From c777f486f84611d2fdd2d03af661b14955f9efb6 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 4 May 2016 17:57:03 -0700 Subject: 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 --- xfa/fwl/lightwidget/cfwl_pushbutton.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/fwl/lightwidget/cfwl_pushbutton.h') diff --git a/xfa/fwl/lightwidget/cfwl_pushbutton.h b/xfa/fwl/lightwidget/cfwl_pushbutton.h index 99b067d2cf..5ca3dded37 100644 --- a/xfa/fwl/lightwidget/cfwl_pushbutton.h +++ b/xfa/fwl/lightwidget/cfwl_pushbutton.h @@ -13,11 +13,11 @@ class CFWL_PushButton : public CFWL_Widget { public: static CFWL_PushButton* Create(); - FWL_ERR Initialize(const CFWL_WidgetProperties* pProperties = NULL); - FWL_ERR GetCaption(CFX_WideString& wsCaption); - FWL_ERR SetCaption(const CFX_WideStringC& wsCaption); + FWL_Error Initialize(const CFWL_WidgetProperties* pProperties = NULL); + FWL_Error GetCaption(CFX_WideString& wsCaption); + FWL_Error SetCaption(const CFX_WideStringC& wsCaption); CFX_DIBitmap* GetPicture(); - FWL_ERR SetPicture(CFX_DIBitmap* pBitmap); + FWL_Error SetPicture(CFX_DIBitmap* pBitmap); CFWL_PushButton(); virtual ~CFWL_PushButton(); @@ -25,7 +25,7 @@ class CFWL_PushButton : public CFWL_Widget { class CFWL_PushButtonDP : public IFWL_PushButtonDP { public: CFWL_PushButtonDP() : m_pBitmap(NULL) {} - FWL_ERR GetCaption(IFWL_Widget* pWidget, CFX_WideString& wsCaption); + FWL_Error GetCaption(IFWL_Widget* pWidget, CFX_WideString& wsCaption); virtual CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget); CFX_WideString m_wsCaption; CFX_DIBitmap* m_pBitmap; -- cgit v1.2.3