From 3ff4deea307c38462393e4f83dabe32949338168 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 9 Nov 2016 10:09:03 -0800 Subject: Rename IFWL_ListItem to CFWL_ListItem This CL removes the empty IFWL_ListItem class and uses CFWL_ListItem in its place. As well, the CFWL_ComboListItem is removed and replaced with CFWL_ListItem. These were almost duplicate classes and the one missing field added to CFWL_ListItem. Review-Url: https://codereview.chromium.org/2487943003 --- xfa/fwl/core/cfwl_listbox.h | 74 ++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 44 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 d91ddff328..e28f8df7bb 100644 --- a/xfa/fwl/core/cfwl_listbox.h +++ b/xfa/fwl/core/cfwl_listbox.h @@ -15,20 +15,6 @@ #include "xfa/fwl/core/ifwl_listbox.h" #include "xfa/fwl/core/ifwl_widget.h" -class CFWL_ListItem : public IFWL_ListItem { - public: - CFWL_ListItem(); - ~CFWL_ListItem(); - - CFX_RectF m_rtItem; - uint32_t m_dwStates; - CFX_WideString m_wsText; - CFX_DIBitmap* m_pDIB; - void* m_pData; - uint32_t m_dwCheckState; - CFX_RectF m_rtCheckBox; -}; - class CFWL_ListBox : public CFWL_Widget, public IFWL_ListBoxDP { public: CFWL_ListBox(const IFWL_App*); @@ -36,27 +22,27 @@ class CFWL_ListBox : public CFWL_Widget, public IFWL_ListBoxDP { void Initialize(); - FWL_Error AddDIBitmap(CFX_DIBitmap* pDIB, IFWL_ListItem* pItem); - IFWL_ListItem* AddString(const CFX_WideStringC& wsAdd, bool bSelect = false); - bool DeleteString(IFWL_ListItem* pItem); + 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(); - IFWL_ListItem* GetSelItem(int32_t nIndexSel); + CFWL_ListItem* GetSelItem(int32_t nIndexSel); int32_t GetSelIndex(int32_t nIndex); - FWL_Error SetSelItem(IFWL_ListItem* pItem, bool bSelect = true); - FWL_Error GetItemText(IFWL_ListItem* pItem, CFX_WideString& wsText); + 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); FWL_Error SetItemHeight(FX_FLOAT fItemHeight); - IFWL_ListItem* GetFocusItem(); - FWL_Error SetFocusItem(IFWL_ListItem* pItem); + CFWL_ListItem* GetFocusItem(); + FWL_Error SetFocusItem(CFWL_ListItem* pItem); int32_t CountItems(); - IFWL_ListItem* GetItem(int32_t nIndex); - FWL_Error SetItemString(IFWL_ListItem* pItem, const CFX_WideStringC& wsText); - FWL_Error GetItemString(IFWL_ListItem* pItem, CFX_WideString& wsText); - FWL_Error SetItemData(IFWL_ListItem* pItem, void* pData); - void* GetItemData(IFWL_ListItem* pItem); - IFWL_ListItem* GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy); - uint32_t GetItemStates(IFWL_ListItem* pItem); + 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, @@ -64,41 +50,41 @@ class CFWL_ListBox : public CFWL_Widget, public IFWL_ListBoxDP { // IFWL_ListBoxDP: int32_t CountItems(const IFWL_Widget* pWidget) override; - IFWL_ListItem* GetItem(const IFWL_Widget* pWidget, int32_t nIndex) override; - int32_t GetItemIndex(IFWL_Widget* pWidget, IFWL_ListItem* pItem) override; + CFWL_ListItem* GetItem(const IFWL_Widget* pWidget, int32_t nIndex) override; + int32_t GetItemIndex(IFWL_Widget* pWidget, CFWL_ListItem* pItem) override; bool SetItemIndex(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, int32_t nIndex) override; - uint32_t GetItemStyles(IFWL_Widget* pWidget, IFWL_ListItem* pItem) override; + uint32_t GetItemStyles(IFWL_Widget* pWidget, CFWL_ListItem* pItem) override; FWL_Error GetItemText(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, CFX_WideString& wsText) override; FWL_Error GetItemRect(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, CFX_RectF& rtItem) override; - void* GetItemData(IFWL_Widget* pWidget, IFWL_ListItem* pItem) override; + void* GetItemData(IFWL_Widget* pWidget, CFWL_ListItem* pItem) override; FWL_Error SetItemStyles(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, uint32_t dwStyle) override; FWL_Error SetItemText(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, const FX_WCHAR* pszText) override; FWL_Error SetItemRect(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, const CFX_RectF& rtItem) override; FX_FLOAT GetItemHeight(IFWL_Widget* pWidget) override; CFX_DIBitmap* GetItemIcon(IFWL_Widget* pWidget, - IFWL_ListItem* pItem) override; + CFWL_ListItem* pItem) override; FWL_Error GetItemCheckRect(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, CFX_RectF& rtCheck) override; FWL_Error SetItemCheckRect(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, const CFX_RectF& rtCheck) override; uint32_t GetItemCheckState(IFWL_Widget* pWidget, - IFWL_ListItem* pItem) override; + CFWL_ListItem* pItem) override; FWL_Error SetItemCheckState(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, uint32_t dwCheckState) override; private: -- cgit v1.2.3