From f87058d19a3448face48202c7040ee4d95ba39c1 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 21 Apr 2016 06:22:11 -0700 Subject: Convert some FWL defines to enums. This CL converts FWL_WGTCAPACITY_* defines to the CFWL_WidgetCapacity enum class. The FWL_PART_* defines to the FWL_Part enum class and the FWL_PartState_* defines to an enum. Review URL: https://codereview.chromium.org/1898713003 --- xfa/fwl/core/ifwl_themeprovider.h | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'xfa/fwl/core/ifwl_themeprovider.h') diff --git a/xfa/fwl/core/ifwl_themeprovider.h b/xfa/fwl/core/ifwl_themeprovider.h index f0fb1492a8..c790da5f4e 100644 --- a/xfa/fwl/core/ifwl_themeprovider.h +++ b/xfa/fwl/core/ifwl_themeprovider.h @@ -10,21 +10,7 @@ #include "core/fxcrt/include/fx_coordinates.h" #include "core/fxcrt/include/fx_system.h" #include "xfa/fwl/core/fwl_error.h" - -#define FWL_WGTCAPACITY_CXBorder 1 -#define FWL_WGTCAPACITY_CYBorder 2 -#define FWL_WGTCAPACITY_ScrollBarWidth 3 -#define FWL_WGTCAPACITY_EdgeFlat 4 -#define FWL_WGTCAPACITY_EdgeRaised 5 -#define FWL_WGTCAPACITY_EdgeSunken 6 -#define FWL_WGTCAPACITY_Font 7 -#define FWL_WGTCAPACITY_FontSize 8 -#define FWL_WGTCAPACITY_TextColor 9 -#define FWL_WGTCAPACITY_TextSelColor 10 -#define FWL_WGTCAPACITY_LineHeight 11 -#define FWL_WGTCAPACITY_UIMargin 12 -#define FWL_WGTCAPACITY_SpaceAboveBelow 13 -#define FWL_WGTCAPACITY_MAX 65535 +#include "xfa/fwl/theme/cfwl_widgettp.h" class CFWL_ThemeBackground; class CFWL_ThemePart; @@ -45,7 +31,7 @@ class IFWL_ThemeProvider { virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams) = 0; virtual FX_BOOL DrawText(CFWL_ThemeText* pParams) = 0; virtual void* GetCapacity(CFWL_ThemePart* pThemePart, - uint32_t dwCapacity) = 0; + CFWL_WidgetCapacity dwCapacity) = 0; virtual FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget) = 0; virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart) = 0; -- cgit v1.2.3