Merge to XFA: Kill CFX_Object.

xfa/include/fwl/lightwidget/combobox.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_COMBOBOX_LIGHT_H
 #define _FWL_COMBOBOX_LIGHT_H
 class CFWL_Widget;
 class CFWL_WidgetProperties;
@@ skipping 78 matching lines @@
         virtual FX_DWORD                GetItemCheckState(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);
         virtual FWL_ERR                 SetItemCheckState(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_DWORD dwCheckState);
         virtual FX_FLOAT                GetListHeight(IFWL_Widget *pWidget);
 
         CFX_PtrArray    m_arrItem;
         FX_FLOAT                m_fMaxListHeight;
         FX_FLOAT                m_fItemHeight;
     };
     CFWL_ComboBoxDP m_comboBoxData;
 };
-class CFWL_ComboBoxItem : public CFX_Object
+class CFWL_ComboBoxItem
 {
 public:
     CFWL_ComboBoxItem()
     {
         m_pDIB = NULL;
         m_pData = NULL;
     }
     CFX_RectF           m_rtItem;
     FX_DWORD            m_dwStyles;
     CFX_WideString      m_wsText;
     CFX_DIBitmap        *m_pDIB;
     FX_DWORD            m_dwCheckState;
     CFX_RectF           m_rtCheckBox;
     FX_LPVOID           m_pData;
 };
 #endif