Rename common methods between ifwl and cfwl.

xfa/fwl/core/cfwl_listbox.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_listbox.h"
 
 #include <memory>
 #include <utility>
@@ skipping 64 matching lines @@
 
 int32_t CFWL_ListBox::GetSelIndex(int32_t nIndex) {
   return GetWidget() ? ToListBox(GetWidget())->GetSelIndex(nIndex) : 0;
 }
 
 void CFWL_ListBox::SetSelItem(CFWL_ListItem* pItem, bool bSelect) {
   if (GetWidget())
     ToListBox(GetWidget())->SetSelItem(pItem, bSelect);
 }
 
-void CFWL_ListBox::GetItemText(CFWL_ListItem* pItem, CFX_WideString& wsText) {
-  if (GetWidget())
-    ToListBox(GetWidget())->GetItemText(pItem, wsText);
-}
-
-CFWL_ListItem* CFWL_ListBox::GetItem(int32_t nIndex) {
-  if (nIndex < 0 || nIndex >= CountItems(nullptr))
-    return nullptr;
-  return m_ItemArray[nIndex].get();
+void CFWL_ListBox::GetItemText(IFWL_Widget* pWidget,

[npm, 2016/11/22 16:36:16]

Widget not being used in this method

[dsinclair, 2016/11/22 16:42:15]

It isn't being used in a bunch of methods. I'm going to cleanup the delegate
params in a followup once I get the classes merged.

+                               CFWL_ListItem* pItem,
+                               CFX_WideString& wsText) {
+  if (pItem)
+    wsText = static_cast<CFWL_ListItem*>(pItem)->m_wsText;
 }
 
 uint32_t CFWL_ListBox::GetItemStates(CFWL_ListItem* pItem) {
   if (!pItem)
     return 0;
   return pItem->m_dwStates | pItem->m_dwCheckState;
 }
 
 int32_t CFWL_ListBox::CountItems(const IFWL_Widget* pWidget) const {
   return pdfium::CollectionSize<int32_t>(m_ItemArray);
@@ skipping 13 matching lines @@
         return candidate.get() == static_cast<CFWL_ListItem*>(pItem);
       });
   return it != m_ItemArray.end() ? it - m_ItemArray.begin() : -1;
 }
 
 uint32_t CFWL_ListBox::GetItemStyles(IFWL_Widget* pWidget,
                                      CFWL_ListItem* pItem) {
   return pItem ? static_cast<CFWL_ListItem*>(pItem)->m_dwStates : 0;
 }
 
-void CFWL_ListBox::GetItemText(IFWL_Widget* pWidget,
-                               CFWL_ListItem* pItem,
-                               CFX_WideString& wsText) {
-  if (pItem)
-    wsText = static_cast<CFWL_ListItem*>(pItem)->m_wsText;
-}
-
 void CFWL_ListBox::GetItemRect(IFWL_Widget* pWidget,
                                CFWL_ListItem* pItem,
                                CFX_RectF& rtItem) {
   if (pItem)
     rtItem = static_cast<CFWL_ListItem*>(pItem)->m_rtItem;
 }
 
 void* CFWL_ListBox::GetItemData(IFWL_Widget* pWidget, CFWL_ListItem* pItem) {
   return pItem ? static_cast<CFWL_ListItem*>(pItem)->m_pData : nullptr;
 }
@@ skipping 32 matching lines @@
 uint32_t CFWL_ListBox::GetItemCheckState(IFWL_Widget* pWidget,
                                          CFWL_ListItem* pItem) {
   return static_cast<CFWL_ListItem*>(pItem)->m_dwCheckState;
 }
 
 void CFWL_ListBox::SetItemCheckState(IFWL_Widget* pWidget,
                                      CFWL_ListItem* pItem,
                                      uint32_t dwCheckState) {
   static_cast<CFWL_ListItem*>(pItem)->m_dwCheckState = dwCheckState;
 }