X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ccd1b4987831a84c7b2898b25c0e54770b3f5f2..bb24f84b70d0b295253b985978e7f4f4bd0b24d1:/include/wx/msw/calctrl.h?ds=sidebyside

diff --git a/include/wx/msw/calctrl.h b/include/wx/msw/calctrl.h
index 50df43095e..d27875cf06 100644
--- a/include/wx/msw/calctrl.h
+++ b/include/wx/msw/calctrl.h
@@ -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,
@@ -53,7 +54,7 @@ public:
     virtual void SetWindowStyleFlag(long style);
 
 protected:
-    virtual wxSize wxCalendarCtrl::DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const;
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
@@ -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)