X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cb9f0d0f82650b707adc39823a73531d080ffec..b889a3a24bda7d1e9d361d866ada776400b2fb81:/samples/calendar/calendar.cpp

diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index 1a05ab23d7..6996c10e6b 100644
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -178,10 +178,7 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame("Calendar wxWindows 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);
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned FALSE here, the
@@ -259,30 +256,30 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnCalMonday(wxCommandEvent& event)
 {
-    m_panel->StartWithMonday(GetMenuBar()->IsChecked(event.GetInt()));
+    m_panel->StartWithMonday(GetMenuBar()->IsChecked(event.GetId()));
 }
 
 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->HighlightSpecial(GetMenuBar()->IsChecked(event.GetInt()));
+    m_panel->HighlightSpecial(GetMenuBar()->IsChecked(event.GetId()));
 }
 
 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)
 {
-    bool allow = GetMenuBar()->IsChecked(event.GetInt());
+    bool allow = GetMenuBar()->IsChecked(event.GetId());
 
     m_panel->GetCal()->EnableYearChange(allow);
 }
@@ -299,13 +296,10 @@ void MyFrame::OnAllowYearUpdate(wxUpdateUIEvent& event)
 MyPanel::MyPanel(wxFrame *frame)
        : wxPanel(frame, -1)
 {
-    // using constraints doesn't work under GTK - the calendar window is never
-    // repainted after it had been moved at least once!
-#if 1
     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,
@@ -331,48 +325,35 @@ MyPanel::MyPanel(wxFrame *frame)
     c->width.AsIs();
 
     m_calendar->SetConstraints(c);
-#else
-    wxString date;
-    date.Printf("Selected date: %s",
-                wxDateTime::Today().FormatISODate().c_str());
-    m_date = new wxStaticText(this, -1, date, wxPoint(10, 100));
-    m_calendar = new wxCalendarCtrl(this, Calendar_CalCtrl,
-                                    wxDefaultDateTime,
-                                    wxPoint(200, 20),
-                                    wxDefaultSize,
-                                    wxCAL_MONDAY_FIRST |
-                                    wxCAL_SHOW_HOLIDAYS |
-                                    wxRAISED_BORDER);
-#endif
 }
 
 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;
-    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))
 {
-    wxLogStatus("Calendar month changed");
+    wxLogStatus(wxT("Calendar month changed"));
 }
 
 void MyPanel::OnCalYearChange(wxCalendarEvent& WXUNUSED(event))
 {
-    wxLogStatus("Calendar year changed");
+    wxLogStatus(wxT("Calendar year changed"));
 }
 
 void MyPanel::OnCalendarWeekDayClick(wxCalendarEvent& event)
 {
-    wxLogMessage("Clicked on %s",
+    wxLogMessage(wxT("Clicked on %s"),
                  wxDateTime::GetWeekDayName(event.GetWeekDay()).c_str());
 }
 
@@ -411,4 +392,3 @@ void MyPanel::HighlightSpecial(bool on)
 
     m_calendar->Refresh();
 }
-