Avoid warnings from mgl headers if possible.

[wxWidgets.git] / contrib / samples / ogl / ogledit / ogledit.cpp

diff --git a/contrib/samples/ogl/ogledit/ogledit.cpp b/contrib/samples/ogl/ogledit/ogledit.cpp
index c0c668408f1e8513e2ce329b70cb557c1d9c4eb9..aeaaf1af969ab9055a986adc922d6249e4d6c71d 100644 (file)
--- a/contrib/samples/ogl/ogledit/ogledit.cpp
+++ b/contrib/samples/ogl/ogledit/ogledit.cpp
@@ -52,7 +52,7 @@ MyApp::MyApp(void)
 bool MyApp::OnInit(void)
 {
   wxOGLInitialize();
 bool MyApp::OnInit(void)
 {
   wxOGLInitialize();

-  
+

   //// Create a document manager
   myDocManager = new wxDocManager;
 
   //// Create a document manager
   myDocManager = new wxDocManager;
 


@@ -88,13 +88,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(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;
   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"));
 
   file_menu->AppendSeparator();
   file_menu->Append(wxID_EXIT, _T("E&xit"));
 


@@ -170,7 +170,7 @@ void MyFrame::OnSize(wxSizeEvent& event)
     int canvasY = 0;
     int canvasW = cw - paletteW;
     int canvasH = ch;
     int canvasY = 0;
     int canvasW = cw - paletteW;
     int canvasH = ch;

-    
+

     palette->SetSize(paletteX, paletteY, paletteW, paletteH);
     canvas->SetSize(canvasX, canvasY, canvasW, canvasH);
   }
     palette->SetSize(paletteX, paletteY, paletteW, paletteH);
     canvas->SetSize(canvasX, canvasY, canvasW, canvasH);
   }