From 98329fe75b9c3e5422344a37d787fb22c89c2ca2 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 10 Nov 2016 09:40:14 -0800 Subject: Cleanup IFWL_Widget visibility and virtual parameters This Cl cleans up the IFWL_Widget class including: * Making members and methods private where possible * Removing virtual methods that are never overridden * Removing methods that do nothing * Removing unchecked FWL_Error return codes Review-Url: https://codereview.chromium.org/2488953003 --- xfa/fwl/core/cfwl_combobox.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 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 9b2cf7fe41..825d66382e 100644 --- a/xfa/fwl/core/cfwl_combobox.cpp +++ b/xfa/fwl/core/cfwl_combobox.cpp @@ -91,9 +91,9 @@ FWL_Error CFWL_ComboBox::SetCurSel(int32_t iSel) { : FWL_Error::Indefinite; } -FWL_Error CFWL_ComboBox::SetEditText(const CFX_WideString& wsText) { - return GetWidget() ? ToComboBox(GetWidget())->SetEditText(wsText) - : FWL_Error::Indefinite; +void CFWL_ComboBox::SetEditText(const CFX_WideString& wsText) { + if (GetWidget()) + ToComboBox(GetWidget())->SetEditText(wsText); } int32_t CFWL_ComboBox::GetEditTextLength() const { @@ -160,8 +160,8 @@ void* CFWL_ComboBox::GetItemData(int32_t iIndex) { return pItem ? pItem->m_pData : nullptr; } -FWL_Error CFWL_ComboBox::SetListTheme(IFWL_ThemeProvider* pTheme) { - return ToComboBox(GetWidget())->GetListBoxt()->SetThemeProvider(pTheme); +void CFWL_ComboBox::SetListTheme(IFWL_ThemeProvider* pTheme) { + ToComboBox(GetWidget())->GetListBoxt()->SetThemeProvider(pTheme); } bool CFWL_ComboBox::AfterFocusShowDropList() { @@ -229,12 +229,12 @@ FWL_Error CFWL_ComboBox::GetBBox(CFX_RectF& rect) { : FWL_Error::Indefinite; } -FWL_Error CFWL_ComboBox::EditModifyStylesEx(uint32_t dwStylesExAdded, - uint32_t dwStylesExRemoved) { - return GetWidget() - ? ToComboBox(GetWidget()) - ->EditModifyStylesEx(dwStylesExAdded, dwStylesExRemoved) - : FWL_Error::Indefinite; +void CFWL_ComboBox::EditModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved) { + if (GetWidget()) { + ToComboBox(GetWidget()) + ->EditModifyStylesEx(dwStylesExAdded, dwStylesExRemoved); + } } FWL_Error CFWL_ComboBox::GetCaption(IFWL_Widget* pWidget, -- cgit v1.2.3