Simplify the version information resource definition a little.

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

diff --git a/src/msw/calctrl.cpp b/src/msw/calctrl.cpp
index 69c5abeb6b858d51e3b59d4ab9a6bd765a822660..6af1285b681b58171d227779fee0e1e81f5ad4c4 100644 (file)
--- a/src/msw/calctrl.cpp
+++ b/src/msw/calctrl.cpp
@@ -34,7 +34,26 @@
 
 #include "wx/msw/private/datecontrols.h"
 
 
 #include "wx/msw/private/datecontrols.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrl, wxControl)
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+namespace
+{
+
+// values of week days used by the native control
+enum
+{
+    MonthCal_Monday,
+    MonthCal_Tuesday,
+    MonthCal_Wednesday,
+    MonthCal_Thursday,
+    MonthCal_Friday,
+    MonthCal_Saturday,
+    MonthCal_Sunday
+};
+
+} // anonymous namespace

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -44,6 +63,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrl, wxControl)
 // wxCalendarCtrl creation
 // ----------------------------------------------------------------------------
 
 // wxCalendarCtrl creation
 // ----------------------------------------------------------------------------
 

+void wxCalendarCtrl::Init()
+{
+    m_marks =
+    m_holidays = 0;
+}
+

 bool
 wxCalendarCtrl::Create(wxWindow *parent,
                        wxWindowID id,
 bool
 wxCalendarCtrl::Create(wxWindow *parent,
                        wxWindowID id,


@@ -56,6 +81,9 @@ wxCalendarCtrl::Create(wxWindow *parent,
     if ( !wxMSWDateControls::CheckInitialization() )
         return false;
 
     if ( !wxMSWDateControls::CheckInitialization() )
         return false;
 

+    // we need the arrows for the navigation
+    style |= wxWANTS_CHARS;
+

     // initialize the base class
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return false;
     // initialize the base class
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return false;


@@ -76,21 +104,27 @@ wxCalendarCtrl::Create(wxWindow *parent,
         }
         else
         {
         }
         else
         {

-            wxLogLastError(_T("GetClassInfoEx(SysMonthCal32)"));
+            wxLogLastError(wxT("GetClassInfoEx(SysMonthCal32)"));

         }
     }
 
     const wxChar * const clsname = s_clsMonthCal.IsRegistered()
         }
     }
 
     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) )
         return false;
 
         : MONTHCAL_CLASS;
 
     if ( !MSWCreateControl(clsname, wxEmptyString, pos, size) )
         return false;
 

+    // initialize the control
+    UpdateFirstDayOfWeek();
+

     SetDate(dt.IsValid() ? dt : wxDateTime::Today());
 
     SetDate(dt.IsValid() ? dt : wxDateTime::Today());
 

+    SetHolidayAttrs();

     UpdateMarks();
 
     UpdateMarks();
 

+    Connect(wxEVT_LEFT_DOWN,
+            wxMouseEventHandler(wxCalendarCtrl::MSWOnClick));

     Connect(wxEVT_LEFT_DCLICK,
             wxMouseEventHandler(wxCalendarCtrl::MSWOnDoubleClick));
 
     Connect(wxEVT_LEFT_DCLICK,
             wxMouseEventHandler(wxCalendarCtrl::MSWOnDoubleClick));
 


@@ -101,9 +135,8 @@ WXDWORD wxCalendarCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD styleMSW = wxCalendarCtrlBase::MSWGetStyle(style, exstyle);
 
 {
     WXDWORD styleMSW = wxCalendarCtrlBase::MSWGetStyle(style, exstyle);
 

-    // right now we don't support any native styles but we should add wx styles
-    // corresponding to MCS_NOTODAY, MCS_NOTODAYCIRCLE and MCS_WEEKNUMBERS
-    // probably (TODO)
+    // right now we don't support all native styles but we should add wx styles
+    // corresponding to MCS_NOTODAY and MCS_NOTODAYCIRCLE probably (TODO)

 
     // for compatibility with the other versions, just turn off today display
     // unconditionally for now
 
     // for compatibility with the other versions, just turn off today display
     // unconditionally for now


@@ -112,15 +145,27 @@ WXDWORD wxCalendarCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
     // we also need this style for Mark() to work
     styleMSW |= MCS_DAYSTATE;
 
     // we also need this style for Mark() to work
     styleMSW |= MCS_DAYSTATE;
 

+    if ( style & wxCAL_SHOW_WEEK_NUMBERS )
+       styleMSW |= MCS_WEEKNUMBERS;
+

     return styleMSW;
 }
 
     return styleMSW;
 }
 

-// TODO: handle WM_WININICHANGE
+void wxCalendarCtrl::SetWindowStyleFlag(long style)
+{
+    const bool hadMondayFirst = HasFlag(wxCAL_MONDAY_FIRST);
+
+    wxCalendarCtrlBase::SetWindowStyleFlag(style);
+
+    if ( HasFlag(wxCAL_MONDAY_FIRST) != hadMondayFirst )
+        UpdateFirstDayOfWeek();
+}

 
 // ----------------------------------------------------------------------------
 // wxCalendarCtrl geometry
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxCalendarCtrl geometry
 // ----------------------------------------------------------------------------
 

+// TODO: handle WM_WININICHANGE

 wxSize wxCalendarCtrl::DoGetBestSize() const
 {
     RECT rc;
 wxSize wxCalendarCtrl::DoGetBestSize() const
 {
     RECT rc;


@@ -140,6 +185,15 @@ wxCalendarCtrl::HitTest(const wxPoint& pos,
                         wxDateTime::WeekDay *wd)
 {
     WinStruct<MCHITTESTINFO> hti;
                         wxDateTime::WeekDay *wd)
 {
     WinStruct<MCHITTESTINFO> hti;

+
+    // Vista and later SDKs add a few extra fields to MCHITTESTINFO which are
+    // not supported by the previous versions, as we don't use them anyhow we
+    // should pretend that we always use the old struct format to make the call
+    // below work on pre-Vista systems (see #11057)
+#ifdef MCHITTESTINFO_V1_SIZE
+    hti.cbSize = MCHITTESTINFO_V1_SIZE;
+#endif
+

     hti.pt.x = pos.x;
     hti.pt.y = pos.y;
     switch ( MonthCal_HitTest(GetHwnd(), &hti) )
     hti.pt.x = pos.x;
     hti.pt.y = pos.y;
     switch ( MonthCal_HitTest(GetHwnd(), &hti) )


@@ -158,13 +212,32 @@ wxCalendarCtrl::HitTest(const wxPoint& pos,
 
         case MCHT_CALENDARDATE:
             if ( date )
 
         case MCHT_CALENDARDATE:
             if ( date )

-                wxMSWDateControls::FromSystemTime(date, hti.st);
+                date->SetFromMSWSysDate(hti.st);

             return wxCAL_HITTEST_DAY;
 
         case MCHT_CALENDARDAY:
             if ( wd )
             {
             return wxCAL_HITTEST_DAY;
 
         case MCHT_CALENDARDAY:
             if ( wd )
             {

-                *wd = wx_static_cast(wxDateTime::WeekDay, hti.st.wDayOfWeek);
+                int day = hti.st.wDayOfWeek;
+
+                // the native control returns incorrect day of the week when
+                // the first day isn't Monday, i.e. the first column is always
+                // "Monday" even if its label is "Sunday", compensate for it
+                const int first = LOWORD(MonthCal_GetFirstDayOfWeek(GetHwnd()));
+                if ( first == MonthCal_Monday )
+                {
+                    // as MonthCal_Monday is 0 while wxDateTime::Mon is 1,
+                    // normally we need to do this to transform from MSW
+                    // convention to wx one
+                    day++;
+                    day %= 7;
+                }
+                //else: but when the first day is MonthCal_Sunday, the native
+                //      control still returns 0 (i.e. MonthCal_Monday) for the
+                //      first column which looks like a bug in it but to work
+                //      around it it's enough to not apply the correction above
+
+                *wd = static_cast<wxDateTime::WeekDay>(day);

             }
             return wxCAL_HITTEST_HEADER;
 
             }
             return wxCAL_HITTEST_HEADER;
 


@@ -189,23 +262,24 @@ bool wxCalendarCtrl::SetDate(const wxDateTime& dt)
     wxCHECK_MSG( dt.IsValid(), false, "invalid date" );
 
     SYSTEMTIME st;
     wxCHECK_MSG( dt.IsValid(), false, "invalid date" );
 
     SYSTEMTIME st;

-    wxMSWDateControls::ToSystemTime(&st, dt);
+    dt.GetAsMSWSysDate(&st);

     if ( !MonthCal_SetCurSel(GetHwnd(), &st) )
     {
     if ( !MonthCal_SetCurSel(GetHwnd(), &st) )
     {

-        wxLogDebug(_T("DateTime_SetSystemtime() failed"));
+        wxLogDebug(wxT("DateTime_SetSystemtime() failed"));

 
         return false;
     }
 
 
         return false;
     }
 

-    m_date = dt;
+    m_date = dt.GetDateOnly();

 
     return true;
 }
 
 wxDateTime wxCalendarCtrl::GetDate() const
 {
 
     return true;
 }
 
 wxDateTime wxCalendarCtrl::GetDate() const
 {

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

     SYSTEMTIME st;
     SYSTEMTIME st;

+

     if ( !MonthCal_GetCurSel(GetHwnd(), &st) )
     {
         wxASSERT_MSG( !m_date.IsValid(), "mismatch between data and control" );
     if ( !MonthCal_GetCurSel(GetHwnd(), &st) )
     {
         wxASSERT_MSG( !m_date.IsValid(), "mismatch between data and control" );


@@ -214,10 +288,14 @@ wxDateTime wxCalendarCtrl::GetDate() const
     }
 
     wxDateTime dt;
     }
 
     wxDateTime dt;

-    wxMSWDateControls::FromSystemTime(&dt, st);
+    dt.SetFromMSWSysDate(st);

 
 

-    wxASSERT_MSG( dt == m_date, "mismatch between data and control" );
-#endif // __WXDEBUG__
+    // 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;
 }
 
     return m_date;
 }


@@ -229,19 +307,19 @@ bool wxCalendarCtrl::SetDateRange(const wxDateTime& dt1, const wxDateTime& dt2)
     DWORD flags = 0;
     if ( dt1.IsValid() )
     {
     DWORD flags = 0;
     if ( dt1.IsValid() )
     {

-        wxMSWDateControls::ToSystemTime(&st[0], dt1);
+        dt1.GetAsMSWSysTime(st + 0);

         flags |= GDTR_MIN;
     }
 
     if ( dt2.IsValid() )
     {
         flags |= GDTR_MIN;
     }
 
     if ( dt2.IsValid() )
     {

-        wxMSWDateControls::ToSystemTime(&st[1], dt2);
+        dt2.GetAsMSWSysTime(st + 1);

         flags |= GDTR_MAX;
     }
 
     if ( !MonthCal_SetRange(GetHwnd(), flags, st) )
     {
         flags |= GDTR_MAX;
     }
 
     if ( !MonthCal_SetRange(GetHwnd(), flags, st) )
     {

-        wxLogDebug(_T("MonthCal_SetRange() failed"));
+        wxLogDebug(wxT("MonthCal_SetRange() failed"));

     }
 
     return flags != 0;
     }
 
     return flags != 0;


@@ -255,7 +333,7 @@ bool wxCalendarCtrl::GetDateRange(wxDateTime *dt1, wxDateTime *dt2) const
     if ( dt1 )
     {
         if ( flags & GDTR_MIN )
     if ( dt1 )
     {
         if ( flags & GDTR_MIN )

-            wxMSWDateControls::FromSystemTime(dt1, st[0]);
+            dt1->SetFromMSWSysDate(st[0]);

         else
             *dt1 = wxDefaultDateTime;
     }
         else
             *dt1 = wxDefaultDateTime;
     }


@@ -263,7 +341,7 @@ bool wxCalendarCtrl::GetDateRange(wxDateTime *dt1, wxDateTime *dt2) const
     if ( dt2 )
     {
         if ( flags & GDTR_MAX )
     if ( dt2 )
     {
         if ( flags & GDTR_MAX )

-            wxMSWDateControls::FromSystemTime(dt2, st[1]);
+            dt2->SetFromMSWSysDate(st[1]);

         else
             *dt2 = wxDefaultDateTime;
     }
         else
             *dt2 = wxDefaultDateTime;
     }


@@ -309,19 +387,51 @@ void wxCalendarCtrl::Mark(size_t day, bool mark)
     UpdateMarks();
 }
 
     UpdateMarks();
 }
 

-void wxCalendarCtrl::UpdateMarks()
+void wxCalendarCtrl::SetHoliday(size_t day)

 {
 {

-    MONTHDAYSTATE states[3];
-    const int nMonths = MonthCal_GetMonthRange(GetHwnd(), GMR_DAYSTATE, NULL);
-    wxCHECK_RET( nMonths <= WXSIZEOF(states), "unexpected months range" );
+    wxCHECK_RET( day > 0 && day < 32, "invalid day" );

 
 

-    for ( int i = 0; i < nMonths; i++ )
-        states[i] = m_marks;
+    m_holidays |= 1 << (day - 1);
+}

 
 

-    if ( !MonthCal_SetDayState(GetHwnd(), nMonths, states) )
+void wxCalendarCtrl::UpdateMarks()
+{
+    // 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
+    // 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
+    //
+    // 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 >= 2 && nMonths <= WXSIZEOF(states) )

     {
     {

-        wxLogLastError(_T("MonthCal_SetDayState"));
+        // The current, fully visible month is always the second one.
+        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()
+{
+    MonthCal_SetFirstDayOfWeek(GetHwnd(),
+                               HasFlag(wxCAL_MONDAY_FIRST) ? MonthCal_Monday
+                                                           : MonthCal_Sunday);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -339,14 +449,20 @@ 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;
                 // which expects GetDate() to return the new date
                 const wxDateTime dateOld = m_date;
                 const NMSELCHANGE * const sch = (NMSELCHANGE *)lParam;

-                wxMSWDateControls::FromSystemTime(&m_date, 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
                 // change anything -- filter it out
                 if ( m_date != dateOld )
                 {
 
                 // changing the year or the month results in a second dummy
                 // MCN_SELCHANGE event on this system which doesn't really
                 // change anything -- filter it out
                 if ( m_date != dateOld )
                 {

-                    GenerateAllChangeEvents(dateOld);
+                    if ( GenerateAllChangeEvents(dateOld) )
+                    {
+                        // month changed, need to update the holidays if we use
+                        // them
+                        SetHolidayAttrs();
+                        UpdateMarks();
+                    }

                 }
             }
             break;
                 }
             }
             break;


@@ -354,9 +470,26 @@ bool wxCalendarCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         case MCN_GETDAYSTATE:
             {
                 const NMDAYSTATE * const ds = (NMDAYSTATE *)lParam;
         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++ )
                 {
                 for ( int i = 0; i < ds->cDayState; i++ )
                 {

-                    ds->prgDayState[i] = m_marks;
+                    // 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;
                 }
             }
             break;


@@ -380,4 +513,13 @@ void wxCalendarCtrl::MSWOnDoubleClick(wxMouseEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

+void wxCalendarCtrl::MSWOnClick(wxMouseEvent& event)
+{
+    // for some reason, the control doesn't get focus on its own when the user
+    // clicks in it
+    SetFocus();
+
+    event.Skip();
+}
+

 #endif // wxUSE_CALENDARCTRL
 #endif // wxUSE_CALENDARCTRL