X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc385ba9ebd0185d5bc3dcbf9fb3f35e3eac4d7a..c16d276354b116475bf85a0388b4b0f545da0f82:/samples/calendar/calendar.cpp?ds=sidebyside diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp index 31c28a57a7..b16e1b0c90 100644 --- a/samples/calendar/calendar.cpp +++ b/samples/calendar/calendar.cpp @@ -67,10 +67,14 @@ public: void OnCalendar(wxCalendarEvent& event); void OnCalendarWeekDayClick(wxCalendarEvent& event); void OnCalendarChange(wxCalendarEvent& event); + void OnCalMonthChange(wxCalendarEvent& event); + void OnCalYearChange(wxCalendarEvent& event); wxCalendarCtrl *GetCal() const { return m_calendar; } - void StartWithMonday(bool on); + // turn on/off the specified style bit on the calendar control + void ToggleCalStyle(bool on, int style); + void HighlightSpecial(bool on); private: @@ -98,6 +102,9 @@ public: void OnCalAllowMonth(wxCommandEvent& event); void OnCalAllowYear(wxCommandEvent& event); + void OnCalSeqMonth(wxCommandEvent& event); + void OnCalShowSurroundingWeeks(wxCommandEvent& event); + void OnAllowYearUpdate(wxUpdateUIEvent& event); private: @@ -122,6 +129,8 @@ enum Calendar_Cal_Special, Calendar_Cal_Month, Calendar_Cal_Year, + Calendar_Cal_SeqMonth, + Calendar_Cal_SurroundWeeks, Calendar_CalCtrl = 1000, }; @@ -143,11 +152,16 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Calendar_Cal_Month, MyFrame::OnCalAllowMonth) EVT_MENU(Calendar_Cal_Year, MyFrame::OnCalAllowYear) + EVT_MENU(Calendar_Cal_SeqMonth, MyFrame::OnCalSeqMonth) + EVT_MENU(Calendar_Cal_SurroundWeeks, MyFrame::OnCalShowSurroundingWeeks) + EVT_UPDATE_UI(Calendar_Cal_Year, MyFrame::OnAllowYearUpdate) END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyPanel, wxPanel) EVT_CALENDAR (Calendar_CalCtrl, MyPanel::OnCalendar) + EVT_CALENDAR_MONTH (Calendar_CalCtrl, MyPanel::OnCalMonthChange) + EVT_CALENDAR_YEAR (Calendar_CalCtrl, MyPanel::OnCalYearChange) EVT_CALENDAR_SEL_CHANGED(Calendar_CalCtrl, MyPanel::OnCalendarChange) EVT_CALENDAR_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick) END_EVENT_TABLE() @@ -174,10 +188,7 @@ bool MyApp::OnInit() MyFrame *frame = new MyFrame("Calendar wxWindows sample", wxPoint(50, 50), wxSize(450, 340)); - // Show it and tell the application that it's our main window - // @@@ what does it do exactly, in fact? is it necessary here? frame->Show(TRUE); - SetTopWindow(frame); // success: wxApp::OnRun() will be called which will enter the main message // loop and the application will run. If we returned FALSE here, the @@ -211,7 +222,15 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) menuCal->Append(Calendar_Cal_Special, "Highlight &special dates\tCtrl-S", "Test custom highlighting", TRUE); + menuCal->Append(Calendar_Cal_SurroundWeeks, + "Show s&urrounding weeks\tCtrl-W", + "Show the neighbouring weeks in the prev/next month", + TRUE); menuCal->AppendSeparator(); + menuCal->Append(Calendar_Cal_SeqMonth, + "To&ggle month selector style\tCtrl-G", + "Use another style for the calendar controls", + TRUE); menuCal->Append(Calendar_Cal_Month, "&Month can be changed\tCtrl-M", "Allow changing the month in the calendar", TRUE); @@ -255,34 +274,51 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnCalMonday(wxCommandEvent& event) { - m_panel->StartWithMonday(GetMenuBar()->IsChecked(event.GetInt())); + bool enable = GetMenuBar()->IsChecked(event.GetId()); + + m_panel->ToggleCalStyle(enable, wxCAL_MONDAY_FIRST); } void MyFrame::OnCalHolidays(wxCommandEvent& event) { - bool enable = GetMenuBar()->IsChecked(event.GetInt()); + bool enable = GetMenuBar()->IsChecked(event.GetId()); + m_panel->GetCal()->EnableHolidayDisplay(enable); } void MyFrame::OnCalSpecial(wxCommandEvent& event) { - m_panel->HighlightSpecial(GetMenuBar()->IsChecked(event.GetInt())); + m_panel->HighlightSpecial(GetMenuBar()->IsChecked(event.GetId())); } void MyFrame::OnCalAllowMonth(wxCommandEvent& event) { - bool allow = GetMenuBar()->IsChecked(event.GetInt()); + bool allow = GetMenuBar()->IsChecked(event.GetId()); m_panel->GetCal()->EnableMonthChange(allow); } void MyFrame::OnCalAllowYear(wxCommandEvent& event) { - bool allow = GetMenuBar()->IsChecked(event.GetInt()); + bool allow = GetMenuBar()->IsChecked(event.GetId()); m_panel->GetCal()->EnableYearChange(allow); } +void MyFrame::OnCalSeqMonth(wxCommandEvent& event) +{ + bool allow = GetMenuBar()->IsChecked(event.GetId()); + + m_panel->ToggleCalStyle(allow, wxCAL_SEQUENTIAL_MONTH_SELECTION); +} + +void MyFrame::OnCalShowSurroundingWeeks(wxCommandEvent& event) +{ + bool allow = GetMenuBar()->IsChecked(event.GetId()); + + m_panel->ToggleCalStyle(allow, wxCAL_SHOW_SURROUNDING_WEEKS); +} + void MyFrame::OnAllowYearUpdate(wxUpdateUIEvent& event) { event.Enable( GetMenuBar()->IsChecked(Calendar_Cal_Month)); @@ -298,7 +334,7 @@ MyPanel::MyPanel(wxFrame *frame) SetAutoLayout(TRUE); wxString date; - date.Printf("Selected date: %s", + date.Printf(wxT("Selected date: %s"), wxDateTime::Today().FormatISODate().c_str()); m_date = new wxStaticText(this, -1, date); m_calendar = new wxCalendarCtrl(this, Calendar_CalCtrl, @@ -311,15 +347,15 @@ MyPanel::MyPanel(wxFrame *frame) wxLayoutConstraints *c = new wxLayoutConstraints; c->left.SameAs(this, wxLeft, 10); - c->centreY.SameAs(m_calendar, wxCentreY); + c->centreY.SameAs(this, wxCentreY); c->height.AsIs(); c->width.AsIs(); m_date->SetConstraints(c); c = new wxLayoutConstraints; - c->left.SameAs(m_date, wxRight, 10); - c->top.SameAs(this, wxTop, 10); + c->left.SameAs(m_date, wxRight, 20); + c->centreY.SameAs(this, wxCentreY); c->height.AsIs(); c->width.AsIs(); @@ -328,31 +364,41 @@ MyPanel::MyPanel(wxFrame *frame) void MyPanel::OnCalendar(wxCalendarEvent& event) { - wxLogMessage("Selected %s from calendar", + wxLogMessage(wxT("Selected %s from calendar"), event.GetDate().FormatISODate().c_str()); } void MyPanel::OnCalendarChange(wxCalendarEvent& event) { wxString s; - s.Printf("Selected date: %s", event.GetDate().FormatISODate().c_str()); + s.Printf(wxT("Selected date: %s"), event.GetDate().FormatISODate().c_str()); m_date->SetLabel(s); } +void MyPanel::OnCalMonthChange(wxCalendarEvent& WXUNUSED(event)) +{ + wxLogStatus(wxT("Calendar month changed")); +} + +void MyPanel::OnCalYearChange(wxCalendarEvent& WXUNUSED(event)) +{ + wxLogStatus(wxT("Calendar year changed")); +} + void MyPanel::OnCalendarWeekDayClick(wxCalendarEvent& event) { - wxLogMessage("Clicked on %s", + wxLogMessage(wxT("Clicked on %s"), wxDateTime::GetWeekDayName(event.GetWeekDay()).c_str()); } -void MyPanel::StartWithMonday(bool on) +void MyPanel::ToggleCalStyle(bool on, int flag) { long style = m_calendar->GetWindowStyle(); if ( on ) - style |= wxCAL_MONDAY_FIRST; + style |= flag; else - style &= ~wxCAL_MONDAY_FIRST; + style &= ~flag; m_calendar->SetWindowStyle(style); @@ -381,4 +427,3 @@ void MyPanel::HighlightSpecial(bool on) m_calendar->Refresh(); } -