Merge to XFA: Kill CFX_Object.

xfa/include/fwl/theme/widgettp.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _FWL_WIDGETTP_H
 #define _FWL_WIDGETTP_H
-class CFX_Object;
 class IFWL_ThemeProvider;
 class IFWL_Widget;
 class IFDE_TextOut;
 class IFX_Font;
 class IFX_FontMgr;
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
 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);
     virtual FX_DWORD    GetThemeID(IFWL_Widget *pWidget);
     virtual FX_DWORD    SetThemeID(IFWL_Widget *pWidget, FX_DWORD dwThemeID, FX_BOOL bChildren = TRUE);
     virtual FWL_ERR             GetThemeMatrix(IFWL_Widget *pWidget, CFX_Matrix &matrix);
     virtual FWL_ERR             SetThemeMatrix(IFWL_Widget *pWidget, const CFX_Matrix &matrix);
     virtual FX_BOOL             DrawBackground(CFWL_ThemeBackground *pParams);
     virtual FX_BOOL             DrawText(CFWL_ThemeText *pParams);
     virtual FX_LPVOID   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);
@@ skipping 33 matching lines @@
     FX_DWORD            m_dwValue;
     CFX_RectF           m_rtMargin;
     FX_DWORD            m_dwThemeID;
     CFX_Matrix          _ctm;
 };
 FX_BOOL FWLTHEME_Init();
 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();
     static FX_BOOL IsInstance();
     static void DestroyInstance();
     virtual ~CFWL_ArrowData();
     void SetColorData(FX_DWORD  dwID);
 
-    class CColorData : public CFX_Object
+    class CColorData
     {
     public:
         FX_ARGB clrBorder[4];
         FX_ARGB clrStart[4];
         FX_ARGB clrEnd[4];
         FX_ARGB clrSign[4];
     } *m_pColorData;
 protected:
     CFWL_ArrowData();
     static CFWL_ArrowData *m_pInstance;
 };
-class CFWL_FontData : public CFX_Object
+class CFWL_FontData
 {
 public:
     CFWL_FontData();
     virtual ~CFWL_FontData();
     FX_BOOL Equal(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage);
     FX_BOOL LoadFont(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage);
     IFX_Font*  GetFont() const
     {
         return m_pFont;
     }
 protected:
     CFX_WideString                      m_wsFamily;
     FX_DWORD                            m_dwStyles;
     FX_DWORD                            m_dwCodePage;
     IFX_Font                            *m_pFont;
     IFX_FontMgr                         *m_pFontMgr;
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
     IFX_FontSourceEnum          *m_pFontSource;
 #endif
 };
-class CFWL_FontManager : public CFX_Object
+class CFWL_FontManager
 {
 public:
     CFWL_FontManager();
     virtual ~CFWL_FontManager();
     IFX_Font* FindFont(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD dwCodePage);
 protected:
     CFX_PtrArray    m_arrFonts;
 };
 CFWL_FontManager *FWL_GetFontManager();
 #endif