Rename common methods between ifwl and cfwl.

xfa/fxfa/app/xfa_ffchoicelist.cpp

Index: xfa/fxfa/app/xfa_ffchoicelist.cpp
diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp
index 63ed7c46d340c1dffa67153b91a2738d9733497e..fe26e041a8ee1f1c101315b952e820a61e9c4935 100644
--- a/xfa/fxfa/app/xfa_ffchoicelist.cpp
+++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp
@@ -66,7 +66,7 @@ bool CXFA_FFListBox::LoadWidget() {
   m_pDataAcc->GetSelectedItems(iSelArray);
   int32_t iSelCount = iSelArray.GetSize();
   for (int32_t j = 0; j < iSelCount; j++) {
-    CFWL_ListItem* item = pListBox->GetItem(iSelArray[j]);
+    CFWL_ListItem* item = pListBox->GetItem(nullptr, iSelArray[j]);
     pListBox->SetSelItem(item, true);
   }
   m_pNormalWidget->UnlockUpdate();
@@ -100,7 +100,7 @@ bool CXFA_FFListBox::IsDataChanged() {
     return true;
 
   for (int32_t i = 0; i < iSels; ++i) {
-    CFWL_ListItem* hlistItem = pListBox->GetItem(iSelArray[i]);
+    CFWL_ListItem* hlistItem = pListBox->GetItem(nullptr, iSelArray[i]);
     if (!(pListBox->GetItemStates(hlistItem) & FWL_ITEMSTATE_LTB_Selected))
       return true;
   }
@@ -160,7 +160,7 @@ void CXFA_FFListBox::OnSelectChanged(IFWL_Widget* pWidget,
   CFWL_ListBox* pListBox = (CFWL_ListBox*)m_pNormalWidget;
   int32_t iSels = pListBox->CountSelItems();
   if (iSels > 0) {
-    pListBox->GetItemText(pListBox->GetSelItem(0), eParam.m_wsNewText);
+    pListBox->GetItemText(nullptr, pListBox->GetSelItem(0), eParam.m_wsNewText);

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

It's unclear to me why this is the same.

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

pListBox had two GetItemText() methods. First first took the IFWL_Widget as the
first param, the second didn't. I removed the version that didn't and changed
these to pass a null widget.

[npm, 2016/11/22 16:52:13]

Original:
if (GetWidget()) ToListBox(GetWidget())->GetItemText(pItem, wsText);
The GetITemText is from IFWL_ListBox, because that's what ToListBox returns.

Now:
if (pItem) wsText = static_cast<CFWL_ListItem*>(pItem)->m_wsText;

Not even sure if the if's will always match...

[dsinclair, 2016/11/22 16:53:49]

Right, but if you look at GetItemText in ListBox, it proxies the request back
this class passing this as the widget. We don't use the widget so nullptr should
be fine until I can remove the param.

   }
   m_pDataAcc->ProcessEvent(XFA_ATTRIBUTEENUM_Change, &eParam);
 }
@@ -182,7 +182,8 @@ void CXFA_FFListBox::DeleteItem(int32_t nIndex) {
     ((CFWL_ListBox*)m_pNormalWidget)->DeleteAll();
   } else {
     ((CFWL_ListBox*)m_pNormalWidget)
-        ->DeleteString(((CFWL_ListBox*)m_pNormalWidget)->GetItem(nIndex));
+        ->DeleteString(
+            ((CFWL_ListBox*)m_pNormalWidget)->GetItem(nullptr, nIndex));
   }
   m_pNormalWidget->Update();
   AddInvalidateRect();