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

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

Issue 2436103002: Remove FWL globals. (Closed)
Patch Set: fix mac Created 4 years, 2 months 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
Index: xfa/fwl/core/ifwl_picturebox.cpp
diff --git a/xfa/fwl/core/ifwl_picturebox.cpp b/xfa/fwl/core/ifwl_picturebox.cpp
index 3539e08b0b6468b3817f5847b57ae77003e78707..ce29806b474eb8ee84e596a9cd8de6b5ff523853 100644
--- a/xfa/fwl/core/ifwl_picturebox.cpp
+++ b/xfa/fwl/core/ifwl_picturebox.cpp
@@ -9,8 +9,9 @@
#include "xfa/fwl/core/cfwl_picturebox.h"
#include "xfa/fwl/core/fwl_noteimp.h"
-IFWL_PictureBox::IFWL_PictureBox(const CFWL_WidgetImpProperties& properties)
- : IFWL_Widget(properties, nullptr),
+IFWL_PictureBox::IFWL_PictureBox(const IFWL_App* app,
+ const CFWL_WidgetImpProperties& properties)
+ : IFWL_Widget(app, properties, nullptr),
m_bTop(FALSE),
m_bVCenter(FALSE),
m_bButton(FALSE) {
@@ -21,16 +22,9 @@ IFWL_PictureBox::IFWL_PictureBox(const CFWL_WidgetImpProperties& properties)
IFWL_PictureBox::~IFWL_PictureBox() {}
-FWL_Type IFWL_PictureBox::GetClassID() const {
- return FWL_Type::PictureBox;
-}
-
-FWL_Error IFWL_PictureBox::Initialize() {
- if (IFWL_Widget::Initialize() != FWL_Error::Succeeded)
- return FWL_Error::Indefinite;
-
+void IFWL_PictureBox::Initialize() {
+ IFWL_Widget::Initialize();
m_pDelegate = new CFWL_PictureBoxImpDelegate(this);
- return FWL_Error::Succeeded;
}
void IFWL_PictureBox::Finalize() {
@@ -39,6 +33,10 @@ void IFWL_PictureBox::Finalize() {
IFWL_Widget::Finalize();
}
+FWL_Type IFWL_PictureBox::GetClassID() const {
+ return FWL_Type::PictureBox;
+}
+
FWL_Error IFWL_PictureBox::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {
if (bAutoSize) {
rect.Set(0, 0, 0, 0);

Powered by Google App Engine
This is Rietveld 408576698