Cleanup methds in IFWL_MonthCalendar

xfa/fwl/core/ifwl_monthcalendar.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_MONTHCALENDAR_H_
 #define XFA_FWL_CORE_IFWL_MONTHCALENDAR_H_
 
 #include "xfa/fgas/localization/fgas_datetime.h"
@@ skipping 19 matching lines @@
 FWL_EVENT_DEF(CFWL_EventMcdDateChanged,
               CFWL_EventType::DateChanged,
               int32_t m_iOldYear;
               int32_t m_iOldMonth;
               int32_t m_iStartDay;
               int32_t m_iEndDay;)
 
 class CFWL_MsgMouse;
 class IFWL_Widget;
 
-struct FWL_DATEINFO;
+struct FWL_DATEINFO {

[npm, 2016/11/09 21:34:14]

You might be able to forward declare and put inside namespace of the cpp
(when you merge datetimecalendar and monthcalendar)

[dsinclair, 2016/11/10 18:04:16]

Done.

+  FWL_DATEINFO(int32_t day,
+               int32_t dayofweek,
+               uint32_t dwSt,
+               CFX_RectF rc,
+               CFX_WideString& wsday);
+  ~FWL_DATEINFO();
 
-extern uint8_t FX_DaysInMonth(int32_t iYear, uint8_t iMonth);
+  int32_t iDay;
+  int32_t iDayOfWeek;
+  uint32_t dwStates;
+  CFX_RectF rect;
+  CFX_WideString wsDay;
+};
 
 class IFWL_MonthCalendarDP : public IFWL_DataProvider {
  public:
   virtual int32_t GetCurDay(IFWL_Widget* pWidget) = 0;
   virtual int32_t GetCurMonth(IFWL_Widget* pWidget) = 0;
   virtual int32_t GetCurYear(IFWL_Widget* pWidget) = 0;
 };
 
 class IFWL_MonthCalendar : public IFWL_Widget {
  public:
   IFWL_MonthCalendar(const IFWL_App* app,
                      std::unique_ptr<CFWL_WidgetProperties> properties,
                      IFWL_Widget* pOuter);
   ~IFWL_MonthCalendar() override;
 
   // FWL_WidgetImp
   FWL_Type GetClassID() const override;
   void GetWidgetRect(CFX_RectF& rect, bool bAutoSize = false) override;
   void Update() override;
   void DrawWidget(CFX_Graphics* pGraphics,
                   const CFX_Matrix* pMatrix = nullptr) override;
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnDrawWidget(CFX_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix) override;
 
-  int32_t CountSelect();
-  bool GetSelect(int32_t& iYear,
-                 int32_t& iMonth,
-                 int32_t& iDay,
-                 int32_t nIndex = 0);
-  bool SetSelect(int32_t iYear, int32_t iMonth, int32_t iDay);
+  void SetSelect(int32_t iYear, int32_t iMonth, int32_t iDay);
 
- protected:
+ private:
   struct DATE {
     DATE() : iYear(0), iMonth(0), iDay(0) {}
+
     DATE(int32_t year, int32_t month, int32_t day)
         : iYear(year), iMonth(month), iDay(day) {}
+
     bool operator<(const DATE& right) {
-      if (iYear < right.iYear) {
+      if (iYear < right.iYear)
         return true;
-      } else if (iYear == right.iYear) {
-        if (iMonth < right.iMonth) {
+      if (iYear == right.iYear) {
+        if (iMonth < right.iMonth)
           return true;
-        } else if (iMonth == right.iMonth) {
+        if (iMonth == right.iMonth)
           return iDay < right.iDay;
-        }
       }
       return false;
     }
+
     bool operator>(const DATE& right) {
-      if (iYear > right.iYear) {
+      if (iYear > right.iYear)
         return true;
-      } else if (iYear == right.iYear) {
-        if (iMonth > right.iMonth) {
+      if (iYear == right.iYear) {
+        if (iMonth > right.iMonth)
           return true;
-        } else if (iMonth == right.iMonth) {
+        if (iMonth == right.iMonth)
           return iDay > right.iDay;
-        }
       }
       return false;
     }
+
     int32_t iYear;
     int32_t iMonth;
     int32_t iDay;
   };
 
   void DrawBkground(CFX_Graphics* pGraphics,
                     IFWL_ThemeProvider* pTheme,
                     const CFX_Matrix* pMatrix);
   void DrawHeadBK(CFX_Graphics* pGraphics,
                   IFWL_ThemeProvider* pTheme,
@@ skipping 27 matching lines @@
                  const CFX_Matrix* pMatrix);
   void DrawDatesIn(CFX_Graphics* pGraphics,
                    IFWL_ThemeProvider* pTheme,
                    const CFX_Matrix* pMatrix);
   void DrawDatesOut(CFX_Graphics* pGraphics,
                     IFWL_ThemeProvider* pTheme,
                     const CFX_Matrix* pMatrix);
   void DrawDatesInCircle(CFX_Graphics* pGraphics,
                          IFWL_ThemeProvider* pTheme,
                          const CFX_Matrix* pMatrix);
-  void DrawTodayCircle(CFX_Graphics* pGraphics,
-                       IFWL_ThemeProvider* pTheme,
-                       const CFX_Matrix* pMatrix);
   CFX_SizeF CalcSize(bool bAutoSize = false);
-  void LayOut();
+  void Layout();
   void CalcHeadSize();
   void CalcTodaySize();
   void CalDateItem();
   void GetCapValue();
-  int32_t CalWeekNumber(int32_t iYear, int32_t iMonth, int32_t iDay);
-  bool GetMinDate(int32_t& iYear, int32_t& iMonth, int32_t& iDay);
-  bool SetMinDate(int32_t iYear, int32_t iMonth, int32_t iDay);
-  bool GetMaxDate(int32_t& iYear, int32_t& iMonth, int32_t& iDay);
-  bool SetMaxDate(int32_t iYear, int32_t iMonth, int32_t iDay);
-  bool InitDate();
+  void InitDate();
   void ClearDateItem();
-  void ReSetDateItem();
-  bool NextMonth();
-  bool PrevMonth();
+  void ResetDateItem();
+  void NextMonth();
+  void PrevMonth();
   void ChangeToMonth(int32_t iYear, int32_t iMonth);
-  bool RemoveSelDay(int32_t iDay, bool bAll = false);
-  bool AddSelDay(int32_t iDay);
-  bool JumpToToday();
+  void RemoveSelDay(int32_t iDay, bool bAll = false);
+  void AddSelDay(int32_t iDay);
+  void JumpToToday();
   void GetHeadText(int32_t iYear, int32_t iMonth, CFX_WideString& wsHead);
   void GetTodayText(int32_t iYear,
                     int32_t iMonth,
                     int32_t iDay,
                     CFX_WideString& wsToday);
   int32_t GetDayAtPoint(FX_FLOAT x, FX_FLOAT y);
-  bool GetDayRect(int32_t iDay, CFX_RectF& rtDay);
+  void GetDayRect(int32_t iDay, CFX_RectF& rtDay);
+  void OnLButtonDown(CFWL_MsgMouse* pMsg);
+  void OnLButtonUp(CFWL_MsgMouse* pMsg);
+  void DisForm_OnLButtonUp(CFWL_MsgMouse* pMsg);
+  void OnMouseMove(CFWL_MsgMouse* pMsg);
+  void OnMouseLeave(CFWL_MsgMouse* pMsg);
 
-  bool m_bInit;
+  bool m_bInitialized;
   CFX_RectF m_rtHead;
   CFX_RectF m_rtWeek;
   CFX_RectF m_rtLBtn;
   CFX_RectF m_rtRBtn;
   CFX_RectF m_rtDates;
   CFX_RectF m_rtHSep;
   CFX_RectF m_rtHeadText;
   CFX_RectF m_rtToday;
   CFX_RectF m_rtTodayFlag;
   CFX_RectF m_rtWeekNum;
   CFX_RectF m_rtWeekNumSep;
-  CFX_RectF m_rtTemp;
   CFX_WideString m_wsHead;
   CFX_WideString m_wsToday;
   std::unique_ptr<CFX_DateTime> m_pDateTime;
   CFX_ArrayTemplate<FWL_DATEINFO*> m_arrDates;
   int32_t m_iCurYear;
   int32_t m_iCurMonth;
   int32_t m_iYear;
   int32_t m_iMonth;
   int32_t m_iDay;
   int32_t m_iHovered;
   int32_t m_iLBtnPartStates;
   int32_t m_iRBtnPartStates;
   DATE m_dtMin;
   DATE m_dtMax;
   CFX_SizeF m_szHead;
   CFX_SizeF m_szCell;
   CFX_SizeF m_szToday;
   CFX_ArrayTemplate<int32_t> m_arrSelDays;
-  int32_t m_iMaxSel;
   CFX_RectF m_rtClient;
   FX_FLOAT m_fHeadWid;
   FX_FLOAT m_fHeadHei;
   FX_FLOAT m_fHeadBtnWid;
   FX_FLOAT m_fHeadBtnHei;
   FX_FLOAT m_fHeadBtnHMargin;
   FX_FLOAT m_fHeadBtnVMargin;
   FX_FLOAT m_fHeadTextWid;
   FX_FLOAT m_fHeadTextHei;
   FX_FLOAT m_fHeadTextHMargin;
   FX_FLOAT m_fHeadTextVMargin;
   FX_FLOAT m_fHSepWid;
   FX_FLOAT m_fHSepHei;
   FX_FLOAT m_fWeekNumWid;
   FX_FLOAT m_fSepDOffset;
   FX_FLOAT m_fSepX;
   FX_FLOAT m_fSepY;
   FX_FLOAT m_fWeekNumHeigh;
   FX_FLOAT m_fWeekWid;
   FX_FLOAT m_fWeekHei;
   FX_FLOAT m_fDateCellWid;
   FX_FLOAT m_fDateCellHei;
   FX_FLOAT m_fTodayWid;
   FX_FLOAT m_fTodayHei;
   FX_FLOAT m_fTodayFlagWid;
   FX_FLOAT m_fMCWid;
   FX_FLOAT m_fMCHei;
   bool m_bFlag;
-
- private:
-  void OnLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void DisForm_OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnMouseMove(CFWL_MsgMouse* pMsg);
-  void OnMouseLeave(CFWL_MsgMouse* pMsg);
-};
-
-struct FWL_DATEINFO {
-  FWL_DATEINFO(int32_t day,
-               int32_t dayofweek,
-               uint32_t dwSt,
-               CFX_RectF rc,
-               CFX_WideString& wsday);
-  ~FWL_DATEINFO();
-
-  int32_t iDay;
-  int32_t iDayOfWeek;
-  uint32_t dwStates;
-  CFX_RectF rect;
-  CFX_WideString wsDay;
 };
 
 #endif  // XFA_FWL_CORE_IFWL_MONTHCALENDAR_H_