Corrected wrong use of delete in region code.

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

diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index 88d1c082847f4336563c5705ae155dadb48625bf..b16e1b0c906ba866d34d2f9b718bd26b4ac16fb9 100644 (file)
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -67,9 +67,14 @@ public:
     void OnCalendar(wxCalendarEvent& event);
     void OnCalendarWeekDayClick(wxCalendarEvent& event);
     void OnCalendarChange(wxCalendarEvent& event);
     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; }
+
+    // turn on/off the specified style bit on the calendar control
+    void ToggleCalStyle(bool on, int style);

 
 

-    void StartWithMonday(bool on);
-    void ShowHolidays(bool on);

     void HighlightSpecial(bool on);
 
 private:
     void HighlightSpecial(bool on);
 
 private:


@@ -94,6 +99,14 @@ public:
     void OnCalHolidays(wxCommandEvent& event);
     void OnCalSpecial(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 OnAllowYearUpdate(wxUpdateUIEvent& event);
+

 private:
     MyPanel *m_panel;
 
 private:
     MyPanel *m_panel;
 


@@ -114,6 +127,10 @@ enum
     Calendar_Cal_Monday = 200,
     Calendar_Cal_Holidays,
     Calendar_Cal_Special,
     Calendar_Cal_Monday = 200,
     Calendar_Cal_Holidays,
     Calendar_Cal_Special,

+    Calendar_Cal_Month,
+    Calendar_Cal_Year,
+    Calendar_Cal_SeqMonth,
+    Calendar_Cal_SurroundWeeks,

     Calendar_CalCtrl = 1000,
 };
 
     Calendar_CalCtrl = 1000,
 };
 


@@ -131,10 +148,20 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     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_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_UPDATE_UI(Calendar_Cal_Year, MyFrame::OnAllowYearUpdate)

 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyPanel, wxPanel)
     EVT_CALENDAR            (Calendar_CalCtrl,   MyPanel::OnCalendar)
 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_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick)
 END_EVENT_TABLE()
     EVT_CALENDAR_SEL_CHANGED(Calendar_CalCtrl,   MyPanel::OnCalendarChange)
     EVT_CALENDAR_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick)
 END_EVENT_TABLE()


@@ -158,13 +185,10 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // Create the main application window
 bool MyApp::OnInit()
 {
     // Create the main application window

-    MyFrame *frame = new MyFrame("Minimal wxWindows App",
+    MyFrame *frame = new MyFrame("Calendar wxWindows sample",

                                  wxPoint(50, 50), wxSize(450, 340));
 
                                  wxPoint(50, 50), wxSize(450, 340));
 

-    // Show it and tell the application that it's our main window
-    // @@@ what does it do exactly, in fact? is it necessary here?

     frame->Show(TRUE);
     frame->Show(TRUE);

-    SetTopWindow(frame);

 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned FALSE here, the
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned FALSE here, the


@@ -189,7 +213,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     wxMenu *menuCal = new wxMenu;
     menuCal->Append(Calendar_Cal_Monday,
 
     wxMenu *menuCal = new wxMenu;
     menuCal->Append(Calendar_Cal_Monday,

-                    "&Monday first weekday\tCtrl-M",
+                    "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 between Mon and Sun as the first week day",
                     TRUE);
     menuCal->Append(Calendar_Cal_Holidays, "Show &holidays\tCtrl-H",


@@ -198,6 +222,21 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuCal->Append(Calendar_Cal_Special, "Highlight &special dates\tCtrl-S",
                     "Test custom highlighting",
                     TRUE);
     menuCal->Append(Calendar_Cal_Special, "Highlight &special dates\tCtrl-S",
                     "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);
+    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);

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


@@ -206,6 +245,8 @@ 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_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);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);


@@ -233,17 +274,54 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnCalMonday(wxCommandEvent& event)
 {
 
 void MyFrame::OnCalMonday(wxCommandEvent& event)
 {

-    m_panel->StartWithMonday(GetMenuBar()->IsChecked(event.GetInt()) != 0);
+    bool enable = GetMenuBar()->IsChecked(event.GetId());
+
+    m_panel->ToggleCalStyle(enable, wxCAL_MONDAY_FIRST);

 }
 
 void MyFrame::OnCalHolidays(wxCommandEvent& event)
 {
 }
 
 void MyFrame::OnCalHolidays(wxCommandEvent& event)
 {

-    m_panel->ShowHolidays(GetMenuBar()->IsChecked(event.GetInt()) != 0);
+    bool enable = GetMenuBar()->IsChecked(event.GetId());
+
+    m_panel->GetCal()->EnableHolidayDisplay(enable);

 }
 
 void MyFrame::OnCalSpecial(wxCommandEvent& event)
 {
 }
 
 void MyFrame::OnCalSpecial(wxCommandEvent& event)
 {

-    m_panel->HighlightSpecial(GetMenuBar()->IsChecked(event.GetInt()) != 0);
+    m_panel->HighlightSpecial(GetMenuBar()->IsChecked(event.GetId()));
+}
+
+void MyFrame::OnCalAllowMonth(wxCommandEvent& event)
+{
+    bool allow = GetMenuBar()->IsChecked(event.GetId());
+
+    m_panel->GetCal()->EnableMonthChange(allow);
+}
+
+void MyFrame::OnCalAllowYear(wxCommandEvent& event)
+{
+    bool allow = GetMenuBar()->IsChecked(event.GetId());
+
+    m_panel->GetCal()->EnableYearChange(allow);
+}
+
+void MyFrame::OnCalSeqMonth(wxCommandEvent& event)
+{
+    bool allow = GetMenuBar()->IsChecked(event.GetId());
+
+    m_panel->ToggleCalStyle(allow, wxCAL_SEQUENTIAL_MONTH_SELECTION);
+}
+
+void MyFrame::OnCalShowSurroundingWeeks(wxCommandEvent& event)
+{
+    bool allow = GetMenuBar()->IsChecked(event.GetId());
+
+    m_panel->ToggleCalStyle(allow, wxCAL_SHOW_SURROUNDING_WEEKS);
+}
+
+void MyFrame::OnAllowYearUpdate(wxUpdateUIEvent& event)
+{
+    event.Enable( GetMenuBar()->IsChecked(Calendar_Cal_Month));

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -256,26 +334,28 @@ MyPanel::MyPanel(wxFrame *frame)
     SetAutoLayout(TRUE);
 
     wxString date;
     SetAutoLayout(TRUE);
 
     wxString date;

-    date.Printf("Selected date: %s",
+    date.Printf(wxT("Selected date: %s"),

                 wxDateTime::Today().FormatISODate().c_str());
     m_date = new wxStaticText(this, -1, date);
     m_calendar = new wxCalendarCtrl(this, Calendar_CalCtrl,
                                     wxDefaultDateTime,
                                     wxDefaultPosition,
                                     wxDefaultSize,
                 wxDateTime::Today().FormatISODate().c_str());
     m_date = new wxStaticText(this, -1, date);
     m_calendar = new wxCalendarCtrl(this, Calendar_CalCtrl,
                                     wxDefaultDateTime,
                                     wxDefaultPosition,
                                     wxDefaultSize,

-                                    wxCAL_MONDAY_FIRST | wxCAL_SHOW_HOLIDAYS);
+                                    wxCAL_MONDAY_FIRST |
+                                    wxCAL_SHOW_HOLIDAYS |
+                                    wxRAISED_BORDER);

 
     wxLayoutConstraints *c = new wxLayoutConstraints;
     c->left.SameAs(this, wxLeft, 10);
 
     wxLayoutConstraints *c = new wxLayoutConstraints;
     c->left.SameAs(this, wxLeft, 10);

-    c->centreY.SameAs(m_calendar, wxCentreY);
+    c->centreY.SameAs(this, wxCentreY);

     c->height.AsIs();
     c->width.AsIs();
 
     m_date->SetConstraints(c);
 
     c = new wxLayoutConstraints;
     c->height.AsIs();
     c->width.AsIs();
 
     m_date->SetConstraints(c);
 
     c = new wxLayoutConstraints;

-    c->left.SameAs(m_date, wxRight, 10);
-    c->top.SameAs(this, wxTop, 10);
+    c->left.SameAs(m_date, wxRight, 20);
+    c->centreY.SameAs(this, wxCentreY);

     c->height.AsIs();
     c->width.AsIs();
 
     c->height.AsIs();
     c->width.AsIs();
 


@@ -284,42 +364,47 @@ MyPanel::MyPanel(wxFrame *frame)
 
 void MyPanel::OnCalendar(wxCalendarEvent& event)
 {
 
 void MyPanel::OnCalendar(wxCalendarEvent& event)
 {

-    wxLogMessage("Selected %s from calendar",
+    wxLogMessage(wxT("Selected %s from calendar"),

                  event.GetDate().FormatISODate().c_str());
 }
 
 void MyPanel::OnCalendarChange(wxCalendarEvent& event)
 {
     wxString s;
                  event.GetDate().FormatISODate().c_str());
 }
 
 void MyPanel::OnCalendarChange(wxCalendarEvent& event)
 {
     wxString s;

-    s.Printf("Selected date: %s", event.GetDate().FormatISODate().c_str());
+    s.Printf(wxT("Selected date: %s"), event.GetDate().FormatISODate().c_str());

 
     m_date->SetLabel(s);
 }
 
 
     m_date->SetLabel(s);
 }
 

+void MyPanel::OnCalMonthChange(wxCalendarEvent& WXUNUSED(event))
+{
+    wxLogStatus(wxT("Calendar month changed"));
+}
+
+void MyPanel::OnCalYearChange(wxCalendarEvent& WXUNUSED(event))
+{
+    wxLogStatus(wxT("Calendar year changed"));
+}
+

 void MyPanel::OnCalendarWeekDayClick(wxCalendarEvent& event)
 {
 void MyPanel::OnCalendarWeekDayClick(wxCalendarEvent& event)
 {

-    wxLogMessage("Clicked on %s",
+    wxLogMessage(wxT("Clicked on %s"),

                  wxDateTime::GetWeekDayName(event.GetWeekDay()).c_str());
 }
 
                  wxDateTime::GetWeekDayName(event.GetWeekDay()).c_str());
 }
 

-void MyPanel::StartWithMonday(bool on)
+void MyPanel::ToggleCalStyle(bool on, int flag)

 {
     long style = m_calendar->GetWindowStyle();
     if ( on )
 {
     long style = m_calendar->GetWindowStyle();
     if ( on )

-        style |= wxCAL_MONDAY_FIRST;
+        style |= flag;

     else
     else

-        style &= ~wxCAL_MONDAY_FIRST;
+        style &= ~flag;

 
     m_calendar->SetWindowStyle(style);
 
     m_calendar->Refresh();
 }
 
 
     m_calendar->SetWindowStyle(style);
 
     m_calendar->Refresh();
 }
 

-void MyPanel::ShowHolidays(bool on)
-{
-    m_calendar->EnableHolidayDisplay(on);
-}
-

 void MyPanel::HighlightSpecial(bool on)
 {
     if ( on )
 void MyPanel::HighlightSpecial(bool on)
 {
     if ( on )


@@ -342,4 +427,3 @@ void MyPanel::HighlightSpecial(bool on)
 
     m_calendar->Refresh();
 }
 
     m_calendar->Refresh();
 }

-