X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d9b77552eeb78e0c7ee903aa265dc187651ff57..0a1c1e6214827e1d9dc9f6ca2c39567cb2d35ebc:/src/generic/calctrl.cpp diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp index b1a43f47e1..f2ecd265a1 100644 --- a/src/generic/calctrl.cpp +++ b/src/generic/calctrl.cpp @@ -32,10 +32,47 @@ #include "wx/dcclient.h" #include "wx/settings.h" #include "wx/brush.h" + #include "wx/combobox.h" + #include "wx/stattext.h" #endif //WX_PRECOMP +// Can only use wxSpinEvent if this is enabled +#if wxUSE_SPINBTN + #include "wx/calctrl.h" +#define DEBUG_PAINT 0 + +// ---------------------------------------------------------------------------- +// private classes +// ---------------------------------------------------------------------------- + +class wxMonthComboBox : public wxComboBox +{ +public: + wxMonthComboBox(wxCalendarCtrl *cal); + + void OnMonthChange(wxCommandEvent& event) { m_cal->OnMonthChange(event); } + +private: + wxCalendarCtrl *m_cal; + + DECLARE_EVENT_TABLE() +}; + +class wxYearSpinCtrl : public wxSpinCtrl +{ +public: + wxYearSpinCtrl(wxCalendarCtrl *cal); + + void OnYearChange(wxSpinEvent& event) { m_cal->OnYearChange(event); } + +private: + wxCalendarCtrl *m_cal; + + DECLARE_EVENT_TABLE() +}; + // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -46,17 +83,59 @@ BEGIN_EVENT_TABLE(wxCalendarCtrl, wxControl) EVT_CHAR(wxCalendarCtrl::OnChar) EVT_LEFT_DOWN(wxCalendarCtrl::OnClick) + EVT_LEFT_DCLICK(wxCalendarCtrl::OnDClick) +END_EVENT_TABLE() + +BEGIN_EVENT_TABLE(wxMonthComboBox, wxComboBox) + EVT_COMBOBOX(-1, wxMonthComboBox::OnMonthChange) +END_EVENT_TABLE() - EVT_COMBOBOX(-1, wxCalendarCtrl::OnMonthChange) - EVT_SPINCTRL(-1, wxCalendarCtrl::OnYearChange) +BEGIN_EVENT_TABLE(wxYearSpinCtrl, wxSpinCtrl) + EVT_SPINCTRL(-1, wxYearSpinCtrl::OnYearChange) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrl, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxCommandEvent) // ============================================================================ // implementation // ============================================================================ +// ---------------------------------------------------------------------------- +// wxMonthComboBox and wxYearSpinCtrl +// ---------------------------------------------------------------------------- + +wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl *cal) + : wxComboBox(cal->GetParent(), -1, + wxEmptyString, + wxDefaultPosition, + wxDefaultSize, + 0, NULL, + wxCB_READONLY) +{ + m_cal = cal; + + wxDateTime::Month m; + for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) ) + { + Append(wxDateTime::GetMonthName(m)); + } + + SetSelection(m_cal->GetDate().GetMonth()); + SetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT); +} + +wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl *cal) + : wxSpinCtrl(cal->GetParent(), -1, + cal->GetDate().Format(_T("%Y")), + wxDefaultPosition, + wxDefaultSize, + wxSP_ARROW_KEYS, + -4300, 10000, cal->GetDate().GetYear()) +{ + m_cal = cal; +} + // ---------------------------------------------------------------------------- // wxCalendarCtrl // ---------------------------------------------------------------------------- @@ -74,42 +153,47 @@ void wxCalendarCtrl::Init() { m_weekdays[wd] = wxDateTime::GetWeekDayName(wd, wxDateTime::Name_Abbr); } + + for ( size_t n = 0; n < WXSIZEOF(m_attrs); n++ ) + { + m_attrs[n] = NULL; + } + + wxSystemSettings ss; + m_colHighlightFg = ss.GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT); + m_colHighlightBg = ss.GetSystemColour(wxSYS_COLOUR_HIGHLIGHT); + + m_colHolidayFg = *wxRED; + // don't set m_colHolidayBg - by default, same as our bg colour + + m_colHeaderFg = *wxBLUE; + m_colHeaderBg = *wxLIGHT_GREY; } -bool wxCalendarCtrl::Create(wxWindow *parent, - wxWindowID id, +bool wxCalendarCtrl::Create(wxWindow * WXUNUSED(parent), + wxWindowID WXUNUSED(id), const wxDateTime& date, - const wxPoint& pos, + const wxPoint& WXUNUSED(pos), const wxSize& size, long style, - const wxString& name) + const wxString& WXUNUSED(name)) { - m_date = date.IsValid() ? date : wxDateTime::Today(); + // needed to get the arrow keys normally used for the dialog navigation + SetWindowStyle(style | wxWANTS_CHARS); - wxString monthNames[12]; - wxDateTime::Month m; - for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) ) - { - monthNames[m] = wxDateTime::GetMonthName(m); - } + m_date = date.IsValid() ? date : wxDateTime::Today(); - m_comboMonth = new wxComboBox(parent, -1, - monthNames[m_date.GetMonth()], - wxDefaultPosition, - wxDefaultSize, - WXSIZEOF(monthNames), monthNames, - wxCB_READONLY); + m_spinYear = new wxYearSpinCtrl(this); + m_staticYear = new wxStaticText(GetParent(), -1, m_date.Format(_T("%Y")), + wxDefaultPosition, wxDefaultSize, + wxALIGN_CENTRE); - m_spinYear = new wxSpinCtrl(parent, -1, - m_date.Format(_T("%Y")), - wxDefaultPosition, - wxDefaultSize, - wxSP_ARROW_KEYS, - -4300, 10000, m_date.GetYear()); + m_comboMonth = new wxMonthComboBox(this); + m_staticMonth = new wxStaticText(GetParent(), -1, m_date.Format(_T("%B")), + wxDefaultPosition, wxDefaultSize, + wxALIGN_CENTRE); - // we want to process the events from these controls - m_comboMonth->PushEventHandler(this); - m_spinYear->PushEventHandler(this); + ShowCurrentControls(); wxSize sizeReal; if ( size.x == -1 || size.y == -1 ) @@ -130,29 +214,155 @@ bool wxCalendarCtrl::Create(wxWindow *parent, SetBackgroundColour(*wxWHITE); SetFont(*wxSWISS_FONT); + SetHolidayAttrs(); + + return TRUE; +} + +wxCalendarCtrl::~wxCalendarCtrl() +{ + for ( size_t n = 0; n < WXSIZEOF(m_attrs); n++ ) + { + delete m_attrs[n]; + } +} + +// ---------------------------------------------------------------------------- +// forward wxWin functions to subcontrols +// ---------------------------------------------------------------------------- + +bool wxCalendarCtrl::Show(bool show) +{ + if ( !wxControl::Show(show) ) + { + return FALSE; + } + + GetMonthControl()->Show(show); + GetYearControl()->Show(show); + return TRUE; } +bool wxCalendarCtrl::Enable(bool enable) +{ + if ( !wxControl::Enable(enable) ) + { + return FALSE; + } + + GetMonthControl()->Enable(enable); + GetYearControl()->Enable(enable); + + return TRUE; +} + +// ---------------------------------------------------------------------------- +// enable/disable month/year controls +// ---------------------------------------------------------------------------- + +void wxCalendarCtrl::ShowCurrentControls() +{ + if ( AllowMonthChange() ) + { + m_comboMonth->Show(); + m_staticMonth->Hide(); + + if ( AllowYearChange() ) + { + m_spinYear->Show(); + m_staticYear->Hide(); + + // skip the rest + return; + } + } + else + { + m_comboMonth->Hide(); + m_staticMonth->Show(); + } + + // year change not allowed here + m_spinYear->Hide(); + m_staticYear->Show(); +} + +wxControl *wxCalendarCtrl::GetMonthControl() const +{ + return AllowMonthChange() ? (wxControl *)m_comboMonth : (wxControl *)m_staticMonth; +} + +wxControl *wxCalendarCtrl::GetYearControl() const +{ + return AllowYearChange() ? (wxControl *)m_spinYear : (wxControl *)m_staticYear; +} + +void wxCalendarCtrl::EnableYearChange(bool enable) +{ + if ( enable != AllowYearChange() ) + { + long style = GetWindowStyle(); + if ( enable ) + style &= ~wxCAL_NO_YEAR_CHANGE; + else + style |= wxCAL_NO_YEAR_CHANGE; + SetWindowStyle(style); + + ShowCurrentControls(); + } +} + +void wxCalendarCtrl::EnableMonthChange(bool enable) +{ + if ( enable != AllowMonthChange() ) + { + long style = GetWindowStyle(); + if ( enable ) + style &= ~wxCAL_NO_MONTH_CHANGE; + else + style |= wxCAL_NO_MONTH_CHANGE; + SetWindowStyle(style); + + ShowCurrentControls(); + } +} + // ---------------------------------------------------------------------------- // changing date // ---------------------------------------------------------------------------- void wxCalendarCtrl::SetDate(const wxDateTime& date) { - if ( m_date.GetMonth() == date.GetMonth() && - m_date.GetYear() == date.GetYear() ) + bool sameMonth = m_date.GetMonth() == date.GetMonth(), + sameYear = m_date.GetYear() == date.GetYear(); + + if ( sameMonth && sameYear ) { // just change the day ChangeDay(date); } else { + if ( !AllowMonthChange() || (!AllowYearChange() && !sameYear) ) + { + // forbidden + return; + } + // change everything m_date = date; // update the controls m_comboMonth->SetSelection(m_date.GetMonth()); - m_spinYear->SetValue(m_date.Format(_T("%Y"))); + + if ( AllowYearChange() ) + { + m_spinYear->SetValue(m_date.Format(_T("%Y"))); + } + + // as the month changed, holidays did too + SetHolidayAttrs(); // update the calendar Refresh(); @@ -195,7 +405,7 @@ void wxCalendarCtrl::SetDateAndNotify(const wxDateTime& date) SetDate(date); - GenerateEvent(type); + GenerateEvents(type, wxEVT_CALENDAR_SEL_CHANGED); } // ---------------------------------------------------------------------------- @@ -207,14 +417,10 @@ wxDateTime wxCalendarCtrl::GetStartDate() const wxDateTime::Tm tm = m_date.GetTm(); wxDateTime date = wxDateTime(1, tm.mon, tm.year); - if ( date.GetWeekDay() != wxDateTime::Sun ) - { - date.SetToPrevWeekDay(wxDateTime::Sun); - // be sure to do it or it might gain 1 hour if DST changed in between - date.ResetTime(); - } - //else: we already have it + // rewind back + date.SetToPrevWeekDay(GetWindowStyle() & wxCAL_MONDAY_FIRST + ? wxDateTime::Mon : wxDateTime::Sun); return date; } @@ -226,7 +432,9 @@ bool wxCalendarCtrl::IsDateShown(const wxDateTime& date) const size_t wxCalendarCtrl::GetWeek(const wxDateTime& date) const { - return date.GetWeekOfMonth(wxDateTime::Sunday_First); + return date.GetWeekOfMonth(GetWindowStyle() & wxCAL_MONDAY_FIRST + ? wxDateTime::Monday_First + : wxDateTime::Sunday_First); } // ---------------------------------------------------------------------------- @@ -237,6 +445,10 @@ size_t wxCalendarCtrl::GetWeek(const wxDateTime& date) const // size or position changes: the combobox and spinctrl are along the top of // the available area and the calendar takes up therest of the space +// the static controls are supposed to be always smaller than combo/spin so we +// always use the latter for size calculations and position the static to take +// the same space + // the constants used for the layout #define VERT_MARGIN 5 // distance between combo and calendar #define HORZ_MARGIN 15 // spin @@ -254,6 +466,12 @@ wxSize wxCalendarCtrl::DoGetBestSize() const height += VERT_MARGIN + wxMax(sizeCombo.y, sizeSpin.y); + if ( GetWindowStyle() & (wxRAISED_BORDER | wxSUNKEN_BORDER) ) + { + // the border would clip the last line otherwise + height += 4; + } + return wxSize(width, height); } @@ -267,10 +485,15 @@ void wxCalendarCtrl::DoSetSize(int x, int y, void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height) { wxSize sizeCombo = m_comboMonth->GetSize(); + wxSize sizeStatic = m_staticMonth->GetSize(); + + int dy = (sizeCombo.y - sizeStatic.y) / 2; m_comboMonth->Move(x, y); + m_staticMonth->SetSize(x, y + dy, sizeCombo.x, sizeStatic.y); int xDiff = sizeCombo.x + HORZ_MARGIN; - m_spinYear->SetSize(x + xDiff, y, width - xDiff, -1); + m_spinYear->SetSize(x + xDiff, y, width - xDiff, sizeCombo.y); + m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y); wxSize sizeSpin = m_spinYear->GetSize(); int yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN; @@ -278,6 +501,28 @@ void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height) wxControl::DoMoveWindow(x, y + yDiff, width, height - yDiff); } +void wxCalendarCtrl::DoGetPosition(int *x, int *y) const +{ + wxControl::DoGetPosition(x, y); + + // our real top corner is not in this position + if ( y ) + { + *y -= GetMonthControl()->GetSize().y + VERT_MARGIN; + } +} + +void wxCalendarCtrl::DoGetSize(int *width, int *height) const +{ + wxControl::DoGetSize(width, height); + + // our real height is bigger + if ( height ) + { + *height += GetMonthControl()->GetSize().y + VERT_MARGIN; + } +} + void wxCalendarCtrl::RecalcGeometry() { if ( m_widthCol != 0 ) @@ -310,33 +555,43 @@ void wxCalendarCtrl::RecalcGeometry() // drawing // ---------------------------------------------------------------------------- -void wxCalendarCtrl::OnPaint(wxPaintEvent& event) +void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); - wxDateTime::WeekDay wd; - dc.SetFont(m_font); RecalcGeometry(); - printf("--- starting to paint, selection: %s, week %u\n", +#if DEBUG_PAINT + wxLogDebug("--- starting to paint, selection: %s, week %u\n", m_date.Format("%a %d-%m-%Y %H:%M:%S").c_str(), GetWeek(m_date)); +#endif // first draw the week days if ( IsExposed(0, 0, 7*m_widthCol, m_heightRow) ) { - puts("painting the header"); +#if DEBUG_PAINT + wxLogDebug("painting the header"); +#endif - dc.SetTextForeground(*wxBLUE); - dc.SetBrush(wxBrush(*wxLIGHT_GREY, wxSOLID)); dc.SetBackgroundMode(wxTRANSPARENT); - dc.SetPen(*wxLIGHT_GREY_PEN); + dc.SetTextForeground(m_colHeaderFg); + dc.SetBrush(wxBrush(m_colHeaderBg, wxSOLID)); + dc.SetPen(wxPen(m_colHeaderBg, 1, wxSOLID)); dc.DrawRectangle(0, 0, 7*m_widthCol, m_heightRow); - for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) ) + + bool startOnMonday = (GetWindowStyle() & wxCAL_MONDAY_FIRST) != 0; + for ( size_t wd = 0; wd < 7; wd++ ) { - dc.DrawText(m_weekdays[wd], wd*m_widthCol + 1, 0); + size_t n; + if ( startOnMonday ) + n = wd == 6 ? 0 : wd + 1; + else + n = wd; + + dc.DrawText(m_weekdays[n], wd*m_widthCol + 1, 0); } } @@ -347,52 +602,138 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& event) wxCoord y = m_heightRow; wxDateTime date = GetStartDate(); - printf("starting calendar from %s\n", +#if DEBUG_PAINT + wxLogDebug("starting calendar from %s\n", date.Format("%a %d-%m-%Y %H:%M:%S").c_str()); +#endif dc.SetBackgroundMode(wxSOLID); for ( size_t nWeek = 1; nWeek <= 6; nWeek++, y += m_heightRow ) { // if the update region doesn't intersect this row, don't paint it - if ( !IsExposed(0, y, 7*m_widthCol, y + m_heightRow - 1) ) + if ( !IsExposed(0, y, 7*m_widthCol, m_heightRow - 1) ) { date += wxDateSpan::Week(); continue; } - printf("painting week %d at y = %d\n", nWeek, y); +#if DEBUG_PAINT + wxLogDebug("painting week %d at y = %d\n", nWeek, y); +#endif - for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) ) + for ( size_t wd = 0; wd < 7; wd++ ) { if ( IsDateShown(date) ) { - wxString day = wxString::Format(_T("%u"), date.GetDay()); + // don't use wxDate::Format() which prepends 0s + unsigned int day = date.GetDay(); + wxString dayStr = wxString::Format(_T("%u"), day); wxCoord width; - dc.GetTextExtent(day, &width, (wxCoord *)NULL); + dc.GetTextExtent(dayStr, &width, (wxCoord *)NULL); + + bool changedColours = FALSE, + changedFont = FALSE; + + wxCalendarDateAttr *attr = m_attrs[day - 1]; bool isSel = m_date == date; if ( isSel ) { - dc.SetTextForeground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); - dc.SetTextBackground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT)); + dc.SetTextForeground(m_colHighlightFg); + dc.SetTextBackground(m_colHighlightBg); + + changedColours = TRUE; + } + else if ( attr ) + { + wxColour colFg, colBg; + + if ( attr->IsHoliday() ) + { + colFg = m_colHolidayFg; + colBg = m_colHolidayBg; + } + else + { + colFg = attr->GetTextColour(); + colBg = attr->GetBackgroundColour(); + } + + if ( colFg.Ok() ) + { + dc.SetTextForeground(colFg); + changedColours = TRUE; + } + + if ( colBg.Ok() ) + { + dc.SetTextBackground(colBg); + changedColours = TRUE; + } + + if ( attr->HasFont() ) + { + dc.SetFont(attr->GetFont()); + changedFont = TRUE; + } } - dc.DrawText(day, wd*m_widthCol + (m_widthCol - width) / 2, y); + wxCoord x = wd*m_widthCol + (m_widthCol - width) / 2; + dc.DrawText(dayStr, x, y + 1); - if ( isSel ) + if ( !isSel && attr && attr->HasBorder() ) + { + wxColour colBorder; + if ( attr->HasBorderColour() ) + { + colBorder = attr->GetBorderColour(); + } + else + { + colBorder = m_foregroundColour; + } + + wxPen pen(colBorder, 1, wxSOLID); + dc.SetPen(pen); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + + switch ( attr->GetBorder() ) + { + case wxCAL_BORDER_SQUARE: + dc.DrawRectangle(x - 2, y, + width + 4, m_heightRow); + break; + + case wxCAL_BORDER_ROUND: + dc.DrawEllipse(x - 2, y, + width + 4, m_heightRow); + break; + + default: + wxFAIL_MSG(_T("unknown border type")); + } + } + + if ( changedColours ) { dc.SetTextForeground(m_foregroundColour); dc.SetTextBackground(m_backgroundColour); } + + if ( changedFont ) + { + dc.SetFont(m_font); + } } //else: just don't draw it date += wxDateSpan::Day(); } } - - puts("+++ finished painting"); +#if DEBUG_PAINT + wxLogDebug("+++ finished painting"); +#endif } void wxCalendarCtrl::RefreshDate(const wxDateTime& date) @@ -409,10 +750,21 @@ void wxCalendarCtrl::RefreshDate(const wxDateTime& date) rect.width = 7*m_widthCol; rect.height = m_heightRow; - printf("*** refreshing week %d at (%d, %d)-(%d, %d)\n", +#ifdef __WXMSW__ + // VZ: for some reason, the selected date seems to occupy more space under + // MSW - this is probably some bug in the font size calculations, but I + // don't know where exactly. This fix is ugly and leads to more + // refreshes than really needed, but without it the selected days + // leaves even more ugly underscores on screen. + rect.Inflate(0, 1); +#endif // MSW + +#if DEBUG_PAINT + wxLogDebug("*** refreshing week %d at (%d, %d)-(%d, %d)\n", GetWeek(date), rect.x, rect.y, rect.x + rect.width, rect.y + rect.height); +#endif Refresh(TRUE, &rect); } @@ -421,44 +773,92 @@ void wxCalendarCtrl::RefreshDate(const wxDateTime& date) // mouse handling // ---------------------------------------------------------------------------- -void wxCalendarCtrl::OnClick(wxMouseEvent& event) +void wxCalendarCtrl::OnDClick(wxMouseEvent& event) { - RecalcGeometry(); - - wxDateTime date; - if ( !HitTest(event.GetPosition(), &date) ) + if ( HitTest(event.GetPosition()) != wxCAL_HITTEST_DAY ) { event.Skip(); } else { - ChangeDay(date); + GenerateEvent(wxEVT_CALENDAR_DOUBLECLICKED); + } +} + +void wxCalendarCtrl::OnClick(wxMouseEvent& event) +{ + wxDateTime date; + wxDateTime::WeekDay wday; + switch ( HitTest(event.GetPosition(), &date, &wday) ) + { + case wxCAL_HITTEST_DAY: + ChangeDay(date); + + GenerateEvents(wxEVT_CALENDAR_DAY_CHANGED, + wxEVT_CALENDAR_SEL_CHANGED); + break; + + case wxCAL_HITTEST_HEADER: + { + wxCalendarEvent event(this, wxEVT_CALENDAR_WEEKDAY_CLICKED); + event.m_wday = wday; + (void)GetEventHandler()->ProcessEvent(event); + } + break; - GenerateEvent(wxEVT_CALENDAR_DAY_CHANGED); + default: + wxFAIL_MSG(_T("unknown hittest code")); + // fall through + + case wxCAL_HITTEST_NOWHERE: + event.Skip(); + break; } } -bool wxCalendarCtrl::HitTest(const wxPoint& pos, wxDateTime *date) +wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos, + wxDateTime *date, + wxDateTime::WeekDay *wd) { RecalcGeometry(); + int wday = pos.x / m_widthCol; + wxCoord y = pos.y; if ( y < m_heightRow ) - return FALSE; + { + if ( wd ) + { + if ( GetWindowStyle() & wxCAL_MONDAY_FIRST ) + { + wday = wday == 6 ? 0 : wday + 1; + } + + *wd = (wxDateTime::WeekDay)wday; + } - y -= m_heightRow; - int week = y / m_heightRow, - wday = pos.x / m_widthCol; + return wxCAL_HITTEST_HEADER; + } + int week = (y - m_heightRow) / m_heightRow; if ( week >= 6 || wday >= 7 ) - return FALSE; + { + return wxCAL_HITTEST_NOWHERE; + } - wxCHECK_MSG( date, FALSE, _T("bad pointer in wxCalendarCtrl::HitTest") ); + wxDateTime dt = GetStartDate() + wxDateSpan::Days(7*week + wday); - *date = GetStartDate(); - *date += wxDateSpan::Days(7*week + wday); + if ( IsDateShown(dt) ) + { + if ( date ) + *date = dt; - return IsDateShown(*date); + return wxCAL_HITTEST_DAY; + } + else + { + return wxCAL_HITTEST_NOWHERE; + } } // ---------------------------------------------------------------------------- @@ -475,24 +875,20 @@ void wxCalendarCtrl::OnMonthChange(wxCommandEvent& event) tm.mday = wxDateTime::GetNumberOfDays(mon, tm.year); } - SetDate(wxDateTime(tm.mday, mon, tm.year)); - - GenerateEvent(wxEVT_CALENDAR_MONTH_CHANGED); + SetDateAndNotify(wxDateTime(tm.mday, mon, tm.year)); } void wxCalendarCtrl::OnYearChange(wxSpinEvent& event) { wxDateTime::Tm tm = m_date.GetTm(); - int year = event.GetInt(); + int year = (int)event.GetInt(); if ( tm.mday > wxDateTime::GetNumberOfDays(tm.mon, year) ) { tm.mday = wxDateTime::GetNumberOfDays(tm.mon, year); } - SetDate(wxDateTime(tm.mday, tm.mon, year)); - - GenerateEvent(wxEVT_CALENDAR_YEAR_CHANGED); + SetDateAndNotify(wxDateTime(tm.mday, tm.mon, year)); } // ---------------------------------------------------------------------------- @@ -513,20 +909,30 @@ void wxCalendarCtrl::OnChar(wxKeyEvent& event) SetDateAndNotify(m_date - wxDateSpan::Year()); break; - case WXK_PAGEDOWN: - SetDateAndNotify(m_date + wxDateSpan::Year()); + case WXK_PRIOR: + SetDateAndNotify(m_date - wxDateSpan::Month()); break; - case WXK_PAGEUP: - SetDateAndNotify(m_date - wxDateSpan::Year()); + case WXK_NEXT: + SetDateAndNotify(m_date + wxDateSpan::Month()); break; case WXK_RIGHT: - SetDateAndNotify(m_date + wxDateSpan::Day()); + if ( event.ControlDown() ) + SetDateAndNotify(wxDateTime(m_date).SetToNextWeekDay( + GetWindowStyle() & wxCAL_MONDAY_FIRST + ? wxDateTime::Sun : wxDateTime::Sat)); + else + SetDateAndNotify(m_date + wxDateSpan::Day()); break; case WXK_LEFT: - SetDateAndNotify(m_date - wxDateSpan::Day()); + if ( event.ControlDown() ) + SetDateAndNotify(wxDateTime(m_date).SetToPrevWeekDay( + GetWindowStyle() & wxCAL_MONDAY_FIRST + ? wxDateTime::Mon : wxDateTime::Sun)); + else + SetDateAndNotify(m_date - wxDateSpan::Day()); break; case WXK_UP: @@ -538,7 +944,18 @@ void wxCalendarCtrl::OnChar(wxKeyEvent& event) break; case WXK_HOME: - SetDateAndNotify(wxDateTime::Today()); + if ( event.ControlDown() ) + SetDateAndNotify(wxDateTime::Today()); + else + SetDateAndNotify(wxDateTime(1, m_date.GetMonth(), m_date.GetYear())); + break; + + case WXK_END: + SetDateAndNotify(wxDateTime(m_date).SetToLastMonthDay()); + break; + + case WXK_RETURN: + GenerateEvent(wxEVT_CALENDAR_DOUBLECLICKED); break; default: @@ -547,18 +964,82 @@ void wxCalendarCtrl::OnChar(wxKeyEvent& event) } // ---------------------------------------------------------------------------- -// wxCalendarEvent +// holidays handling // ---------------------------------------------------------------------------- -void wxCalendarCtrl::GenerateEvent(wxEventType type) +void wxCalendarCtrl::EnableHolidayDisplay(bool display) +{ + long style = GetWindowStyle(); + if ( display ) + style |= wxCAL_SHOW_HOLIDAYS; + else + style &= ~wxCAL_SHOW_HOLIDAYS; + + SetWindowStyle(style); + + if ( display ) + SetHolidayAttrs(); + else + ResetHolidayAttrs(); + + Refresh(); +} + +void wxCalendarCtrl::SetHolidayAttrs() { - // we're called for a change in some particular date field but we always - // also generate a generic "changed" event - wxCalendarEvent event(this, type); - wxCalendarEvent event2(this, wxEVT_CALENDAR_SEL_CHANGED); + if ( GetWindowStyle() & wxCAL_SHOW_HOLIDAYS ) + { + ResetHolidayAttrs(); + + wxDateTime::Tm tm = m_date.GetTm(); + wxDateTime dtStart(1, tm.mon, tm.year), + dtEnd = dtStart.GetLastMonthDay(); + + wxDateTimeArray hol; + wxDateTimeHolidayAuthority::GetHolidaysInRange(dtStart, dtEnd, hol); + + size_t count = hol.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + SetHoliday(hol[n].GetDay()); + } + } +} + +void wxCalendarCtrl::SetHoliday(size_t day) +{ + wxCHECK_RET( day > 0 && day < 32, _T("invalid day in SetHoliday") ); + + wxCalendarDateAttr *attr = GetAttr(day); + if ( !attr ) + { + attr = new wxCalendarDateAttr; + } + + attr->SetHoliday(TRUE); + + // can't use SetAttr() because it would delete this pointer + m_attrs[day - 1] = attr; +} - (void)GetEventHandler()->ProcessEvent(event); - (void)GetEventHandler()->ProcessEvent(event2); +void wxCalendarCtrl::ResetHolidayAttrs() +{ + for ( size_t day = 0; day < 31; day++ ) + { + if ( m_attrs[day] ) + { + m_attrs[day]->SetHoliday(FALSE); + } + } +} + +// ---------------------------------------------------------------------------- +// wxCalendarEvent +// ---------------------------------------------------------------------------- + +void wxCalendarEvent::Init() +{ + m_wday = wxDateTime::Inv_WeekDay; } wxCalendarEvent::wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type) @@ -566,3 +1047,6 @@ wxCalendarEvent::wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type) { m_date = cal->GetDate(); } + +#endif // wxUSE_SPINBTN +