X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..3abcf424a3e250f5537f9f076d3fb86a925e2547:/contrib/samples/deprecated/resource/resource.cpp diff --git a/contrib/samples/deprecated/resource/resource.cpp b/contrib/samples/deprecated/resource/resource.cpp index 4aaf51eca0..7d0bb7b9c8 100644 --- a/contrib/samples/deprecated/resource/resource.cpp +++ b/contrib/samples/deprecated/resource/resource.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -// #pragma implementation -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -103,12 +99,14 @@ bool MyApp::OnInit(void) #endif // Create the main frame window - frame = new MyFrame( (wxFrame *) NULL, -1, + frame = new MyFrame( (wxFrame *) NULL, wxID_ANY, wxT("wxWidgets Resource Sample"), - wxPoint(-1, -1), wxSize(300, 250) ); + wxDefaultPosition, wxSize(300, 250) ); +#if wxUSE_STATUSBAR // Give it a status line frame->CreateStatusBar(2); +#endif // wxUSE_STATUSBAR wxMenuBar *menu_bar = wxResourceCreateMenuBar(wxT("menu1")); @@ -116,13 +114,13 @@ bool MyApp::OnInit(void) frame->SetMenuBar(menu_bar); // Make a panel - frame->panel = new MyPanel( frame, -1, wxPoint(0, 0), wxSize(400, 400), + frame->panel = new MyPanel( frame, wxID_ANY, wxPoint(0, 0), wxSize(400, 400), 0, wxT("MyMainFrame") ); - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); - return TRUE; + return true; } MyApp::~MyApp() @@ -179,7 +177,7 @@ void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) ) { - Close(TRUE); + Close(true); } void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) ) @@ -197,7 +195,7 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) ) dialog->ShowModal(); } - dialog->Close(TRUE); + dialog->Close(true); } BEGIN_EVENT_TABLE(MyDialog, wxDialog)