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.cpp | 80 ++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 42 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 fa2698be6e..9b2cf7fe41 100644 --- a/xfa/fwl/core/cfwl_combobox.cpp +++ b/xfa/fwl/core/cfwl_combobox.cpp @@ -39,7 +39,7 @@ void CFWL_ComboBox::Initialize() { } int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText) { - std::unique_ptr pItem(new CFWL_ComboBoxItem); + std::unique_ptr pItem(new CFWL_ListItem); pItem->m_wsText = wsText; pItem->m_dwStyles = 0; m_ItemArray.push_back(std::move(pItem)); @@ -48,7 +48,7 @@ int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText) { int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText, CFX_DIBitmap* pIcon) { - std::unique_ptr pItem(new CFWL_ComboBoxItem); + std::unique_ptr pItem(new CFWL_ListItem); pItem->m_wsText = wsText; pItem->m_dwStyles = 0; pItem->m_pDIB = pIcon; @@ -74,8 +74,8 @@ int32_t CFWL_ComboBox::CountItems() { FWL_Error CFWL_ComboBox::GetTextByIndex(int32_t iIndex, CFX_WideString& wsText) { - CFWL_ComboBoxItem* pItem = - static_cast(GetItem(m_pIface.get(), iIndex)); + CFWL_ListItem* pItem = + static_cast(GetItem(m_pIface.get(), iIndex)); if (!pItem) return FWL_Error::Indefinite; wsText = pItem->m_wsText; @@ -146,8 +146,8 @@ FWL_Error CFWL_ComboBox::SetMaxListHeight(FX_FLOAT fMaxHeight) { } FWL_Error CFWL_ComboBox::SetItemData(int32_t iIndex, void* pData) { - CFWL_ComboBoxItem* pItem = - static_cast(GetItem(m_pIface.get(), iIndex)); + CFWL_ListItem* pItem = + static_cast(GetItem(m_pIface.get(), iIndex)); if (!pItem) return FWL_Error::Indefinite; pItem->m_pData = pData; @@ -155,8 +155,8 @@ FWL_Error CFWL_ComboBox::SetItemData(int32_t iIndex, void* pData) { } void* CFWL_ComboBox::GetItemData(int32_t iIndex) { - CFWL_ComboBoxItem* pItem = - static_cast(GetItem(m_pIface.get(), iIndex)); + CFWL_ListItem* pItem = + static_cast(GetItem(m_pIface.get(), iIndex)); return pItem ? pItem->m_pData : nullptr; } @@ -246,7 +246,7 @@ int32_t CFWL_ComboBox::CountItems(const IFWL_Widget* pWidget) { return m_ItemArray.size(); } -IFWL_ListItem* CFWL_ComboBox::GetItem(const IFWL_Widget* pWidget, +CFWL_ListItem* CFWL_ComboBox::GetItem(const IFWL_Widget* pWidget, int32_t nIndex) { if (nIndex < 0 || static_cast(nIndex) >= m_ItemArray.size()) return nullptr; @@ -255,80 +255,80 @@ IFWL_ListItem* CFWL_ComboBox::GetItem(const IFWL_Widget* pWidget, } int32_t CFWL_ComboBox::GetItemIndex(IFWL_Widget* pWidget, - IFWL_ListItem* pItem) { + CFWL_ListItem* pItem) { auto it = std::find_if( m_ItemArray.begin(), m_ItemArray.end(), - [pItem](const std::unique_ptr& candidate) { - return candidate.get() == static_cast(pItem); + [pItem](const std::unique_ptr& candidate) { + return candidate.get() == static_cast(pItem); }); return it != m_ItemArray.end() ? it - m_ItemArray.begin() : -1; } bool CFWL_ComboBox::SetItemIndex(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, int32_t nIndex) { if (nIndex < 0 || static_cast(nIndex) >= m_ItemArray.size()) return false; - m_ItemArray[nIndex].reset(static_cast(pItem)); + m_ItemArray[nIndex].reset(static_cast(pItem)); return true; } uint32_t CFWL_ComboBox::GetItemStyles(IFWL_Widget* pWidget, - IFWL_ListItem* pItem) { + CFWL_ListItem* pItem) { if (!pItem) return 0; - return static_cast(pItem)->m_dwStyles; + return static_cast(pItem)->m_dwStyles; } FWL_Error CFWL_ComboBox::GetItemText(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, CFX_WideString& wsText) { if (!pItem) return FWL_Error::Indefinite; - wsText = static_cast(pItem)->m_wsText; + wsText = static_cast(pItem)->m_wsText; return FWL_Error::Succeeded; } FWL_Error CFWL_ComboBox::GetItemRect(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, CFX_RectF& rtItem) { if (!pItem) return FWL_Error::Indefinite; - CFWL_ComboBoxItem* pComboItem = static_cast(pItem); + CFWL_ListItem* pComboItem = static_cast(pItem); rtItem.Set(pComboItem->m_rtItem.left, pComboItem->m_rtItem.top, pComboItem->m_rtItem.width, pComboItem->m_rtItem.height); return FWL_Error::Succeeded; } -void* CFWL_ComboBox::GetItemData(IFWL_Widget* pWidget, IFWL_ListItem* pItem) { - return pItem ? static_cast(pItem)->m_pData : nullptr; +void* CFWL_ComboBox::GetItemData(IFWL_Widget* pWidget, CFWL_ListItem* pItem) { + return pItem ? static_cast(pItem)->m_pData : nullptr; } FWL_Error CFWL_ComboBox::SetItemStyles(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, uint32_t dwStyle) { if (!pItem) return FWL_Error::Indefinite; - static_cast(pItem)->m_dwStyles = dwStyle; + static_cast(pItem)->m_dwStyles = dwStyle; return FWL_Error::Succeeded; } FWL_Error CFWL_ComboBox::SetItemText(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, const FX_WCHAR* pszText) { if (!pItem) return FWL_Error::Indefinite; - static_cast(pItem)->m_wsText = pszText; + static_cast(pItem)->m_wsText = pszText; return FWL_Error::Succeeded; } FWL_Error CFWL_ComboBox::SetItemRect(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, const CFX_RectF& rtItem) { if (!pItem) return FWL_Error::Indefinite; - static_cast(pItem)->m_rtItem = rtItem; + static_cast(pItem)->m_rtItem = rtItem; return FWL_Error::Succeeded; } @@ -337,40 +337,36 @@ FX_FLOAT CFWL_ComboBox::GetItemHeight(IFWL_Widget* pWidget) { } CFX_DIBitmap* CFWL_ComboBox::GetItemIcon(IFWL_Widget* pWidget, - IFWL_ListItem* pItem) { - return pItem ? static_cast(pItem)->m_pDIB : nullptr; + CFWL_ListItem* pItem) { + return pItem ? static_cast(pItem)->m_pDIB : nullptr; } FWL_Error CFWL_ComboBox::GetItemCheckRect(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, CFX_RectF& rtCheck) { - rtCheck = static_cast(pItem)->m_rtCheckBox; + rtCheck = static_cast(pItem)->m_rtCheckBox; return FWL_Error::Succeeded; } FWL_Error CFWL_ComboBox::SetItemCheckRect(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, const CFX_RectF& rtCheck) { - static_cast(pItem)->m_rtCheckBox = rtCheck; + static_cast(pItem)->m_rtCheckBox = rtCheck; return FWL_Error::Succeeded; } uint32_t CFWL_ComboBox::GetItemCheckState(IFWL_Widget* pWidget, - IFWL_ListItem* pItem) { - return static_cast(pItem)->m_dwCheckState; + CFWL_ListItem* pItem) { + return static_cast(pItem)->m_dwCheckState; } FWL_Error CFWL_ComboBox::SetItemCheckState(IFWL_Widget* pWidget, - IFWL_ListItem* pItem, + CFWL_ListItem* pItem, uint32_t dwCheckState) { - static_cast(pItem)->m_dwCheckState = dwCheckState; + static_cast(pItem)->m_dwCheckState = dwCheckState; return FWL_Error::Succeeded; } FX_FLOAT CFWL_ComboBox::GetListHeight(IFWL_Widget* pWidget) { return m_fMaxListHeight; } - -CFWL_ComboBoxItem::CFWL_ComboBoxItem() : m_pDIB(nullptr), m_pData(nullptr) {} - -CFWL_ComboBoxItem::~CFWL_ComboBoxItem() {} -- cgit v1.2.3