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/checkboxtp.h | 3 +-- xfa/include/fwl/theme/datetimepickertp.h | 3 +-- xfa/include/fwl/theme/formtp.h | 3 +-- xfa/include/fwl/theme/monthcalendartp.h | 2 +- xfa/include/fwl/theme/pushbuttontp.h | 3 +-- xfa/include/fwl/theme/scrollbartp.h | 3 +-- xfa/include/fwl/theme/widgettp.h | 11 +++++------ 7 files changed, 11 insertions(+), 17 deletions(-) (limited to 'xfa/include/fwl/theme') diff --git a/xfa/include/fwl/theme/checkboxtp.h b/xfa/include/fwl/theme/checkboxtp.h index 384effe732..b11407063e 100644 --- a/xfa/include/fwl/theme/checkboxtp.h +++ b/xfa/include/fwl/theme/checkboxtp.h @@ -32,8 +32,7 @@ protected: void DrawSignBorder(IFWL_Widget *pWidget, CFX_Graphics *pGraphics, const CFX_RectF *pRtBox, FX_BOOL bDisable = FALSE, CFX_Matrix *pMatrix = NULL); void SetThemeData(FX_DWORD dwID); void initCheckPath(FX_FLOAT fCheckLen); - struct CKBThemeData : public CFX_Object { - public: + struct CKBThemeData { FX_ARGB clrBoxBk[13][2]; FX_ARGB clrSignBorderNormal; FX_ARGB clrSignBorderDisable; diff --git a/xfa/include/fwl/theme/datetimepickertp.h b/xfa/include/fwl/theme/datetimepickertp.h index 01a775a6f1..39e509530c 100644 --- a/xfa/include/fwl/theme/datetimepickertp.h +++ b/xfa/include/fwl/theme/datetimepickertp.h @@ -18,8 +18,7 @@ public: protected: void DrawDropDownButton(CFWL_ThemeBackground *pParams, CFX_Matrix *pMatrix); void initThemeData(); - struct DTPThemeData : public CFX_Object { - public: + struct DTPThemeData { FX_ARGB BoxBkColor[13][2]; } *m_pThemeData; }; diff --git a/xfa/include/fwl/theme/formtp.h b/xfa/include/fwl/theme/formtp.h index b7e68e2d5b..8f715e77b6 100644 --- a/xfa/include/fwl/theme/formtp.h +++ b/xfa/include/fwl/theme/formtp.h @@ -48,8 +48,7 @@ protected: CFX_RectF m_rtDisLBorder; CFX_RectF m_rtDisRBorder; CFX_RectF m_rtDisBBorder; - struct SBThemeData : public CFX_Object { - public: + struct SBThemeData { FX_ARGB clrHeadBK[2][4]; FX_ARGB clrHeadEdgeLeft[2][3]; FX_ARGB clrHeadEdgeRight[2][3]; diff --git a/xfa/include/fwl/theme/monthcalendartp.h b/xfa/include/fwl/theme/monthcalendartp.h index 55d991d404..6f0624ae9c 100644 --- a/xfa/include/fwl/theme/monthcalendartp.h +++ b/xfa/include/fwl/theme/monthcalendartp.h @@ -32,7 +32,7 @@ protected: FX_BOOL DrawWeekNumSep(CFWL_ThemeBackground *pParams, CFX_Matrix *pMatrix); FWLTHEME_STATE GetState(FX_DWORD dwFWLStates); void SetThemeData(FX_DWORD dwThemeID); - class MCThemeData : public CFX_Object + class MCThemeData { public: FX_ARGB clrCaption; diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h index 676a5fce50..b27afc47f4 100644 --- a/xfa/include/fwl/theme/pushbuttontp.h +++ b/xfa/include/fwl/theme/pushbuttontp.h @@ -30,8 +30,7 @@ protected: void SetCornerColor(FX_DWORD *pData); FX_INT32 GetColorID(FX_DWORD dwStates); - struct PBThemeData : CFX_Object { - public: + struct PBThemeData { FX_ARGB clrBorder[5]; FX_ARGB clrStart[5]; FX_ARGB clrEnd[5]; diff --git a/xfa/include/fwl/theme/scrollbartp.h b/xfa/include/fwl/theme/scrollbartp.h index b7f1926029..3153c79ead 100644 --- a/xfa/include/fwl/theme/scrollbartp.h +++ b/xfa/include/fwl/theme/scrollbartp.h @@ -23,8 +23,7 @@ protected: void DrawMaxMinBtn(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_DIRECTION eDict, FWLTHEME_STATE eState, CFX_Matrix *pMatrix = NULL); void DrawPaw(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FX_BOOL bVert, FWLTHEME_STATE eState, CFX_Matrix *pMatrix = NULL); void SetThemeData(FX_DWORD dwID); - struct SBThemeData : public CFX_Object { - public: + struct SBThemeData { FX_ARGB clrPawColorLight[4]; FX_ARGB clrPawColorDark[4]; FX_ARGB clrBtnBK[4][2]; 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