Compile fix for sound without threads. Not sure

[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 13e3770ee9da437ef35248001373a63abb53d33e..b69f7dece33ea47d8b4847b2c4782c316c106cb5 100644 (file)
--- a/contrib/samples/ogl/ogledit/ogledit.cpp
+++ b/contrib/samples/ogl/ogledit/ogledit.cpp
@@ -72,7 +72,6 @@ bool MyApp::OnInit(void)
 
   //// Make a menubar
   wxMenu *file_menu = new wxMenu;
-  wxMenu *edit_menu = NULL;
 
   file_menu->Append(wxID_NEW, _T("&New..."));
   file_menu->Append(wxID_OPEN, _T("&Open..."));
@@ -85,7 +84,7 @@ bool MyApp::OnInit(void)
   file_menu->Append(wxID_PRINT_SETUP, _T("Print &Setup..."));
   file_menu->Append(wxID_PREVIEW, _T("Print Pre&view"));
 
-  edit_menu = new wxMenu;
+  wxMenu *edit_menu = new wxMenu;
   edit_menu->Append(wxID_UNDO, _T("&Undo"));
   edit_menu->Append(wxID_REDO, _T("&Redo"));
   edit_menu->AppendSeparator();
@@ -155,7 +154,7 @@ MyFrame::MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title,
   editMenu = NULL;
 }
 
-void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
+void MyFrame::OnSize(wxSizeEvent& event)
 {
   if (canvas && palette)
   {
@@ -173,6 +172,7 @@ void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
     palette->SetSize(paletteX, paletteY, paletteW, paletteH);
     canvas->SetSize(canvasX, canvasY, canvasW, canvasH);
   }
+  event.Skip();
 }
 
 void MyFrame::OnCloseWindow(wxCloseEvent& event)