X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/169b83dd23fb5fa91dcac062fe7aafa5fb22a2db..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/msw/calctrl.cpp?ds=sidebyside

diff --git a/src/msw/calctrl.cpp b/src/msw/calctrl.cpp
index b168a1b7d3..6af1285b68 100644
--- 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) )
@@ -396,10 +396,12 @@ void wxCalendarCtrl::SetHoliday(size_t day)
 
 void wxCalendarCtrl::UpdateMarks()
 {
-    // we show only one full month but there can be some days from the month
-    // before it and from the one after it so days from 3 different months can
-    // be partially shown
-    MONTHDAYSTATE states[3] = { 0 };
+    // Currently the native control may show more than one month if its size is
+    // big enough. Ideal would be to prevent this from happening but there
+    // doesn't seem to be any obvious way to do it, so for now just handle the
+    // possibility that we can display several of them: one before the current
+    // one and up to 12 after it.
+    MONTHDAYSTATE states[14] = { 0 };
     const DWORD nMonths = MonthCal_GetMonthRange(GetHwnd(), GMR_DAYSTATE, NULL);
 
     // although in principle the calendar might not show any days from the
@@ -412,13 +414,9 @@ void wxCalendarCtrl::UpdateMarks()
     // in its window if you "zoom out" of it by double clicking on free areas
     // so the return value can be (much, in case of decades view) greater than
     // 3 but in this case marks are not visible anyhow so simply ignore it
-    if ( nMonths < WXSIZEOF(states) )
+    if ( nMonths >= 2 && nMonths <= WXSIZEOF(states) )
     {
-        wxFAIL_MSG("unexpectedly few months shown in the control");
-    }
-    else if ( nMonths == WXSIZEOF(states) )
-    {
-        // the fully visible month is the one in the middle
+        // The current, fully visible month is always the second one.
         states[1] = m_marks | m_holidays;
 
         if ( !MonthCal_SetDayState(GetHwnd(), nMonths, states) )
@@ -472,9 +470,26 @@ bool wxCalendarCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         case MCN_GETDAYSTATE:
             {
                 const NMDAYSTATE * const ds = (NMDAYSTATE *)lParam;
+
+                wxDateTime startDate;
+                startDate.SetFromMSWSysDate(ds->stStart);
+
+                // 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);
+
                 for ( int i = 0; i < ds->cDayState; i++ )
                 {
-                    ds->prgDayState[i] = m_marks | m_holidays;
+                    // set holiday/marks only for the "current" month
+                    if ( startDate == currentDate )
+                        ds->prgDayState[i] = m_marks | m_holidays;
+                    else
+                        ds->prgDayState[i] = 0;
+
+                    startDate += wxDateSpan::Month();
                 }
             }
             break;