X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1484b5cc701329c54bbe70f2a155119fd86945c7..a333f34d91ae845d39ca8a833290e9a1c3d04749:/contrib/samples/ogl/ogledit/ogledit.cpp diff --git a/contrib/samples/ogl/ogledit/ogledit.cpp b/contrib/samples/ogl/ogledit/ogledit.cpp index 13e3770ee9..b69f7dece3 100644 --- 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)