X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1484b5cc701329c54bbe70f2a155119fd86945c7..45b8a2566d46bf77f13553937df258e44c88a789:/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 48c0b44fd1..b1f6d8b12a 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); @@ -161,7 +161,7 @@ bool csApp::OnInit(void) frame->SetMenuBar(menuBar); // Load the file history - wxConfig config(_T("OGL Studio"), _T("wxWindows")); + wxConfig config(_T("OGL Studio"), _T("wxWidgets")); m_docManager->FileHistoryLoad(config); frame->CreateStatusBar(); @@ -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(); @@ -288,7 +286,7 @@ wxMDIChildFrame *csApp::CreateChildFrame(wxDocument *doc, wxView *view, wxMenu** } // Creates a canvas. Called by OnInit as a child of the main window -csCanvas *csApp::CreateCanvas(wxView *view, wxFrame *parent) +csCanvas *csApp::CreateCanvas(wxView *view, wxMDIChildFrame *parent) { int width, height; parent->GetClientSize(&width, &height); @@ -493,7 +491,7 @@ void csApp::CreateDiagramToolBar(wxFrame* parent) // Read/write configuration information bool csApp::ReadOptions() { - wxConfig config(_T("OGL Studio"), _T("wxWindows")); + wxConfig config(_T("OGL Studio"), _T("wxWidgets")); config.Read(_T("mainX"), & m_mainFramePos.x); config.Read(_T("mainY"), & m_mainFramePos.y); @@ -507,7 +505,7 @@ bool csApp::ReadOptions() bool csApp::WriteOptions() { - wxConfig config(_T("OGL Studio"), _T("wxWindows")); + wxConfig config(_T("OGL Studio"), _T("wxWidgets")); config.Write(_T("mainX"), (long) m_mainFramePos.x); config.Write(_T("mainY"), (long) m_mainFramePos.y);