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);
   }
   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));

[Tom Sepez, 2016/11/22 17:10:24]

nit: static_cast. (two places plus previous lines).  Local might help.

[dsinclair, 2016/11/22 17:24:37]

Done.

   }
   m_pNormalWidget->Update();
   AddInvalidateRect();