diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-11-17 13:15:16 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-17 13:15:16 -0800 |
| commit | 3855f7ff0d4c5c8653fc17219bf65c4a0a95e8bb (patch) | |
| tree | 17cd22db0b4cd1ea3c337d99ee760b3a86181eaf /xfa/fxfa/app | |
| parent | 935c6310adacf2f4a4265e831e6cb60dc7a35803 (diff) | |
| download | pdfium-3855f7ff0d4c5c8653fc17219bf65c4a0a95e8bb.tar.xz | |
Unify the three CFWL_EventType::SelectChange classes.
This CL removes the ListBox SelectChange class as it is never processed. The
other two have been unified into a single classs.
Review-Url: https://codereview.chromium.org/2509283003
Diffstat (limited to 'xfa/fxfa/app')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffchoicelist.cpp | 8 | ||||
| -rw-r--r-- | xfa/fxfa/app/xfa_ffchoicelist.h | 1 | ||||
| -rw-r--r-- | xfa/fxfa/app/xfa_fftextedit.cpp | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp index e516ffde95..f44ea56606 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.cpp +++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp @@ -7,6 +7,7 @@ #include "xfa/fxfa/app/xfa_ffchoicelist.h" #include "xfa/fwl/core/cfwl_combobox.h" +#include "xfa/fwl/core/cfwl_evtselectchanged.h" #include "xfa/fwl/core/cfwl_listbox.h" #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_app.h" @@ -480,7 +481,6 @@ void CXFA_FFComboBox::OnTextChanged(IFWL_Widget* pWidget, FWLEventSelChange(&eParam); } void CXFA_FFComboBox::OnSelectChanged(IFWL_Widget* pWidget, - const CFX_Int32Array& arrSels, bool bLButtonUp) { CXFA_EventParam eParam; m_pDataAcc->GetValue(eParam.m_wsPrevText, XFA_VALUEPICTURE_Raw); @@ -511,9 +511,9 @@ void CXFA_FFComboBox::OnProcessEvent(CFWL_Event* pEvent) { CXFA_FFField::OnProcessEvent(pEvent); switch (pEvent->GetClassID()) { case CFWL_EventType::SelectChanged: { - CFWL_EvtCmbSelChanged* postEvent = (CFWL_EvtCmbSelChanged*)pEvent; - OnSelectChanged(m_pNormalWidget->GetWidget(), postEvent->iArraySels, - postEvent->bLButtonUp); + CFWL_EvtSelectChanged* postEvent = + static_cast<CFWL_EvtSelectChanged*>(pEvent); + OnSelectChanged(m_pNormalWidget->GetWidget(), postEvent->bLButtonUp); break; } case CFWL_EventType::EditChanged: { diff --git a/xfa/fxfa/app/xfa_ffchoicelist.h b/xfa/fxfa/app/xfa_ffchoicelist.h index 720807f968..1855d193aa 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.h +++ b/xfa/fxfa/app/xfa_ffchoicelist.h @@ -77,7 +77,6 @@ class CXFA_FFComboBox : public CXFA_FFField { void OnTextChanged(IFWL_Widget* pWidget, const CFX_WideString& wsChanged); void OnSelectChanged(IFWL_Widget* pWidget, - const CFX_Int32Array& arrSels, bool bLButtonUp); void OnPreOpen(IFWL_Widget* pWidget); void OnPostOpen(IFWL_Widget* pWidget); diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp index 8475f293d3..6a2c611539 100644 --- a/xfa/fxfa/app/xfa_fftextedit.cpp +++ b/xfa/fxfa/app/xfa_fftextedit.cpp @@ -11,6 +11,7 @@ #include "xfa/fwl/core/cfwl_datetimepicker.h" #include "xfa/fwl/core/cfwl_edit.h" #include "xfa/fwl/core/cfwl_evtcheckword.h" +#include "xfa/fwl/core/cfwl_evtselectchanged.h" #include "xfa/fwl/core/cfwl_evttextchanged.h" #include "xfa/fwl/core/cfwl_evtvalidate.h" #include "xfa/fwl/core/cfwl_msgkillfocus.h" @@ -686,7 +687,7 @@ void CXFA_FFDateTimeEdit::OnSelectChanged(IFWL_Widget* pWidget, void CXFA_FFDateTimeEdit::OnProcessEvent(CFWL_Event* pEvent) { if (pEvent->GetClassID() == CFWL_EventType::SelectChanged) { - CFWL_Event_DtpSelectChanged* event = (CFWL_Event_DtpSelectChanged*)pEvent; + CFWL_EvtSelectChanged* event = static_cast<CFWL_EvtSelectChanged*>(pEvent); OnSelectChanged(m_pNormalWidget->GetWidget(), event->iYear, event->iMonth, event->iDay); return; |