Use stock ids for menu items in the config sample.
This not only removes some unnecessary code from the sample but also fixes a problem due to the use of a 0 id under wxOSX (which is unsupported there). Closes #12788. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -63,21 +63,14 @@ private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
ConfTest_Quit,
|
||||
ConfTest_About,
|
||||
ConfTest_Delete
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// event tables
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
||||
EVT_MENU(ConfTest_Quit, MyFrame::OnQuit)
|
||||
EVT_MENU(ConfTest_About, MyFrame::OnAbout)
|
||||
EVT_MENU(ConfTest_Delete, MyFrame::OnDelete)
|
||||
EVT_MENU(wxID_EXIT, MyFrame::OnQuit)
|
||||
EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
|
||||
EVT_MENU(wxID_DELETE, MyFrame::OnDelete)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
// ============================================================================
|
||||
@@ -163,11 +156,11 @@ MyFrame::MyFrame()
|
||||
// menu
|
||||
wxMenu *file_menu = new wxMenu;
|
||||
|
||||
file_menu->Append(ConfTest_Delete, wxT("&Delete"), wxT("Delete config file"));
|
||||
file_menu->Append(wxID_DELETE, wxT("&Delete"), wxT("Delete config file"));
|
||||
file_menu->AppendSeparator();
|
||||
file_menu->Append(ConfTest_About, wxT("&About\tF1"), wxT("About this sample"));
|
||||
file_menu->Append(wxID_ABOUT, wxT("&About\tF1"), wxT("About this sample"));
|
||||
file_menu->AppendSeparator();
|
||||
file_menu->Append(ConfTest_Quit, wxT("E&xit\tAlt-X"), wxT("Exit the program"));
|
||||
file_menu->Append(wxID_EXIT, wxT("E&xit\tAlt-X"), wxT("Exit the program"));
|
||||
wxMenuBar *menu_bar = new wxMenuBar;
|
||||
menu_bar->Append(file_menu, wxT("&File"));
|
||||
SetMenuBar(menu_bar);
|
||||
|
Reference in New Issue
Block a user