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_listbox.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_listbox.h')
| -rw-r--r-- | xfa/fwl/core/ifwl_listbox.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/xfa/fwl/core/ifwl_listbox.h b/xfa/fwl/core/ifwl_listbox.h index 25e28cc3a6..5d4f896e94 100644 --- a/xfa/fwl/core/ifwl_listbox.h +++ b/xfa/fwl/core/ifwl_listbox.h @@ -32,7 +32,6 @@ #define FWL_ITEMSTATE_LTB_Focused (1L << 1) #define FWL_ITEMSTATE_LTB_Checked (1L << 2) -class CFWL_ListBoxImpDelegate; class CFWL_MsgKillFocus; class CFWL_MsgMouse; class CFWL_MsgMouseWheel; @@ -115,6 +114,10 @@ class IFWL_ListBox : public IFWL_Widget { FWL_Error DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = nullptr) override; FWL_Error SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) override; + void OnProcessMessage(CFWL_Message* pMessage) override; + void OnProcessEvent(CFWL_Event* pEvent) override; + void OnDrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix) override; int32_t CountSelItems(); IFWL_ListItem* GetSelItem(int32_t nIndexSel); @@ -180,17 +183,8 @@ class IFWL_ListBox : public IFWL_Widget { FX_FLOAT m_fScorllBarWidth; FX_BOOL m_bLButtonDown; IFWL_ThemeProvider* m_pScrollBarTP; -}; - -class CFWL_ListBoxImpDelegate : public CFWL_WidgetImpDelegate { - public: - CFWL_ListBoxImpDelegate(IFWL_ListBox* pOwner); - void OnProcessMessage(CFWL_Message* pMessage) override; - void OnProcessEvent(CFWL_Event* pEvent) override; - void OnDrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = nullptr) override; - protected: + private: void OnFocusChanged(CFWL_Message* pMsg, FX_BOOL bSet = TRUE); void OnLButtonDown(CFWL_MsgMouse* pMsg); void OnLButtonUp(CFWL_MsgMouse* pMsg); @@ -199,7 +193,6 @@ class CFWL_ListBoxImpDelegate : public CFWL_WidgetImpDelegate { void OnVK(IFWL_ListItem* hItem, FX_BOOL bShift, FX_BOOL bCtrl); FX_BOOL OnScroll(IFWL_ScrollBar* pScrollBar, uint32_t dwCode, FX_FLOAT fPos); void DispatchSelChangedEv(); - IFWL_ListBox* m_pOwner; }; #endif // XFA_FWL_CORE_IFWL_LISTBOX_H_ |