Merge to XFA: Kill CFX_Object.

xfa/include/fwl/theme/formtp.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_FORM_THEMEPROVIDER_H
 #define _FWL_FORM_THEMEPROVIDER_H
 class CFWL_WidgetTP;
 class CFWL_FormTP;
@@ skipping 30 matching lines @@
     void SetThemeData(FX_DWORD dwID);
     void TransModeColor(FX_ARGB clrFore, FX_ARGB &clrBack);
     void DeactiveForm();
     void InitCaption(FX_BOOL bActive);
     CFX_DIBitmap        *m_pActiveBitmap;
     CFX_DIBitmap        *m_pDeactivebitmap;
     CFX_RectF           m_rtDisCaption;
     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];
         FX_ARGB clrHeadEdgeTop[2][3];
         FX_ARGB clrHeadEdgeBottom[2][3];
         FX_ARGB clrCloseBtBKStart[2][3];
         FX_ARGB clrCloseBtBKEnd[2][3];
         FX_ARGB clrCloseBtEdgeLight[2][3];
         FX_ARGB clrCloseBtEdgeDark[2][3];
         FX_ARGB clrNormalBtBKStart[2][3];
         FX_ARGB clrNormalBtBKEnd[2][3];
         FX_ARGB clrNormalBtEdgeLight[2][3];
         FX_ARGB clrNormalBtEdgeDark[2][3];
         FX_ARGB clrBtnEdgeOut[2];
         FX_ARGB clrBtnCornerLight[2][3];
         FX_ARGB clrHeadText[2];
         FX_ARGB clrFormBorder[2][5];
         FX_ARGB clrFormBorderLight[2];
         FX_ARGB clrTransWhite;
     } *m_pThemeData;
 };
 #endif