X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMMainFrame.cpp;h=41052d4014f611fd1fb851511810008d63390ec8;hb=bae167768b5d3ccae6ec9b04c844d80e0368a52d;hp=441d99e89050c728f347cd41239a1bdb095e1e69;hpb=6bb41c012fbc5a0ded6a2ed4e294f3ea0e1ab0c5;p=crea.git diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp index 441d99e..41052d4 100755 --- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp +++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp @@ -38,7 +38,9 @@ #include "wx/tooltip.h" #include "wx/wxhtml.h" #include "wx/statline.h" +#include "wx/config.h" #include "CDMUtilities.h" +#include "images/CIcon64.xpm" #include "creaDevManagerIds.h" #include "wxCDMMainDescriptionPanel.h" @@ -49,10 +51,16 @@ #include "wxCDMLibraryDescriptionPanel.h" #include "wxCDMPackageDescriptionPanel.h" #include "wxCDMBlackBoxDescriptionPanel.h" +#include "wxCDMBBSFileDescriptionPanel.h" +#include "wxCDMBBGFileDescriptionPanel.h" +#include "wxCDMCodeFileDescriptionPanel.h" #include "wxCDMCMakeListsDescriptionPanel.h" #include "wxCDMFolderDescriptionPanel.h" #include "wxCDMFileDescriptionPanel.h" #include "wxCDMPackageManagerPanel.h" +#include "wxCDMProjectMapDialog.h" + +#include "wxCDMSettingsDialog.h" #include "wxCDMProjectActionsPanel.h" #include "wxCDMNewProjectDialog.h" @@ -60,18 +68,26 @@ BEGIN_EVENT_TABLE(wxCDMMainFrame, wxFrame) +EVT_MENU_OPEN(wxCDMMainFrame::OnMenuBarOpen) EVT_MENU(ID_MENU_NEW_PROJECT, wxCDMMainFrame::OnMenuNewProject) EVT_MENU(ID_MENU_OPEN_PROJECT, wxCDMMainFrame::OnMenuOpenProject) +EVT_MENU(ID_MENU_OPEN_RECENT1, wxCDMMainFrame::OnMenuOpenRecent) +EVT_MENU(ID_MENU_OPEN_RECENT2, wxCDMMainFrame::OnMenuOpenRecent) +EVT_MENU(ID_MENU_OPEN_RECENT3, wxCDMMainFrame::OnMenuOpenRecent) +EVT_MENU(ID_MENU_OPEN_RECENT4, wxCDMMainFrame::OnMenuOpenRecent) +EVT_MENU(ID_MENU_OPEN_RECENT5, wxCDMMainFrame::OnMenuOpenRecent) EVT_MENU(ID_MENU_CLOSE_PROJECT, wxCDMMainFrame::OnMenuCloseProject) EVT_MENU(ID_MENU_EXPORT_HIERARCHY, wxCDMMainFrame::OnMenuExportHierarchy) EVT_MENU(ID_MENU_EXIT, wxCDMMainFrame::OnMenuExit) EVT_MENU(ID_MENU_REFRESH_PROJECT, wxCDMMainFrame::OnMenuRefreshProject) +EVT_MENU(ID_MENU_SETTINGS, wxCDMMainFrame::OnMenuSettings) EVT_MENU(ID_MENU_BBTK_GRAPHICAL_EDITOR, wxCDMMainFrame::OnMenuBBTKGraphicalEditor) EVT_MENU(ID_MENU_MINITOOLS, wxCDMMainFrame::OnMenuMiniTools) EVT_MENU(ID_MENU_CODE_EDITOR, wxCDMMainFrame::OnMenuCodeEditor) EVT_MENU(ID_MENU_COMMAND_LINE, wxCDMMainFrame::OnMenuCommandLine) EVT_MENU(ID_MENU_TOGGLE_HELP, wxCDMMainFrame::OnMenuToggleHelp) EVT_MENU(ID_MENU_HELP, wxCDMMainFrame::OnMenuHelp) +EVT_MENU(ID_MENU_SHOW_PROJECT_MAP, wxCDMMainFrame::OnMenuShowProjectMap) EVT_MENU(ID_MENU_REPORT_BUG, wxCDMMainFrame::OnMenuReportBug) EVT_MENU(ID_MENU_ABOUT_CREADEVMANAGER, wxCDMMainFrame::OnMenuAboutCreaDevManager) EVT_MENU(ID_MENU_ABOUT_CREATIS, wxCDMMainFrame::OnMenuAboutCreatis) @@ -110,6 +126,9 @@ wxCDMMainFrame::wxCDMMainFrame( wxCDMMainFrame::~wxCDMMainFrame() { + wxConfigBase* pConfig = wxConfigBase::Get(); + pConfig->Write(wxT("HELP"), this->help); + auiManager.UnInit(); } @@ -123,10 +142,16 @@ bool wxCDMMainFrame::Create( ) { wxFrame::Create(parent, id, caption, pos, size, style); - this->model = new modelCDMMain(); this->help = true; + + wxConfigBase* pConfig = wxConfigBase::Get(); + this->help = pConfig->Read(wxT("HELP"), this->help) != 0; + + this->model = new modelCDMMain(); + CreateMenus(); CreateControls(); + this->SetIcon(wxIcon(CIcon64)); return TRUE; } @@ -160,10 +185,40 @@ void wxCDMMainFrame::CreateMenus() { wxMenuBar* menuBar = new wxMenuBar; + //Recently opened projects + menu_Recent = new wxMenu(); + wxConfigBase* pConfig = wxConfigBase::Get(); + std::string rp = crea::wx2std(pConfig->Read(wxT("RECENT1"), wxT(""))); + if(rp != "") + { + menu_Recent->Append(ID_MENU_OPEN_RECENT1, crea::std2wx(rp)); + rp = crea::wx2std(pConfig->Read(wxT("RECENT2"), wxT(""))); + if(rp != "") + { + menu_Recent->Append(ID_MENU_OPEN_RECENT2, crea::std2wx(rp)); + rp = crea::wx2std(pConfig->Read(wxT("RECENT3"), wxT(""))); + if(rp != "") + { + menu_Recent->Append(ID_MENU_OPEN_RECENT3, crea::std2wx(rp)); + rp = crea::wx2std(pConfig->Read(wxT("RECENT4"), wxT(""))); + if(rp != "") + { + menu_Recent->Append(ID_MENU_OPEN_RECENT4, crea::std2wx(rp)); + rp = crea::wx2std(pConfig->Read(wxT("RECENT5"), wxT(""))); + if(rp != "") + { + menu_Recent->Append(ID_MENU_OPEN_RECENT5, crea::std2wx(rp)); + } + } + } + } + } + //FileMenu menu_File = new wxMenu(); menu_File->Append(ID_MENU_NEW_PROJECT, wxT("&New Project...")); menu_File->Append(ID_MENU_OPEN_PROJECT, wxT("&Open Project...")); + menu_File->AppendSubMenu(menu_Recent,wxT("Open &Recent"),wxT("Open a recently opened project.")); menu_File->AppendSeparator(); menu_File->Append(ID_MENU_CLOSE_PROJECT, wxT("&Close Project")); menu_File->AppendSeparator(); @@ -176,15 +231,16 @@ void wxCDMMainFrame::CreateMenus() //EditMenu menu_Edit = new wxMenu(); menu_Edit->Append(ID_MENU_REFRESH_PROJECT, wxT("&Refresh Project")); + menu_Edit->Append(ID_MENU_SETTINGS, wxT("&Settings")); menuBar->Append(menu_Edit, wxT("&Edit")); //ToolsMenu menu_Tools = new wxMenu(); - menu_Tools->Append(ID_MENU_BBTK_GRAPHICAL_EDITOR, wxT("BBTK &Graphical Editor")); - menu_Tools->Append(ID_MENU_MINITOOLS, wxT("&MiniTools")); - menu_Tools->Append(ID_MENU_CODE_EDITOR, wxT("&Code Editor")); - menu_Tools->Append(ID_MENU_COMMAND_LINE, wxT("&Command Line")); + menu_Tools->Append(ID_MENU_BBTK_GRAPHICAL_EDITOR, wxT("Open BBEditor (BBTK &Graphical Editor)")); + menu_Tools->Append(ID_MENU_MINITOOLS, wxT("Open &CreaTools")); + menu_Tools->Append(ID_MENU_CODE_EDITOR, wxT("Open Code &Editor")); + menu_Tools->Append(ID_MENU_COMMAND_LINE, wxT("Open Command &Line")); menuBar->Append(menu_Tools, wxT("&Tools")); @@ -192,6 +248,7 @@ void wxCDMMainFrame::CreateMenus() menu_Help = new wxMenu(); menu_Help->AppendCheckItem(ID_MENU_TOGGLE_HELP, wxT("He&lp Dialogs")); menu_Help->Check(ID_MENU_TOGGLE_HELP, this->help); + menu_Help->Append(ID_MENU_SHOW_PROJECT_MAP, wxT("&Show Project Map")); menu_Help->Append(ID_MENU_HELP, wxT("&Help")); menu_Help->Append(ID_MENU_REPORT_BUG, wxT("Report &Bug")); menu_Help->Append(ID_MENU_ABOUT_CREADEVMANAGER, wxT("&About CreaDevManager")); @@ -233,7 +290,7 @@ void wxCDMMainFrame::CreateControls() ); auiManager.AddPane(panel_Properties, wxAuiPaneInfo().BestSize(600,400).CenterPane().Name(wxT("panel_Properties")).Caption(wxT("")).CloseButton(false)); - auiManager.AddPane(tree_Projects, wxAuiPaneInfo().Right().MinSize(300,300).BestSize(300,400).CloseButton(false).Name(wxT("tree_Projects")).Caption(wxT("Project Tree")).CloseButton(false)); + auiManager.AddPane(tree_Projects, wxAuiPaneInfo().Left().MinSize(250,300).BestSize(250,400).CloseButton(false).Name(wxT("tree_Projects")).Caption(wxT("Project Tree")).CloseButton(false)); auiManager.Update(); //auiManager.LoadPerspective(pers,true); wxToolTip::Enable(true); @@ -241,6 +298,43 @@ void wxCDMMainFrame::CreateControls() } //Event Handlers + +void wxCDMMainFrame::OnMenuBarOpen(wxMenuEvent& event) +{ + //clean recent menu + int tam = menu_Recent->GetMenuItemCount(); + for (int i = 0; i < tam; ++i) { + menu_Recent->Delete(menu_Recent->FindItemByPosition(0)); + } + //populate recent menu + wxConfigBase* pConfig = wxConfigBase::Get(); + std::string rp = crea::wx2std(pConfig->Read(wxT("RECENT1"), wxT(""))); + if(rp != "") + { + menu_Recent->Append(ID_MENU_OPEN_RECENT1, crea::std2wx(rp)); + rp = crea::wx2std(pConfig->Read(wxT("RECENT2"), wxT(""))); + if(rp != "") + { + menu_Recent->Append(ID_MENU_OPEN_RECENT2, crea::std2wx(rp)); + rp = crea::wx2std(pConfig->Read(wxT("RECENT3"), wxT(""))); + if(rp != "") + { + menu_Recent->Append(ID_MENU_OPEN_RECENT3, crea::std2wx(rp)); + rp = crea::wx2std(pConfig->Read(wxT("RECENT4"), wxT(""))); + if(rp != "") + { + menu_Recent->Append(ID_MENU_OPEN_RECENT4, crea::std2wx(rp)); + rp = crea::wx2std(pConfig->Read(wxT("RECENT5"), wxT(""))); + if(rp != "") + { + menu_Recent->Append(ID_MENU_OPEN_RECENT5, crea::std2wx(rp)); + } + } + } + } + } +} + //File menu void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event) { @@ -252,7 +346,7 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event) if(userResponse == wxID_FORWARD) { - //create project + //close open project if(this->model->GetProject() != NULL) { if(!this->model->CloseProject(result)) @@ -262,6 +356,7 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event) event.Skip(); return; } + if(this->panel_Properties != NULL) { auiManager.DetachPane(this->panel_Properties); @@ -275,7 +370,7 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event) } - + //create project if(!this->model->CreateProject( crea::wx2std(dialog->GetProjectName()), crea::wx2std(dialog->GetProjectLocation()), @@ -290,6 +385,18 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event) return; } + //update recently open projects + wxConfigBase* pConfig = wxConfigBase::Get(); + if(pConfig->Read(wxT("RECENT1"),wxT("")) != crea::std2wx(this->model->GetProject()->GetPath())) + { + pConfig->Write(wxT("RECENT5"), pConfig->Read(wxT("RECENT4"),wxT(""))); + pConfig->Write(wxT("RECENT4"), pConfig->Read(wxT("RECENT3"),wxT(""))); + pConfig->Write(wxT("RECENT3"), pConfig->Read(wxT("RECENT2"),wxT(""))); + pConfig->Write(wxT("RECENT2"), pConfig->Read(wxT("RECENT1"),wxT(""))); + pConfig->Write(wxT("RECENT1"), crea::std2wx(this->model->GetProject()->GetPath())); + } + + //show project actions panel if(this->panel_ProjectActions != NULL) { @@ -319,6 +426,104 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event) //wxMessageBox(wxT("ProjectSelected") ,_T("New Project - Success!"),wxOK | wxICON_ERROR); } } +void wxCDMMainFrame::OnMenuOpenRecent(wxCommandEvent& event) +{ + std::string* result; + + //((wxMenuItem*)(event.GetEventObject()))->GetItemLabel(); + + std::string path = ""; + wxConfigBase* pConfig = wxConfigBase::Get(); + if(event.GetId() == ID_MENU_OPEN_RECENT1) + path = crea::wx2std (pConfig->Read(wxT("RECENT1"),wxT(""))); + else if(event.GetId() == ID_MENU_OPEN_RECENT2) + path = crea::wx2std (pConfig->Read(wxT("RECENT2"),wxT(""))); + else if(event.GetId() == ID_MENU_OPEN_RECENT3) + path = crea::wx2std (pConfig->Read(wxT("RECENT3"),wxT(""))); + else if(event.GetId() == ID_MENU_OPEN_RECENT4) + path = crea::wx2std (pConfig->Read(wxT("RECENT4"),wxT(""))); + else if(event.GetId() == ID_MENU_OPEN_RECENT5) + path = crea::wx2std (pConfig->Read(wxT("RECENT5"),wxT(""))); + + std::cout << "Selection to open: " << path << std::endl; + std::cout.flush(); + + + //populate model + if(this->model->GetProject() != NULL) + { + std::cout << "Project not null, closing it" << std::endl; + if(!this->model->CloseProject(result)) + { + std::cout << "error closing project: " << *result << std::endl; + wxMessageBox(crea::std2wx(result->c_str()),_T("New Project - Error!"),wxOK | wxICON_ERROR); + event.Skip(); + return; + } + + if(this->panel_Properties != NULL) + { + auiManager.DetachPane(this->panel_Properties); + this->panel_Properties->Hide(); + } + if(this->panel_ProjectActions != NULL) + { + auiManager.DetachPane(this->panel_ProjectActions); + this->panel_ProjectActions->Hide(); + } + } + + if (!this->model->OpenProject(path, result)) + { + std::cout << "error opening project: " << *result << std::endl; + wxMessageBox( crea::std2wx(result->c_str()), wxT("Open Project - Error"), wxICON_ERROR); + event.Skip(); + return; + }; + + //update recently open projects + if(pConfig->Read(wxT("RECENT1"),wxT("")) != crea::std2wx(this->model->GetProject()->GetPath())) + { + pConfig->Write(wxT("RECENT5"), pConfig->Read(wxT("RECENT4"),wxT(""))); + pConfig->Write(wxT("RECENT4"), pConfig->Read(wxT("RECENT3"),wxT(""))); + pConfig->Write(wxT("RECENT3"), pConfig->Read(wxT("RECENT2"),wxT(""))); + pConfig->Write(wxT("RECENT2"), pConfig->Read(wxT("RECENT1"),wxT(""))); + pConfig->Write(wxT("RECENT1"), crea::std2wx(this->model->GetProject()->GetPath())); + } + + std::cout << "building ui" << std::endl; + + //populate tree control + tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject()); + tree_Projects->Unselect(); + this->actualTreeItem.Unset(); + tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true); + + + //change project's actions panel + if(this->panel_ProjectActions!= NULL) + { + auiManager.DetachPane(this->panel_ProjectActions); + this->panel_ProjectActions->Destroy(); + this->panel_ProjectActions = NULL; + } + panel_ProjectActions = new wxCDMProjectActionsPanel( + this, + this->model->GetProject(), + ID_WINDOW_PROJ_ACTIONS, + wxT("Project Actions Panel"), + wxDefaultPosition, + wxSize(800,200), + 0 + ); + panel_ProjectActions->SetMinSize(wxSize(500, 100)); + + + auiManager.AddPane(panel_ProjectActions, wxAuiPaneInfo().Bottom().MinSize(800,50).Name(wxT("panel_ProjectActions")).Caption(wxT("General Project Actions")).BestSize(800,70).CloseButton(false)); + + auiManager.Update(); + +} void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event) { std::string* result; @@ -346,6 +551,7 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event) event.Skip(); return; } + if(this->panel_Properties != NULL) { auiManager.DetachPane(this->panel_Properties); @@ -366,6 +572,17 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event) return; }; + //update recently open projects + wxConfigBase* pConfig = wxConfigBase::Get(); + if(pConfig->Read(wxT("RECENT1"),wxT("")) != crea::std2wx(this->model->GetProject()->GetPath())) + { + pConfig->Write(wxT("RECENT5"), pConfig->Read(wxT("RECENT4"),wxT(""))); + pConfig->Write(wxT("RECENT4"), pConfig->Read(wxT("RECENT3"),wxT(""))); + pConfig->Write(wxT("RECENT3"), pConfig->Read(wxT("RECENT2"),wxT(""))); + pConfig->Write(wxT("RECENT2"), pConfig->Read(wxT("RECENT1"),wxT(""))); + pConfig->Write(wxT("RECENT1"), crea::std2wx(this->model->GetProject()->GetPath())); + } + std::cout << "building ui" << std::endl; //populate tree control @@ -496,6 +713,19 @@ void wxCDMMainFrame::OnMenuRefreshProject(wxCommandEvent& event) event.Skip(); } +void wxCDMMainFrame::OnMenuSettings(wxCommandEvent& event) +{ + wxCDMSettingsDialog* settingsDialog = new wxCDMSettingsDialog(this, -1); + settingsDialog->SetHelpEnabled(this->help); + + int res = settingsDialog->ShowModal(); + if(res == wxID_OK) + { + this->help = settingsDialog->IsHelpEnabled(); + this->menu_Help->Check(ID_MENU_TOGGLE_HELP, this->help); + } +} + void wxCDMMainFrame::OnMenuBBTKGraphicalEditor(wxCommandEvent& event) { std::cerr << "Event OnMenuBBTKGraphicalEditor not implemented" << std::endl; @@ -527,10 +757,18 @@ void wxCDMMainFrame::OnMenuCommandLine(wxCommandEvent& event) } } +//Help Menu +void wxCDMMainFrame::OnMenuShowProjectMap(wxCommandEvent& event) +{ + wxCDMProjectMapDialog* dialog = new wxCDMProjectMapDialog(this); + + dialog->Show(true); +} + //Help Menu void wxCDMMainFrame::OnMenuHelp(wxCommandEvent& event) { - wxLaunchDefaultBrowser(_T("http://www.creatis.insa-lyon.fr/site/en/CreatoolsDocumentation"), 0); + wxLaunchDefaultBrowser(_T("http://www.creatis.insa-lyon.fr/~gonzalez/documentationSWDoc.html"), 0); } void wxCDMMainFrame::OnMenuReportBug(wxCommandEvent& event) { @@ -769,14 +1007,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) } else { - //folder - modelCDMFolder* elementFolder = dynamic_cast(element); - if(elementFolder != NULL) + //CodeFile + modelCDMCodeFile* elementCodeFile = dynamic_cast(element); + if(elementCodeFile != NULL) { //create element description - description = new wxCDMFolderDescriptionPanel( + description = new wxCDMCodeFileDescriptionPanel( this, - elementFolder, + elementCodeFile, ID_WINDOW_PROPERTIES, wxT("Description Panel"), wxDefaultPosition, @@ -786,14 +1024,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) } else { - //file - modelCDMFile* elementFile = dynamic_cast(element); - if(elementFile != NULL) + //BBSFile + modelCDMBBSFile* elementBBSFile = dynamic_cast(element); + if(elementBBSFile != NULL) { //create element description - description = new wxCDMFileDescriptionPanel( + description = new wxCDMBBSFileDescriptionPanel( this, - elementFile, + elementBBSFile, ID_WINDOW_PROPERTIES, wxT("Description Panel"), wxDefaultPosition, @@ -803,17 +1041,71 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) } else { - - //main if not any - //create element description - description = new wxCDMMainDescriptionPanel( - this, - ID_WINDOW_PROPERTIES, - wxT("Description Panel"), - wxDefaultPosition, - wxSize(600, 400), - 0 - ); + //BBSFile + modelCDMBBGFile* elementBBGFile = dynamic_cast(element); + if(elementBBGFile != NULL) + { + //create element description + description = new wxCDMBBGFileDescriptionPanel( + this, + elementBBGFile, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(600, 400), + 0 + ); + } + else + { + //folder + modelCDMFolder* elementFolder = dynamic_cast(element); + if(elementFolder != NULL) + { + //create element description + description = new wxCDMFolderDescriptionPanel( + this, + elementFolder, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(600, 400), + 0 + ); + } + else + { + //file + modelCDMFile* elementFile = dynamic_cast(element); + if(elementFile != NULL) + { + //create element description + description = new wxCDMFileDescriptionPanel( + this, + elementFile, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(600, 400), + 0 + ); + } + else + { + + //main if not any + //create element description + description = new wxCDMMainDescriptionPanel( + this, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(600, 400), + 0 + ); + } + } + } } } } @@ -868,7 +1160,7 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event) //this->tree_Projects->Expand(this->model->GetProject()->GetId()); //this->tree_Projects->Unselect(); this->actualTreeItem.Unset(); - description = new wxCDMPackageManagerPanel( + description = new wxCDMPackageManagerPanel( this, this->model->GetProject(), ID_WINDOW_PROPERTIES, @@ -893,7 +1185,8 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event) else if(event.GetString() == wxT("blackbox")) { modelCDMBlackBox* bb = (modelCDMBlackBox*)event.GetClientData(); - this->actualTreeItem.Unset(); + this->actualTreeItem.Unset(); + this->tree_Projects->SelectItem(bb->GetHeaderFile()->GetId().GetWxId()); description = new wxCDMBlackBoxDescriptionPanel( this, bb, @@ -903,6 +1196,7 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event) wxSize(600, 400), 0 ); + } @@ -920,7 +1214,8 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event) auiManager.Update(); break; default: - event.Skip(); + event.Skip(); + break; } }