X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/273b7ed9d0727d94f80e6ac65778ceea5fd87d43..90da75e673f51b30e04629035d8bf7501fd00e30:/samples/calendar/calendar.cpp diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp index 88d1c08284..9481cbfbd2 100644 --- a/samples/calendar/calendar.cpp +++ b/samples/calendar/calendar.cpp @@ -2,7 +2,7 @@ // Name: calendar.cpp // Purpose: wxCalendarCtrl sample // Author: Vadim Zeitlin -// Modified by: +// Modified by: Mark Johnson : Added wxLayoutConstraints support for Ctrl // Created: 02.01.00 // RCS-ID: $Id$ // Copyright: (c) Vadim Zeitlin @@ -67,9 +67,12 @@ 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); - void ShowHolidays(bool on); void HighlightSpecial(bool on); private: @@ -94,6 +97,11 @@ public: void OnCalHolidays(wxCommandEvent& event); void OnCalSpecial(wxCommandEvent& event); + void OnCalAllowMonth(wxCommandEvent& event); + void OnCalAllowYear(wxCommandEvent& event); + + void OnAllowYearUpdate(wxUpdateUIEvent& event); + private: MyPanel *m_panel; @@ -114,6 +122,8 @@ enum Calendar_Cal_Monday = 200, Calendar_Cal_Holidays, Calendar_Cal_Special, + Calendar_Cal_Month, + Calendar_Cal_Year, Calendar_CalCtrl = 1000, }; @@ -131,10 +141,17 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Calendar_Cal_Monday, MyFrame::OnCalMonday) EVT_MENU(Calendar_Cal_Holidays, MyFrame::OnCalHolidays) EVT_MENU(Calendar_Cal_Special, MyFrame::OnCalSpecial) + + EVT_MENU(Calendar_Cal_Month, MyFrame::OnCalAllowMonth) + EVT_MENU(Calendar_Cal_Year, MyFrame::OnCalAllowYear) + + 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() @@ -158,8 +175,8 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { // Create the main application window - MyFrame *frame = new MyFrame("Minimal wxWindows App", - wxPoint(50, 50), wxSize(450, 340)); + MyFrame *frame = new MyFrame("Calendar wxWindows sample", + wxPoint(50, 50), wxSize(450, 375)); // Show it and tell the application that it's our main window // @@@ what does it do exactly, in fact? is it necessary here? @@ -189,7 +206,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) wxMenu *menuCal = new wxMenu; menuCal->Append(Calendar_Cal_Monday, - "&Monday first weekday\tCtrl-M", + "Monday &first weekday\tCtrl-F", "Toggle between Mon and Sun as the first week day", TRUE); menuCal->Append(Calendar_Cal_Holidays, "Show &holidays\tCtrl-H", @@ -198,6 +215,13 @@ 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->AppendSeparator(); + menuCal->Append(Calendar_Cal_Month, "&Month can be changed\tCtrl-M", + "Allow changing the month in the calendar", + TRUE); + menuCal->Append(Calendar_Cal_Year, "&Year can be changed\tCtrl-Y", + "Allow changing the year in the calendar", + TRUE); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar; @@ -206,6 +230,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) menuBar->Check(Calendar_Cal_Monday, TRUE); menuBar->Check(Calendar_Cal_Holidays, TRUE); + menuBar->Check(Calendar_Cal_Month, TRUE); + menuBar->Check(Calendar_Cal_Year, TRUE); // ... and attach this menu bar to the frame SetMenuBar(menuBar); @@ -216,6 +242,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) // create a status bar just for fun (by default with 1 pane only) CreateStatusBar(2); SetStatusText("Welcome to wxWindows!"); + SetStatusText("Try changing the size of the Window !",1); #endif // wxUSE_STATUSBAR } @@ -233,17 +260,37 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnCalMonday(wxCommandEvent& event) { - m_panel->StartWithMonday(GetMenuBar()->IsChecked(event.GetInt()) != 0); + m_panel->StartWithMonday(GetMenuBar()->IsChecked(event.GetInt())); } void MyFrame::OnCalHolidays(wxCommandEvent& event) { - m_panel->ShowHolidays(GetMenuBar()->IsChecked(event.GetInt()) != 0); + bool enable = GetMenuBar()->IsChecked(event.GetInt()); + m_panel->GetCal()->EnableHolidayDisplay(enable); } void MyFrame::OnCalSpecial(wxCommandEvent& event) { - m_panel->HighlightSpecial(GetMenuBar()->IsChecked(event.GetInt()) != 0); + m_panel->HighlightSpecial(GetMenuBar()->IsChecked(event.GetInt())); +} + +void MyFrame::OnCalAllowMonth(wxCommandEvent& event) +{ + bool allow = GetMenuBar()->IsChecked(event.GetInt()); + + m_panel->GetCal()->EnableMonthChange(allow); +} + +void MyFrame::OnCalAllowYear(wxCommandEvent& event) +{ + bool allow = GetMenuBar()->IsChecked(event.GetInt()); + + m_panel->GetCal()->EnableYearChange(allow); +} + +void MyFrame::OnAllowYearUpdate(wxUpdateUIEvent& event) +{ + event.Enable( GetMenuBar()->IsChecked(Calendar_Cal_Month)); } // ---------------------------------------------------------------------------- @@ -253,33 +300,40 @@ void MyFrame::OnCalSpecial(wxCommandEvent& event) MyPanel::MyPanel(wxFrame *frame) : wxPanel(frame, -1) { - SetAutoLayout(TRUE); - wxString date; - date.Printf("Selected date: %s", + //------------------ + SetAutoLayout(TRUE); + date.Printf("Selected date: %s ", wxDateTime::Today().FormatISODate().c_str()); m_date = new wxStaticText(this, -1, date); + //------------------ m_calendar = new wxCalendarCtrl(this, Calendar_CalCtrl, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, - wxCAL_MONDAY_FIRST | wxCAL_SHOW_HOLIDAYS); + wxCAL_MONDAY_FIRST | + wxCAL_SHOW_HOLIDAYS | + wxRAISED_BORDER); + m_calendar->SetAutoLayout(TRUE); + //------------------ wxLayoutConstraints *c = new wxLayoutConstraints; - c->left.SameAs(this, wxLeft, 10); - c->centreY.SameAs(m_calendar, wxCentreY); - c->height.AsIs(); - c->width.AsIs(); - - m_date->SetConstraints(c); - + //------------------ + c = new wxLayoutConstraints; + c->left.PercentOf(this, wxWidth, 10); + c->right.PercentOf(this, wxWidth, 60); + c->top.PercentOf(this, wxHeight, 10); + c->bottom.PercentOf(this, wxHeight, 60); + m_calendar->SetConstraints(c); + //------------------ c = new wxLayoutConstraints; - c->left.SameAs(m_date, wxRight, 10); - c->top.SameAs(this, wxTop, 10); + c->left.SameAs(m_calendar, wxLeft, 10); + c->top.SameAs(m_calendar, wxBottom); c->height.AsIs(); c->width.AsIs(); - - m_calendar->SetConstraints(c); + m_date->SetConstraints(c); + //------------------ + Layout(); } void MyPanel::OnCalendar(wxCalendarEvent& event) @@ -296,6 +350,16 @@ void MyPanel::OnCalendarChange(wxCalendarEvent& event) m_date->SetLabel(s); } +void MyPanel::OnCalMonthChange(wxCalendarEvent& WXUNUSED(event)) +{ + wxLogStatus("Calendar month changed"); +} + +void MyPanel::OnCalYearChange(wxCalendarEvent& WXUNUSED(event)) +{ + wxLogStatus("Calendar year changed"); +} + void MyPanel::OnCalendarWeekDayClick(wxCalendarEvent& event) { wxLogMessage("Clicked on %s", @@ -315,11 +379,6 @@ void MyPanel::StartWithMonday(bool on) m_calendar->Refresh(); } -void MyPanel::ShowHolidays(bool on) -{ - m_calendar->EnableHolidayDisplay(on); -} - void MyPanel::HighlightSpecial(bool on) { if ( on )