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

Unified Diff: xfa/fwl/core/cfwl_datetimepicker.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/cfwl_datetimepicker.h ('k') | xfa/fwl/core/cfwl_edit.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fwl/core/cfwl_datetimepicker.cpp
diff --git a/xfa/fwl/core/cfwl_datetimepicker.cpp b/xfa/fwl/core/cfwl_datetimepicker.cpp
index 7d5a1535f15c839e43e4c2d4ef8da9292573a713..ebfcee62ba0b5482ac72e7ee693bb672123d16ff 100644
--- a/xfa/fwl/core/cfwl_datetimepicker.cpp
+++ b/xfa/fwl/core/cfwl_datetimepicker.cpp
@@ -12,6 +12,25 @@
#include "xfa/fwl/core/ifwl_datetimepicker.h"
#include "xfa/fwl/core/ifwl_widget.h"
+CFWL_DateTimePicker::CFWL_DateTimePicker(const IFWL_App* app)
+ : CFWL_Widget(app) {}
+
+CFWL_DateTimePicker::~CFWL_DateTimePicker() {}
+
+void CFWL_DateTimePicker::Initialize(const CFWL_WidgetProperties* pProperties) {
+ ASSERT(!m_pIface);
+
+ if (pProperties)
+ *m_pProperties = *pProperties;
+
+ std::unique_ptr<IFWL_DateTimePicker> pDateTimePicker(new IFWL_DateTimePicker(
+ m_pApp, m_pProperties->MakeWidgetImpProperties(&m_DateTimePickerDP)));
+ pDateTimePicker->Initialize();
+
+ m_pIface = std::move(pDateTimePicker);
+ CFWL_Widget::Initialize(pProperties);
+}
+
IFWL_DateTimePicker* CFWL_DateTimePicker::GetWidget() {
return static_cast<IFWL_DateTimePicker*>(m_pIface.get());
}
@@ -20,24 +39,6 @@ const IFWL_DateTimePicker* CFWL_DateTimePicker::GetWidget() const {
return static_cast<IFWL_DateTimePicker*>(m_pIface.get());
}
-FWL_Error CFWL_DateTimePicker::Initialize(
- const CFWL_WidgetProperties* pProperties) {
- if (m_pIface)
- return FWL_Error::Indefinite;
- if (pProperties) {
- *m_pProperties = *pProperties;
- }
- std::unique_ptr<IFWL_DateTimePicker> pDateTimePicker(new IFWL_DateTimePicker(
- m_pProperties->MakeWidgetImpProperties(&m_DateTimePickerDP)));
- FWL_Error ret = pDateTimePicker->Initialize();
- if (ret != FWL_Error::Succeeded) {
- return ret;
- }
- m_pIface = std::move(pDateTimePicker);
- CFWL_Widget::Initialize();
- return FWL_Error::Succeeded;
-}
-
FWL_Error CFWL_DateTimePicker::SetToday(int32_t iYear,
int32_t iMonth,
int32_t iDay) {
@@ -75,10 +76,6 @@ FWL_Error CFWL_DateTimePicker::SetCurSel(int32_t iYear,
return GetWidget()->SetCurSel(iYear, iMonth, iDay);
}
-CFWL_DateTimePicker::CFWL_DateTimePicker() {}
-
-CFWL_DateTimePicker::~CFWL_DateTimePicker() {}
-
CFWL_DateTimePicker::CFWL_DateTimePickerDP::CFWL_DateTimePickerDP() {
m_iYear = 2011;
m_iMonth = 1;
« no previous file with comments | « xfa/fwl/core/cfwl_datetimepicker.h ('k') | xfa/fwl/core/cfwl_edit.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698