diff options
Diffstat (limited to 'xfa/fwl/cfwl_monthcalendar.h')
| -rw-r--r-- | xfa/fwl/cfwl_monthcalendar.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/xfa/fwl/cfwl_monthcalendar.h b/xfa/fwl/cfwl_monthcalendar.h index 3f1ea207fd..bdf66a0b5c 100644 --- a/xfa/fwl/cfwl_monthcalendar.h +++ b/xfa/fwl/cfwl_monthcalendar.h @@ -19,7 +19,6 @@ #define FWL_ITEMSTATE_MCD_Selected (1L << 1) class CFWL_MessageMouse; -class CFWL_Widget; class CFWL_MonthCalendar : public CFWL_Widget { public: @@ -149,7 +148,7 @@ class CFWL_MonthCalendar : public CFWL_Widget { void OnMouseMove(CFWL_MessageMouse* pMsg); void OnMouseLeave(CFWL_MessageMouse* pMsg); - bool m_bInitialized; + bool m_bInitialized = false; CFX_RectF m_rtHead; CFX_RectF m_rtWeek; CFX_RectF m_rtLBtn; @@ -159,19 +158,17 @@ class CFWL_MonthCalendar : public CFWL_Widget { CFX_RectF m_rtHeadText; CFX_RectF m_rtToday; CFX_RectF m_rtTodayFlag; - CFX_RectF m_rtWeekNum; - CFX_RectF m_rtWeekNumSep; WideString m_wsHead; WideString m_wsToday; std::vector<std::unique_ptr<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; + int32_t m_iCurYear = 2011; + int32_t m_iCurMonth = 1; + int32_t m_iYear = 2011; + int32_t m_iMonth = 1; + int32_t m_iDay = 1; + int32_t m_iHovered = -1; + int32_t m_iLBtnPartStates = CFWL_PartState_Normal; + int32_t m_iRBtnPartStates = CFWL_PartState_Normal; DATE m_dtMin; DATE m_dtMax; CFX_SizeF m_szHead; @@ -179,7 +176,6 @@ class CFWL_MonthCalendar : public CFWL_Widget { CFX_SizeF m_szToday; std::vector<int32_t> m_arrSelDays; CFX_RectF m_rtClient; - bool m_bFlag; }; #endif // XFA_FWL_CFWL_MONTHCALENDAR_H_ |