diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-07-07 16:10:06 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-07-10 13:23:13 +0000 |
| commit | 4183f201c5155717762df48e5d68330b754070f3 (patch) | |
| tree | 49a3ce27be46ee5898c94e91034bcbe560e18caa | |
| parent | b46ce4172ee8282a39997c175dff2bd8f187208f (diff) | |
| download | pdfium-4183f201c5155717762df48e5d68330b754070f3.tar.xz | |
Change parameter type to IPWL_FocusHandler::OnSetFocus().
The parameter is a CPWL_Wnd* but the only caller passes in a CPWL_Edit*,
so change it to CPWL_Edit* and remove the type checks / casting.
Change-Id: Ic2c85427bea5bf3d257b63c1e2ce9db5bee22136
Reviewed-on: https://pdfium-review.googlesource.com/7430
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
| -rw-r--r-- | fpdfsdk/formfiller/cffl_combobox.cpp | 6 | ||||
| -rw-r--r-- | fpdfsdk/formfiller/cffl_combobox.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/formfiller/cffl_textfield.cpp | 6 | ||||
| -rw-r--r-- | fpdfsdk/formfiller/cffl_textfield.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/pdfwindow/cpwl_wnd.h | 3 |
5 files changed, 6 insertions, 13 deletions
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp index 006828df75..6af65de643 100644 --- a/fpdfsdk/formfiller/cffl_combobox.cpp +++ b/fpdfsdk/formfiller/cffl_combobox.cpp @@ -257,11 +257,7 @@ bool CFFL_ComboBox::IsFieldFull(CPDFSDK_PageView* pPageView) { } #endif // PDF_ENABLE_XFA -void CFFL_ComboBox::OnSetFocus(CPWL_Wnd* pWnd) { - if (pWnd->GetClassName() != PWL_CLASSNAME_EDIT) - return; - - CPWL_Edit* pEdit = (CPWL_Edit*)pWnd; +void CFFL_ComboBox::OnSetFocus(CPWL_Edit* pEdit) { pEdit->SetCharSet(FX_CHARSET_ChineseSimplified); pEdit->SetReadyToInput(); diff --git a/fpdfsdk/formfiller/cffl_combobox.h b/fpdfsdk/formfiller/cffl_combobox.h index be14d8beec..96e8ffda84 100644 --- a/fpdfsdk/formfiller/cffl_combobox.h +++ b/fpdfsdk/formfiller/cffl_combobox.h @@ -47,7 +47,7 @@ class CFFL_ComboBox : public CFFL_FormFiller, public IPWL_FocusHandler { bool bRestoreValue) override; // IPWL_FocusHandler: - void OnSetFocus(CPWL_Wnd* pWnd) override; + void OnSetFocus(CPWL_Edit* pEdit) override; #ifdef PDF_ENABLE_XFA // CFFL_FormFiller: diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp index da8c14d0ff..70bc202fbf 100644 --- a/fpdfsdk/formfiller/cffl_textfield.cpp +++ b/fpdfsdk/formfiller/cffl_textfield.cpp @@ -255,11 +255,7 @@ bool CFFL_TextField::IsFieldFull(CPDFSDK_PageView* pPageView) { } #endif // PDF_ENABLE_XFA -void CFFL_TextField::OnSetFocus(CPWL_Wnd* pWnd) { - if (pWnd->GetClassName() != PWL_CLASSNAME_EDIT) - return; - - CPWL_Edit* pEdit = (CPWL_Edit*)pWnd; +void CFFL_TextField::OnSetFocus(CPWL_Edit* pEdit) { pEdit->SetCharSet(FX_CHARSET_ChineseSimplified); pEdit->SetReadyToInput(); diff --git a/fpdfsdk/formfiller/cffl_textfield.h b/fpdfsdk/formfiller/cffl_textfield.h index 621c1184e1..91771a10c1 100644 --- a/fpdfsdk/formfiller/cffl_textfield.h +++ b/fpdfsdk/formfiller/cffl_textfield.h @@ -52,7 +52,7 @@ class CFFL_TextField : public CFFL_FormFiller, public IPWL_FocusHandler { bool bRestoreValue) override; // IPWL_FocusHandler: - void OnSetFocus(CPWL_Wnd* pWnd) override; + void OnSetFocus(CPWL_Edit* pEdit) override; #ifdef PDF_ENABLE_XFA // CFFL_FormFiller: diff --git a/fpdfsdk/pdfwindow/cpwl_wnd.h b/fpdfsdk/pdfwindow/cpwl_wnd.h index a3c4cbbb42..2689a10393 100644 --- a/fpdfsdk/pdfwindow/cpwl_wnd.h +++ b/fpdfsdk/pdfwindow/cpwl_wnd.h @@ -19,6 +19,7 @@ #include "fpdfsdk/pdfwindow/cpwl_timer.h" #include "fpdfsdk/pdfwindow/cpwl_timer_handler.h" +class CPWL_Edit; class CPWL_MsgControl; class CPWL_ScrollBar; class CPWL_Wnd; @@ -114,7 +115,7 @@ class IPWL_Provider : public CFX_Observable<IPWL_Provider> { class IPWL_FocusHandler { public: virtual ~IPWL_FocusHandler() {} - virtual void OnSetFocus(CPWL_Wnd* pWnd) = 0; + virtual void OnSetFocus(CPWL_Edit* pEdit) = 0; }; struct PWL_CREATEPARAM { |