Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed refresh problem with holidays in wxCalendarCtrl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-11 19:12:47 +00:00
parent c2754d2903
commit 0de868d9dd
5 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/generic/calctrl.cpp
View File

@@ -81,9 +81,6 @@ BEGIN_EVENT_TABLE(wxCalendarCtrl, wxControl)
EVT_LEFT_DOWN(wxCalendarCtrl::OnClick)
EVT_LEFT_DCLICK(wxCalendarCtrl::OnDClick)
EVT_CALENDAR_MONTH(-1, wxCalendarCtrl::OnCalMonthChange)
EVT_CALENDAR_YEAR(-1, wxCalendarCtrl::OnCalMonthChange)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxMonthComboBox, wxComboBox)
@@ -359,6 +356,9 @@ void wxCalendarCtrl::SetDate(const wxDateTime& date)
m_spinYear->SetValue(m_date.Format(_T("%Y")));
}
// as the month changed, holidays did too
SetHolidayAttrs();
// update the calendar
Refresh();
}
@@ -861,9 +861,7 @@ void wxCalendarCtrl::OnMonthChange(wxCommandEvent& event)
tm.mday = wxDateTime::GetNumberOfDays(mon, tm.year);
}
SetDate(wxDateTime(tm.mday, mon, tm.year));
GenerateEvents(wxEVT_CALENDAR_MONTH_CHANGED, wxEVT_CALENDAR_SEL_CHANGED);
SetDateAndNotify(wxDateTime(tm.mday, mon, tm.year));
}
void wxCalendarCtrl::OnYearChange(wxSpinEvent& event)
@@ -876,9 +874,7 @@ void wxCalendarCtrl::OnYearChange(wxSpinEvent& event)
tm.mday = wxDateTime::GetNumberOfDays(tm.mon, year);
}
SetDate(wxDateTime(tm.mday, tm.mon, year));
GenerateEvents(wxEVT_CALENDAR_YEAR_CHANGED, wxEVT_CALENDAR_SEL_CHANGED);
SetDateAndNotify(wxDateTime(tm.mday, tm.mon, year));
}
// ----------------------------------------------------------------------------
@@ -957,13 +953,6 @@ void wxCalendarCtrl::OnChar(wxKeyEvent& event)
// holidays handling
// ----------------------------------------------------------------------------
void wxCalendarCtrl::OnCalMonthChange(wxCalendarEvent& event)
{
SetHolidayAttrs();
event.Skip();
}
void wxCalendarCtrl::EnableHolidayDisplay(bool display)
{
long style = GetWindowStyle();