Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(542)

Unified Diff: xfa/fwl/core/ifwl_formproxy.cpp

Issue 2436103002: Remove FWL globals. (Closed)
Patch Set: Review feedback Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/fwl/core/ifwl_formproxy.h ('k') | xfa/fwl/core/ifwl_listbox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fwl/core/ifwl_formproxy.cpp
diff --git a/xfa/fwl/core/ifwl_formproxy.cpp b/xfa/fwl/core/ifwl_formproxy.cpp
index 9a00bf3e8ffd2a8cf1b0602e81825ad5c9b3b66b..16cd90813d2843dea876d4f51746420eef5f610e 100644
--- a/xfa/fwl/core/ifwl_formproxy.cpp
+++ b/xfa/fwl/core/ifwl_formproxy.cpp
@@ -8,12 +8,24 @@
#include "xfa/fwl/core/fwl_noteimp.h"
-IFWL_FormProxy::IFWL_FormProxy(const CFWL_WidgetImpProperties& properties,
+IFWL_FormProxy::IFWL_FormProxy(const IFWL_App* app,
+ const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter)
- : IFWL_Form(properties, pOuter) {}
+ : IFWL_Form(app, properties, pOuter) {}
IFWL_FormProxy::~IFWL_FormProxy() {}
+void IFWL_FormProxy::Initialize() {
+ IFWL_Widget::Initialize();
+ m_pDelegate = new CFWL_FormProxyImpDelegate(this);
+}
+
+void IFWL_FormProxy::Finalize() {
+ delete m_pDelegate;
+ m_pDelegate = nullptr;
+ IFWL_Widget::Finalize();
+}
+
FWL_Type IFWL_FormProxy::GetClassID() const {
return FWL_Type::FormProxy;
}
@@ -25,19 +37,6 @@ FX_BOOL IFWL_FormProxy::IsInstance(const CFX_WideStringC& wsClass) const {
return IFWL_Form::IsInstance(wsClass);
}
-FWL_Error IFWL_FormProxy::Initialize() {
- if (IFWL_Widget::Initialize() != FWL_Error::Succeeded)
- return FWL_Error::Indefinite;
- m_pDelegate = new CFWL_FormProxyImpDelegate(this);
- return FWL_Error::Succeeded;
-}
-
-void IFWL_FormProxy::Finalize() {
- delete m_pDelegate;
- m_pDelegate = nullptr;
- IFWL_Widget::Finalize();
-}
-
FWL_Error IFWL_FormProxy::Update() {
return FWL_Error::Succeeded;
}
« no previous file with comments | « xfa/fwl/core/ifwl_formproxy.h ('k') | xfa/fwl/core/ifwl_listbox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698