| Index: xfa/fwl/basewidget/fwl_pictureboximp.h
|
| diff --git a/xfa/fwl/basewidget/fwl_pictureboximp.h b/xfa/fwl/basewidget/fwl_pictureboximp.h
|
| index d6f0ccc935b7562031a447235e53334029e38341..9fa065216a7c4e7bb1f54c5c1d8acf2d09c0789c 100644
|
| --- a/xfa/fwl/basewidget/fwl_pictureboximp.h
|
| +++ b/xfa/fwl/basewidget/fwl_pictureboximp.h
|
| @@ -8,6 +8,7 @@
|
| #define XFA_FWL_BASEWIDGET_FWL_PICTUREBOXIMP_H_
|
|
|
| #include "xfa/fwl/core/fwl_widgetimp.h"
|
| +#include "xfa/fwl/core/ifwl_widget.h"
|
|
|
| class CFWL_WidgetImpProperties;
|
| class IFWL_Widget;
|
| @@ -17,20 +18,25 @@ class CFWL_PictureBoxImp : public CFWL_WidgetImp {
|
| public:
|
| CFWL_PictureBoxImp(const CFWL_WidgetImpProperties& properties,
|
| IFWL_Widget* pOuter);
|
| - ~CFWL_PictureBoxImp();
|
| - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const;
|
| - virtual uint32_t GetClassID() const;
|
| - virtual FWL_Error Initialize();
|
| - virtual FWL_Error Finalize();
|
| - virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
|
| - virtual FWL_Error Update();
|
| - virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics,
|
| - const CFX_Matrix* pMatrix = NULL);
|
| + ~CFWL_PictureBoxImp() override;
|
| +
|
| + // CFWL_WidgetImp
|
| + FWL_Error GetClassName(CFX_WideString& wsClass) const override;
|
| + FWL_Type GetClassID() const override;
|
| + FWL_Error Initialize() override;
|
| + FWL_Error Finalize() override;
|
| + FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override;
|
| + FWL_Error Update() override;
|
| + FWL_Error DrawWidget(CFX_Graphics* pGraphics,
|
| + const CFX_Matrix* pMatrix = nullptr) override;
|
|
|
| protected:
|
| + friend class CFWL_PictureBoxImpDelegate;
|
| +
|
| void DrawBkground(CFX_Graphics* pGraphics,
|
| IFWL_ThemeProvider* pTheme,
|
| const CFX_Matrix* pMatrix = NULL);
|
| +
|
| FX_BOOL VStyle(FX_BOOL dwStyle);
|
| CFX_RectF m_rtClient;
|
| CFX_RectF m_rtImage;
|
| @@ -38,7 +44,6 @@ class CFWL_PictureBoxImp : public CFWL_WidgetImp {
|
| FX_BOOL m_bTop;
|
| FX_BOOL m_bVCenter;
|
| FX_BOOL m_bButton;
|
| - friend class CFWL_PictureBoxImpDelegate;
|
| };
|
|
|
| class CFWL_PictureBoxImpDelegate : public CFWL_WidgetImpDelegate {
|
|
|