From 7172b71a005c181e9f103ac0e19f6675bf3bc8e8 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 23 Nov 2016 13:04:07 -0500 Subject: Remove IFWL_CombobBox::DataProvider The height value returned is always 0. This CL removes the plumbing and uses the 0 value directly. R=npm@chromium.org, tsepez@chromium.org Review URL: https://codereview.chromium.org/2525003002 . --- xfa/fwl/core/cfwl_combobox.h | 8 +------- 1 file changed, 1 insertion(+), 7 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 2b63c50aad..a670ef22cb 100644 --- a/xfa/fwl/core/cfwl_combobox.h +++ b/xfa/fwl/core/cfwl_combobox.h @@ -13,16 +13,13 @@ #include "xfa/fwl/core/cfwl_widget.h" #include "xfa/fwl/core/ifwl_combobox.h" -class CFWL_ComboBox : public CFWL_Widget, public IFWL_ComboBox::DataProvider { +class CFWL_ComboBox : public CFWL_Widget, public IFWL_Widget::DataProvider { public: explicit CFWL_ComboBox(const CFWL_App* pApp); ~CFWL_ComboBox() override; void Initialize(); - // IFWL_ComboBox::DataProvider - FX_FLOAT GetListHeight(IFWL_Widget* pWidget) override; - void AddString(const CFX_WideStringC& wsText); bool RemoveAt(int32_t iIndex); // Returns false iff |iIndex| out of range. void RemoveAll(); @@ -54,9 +51,6 @@ class CFWL_ComboBox : public CFWL_Widget, public IFWL_ComboBox::DataProvider { void GetBBox(CFX_RectF& rect); void EditModifyStylesEx(uint32_t dwStylesExAdded, uint32_t dwStylesExRemoved); - - private: - FX_FLOAT m_fMaxListHeight; }; #endif // XFA_FWL_CORE_CFWL_COMBOBOX_H_ -- cgit v1.2.3