From dd17234c42e4572b85b6d74a07bc901974d061be Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 21 Nov 2016 09:04:05 -0800 Subject: Split fwl/core class pt I. Split classes in FWL to be single class per file. In the case of data providers which added no new methods, removed and used the IFWL_DataProvider directly. Review-Url: https://codereview.chromium.org/2506253004 --- xfa/fwl/core/ifwl_datetimepicker.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 e9aeb08be2..c8d70f5575 100644 --- a/xfa/fwl/core/ifwl_datetimepicker.h +++ b/xfa/fwl/core/ifwl_datetimepicker.h @@ -9,7 +9,6 @@ #include "xfa/fwl/core/cfwl_event.h" #include "xfa/fwl/core/cfwl_widgetproperties.h" -#include "xfa/fwl/core/ifwl_dataprovider.h" #include "xfa/fwl/core/ifwl_datetimeedit.h" #include "xfa/fwl/core/ifwl_monthcalendar.h" #include "xfa/fwl/core/ifwl_widget.h" @@ -34,7 +33,7 @@ class IFWL_DateTimeEdit; class IFWL_FormProxy; -class IFWL_DateTimePickerDP : public IFWL_DataProvider { +class IFWL_DateTimePickerDP : public IFWL_Widget::DataProvider { public: virtual void GetToday(IFWL_Widget* pWidget, int32_t& iYear, @@ -42,7 +41,8 @@ class IFWL_DateTimePickerDP : public IFWL_DataProvider { int32_t& iDay) = 0; }; -class IFWL_DateTimePicker : public IFWL_Widget, public IFWL_MonthCalendarDP { +class IFWL_DateTimePicker : public IFWL_Widget, + public IFWL_MonthCalendar::DataProvider { public: explicit IFWL_DateTimePicker( const IFWL_App* app, @@ -61,10 +61,10 @@ class IFWL_DateTimePicker : public IFWL_Widget, public IFWL_MonthCalendarDP { void OnDrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; - // IFWL_DataProvider + // IFWL_Widget::DataProvider void GetCaption(IFWL_Widget* pWidget, CFX_WideString& wsCaption) override; - // IFWL_MonthCalendarDP + // IFWL_MonthCalendar::DataProvider int32_t GetCurDay(IFWL_Widget* pWidget) override; int32_t GetCurMonth(IFWL_Widget* pWidget) override; int32_t GetCurYear(IFWL_Widget* pWidget) override; -- cgit v1.2.3