Fold IFWL_DateTimeCalendar into IFWL_MonthCalendar

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 12 matching lines @@
 #define FWL_STYLEEXT_DTP_EditHFar (2L << 4)
 #define FWL_STYLEEXT_DTP_EditVNear (0L << 6)
 #define FWL_STYLEEXT_DTP_EditVCenter (1L << 6)
 #define FWL_STYLEEXT_DTP_EditVFar (2L << 6)
 #define FWL_STYLEEXT_DTP_EditJustified (1L << 8)
 #define FWL_STYLEEXT_DTP_EditDistributed (2L << 8)
 #define FWL_STYLEEXT_DTP_EditHAlignMask (3L << 4)
 #define FWL_STYLEEXT_DTP_EditVAlignMask (3L << 6)
 #define FWL_STYLEEXT_DTP_EditHAlignModeMask (3L << 8)
 
-class IFWL_DateTimeCalendar;
 class IFWL_DateTimeEdit;
 class IFWL_FormProxy;
 
 FWL_EVENT_DEF(CFWL_Event_DtpDropDown, CFWL_EventType::DropDown)
 
 FWL_EVENT_DEF(CFWL_Event_DtpCloseUp, CFWL_EventType::CloseUp)
 
 FWL_EVENT_DEF(CFWL_Event_DtpEditChanged,
               CFWL_EventType::EditChanged,
               CFX_WideString m_wsText;)
@@ skipping 89 matching lines @@
   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_MonthCalendar> m_pMonthCal;
   std::unique_ptr<IFWL_FormProxy> 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);
   FWL_WidgetHit DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy);
   bool DisForm_IsNeedShowButton();
   void DisForm_Update();
   void DisForm_GetWidgetRect(CFX_RectF& rect, bool bAutoSize = false);
   FWL_Error DisForm_GetBBox(CFX_RectF& rect);
   void 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_