From 2c489cc41023a40648dfde988d11b8ec2b66c7d0 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 23 Nov 2016 16:17:20 -0800 Subject: Merge IFWL and CFWL classes. This CL merges the IFWL hierarchy into the CFWL hierachy. All CFWL proxy methods have been replaced by the IFWL implementations. Review-Url: https://codereview.chromium.org/2524173002 --- xfa/fwl/theme/cfwl_widgettp.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 6093dd2465..998d3c76e8 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h @@ -97,7 +97,7 @@ class CFWL_ThemeBackground; class CFWL_ThemePart; class CFWL_ThemeText; class CFGAS_FontMgr; -class IFWL_Widget; +class CFWL_Widget; #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ class CFX_FontSourceEnum_File; @@ -110,7 +110,7 @@ class CFWL_WidgetTP { virtual void Initialize(); virtual void Finalize(); - virtual bool IsValidWidget(IFWL_Widget* pWidget); + virtual bool IsValidWidget(CFWL_Widget* pWidget); virtual void DrawBackground(CFWL_ThemeBackground* pParams); virtual void DrawText(CFWL_ThemeText* pParams); @@ -118,15 +118,15 @@ class CFWL_WidgetTP { CFWL_WidgetCapacity dwCapacity); virtual void CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect); - void SetFont(IFWL_Widget* pWidget, + void SetFont(CFWL_Widget* pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont); - void SetFont(IFWL_Widget* pWidget, + void SetFont(CFWL_Widget* pWidget, CFGAS_GEFont* pFont, FX_FLOAT fFontSize, FX_ARGB rgbFont); - CFGAS_GEFont* GetFont(IFWL_Widget* pWidget); + CFGAS_GEFont* GetFont(CFWL_Widget* pWidget); protected: CFWL_WidgetTP(); -- cgit v1.2.3