From eb3f68cc7f25a1e28464eb251161b8f08fcd04bc Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 7 Nov 2016 10:28:47 -0800 Subject: Fold DataProviders into parent classes This CL removes the data provider classes and folds the code into the parent classes. Review-Url: https://codereview.chromium.org/2480233003 --- xfa/fwl/core/cfwl_pushbutton.h | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'xfa/fwl/core/cfwl_pushbutton.h') diff --git a/xfa/fwl/core/cfwl_pushbutton.h b/xfa/fwl/core/cfwl_pushbutton.h index 1c4b6b47a1..a146efc54e 100644 --- a/xfa/fwl/core/cfwl_pushbutton.h +++ b/xfa/fwl/core/cfwl_pushbutton.h @@ -10,7 +10,7 @@ #include "xfa/fwl/core/cfwl_widget.h" #include "xfa/fwl/core/ifwl_pushbutton.h" -class CFWL_PushButton : public CFWL_Widget { +class CFWL_PushButton : public CFWL_Widget, public IFWL_PushButtonDP { public: CFWL_PushButton(const IFWL_App*); ~CFWL_PushButton() override; @@ -22,23 +22,16 @@ class CFWL_PushButton : public CFWL_Widget { CFX_DIBitmap* GetPicture(); FWL_Error SetPicture(CFX_DIBitmap* pBitmap); - protected: - class CFWL_PushButtonDP : public IFWL_PushButtonDP { - public: - CFWL_PushButtonDP() : m_pBitmap(nullptr) {} + // IFWL_DataProvider + FWL_Error GetCaption(IFWL_Widget* pWidget, + CFX_WideString& wsCaption) override; - // IFWL_DataProvider - FWL_Error GetCaption(IFWL_Widget* pWidget, - CFX_WideString& wsCaption) override; + // IFWL_PushButtonDP + CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget) override; - // IFWL_PushButtonDP - CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget) override; - - CFX_WideString m_wsCaption; - CFX_DIBitmap* m_pBitmap; - }; - - CFWL_PushButtonDP m_buttonData; + private: + CFX_WideString m_wsCaption; + CFX_DIBitmap* m_pBitmap; }; #endif // XFA_FWL_CORE_CFWL_PUSHBUTTON_H_ -- cgit v1.2.3