X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b0ccb8a603b4f97740acc65d9429bb58f7ba1bd..0aa619b53203461ec07541f0ba5ebe4aaf4f7184:/include/wx/calctrl.h?ds=sidebyside

diff --git a/include/wx/calctrl.h b/include/wx/calctrl.h
index 4d800cd3a5..e94354010e 100644
--- a/include/wx/calctrl.h
+++ b/include/wx/calctrl.h
@@ -233,7 +233,7 @@ public:
     //
     // NB: we provide implementation for this pure virtual function, derived
     //     classes should call it
-    virtual bool EnableMonthChange(bool enable) = 0;
+    virtual bool EnableMonthChange(bool enable = true) = 0;
 
 
     // an item without custom attributes is drawn with the default colours and
@@ -259,12 +259,13 @@ public:
 
     // holidays support
     //
-    // currently all functions in this section are implemented in the generic
-    // version of the control only and are simply ignored by native ones
+    // currently only the generic version implements all functions in this
+    // section; wxMSW implements simple support for holidays (they can be
+    // just enabled or disabled) and wxGTK doesn't support them at all
 
     // equivalent to changing wxCAL_SHOW_HOLIDAYS flag but should be called
     // instead of just changing it
-    virtual void EnableHolidayDisplay(bool WXUNUSED(display) = true) { }
+    virtual void EnableHolidayDisplay(bool display = true);
 
     // set/get the colours to use for holidays (if they're enabled)
     virtual void SetHolidayColours(const wxColour& WXUNUSED(colFg),
@@ -313,7 +314,22 @@ protected:
     // generate all the events for the selection change from dateOld to current
     // date: SEL_CHANGED, PAGE_CHANGED if necessary and also one of (deprecated)
     // YEAR/MONTH/DAY_CHANGED ones
-    void GenerateAllChangeEvents(const wxDateTime& dateOld);
+    //
+    // returns true if page changed event was generated, false if the new date
+    // is still in the same month as before
+    bool GenerateAllChangeEvents(const wxDateTime& dateOld);
+
+    // call SetHoliday() for all holidays in the current month
+    //
+    // should be called on month change, does nothing if wxCAL_SHOW_HOLIDAYS is
+    // not set and returns false in this case, true if we do show them
+    bool SetHolidayAttrs();
+
+    // called by SetHolidayAttrs() to forget the previously set holidays
+    virtual void ResetHolidayAttrs() { }
+
+    // called by EnableHolidayDisplay()
+    virtual void RefreshHolidays() { }
 };
 
 // ----------------------------------------------------------------------------