Don't use a destroy event handler to disconnect the native control's delegate as...

[wxWidgets.git] / samples / calendar / calendar.cpp

diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index 42714c2345c1d9251f6ab46baf573d933c8df62f..a6c6007c51f0ae800aaead0ff99a736936fe0728 100644 (file)
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -81,6 +81,7 @@ public:
 
     void OnCalendar(wxCalendarEvent& event);
     void OnCalendarWeekDayClick(wxCalendarEvent& event);
 
     void OnCalendar(wxCalendarEvent& event);
     void OnCalendarWeekDayClick(wxCalendarEvent& event);

+    void OnCalendarWeekClick(wxCalendarEvent& event);

     void OnCalendarChange(wxCalendarEvent& event);
     void OnCalMonthChange(wxCalendarEvent& event);
 
     void OnCalendarChange(wxCalendarEvent& event);
     void OnCalMonthChange(wxCalendarEvent& event);
 


@@ -97,11 +98,14 @@ public:
     }
 
     void HighlightSpecial(bool on);
     }
 
     void HighlightSpecial(bool on);

+    void LimitDateRange(bool on);

 
     wxDateTime GetDate() const { return m_calendar->GetDate(); }
     void SetDate(const wxDateTime& dt) { m_calendar->SetDate(dt); }
 
 private:
 
     wxDateTime GetDate() const { return m_calendar->GetDate(); }
     void SetDate(const wxDateTime& dt) { m_calendar->SetDate(dt); }
 
 private:

+    wxCalendarCtrlBase *DoCreateCalendar(const wxDateTime& dt, long style);
+

     void RecreateCalendar(long style);
 
     wxCalendarCtrlBase *m_calendar;
     void RecreateCalendar(long style);
 
     wxCalendarCtrlBase *m_calendar;


@@ -144,9 +148,10 @@ public:
     void OnCalSpecial(wxCommandEvent& event);
 
     void OnCalAllowMonth(wxCommandEvent& event);
     void OnCalSpecial(wxCommandEvent& event);
 
     void OnCalAllowMonth(wxCommandEvent& event);

-
+    void OnCalLimitDates(wxCommandEvent& event);

     void OnCalSeqMonth(wxCommandEvent& event);
     void OnCalShowSurroundingWeeks(wxCommandEvent& event);
     void OnCalSeqMonth(wxCommandEvent& event);
     void OnCalShowSurroundingWeeks(wxCommandEvent& event);

+    void OnCalShowWeekNumbers(wxCommandEvent& event);

 
     void OnSetDate(wxCommandEvent& event);
     void OnToday(wxCommandEvent& event);
 
     void OnSetDate(wxCommandEvent& event);
     void OnToday(wxCommandEvent& event);


@@ -159,6 +164,8 @@ public:
         event.Enable(m_panel->IsUsingGeneric());
     }
 
         event.Enable(m_panel->IsUsingGeneric());
     }
 

+    void OnCalRClick(wxMouseEvent& event);
+

 private:
     MyPanel *m_panel;
     wxTextCtrl *m_logWindow;
 private:
     MyPanel *m_panel;
     wxTextCtrl *m_logWindow;


@@ -206,8 +213,10 @@ enum
     Calendar_Cal_Holidays,
     Calendar_Cal_Special,
     Calendar_Cal_Month,
     Calendar_Cal_Holidays,
     Calendar_Cal_Special,
     Calendar_Cal_Month,

+    Calendar_Cal_LimitDates,

     Calendar_Cal_SeqMonth,
     Calendar_Cal_SurroundWeeks,
     Calendar_Cal_SeqMonth,
     Calendar_Cal_SurroundWeeks,

+    Calendar_Cal_WeekNumbers,

     Calendar_Cal_SetDate,
     Calendar_Cal_Today,
     Calendar_Cal_BeginDST,
     Calendar_Cal_SetDate,
     Calendar_Cal_Today,
     Calendar_Cal_BeginDST,


@@ -254,8 +263,11 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
     EVT_MENU(Calendar_Cal_Month, MyFrame::OnCalAllowMonth)
 
 
     EVT_MENU(Calendar_Cal_Month, MyFrame::OnCalAllowMonth)
 

+    EVT_MENU(Calendar_Cal_LimitDates, MyFrame::OnCalLimitDates)
+

     EVT_MENU(Calendar_Cal_SeqMonth, MyFrame::OnCalSeqMonth)
     EVT_MENU(Calendar_Cal_SurroundWeeks, MyFrame::OnCalShowSurroundingWeeks)
     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_SetDate, MyFrame::OnSetDate)
     EVT_MENU(Calendar_Cal_Today, MyFrame::OnToday)


@@ -265,8 +277,11 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
 
     EVT_UPDATE_UI(Calendar_Cal_SeqMonth, MyFrame::OnUpdateUIGenericOnly)
 
 
     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)
     EVT_UPDATE_UI(Calendar_Cal_Monday, MyFrame::OnUpdateUIGenericOnly)
     EVT_UPDATE_UI(Calendar_Cal_Holidays, MyFrame::OnUpdateUIGenericOnly)

+    EVT_UPDATE_UI(Calendar_Cal_LimitDates, MyFrame::OnUpdateUIGenericOnly)
+#endif

     EVT_UPDATE_UI(Calendar_Cal_Special, MyFrame::OnUpdateUIGenericOnly)
     EVT_UPDATE_UI(Calendar_Cal_SurroundWeeks, MyFrame::OnUpdateUIGenericOnly)
 END_EVENT_TABLE()
     EVT_UPDATE_UI(Calendar_Cal_Special, MyFrame::OnUpdateUIGenericOnly)
     EVT_UPDATE_UI(Calendar_Cal_SurroundWeeks, MyFrame::OnUpdateUIGenericOnly)
 END_EVENT_TABLE()


@@ -276,6 +291,7 @@ BEGIN_EVENT_TABLE(MyPanel, wxPanel)
     EVT_CALENDAR_PAGE_CHANGED(Calendar_CalCtrl, MyPanel::OnCalMonthChange)
     EVT_CALENDAR_SEL_CHANGED(Calendar_CalCtrl, MyPanel::OnCalendarChange)
     EVT_CALENDAR_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick)
     EVT_CALENDAR_PAGE_CHANGED(Calendar_CalCtrl, MyPanel::OnCalMonthChange)
     EVT_CALENDAR_SEL_CHANGED(Calendar_CalCtrl, MyPanel::OnCalendarChange)
     EVT_CALENDAR_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick)

+    EVT_CALENDAR_WEEK_CLICKED(Calendar_CalCtrl,  MyPanel::OnCalendarWeekClick)

 END_EVENT_TABLE()
 
 #if wxUSE_DATEPICKCTRL
 END_EVENT_TABLE()
 
 #if wxUSE_DATEPICKCTRL


@@ -308,11 +324,11 @@ bool MyApp::OnInit()
         return false;
 
     // Create the main application window
         return false;
 
     // Create the main application window

-    MyFrame *frame = new MyFrame(_T("Calendar wxWidgets sample")
+    MyFrame *frame = new MyFrame(wxT("Calendar wxWidgets sample")

 #ifndef __WXWINCE__
                                  ,wxPoint(50, 50), wxSize(450, 340)
 #endif
 #ifndef __WXWINCE__
                                  ,wxPoint(50, 50), wxSize(450, 340)
 #endif

-                                                                );
+                                 );

 
     frame->Show(true);
 
 
     frame->Show(true);
 


@@ -335,11 +351,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 
     // create a menu bar
     wxMenu *menuFile = new wxMenu;

-    menuFile->Append(Calendar_File_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));
+    menuFile->Append(Calendar_File_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog"));

     menuFile->AppendSeparator();
     menuFile->AppendSeparator();

-    menuFile->Append(Calendar_File_ClearLog, _T("&Clear log\tCtrl-L"));
+    menuFile->Append(Calendar_File_ClearLog, wxT("&Clear log\tCtrl-L"));

     menuFile->AppendSeparator();
     menuFile->AppendSeparator();

-    menuFile->Append(Calendar_File_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
+    menuFile->Append(Calendar_File_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));

 
     wxMenu *menuCal = new wxMenu;
 #ifdef wxHAS_NATIVE_CALENDARCTRL
 
     wxMenu *menuCal = new wxMenu;
 #ifdef wxHAS_NATIVE_CALENDARCTRL


@@ -348,63 +364,70 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuCal->AppendSeparator();
 #endif // wxHAS_NATIVE_CALENDARCTRL
     menuCal->Append(Calendar_Cal_Monday,
     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"),
+                    wxT("Monday &first weekday\tCtrl-F"),
+                    wxT("Toggle between Mon and Sun as the first week day"),

                     true);
                     true);

-    menuCal->Append(Calendar_Cal_Holidays, _T("Show &holidays\tCtrl-H"),
-                    _T("Toggle highlighting the holidays"),
+    menuCal->Append(Calendar_Cal_Holidays, wxT("Show &holidays\tCtrl-H"),
+                    wxT("Toggle highlighting the holidays"),

                     true);
                     true);

-    menuCal->Append(Calendar_Cal_Special, _T("Highlight &special dates\tCtrl-S"),
-                    _T("Test custom highlighting"),
+    menuCal->Append(Calendar_Cal_Special, wxT("Highlight &special dates\tCtrl-S"),
+                    wxT("Test custom highlighting"),

                     true);
     menuCal->Append(Calendar_Cal_SurroundWeeks,
                     true);
     menuCal->Append(Calendar_Cal_SurroundWeeks,

-                    _T("Show s&urrounding weeks\tCtrl-W"),
-                    _T("Show the neighbouring weeks in the prev/next month"),
+                    wxT("Show s&urrounding weeks\tCtrl-W"),
+                    wxT("Show the neighbouring weeks in the prev/next month"),
+                    true);
+    menuCal->Append(Calendar_Cal_WeekNumbers,
+                    wxT("Show &week numbers"),
+                    wxT("Toggle week numbers"),

                     true);
     menuCal->AppendSeparator();
     menuCal->Append(Calendar_Cal_SeqMonth,
                     true);
     menuCal->AppendSeparator();
     menuCal->Append(Calendar_Cal_SeqMonth,

-                    _T("Toggle month selector st&yle\tCtrl-Y"),
-                    _T("Use another style for the calendar controls"),
+                    wxT("Toggle month selector st&yle\tCtrl-Y"),
+                    wxT("Use another style for the calendar controls"),

                     true);
                     true);

-    menuCal->Append(Calendar_Cal_Month, _T("&Month can be changed\tCtrl-M"),
-                    _T("Allow changing the month in the calendar"),
+    menuCal->Append(Calendar_Cal_Month, wxT("&Month can be changed\tCtrl-M"),
+                    wxT("Allow changing the month in the calendar"),

                     true);
                     true);

+    menuCal->AppendCheckItem(Calendar_Cal_LimitDates, wxT("Toggle date ra&nge\tCtrl-N"),
+                    wxT("Limit the valid dates"));

     menuCal->AppendSeparator();
     menuCal->AppendSeparator();

-    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_SetDate, wxT("Call &SetDate(2005-12-24)"), wxT("Set date to 2005-12-24."));
+    menuCal->Append(Calendar_Cal_Today, wxT("Call &Today()"), wxT("Set to the current date."));

     menuCal->Append(Calendar_Cal_BeginDST, "Call SetDate(GetBeginDST())");
     menuCal->AppendSeparator();
     menuCal->Append(Calendar_Cal_BeginDST, "Call SetDate(GetBeginDST())");
     menuCal->AppendSeparator();

-    menuCal->AppendCheckItem(Calendar_Cal_Resizable, _T("Make &resizable\tCtrl-R"));
+    menuCal->AppendCheckItem(Calendar_Cal_Resizable, wxT("Make &resizable\tCtrl-R"));

 
 #if wxUSE_DATEPICKCTRL
     wxMenu *menuDate = new wxMenu;
     menuDate->AppendCheckItem(Calendar_DatePicker_ShowCentury,
 
 #if wxUSE_DATEPICKCTRL
     wxMenu *menuDate = new wxMenu;
     menuDate->AppendCheckItem(Calendar_DatePicker_ShowCentury,

-                              _T("Al&ways show century"));
+                              wxT("Al&ways show century"));

     menuDate->AppendCheckItem(Calendar_DatePicker_DropDown,
     menuDate->AppendCheckItem(Calendar_DatePicker_DropDown,

-                              _T("Use &drop down control"));
+                              wxT("Use &drop down control"));

     menuDate->AppendCheckItem(Calendar_DatePicker_AllowNone,
     menuDate->AppendCheckItem(Calendar_DatePicker_AllowNone,

-                              _T("Allow &no date"));
+                              wxT("Allow &no date"));

     menuDate->AppendCheckItem(Calendar_DatePicker_StartWithNone,
     menuDate->AppendCheckItem(Calendar_DatePicker_StartWithNone,

-                              _T("Start &with no date"));
+                              wxT("Start &with no date"));

 #if wxUSE_DATEPICKCTRL_GENERIC
     menuDate->AppendCheckItem(Calendar_DatePicker_Generic,
 #if wxUSE_DATEPICKCTRL_GENERIC
     menuDate->AppendCheckItem(Calendar_DatePicker_Generic,

-                              _T("Use &generic version of the control"));
+                              wxT("Use &generic version of the control"));

 #endif // wxUSE_DATEPICKCTRL_GENERIC
     menuDate->AppendSeparator();
 #endif // wxUSE_DATEPICKCTRL_GENERIC
     menuDate->AppendSeparator();

-    menuDate->Append(Calendar_DatePicker_AskDate, _T("&Choose date...\tCtrl-D"), _T("Show dialog with wxDatePickerCtrl"));
+    menuDate->Append(Calendar_DatePicker_AskDate, wxT("&Choose date...\tCtrl-D"), wxT("Show dialog with wxDatePickerCtrl"));

 #endif // wxUSE_DATEPICKCTRL
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
 #endif // wxUSE_DATEPICKCTRL
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;

-    menuBar->Append(menuFile, _T("&File"));
-    menuBar->Append(menuCal, _T("&Calendar"));
+    menuBar->Append(menuFile, wxT("&File"));
+    menuBar->Append(menuCal, wxT("&Calendar"));

 #if wxUSE_DATEPICKCTRL
 #if wxUSE_DATEPICKCTRL

-    menuBar->Append(menuDate, _T("&Date picker"));
+    menuBar->Append(menuDate, wxT("&Date picker"));

 #endif // wxUSE_DATEPICKCTRL
 
     menuBar->Check(Calendar_Cal_Monday, true);
     menuBar->Check(Calendar_Cal_Holidays, true);
     menuBar->Check(Calendar_Cal_Month, true);
 #endif // wxUSE_DATEPICKCTRL
 
     menuBar->Check(Calendar_Cal_Monday, true);
     menuBar->Check(Calendar_Cal_Holidays, true);
     menuBar->Check(Calendar_Cal_Month, true);

+    menuBar->Check(Calendar_Cal_LimitDates, false);

 
 #if wxUSE_DATEPICKCTRL
     menuBar->Check(Calendar_DatePicker_ShowCentury, true);
 
 #if wxUSE_DATEPICKCTRL
     menuBar->Check(Calendar_DatePicker_ShowCentury, true);


@@ -433,8 +456,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageBox(_T("wxCalendarCtrl sample\n(c) 2000--2008 Vadim Zeitlin"),
-                 _T("About Calendar"), wxOK | wxICON_INFORMATION, this);
+    wxMessageBox(wxT("wxCalendarCtrl sample\n(c) 2000--2008 Vadim Zeitlin"),
+                 wxT("About Calendar"), wxOK | wxICON_INFORMATION, this);

 }
 
 void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))


@@ -457,6 +480,11 @@ void MyFrame::OnCalSpecial(wxCommandEvent& event)
     m_panel->HighlightSpecial(GetMenuBar()->IsChecked(event.GetId()));
 }
 
     m_panel->HighlightSpecial(GetMenuBar()->IsChecked(event.GetId()));
 }
 

+void MyFrame::OnCalLimitDates(wxCommandEvent& event)
+{
+    m_panel->LimitDateRange(GetMenuBar()->IsChecked(event.GetId()));
+}
+

 void MyFrame::OnCalAllowMonth(wxCommandEvent& event)
 {
     m_panel->GetCal()->EnableMonthChange(event.IsChecked());
 void MyFrame::OnCalAllowMonth(wxCommandEvent& event)
 {
     m_panel->GetCal()->EnableMonthChange(event.IsChecked());


@@ -473,6 +501,11 @@ void MyFrame::OnCalShowSurroundingWeeks(wxCommandEvent& event)
     m_panel->ToggleCalStyle(event.IsChecked(), wxCAL_SHOW_SURROUNDING_WEEKS);
 }
 
     m_panel->ToggleCalStyle(event.IsChecked(), wxCAL_SHOW_SURROUNDING_WEEKS);
 }
 

+void MyFrame::OnCalShowWeekNumbers(wxCommandEvent& event)
+{
+    m_panel->ToggleCalStyle(event.IsChecked(), wxCAL_SHOW_WEEK_NUMBERS);
+}
+

 void MyFrame::OnSetDate(wxCommandEvent &WXUNUSED(event))
 {
     m_panel->SetDate(wxDateTime(24, wxDateTime::Dec, 2005, 22, 00, 00));
 void MyFrame::OnSetDate(wxCommandEvent &WXUNUSED(event))
 {
     m_panel->SetDate(wxDateTime(24, wxDateTime::Dec, 2005, 22, 00, 00));


@@ -506,6 +539,48 @@ void MyFrame::OnCalToggleResizable(wxCommandEvent& event)
     sizer->Layout();
 }
 
     sizer->Layout();
 }
 

+void MyFrame::OnCalRClick(wxMouseEvent& event)
+{
+    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)
 #if wxUSE_DATEPICKCTRL
 
 void MyFrame::OnUpdateUIStartWithNone(wxUpdateUIEvent& event)


@@ -542,16 +617,16 @@ void MyFrame::OnAskDate(wxCommandEvent& WXUNUSED(event))
             if ( dt.GetDay() == today.GetDay() &&
                     dt.GetMonth() == today.GetMonth() )
             {
             if ( dt.GetDay() == today.GetDay() &&
                     dt.GetMonth() == today.GetMonth() )
             {

-                wxMessageBox(_T("Happy birthday!"), _T("Calendar Sample"));
+                wxMessageBox(wxT("Happy birthday!"), wxT("Calendar Sample"));

             }
 
             m_panel->SetDate(dt);
 
             }
 
             m_panel->SetDate(dt);
 

-            wxLogStatus(_T("Changed the date to your input"));
+            wxLogStatus(wxT("Changed the date to your input"));

         }
         else
         {
         }
         else
         {

-            wxLogStatus(_T("No date entered"));
+            wxLogStatus(wxT("No date entered"));

         }
     }
 }
         }
     }
 }


@@ -575,13 +650,8 @@ MyPanel::MyPanel(wxWindow *parent)
     date.Printf(wxT("Selected date: %s"),
                 wxDateTime::Today().FormatISODate().c_str());
     m_date = new wxStaticText(this, wxID_ANY, 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);

 
     // adjust to vertical/horizontal display, check mostly dedicated to WinCE
     bool horizontal = ( wxSystemSettings::GetMetric(wxSYS_SCREEN_X) > wxSystemSettings::GetMetric(wxSYS_SCREEN_Y) );
 
     // adjust to vertical/horizontal display, check mostly dedicated to WinCE
     bool horizontal = ( wxSystemSettings::GetMetric(wxSYS_SCREEN_X) > wxSystemSettings::GetMetric(wxSYS_SCREEN_Y) );


@@ -596,9 +666,15 @@ MyPanel::MyPanel(wxWindow *parent)
 
 void MyPanel::OnCalendar(wxCalendarEvent& event)
 {
 
 void MyPanel::OnCalendar(wxCalendarEvent& event)
 {

-    m_calendar->Mark(event.GetDate().GetDay(), true);
-    wxLogMessage(wxT("Selected (and marked) %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)
 }
 
 void MyPanel::OnCalendarChange(wxCalendarEvent& event)


@@ -623,24 +699,41 @@ void MyPanel::OnCalendarWeekDayClick(wxCalendarEvent& event)
                  wxDateTime::GetWeekDayName(event.GetWeekDay()).c_str());
 }
 
                  wxDateTime::GetWeekDayName(event.GetWeekDay()).c_str());
 }
 

-void MyPanel::RecreateCalendar(long style)
+void MyPanel::OnCalendarWeekClick(wxCalendarEvent& event)
+{
+    wxLogMessage(wxT("Clicked on week %d"), event.GetDate().GetWeekOfYear());
+}
+
+wxCalendarCtrlBase *MyPanel::DoCreateCalendar(const wxDateTime& dt, long style)

 {
     wxCalendarCtrlBase *calendar;
 #ifdef wxHAS_NATIVE_CALENDARCTRL
     if ( m_usingGeneric )
         calendar = new wxGenericCalendarCtrl(this, Calendar_CalCtrl,
 {
     wxCalendarCtrlBase *calendar;
 #ifdef wxHAS_NATIVE_CALENDARCTRL
     if ( m_usingGeneric )
         calendar = new wxGenericCalendarCtrl(this, Calendar_CalCtrl,

-                                             m_calendar->GetDate(),
+                                             dt,

                                              wxDefaultPosition,
                                              wxDefaultSize,
                                              style);
     else
 #endif // wxHAS_NATIVE_CALENDARCTRL
         calendar = new wxCalendarCtrl(this, Calendar_CalCtrl,
                                              wxDefaultPosition,
                                              wxDefaultSize,
                                              style);
     else
 #endif // wxHAS_NATIVE_CALENDARCTRL
         calendar = new wxCalendarCtrl(this, Calendar_CalCtrl,

-                                      m_calendar->GetDate(),
+                                      dt,

                                       wxDefaultPosition,
                                       wxDefaultSize,
                                       style);
 
                                       wxDefaultPosition,
                                       wxDefaultSize,
                                       style);
 

+    calendar->Connect(wxEVT_RIGHT_DOWN,
+                      wxMouseEventHandler(MyFrame::OnCalRClick),
+                      NULL,
+                      ( MyFrame * )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->Replace(m_calendar, calendar);
     delete m_calendar;
     m_calendar = calendar;


@@ -656,7 +749,8 @@ void MyPanel::ToggleCalStyle(bool on, int flag)
     else
         style &= ~flag;
 
     else
         style &= ~flag;
 

-    if ( flag == wxCAL_SEQUENTIAL_MONTH_SELECTION )
+    if ( flag == wxCAL_SEQUENTIAL_MONTH_SELECTION
+        || flag == wxCAL_SHOW_WEEK_NUMBERS)

     {
         // changing this style requires recreating the control
         RecreateCalendar(style);
     {
         // changing this style requires recreating the control
         RecreateCalendar(style);


@@ -692,6 +786,52 @@ void MyPanel::HighlightSpecial(bool on)
     m_calendar->Refresh();
 }
 
     m_calendar->Refresh();
 }
 

+// Toggle a restricted date range to the six months centered on today's date.
+void MyPanel::LimitDateRange(bool on)
+{
+    if ( on )
+    {
+        // limit the choice of date to 3 months around today
+        const wxDateSpan diff = wxDateSpan::Months(3);
+        const wxDateTime today = wxDateTime::Today();
+
+        // Set the restricted date range.
+        if ( m_calendar->SetDateRange(today - diff, today + diff) )
+        {
+            wxLogStatus("Date range limited to 3 months around today.");
+            wxDateTime firstValidDate;
+            wxDateTime lastValidDate;
+            if ( m_calendar->GetDateRange(&firstValidDate, &lastValidDate) )
+            {
+                wxLogMessage("First valid date: %s, last valid date: %s",
+                             firstValidDate.FormatISODate(),
+                             lastValidDate.FormatISODate());
+            }
+            else
+            {
+                wxLogWarning("Failed to get back the valid dates range.");
+            }
+        }
+        else
+        {
+            wxLogWarning("Date range not supported.");
+        }
+    }
+    else // off
+    {
+        // Remove the date restrictions.
+        if ( m_calendar->SetDateRange() )
+        {
+            wxLogStatus("Date choice is unlimited now.");
+        }
+        else
+        {
+            wxLogWarning("Date range not supported.");
+        }
+    }
+
+    m_calendar->Refresh();
+}

 
 // ----------------------------------------------------------------------------
 // MyDialog
 
 // ----------------------------------------------------------------------------
 // MyDialog


@@ -700,7 +840,7 @@ void MyPanel::HighlightSpecial(bool on)
 #if wxUSE_DATEPICKCTRL
 
 MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
 #if wxUSE_DATEPICKCTRL
 
 MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)

-        : wxDialog(parent, wxID_ANY, wxString(_T("Calendar: Choose a date")))
+        : wxDialog(parent, wxID_ANY, wxString(wxT("Calendar: Choose a date")))

 {
     wxStdDialogButtonSizer *sizerBtns = new wxStdDialogButtonSizer;
     sizerBtns->AddButton(new wxButton(this, wxID_OK));
 {
     wxStdDialogButtonSizer *sizerBtns = new wxStdDialogButtonSizer;
     sizerBtns->AddButton(new wxButton(this, wxID_OK));


@@ -708,7 +848,7 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
     sizerBtns->Realize();
 
     wxSizer *sizerText = new wxBoxSizer(wxHORIZONTAL);
     sizerBtns->Realize();
 
     wxSizer *sizerText = new wxBoxSizer(wxHORIZONTAL);

-    sizerText->Add(new wxStaticText(this, wxID_ANY, _T("Date in ISO format: ")),
+    sizerText->Add(new wxStaticText(this, wxID_ANY, wxT("Date in ISO format: ")),

                     wxSizerFlags().Border().Align(wxALIGN_CENTRE_VERTICAL));
     m_text = new wxTextCtrl(this, wxID_ANY);
     sizerText->Add(m_text, wxSizerFlags().
                     wxSizerFlags().Border().Align(wxALIGN_CENTRE_VERTICAL));
     m_text = new wxTextCtrl(this, wxID_ANY);
     sizerText->Add(m_text, wxSizerFlags().


@@ -718,7 +858,7 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
     sizerTop->Add(new wxStaticText
                       (
                         this, wxID_ANY,
     sizerTop->Add(new wxStaticText
                       (
                         this, wxID_ANY,

-                        _T("Enter your birthday date (not before 20th century):")
+                        wxT("Enter your birthday date (not before 20th century):")

                       ),
                     wxSizerFlags().Border());
 
                       ),
                     wxSizerFlags().Border());