// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma implementation "calendar.cpp"
#pragma interface "calendar.cpp"
#endif
// 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"
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 OnCalAllowMonth(wxCommandEvent& event);
void OnCalAllowYear(wxCommandEvent& event);
+ void OnCalSeqMonth(wxCommandEvent& event);
+ void OnCalShowSurroundingWeeks(wxCommandEvent& event);
+
void OnAllowYearUpdate(wxUpdateUIEvent& event);
private:
Calendar_Cal_Special,
Calendar_Cal_Month,
Calendar_Cal_Year,
- Calendar_CalCtrl = 1000,
+ Calendar_Cal_SeqMonth,
+ Calendar_Cal_SurroundWeeks,
+ Calendar_CalCtrl = 1000
};
// ----------------------------------------------------------------------------
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()
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));
- // 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
// 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->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,
- "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);
- 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);
- 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();
- 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);
- 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;
- 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);
#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
}
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)
{
- 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);
}
+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));
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,
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());
}
-void MyPanel::StartWithMonday(bool on)
+void MyPanel::ToggleCalStyle(bool on, int flag)
{
long style = m_calendar->GetWindowStyle();
if ( on )
- style |= wxCAL_MONDAY_FIRST;
+ style |= flag;
else
- style &= ~wxCAL_MONDAY_FIRST;
+ style &= ~flag;
m_calendar->SetWindowStyle(style);
m_calendar->Refresh();
}
-
projects / wxWidgets.git / blobdiff