Merge to XFA: Kill CFX_Object.

xfa/include/fwl/lightwidget/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_LIGHT_H
 #define _FWL_WIDGET_LIGHT_H
 class CFWL_WidgetMgr;
 class CFWL_Message;
 class CFWL_Event;
 class IFWL_WidgetDelegate;
 class IFWL_Widget;
 class CFWL_Widget;
 class CFWL_WidgetDelegate;
-class CFWL_WidgetProperties : public CFX_Object
+class CFWL_WidgetProperties
 {
 public:
     CFWL_WidgetProperties()
     {
         m_ctmOnParent.Reset();
         m_rtWidget.Set(0, 0, 0, 0);
         m_dwStyles              = FWL_WGTSTYLE_Child;
         m_dwStyleExes   = 0;
         m_dwStates              = 0;
         m_pParent               = NULL;
         m_pOwner                = NULL;
     }
     CFX_WideString              m_wsWindowclass;
     CFX_Matrix                  m_ctmOnParent;
     CFX_RectF                   m_rtWidget;
     FX_DWORD                    m_dwStyles;
     FX_DWORD                    m_dwStyleExes;
     FX_DWORD                    m_dwStates;
     CFWL_Widget                 *m_pParent;
     CFWL_Widget                 *m_pOwner;
 };
-class CFWL_Widget : public CFX_Object
+class CFWL_Widget
 {
 public:
     IFWL_Widget*        GetWidget();
     FX_DWORD            Release();
     CFWL_Widget*        Retain();
     FX_DWORD            GetRefCount() const;
     FWL_ERR                     GetClassName(CFX_WideString &wsClass) const;
     FX_DWORD            GetClassID() const;
     virtual FX_BOOL     IsInstance(FX_WSTR wsClass) const;
 protected:
@@ skipping 33 matching lines @@
     CFWL_Widget();
     virtual ~CFWL_Widget();
     void                RegisterEventTarget(CFWL_Widget *pEventSource = NULL, FX_DWORD dwFilter = FWL_EVENT_ALL_MASK);
     void                DispatchEvent(CFWL_Event *pEvent);
     CFX_SizeF   CalcTextSize(const CFX_WideString &wsText, FX_BOOL bMultiLine = FALSE, FX_INT32 iLineWidth = -1);
     IFWL_Widget                 *m_pImp;
     IFWL_WidgetDelegate *m_pDelegate;
     CFWL_WidgetMgr              *m_pWidgetMgr;
     CFWL_WidgetProperties *m_pProperties;
 };
-class CFWL_WidgetDelegate : public CFX_Object, public IFWL_WidgetDelegate
+class CFWL_WidgetDelegate
 {
 public:
     CFWL_WidgetDelegate();
     virtual ~CFWL_WidgetDelegate();
     virtual FX_INT32    OnProcessMessage(CFWL_Message *pMessage);
     virtual FWL_ERR             OnProcessEvent(CFWL_Event *pEvent);
     virtual FWL_ERR             OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL);
 };
 #endif