From 72f15a08aa47afb61e3c60b3f754309696c471ec Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 10 Nov 2016 13:01:54 -0800 Subject: Fold IFWL_DateTimeCalendar into IFWL_MonthCalendar The IFWL_MonthCalendar was never instantiated and had a single sub-class. This CL folds the subclass into IFWL_MonthCalendar and uses MonthCalendar directly. Review-Url: https://codereview.chromium.org/2491443003 --- xfa/fwl/core/ifwl_datetimepicker.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'xfa/fwl/core/ifwl_datetimepicker.h') diff --git a/xfa/fwl/core/ifwl_datetimepicker.h b/xfa/fwl/core/ifwl_datetimepicker.h index a7464e78e6..f6742838c4 100644 --- a/xfa/fwl/core/ifwl_datetimepicker.h +++ b/xfa/fwl/core/ifwl_datetimepicker.h @@ -30,7 +30,6 @@ #define FWL_STYLEEXT_DTP_EditVAlignMask (3L << 6) #define FWL_STYLEEXT_DTP_EditHAlignModeMask (3L << 8) -class IFWL_DateTimeCalendar; class IFWL_DateTimeEdit; class IFWL_FormProxy; @@ -140,13 +139,13 @@ class IFWL_DateTimePicker : public IFWL_Widget, public IFWL_MonthCalendarDP { int32_t m_iDay; bool m_bLBtnDown; std::unique_ptr m_pEdit; - std::unique_ptr m_pMonthCal; + std::unique_ptr m_pMonthCal; std::unique_ptr m_pForm; FX_FLOAT m_fBtn; private: FWL_Error DisForm_Initialize(); - void DisForm_InitDateTimeCalendar(); + void DisForm_InitMonthCalendar(); void DisForm_InitDateTimeEdit(); bool DisForm_IsMonthCalendarShowed(); void DisForm_ShowMonthCalendar(bool bActivate); -- cgit v1.2.3