mark holidays if wxCAL_SHOW_HOLIDAYS is on (replaces #9155)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -45,6 +45,7 @@ public:
|
||||
virtual bool EnableMonthChange(bool enable = true);
|
||||
|
||||
virtual void Mark(size_t day, bool mark);
|
||||
virtual void SetHoliday(size_t day);
|
||||
|
||||
virtual wxCalendarHitTestResult HitTest(const wxPoint& pos,
|
||||
wxDateTime *date = NULL,
|
||||
@@ -63,7 +64,7 @@ protected:
|
||||
void MSWOnDoubleClick(wxMouseEvent& event);
|
||||
|
||||
private:
|
||||
void Init() { m_marks = 0; }
|
||||
void Init();
|
||||
|
||||
// bring the control in sync with m_marks
|
||||
void UpdateMarks();
|
||||
@@ -72,6 +73,12 @@ private:
|
||||
// wxCAL_MONDAY_FIRST flag
|
||||
void UpdateFirstDayOfWeek();
|
||||
|
||||
// reset holiday information
|
||||
virtual void ResetHolidayAttrs() { m_holidays = 0; }
|
||||
|
||||
// redisplay holidays
|
||||
virtual void RefreshHolidays() { UpdateMarks(); }
|
||||
|
||||
|
||||
// current date, we need to store it instead of simply retrieving it from
|
||||
// the control as needed in order to be able to generate the correct events
|
||||
@@ -81,6 +88,9 @@ private:
|
||||
// bit field containing the state (marked or not) of all days in the month
|
||||
wxUint32 m_marks;
|
||||
|
||||
// the same but indicating whether a day is a holiday or not
|
||||
wxUint32 m_holidays;
|
||||
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxCalendarCtrl)
|
||||
DECLARE_NO_COPY_CLASS(wxCalendarCtrl)
|
||||
|
Reference in New Issue
Block a user