Merge to XFA: Kill CFX_Object.

xfa/include/fwl/core/fwl_widget.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_WIDGET_H
 #define _FWL_WIDGET_H
 class IFWL_Target;
 class IFWL_ThemeProvider;
@@ skipping 45 matching lines @@
     IFWL_NoteThread*            GetOwnerThread() const;
     CFX_SizeF                           GetOffsetFromParent(IFWL_Widget *pParent);
 };
 class IFWL_WidgetDelegate
 {
 public:
     virtual FX_INT32    OnProcessMessage(CFWL_Message *pMessage) = 0;
     virtual FWL_ERR             OnProcessEvent(CFWL_Event *pEvent) = 0;
     virtual FWL_ERR             OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL) = 0;
 };
-class CFWL_WidgetImpProperties : public CFX_Object
+class CFWL_WidgetImpProperties
 {
 public:
     CFWL_WidgetImpProperties()
     {
         m_ctmOnParent.Reset();
         m_rtWidget.Set(0, 0, 0, 0);
         m_dwStyles              = FWL_WGTSTYLE_Child;
         m_dwStyleExes   = 0;
         m_dwStates              = 0;
         m_pThemeProvider = NULL;
@@ skipping 36 matching lines @@
 typedef struct _FWL_ACCEL {
     FX_DWORD dwKey;
     FX_DWORD dwCmd;
 } FWL_ACCEL;
 typedef CFX_MapPtrTemplate <FX_DWORD, FX_DWORD> CFX_MapAccelerators;
 FWL_ERR FWL_Accelerator_SetApp(CFX_MapAccelerators *pMapAccel);
 FWL_ERR FWL_Accelerator_SetThread(CFX_MapAccelerators *pMapAccel);
 FWL_ERR FWL_Accelerator_SetForm(IFWL_Form *pFrom, CFX_MapAccelerators *pMapAccel);
 FWL_ERR FWL_EnabelWidget(IFWL_Widget *widget, FX_BOOL bEnable);
 #endif