From eb3f68cc7f25a1e28464eb251161b8f08fcd04bc Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 7 Nov 2016 10:28:47 -0800 Subject: Fold DataProviders into parent classes This CL removes the data provider classes and folds the code into the parent classes. Review-Url: https://codereview.chromium.org/2480233003 --- xfa/fwl/core/cfwl_datetimepicker.h | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) (limited to 'xfa/fwl/core/cfwl_datetimepicker.h') diff --git a/xfa/fwl/core/cfwl_datetimepicker.h b/xfa/fwl/core/cfwl_datetimepicker.h index 327364ce6a..2b5277f495 100644 --- a/xfa/fwl/core/cfwl_datetimepicker.h +++ b/xfa/fwl/core/cfwl_datetimepicker.h @@ -10,7 +10,7 @@ #include "xfa/fwl/core/cfwl_widget.h" #include "xfa/fwl/core/ifwl_datetimepicker.h" -class CFWL_DateTimePicker : public CFWL_Widget { +class CFWL_DateTimePicker : public CFWL_Widget, public IFWL_DateTimePickerDP { public: CFWL_DateTimePicker(const IFWL_App*); ~CFWL_DateTimePicker() override; @@ -42,27 +42,21 @@ class CFWL_DateTimePicker : public CFWL_Widget { FWL_Error ModifyEditStylesEx(uint32_t dwStylesExAdded, uint32_t dwStylesExRemoved); - protected: - class CFWL_DateTimePickerDP : public IFWL_DateTimePickerDP { - public: - CFWL_DateTimePickerDP(); - - // IFWL_DataProvider - FWL_Error GetCaption(IFWL_Widget* pWidget, - CFX_WideString& wsCaption) override; - - // IFWL_DateTimePickerDP - FWL_Error GetToday(IFWL_Widget* pWidget, - int32_t& iYear, - int32_t& iMonth, - int32_t& iDay) override; - int32_t m_iYear; - int32_t m_iMonth; - int32_t m_iDay; - CFX_WideString m_wsData; - }; - - CFWL_DateTimePickerDP m_DateTimePickerDP; + // IFWL_DataProvider + FWL_Error GetCaption(IFWL_Widget* pWidget, + CFX_WideString& wsCaption) override; + + // IFWL_DateTimePickerDP + FWL_Error GetToday(IFWL_Widget* pWidget, + int32_t& iYear, + int32_t& iMonth, + int32_t& iDay) override; + + private: + int32_t m_iYear; + int32_t m_iMonth; + int32_t m_iDay; + CFX_WideString m_wsData; }; #endif // XFA_FWL_CORE_CFWL_DATETIMEPICKER_H_ -- cgit v1.2.3