| Index: xfa/fxfa/app/xfa_ffchoicelist.cpp
|
| diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp
|
| index 7a207304108df714ac3d516108f3378d0fecd0f2..93e270da3e0411ad57f9ef5bc56bd670aac7158f 100644
|
| --- a/xfa/fxfa/app/xfa_ffchoicelist.cpp
|
| +++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp
|
| @@ -63,7 +63,7 @@ bool CXFA_FFListBox::LoadWidget() {
|
| m_pDataAcc->GetSelectedItems(iSelArray);
|
| int32_t iSelCount = iSelArray.GetSize();
|
| for (int32_t j = 0; j < iSelCount; j++) {
|
| - IFWL_ListItem* item = pListBox->GetItem(iSelArray[j]);
|
| + CFWL_ListItem* item = pListBox->GetItem(iSelArray[j]);
|
| pListBox->SetSelItem(item, true);
|
| }
|
| m_pNormalWidget->UnlockUpdate();
|
| @@ -97,7 +97,7 @@ bool CXFA_FFListBox::IsDataChanged() {
|
| return true;
|
|
|
| for (int32_t i = 0; i < iSels; ++i) {
|
| - IFWL_ListItem* hlistItem = pListBox->GetItem(iSelArray[i]);
|
| + CFWL_ListItem* hlistItem = pListBox->GetItem(iSelArray[i]);
|
| if (!(pListBox->GetItemStates(hlistItem) & FWL_ITEMSTATE_LTB_Selected))
|
| return true;
|
| }
|
| @@ -133,12 +133,12 @@ bool CXFA_FFListBox::UpdateFWLData() {
|
| return false;
|
| }
|
| CFWL_ListBox* pListBox = ((CFWL_ListBox*)m_pNormalWidget);
|
| - CFX_ArrayTemplate<IFWL_ListItem*> selItemArray;
|
| + CFX_ArrayTemplate<CFWL_ListItem*> selItemArray;
|
| CFX_Int32Array iSelArray;
|
| m_pDataAcc->GetSelectedItems(iSelArray);
|
| int32_t iSelCount = iSelArray.GetSize();
|
| for (int32_t j = 0; j < iSelCount; j++) {
|
| - IFWL_ListItem* lpItemSel = pListBox->GetSelItem(iSelArray[j]);
|
| + CFWL_ListItem* lpItemSel = pListBox->GetSelItem(iSelArray[j]);
|
| selItemArray.Add(lpItemSel);
|
| }
|
| pListBox->SetSelItem(pListBox->GetSelItem(-1), false);
|
| @@ -162,7 +162,7 @@ void CXFA_FFListBox::OnSelectChanged(IFWL_Widget* pWidget,
|
| m_pDataAcc->ProcessEvent(XFA_ATTRIBUTEENUM_Change, &eParam);
|
| }
|
| void CXFA_FFListBox::SetItemState(int32_t nIndex, bool bSelected) {
|
| - IFWL_ListItem* item = ((CFWL_ListBox*)m_pNormalWidget)->GetSelItem(nIndex);
|
| + CFWL_ListItem* item = ((CFWL_ListBox*)m_pNormalWidget)->GetSelItem(nIndex);
|
| ((CFWL_ListBox*)m_pNormalWidget)->SetSelItem(item, bSelected);
|
| m_pNormalWidget->Update();
|
| AddInvalidateRect();
|
|
|