| Index: xfa/fwl/core/cfwl_listbox.cpp
|
| diff --git a/xfa/fwl/core/cfwl_listbox.cpp b/xfa/fwl/core/cfwl_listbox.cpp
|
| index 4c933bf24eef806bb724498b3d3a226ad9d8e8f1..7da49efbb0fc0d006ef86cff95cdecb992346e50 100644
|
| --- a/xfa/fwl/core/cfwl_listbox.cpp
|
| +++ b/xfa/fwl/core/cfwl_listbox.cpp
|
| @@ -82,15 +82,11 @@ void CFWL_ListBox::SetSelItem(CFWL_ListItem* pItem, bool bSelect) {
|
| 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,
|
| + CFWL_ListItem* pItem,
|
| + CFX_WideString& wsText) {
|
| + if (pItem)
|
| + wsText = static_cast<CFWL_ListItem*>(pItem)->m_wsText;
|
| }
|
|
|
| uint32_t CFWL_ListBox::GetItemStates(CFWL_ListItem* pItem) {
|
| @@ -124,13 +120,6 @@ uint32_t CFWL_ListBox::GetItemStyles(IFWL_Widget* pWidget,
|
| 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) {
|
|
|