X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7e542bee896f74d7a7aef769335b2e90384e8ca..506e9b7ed2bee097fd3674061f6962e54bdea7bf:/samples/calendar/calendar.cpp?ds=sidebyside diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp index fb34cfe280..ffa07b257c 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,12 +34,15 @@ #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" +#include "wx/splitter.h" #if wxUSE_DATEPICKCTRL #include "wx/datectrl.h" @@ -53,10 +51,10 @@ #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" +#include "../sample.xpm" + +#ifdef wxHAS_NATIVE_CALENDARCTRL + #include "wx/generic/calctrlg.h" #endif // ---------------------------------------------------------------------------- @@ -79,27 +77,41 @@ public: class MyPanel : public wxPanel { public: - MyPanel(wxFrame *frame); + MyPanel(wxWindow *parent); 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; } + wxCalendarCtrlBase *GetCal() const { return m_calendar; } // turn on/off the specified style bit on the calendar control void ToggleCalStyle(bool on, int style); + bool IsUsingGeneric() const { return m_usingGeneric; } + void ToggleUseGeneric() + { + m_usingGeneric = !m_usingGeneric; + RecreateCalendar(m_calendar->GetWindowStyle()); + } + void HighlightSpecial(bool on); - void SetDate(); - void Today(); - + wxDateTime GetDate() const { return m_calendar->GetDate(); } + void SetDate(const wxDateTime& dt) { m_calendar->SetDate(dt); } + private: - wxCalendarCtrl *m_calendar; + wxCalendarCtrlBase *DoCreateCalendar(const wxDateTime& dt, long style); + + void RecreateCalendar(long style); + + wxCalendarCtrlBase *m_calendar; wxStaticText *m_date; + wxSizer *m_sizer; + + bool m_usingGeneric; + DECLARE_EVENT_TABLE() }; @@ -109,33 +121,52 @@ 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); void OnAbout(wxCommandEvent& event); + void OnClearLog(wxCommandEvent& event); + void OnQuit(wxCommandEvent& event); #if wxUSE_DATEPICKCTRL void OnAskDate(wxCommandEvent& event); + + void OnUpdateUIStartWithNone(wxUpdateUIEvent& event); #endif // wxUSE_DATEPICKCTRL +#ifdef wxHAS_NATIVE_CALENDARCTRL + void OnCalGeneric(wxCommandEvent& WXUNUSED(event)) + { + m_panel->ToggleUseGeneric(); + } +#endif // wxHAS_NATIVE_CALENDARCTRL + void OnCalMonday(wxCommandEvent& event); void OnCalHolidays(wxCommandEvent& event); void OnCalSpecial(wxCommandEvent& event); void OnCalAllowMonth(wxCommandEvent& event); - void OnCalAllowYear(wxCommandEvent& event); void OnCalSeqMonth(wxCommandEvent& event); void OnCalShowSurroundingWeeks(wxCommandEvent& event); + void OnCalShowWeekNumbers(wxCommandEvent& event); void OnSetDate(wxCommandEvent& event); void OnToday(wxCommandEvent& event); + void OnBeginDST(wxCommandEvent& event); - void OnAllowYearUpdate(wxUpdateUIEvent& event); + void OnCalToggleResizable(wxCommandEvent& event); + + void OnUpdateUIGenericOnly(wxUpdateUIEvent& event) + { + event.Enable(m_panel->IsUsingGeneric()); + } + + void OnCalRClick(wxMouseEvent& event); private: MyPanel *m_panel; + wxTextCtrl *m_logWindow; // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() @@ -173,21 +204,26 @@ enum { // menu items Calendar_File_About = wxID_ABOUT, + Calendar_File_ClearLog = wxID_CLEAR, Calendar_File_Quit = wxID_EXIT, - Calendar_Cal_Monday = 200, + Calendar_Cal_Generic = 200, + Calendar_Cal_Monday, Calendar_Cal_Holidays, Calendar_Cal_Special, Calendar_Cal_Month, - Calendar_Cal_Year, Calendar_Cal_SeqMonth, Calendar_Cal_SurroundWeeks, + Calendar_Cal_WeekNumbers, Calendar_Cal_SetDate, Calendar_Cal_Today, + Calendar_Cal_BeginDST, + 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,35 +239,51 @@ enum // 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) - EVT_MENU(Calendar_File_Quit, MyFrame::OnQuit) EVT_MENU(Calendar_File_About, MyFrame::OnAbout) + EVT_MENU(Calendar_File_ClearLog, MyFrame::OnClearLog) + EVT_MENU(Calendar_File_Quit, MyFrame::OnQuit) #if wxUSE_DATEPICKCTRL EVT_MENU(Calendar_DatePicker_AskDate, MyFrame::OnAskDate) + + EVT_UPDATE_UI(Calendar_DatePicker_StartWithNone, + MyFrame::OnUpdateUIStartWithNone) #endif // wxUSE_DATEPICKCTRL +#ifdef wxHAS_NATIVE_CALENDARCTRL + EVT_MENU(Calendar_Cal_Generic, MyFrame::OnCalGeneric) +#endif // wxHAS_NATIVE_CALENDARCTRL + 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_MENU(Calendar_Cal_SeqMonth, MyFrame::OnCalSeqMonth) EVT_MENU(Calendar_Cal_SurroundWeeks, MyFrame::OnCalShowSurroundingWeeks) + EVT_MENU(Calendar_Cal_WeekNumbers, MyFrame::OnCalShowWeekNumbers) EVT_MENU(Calendar_Cal_SetDate, MyFrame::OnSetDate) EVT_MENU(Calendar_Cal_Today, MyFrame::OnToday) + EVT_MENU(Calendar_Cal_BeginDST, MyFrame::OnBeginDST) + + EVT_MENU(Calendar_Cal_Resizable, MyFrame::OnCalToggleResizable) - EVT_UPDATE_UI(Calendar_Cal_Year, MyFrame::OnAllowYearUpdate) + EVT_UPDATE_UI(Calendar_Cal_SeqMonth, MyFrame::OnUpdateUIGenericOnly) +#ifdef __WXGTK20__ + EVT_UPDATE_UI(Calendar_Cal_Monday, MyFrame::OnUpdateUIGenericOnly) + EVT_UPDATE_UI(Calendar_Cal_Holidays, MyFrame::OnUpdateUIGenericOnly) +#endif + EVT_UPDATE_UI(Calendar_Cal_Special, MyFrame::OnUpdateUIGenericOnly) + EVT_UPDATE_UI(Calendar_Cal_SurroundWeeks, MyFrame::OnUpdateUIGenericOnly) 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(Calendar_CalCtrl, MyPanel::OnCalendar) + EVT_CALENDAR_PAGE_CHANGED(Calendar_CalCtrl, MyPanel::OnCalMonthChange) + EVT_CALENDAR_SEL_CHANGED(Calendar_CalCtrl, MyPanel::OnCalendarChange) EVT_CALENDAR_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick) END_EVENT_TABLE() @@ -261,9 +313,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); @@ -282,15 +340,22 @@ 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; menuFile->Append(Calendar_File_About, _T("&About...\tCtrl-A"), _T("Show about dialog")); menuFile->AppendSeparator(); + menuFile->Append(Calendar_File_ClearLog, _T("&Clear log\tCtrl-L")); + menuFile->AppendSeparator(); menuFile->Append(Calendar_File_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); wxMenu *menuCal = new wxMenu; +#ifdef wxHAS_NATIVE_CALENDARCTRL + menuCal->AppendCheckItem(Calendar_Cal_Generic, "Use &generic version\tCtrl-G", + "Toggle between native and generic control"); + menuCal->AppendSeparator(); +#endif // wxHAS_NATIVE_CALENDARCTRL menuCal->Append(Calendar_Cal_Monday, _T("Monday &first weekday\tCtrl-F"), _T("Toggle between Mon and Sun as the first week day"), @@ -305,20 +370,24 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) _T("Show s&urrounding weeks\tCtrl-W"), _T("Show the neighbouring weeks in the prev/next month"), true); + menuCal->Append(Calendar_Cal_WeekNumbers, + _T("Show &week numbers"), + _T("Toggle week numbers"), + true); menuCal->AppendSeparator(); menuCal->Append(Calendar_Cal_SeqMonth, - _T("To&ggle month selector style\tCtrl-G"), + _T("Toggle month selector st&yle\tCtrl-Y"), _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.")); + 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 to the current date.")); + menuCal->Append(Calendar_Cal_BeginDST, "Call SetDate(GetBeginDST())"); + menuCal->AppendSeparator(); + menuCal->AppendCheckItem(Calendar_Cal_Resizable, _T("Make &resizable\tCtrl-R")); #if wxUSE_DATEPICKCTRL wxMenu *menuDate = new wxMenu; @@ -328,6 +397,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")); @@ -347,7 +418,6 @@ 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); #if wxUSE_DATEPICKCTRL menuBar->Check(Calendar_DatePicker_ShowCentury, true); @@ -356,13 +426,16 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) // ... and attach this menu bar to the frame SetMenuBar(menuBar); - m_panel = new MyPanel(this); - -#if wxUSE_STATUSBAR - // create a status bar just for fun (by default with 1 pane only) - CreateStatusBar(2); - SetStatusText(_T("Welcome to wxWidgets!")); -#endif // wxUSE_STATUSBAR + wxSplitterWindow *splitter = new wxSplitterWindow(this, wxID_ANY, + wxDefaultPosition, wxDefaultSize, + wxSP_NOBORDER); + m_panel = new MyPanel(splitter); + m_logWindow = new wxTextCtrl(splitter, wxID_ANY, wxEmptyString, + wxDefaultPosition, wxDefaultSize, + wxTE_READONLY | wxTE_MULTILINE); + splitter->SplitHorizontally(m_panel, m_logWindow); + splitter->SetMinimumPaneSize(20); + wxLog::SetActiveTarget(new wxLogTextCtrl(m_logWindow)); } void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) @@ -373,22 +446,23 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox(_T("wxCalendarCtrl sample\n(c) 2000 Vadim Zeitlin"), + wxMessageBox(_T("wxCalendarCtrl sample\n(c) 2000--2008 Vadim Zeitlin"), _T("About Calendar"), wxOK | wxICON_INFORMATION, this); } -void MyFrame::OnCalMonday(wxCommandEvent& event) +void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event)) { - bool enable = GetMenuBar()->IsChecked(event.GetId()); + m_logWindow->Clear(); +} - m_panel->ToggleCalStyle(enable, wxCAL_MONDAY_FIRST); +void MyFrame::OnCalMonday(wxCommandEvent& event) +{ + m_panel->ToggleCalStyle(event.IsChecked(), wxCAL_MONDAY_FIRST); } void MyFrame::OnCalHolidays(wxCommandEvent& event) { - bool enable = GetMenuBar()->IsChecked(event.GetId()); - - m_panel->GetCal()->EnableHolidayDisplay(enable); + m_panel->GetCal()->EnableHolidayDisplay(event.IsChecked()); } void MyFrame::OnCalSpecial(wxCommandEvent& event) @@ -398,63 +472,129 @@ void MyFrame::OnCalSpecial(wxCommandEvent& event) void MyFrame::OnCalAllowMonth(wxCommandEvent& event) { - bool allow = GetMenuBar()->IsChecked(event.GetId()); - - m_panel->GetCal()->EnableMonthChange(allow); + m_panel->GetCal()->EnableMonthChange(event.IsChecked()); } -void MyFrame::OnCalAllowYear(wxCommandEvent& event) +void MyFrame::OnCalSeqMonth(wxCommandEvent& event) { - bool allow = GetMenuBar()->IsChecked(event.GetId()); - - m_panel->GetCal()->EnableYearChange(allow); + m_panel->ToggleCalStyle(event.IsChecked(), + wxCAL_SEQUENTIAL_MONTH_SELECTION); } -void MyFrame::OnCalSeqMonth(wxCommandEvent& event) +void MyFrame::OnCalShowSurroundingWeeks(wxCommandEvent& event) { - bool allow = GetMenuBar()->IsChecked(event.GetId()); + m_panel->ToggleCalStyle(event.IsChecked(), wxCAL_SHOW_SURROUNDING_WEEKS); +} - m_panel->ToggleCalStyle(allow, wxCAL_SEQUENTIAL_MONTH_SELECTION); +void MyFrame::OnCalShowWeekNumbers(wxCommandEvent& event) +{ + m_panel->ToggleCalStyle(event.IsChecked(), wxCAL_SHOW_WEEK_NUMBERS); } -void MyFrame::OnCalShowSurroundingWeeks(wxCommandEvent& event) +void MyFrame::OnSetDate(wxCommandEvent &WXUNUSED(event)) { - bool allow = GetMenuBar()->IsChecked(event.GetId()); + m_panel->SetDate(wxDateTime(24, wxDateTime::Dec, 2005, 22, 00, 00)); +} - m_panel->ToggleCalStyle(allow, wxCAL_SHOW_SURROUNDING_WEEKS); +void MyFrame::OnToday(wxCommandEvent &WXUNUSED(event)) +{ + m_panel->SetDate(wxDateTime::Today()); } -void MyFrame::OnAllowYearUpdate(wxUpdateUIEvent& event) +void MyFrame::OnBeginDST(wxCommandEvent &WXUNUSED(event)) { - event.Enable( GetMenuBar()->IsChecked(Calendar_Cal_Month)); + m_panel->SetDate(wxDateTime::GetBeginDST(m_panel->GetDate().GetYear())); } -void MyFrame::OnSetDate(wxCommandEvent &WXUNUSED(event)) +void MyFrame::OnCalToggleResizable(wxCommandEvent& event) { - m_panel->SetDate(); + 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(); } -void MyFrame::OnToday(wxCommandEvent &WXUNUSED(event)) +void MyFrame::OnCalRClick(wxMouseEvent& event) { - m_panel->Today(); + wxDateTime dt; + wxDateTime::WeekDay wd; + + const wxPoint pt = event.GetPosition(); + wxString msg = wxString::Format("Point (%d, %d) is ", pt.x, pt.y); + + switch ( m_panel->GetCal()->HitTest(pt, &dt, &wd) ) + { + default: + wxFAIL_MSG( "unexpected" ); + // fall through + + case wxCAL_HITTEST_NOWHERE: + msg += "nowhere"; + break; + + case wxCAL_HITTEST_HEADER: + msg += wxString::Format("over %s", wxDateTime::GetWeekDayName(wd)); + break; + + case wxCAL_HITTEST_DAY: + msg += wxString::Format("over %s", dt.FormatISODate()); + break; + + case wxCAL_HITTEST_INCMONTH: + msg += "over next month button"; + break; + + case wxCAL_HITTEST_DECMONTH: + msg += "over previous month button"; + break; + + case wxCAL_HITTEST_SURROUNDING_WEEK: + msg += "over a day from another month"; + break; + } + + wxLogMessage("%s", msg); } #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(); @@ -465,7 +605,7 @@ void MyFrame::OnAskDate(wxCommandEvent& WXUNUSED(event)) wxMessageBox(_T("Happy birthday!"), _T("Calendar Sample")); } - m_panel->GetCal()->SetDate(dt); + m_panel->SetDate(dt); wxLogStatus(_T("Changed the date to your input")); } @@ -482,22 +622,25 @@ void MyFrame::OnAskDate(wxCommandEvent& WXUNUSED(event)) // MyPanel // ---------------------------------------------------------------------------- -MyPanel::MyPanel(wxFrame *frame) - : wxPanel(frame, wxID_ANY) +MyPanel::MyPanel(wxWindow *parent) + : wxPanel(parent, wxID_ANY) { +#ifdef wxHAS_NATIVE_CALENDARCTRL + m_usingGeneric = false; +#else + m_usingGeneric = true; +#endif + wxString date; date.Printf(wxT("Selected date: %s"), wxDateTime::Today().FormatISODate().c_str()); m_date = new wxStaticText(this, wxID_ANY, date); - m_calendar = new wxCalendarCtrl(this, Calendar_CalCtrl, - wxDefaultDateTime, - wxDefaultPosition, - wxDefaultSize, - wxCAL_MONDAY_FIRST | - wxCAL_SHOW_HOLIDAYS | - wxRAISED_BORDER); + m_calendar = DoCreateCalendar(wxDefaultDateTime, + wxCAL_MONDAY_FIRST | wxCAL_SHOW_HOLIDAYS); - 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); @@ -508,8 +651,15 @@ MyPanel::MyPanel(wxFrame *frame) void MyPanel::OnCalendar(wxCalendarEvent& event) { - wxLogMessage(wxT("Selected %s from calendar"), - event.GetDate().FormatISODate().c_str()); + // clicking the same date twice unmarks it (convenient for testing) + static wxDateTime s_dateLast; + const bool mark = !s_dateLast.IsValid() || event.GetDate() != s_dateLast; + + s_dateLast = event.GetDate(); + + m_calendar->Mark(event.GetDate().GetDay(), mark); + wxLogMessage(wxT("Selected (and %smarked) %s from calendar."), + mark ? "" : "un", s_dateLast.FormatISODate().c_str()); } void MyPanel::OnCalendarChange(wxCalendarEvent& event) @@ -518,16 +668,14 @@ void MyPanel::OnCalendarChange(wxCalendarEvent& event) s.Printf(wxT("Selected date: %s"), event.GetDate().FormatISODate().c_str()); m_date->SetLabel(s); + wxLogStatus(s); } -void MyPanel::OnCalMonthChange(wxCalendarEvent& WXUNUSED(event)) +void MyPanel::OnCalMonthChange(wxCalendarEvent& event) { - wxLogStatus(wxT("Calendar month changed")); -} - -void MyPanel::OnCalYearChange(wxCalendarEvent& WXUNUSED(event)) -{ - wxLogStatus(wxT("Calendar year changed")); + wxLogStatus(wxT("Calendar month changed to %s %d"), + wxDateTime::GetMonthName(event.GetDate().GetMonth()), + event.GetDate().GetYear()); } void MyPanel::OnCalendarWeekDayClick(wxCalendarEvent& event) @@ -536,6 +684,43 @@ void MyPanel::OnCalendarWeekDayClick(wxCalendarEvent& event) wxDateTime::GetWeekDayName(event.GetWeekDay()).c_str()); } +wxCalendarCtrlBase *MyPanel::DoCreateCalendar(const wxDateTime& dt, long style) +{ + wxCalendarCtrlBase *calendar; +#ifdef wxHAS_NATIVE_CALENDARCTRL + if ( m_usingGeneric ) + calendar = new wxGenericCalendarCtrl(this, Calendar_CalCtrl, + dt, + wxDefaultPosition, + wxDefaultSize, + style); + else +#endif // wxHAS_NATIVE_CALENDARCTRL + calendar = new wxCalendarCtrl(this, Calendar_CalCtrl, + dt, + wxDefaultPosition, + wxDefaultSize, + style); + + calendar->Connect(wxEVT_RIGHT_DOWN, + wxMouseEventHandler(MyFrame::OnCalRClick), + NULL, + wxGetTopLevelParent(this)); + + return calendar; +} + +void MyPanel::RecreateCalendar(long style) +{ + wxCalendarCtrlBase *calendar = DoCreateCalendar(m_calendar->GetDate(), style); + + m_sizer->Replace(m_calendar, calendar); + delete m_calendar; + m_calendar = calendar; + + m_sizer->Layout(); +} + void MyPanel::ToggleCalStyle(bool on, int flag) { long style = m_calendar->GetWindowStyle(); @@ -544,9 +729,18 @@ void MyPanel::ToggleCalStyle(bool on, int flag) else style &= ~flag; - m_calendar->SetWindowStyle(style); + if ( flag == wxCAL_SEQUENTIAL_MONTH_SELECTION + || flag == wxCAL_SHOW_WEEK_NUMBERS) + { + // changing this style requires recreating the control + RecreateCalendar(style); + } + else // just changing the style is enough + { + m_calendar->SetWindowStyle(style); - m_calendar->Refresh(); + m_calendar->Refresh(); + } } void MyPanel::HighlightSpecial(bool on) @@ -572,16 +766,6 @@ 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()); -} // ---------------------------------------------------------------------------- // MyDialog @@ -590,24 +774,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: ")), + sizerText->Add(new wxStaticText(this, wxID_ANY, _T("Date in ISO format: ")), wxSizerFlags().Border().Align(wxALIGN_CENTRE_VERTICAL)); - m_text = new wxTextCtrl(this, -1); + 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()); @@ -615,13 +799,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), @@ -640,8 +824,10 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle) void MyDialog::OnDateChange(wxDateEvent& event) { const wxDateTime dt = event.GetDate(); - m_text->SetValue(dt.IsValid()? dt.FormatISODate() : wxString()); + if ( dt.IsValid() ) + m_text->SetValue(dt.FormatISODate()); + else + m_text->SetValue(wxEmptyString); } #endif // wxUSE_DATEPICKCTRL -