From a0d3231037816d3f0e377e9c57a2bfaa1372e151 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 10 Nov 2016 14:22:06 -0800 Subject: Remove IFWL methods proxied from CFWL classes This CL removes a few methods from IFWL that are around just to proxy from CFWL methods which are, in turn, never called. Review-Url: https://codereview.chromium.org/2486333004 --- xfa/fwl/core/cfwl_listbox.h | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) (limited to 'xfa/fwl/core/cfwl_listbox.h') diff --git a/xfa/fwl/core/cfwl_listbox.h b/xfa/fwl/core/cfwl_listbox.h index ff24e5a308..901f77e894 100644 --- a/xfa/fwl/core/cfwl_listbox.h +++ b/xfa/fwl/core/cfwl_listbox.h @@ -22,28 +22,6 @@ class CFWL_ListBox : public CFWL_Widget, public IFWL_ListBoxDP { void Initialize(); - FWL_Error AddDIBitmap(CFX_DIBitmap* pDIB, CFWL_ListItem* pItem); - CFWL_ListItem* AddString(const CFX_WideStringC& wsAdd, bool bSelect = false); - bool DeleteString(CFWL_ListItem* pItem); - void DeleteAll(); - int32_t CountSelItems(); - CFWL_ListItem* GetSelItem(int32_t nIndexSel); - int32_t GetSelIndex(int32_t nIndex); - 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); - int32_t CountItems(); - CFWL_ListItem* GetItem(int32_t nIndex); - FWL_Error SetItemString(CFWL_ListItem* pItem, const CFX_WideStringC& wsText); - FWL_Error GetItemString(CFWL_ListItem* pItem, CFX_WideString& wsText); - FWL_Error SetItemData(CFWL_ListItem* pItem, void* pData); - void* GetItemData(CFWL_ListItem* pItem); - CFWL_ListItem* GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy); - uint32_t GetItemStates(CFWL_ListItem* pItem); - // IFWL_DataProvider: FWL_Error GetCaption(IFWL_Widget* pWidget, CFX_WideString& wsCaption) override; @@ -87,10 +65,26 @@ class CFWL_ListBox : public CFWL_Widget, public IFWL_ListBoxDP { CFWL_ListItem* pItem, uint32_t dwCheckState) override; + CFWL_ListItem* AddString(const CFX_WideStringC& wsAdd, bool bSelect = false); + bool DeleteString(CFWL_ListItem* pItem); + void DeleteAll(); + + int32_t CountSelItems(); + + void SetSelItem(CFWL_ListItem* pItem, bool bSelect = true); + CFWL_ListItem* GetSelItem(int32_t nIndexSel); + int32_t GetSelIndex(int32_t nIndex); + + void GetScrollPos(FX_FLOAT& fPos, bool bVert = true); + + CFWL_ListItem* GetItem(int32_t nIndex); + void GetItemText(CFWL_ListItem* pItem, CFX_WideString& wsText); + uint32_t GetItemStates(CFWL_ListItem* pItem); + private: + int32_t CountItems(); + std::vector> m_ItemArray; - CFX_WideString m_wsData; - FX_FLOAT m_fItemHeight; }; #endif // XFA_FWL_CORE_CFWL_LISTBOX_H_ -- cgit v1.2.3