X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/526954c5968baa29218c994ec48e476ae2bd4b9f..d5cc191c9cd48a915ce0dfc6e49511b2fddb6746:/samples/config/conftest.cpp?ds=sidebyside diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp index 6152557676..dd903e2378 100644 --- a/samples/config/conftest.cpp +++ b/samples/config/conftest.cpp @@ -29,7 +29,7 @@ #include "wx/log.h" #include "wx/config.h" -#ifndef __WXMSW__ +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" #endif @@ -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() // ============================================================================ @@ -126,7 +119,6 @@ bool MyApp::OnInit() // create the main program window MyFrame *frame = new MyFrame; frame->Show(true); - SetTopWindow(frame); // use our config object... if ( pConfig->Read(wxT("/Controls/Check"), 1l) != 0 ) { @@ -163,11 +155,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);