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_barcode.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'xfa/fwl/core/ifwl_barcode.cpp') diff --git a/xfa/fwl/core/ifwl_barcode.cpp b/xfa/fwl/core/ifwl_barcode.cpp index a4b210f115..779b44ab3e 100644 --- a/xfa/fwl/core/ifwl_barcode.cpp +++ b/xfa/fwl/core/ifwl_barcode.cpp @@ -12,8 +12,9 @@ #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_themeprovider.h" -IFWL_Barcode::IFWL_Barcode(const CFWL_WidgetImpProperties& properties) - : IFWL_Edit(properties, nullptr), m_dwStatus(0), m_type(BC_UNKNOWN) {} +IFWL_Barcode::IFWL_Barcode(const IFWL_App* app, + const CFWL_WidgetImpProperties& properties) + : IFWL_Edit(app, properties, nullptr), m_dwStatus(0), m_type(BC_UNKNOWN) {} IFWL_Barcode::~IFWL_Barcode() {} @@ -21,13 +22,11 @@ FWL_Type IFWL_Barcode::GetClassID() const { return FWL_Type::Barcode; } -FWL_Error IFWL_Barcode::Initialize() { - if (!m_pDelegate) { +void IFWL_Barcode::Initialize() { + if (!m_pDelegate) m_pDelegate = new CFWL_BarcodeImpDelegate(this); - } - if (IFWL_Edit::Initialize() != FWL_Error::Succeeded) - return FWL_Error::Indefinite; - return FWL_Error::Succeeded; + + IFWL_Edit::Initialize(); } void IFWL_Barcode::Finalize() { -- cgit v1.2.3