#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
}
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;
- // initialize the control
+ // initialize the control
UpdateFirstDayOfWeek();
SetDate(dt.IsValid() ? dt : wxDateTime::Today());
- if ( SetHolidayAttrs() )
- UpdateMarks();
+ SetHolidayAttrs();
+ UpdateMarks();
Connect(wxEVT_LEFT_DOWN,
wxMouseEventHandler(wxCalendarCtrl::MSWOnClick));
case MCHT_CALENDARDATE:
if ( date )
- date->SetFromMSWSysTime(hti.st);
+ date->SetFromMSWSysDate(hti.st);
return wxCAL_HITTEST_DAY;
case MCHT_CALENDARDAY:
if ( wd )
{
- *wd = 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;
wxCHECK_MSG( dt.IsValid(), false, "invalid date" );
SYSTEMTIME st;
- dt.GetAsMSWSysTime(&st);
+ dt.GetAsMSWSysDate(&st);
if ( !MonthCal_SetCurSel(GetHwnd(), &st) )
{
wxLogDebug(wxT("DateTime_SetSystemtime() failed"));
return false;
}
- m_date = dt;
+ m_date = dt.GetDateOnly();
return true;
}
{
#if wxDEBUG_LEVEL
SYSTEMTIME st;
+
if ( !MonthCal_GetCurSel(GetHwnd(), &st) )
{
wxASSERT_MSG( !m_date.IsValid(), "mismatch between data and control" );
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;
if ( dt1 )
{
if ( flags & GDTR_MIN )
- dt1->SetFromMSWSysTime(st[0]);
+ dt1->SetFromMSWSysDate(st[0]);
else
*dt1 = wxDefaultDateTime;
}
if ( dt2 )
{
if ( flags & GDTR_MAX )
- dt2->SetFromMSWSysTime(st[1]);
+ dt2->SetFromMSWSysDate(st[1]);
else
*dt2 = wxDefaultDateTime;
}
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 };
- const int nMonths = MonthCal_GetMonthRange(GetHwnd(), GMR_DAYSTATE, NULL);
+ // 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
- 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 >= 2 && nMonths <= WXSIZEOF(states) )
{
- wxLogLastError(wxT("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) ? 0 : 6);
+ MonthCal_SetFirstDayOfWeek(GetHwnd(),
+ HasFlag(wxCAL_MONDAY_FIRST) ? MonthCal_Monday
+ : MonthCal_Sunday);
}
// ----------------------------------------------------------------------------
// 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
{
// month changed, need to update the holidays if we use
// them
- if ( SetHolidayAttrs() )
- UpdateMarks();
+ SetHolidayAttrs();
+ UpdateMarks();
}
}
}
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;
projects / wxWidgets.git / blobdiff