summaryrefslogtreecommitdiff
path: root/xfa/fwl/basewidget/fwl_pictureboximp.h
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-05-04 17:57:03 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-04 17:57:03 -0700
commitc777f486f84611d2fdd2d03af661b14955f9efb6 (patch)
tree679012454d82e885f749d17f75fd12735efec29a /xfa/fwl/basewidget/fwl_pictureboximp.h
parent41aad19ba366540bd4efa20a9009ac1c70a81403 (diff)
downloadpdfium-c777f486f84611d2fdd2d03af661b14955f9efb6.tar.xz
Convert FWL_ERR into an enum class.
This Cl updates FWL_ERR to be an FWL_Error enum class. It removes FX_ERR and replaces it with FWL_Error as well as the values were the same. There were many places where we either returned other values for FWL_ERR results. This Cl is the same as: https://codereview.chromium.org/1943413002/ but I seem to have messed up the base URL in that one. TBR=tsepez@chromium.org Review-Url: https://codereview.chromium.org/1952693003
Diffstat (limited to 'xfa/fwl/basewidget/fwl_pictureboximp.h')
-rw-r--r--xfa/fwl/basewidget/fwl_pictureboximp.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/xfa/fwl/basewidget/fwl_pictureboximp.h b/xfa/fwl/basewidget/fwl_pictureboximp.h
index f2e67124f6..d6f0ccc935 100644
--- a/xfa/fwl/basewidget/fwl_pictureboximp.h
+++ b/xfa/fwl/basewidget/fwl_pictureboximp.h
@@ -18,14 +18,14 @@ class CFWL_PictureBoxImp : public CFWL_WidgetImp {
CFWL_PictureBoxImp(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter);
~CFWL_PictureBoxImp();
- virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
+ virtual FWL_Error GetClassName(CFX_WideString& wsClass) const;
virtual uint32_t GetClassID() const;
- virtual FWL_ERR Initialize();
- virtual FWL_ERR Finalize();
- virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
- virtual FWL_ERR Update();
- virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics,
- const CFX_Matrix* pMatrix = NULL);
+ 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);
protected:
void DrawBkground(CFX_Graphics* pGraphics,
@@ -40,11 +40,12 @@ class CFWL_PictureBoxImp : public CFWL_WidgetImp {
FX_BOOL m_bButton;
friend class CFWL_PictureBoxImpDelegate;
};
+
class CFWL_PictureBoxImpDelegate : public CFWL_WidgetImpDelegate {
public:
CFWL_PictureBoxImpDelegate(CFWL_PictureBoxImp* pOwner);
- FWL_ERR OnDrawWidget(CFX_Graphics* pGraphics,
- const CFX_Matrix* pMatrix = NULL) override;
+ void OnDrawWidget(CFX_Graphics* pGraphics,
+ const CFX_Matrix* pMatrix = NULL) override;
protected:
CFWL_PictureBoxImp* m_pOwner;