X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d96cdd4a885886d1c76c6f4cb1a7eefba34b3d10..4cbcfb73a037462ccf4d54b3e50c58e37cc61aa9:/contrib/samples/ogl/ogledit/ogledit.cpp?ds=sidebyside diff --git a/contrib/samples/ogl/ogledit/ogledit.cpp b/contrib/samples/ogl/ogledit/ogledit.cpp index c0c668408f..eefb4a1a02 100644 --- a/contrib/samples/ogl/ogledit/ogledit.cpp +++ b/contrib/samples/ogl/ogledit/ogledit.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -// #pragma implementation -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -52,7 +48,7 @@ MyApp::MyApp(void) bool MyApp::OnInit(void) { wxOGLInitialize(); - + //// Create a document manager myDocManager = new wxDocManager; @@ -88,13 +84,13 @@ bool MyApp::OnInit(void) edit_menu->Append(wxID_UNDO, _T("&Undo")); edit_menu->Append(wxID_REDO, _T("&Redo")); edit_menu->AppendSeparator(); - edit_menu->Append(OGLEDIT_CUT, _T("&Cut")); + edit_menu->Append(wxID_CUT, _T("&Cut")); edit_menu->AppendSeparator(); edit_menu->Append(OGLEDIT_CHANGE_BACKGROUND_COLOUR, _T("Change &background colour")); edit_menu->Append(OGLEDIT_EDIT_LABEL, _T("Edit &label")); frame->editMenu = edit_menu; - + file_menu->AppendSeparator(); file_menu->Append(wxID_EXIT, _T("E&xit")); @@ -170,7 +166,7 @@ void MyFrame::OnSize(wxSizeEvent& event) int canvasY = 0; int canvasW = cw - paletteW; int canvasH = ch; - + palette->SetSize(paletteX, paletteY, paletteW, paletteH); canvas->SetSize(canvasX, canvasY, canvasW, canvasH); }