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_combobox.h | 46 +++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 30 deletions(-) (limited to 'xfa/fwl/core/cfwl_combobox.h') diff --git a/xfa/fwl/core/cfwl_combobox.h b/xfa/fwl/core/cfwl_combobox.h index cd409ffbc1..4b544b4530 100644 --- a/xfa/fwl/core/cfwl_combobox.h +++ b/xfa/fwl/core/cfwl_combobox.h @@ -13,20 +13,6 @@ #include "xfa/fwl/core/cfwl_widget.h" #include "xfa/fwl/core/ifwl_combobox.h" -class CFWL_ComboBoxItem : public IFWL_ListItem { - public: - CFWL_ComboBoxItem(); - ~CFWL_ComboBoxItem(); - - CFX_RectF m_rtItem; - uint32_t m_dwStyles; - CFX_WideString m_wsText; - CFX_DIBitmap* m_pDIB; - uint32_t m_dwCheckState; - CFX_RectF m_rtCheckBox; - void* m_pData; -}; - class CFWL_ComboBox : public CFWL_Widget, public IFWL_ComboBoxDP { public: CFWL_ComboBox(const IFWL_App*); @@ -84,49 +70,49 @@ class CFWL_ComboBox : public CFWL_Widget, public IFWL_ComboBoxDP { // 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; // IFWL_ComboBoxDP FX_FLOAT GetListHeight(IFWL_Widget* pWidget) override; private: - std::vector> m_ItemArray; + std::vector> m_ItemArray; FX_FLOAT m_fMaxListHeight; FX_FLOAT m_fItemHeight; }; -- cgit v1.2.3