update libpng-dev deps.

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

diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index f5542fd1d1e32d99d884b8174d269dbcbc5fc76d..0d1e45626505586f1c233fc202fcaf76f77112aa 100644 (file)
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -2,7 +2,7 @@
 // Name:        calendar.cpp
 // Purpose:     wxCalendarCtrl sample
 // Author:      Vadim Zeitlin
 // Name:        calendar.cpp
 // Purpose:     wxCalendarCtrl sample
 // Author:      Vadim Zeitlin

-// Modified by: Mark Johnson : Added wxLayoutConstraints support for Ctrl
+// Modified by:

 // Created:     02.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
 // Created:     02.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma implementation "calendar.cpp"
     #pragma interface "calendar.cpp"
 #endif
     #pragma implementation "calendar.cpp"
     #pragma interface "calendar.cpp"
 #endif


@@ -32,6 +32,7 @@
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/log.h"

     #include "wx/frame.h"
     #include "wx/panel.h"
     #include "wx/stattext.h"
     #include "wx/frame.h"
     #include "wx/panel.h"
     #include "wx/stattext.h"


@@ -72,7 +73,9 @@ public:
 
     wxCalendarCtrl *GetCal() const { return m_calendar; }
 
 
     wxCalendarCtrl *GetCal() const { return m_calendar; }
 

-    void StartWithMonday(bool on);
+    // turn on/off the specified style bit on the calendar control
+    void ToggleCalStyle(bool on, int style);
+

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


@@ -100,6 +103,9 @@ public:
     void OnCalAllowMonth(wxCommandEvent& event);
     void OnCalAllowYear(wxCommandEvent& event);
 
     void OnCalAllowMonth(wxCommandEvent& event);
     void OnCalAllowYear(wxCommandEvent& event);
 

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

     void OnAllowYearUpdate(wxUpdateUIEvent& event);
 
 private:
     void OnAllowYearUpdate(wxUpdateUIEvent& event);
 
 private:


@@ -124,7 +130,9 @@ enum
     Calendar_Cal_Special,
     Calendar_Cal_Month,
     Calendar_Cal_Year,
     Calendar_Cal_Special,
     Calendar_Cal_Month,
     Calendar_Cal_Year,

-    Calendar_CalCtrl = 1000,
+    Calendar_Cal_SeqMonth,
+    Calendar_Cal_SurroundWeeks,
+    Calendar_CalCtrl = 1000

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -145,6 +153,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Calendar_Cal_Month, MyFrame::OnCalAllowMonth)
     EVT_MENU(Calendar_Cal_Year, MyFrame::OnCalAllowYear)
 
     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()
 
     EVT_UPDATE_UI(Calendar_Cal_Year, MyFrame::OnAllowYearUpdate)
 END_EVENT_TABLE()
 


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

-    MyFrame *frame = new MyFrame("Calendar wxWindows sample",
+    MyFrame *frame = new MyFrame(_T("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


@@ -200,33 +208,41 @@ 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, "&About...\tCtrl-A", "Show about dialog");
+    menuFile->Append(Calendar_File_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));

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

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

 
     wxMenu *menuCal = new wxMenu;
     menuCal->Append(Calendar_Cal_Monday,
 
     wxMenu *menuCal = new wxMenu;
     menuCal->Append(Calendar_Cal_Monday,

-                    "Monday &first weekday\tCtrl-F",
-                    "Toggle between Mon and Sun as the first week day",
+                    _T("Monday &first weekday\tCtrl-F"),
+                    _T("Toggle between Mon and Sun as the first week day"),
+                    TRUE);
+    menuCal->Append(Calendar_Cal_Holidays, _T("Show &holidays\tCtrl-H"),
+                    _T("Toggle highlighting the holidays"),

                     TRUE);
                     TRUE);

-    menuCal->Append(Calendar_Cal_Holidays, "Show &holidays\tCtrl-H",
-                    "Toggle highlighting the holidays",
+    menuCal->Append(Calendar_Cal_Special, _T("Highlight &special dates\tCtrl-S"),
+                    _T("Test custom highlighting"),

                     TRUE);
                     TRUE);

-    menuCal->Append(Calendar_Cal_Special, "Highlight &special dates\tCtrl-S",
-                    "Test custom highlighting",
+    menuCal->Append(Calendar_Cal_SurroundWeeks,
+                    _T("Show s&urrounding weeks\tCtrl-W"),
+                    _T("Show the neighbouring weeks in the prev/next month"),

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

-    menuCal->Append(Calendar_Cal_Month, "&Month can be changed\tCtrl-M",
-                    "Allow changing the month in the calendar",
+    menuCal->Append(Calendar_Cal_SeqMonth,
+                    _T("To&ggle month selector style\tCtrl-G"),
+                    _T("Use another style for the calendar controls"),

                     TRUE);
                     TRUE);

-    menuCal->Append(Calendar_Cal_Year, "&Year can be changed\tCtrl-Y",
-                    "Allow changing the year in the calendar",
+    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);
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
                     TRUE);
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;

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

 
     menuBar->Check(Calendar_Cal_Monday, TRUE);
     menuBar->Check(Calendar_Cal_Holidays, TRUE);
 
     menuBar->Check(Calendar_Cal_Monday, TRUE);
     menuBar->Check(Calendar_Cal_Holidays, TRUE);


@@ -241,7 +257,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);

-    SetStatusText("Welcome to wxWindows!");
+    SetStatusText(_T("Welcome to wxWindows!"));

 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR
 }
 


@@ -259,34 +275,51 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnCalMonday(wxCommandEvent& event)
 {
 
 void MyFrame::OnCalMonday(wxCommandEvent& event)
 {

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

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

-    bool enable = GetMenuBar()->IsChecked(event.GetInt());
+    bool enable = GetMenuBar()->IsChecked(event.GetId());
+

     m_panel->GetCal()->EnableHolidayDisplay(enable);
 }
 
 void MyFrame::OnCalSpecial(wxCommandEvent& event)
 {
     m_panel->GetCal()->EnableHolidayDisplay(enable);
 }
 
 void MyFrame::OnCalSpecial(wxCommandEvent& event)
 {

-    m_panel->HighlightSpecial(GetMenuBar()->IsChecked(event.GetInt()));
+    m_panel->HighlightSpecial(GetMenuBar()->IsChecked(event.GetId()));

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

-    bool allow = GetMenuBar()->IsChecked(event.GetInt());
+    bool allow = GetMenuBar()->IsChecked(event.GetId());

 
     m_panel->GetCal()->EnableMonthChange(allow);
 }
 
 void MyFrame::OnCalAllowYear(wxCommandEvent& event)
 {
 
     m_panel->GetCal()->EnableMonthChange(allow);
 }
 
 void MyFrame::OnCalAllowYear(wxCommandEvent& event)
 {

-    bool allow = GetMenuBar()->IsChecked(event.GetInt());
+    bool allow = GetMenuBar()->IsChecked(event.GetId());

 
     m_panel->GetCal()->EnableYearChange(allow);
 }
 
 
     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));
 void MyFrame::OnAllowYearUpdate(wxUpdateUIEvent& event)
 {
     event.Enable( GetMenuBar()->IsChecked(Calendar_Cal_Month));


@@ -299,13 +332,12 @@ void MyFrame::OnAllowYearUpdate(wxUpdateUIEvent& event)
 MyPanel::MyPanel(wxFrame *frame)
        : wxPanel(frame, -1)
 {
 MyPanel::MyPanel(wxFrame *frame)
        : wxPanel(frame, -1)
 {

-    wxString date;
-    //------------------

     SetAutoLayout(TRUE);
     SetAutoLayout(TRUE);

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

                 wxDateTime::Today().FormatISODate().c_str());
     m_date = new wxStaticText(this, -1, date);
                 wxDateTime::Today().FormatISODate().c_str());
     m_date = new wxStaticText(this, -1, date);

-    //------------------

     m_calendar = new wxCalendarCtrl(this, Calendar_CalCtrl,
                                     wxDefaultDateTime,
                                     wxDefaultPosition,
     m_calendar = new wxCalendarCtrl(this, Calendar_CalCtrl,
                                     wxDefaultDateTime,
                                     wxDefaultPosition,


@@ -314,64 +346,60 @@ MyPanel::MyPanel(wxFrame *frame)
                                     wxCAL_SHOW_HOLIDAYS |
                                     wxRAISED_BORDER);
 
                                     wxCAL_SHOW_HOLIDAYS |
                                     wxRAISED_BORDER);
 

-    m_calendar->SetAutoLayout(TRUE);
-    //------------------

     wxLayoutConstraints *c = new wxLayoutConstraints;
     wxLayoutConstraints *c = new wxLayoutConstraints;

-    //------------------
-    c = new wxLayoutConstraints;
-    c->left.PercentOf(this, wxWidth, 10);
-    c->right.PercentOf(this, wxWidth, 60);
-    c->top.PercentOf(this, wxHeight, 10);
-    c->bottom.PercentOf(this, wxHeight, 60);
-    m_calendar->SetConstraints(c);
-    //------------------
-    c = new wxLayoutConstraints;
-    c->left.SameAs(m_calendar, wxLeft, 10);
-    c->top.SameAs(m_calendar, wxBottom);
+    c->left.SameAs(this, wxLeft, 10);
+    c->centreY.SameAs(this, wxCentreY);

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

+

     m_date->SetConstraints(c);
     m_date->SetConstraints(c);

-    //------------------
-    Layout();
+
+    c = new wxLayoutConstraints;
+    c->left.SameAs(m_date, wxRight, 20);
+    c->centreY.SameAs(this, wxCentreY);
+    c->height.AsIs();
+    c->width.AsIs();
+
+    m_calendar->SetConstraints(c);

 }
 
 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);
 }
 
 void MyPanel::OnCalMonthChange(wxCalendarEvent& WXUNUSED(event))
 {
 
     m_date->SetLabel(s);
 }
 
 void MyPanel::OnCalMonthChange(wxCalendarEvent& WXUNUSED(event))
 {

-    wxLogStatus("Calendar month changed");
+    wxLogStatus(wxT("Calendar month changed"));

 }
 
 void MyPanel::OnCalYearChange(wxCalendarEvent& WXUNUSED(event))
 {
 }
 
 void MyPanel::OnCalYearChange(wxCalendarEvent& WXUNUSED(event))
 {

-    wxLogStatus("Calendar year changed");
+    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->SetWindowStyle(style);
 


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

-