IFWL cleanup in the Combo classes

xfa/fwl/core/cfwl_combobox.cpp

 // 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
 
 #include "xfa/fwl/core/cfwl_combobox.h"
 
 #include <utility>
 
@@ skipping 28 matching lines @@
 }
 
 int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText) {
   std::unique_ptr<CFWL_ListItem> pItem(new CFWL_ListItem);
   pItem->m_wsText = wsText;
   pItem->m_dwStyles = 0;
   m_ItemArray.push_back(std::move(pItem));
   return m_ItemArray.size() - 1;
 }
 
-int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText,
-                                 CFX_DIBitmap* pIcon) {
-  std::unique_ptr<CFWL_ListItem> pItem(new CFWL_ListItem);
-  pItem->m_wsText = wsText;
-  pItem->m_dwStyles = 0;
-  pItem->m_pDIB = pIcon;
-  m_ItemArray.push_back(std::move(pItem));
-  return m_ItemArray.size() - 1;
-}
-
 bool CFWL_ComboBox::RemoveAt(int32_t iIndex) {
   if (iIndex < 0 || static_cast<size_t>(iIndex) >= m_ItemArray.size()) {
     return false;
   }
   m_ItemArray.erase(m_ItemArray.begin() + iIndex);
   return true;
 }
 
 void CFWL_ComboBox::RemoveAll() {
   m_ItemArray.clear();
 }
 
-int32_t CFWL_ComboBox::CountItems() {
-  return CountItems(GetWidget());
-}
-
-FWL_Error CFWL_ComboBox::GetTextByIndex(int32_t iIndex,
-                                        CFX_WideString& wsText) {
+void CFWL_ComboBox::GetTextByIndex(int32_t iIndex, CFX_WideString& wsText) {

[npm, 2016/11/10 19:42:38]

Can we make these Get methods actually return what they get as Tom
suggested in another CL? Or is this in followup?

   CFWL_ListItem* pItem =
       static_cast<CFWL_ListItem*>(GetItem(m_pIface.get(), iIndex));
-  if (!pItem)
-    return FWL_Error::Indefinite;
-  wsText = pItem->m_wsText;
-  return FWL_Error::Succeeded;
+  if (pItem)
+    wsText = pItem->m_wsText;
 }
 
 int32_t CFWL_ComboBox::GetCurSel() {
   return GetWidget() ? ToComboBox(GetWidget())->GetCurSel() : -1;
 }
 
-FWL_Error CFWL_ComboBox::SetCurSel(int32_t iSel) {
-  return GetWidget() ? ToComboBox(GetWidget())->SetCurSel(iSel)
-                     : FWL_Error::Indefinite;
+void CFWL_ComboBox::SetCurSel(int32_t iSel) {
+  if (GetWidget())
+    ToComboBox(GetWidget())->SetCurSel(iSel);
 }
 
 void CFWL_ComboBox::SetEditText(const CFX_WideString& wsText) {
   if (GetWidget())
     ToComboBox(GetWidget())->SetEditText(wsText);
 }
 
-int32_t CFWL_ComboBox::GetEditTextLength() const {
-  return GetWidget() ? ToComboBox(GetWidget())->GetEditTextLength() : 0;
+void CFWL_ComboBox::GetEditText(CFX_WideString& wsText,
+                                int32_t nStart,
+                                int32_t nCount) const {
+  if (GetWidget())
+    ToComboBox(GetWidget())->GetEditText(wsText, nStart, nCount);
 }
 
-FWL_Error CFWL_ComboBox::GetEditText(CFX_WideString& wsText,
-                                     int32_t nStart,
-                                     int32_t nCount) const {
-  return GetWidget()
-             ? ToComboBox(GetWidget())->GetEditText(wsText, nStart, nCount)
-             : FWL_Error::Indefinite;
-}
-
-FWL_Error CFWL_ComboBox::SetEditSelRange(int32_t nStart, int32_t nCount) {
-  return GetWidget() ? ToComboBox(GetWidget())->SetEditSelRange(nStart, nCount)
-                     : FWL_Error::Indefinite;
-}
-
-int32_t CFWL_ComboBox::GetEditSelRange(int32_t nIndex, int32_t& nStart) {
-  return GetWidget() ? ToComboBox(GetWidget())->GetEditSelRange(nIndex, nStart)
-                     : 0;
-}
-
-int32_t CFWL_ComboBox::GetEditLimit() {
-  return GetWidget() ? ToComboBox(GetWidget())->GetEditLimit() : 0;
-}
-
-FWL_Error CFWL_ComboBox::SetEditLimit(int32_t nLimit) {
-  return GetWidget() ? ToComboBox(GetWidget())->SetEditLimit(nLimit)
-                     : FWL_Error::Indefinite;
-}
-
-bool CFWL_ComboBox::EditRedo(const IFDE_TxtEdtDoRecord* pRecord) {
-  return GetWidget() ? ToComboBox(GetWidget())->EditRedo(pRecord) : false;
-}
-
-bool CFWL_ComboBox::EditUndo(const IFDE_TxtEdtDoRecord* pRecord) {
-  return GetWidget() ? ToComboBox(GetWidget())->EditUndo(pRecord) : false;
-}
-
-FWL_Error CFWL_ComboBox::SetMaxListHeight(FX_FLOAT fMaxHeight) {
-  m_fMaxListHeight = fMaxHeight;
-  return FWL_Error::Succeeded;
-}
-
-FWL_Error CFWL_ComboBox::SetItemData(int32_t iIndex, void* pData) {
-  CFWL_ListItem* pItem =
-      static_cast<CFWL_ListItem*>(GetItem(m_pIface.get(), iIndex));
-  if (!pItem)
-    return FWL_Error::Indefinite;
-  pItem->m_pData = pData;
-  return FWL_Error::Succeeded;
-}
-
-void* CFWL_ComboBox::GetItemData(int32_t iIndex) {
-  CFWL_ListItem* pItem =
-      static_cast<CFWL_ListItem*>(GetItem(m_pIface.get(), iIndex));
-  return pItem ? pItem->m_pData : nullptr;
-}
-
-void CFWL_ComboBox::SetListTheme(IFWL_ThemeProvider* pTheme) {
-  ToComboBox(GetWidget())->GetListBoxt()->SetThemeProvider(pTheme);
-}
-
-bool CFWL_ComboBox::AfterFocusShowDropList() {
-  return ToComboBox(GetWidget())->AfterFocusShowDropList();
-}
-
-FWL_Error CFWL_ComboBox::OpenDropDownList(bool bActivate) {
-  return ToComboBox(GetWidget())->OpenDropDownList(bActivate);
+void CFWL_ComboBox::OpenDropDownList(bool bActivate) {
+  ToComboBox(GetWidget())->OpenDropDownList(bActivate);
 }
 
 bool CFWL_ComboBox::EditCanUndo() {
   return GetWidget() ? ToComboBox(GetWidget())->EditCanUndo() : false;
 }
 
 bool CFWL_ComboBox::EditCanRedo() {
   return GetWidget() ? ToComboBox(GetWidget())->EditCanRedo() : false;
 }
 
@@ skipping 34 matching lines @@
 }
 
 bool CFWL_ComboBox::EditDelete() {
   return GetWidget() ? ToComboBox(GetWidget())->EditDelete() : false;
 }
 
 bool CFWL_ComboBox::EditDeSelect() {
   return GetWidget() ? ToComboBox(GetWidget())->EditDeSelect() : false;
 }
 
-FWL_Error CFWL_ComboBox::GetBBox(CFX_RectF& rect) {
-  return GetWidget() ? ToComboBox(GetWidget())->GetBBox(rect)
-                     : FWL_Error::Indefinite;
+void CFWL_ComboBox::GetBBox(CFX_RectF& rect) {
+  if (GetWidget())
+    ToComboBox(GetWidget())->GetBBox(rect);
 }
 
 void CFWL_ComboBox::EditModifyStylesEx(uint32_t dwStylesExAdded,
                                        uint32_t dwStylesExRemoved) {
   if (GetWidget()) {
     ToComboBox(GetWidget())
         ->EditModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
   }
 }
 
@@ skipping 109 matching lines @@
 
 void CFWL_ComboBox::SetItemCheckState(IFWL_Widget* pWidget,
                                       CFWL_ListItem* pItem,
                                       uint32_t dwCheckState) {
   static_cast<CFWL_ListItem*>(pItem)->m_dwCheckState = dwCheckState;
 }
 
 FX_FLOAT CFWL_ComboBox::GetListHeight(IFWL_Widget* pWidget) {
   return m_fMaxListHeight;
 }