mingw compilation fix

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

diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index 4dbe677028b657408a92a2b14529e6e5bcd87a3a..6996c10e6bf5c523fe89562fef416dd1c8e2c327 100644 (file)
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -29,11 +29,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// for all others, include the necessary headers

 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"

+    #include "wx/panel.h"
+    #include "wx/stattext.h"
+    #include "wx/menu.h"
+    #include "wx/layout.h"
+    #include "wx/msgdlg.h"

 #endif
 
 #include "wx/calctrl.h"
 #endif
 
 #include "wx/calctrl.h"


@@ -63,9 +67,12 @@ 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; }

 
     void StartWithMonday(bool on);
 
     void StartWithMonday(bool on);

-    void ShowHolidays(bool on);

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


@@ -90,6 +97,11 @@ 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 OnAllowYearUpdate(wxUpdateUIEvent& event);
+

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


@@ -110,6 +122,8 @@ 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_CalCtrl = 1000,
 };
 
     Calendar_CalCtrl = 1000,
 };
 


@@ -127,10 +141,17 @@ 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_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()


@@ -154,13 +175,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


@@ -185,7 +203,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",


@@ -194,6 +212,13 @@ 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->AppendSeparator();
+    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;


@@ -202,6 +227,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);


@@ -229,17 +256,37 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnCalMonday(wxCommandEvent& event)
 {
 
 void MyFrame::OnCalMonday(wxCommandEvent& event)
 {

-    m_panel->StartWithMonday(GetMenuBar()->IsChecked(event.GetInt()) != 0);
+    m_panel->StartWithMonday(GetMenuBar()->IsChecked(event.GetId()));

 }
 
 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::OnAllowYearUpdate(wxUpdateUIEvent& event)
+{
+    event.Enable( GetMenuBar()->IsChecked(Calendar_Cal_Month));

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


@@ -252,26 +299,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();
 


@@ -280,21 +329,31 @@ 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());
 }
 


@@ -311,11 +370,6 @@ void MyPanel::StartWithMonday(bool on)
     m_calendar->Refresh();
 }
 
     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 )


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

-