From 0ced827f257344a1f5804aa96df538f3e783bd10 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 23 Nov 2016 12:20:47 -0500 Subject: Remove listbox providers and build into listbox This CL removes the IFWL_ListBox::DataProvider and builds the data storage for the list directly into IFWL_ListBox. This removes the need for the provider in CFWL_ComboBox and CFWL_ListBox. Change-Id: I74c2286757a0b73083908f1cc630a88e7d730fd9 Reviewed-on: https://pdfium-review.googlesource.com/2050 Commit-Queue: dan sinclair Reviewed-by: Tom Sepez --- xfa/fwl/core/cfwl_combobox.h | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 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 2036b933fd..2b63c50aad 100644 --- a/xfa/fwl/core/cfwl_combobox.h +++ b/xfa/fwl/core/cfwl_combobox.h @@ -20,44 +20,10 @@ class CFWL_ComboBox : public CFWL_Widget, public IFWL_ComboBox::DataProvider { void Initialize(); - // IFWL_ListBox::DataProvider - int32_t CountItems(const IFWL_Widget* pWidget) const override; - CFWL_ListItem* GetItem(const IFWL_Widget* pWidget, - int32_t nIndex) const override; - int32_t GetItemIndex(IFWL_Widget* pWidget, CFWL_ListItem* pItem) override; - uint32_t GetItemStyles(IFWL_Widget* pWidget, CFWL_ListItem* pItem) 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; - void SetItemStyles(IFWL_Widget* pWidget, - CFWL_ListItem* pItem, - uint32_t dwStyle) override; - void SetItemRect(IFWL_Widget* pWidget, - CFWL_ListItem* pItem, - const CFX_RectF& rtItem) override; - CFX_DIBitmap* GetItemIcon(IFWL_Widget* pWidget, - CFWL_ListItem* pItem) 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; - void SetItemCheckState(IFWL_Widget* pWidget, - CFWL_ListItem* pItem, - uint32_t dwCheckState) override; - // IFWL_ComboBox::DataProvider FX_FLOAT GetListHeight(IFWL_Widget* pWidget) override; - int32_t AddString(const CFX_WideStringC& wsText); - + void AddString(const CFX_WideStringC& wsText); bool RemoveAt(int32_t iIndex); // Returns false iff |iIndex| out of range. void RemoveAll(); @@ -90,7 +56,6 @@ class CFWL_ComboBox : public CFWL_Widget, public IFWL_ComboBox::DataProvider { void EditModifyStylesEx(uint32_t dwStylesExAdded, uint32_t dwStylesExRemoved); private: - std::vector> m_ItemArray; FX_FLOAT m_fMaxListHeight; }; -- cgit v1.2.3