From 38eaf4b11383e24a00192132b683cc07e38622a6 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 15 Nov 2016 12:33:06 -0800 Subject: Cleanup cfwl_* files. This Cl cleans up the visibility, method usage and return values in the remaining CFWL files. Review-Url: https://codereview.chromium.org/2498163002 --- xfa/fwl/core/cfwl_combobox.cpp | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'xfa/fwl/core/cfwl_combobox.cpp') diff --git a/xfa/fwl/core/cfwl_combobox.cpp b/xfa/fwl/core/cfwl_combobox.cpp index d59cd4bd12..d1f95035d6 100644 --- a/xfa/fwl/core/cfwl_combobox.cpp +++ b/xfa/fwl/core/cfwl_combobox.cpp @@ -25,7 +25,7 @@ const IFWL_ComboBox* ToComboBox(const IFWL_Widget* widget) { } // namespace CFWL_ComboBox::CFWL_ComboBox(const IFWL_App* app) - : CFWL_Widget(app), m_fMaxListHeight(0), m_fItemHeight(0) {} + : CFWL_Widget(app), m_fMaxListHeight(0) {} CFWL_ComboBox::~CFWL_ComboBox() {} @@ -181,16 +181,6 @@ int32_t CFWL_ComboBox::GetItemIndex(IFWL_Widget* pWidget, return it != m_ItemArray.end() ? it - m_ItemArray.begin() : -1; } -bool CFWL_ComboBox::SetItemIndex(IFWL_Widget* pWidget, - CFWL_ListItem* pItem, - int32_t nIndex) { - if (nIndex < 0 || static_cast(nIndex) >= m_ItemArray.size()) - return false; - - m_ItemArray[nIndex].reset(static_cast(pItem)); - return true; -} - uint32_t CFWL_ComboBox::GetItemStyles(IFWL_Widget* pWidget, CFWL_ListItem* pItem) { if (!pItem) @@ -226,13 +216,6 @@ void CFWL_ComboBox::SetItemStyles(IFWL_Widget* pWidget, static_cast(pItem)->m_dwStyles = dwStyle; } -void CFWL_ComboBox::SetItemText(IFWL_Widget* pWidget, - CFWL_ListItem* pItem, - const FX_WCHAR* pszText) { - if (pItem) - static_cast(pItem)->m_wsText = pszText; -} - void CFWL_ComboBox::SetItemRect(IFWL_Widget* pWidget, CFWL_ListItem* pItem, const CFX_RectF& rtItem) { @@ -240,10 +223,6 @@ void CFWL_ComboBox::SetItemRect(IFWL_Widget* pWidget, static_cast(pItem)->m_rtItem = rtItem; } -FX_FLOAT CFWL_ComboBox::GetItemHeight(IFWL_Widget* pWidget) { - return m_fItemHeight; -} - CFX_DIBitmap* CFWL_ComboBox::GetItemIcon(IFWL_Widget* pWidget, CFWL_ListItem* pItem) { return pItem ? static_cast(pItem)->m_pDIB : nullptr; -- cgit v1.2.3