X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83ae4c616cd965afda87c4bff6509dba3b3254ab..8fb75ec30fa7a4fc30e0130b4224959dfaf7a6b0:/contrib/samples/ogl/ogledit/ogledit.cpp diff --git a/contrib/samples/ogl/ogledit/ogledit.cpp b/contrib/samples/ogl/ogledit/ogledit.cpp index b69f7dece3..c0c668408f 100644 --- a/contrib/samples/ogl/ogledit/ogledit.cpp +++ b/contrib/samples/ogl/ogledit/ogledit.cpp @@ -6,7 +6,7 @@ // Created: 12/07/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -118,12 +118,14 @@ bool MyApp::OnInit(void) //// Associate the menu bar with the frame frame->SetMenuBar(menu_bar); +#if wxUSE_STATUSBAR frame->CreateStatusBar(1); +#endif // wxUSE_STATUSBAR frame->Centre(wxBOTH); - frame->Show(TRUE); + frame->Show(true); - return TRUE; + return true; } int MyApp::OnExit(void) @@ -147,7 +149,7 @@ END_EVENT_TABLE() MyFrame::MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, long type): - wxDocParentFrame(manager, frame, -1, title, pos, size, type) + wxDocParentFrame(manager, frame, wxID_ANY, title, pos, size, type) { canvas = NULL; palette = NULL; @@ -197,7 +199,7 @@ MyCanvas *MyFrame::CreateCanvas(wxView *view, wxFrame *parent) parent->GetClientSize(&width, &height); // Non-retained canvas - MyCanvas *canvas = new MyCanvas(view, parent, -1, wxPoint(0, 0), wxSize(width, height), 0); + MyCanvas *canvas = new MyCanvas(view, parent, wxID_ANY, wxPoint(0, 0), wxSize(width, height), 0); canvas->SetCursor(wxCursor(wxCURSOR_HAND)); // Give it scrollbars