X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ff2dfbac2efa5ed3ac4bcc6ebc722edbb5c6813..e960c20e389061c0db09e03fdaf9ffe3a418779b:/samples/calendar/calendar.cpp diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp index 737db45395..2b83737e07 100644 --- a/samples/calendar/calendar.cpp +++ b/samples/calendar/calendar.cpp @@ -17,11 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation "calendar.cpp" - #pragma interface "calendar.cpp" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -39,11 +34,13 @@ #include "wx/menu.h" #include "wx/layout.h" #include "wx/msgdlg.h" + #include "wx/icon.h" + #include "wx/button.h" + #include "wx/sizer.h" + #include "wx/textctrl.h" + #include "wx/settings.h" #endif -#include "wx/sizer.h" -#include "wx/textctrl.h" - #include "wx/calctrl.h" #if wxUSE_DATEPICKCTRL @@ -53,6 +50,8 @@ #endif // wxUSE_DATEPICKCTRL_GENERIC #endif // wxUSE_DATEPICKCTRL +#include "../sample.xpm" + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -90,10 +89,11 @@ public: void SetDate(); void Today(); - + private: wxCalendarCtrl *m_calendar; wxStaticText *m_date; + wxSizer *m_sizer; DECLARE_EVENT_TABLE() }; @@ -103,7 +103,7 @@ class MyFrame : public wxFrame { public: // ctor(s) - MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size); + MyFrame(const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize); // event handlers (these functions should _not_ be virtual) void OnQuit(wxCommandEvent& event); @@ -111,6 +111,8 @@ public: #if wxUSE_DATEPICKCTRL void OnAskDate(wxCommandEvent& event); + + void OnUpdateUIStartWithNone(wxUpdateUIEvent& event); #endif // wxUSE_DATEPICKCTRL void OnCalMonday(wxCommandEvent& event); @@ -126,6 +128,8 @@ public: void OnSetDate(wxCommandEvent& event); void OnToday(wxCommandEvent& event); + void OnCalToggleResizable(wxCommandEvent& event); + void OnAllowYearUpdate(wxUpdateUIEvent& event); private: @@ -177,10 +181,13 @@ enum Calendar_Cal_SurroundWeeks, Calendar_Cal_SetDate, Calendar_Cal_Today, + Calendar_Cal_Resizable, #if wxUSE_DATEPICKCTRL Calendar_DatePicker_AskDate = 300, Calendar_DatePicker_ShowCentury, Calendar_DatePicker_DropDown, + Calendar_DatePicker_AllowNone, + Calendar_DatePicker_StartWithNone, #if wxUSE_DATEPICKCTRL_GENERIC Calendar_DatePicker_Generic, #endif // wxUSE_DATEPICKCTRL_GENERIC @@ -201,6 +208,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #if wxUSE_DATEPICKCTRL EVT_MENU(Calendar_DatePicker_AskDate, MyFrame::OnAskDate) + + EVT_UPDATE_UI(Calendar_DatePicker_StartWithNone, + MyFrame::OnUpdateUIStartWithNone) #endif // wxUSE_DATEPICKCTRL EVT_MENU(Calendar_Cal_Monday, MyFrame::OnCalMonday) @@ -216,6 +226,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Calendar_Cal_SetDate, MyFrame::OnSetDate) EVT_MENU(Calendar_Cal_Today, MyFrame::OnToday) + EVT_MENU(Calendar_Cal_Resizable, MyFrame::OnCalToggleResizable) + EVT_UPDATE_UI(Calendar_Cal_Year, MyFrame::OnAllowYearUpdate) END_EVENT_TABLE() @@ -254,9 +266,15 @@ IMPLEMENT_APP(MyApp) // `Main program' equivalent: the program execution "starts" here bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // Create the main application window - MyFrame *frame = new MyFrame(_T("Calendar wxWidgets sample"), - wxPoint(50, 50), wxSize(450, 340)); + MyFrame *frame = new MyFrame(_T("Calendar wxWidgets sample") +#ifndef __WXWINCE__ + ,wxPoint(50, 50), wxSize(450, 340) +#endif + ); frame->Show(true); @@ -274,6 +292,9 @@ bool MyApp::OnInit() MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size) { + // set the frame icon + SetIcon(wxIcon(sample_xpm)); + // create a menu bar wxMenu *menuFile = new wxMenu; menuFile->Append(Calendar_File_About, _T("&About...\tCtrl-A"), _T("Show about dialog")); @@ -307,8 +328,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) _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.")); + menuCal->Append(Calendar_Cal_SetDate, _T("Call &SetDate(2005-12-24)"), _T("Set date to 2005-12-24.")); + menuCal->Append(Calendar_Cal_Today, _T("Call &Today()"), _T("Set the current date.")); + menuCal->AppendSeparator(); + menuCal->AppendCheckItem(Calendar_Cal_Resizable, _T("Make &resizable\tCtrl-R")); #if wxUSE_DATEPICKCTRL wxMenu *menuDate = new wxMenu; @@ -316,6 +339,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) _T("Al&ways show century")); menuDate->AppendCheckItem(Calendar_DatePicker_DropDown, _T("Use &drop down control")); + menuDate->AppendCheckItem(Calendar_DatePicker_AllowNone, + _T("Allow &no date")); + menuDate->AppendCheckItem(Calendar_DatePicker_StartWithNone, + _T("Start &with no date")); #if wxUSE_DATEPICKCTRL_GENERIC menuDate->AppendCheckItem(Calendar_DatePicker_Generic, _T("Use &generic version of the control")); @@ -427,31 +454,71 @@ void MyFrame::OnToday(wxCommandEvent &WXUNUSED(event)) m_panel->Today(); } +void MyFrame::OnCalToggleResizable(wxCommandEvent& event) +{ + wxSizer * const sizer = m_panel->GetSizer(); + wxSizerItem * const item = sizer->GetItem(m_panel->GetCal()); + if ( event.IsChecked() ) + { + item->SetProportion(1); + item->SetFlag(wxEXPAND); + } + else // not resizable + { + item->SetProportion(0); + item->SetFlag(wxALIGN_CENTER); + } + + sizer->Layout(); +} + #if wxUSE_DATEPICKCTRL +void MyFrame::OnUpdateUIStartWithNone(wxUpdateUIEvent& event) +{ + // it only makes sense to start with invalid date if we can have no date + event.Enable( GetMenuBar()->IsChecked(Calendar_DatePicker_AllowNone) ); +} + void MyFrame::OnAskDate(wxCommandEvent& WXUNUSED(event)) { + wxDateTime dt = m_panel->GetCal()->GetDate(); + int style = wxDP_DEFAULT; if ( GetMenuBar()->IsChecked(Calendar_DatePicker_ShowCentury) ) style |= wxDP_SHOWCENTURY; if ( GetMenuBar()->IsChecked(Calendar_DatePicker_DropDown) ) style |= wxDP_DROPDOWN; + if ( GetMenuBar()->IsChecked(Calendar_DatePicker_AllowNone) ) + { + style |= wxDP_ALLOWNONE; - MyDialog dlg(this, m_panel->GetCal()->GetDate(), style); + if ( GetMenuBar()->IsChecked(Calendar_DatePicker_StartWithNone) ) + dt = wxDefaultDateTime; + } + + MyDialog dlg(this, dt, style); if ( dlg.ShowModal() == wxID_OK ) { - const wxDateTime dt = dlg.GetDate(), - today = wxDateTime::Today(); - - if ( dt.GetDay() == today.GetDay() && - dt.GetMonth() == today.GetMonth() ) + dt = dlg.GetDate(); + if ( dt.IsValid() ) { - wxMessageBox(_T("Happy birthday!"), _T("Calendar Sample")); - } + const wxDateTime today = wxDateTime::Today(); - m_panel->GetCal()->SetDate(dt); + if ( dt.GetDay() == today.GetDay() && + dt.GetMonth() == today.GetMonth() ) + { + wxMessageBox(_T("Happy birthday!"), _T("Calendar Sample")); + } - wxLogStatus(_T("Changed the date to your birthday")); + m_panel->GetCal()->SetDate(dt); + + wxLogStatus(_T("Changed the date to your input")); + } + else + { + wxLogStatus(_T("No date entered")); + } } } @@ -476,7 +543,9 @@ MyPanel::MyPanel(wxFrame *frame) wxCAL_SHOW_HOLIDAYS | wxRAISED_BORDER); - wxBoxSizer *m_sizer = new wxBoxSizer( wxHORIZONTAL ); + // adjust to vertical/horizontal display, check mostly dedicated to WinCE + bool horizontal = ( wxSystemSettings::GetMetric(wxSYS_SCREEN_X) > wxSystemSettings::GetMetric(wxSYS_SCREEN_Y) ); + m_sizer = new wxBoxSizer( horizontal ? wxHORIZONTAL : wxVERTICAL ); m_sizer->Add(m_date, 0, wxALIGN_CENTER | wxALL, 10 ); m_sizer->Add(m_calendar, 0, wxALIGN_CENTER | wxALIGN_LEFT); @@ -523,9 +592,26 @@ void MyPanel::ToggleCalStyle(bool on, int flag) else style &= ~flag; - m_calendar->SetWindowStyle(style); + if ( flag == wxCAL_SEQUENTIAL_MONTH_SELECTION ) + { + // changing this style requires recreating the control + wxCalendarCtrl *calendar = new wxCalendarCtrl(this, Calendar_CalCtrl, + m_calendar->GetDate(), + wxDefaultPosition, + wxDefaultSize, + style); + m_sizer->Replace(m_calendar, calendar); + delete m_calendar; + m_calendar = calendar; + + m_sizer->Layout(); + } + else // just changing the style is enough + { + m_calendar->SetWindowStyle(style); - m_calendar->Refresh(); + m_calendar->Refresh(); + } } void MyPanel::HighlightSpecial(bool on) @@ -569,23 +655,24 @@ void MyPanel::Today() #if wxUSE_DATEPICKCTRL MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle) - : wxDialog(parent, -1, wxString(_T("Calendar: Choose a date"))) + : wxDialog(parent, wxID_ANY, wxString(_T("Calendar: Choose a date"))) { wxStdDialogButtonSizer *sizerBtns = new wxStdDialogButtonSizer; sizerBtns->AddButton(new wxButton(this, wxID_OK)); sizerBtns->AddButton(new wxButton(this, wxID_CANCEL)); - sizerBtns->Finalise(); + sizerBtns->Realize(); wxSizer *sizerText = new wxBoxSizer(wxHORIZONTAL); - sizerText->Add(new wxStaticText(this, -1, _T("Date in ISO format: ")), - wxSizerFlags().Border()); - m_text = new wxTextCtrl(this, -1); - sizerText->Add(m_text, wxSizerFlags().Expand().Border()); + sizerText->Add(new wxStaticText(this, wxID_ANY, _T("Date in ISO format: ")), + wxSizerFlags().Border().Align(wxALIGN_CENTRE_VERTICAL)); + m_text = new wxTextCtrl(this, wxID_ANY); + sizerText->Add(m_text, wxSizerFlags(). + Expand().Border().Align(wxALIGN_CENTRE_VERTICAL)); wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); sizerTop->Add(new wxStaticText ( - this, -1, + this, wxID_ANY, _T("Enter your birthday date (not before 20th century):") ), wxSizerFlags().Border()); @@ -593,13 +680,13 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle) #if wxUSE_DATEPICKCTRL_GENERIC wxFrame *frame = (wxFrame *)wxGetTopLevelParent(parent); if ( frame && frame->GetMenuBar()->IsChecked(Calendar_DatePicker_Generic) ) - m_datePicker = new wxDatePickerCtrlGeneric(this, -1, dt, + m_datePicker = new wxDatePickerCtrlGeneric(this, wxID_ANY, dt, wxDefaultPosition, wxDefaultSize, dtpStyle); else #endif // wxUSE_DATEPICKCTRL_GENERIC - m_datePicker = new wxDatePickerCtrl(this, -1, dt, + m_datePicker = new wxDatePickerCtrl(this, wxID_ANY, dt, wxDefaultPosition, wxDefaultSize, dtpStyle); m_datePicker->SetRange(wxDateTime(1, wxDateTime::Jan, 1900), @@ -617,8 +704,11 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle) void MyDialog::OnDateChange(wxDateEvent& event) { - m_text->SetValue(event.GetDate().FormatISODate()); + const wxDateTime dt = event.GetDate(); + if ( dt.IsValid() ) + m_text->SetValue(dt.FormatISODate()); + else + m_text->SetValue(wxEmptyString); } #endif // wxUSE_DATEPICKCTRL -