summaryrefslogtreecommitdiff
path: root/xfa/fwl/core/cfwl_pushbutton.h
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-11-07 10:28:47 -0800
committerCommit bot <commit-bot@chromium.org>2016-11-07 10:28:47 -0800
commiteb3f68cc7f25a1e28464eb251161b8f08fcd04bc (patch)
tree36e565bac1a7760e605b181b7da4c08bda151cdd /xfa/fwl/core/cfwl_pushbutton.h
parenta97fc7c6392c0adbd702bdf898cb9e20cee00a3e (diff)
downloadpdfium-eb3f68cc7f25a1e28464eb251161b8f08fcd04bc.tar.xz
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
Diffstat (limited to 'xfa/fwl/core/cfwl_pushbutton.h')
-rw-r--r--xfa/fwl/core/cfwl_pushbutton.h25
1 files changed, 9 insertions, 16 deletions
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_