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

Unified Diff: xfa/fwl/core/ifwl_monthcalendar.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_monthcalendar.h ('k') | xfa/fwl/core/ifwl_picturebox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fwl/core/ifwl_monthcalendar.cpp
diff --git a/xfa/fwl/core/ifwl_monthcalendar.cpp b/xfa/fwl/core/ifwl_monthcalendar.cpp
index 69e7588245f0a5178edafefa5c9ceb1f56c64016..43e90a23a593e3c9b7835b20f4b4015dec18a1ac 100644
--- a/xfa/fwl/core/ifwl_monthcalendar.cpp
+++ b/xfa/fwl/core/ifwl_monthcalendar.cpp
@@ -118,9 +118,10 @@ CFX_WideString* GetCapacityForMonth(IFWL_ThemeProvider* pTheme,
} // namespace
IFWL_MonthCalendar::IFWL_MonthCalendar(
+ const IFWL_App* app,
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter)
- : IFWL_Widget(properties, pOuter),
+ : IFWL_Widget(app, properties, pOuter),
m_bInit(FALSE),
m_pDateTime(new CFX_DateTime),
m_iCurYear(2011),
@@ -151,16 +152,9 @@ IFWL_MonthCalendar::~IFWL_MonthCalendar() {
m_arrSelDays.RemoveAll();
}
-FWL_Type IFWL_MonthCalendar::GetClassID() const {
- return FWL_Type::MonthCalendar;
-}
-
-FWL_Error IFWL_MonthCalendar::Initialize() {
- if (IFWL_Widget::Initialize() != FWL_Error::Succeeded)
- return FWL_Error::Indefinite;
-
+void IFWL_MonthCalendar::Initialize() {
+ IFWL_Widget::Initialize();
m_pDelegate = new CFWL_MonthCalendarImpDelegate(this);
- return FWL_Error::Succeeded;
}
void IFWL_MonthCalendar::Finalize() {
@@ -169,6 +163,10 @@ void IFWL_MonthCalendar::Finalize() {
IFWL_Widget::Finalize();
}
+FWL_Type IFWL_MonthCalendar::GetClassID() const {
+ return FWL_Type::MonthCalendar;
+}
+
FWL_Error IFWL_MonthCalendar::GetWidgetRect(CFX_RectF& rect,
FX_BOOL bAutoSize) {
if (bAutoSize) {
« no previous file with comments | « xfa/fwl/core/ifwl_monthcalendar.h ('k') | xfa/fwl/core/ifwl_picturebox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698