X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/788233da909b0f6bc684a99200c614e3dee2aa20..d01bf7ae343a61247ef9e0f7ad53a26ea5266058:/samples/calendar/calendar.cpp diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp index 1d66e39253..8a3cabd8f6 100644 --- a/samples/calendar/calendar.cpp +++ b/samples/calendar/calendar.cpp @@ -41,6 +41,7 @@ #include "wx/msgdlg.h" #endif +#include "wx/sizer.h" #include "wx/calctrl.h" // ---------------------------------------------------------------------------- @@ -78,6 +79,9 @@ public: void HighlightSpecial(bool on); + void SetDate(); + void Today(); + private: wxCalendarCtrl *m_calendar; wxStaticText *m_date; @@ -106,12 +110,15 @@ public: void OnCalSeqMonth(wxCommandEvent& event); void OnCalShowSurroundingWeeks(wxCommandEvent& event); + void OnSetDate(wxCommandEvent& event); + void OnToday(wxCommandEvent& event); + void OnAllowYearUpdate(wxUpdateUIEvent& event); private: MyPanel *m_panel; - // any class wishing to process wxWindows events must use this macro + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; @@ -132,14 +139,16 @@ enum Calendar_Cal_Year, Calendar_Cal_SeqMonth, Calendar_Cal_SurroundWeeks, - Calendar_CalCtrl = 1000, + Calendar_Cal_SetDate, + Calendar_Cal_Today, + Calendar_CalCtrl = 1000 }; // ---------------------------------------------------------------------------- -// event tables and other macros for wxWindows +// event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -// the event tables connect the wxWindows events with the functions (event +// the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. BEGIN_EVENT_TABLE(MyFrame, wxFrame) @@ -156,6 +165,10 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Calendar_Cal_SeqMonth, MyFrame::OnCalSeqMonth) EVT_MENU(Calendar_Cal_SurroundWeeks, MyFrame::OnCalShowSurroundingWeeks) + EVT_MENU(Calendar_Cal_SetDate, MyFrame::OnSetDate) + EVT_MENU(Calendar_Cal_Today, MyFrame::OnToday) + + EVT_UPDATE_UI(Calendar_Cal_Year, MyFrame::OnAllowYearUpdate) END_EVENT_TABLE() @@ -167,7 +180,7 @@ BEGIN_EVENT_TABLE(MyPanel, wxPanel) EVT_CALENDAR_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick) END_EVENT_TABLE() -// Create a new application object: this macro will allow wxWindows to create +// Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a // static object for many reasons) and also declares the accessor function // wxGetApp() which will return the reference of the right type (i.e. MyApp and @@ -186,15 +199,15 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { // Create the main application window - MyFrame *frame = new MyFrame("Calendar wxWindows sample", + MyFrame *frame = new MyFrame(_T("Calendar wxWidgets sample"), wxPoint(50, 50), wxSize(450, 340)); - frame->Show(TRUE); + frame->Show(true); // success: wxApp::OnRun() will be called which will enter the main message - // loop and the application will run. If we returned FALSE here, the + // loop and the application will run. If we returned false here, the // application would exit immediately. - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -203,51 +216,54 @@ bool MyApp::OnInit() // frame constructor MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, -1, title, pos, size) + : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size) { // create a menu bar wxMenu *menuFile = new wxMenu; - menuFile->Append(Calendar_File_About, "&About...\tCtrl-A", "Show about dialog"); + menuFile->Append(Calendar_File_About, _T("&About...\tCtrl-A"), _T("Show about dialog")); menuFile->AppendSeparator(); - menuFile->Append(Calendar_File_Quit, "E&xit\tAlt-X", "Quit this program"); + menuFile->Append(Calendar_File_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); wxMenu *menuCal = new wxMenu; menuCal->Append(Calendar_Cal_Monday, - "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", - "Toggle highlighting the holidays", - TRUE); - menuCal->Append(Calendar_Cal_Special, "Highlight &special dates\tCtrl-S", - "Test custom highlighting", - TRUE); + _T("Monday &first weekday\tCtrl-F"), + _T("Toggle between Mon and Sun as the first week day"), + true); + menuCal->Append(Calendar_Cal_Holidays, _T("Show &holidays\tCtrl-H"), + _T("Toggle highlighting the holidays"), + true); + menuCal->Append(Calendar_Cal_Special, _T("Highlight &special dates\tCtrl-S"), + _T("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); + _T("Show s&urrounding weeks\tCtrl-W"), + _T("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); - menuCal->Append(Calendar_Cal_Year, "&Year can be changed\tCtrl-Y", - "Allow changing the year in the calendar", - TRUE); + _T("To&ggle month selector style\tCtrl-G"), + _T("Use another style for the calendar controls"), + true); + menuCal->Append(Calendar_Cal_Month, _T("&Month can be changed\tCtrl-M"), + _T("Allow changing the month in the calendar"), + true); + menuCal->Append(Calendar_Cal_Year, _T("&Year can be changed\tCtrl-Y"), + _T("Allow changing the year in the calendar"), + true); + menuCal->AppendSeparator(); + menuCal->Append(Calendar_Cal_SetDate, _T("SetDate()"), _T("Set date to 2005-12-24.")); + menuCal->Append(Calendar_Cal_Today, _T("Today()"), _T("Set the current date.")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar; - menuBar->Append(menuFile, "&File"); - menuBar->Append(menuCal, "&Calendar"); + menuBar->Append(menuFile, _T("&File")); + menuBar->Append(menuCal, _T("&Calendar")); - menuBar->Check(Calendar_Cal_Monday, TRUE); - menuBar->Check(Calendar_Cal_Holidays, TRUE); - menuBar->Check(Calendar_Cal_Month, TRUE); - menuBar->Check(Calendar_Cal_Year, TRUE); + 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); @@ -257,14 +273,14 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) #if wxUSE_STATUSBAR // create a status bar just for fun (by default with 1 pane only) CreateStatusBar(2); - SetStatusText("Welcome to wxWindows!"); + SetStatusText(_T("Welcome to wxWidgets!")); #endif // wxUSE_STATUSBAR } void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - // TRUE is to force the frame to close - Close(TRUE); + // true is to force the frame to close + Close(true); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) @@ -325,19 +341,27 @@ void MyFrame::OnAllowYearUpdate(wxUpdateUIEvent& event) event.Enable( GetMenuBar()->IsChecked(Calendar_Cal_Month)); } +void MyFrame::OnSetDate(wxCommandEvent &WXUNUSED(event)) +{ + m_panel->SetDate(); +} + +void MyFrame::OnToday(wxCommandEvent &WXUNUSED(event)) +{ + m_panel->Today(); +} + // ---------------------------------------------------------------------------- // MyPanel // ---------------------------------------------------------------------------- MyPanel::MyPanel(wxFrame *frame) - : wxPanel(frame, -1) + : wxPanel(frame, wxID_ANY) { - SetAutoLayout(TRUE); - wxString date; date.Printf(wxT("Selected date: %s"), wxDateTime::Today().FormatISODate().c_str()); - m_date = new wxStaticText(this, -1, date); + m_date = new wxStaticText(this, wxID_ANY, date); m_calendar = new wxCalendarCtrl(this, Calendar_CalCtrl, wxDefaultDateTime, wxDefaultPosition, @@ -346,21 +370,13 @@ MyPanel::MyPanel(wxFrame *frame) wxCAL_SHOW_HOLIDAYS | wxRAISED_BORDER); - wxLayoutConstraints *c = new wxLayoutConstraints; - c->left.SameAs(this, wxLeft, 10); - c->centreY.SameAs(this, wxCentreY); - c->height.AsIs(); - c->width.AsIs(); - - m_date->SetConstraints(c); + wxBoxSizer *m_sizer = new wxBoxSizer( wxHORIZONTAL ); - c = new wxLayoutConstraints; - c->left.SameAs(m_date, wxRight, 20); - c->centreY.SameAs(this, wxCentreY); - c->height.AsIs(); - c->width.AsIs(); + m_sizer->Add(m_date, 0, wxALIGN_CENTER | wxALL, 10 ); + m_sizer->Add(m_calendar, 0, wxALIGN_CENTER | wxALIGN_LEFT); - m_calendar->SetConstraints(c); + SetSizer( m_sizer ); + m_sizer->SetSizeHints( this ); } void MyPanel::OnCalendar(wxCalendarEvent& event) @@ -428,3 +444,14 @@ void MyPanel::HighlightSpecial(bool on) m_calendar->Refresh(); } + +void MyPanel::SetDate() +{ + wxDateTime date(24, wxDateTime::Dec, 2005, 23, 59, 59); + m_calendar->SetDate(date); +} + +void MyPanel::Today() +{ + m_calendar->SetDate(wxDateTime::Today()); +}