From 20855384b8149a631c3c1d229551523c12eb767b Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 31 Oct 2016 07:29:34 -0700 Subject: Remove FWL globals. This CL removes the FWL_GetApp, FWL_SetApp and FWL_GetWidgetAdapter methods. In the process it changes the various Initialize methods to return void. Review-Url: https://codereview.chromium.org/2436103002 --- xfa/fwl/core/ifwl_combolist.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'xfa/fwl/core/ifwl_combolist.cpp') diff --git a/xfa/fwl/core/ifwl_combolist.cpp b/xfa/fwl/core/ifwl_combolist.cpp index d34a55bcc2..6538bff20d 100644 --- a/xfa/fwl/core/ifwl_combolist.cpp +++ b/xfa/fwl/core/ifwl_combolist.cpp @@ -9,18 +9,19 @@ #include "xfa/fwl/core/ifwl_combobox.h" #include "xfa/fwl/core/ifwl_comboedit.h" -IFWL_ComboList::IFWL_ComboList(const CFWL_WidgetImpProperties& properties, +IFWL_ComboList::IFWL_ComboList(const IFWL_App* app, + const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter) - : IFWL_ListBox(properties, pOuter), m_bNotifyOwner(TRUE) { + : IFWL_ListBox(app, properties, pOuter), m_bNotifyOwner(TRUE) { ASSERT(pOuter); } -FWL_Error IFWL_ComboList::Initialize() { - if (IFWL_ListBox::Initialize() != FWL_Error::Succeeded) - return FWL_Error::Indefinite; +void IFWL_ComboList::Initialize() { + IFWL_ListBox::Initialize(); + + // Delete the delegate that was created by IFWL_ListBox::Initialize ... delete m_pDelegate; m_pDelegate = new CFWL_ComboListImpDelegate(this); - return FWL_Error::Succeeded; } void IFWL_ComboList::Finalize() { -- cgit v1.2.3