From 3b3ce1a242f8445848d3f23d6c35ba01d7c645f4 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 2 Nov 2016 14:51:25 -0700 Subject: 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 --- xfa/fwl/core/ifwl_monthcalendar.h | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'xfa/fwl/core/ifwl_monthcalendar.h') diff --git a/xfa/fwl/core/ifwl_monthcalendar.h b/xfa/fwl/core/ifwl_monthcalendar.h index 6bf8ad4898..dfde3944a1 100644 --- a/xfa/fwl/core/ifwl_monthcalendar.h +++ b/xfa/fwl/core/ifwl_monthcalendar.h @@ -34,7 +34,6 @@ FWL_EVENT_DEF(CFWL_EventMcdDateChanged, int32_t m_iStartDay; int32_t m_iEndDay;) -class CFWL_MonthCalendarImpDelegate; class CFWL_MsgMouse; class CFWL_WidgetImpProperties; class IFWL_Widget; @@ -63,6 +62,10 @@ class IFWL_MonthCalendar : public IFWL_Widget { FWL_Error Update() override; FWL_Error DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = nullptr) override; + void OnProcessMessage(CFWL_Message* pMessage) override; + void OnDrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix) override; + int32_t CountSelect(); FX_BOOL GetSelect(int32_t& iYear, int32_t& iMonth, @@ -236,7 +239,13 @@ class IFWL_MonthCalendar : public IFWL_Widget { FX_FLOAT m_fTodayFlagWid; FX_FLOAT m_fMCWid; FX_FLOAT m_fMCHei; - friend class CFWL_MonthCalendarImpDelegate; + + private: + void OnFocusChanged(CFWL_Message* pMsg, FX_BOOL bSet); + void OnLButtonDown(CFWL_MsgMouse* pMsg); + void OnLButtonUp(CFWL_MsgMouse* pMsg); + void OnMouseMove(CFWL_MsgMouse* pMsg); + void OnMouseLeave(CFWL_MsgMouse* pMsg); }; struct FWL_DATEINFO { @@ -254,21 +263,4 @@ struct FWL_DATEINFO { CFX_WideString wsDay; }; -class CFWL_MonthCalendarImpDelegate : public CFWL_WidgetImpDelegate { - public: - CFWL_MonthCalendarImpDelegate(IFWL_MonthCalendar* pOwner); - void OnProcessMessage(CFWL_Message* pMessage) override; - void OnDrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = nullptr) override; - - protected: - void OnActivate(CFWL_Message* pMsg); - void OnFocusChanged(CFWL_Message* pMsg, FX_BOOL bSet = TRUE); - void OnLButtonDown(CFWL_MsgMouse* pMsg); - void OnLButtonUp(CFWL_MsgMouse* pMsg); - void OnMouseMove(CFWL_MsgMouse* pMsg); - void OnMouseLeave(CFWL_MsgMouse* pMsg); - IFWL_MonthCalendar* m_pOwner; -}; - #endif // XFA_FWL_CORE_IFWL_MONTHCALENDAR_H_ -- cgit v1.2.3