Fold DataProviders into parent classes

xfa/fwl/core/ifwl_datetimepicker.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef XFA_FWL_CORE_IFWL_DATETIMEPICKER_H_
 #define XFA_FWL_CORE_IFWL_DATETIMEPICKER_H_
 
 #include "xfa/fwl/core/cfwl_event.h"
@@ skipping 42 matching lines @@
               int32_t iDay;)
 
 class IFWL_DateTimePickerDP : public IFWL_DataProvider {
  public:
   virtual FWL_Error GetToday(IFWL_Widget* pWidget,
                              int32_t& iYear,
                              int32_t& iMonth,
                              int32_t& iDay) = 0;
 };
 
-class IFWL_DateTimePicker : public IFWL_Widget {
+class IFWL_DateTimePicker : public IFWL_Widget, public IFWL_MonthCalendarDP {
  public:
   explicit IFWL_DateTimePicker(
       const IFWL_App* app,
       std::unique_ptr<CFWL_WidgetProperties> properties);
   ~IFWL_DateTimePicker() override;
 
   // IFWL_Widget
   FWL_Type GetClassID() const override;
   FWL_Error GetWidgetRect(CFX_RectF& rect, bool bAutoSize = false) override;
   FWL_Error Update() override;
@@ skipping 32 matching lines @@
   FWL_Error ModifyEditStylesEx(uint32_t dwStylesExAdded,
                                uint32_t dwStylesExRemoved);
   IFWL_DateTimeEdit* GetDataTimeEdit();
 
   bool IsMonthCalendarShowed();
   void ShowMonthCalendar(bool bActivate);
   void ProcessSelChanged(int32_t iYear, int32_t iMonth, int32_t iDay);
 
   IFWL_FormProxy* GetFormProxy() const { return m_pForm.get(); }
 
+  // IFWL_DataProvider
+  FWL_Error GetCaption(IFWL_Widget* pWidget,
+                       CFX_WideString& wsCaption) override;
+
+  // IFWL_MonthCalendarDP
+  int32_t GetCurDay(IFWL_Widget* pWidget) override;
+  int32_t GetCurMonth(IFWL_Widget* pWidget) override;
+  int32_t GetCurYear(IFWL_Widget* pWidget) override;
+
  protected:
-  class CFWL_MonthCalendarImpDP : public IFWL_MonthCalendarDP {
-   public:
-    CFWL_MonthCalendarImpDP();
-
-    // IFWL_DataProvider
-    FWL_Error GetCaption(IFWL_Widget* pWidget,
-                         CFX_WideString& wsCaption) override;
-
-    // IFWL_MonthCalendarDP
-    int32_t GetCurDay(IFWL_Widget* pWidget) override;
-    int32_t GetCurMonth(IFWL_Widget* pWidget) override;
-    int32_t GetCurYear(IFWL_Widget* pWidget) override;
-
-    int32_t m_iCurDay;
-    int32_t m_iCurYear;
-    int32_t m_iCurMonth;
-  };
-
   void DrawDropDownButton(CFX_Graphics* pGraphics,
                           IFWL_ThemeProvider* pTheme,
                           const CFX_Matrix* pMatrix);
   void FormatDateString(int32_t iYear,
                         int32_t iMonth,
                         int32_t iDay,
                         CFX_WideString& wsText);
   void ReSetEditAlignment();
   void InitProxyForm();
 
   CFX_RectF m_rtBtn;
   CFX_RectF m_rtClient;
   int32_t m_iBtnState;
   int32_t m_iYear;
   int32_t m_iMonth;
   int32_t m_iDay;
   bool m_bLBtnDown;
   std::unique_ptr<IFWL_DateTimeEdit> m_pEdit;
   std::unique_ptr<IFWL_DateTimeCalendar> m_pMonthCal;
   std::unique_ptr<IFWL_FormProxy> m_pForm;
   FX_FLOAT m_fBtn;
-  CFWL_MonthCalendarImpDP m_MonthCalendarDP;
 
  private:
   FWL_Error DisForm_Initialize();
   void DisForm_InitDateTimeCalendar();
   void DisForm_InitDateTimeEdit();
   bool DisForm_IsMonthCalendarShowed();
   void DisForm_ShowMonthCalendar(bool bActivate);
   FWL_WidgetHit DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy);
   bool DisForm_IsNeedShowButton();
   FWL_Error DisForm_Update();
   FWL_Error DisForm_GetWidgetRect(CFX_RectF& rect, bool bAutoSize = false);
   FWL_Error DisForm_GetBBox(CFX_RectF& rect);
   FWL_Error DisForm_DrawWidget(CFX_Graphics* pGraphics,
                                const CFX_Matrix* pMatrix = nullptr);
 
   void OnFocusChanged(CFWL_Message* pMsg, bool bSet);
   void OnLButtonDown(CFWL_MsgMouse* pMsg);
   void OnLButtonUp(CFWL_MsgMouse* pMsg);
   void OnMouseMove(CFWL_MsgMouse* pMsg);
   void OnMouseLeave(CFWL_MsgMouse* pMsg);
   void DisForm_OnFocusChanged(CFWL_Message* pMsg, bool bSet);
+
+  int32_t m_iCurYear;
+  int32_t m_iCurMonth;
+  int32_t m_iCurDay;
 };
 
 #endif  // XFA_FWL_CORE_IFWL_DATETIMEPICKER_H_