Cleanup FWL default values part II.

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 <algorithm>
 #include <memory>
@@ skipping 282 matching lines @@
 }
 
 void CFWL_ComboBox::SetEditText(const CFX_WideString& wsText) {
   if (!m_pEdit)
     return;
 
   m_pEdit->SetText(wsText);
   m_pEdit->Update();
 }
 
-CFX_WideString CFWL_ComboBox::GetEditText(int32_t nStart,
-                                          int32_t nCount) const {
-  if (m_pEdit) {
-    return m_pEdit->GetText(nStart, nCount);
-  }
+CFX_WideString CFWL_ComboBox::GetEditText() const {
+  if (m_pEdit)
+    return m_pEdit->GetText();
   if (!m_pListBox)
     return L"";
 
   CFWL_ListItem* hItem = m_pListBox->GetItem(this, m_iCurSel);
   return m_pListBox->GetDataProviderItemText(hItem);
 }
 
 void CFWL_ComboBox::OpenDropDownList(bool bActivate) {
   ShowDropList(bActivate);
 }
@@ skipping 302 matching lines @@
 
     CFWL_ComboList* pComboList = m_pListBox.get();
     int32_t iItems = pComboList->CountItems(nullptr);
     if (iItems < 1)
       return;
 
     ResetListItemAlignment();
     pComboList->ChangeSelected(m_iCurSel);
 
     FX_FLOAT fItemHeight = pComboList->CalcItemHeight();
-    FX_FLOAT fBorder = GetBorderSize();
+    FX_FLOAT fBorder = GetBorderSize(true);
     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;
     rtList.height = 0;
@@ skipping 472 matching lines @@
       else
         iCurSel++;
     }
     m_iCurSel = iCurSel;
     SyncEditText(m_iCurSel);
     return;
   }
   if (m_pEdit)
     m_pEdit->GetDelegate()->OnProcessMessage(pMsg);
 }