Remove CFX_PtrArray from xfa's combobox.h.

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;
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_COMBOBOX_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_COMBOBOX_H_
+
+#include <memory>
+#include <vector>
+
+#include "xfa/include/fwl/basewidget/fwl_combobox.h"
+#include "xfa/include/fwl/lightwidget/widget.h"
+
 class CFWL_WidgetProperties;
 class IFWL_ComboBoxDP;
-class CFWL_ComboBox;
 class CFWL_ComboBoxDP;
 class CFWL_ComboBoxItem;
+
 class CFWL_ComboBox : public CFWL_Widget {
  public:
   static CFWL_ComboBox* Create();
   FWL_ERR Initialize(const CFWL_WidgetProperties* pProperties = NULL);
   int32_t AddString(const CFX_WideStringC& wsText);
   int32_t AddString(const CFX_WideStringC& wsText, CFX_DIBitmap* pIcon);
-  int32_t RemoveAt(int32_t iIndex);
-  int32_t RemoveAll();
+  bool RemoveAt(int32_t iIndex);  // Returns false iff |iIndex| out of range.
+  void RemoveAll();
   int32_t CountItems();
   FWL_ERR GetTextByIndex(int32_t iIndex, CFX_WideString& wsText);
   int32_t GetCurSel();
   FWL_ERR SetCurSel(int32_t iSel);
   FWL_ERR SetEditText(const CFX_WideStringC& wsText);
   int32_t GetEditTextLength() const;
   FWL_ERR GetEditText(CFX_WideString& wsText,
                       int32_t nStart = 0,
                       int32_t nCount = -1) const;
   FWL_ERR SetEditSelRange(int32_t nStart, int32_t nCount = -1);
@@ skipping 73 matching lines @@
     virtual FWL_ERR SetItemCheckRect(IFWL_Widget* pWidget,
                                      FWL_HLISTITEM hItem,
                                      const CFX_RectF& rtCheck);
     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;
+    std::vector<std::unique_ptr<CFWL_ComboBoxItem>> m_ItemArray;
     FX_FLOAT m_fMaxListHeight;
     FX_FLOAT m_fItemHeight;
   };
   CFWL_ComboBoxDP m_comboBoxData;
 };
+
 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;
   void* m_pData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_COMBOBOX_H_