diff options
author | dsinclair <dsinclair@chromium.org> | 2016-07-13 11:34:23 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-07-13 11:34:23 -0700 |
commit | dbc7716e1b8d67a5ca422ef0bbfe87ff8c5cf4ea (patch) | |
tree | be90424187b3e350b6ef824f0ac0a069cbd0beb8 /fpdfsdk/formfiller | |
parent | e35af1e3c93e5e1f374799da115eb4b99820831c (diff) | |
download | pdfium-chromium/2798.tar.xz |
Cleanup some PWL interfaces.chromium/2800chromium/2799chromium/2798chromium/2797
This CL removes IPWL_Edit_Notfy and removes the OnKillFocus override from
IPWL_FocusHandler.
Review-Url: https://codereview.chromium.org/2144813002
Diffstat (limited to 'fpdfsdk/formfiller')
-rw-r--r-- | fpdfsdk/formfiller/cffl_combobox.cpp | 10 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_combobox.h | 8 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_textfield.cpp | 6 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_textfield.h | 8 |
4 files changed, 2 insertions, 30 deletions
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp index 262c485138..4b84733890 100644 --- a/fpdfsdk/formfiller/cffl_combobox.cpp +++ b/fpdfsdk/formfiller/cffl_combobox.cpp @@ -267,19 +267,9 @@ void CFFL_ComboBox::OnSetFocus(CPWL_Wnd* pWnd) { unsigned short* pBuffer = (unsigned short*)bsUTFText.c_str(); m_pApp->FFI_OnSetFieldInputFocus(m_pWidget->GetFormField(), pBuffer, nCharacters, TRUE); - - pEdit->SetEditNotify(this); } } -void CFFL_ComboBox::OnKillFocus(CPWL_Wnd* pWnd) { - ASSERT(m_pApp); -} - -void CFFL_ComboBox::OnAddUndo(CPWL_Edit* pEdit) { - ASSERT(pEdit); -} - CFX_WideString CFFL_ComboBox::GetSelectExportText() { CFX_WideString swRet; diff --git a/fpdfsdk/formfiller/cffl_combobox.h b/fpdfsdk/formfiller/cffl_combobox.h index 947f42548e..6b8fb4939b 100644 --- a/fpdfsdk/formfiller/cffl_combobox.h +++ b/fpdfsdk/formfiller/cffl_combobox.h @@ -19,9 +19,7 @@ struct FFL_ComboBoxState { CFX_WideString sValue; }; -class CFFL_ComboBox : public CFFL_FormFiller, - public IPWL_FocusHandler, - public IPWL_Edit_Notify { +class CFFL_ComboBox : public CFFL_FormFiller, public IPWL_FocusHandler { public: CFFL_ComboBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pWidget); ~CFFL_ComboBox() override; @@ -49,10 +47,6 @@ class CFFL_ComboBox : public CFFL_FormFiller, // IPWL_FocusHandler: void OnSetFocus(CPWL_Wnd* pWnd) override; - void OnKillFocus(CPWL_Wnd* pWnd) override; - - // IPWL_Edit_Notify: - void OnAddUndo(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 4f32f42ac7..5e690313be 100644 --- a/fpdfsdk/formfiller/cffl_textfield.cpp +++ b/fpdfsdk/formfiller/cffl_textfield.cpp @@ -279,11 +279,5 @@ void CFFL_TextField::OnSetFocus(CPWL_Wnd* pWnd) { unsigned short* pBuffer = (unsigned short*)bsUTFText.c_str(); m_pApp->FFI_OnSetFieldInputFocus(m_pWidget->GetFormField(), pBuffer, nCharacters, TRUE); - - pEdit->SetEditNotify(this); } } - -void CFFL_TextField::OnKillFocus(CPWL_Wnd* pWnd) {} - -void CFFL_TextField::OnAddUndo(CPWL_Edit* pEdit) {} diff --git a/fpdfsdk/formfiller/cffl_textfield.h b/fpdfsdk/formfiller/cffl_textfield.h index d7bfc9ee8d..34968e8fc3 100644 --- a/fpdfsdk/formfiller/cffl_textfield.h +++ b/fpdfsdk/formfiller/cffl_textfield.h @@ -21,9 +21,7 @@ struct FFL_TextFieldState { CFX_WideString sValue; }; -class CFFL_TextField : public CFFL_FormFiller, - public IPWL_FocusHandler, - public IPWL_Edit_Notify { +class CFFL_TextField : public CFFL_FormFiller, public IPWL_FocusHandler { public: CFFL_TextField(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot); ~CFFL_TextField() override; @@ -51,10 +49,6 @@ class CFFL_TextField : public CFFL_FormFiller, // IPWL_FocusHandler: void OnSetFocus(CPWL_Wnd* pWnd) override; - void OnKillFocus(CPWL_Wnd* pWnd) override; - - // IPWL_Edit_Notify: - void OnAddUndo(CPWL_Edit* pEdit) override; #ifdef PDF_ENABLE_XFA // CFFL_FormFiller: |