missing commit

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

diff --git a/src/msw/calctrl.cpp b/src/msw/calctrl.cpp
index 467ced1e8c930497be4df747fcbd08ceac00846a..6af1285b681b58171d227779fee0e1e81f5ad4c4 100644 (file)
--- a/src/msw/calctrl.cpp
+++ b/src/msw/calctrl.cpp
@@ -109,7 +109,7 @@ wxCalendarCtrl::Create(wxWindow *parent,
     }
 
     const wxChar * const clsname = s_clsMonthCal.IsRegistered()
-        ? s_clsMonthCal.GetName().wx_str()
+        ? s_clsMonthCal.GetName().t_str()
         : MONTHCAL_CLASS;
 
     if ( !MSWCreateControl(clsname, wxEmptyString, pos, size) )
@@ -474,7 +474,9 @@ bool wxCalendarCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 wxDateTime startDate;
                 startDate.SetFromMSWSysDate(ds->stStart);
 
-                wxDateTime currentDate = m_date;
+                // Ensure we have a valid date to work with.
+                wxDateTime currentDate = m_date.IsValid() ? m_date : startDate;
+
                 // Set to the start of month for comparison with startDate to
                 // work correctly.
                 currentDate.SetDay(1);