From 4f7222ca3632e40ad8f77947dba6bced63733655 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 11 Jul 2012 11:42:39 +0000 Subject: [PATCH] Fix bug with using invalid date in wxMSW wxCalendarCtrl. Fall back to the start date of the native control if our own date was not set yet. Closes #14476. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/calctrl.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/msw/calctrl.cpp b/src/msw/calctrl.cpp index 7d80380b93..6af1285b68 100644 --- a/src/msw/calctrl.cpp +++ b/src/msw/calctrl.cpp @@ -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); -- 2.45.2