| Index: xfa/fwl/basewidget/ifwl_listbox.h
|
| diff --git a/xfa/fwl/basewidget/ifwl_listbox.h b/xfa/fwl/basewidget/ifwl_listbox.h
|
| index 87d11a3c56092d288395269bee4bb5d4341ffa47..829b38699df5d0760e4aad27893a7c707b8f2e20 100644
|
| --- a/xfa/fwl/basewidget/ifwl_listbox.h
|
| +++ b/xfa/fwl/basewidget/ifwl_listbox.h
|
| @@ -15,7 +15,6 @@
|
| #define FWL_CLASS_ListBox L"FWL_LISTBOX"
|
| #define FWL_CLASSHASH_ListBox 1777358317
|
| #define FWL_STYLEEXT_LTB_MultiSelection (1L << 0)
|
| -#define FWL_STYLEEXT_LTB_Sort (1L << 1)
|
| #define FWL_STYLEEXT_LTB_ShowScrollBarAlaways (1L << 2)
|
| #define FWL_STYLEEXT_LTB_MultiColumn (1L << 3)
|
| #define FWL_STYLEEXT_LTB_LeftAlign (0L << 4)
|
| @@ -61,36 +60,36 @@ class IFWL_ListBoxDP : public IFWL_DataProvider {
|
| FWL_HLISTITEM hItem,
|
| int32_t nIndex) = 0;
|
| virtual uint32_t GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) = 0;
|
| - virtual FWL_ERR GetItemText(IFWL_Widget* pWidget,
|
| - FWL_HLISTITEM hItem,
|
| - CFX_WideString& wsText) = 0;
|
| - virtual FWL_ERR GetItemRect(IFWL_Widget* pWidget,
|
| - FWL_HLISTITEM hItem,
|
| - CFX_RectF& rtItem) = 0;
|
| + virtual FWL_Error GetItemText(IFWL_Widget* pWidget,
|
| + FWL_HLISTITEM hItem,
|
| + CFX_WideString& wsText) = 0;
|
| + virtual FWL_Error GetItemRect(IFWL_Widget* pWidget,
|
| + FWL_HLISTITEM hItem,
|
| + CFX_RectF& rtItem) = 0;
|
| virtual void* GetItemData(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) = 0;
|
| - virtual FWL_ERR SetItemStyles(IFWL_Widget* pWidget,
|
| + virtual FWL_Error SetItemStyles(IFWL_Widget* pWidget,
|
| + FWL_HLISTITEM hItem,
|
| + uint32_t dwStyle) = 0;
|
| + virtual FWL_Error SetItemText(IFWL_Widget* pWidget,
|
| + FWL_HLISTITEM hItem,
|
| + const FX_WCHAR* pszText) = 0;
|
| + virtual FWL_Error SetItemRect(IFWL_Widget* pWidget,
|
| FWL_HLISTITEM hItem,
|
| - uint32_t dwStyle) = 0;
|
| - virtual FWL_ERR SetItemText(IFWL_Widget* pWidget,
|
| - FWL_HLISTITEM hItem,
|
| - const FX_WCHAR* pszText) = 0;
|
| - virtual FWL_ERR SetItemRect(IFWL_Widget* pWidget,
|
| - FWL_HLISTITEM hItem,
|
| - const CFX_RectF& rtItem) = 0;
|
| + const CFX_RectF& rtItem) = 0;
|
| virtual FX_FLOAT GetItemHeight(IFWL_Widget* pWidget) = 0;
|
| virtual CFX_DIBitmap* GetItemIcon(IFWL_Widget* pWidget,
|
| FWL_HLISTITEM hItem) = 0;
|
| - virtual FWL_ERR GetItemCheckRect(IFWL_Widget* pWidget,
|
| - FWL_HLISTITEM hItem,
|
| - CFX_RectF& rtCheck) = 0;
|
| - virtual FWL_ERR SetItemCheckRect(IFWL_Widget* pWidget,
|
| - FWL_HLISTITEM hItem,
|
| - const CFX_RectF& rtCheck) = 0;
|
| + virtual FWL_Error GetItemCheckRect(IFWL_Widget* pWidget,
|
| + FWL_HLISTITEM hItem,
|
| + CFX_RectF& rtCheck) = 0;
|
| + virtual FWL_Error SetItemCheckRect(IFWL_Widget* pWidget,
|
| + FWL_HLISTITEM hItem,
|
| + const CFX_RectF& rtCheck) = 0;
|
| virtual uint32_t GetItemCheckState(IFWL_Widget* pWidget,
|
| FWL_HLISTITEM hItem) = 0;
|
| - virtual FWL_ERR SetItemCheckState(IFWL_Widget* pWidget,
|
| - FWL_HLISTITEM hItem,
|
| - uint32_t dwCheckState) = 0;
|
| + virtual FWL_Error SetItemCheckState(IFWL_Widget* pWidget,
|
| + FWL_HLISTITEM hItem,
|
| + uint32_t dwCheckState) = 0;
|
| };
|
|
|
| class IFWL_ListBoxCompare {
|
| @@ -110,10 +109,9 @@ class IFWL_ListBox : public IFWL_Widget {
|
| int32_t CountSelItems();
|
| FWL_HLISTITEM GetSelItem(int32_t nIndexSel);
|
| int32_t GetSelIndex(int32_t nIndex);
|
| - FWL_ERR SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect = TRUE);
|
| - FWL_ERR GetItemText(FWL_HLISTITEM hItem, CFX_WideString& wsText);
|
| - FWL_ERR GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert = TRUE);
|
| - FWL_ERR* Sort(IFWL_ListBoxCompare* pCom);
|
| + FWL_Error SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect = TRUE);
|
| + FWL_Error GetItemText(FWL_HLISTITEM hItem, CFX_WideString& wsText);
|
| + FWL_Error GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert = TRUE);
|
|
|
| protected:
|
| IFWL_ListBox();
|
|
|