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_picturebox.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_picturebox.h')
| -rw-r--r-- | xfa/fwl/core/ifwl_picturebox.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/xfa/fwl/core/ifwl_picturebox.h b/xfa/fwl/core/ifwl_picturebox.h index ecbbc449cb..05f094b25c 100644 --- a/xfa/fwl/core/ifwl_picturebox.h +++ b/xfa/fwl/core/ifwl_picturebox.h @@ -27,7 +27,6 @@ #define FWL_STYLEEXT_PTB_VAlignMask 3L << 2 #define FWL_STYLEEXT_PTB_StretchAlignMask 7L << 4 -class CFWL_PictureBoxImpDelegate; class CFWL_WidgetImpProperties; class CFX_DIBitmap; class IFWL_Widget; @@ -54,10 +53,10 @@ class IFWL_PictureBox : public IFWL_Widget { FWL_Error Update() override; FWL_Error DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = nullptr) override; + void OnDrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix) override; protected: - friend class CFWL_PictureBoxImpDelegate; - void DrawBkground(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix = nullptr); @@ -71,14 +70,4 @@ class IFWL_PictureBox : public IFWL_Widget { FX_BOOL m_bButton; }; -class CFWL_PictureBoxImpDelegate : public CFWL_WidgetImpDelegate { - public: - CFWL_PictureBoxImpDelegate(IFWL_PictureBox* pOwner); - void OnDrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = nullptr) override; - - protected: - IFWL_PictureBox* m_pOwner; -}; - #endif // XFA_FWL_CORE_IFWL_PICTUREBOX_H_ |