removed src/gtk/eggtrayicon.h

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

diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index 64fa307a45030400ee2778ec14c748d0496d4cdb..6bd3311525de68b2223845fe2709a18ad52c5bc3 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"


@@ -40,6 +41,7 @@
     #include "wx/msgdlg.h"
 #endif
 
     #include "wx/msgdlg.h"
 #endif
 

+#include "wx/sizer.h"

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


@@ -72,9 +74,14 @@ 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);
 
     void HighlightSpecial(bool on);
 

+    void SetDate();
+    void Today();
+    

 private:
     wxCalendarCtrl *m_calendar;
     wxStaticText   *m_date;
 private:
     wxCalendarCtrl *m_calendar;
     wxStaticText   *m_date;


@@ -100,12 +107,18 @@ 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 OnSetDate(wxCommandEvent& event);
+    void OnToday(wxCommandEvent& event);
+

     void OnAllowYearUpdate(wxUpdateUIEvent& event);
 
 private:
     MyPanel *m_panel;
 
     void OnAllowYearUpdate(wxUpdateUIEvent& event);
 
 private:
     MyPanel *m_panel;
 

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -124,14 +137,18 @@ 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_Cal_SetDate,
+    Calendar_Cal_Today,
+    Calendar_CalCtrl = 1000

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

-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets

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

-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event

 // 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)
 // 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)


@@ -145,6 +162,13 @@ 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_MENU(Calendar_Cal_SetDate, MyFrame::OnSetDate)
+    EVT_MENU(Calendar_Cal_Today, MyFrame::OnToday)
+
+

     EVT_UPDATE_UI(Calendar_Cal_Year, MyFrame::OnAllowYearUpdate)
 END_EVENT_TABLE()
 
     EVT_UPDATE_UI(Calendar_Cal_Year, MyFrame::OnAllowYearUpdate)
 END_EVENT_TABLE()
 


@@ -156,7 +180,7 @@ BEGIN_EVENT_TABLE(MyPanel, wxPanel)
     EVT_CALENDAR_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick)
 END_EVENT_TABLE()
 
     EVT_CALENDAR_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick)
 END_EVENT_TABLE()
 

-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create

 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and


@@ -175,18 +199,15 @@ 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",
-                                 wxPoint(50, 50), wxSize(450, 375));
+    MyFrame *frame = new MyFrame(_T("Calendar wxWidgets sample"),
+                                 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);
-    SetTopWindow(frame);
+    frame->Show(true);

 
     // success: wxApp::OnRun() will be called which will enter the main message
 
     // success: wxApp::OnRun() will be called which will enter the main message

-    // loop and the application will run. If we returned FALSE here, the
+    // loop and the application will run. If we returned false here, the

     // application would exit immediately.
     // application would exit immediately.

-    return TRUE;
+    return true;

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


@@ -195,43 +216,54 @@ bool MyApp::OnInit()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)

-       : wxFrame((wxFrame *)NULL, -1, title, pos, size)
+       : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, 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",
-                    TRUE);
-    menuCal->Append(Calendar_Cal_Holidays, "Show &holidays\tCtrl-H",
-                    "Toggle highlighting the holidays",
-                    TRUE);
-    menuCal->Append(Calendar_Cal_Special, "Highlight &special dates\tCtrl-S",
-                    "Test custom highlighting",
-                    TRUE);
+                    _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);
+    menuCal->Append(Calendar_Cal_Special, _T("Highlight &special dates\tCtrl-S"),
+                    _T("Test custom highlighting"),
+                    true);
+    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();
     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);
+    menuCal->Append(Calendar_Cal_SeqMonth,
+                    _T("To&ggle month selector style\tCtrl-G"),
+                    _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."));

 
     // 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;

-    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_Month, TRUE);
-    menuBar->Check(Calendar_Cal_Year, 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);


@@ -241,72 +273,95 @@ 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("Try changing the size of the Window !",1);
+    SetStatusText(_T("Welcome to wxWidgets!"));

 #endif // wxUSE_STATUSBAR
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 #endif // wxUSE_STATUSBAR
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);

 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageBox(_T("wxCalendarCtrl sample\n© 2000 Vadim Zeitlin"),
+    wxMessageBox(_T("wxCalendarCtrl sample\n(c) 2000 Vadim Zeitlin"),

                  _T("About Calendar"), wxOK | wxICON_INFORMATION, this);
 }
 
 void MyFrame::OnCalMonday(wxCommandEvent& event)
 {
                  _T("About Calendar"), wxOK | wxICON_INFORMATION, this);
 }
 
 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));
 }
 

+void MyFrame::OnSetDate(wxCommandEvent &WXUNUSED(event))
+{
+    m_panel->SetDate();
+}
+
+void MyFrame::OnToday(wxCommandEvent &WXUNUSED(event))
+{
+    m_panel->Today();
+}
+

 // ----------------------------------------------------------------------------
 // MyPanel
 // ----------------------------------------------------------------------------
 
 MyPanel::MyPanel(wxFrame *frame)
 // ----------------------------------------------------------------------------
 // MyPanel
 // ----------------------------------------------------------------------------
 
 MyPanel::MyPanel(wxFrame *frame)

-       : wxPanel(frame, -1)
+       : wxPanel(frame, wxID_ANY)

 {
     wxString date;
 {
     wxString date;

-    //------------------
-    SetAutoLayout(TRUE);
-    date.Printf("Selected date: %s ",
+    date.Printf(wxT("Selected date: %s"),

                 wxDateTime::Today().FormatISODate().c_str());
                 wxDateTime::Today().FormatISODate().c_str());

-    m_date = new wxStaticText(this, -1, date);
-    //------------------
+    m_date = new wxStaticText(this, wxID_ANY, date);

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


@@ -315,64 +370,52 @@ MyPanel::MyPanel(wxFrame *frame)
                                     wxCAL_SHOW_HOLIDAYS |
                                     wxRAISED_BORDER);
 
                                     wxCAL_SHOW_HOLIDAYS |
                                     wxRAISED_BORDER);
 

-    //m_calendar->SetAutoLayout(TRUE);
-    //------------------
-    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->height.AsIs();
-    c->width.AsIs();
-    m_date->SetConstraints(c);
-    //------------------
-    Layout();
+    wxBoxSizer *m_sizer = new wxBoxSizer( wxHORIZONTAL );
+
+    m_sizer->Add(m_date, 0, wxALIGN_CENTER | wxALL, 10 );
+    m_sizer->Add(m_calendar, 0, wxALIGN_CENTER | wxALIGN_LEFT);
+
+    SetSizer( m_sizer );
+    m_sizer->SetSizeHints( this );

 }
 
 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);
 


@@ -402,3 +445,13 @@ void MyPanel::HighlightSpecial(bool on)
     m_calendar->Refresh();
 }
 
     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());
+}