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_datetimeedit.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'xfa/fwl/core/ifwl_datetimeedit.cpp') diff --git a/xfa/fwl/core/ifwl_datetimeedit.cpp b/xfa/fwl/core/ifwl_datetimeedit.cpp index 0097691c42..9d0a08bed6 100644 --- a/xfa/fwl/core/ifwl_datetimeedit.cpp +++ b/xfa/fwl/core/ifwl_datetimeedit.cpp @@ -9,15 +9,17 @@ #include "xfa/fwl/core/cfwl_widgetmgr.h" #include "xfa/fwl/core/ifwl_datetimepicker.h" -IFWL_DateTimeEdit::IFWL_DateTimeEdit(const CFWL_WidgetImpProperties& properties, +IFWL_DateTimeEdit::IFWL_DateTimeEdit(const IFWL_App* app, + const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter) - : IFWL_Edit(properties, pOuter) {} + : IFWL_Edit(app, properties, pOuter) {} -FWL_Error IFWL_DateTimeEdit::Initialize() { +void IFWL_DateTimeEdit::Initialize() { + IFWL_Edit::Initialize(); + + // Delete delegate set by IFWL_Edit::Initialize. + delete m_pDelegate; m_pDelegate = new CFWL_DateTimeEditImpDelegate(this); - if (IFWL_Edit::Initialize() != FWL_Error::Succeeded) - return FWL_Error::Indefinite; - return FWL_Error::Succeeded; } void IFWL_DateTimeEdit::Finalize() { -- cgit v1.2.3