Continue IFWL cleanup

xfa/fwl/core/ifwl_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/ifwl_combobox.h"
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/cfde_txtedtengine.h"
@@ skipping 273 matching lines @@
 
 FWL_Error IFWL_ComboBox::GetEditText(CFX_WideString& wsText,
                                      int32_t nStart,
                                      int32_t nCount) const {
   if (m_pEdit) {
     return m_pEdit->GetText(wsText, nStart, nCount);
   } else if (m_pListBox) {
     IFWL_ComboBoxDP* pData =
         static_cast<IFWL_ComboBoxDP*>(m_pProperties->m_pDataProvider);
     CFWL_ListItem* hItem = pData->GetItem(this, m_iCurSel);
-    return m_pListBox->GetItemText(hItem, wsText);
+    m_pListBox->GetItemText(hItem, wsText);
+    return FWL_Error::Succeeded;
   }
   return FWL_Error::Indefinite;
 }
 
 FWL_Error IFWL_ComboBox::SetEditSelRange(int32_t nStart, int32_t nCount) {
   if (!m_pEdit)
     return FWL_Error::Indefinite;
   m_pEdit->ClearSelected();
   m_pEdit->AddSelRange(nStart, nCount);
   return FWL_Error::Succeeded;
@@ skipping 196 matching lines @@
                         m_fComboFormHandler);
       }
     }
     m_pComboBoxProxy->SetWidgetRect(m_rtProxy);
     m_pComboBoxProxy->Update();
     m_pListBox->SetWidgetRect(m_rtList);
     m_pListBox->Update();
     CFWL_EvtCmbPreDropDown ev;
     ev.m_pSrcTarget = this;
     DispatchEvent(&ev);
-    m_fItemHeight = m_pListBox->m_fItemHeight;
+    m_fItemHeight = m_pListBox->GetItemHeight();
     m_pListBox->SetFocus(true);
     m_pComboBoxProxy->DoModal();
     m_pListBox->SetFocus(false);
   } else {
     m_pComboBoxProxy->EndDoModal();
     CFWL_EvtCmbCloseUp ev;
     ev.m_pSrcTarget = this;
     DispatchEvent(&ev);
     m_bLButtonDown = false;
     m_pListBox->m_bNotifyOwner = true;
@@ skipping 212 matching lines @@
     CFWL_EvtCmbPreDropDown preEvent;
     preEvent.m_pSrcTarget = this;
     DispatchEvent(&preEvent);
     IFWL_ComboList* pComboList = m_pListBox.get();
     int32_t iItems = pComboList->CountItems();
     if (iItems < 1) {
       return;
     }
     ReSetListItemAlignment();
     pComboList->ChangeSelected(m_iCurSel);
-    FX_FLOAT fItemHeight = pComboList->GetItemHeigt();
+    FX_FLOAT fItemHeight = pComboList->CalcItemHeight();
     FX_FLOAT fBorder = GetBorderSize();
     FX_FLOAT fPopupMin = 0.0f;
     if (iItems > 3) {
       fPopupMin = fItemHeight * 3 + fBorder * 2;
     }
     FX_FLOAT fPopupMax = fItemHeight * iItems + fBorder * 2;
     CFX_RectF rtList;
     rtList.left = m_rtClient.left;
     rtList.width = m_pProperties->m_rtWidget.width;
     rtList.top = 0;
@@ skipping 496 matching lines @@
       else
         iCurSel++;
     }
     m_iCurSel = iCurSel;
     SynchrEditText(m_iCurSel);
     return;
   }
   if (m_pEdit)
     m_pEdit->GetDelegate()->OnProcessMessage(pMsg);
 }