From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: Merge to XFA: Kill CFX_Object. Not just a simple merge, but changes to remove CFX_Object from XFA. Original Review URL: https://codereview.chromium.org/1088733002 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1087053002 --- xfa/include/fwl/theme/widgettp.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'xfa/include/fwl/theme/widgettp.h') diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h index 3ede92f5d7..57348e4c75 100644 --- a/xfa/include/fwl/theme/widgettp.h +++ b/xfa/include/fwl/theme/widgettp.h @@ -6,7 +6,6 @@ #ifndef _FWL_WIDGETTP_H #define _FWL_WIDGETTP_H -class CFX_Object; class IFWL_ThemeProvider; class IFWL_Widget; class IFDE_TextOut; @@ -17,7 +16,7 @@ class IFX_FontSourceEnum; #endif class CFWL_WidgetTP; class CFWL_ArrowData; -class CFWL_WidgetTP : public CFX_Object +class CFWL_WidgetTP { public: virtual FX_BOOL IsValidWidget(IFWL_Widget *pWidget); @@ -71,7 +70,7 @@ void FWLTHEME_Release(); FX_DWORD FWL_GetThemeLayout(FX_DWORD dwThemeID); FX_DWORD FWL_GetThemeColor(FX_DWORD dwThemeID); FX_DWORD FWL_MakeThemeID(FX_DWORD dwLayout, FX_DWORD dwColor); -class CFWL_ArrowData : public CFX_Object +class CFWL_ArrowData { public: static CFWL_ArrowData* GetInstance(); @@ -80,7 +79,7 @@ public: virtual ~CFWL_ArrowData(); void SetColorData(FX_DWORD dwID); - class CColorData : public CFX_Object + class CColorData { public: FX_ARGB clrBorder[4]; @@ -92,7 +91,7 @@ protected: CFWL_ArrowData(); static CFWL_ArrowData *m_pInstance; }; -class CFWL_FontData : public CFX_Object +class CFWL_FontData { public: CFWL_FontData(); @@ -113,7 +112,7 @@ protected: IFX_FontSourceEnum *m_pFontSource; #endif }; -class CFWL_FontManager : public CFX_Object +class CFWL_FontManager { public: CFWL_FontManager(); -- cgit v1.2.3