fixed bug with using wxCommandEvent::GetInt() instead of GetId()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
31ad62bc09
commit
89a0a3220b
@ -178,10 +178,7 @@ bool MyApp::OnInit()
|
|||||||
MyFrame *frame = new MyFrame("Calendar wxWindows sample",
|
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
|
// 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
|
||||||
@ -259,30 +256,30 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
|
|||||||
|
|
||||||
void MyFrame::OnCalMonday(wxCommandEvent& 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)
|
void MyFrame::OnCalHolidays(wxCommandEvent& event)
|
||||||
{
|
{
|
||||||
bool enable = GetMenuBar()->IsChecked(event.GetInt());
|
bool enable = GetMenuBar()->IsChecked(event.GetId());
|
||||||
m_panel->GetCal()->EnableHolidayDisplay(enable);
|
m_panel->GetCal()->EnableHolidayDisplay(enable);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MyFrame::OnCalSpecial(wxCommandEvent& event)
|
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);
|
m_panel->GetCal()->EnableMonthChange(allow);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MyFrame::OnCalAllowYear(wxCommandEvent& event)
|
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);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user