X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7313db77a7c6d9606c258145994b27ab993f0883..8a31648287be0ef976f133de2786b137f1e98340:/src/msw/calctrl.cpp

diff --git a/src/msw/calctrl.cpp b/src/msw/calctrl.cpp
index 56ac3fdb18..31ab4b65f1 100644
--- a/src/msw/calctrl.cpp
+++ b/src/msw/calctrl.cpp
@@ -34,8 +34,6 @@
 
 #include "wx/msw/private/datecontrols.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrl, wxControl)
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -214,7 +212,7 @@ wxCalendarCtrl::HitTest(const wxPoint& pos,
 
         case MCHT_CALENDARDATE:
             if ( date )
-                date->SetFromMSWSysTime(hti.st);
+                date->SetFromMSWSysDate(hti.st);
             return wxCAL_HITTEST_DAY;
 
         case MCHT_CALENDARDAY:
@@ -262,11 +260,9 @@ wxCalendarCtrl::HitTest(const wxPoint& pos,
 bool wxCalendarCtrl::SetDate(const wxDateTime& dt)
 {
     wxCHECK_MSG( dt.IsValid(), false, "invalid date" );
-    wxDateTime newdt(dt);
-    newdt.ResetTime();
-    
+
     SYSTEMTIME st;
-    newdt.GetAsMSWSysTime(&st);
+    dt.GetAsMSWSysDate(&st);
     if ( !MonthCal_SetCurSel(GetHwnd(), &st) )
     {
         wxLogDebug(wxT("DateTime_SetSystemtime() failed"));
@@ -274,7 +270,7 @@ bool wxCalendarCtrl::SetDate(const wxDateTime& dt)
         return false;
     }
 
-    m_date = newdt;
+    m_date = dt.GetDateOnly();
 
     return true;
 }
@@ -283,6 +279,7 @@ wxDateTime wxCalendarCtrl::GetDate() const
 {
 #if wxDEBUG_LEVEL
     SYSTEMTIME st;
+
     if ( !MonthCal_GetCurSel(GetHwnd(), &st) )
     {
         wxASSERT_MSG( !m_date.IsValid(), "mismatch between data and control" );
@@ -290,9 +287,14 @@ wxDateTime wxCalendarCtrl::GetDate() const
         return wxDefaultDateTime;
     }
 
-    wxDateTime dt(st);
+    wxDateTime dt;
+    dt.SetFromMSWSysDate(st);
 
-    wxASSERT_MSG( dt == m_date, "mismatch between data and control" );
+    // Windows XP and earlier didn't include the time component into the
+    // returned date but Windows 7 does, so we can't compare the full objects
+    // in the same way under all the Windows versions, just compare their date
+    // parts
+    wxASSERT_MSG( dt.IsSameDate(m_date), "mismatch between data and control" );
 #endif // wxDEBUG_LEVEL
 
     return m_date;
@@ -331,7 +333,7 @@ bool wxCalendarCtrl::GetDateRange(wxDateTime *dt1, wxDateTime *dt2) const
     if ( dt1 )
     {
         if ( flags & GDTR_MIN )
-            dt1->SetFromMSWSysTime(st[0]);
+            dt1->SetFromMSWSysDate(st[0]);
         else
             *dt1 = wxDefaultDateTime;
     }
@@ -339,7 +341,7 @@ bool wxCalendarCtrl::GetDateRange(wxDateTime *dt1, wxDateTime *dt2) const
     if ( dt2 )
     {
         if ( flags & GDTR_MAX )
-            dt2->SetFromMSWSysTime(st[1]);
+            dt2->SetFromMSWSysDate(st[1]);
         else
             *dt2 = wxDefaultDateTime;
     }
@@ -398,22 +400,33 @@ void wxCalendarCtrl::UpdateMarks()
     // before it and from the one after it so days from 3 different months can
     // be partially shown
     MONTHDAYSTATE states[3] = { 0 };
-    const int nMonths = MonthCal_GetMonthRange(GetHwnd(), GMR_DAYSTATE, NULL);
+    const DWORD nMonths = MonthCal_GetMonthRange(GetHwnd(), GMR_DAYSTATE, NULL);
 
     // although in principle the calendar might not show any days from the
     // preceding months, it seems like it always does, consider e.g. Feb 2010
     // which starts on Monday and ends on Sunday and so could fit on 4 lines
     // without showing any subsequent months -- the standard control still
     // shows it on 6 lines and the number of visible months is still 3
-    wxCHECK_RET( nMonths == (int)WXSIZEOF(states), "unexpected months range" );
-
-    // the fully visible month is the one in the middle
-    states[1] = m_marks | m_holidays;
-
-    if ( !MonthCal_SetDayState(GetHwnd(), nMonths, states) )
+    //
+    // OTOH Windows 7 control can show all 12 months or even years or decades
+    // 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) )
     {
-        wxLogLastError(wxT("MonthCal_SetDayState"));
+        wxFAIL_MSG("unexpectedly few months shown in the control");
+    }
+    else if ( nMonths == WXSIZEOF(states) )
+    {
+        // the fully visible month is the one in the middle
+        states[1] = m_marks | m_holidays;
+
+        if ( !MonthCal_SetDayState(GetHwnd(), nMonths, states) )
+        {
+            wxLogLastError(wxT("MonthCal_SetDayState"));
+        }
     }
+    //else: not a month view at all
 }
 
 void wxCalendarCtrl::UpdateFirstDayOfWeek()
@@ -438,7 +451,7 @@ bool wxCalendarCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 // which expects GetDate() to return the new date
                 const wxDateTime dateOld = m_date;
                 const NMSELCHANGE * const sch = (NMSELCHANGE *)lParam;
-                m_date.SetFromMSWSysTime(sch->stSelStart);
+                m_date.SetFromMSWSysDate(sch->stSelStart);
 
                 // changing the year or the month results in a second dummy
                 // MCN_SELCHANGE event on this system which doesn't really