summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xfa/fwl/cfwl_monthcalendar.cpp36
-rw-r--r--xfa/fwl/cfwl_monthcalendar.h22
2 files changed, 12 insertions, 46 deletions
diff --git a/xfa/fwl/cfwl_monthcalendar.cpp b/xfa/fwl/cfwl_monthcalendar.cpp
index 8ac67e669d..c254bca253 100644
--- a/xfa/fwl/cfwl_monthcalendar.cpp
+++ b/xfa/fwl/cfwl_monthcalendar.cpp
@@ -87,35 +87,9 @@ CFWL_MonthCalendar::CFWL_MonthCalendar(
const CFWL_App* app,
std::unique_ptr<CFWL_WidgetProperties> properties,
CFWL_Widget* pOuter)
- : CFWL_Widget(app, std::move(properties), pOuter),
- m_bInitialized(false),
- m_iCurYear(2011),
- m_iCurMonth(1),
- m_iYear(2011),
- m_iMonth(1),
- m_iDay(1),
- m_iHovered(-1),
- m_iLBtnPartStates(CFWL_PartState_Normal),
- m_iRBtnPartStates(CFWL_PartState_Normal),
- m_bFlag(false) {
- m_rtHead.Reset();
- m_rtWeek.Reset();
- m_rtLBtn.Reset();
- m_rtRBtn.Reset();
- m_rtDates.Reset();
- m_rtHSep.Reset();
- m_rtHeadText.Reset();
- m_rtToday.Reset();
- m_rtTodayFlag.Reset();
- m_rtClient.Reset();
- m_rtWeekNum.Reset();
- m_rtWeekNumSep.Reset();
-}
-
-CFWL_MonthCalendar::~CFWL_MonthCalendar() {
- ClearDateItem();
- m_arrSelDays.clear();
-}
+ : CFWL_Widget(app, std::move(properties), pOuter) {}
+
+CFWL_MonthCalendar::~CFWL_MonthCalendar() = default;
FWL_Type CFWL_MonthCalendar::GetClassID() const {
return FWL_Type::MonthCalendar;
@@ -756,10 +730,6 @@ void CFWL_MonthCalendar::OnLButtonDown(CFWL_MessageMouse* pMsg) {
} else if (m_rtToday.Contains(pMsg->m_pos)) {
JumpToToday();
RepaintRect(m_rtClient);
- } else {
- CFWL_DateTimePicker* pIPicker = static_cast<CFWL_DateTimePicker*>(m_pOuter);
- if (pIPicker->IsMonthCalendarVisible())
- m_bFlag = true;
}
}
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_