X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5abe54648fcd428e57ed38bfd2fada3921b4cf83..adb8a71bbc0ba11aad0b417db24f7267a250b6c3:/contrib/samples/ogl/studio/studio.cpp?ds=sidebyside

diff --git a/contrib/samples/ogl/studio/studio.cpp b/contrib/samples/ogl/studio/studio.cpp
index ce7ca8b609..f3d414eeee 100644
--- a/contrib/samples/ogl/studio/studio.cpp
+++ b/contrib/samples/ogl/studio/studio.cpp
@@ -119,7 +119,7 @@ bool csApp::OnInit(void)
   // area doesn't refresh properly when we change its position, under Windows.
 
 #define wxDEFAULT_FRAME_STYLE_NO_CLIP \
-  (wxSYSTEM_MENU | wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION)
+  (wxDEFAULT_FRAME_STYLE & ~wxCLIP_CHILDREN)
 
   csFrame* frame = new csFrame(m_docManager, NULL, -1, _T("OGL Studio"), m_mainFramePos, m_mainFrameSize,
    wxDEFAULT_FRAME_STYLE_NO_CLIP | wxHSCROLL | wxVSCROLL);
@@ -244,9 +244,7 @@ wxMDIChildFrame *csApp::CreateChildFrame(wxDocument *doc, wxView *view, wxMenu**
   fileMenu->AppendSeparator();
   fileMenu->Append(wxID_EXIT, _T("E&xit"));
 
-  wxMenu *editMenu = NULL;
-
-  editMenu = new wxMenu;
+  wxMenu* editMenu = new wxMenu;
   editMenu->Append(wxID_UNDO, _T("&Undo\tCtrl+Z"));
   editMenu->Append(wxID_REDO, _T("&Redo\tCtrl+Y"));
   editMenu->AppendSeparator();