| Index: xfa/fwl/core/cfwl_listbox.h
|
| diff --git a/xfa/fwl/core/cfwl_listbox.h b/xfa/fwl/core/cfwl_listbox.h
|
| index e28f8df7bbf261199a8fae02bdf8b388ba983a9b..ff24e5a30832012ea2ed8930bd300dbfbe5dd041 100644
|
| --- a/xfa/fwl/core/cfwl_listbox.h
|
| +++ b/xfa/fwl/core/cfwl_listbox.h
|
| @@ -29,9 +29,9 @@ class CFWL_ListBox : public CFWL_Widget, public IFWL_ListBoxDP {
|
| int32_t CountSelItems();
|
| CFWL_ListItem* GetSelItem(int32_t nIndexSel);
|
| int32_t GetSelIndex(int32_t nIndex);
|
| - FWL_Error SetSelItem(CFWL_ListItem* pItem, bool bSelect = true);
|
| - FWL_Error GetItemText(CFWL_ListItem* pItem, CFX_WideString& wsText);
|
| - FWL_Error GetScrollPos(FX_FLOAT& fPos, bool bVert = true);
|
| + void SetSelItem(CFWL_ListItem* pItem, bool bSelect = true);
|
| + void GetItemText(CFWL_ListItem* pItem, CFX_WideString& wsText);
|
| + void GetScrollPos(FX_FLOAT& fPos, bool bVert = true);
|
| FWL_Error SetItemHeight(FX_FLOAT fItemHeight);
|
| CFWL_ListItem* GetFocusItem();
|
| FWL_Error SetFocusItem(CFWL_ListItem* pItem);
|
| @@ -56,36 +56,36 @@ class CFWL_ListBox : public CFWL_Widget, public IFWL_ListBoxDP {
|
| CFWL_ListItem* pItem,
|
| int32_t nIndex) override;
|
| uint32_t GetItemStyles(IFWL_Widget* pWidget, CFWL_ListItem* pItem) override;
|
| - FWL_Error GetItemText(IFWL_Widget* pWidget,
|
| - CFWL_ListItem* pItem,
|
| - CFX_WideString& wsText) override;
|
| - FWL_Error GetItemRect(IFWL_Widget* pWidget,
|
| - CFWL_ListItem* pItem,
|
| - CFX_RectF& rtItem) override;
|
| + void GetItemText(IFWL_Widget* pWidget,
|
| + CFWL_ListItem* pItem,
|
| + CFX_WideString& wsText) override;
|
| + void GetItemRect(IFWL_Widget* pWidget,
|
| + CFWL_ListItem* pItem,
|
| + CFX_RectF& rtItem) override;
|
| void* GetItemData(IFWL_Widget* pWidget, CFWL_ListItem* pItem) override;
|
| - FWL_Error SetItemStyles(IFWL_Widget* pWidget,
|
| - CFWL_ListItem* pItem,
|
| - uint32_t dwStyle) override;
|
| - FWL_Error SetItemText(IFWL_Widget* pWidget,
|
| - CFWL_ListItem* pItem,
|
| - const FX_WCHAR* pszText) override;
|
| - FWL_Error SetItemRect(IFWL_Widget* pWidget,
|
| - CFWL_ListItem* pItem,
|
| - const CFX_RectF& rtItem) override;
|
| + void SetItemStyles(IFWL_Widget* pWidget,
|
| + CFWL_ListItem* pItem,
|
| + uint32_t dwStyle) override;
|
| + void SetItemText(IFWL_Widget* pWidget,
|
| + CFWL_ListItem* pItem,
|
| + const FX_WCHAR* pszText) override;
|
| + void SetItemRect(IFWL_Widget* pWidget,
|
| + CFWL_ListItem* pItem,
|
| + const CFX_RectF& rtItem) override;
|
| FX_FLOAT GetItemHeight(IFWL_Widget* pWidget) override;
|
| CFX_DIBitmap* GetItemIcon(IFWL_Widget* pWidget,
|
| CFWL_ListItem* pItem) override;
|
| - FWL_Error GetItemCheckRect(IFWL_Widget* pWidget,
|
| - CFWL_ListItem* pItem,
|
| - CFX_RectF& rtCheck) override;
|
| - FWL_Error SetItemCheckRect(IFWL_Widget* pWidget,
|
| - CFWL_ListItem* pItem,
|
| - const CFX_RectF& rtCheck) override;
|
| + void GetItemCheckRect(IFWL_Widget* pWidget,
|
| + CFWL_ListItem* pItem,
|
| + CFX_RectF& rtCheck) override;
|
| + void SetItemCheckRect(IFWL_Widget* pWidget,
|
| + CFWL_ListItem* pItem,
|
| + const CFX_RectF& rtCheck) override;
|
| uint32_t GetItemCheckState(IFWL_Widget* pWidget,
|
| CFWL_ListItem* pItem) override;
|
| - FWL_Error SetItemCheckState(IFWL_Widget* pWidget,
|
| - CFWL_ListItem* pItem,
|
| - uint32_t dwCheckState) override;
|
| + void SetItemCheckState(IFWL_Widget* pWidget,
|
| + CFWL_ListItem* pItem,
|
| + uint32_t dwCheckState) override;
|
|
|
| private:
|
| std::vector<std::unique_ptr<CFWL_ListItem>> m_ItemArray;
|
|
|