diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-11-02 14:51:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-02 14:51:25 -0700 |
| commit | 3b3ce1a242f8445848d3f23d6c35ba01d7c645f4 (patch) | |
| tree | 365d9ee7f8eec1103fb9fce0986e23d9f548ecae /xfa/fwl/core/ifwl_combolist.h | |
| parent | 4cf551577856f89103e162edc761def44ffb96fc (diff) | |
| download | pdfium-3b3ce1a242f8445848d3f23d6c35ba01d7c645f4.tar.xz | |
Merge delegates into IFWL_* classes.
This Cl removes ownership of the delgates from IFWL_Widget and puts it in the
hand of the creating classes. In doing so, merge the delegates back into the
IFWL_* classes to simplify logic.
Review-Url: https://codereview.chromium.org/2467993003
Diffstat (limited to 'xfa/fwl/core/ifwl_combolist.h')
| -rw-r--r-- | xfa/fwl/core/ifwl_combolist.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/xfa/fwl/core/ifwl_combolist.h b/xfa/fwl/core/ifwl_combolist.h index 781fbadf73..a4e90f5b93 100644 --- a/xfa/fwl/core/ifwl_combolist.h +++ b/xfa/fwl/core/ifwl_combolist.h @@ -17,6 +17,9 @@ class IFWL_ComboList : public IFWL_ListBox { const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); + // IFWL_ListBox. + void OnProcessMessage(CFWL_Message* pMessage) override; + int32_t MatchItem(const CFX_WideString& wsMatch); void ChangeSelected(int32_t iSel); int32_t CountItems(); @@ -26,23 +29,15 @@ class IFWL_ComboList : public IFWL_ListBox { FX_BOOL m_bNotifyOwner; - friend class CFWL_ComboListImpDelegate; friend class IFWL_ComboBox; -}; - -class CFWL_ComboListImpDelegate : public CFWL_ListBoxImpDelegate { - public: - CFWL_ComboListImpDelegate(IFWL_ComboList* pOwner); - void OnProcessMessage(CFWL_Message* pMessage) override; - protected: - void OnDropListFocusChanged(CFWL_Message* pMsg, FX_BOOL bSet = TRUE); + private: + void OnDropListFocusChanged(CFWL_Message* pMsg, FX_BOOL bSet); int32_t OnDropListMouseMove(CFWL_MsgMouse* pMsg); int32_t OnDropListLButtonDown(CFWL_MsgMouse* pMsg); int32_t OnDropListLButtonUp(CFWL_MsgMouse* pMsg); int32_t OnDropListKey(CFWL_MsgKey* pKey); void OnDropListKeyDown(CFWL_MsgKey* pKey); - IFWL_ComboList* m_pOwner; }; #endif // XFA_FWL_CORE_IFWL_COMBOLIST_H_ |