reactivate commented out method

[wxWidgets.git] / src / gtk / calctrl.cpp

diff --git a/src/gtk/calctrl.cpp b/src/gtk/calctrl.cpp
index 24b1d73347446f6ba1d5c6267350a6d83519d691..09104839e041a05fb34564e5ba37a1ece55576cd 100644 (file)
--- a/src/gtk/calctrl.cpp
+++ b/src/gtk/calctrl.cpp
@@ -162,9 +162,22 @@ bool wxGtkCalendarCtrl::SetDate(const wxDateTime& date)
 
 wxDateTime wxGtkCalendarCtrl::GetDate() const
 {
-    guint year, month, day;
-    gtk_calendar_get_date(GTK_CALENDAR(m_widget), &year, &month, &day);
-    return wxDateTime(day, (wxDateTime::Month) month, year);
+    guint year, monthGTK, day;
+    gtk_calendar_get_date(GTK_CALENDAR(m_widget), &year, &monthGTK, &day);
+
+    // GTK may return an invalid date, this happens at least when switching the
+    // month (or the year in case of February in a leap year) and the new month
+    // has fewer days than the currently selected one making the currently
+    // selected day invalid, e.g. just choosing May 31 and going back a month
+    // results in the date being (non existent) April 31 when we're called from
+    // gtk_prev_month_callback(). We need to manually work around this to avoid
+    // asserts from wxDateTime ctor.
+    const wxDateTime::Month month = static_cast<wxDateTime::Month>(monthGTK);
+    const guint dayMax = wxDateTime::GetNumberOfDays(month, year);
+    if ( day > dayMax )
+        day = dayMax;
+
+    return wxDateTime(day, month, year);
 }
 
 void wxGtkCalendarCtrl::Mark(size_t day, bool mark)