// wxCalendarCtrl creation
// ----------------------------------------------------------------------------
+void wxCalendarCtrl::Init()
+{
+ m_marks =
+ m_holidays = 0;
+}
+
bool
wxCalendarCtrl::Create(wxWindow *parent,
wxWindowID id,
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;
if ( !MSWCreateControl(clsname, wxEmptyString, pos, size) )
return false;
+ // initialize the control
+ UpdateFirstDayOfWeek();
+
SetDate(dt.IsValid() ? dt : wxDateTime::Today());
- UpdateMarks();
+ if ( SetHolidayAttrs() )
+ UpdateMarks();
+ Connect(wxEVT_LEFT_DOWN,
+ wxMouseEventHandler(wxCalendarCtrl::MSWOnClick));
Connect(wxEVT_LEFT_DCLICK,
wxMouseEventHandler(wxCalendarCtrl::MSWOnDoubleClick));
{
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
// we also need this style for Mark() to work
styleMSW |= MCS_DAYSTATE;
+ if ( style & wxCAL_SHOW_WEEK_NUMBERS )
+ styleMSW |= MCS_WEEKNUMBERS;
+
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
// ----------------------------------------------------------------------------
+// TODO: handle WM_WININICHANGE
wxSize wxCalendarCtrl::DoGetBestSize() const
{
RECT rc;
case MCHT_CALENDARDATE:
if ( date )
- wxMSWDateControls::FromSystemTime(date, hti.st);
+ date->SetFromMSWSysTime(hti.st);
return wxCAL_HITTEST_DAY;
case MCHT_CALENDARDAY:
if ( wd )
{
- *wd = wx_static_cast(wxDateTime::WeekDay, hti.st.wDayOfWeek);
+ *wd = static_cast<wxDateTime::WeekDay>(hti.st.wDayOfWeek);
}
return wxCAL_HITTEST_HEADER;
wxCHECK_MSG( dt.IsValid(), false, "invalid date" );
SYSTEMTIME st;
- wxMSWDateControls::ToSystemTime(&st, dt);
+ dt.GetAsMSWSysTime(&st);
if ( !MonthCal_SetCurSel(GetHwnd(), &st) )
{
wxLogDebug(_T("DateTime_SetSystemtime() failed"));
return wxDefaultDateTime;
}
- wxDateTime dt;
- wxMSWDateControls::FromSystemTime(&dt, st);
+ wxDateTime dt(st);
wxASSERT_MSG( dt == m_date, "mismatch between data and control" );
#endif // __WXDEBUG__
DWORD flags = 0;
if ( dt1.IsValid() )
{
- wxMSWDateControls::ToSystemTime(&st[0], dt1);
+ dt1.GetAsMSWSysTime(st + 0);
flags |= GDTR_MIN;
}
if ( dt2.IsValid() )
{
- wxMSWDateControls::ToSystemTime(&st[1], dt2);
+ dt2.GetAsMSWSysTime(st + 1);
flags |= GDTR_MAX;
}
if ( dt1 )
{
if ( flags & GDTR_MIN )
- wxMSWDateControls::FromSystemTime(dt1, st[0]);
+ dt1->SetFromMSWSysTime(st[0]);
else
*dt1 = wxDefaultDateTime;
}
if ( dt2 )
{
if ( flags & GDTR_MAX )
- wxMSWDateControls::FromSystemTime(dt2, st[1]);
+ dt2->SetFromMSWSysTime(st[1]);
else
*dt2 = wxDefaultDateTime;
}
UpdateMarks();
}
+void wxCalendarCtrl::SetHoliday(size_t day)
+{
+ wxCHECK_RET( day > 0 && day < 32, "invalid day" );
+
+ m_holidays |= 1 << (day - 1);
+}
+
void wxCalendarCtrl::UpdateMarks()
{
- MONTHDAYSTATE states[3];
+ // 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);
- wxCHECK_RET( nMonths <= WXSIZEOF(states), "unexpected months range" );
- for ( int i = 0; i < nMonths; i++ )
- states[i] = m_marks;
+ // 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) )
{
}
}
+void wxCalendarCtrl::UpdateFirstDayOfWeek()
+{
+ MonthCal_SetFirstDayOfWeek(GetHwnd(), HasFlag(wxCAL_MONDAY_FIRST) ? 0 : 6);
+}
+
// ----------------------------------------------------------------------------
// wxCalendarCtrl events
// ----------------------------------------------------------------------------
// 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.SetFromMSWSysTime(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 )
{
- GenerateAllChangeEvents(dateOld);
+ if ( GenerateAllChangeEvents(dateOld) )
+ {
+ // month changed, need to update the holidays if we use
+ // them
+ if ( SetHolidayAttrs() )
+ UpdateMarks();
+ }
}
}
break;
const NMDAYSTATE * const ds = (NMDAYSTATE *)lParam;
for ( int i = 0; i < ds->cDayState; i++ )
{
- ds->prgDayState[i] = m_marks;
+ ds->prgDayState[i] = m_marks | m_holidays;
}
}
break;
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
projects / wxWidgets.git / blobdiff