X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd019edddc3dff831764aeac5971ce28fe469854..a0232aa5207651deaf980c68f79546eed6327af7:/samples/calendar/calendar.cpp diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp index af492450ce..719f4b2f1e 100644 --- a/samples/calendar/calendar.cpp +++ b/samples/calendar/calendar.cpp @@ -34,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 @@ -48,11 +50,7 @@ #endif // wxUSE_DATEPICKCTRL_GENERIC #endif // wxUSE_DATEPICKCTRL -// the application icon (under Windows and OS/2 it is in resources and even -// though we could still include the XPM here it would be unused) -#if !defined(__WXMSW__) && !defined(__WXPM__) - #include "../sample.xpm" -#endif +#include "../sample.xpm" // ---------------------------------------------------------------------------- // private classes @@ -95,6 +93,7 @@ public: private: wxCalendarCtrl *m_calendar; wxStaticText *m_date; + wxSizer *m_sizer; DECLARE_EVENT_TABLE() }; @@ -104,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); @@ -112,6 +111,8 @@ public: #if wxUSE_DATEPICKCTRL void OnAskDate(wxCommandEvent& event); + + void OnUpdateUIStartWithNone(wxUpdateUIEvent& event); #endif // wxUSE_DATEPICKCTRL void OnCalMonday(wxCommandEvent& event); @@ -127,6 +128,8 @@ public: void OnSetDate(wxCommandEvent& event); void OnToday(wxCommandEvent& event); + void OnCalToggleResizable(wxCommandEvent& event); + void OnAllowYearUpdate(wxUpdateUIEvent& event); private: @@ -178,11 +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 @@ -203,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) @@ -218,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() @@ -257,8 +267,11 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { // 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); @@ -277,7 +290,7 @@ 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)); + SetIcon(wxIcon(sample_xpm)); // create a menu bar wxMenu *menuFile = new wxMenu; @@ -312,8 +325,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; @@ -323,6 +338,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) _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")); @@ -434,22 +451,53 @@ 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(); + dt = dlg.GetDate(); if ( dt.IsValid() ) { const wxDateTime today = wxDateTime::Today(); @@ -492,7 +540,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); @@ -539,9 +589,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) @@ -635,11 +702,10 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle) void MyDialog::OnDateChange(wxDateEvent& event) { const wxDateTime dt = event.GetDate(); - if(dt.IsValid()) + if ( dt.IsValid() ) m_text->SetValue(dt.FormatISODate()); else m_text->SetValue(wxEmptyString); } #endif // wxUSE_DATEPICKCTRL -