From b4d40ffae3f955fab2fac838430c89aca452c45f Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 5 May 2016 10:28:02 -0700 Subject: Remove CLASSHASH defines in favour of an enum class. This Cl updates all the CLASSHASH defines to use an enum class. A few defines where unabled and were either updated or removed if the number no longer exists in the code base. Review-Url: https://codereview.chromium.org/1946213003 --- xfa/fwl/theme/cfwl_widgettp.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'xfa/fwl/theme/cfwl_widgettp.h') diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index 633892a8ee..edb793def9 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h @@ -106,7 +106,12 @@ class CFX_FontSourceEnum_File; class CFWL_WidgetTP { public: - virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); + virtual ~CFWL_WidgetTP(); + + virtual FWL_Error Initialize(); + virtual FWL_Error Finalize(); + + virtual bool IsValidWidget(IFWL_Widget* pWidget); virtual uint32_t GetThemeID(IFWL_Widget* pWidget); virtual uint32_t SetThemeID(IFWL_Widget* pWidget, uint32_t dwThemeID, @@ -124,9 +129,7 @@ class CFWL_WidgetTP { FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect); - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); - virtual ~CFWL_WidgetTP(); + FWL_Error SetFont(IFWL_Widget* pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, -- cgit v1.2.3