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_checkbox.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'xfa/fwl/lightwidget/cfwl_checkbox.h') diff --git a/xfa/fwl/lightwidget/cfwl_checkbox.h b/xfa/fwl/lightwidget/cfwl_checkbox.h index 7b7e4004bd..061e46f777 100644 --- a/xfa/fwl/lightwidget/cfwl_checkbox.h +++ b/xfa/fwl/lightwidget/cfwl_checkbox.h @@ -14,12 +14,12 @@ class CFWL_CheckBox : public CFWL_Widget { public: static CFWL_CheckBox* Create(); - FWL_ERR Initialize(const CFWL_WidgetProperties* pProperties = NULL); - FWL_ERR GetCaption(CFX_WideString& wsCaption); - FWL_ERR SetCaption(const CFX_WideStringC& wsCaption); - FWL_ERR SetBoxSize(FX_FLOAT fHeight); + FWL_Error Initialize(const CFWL_WidgetProperties* pProperties = NULL); + FWL_Error GetCaption(CFX_WideString& wsCaption); + FWL_Error SetCaption(const CFX_WideStringC& wsCaption); + FWL_Error SetBoxSize(FX_FLOAT fHeight); int32_t GetCheckState(); - FWL_ERR SetCheckState(int32_t iCheck); + FWL_Error SetCheckState(int32_t iCheck); CFWL_CheckBox(); virtual ~CFWL_CheckBox(); @@ -27,7 +27,8 @@ class CFWL_CheckBox : public CFWL_Widget { class CFWL_CheckBoxDP : public IFWL_CheckBoxDP { public: CFWL_CheckBoxDP(); - virtual FWL_ERR GetCaption(IFWL_Widget* pWidget, CFX_WideString& wsCaption); + virtual FWL_Error GetCaption(IFWL_Widget* pWidget, + CFX_WideString& wsCaption); virtual FX_FLOAT GetBoxSize(IFWL_Widget* pWidget); FX_FLOAT m_fBoxHeight; CFX_WideString m_wsCaption; -- cgit v1.2.3