From d5dbb53140d0ff649fb48fcafabd8a478a347a14 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 17 Apr 2011 18:04:09 +0200 Subject: [PATCH] Code cleaning and finish to fix a crash under wxWidgets 2.9.2 and Linux. --- cvpcb/cvframe.cpp | 2 -- cvpcb/cvpcb.cpp | 3 --- cvpcb/menubar.cpp | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cvpcb/cvframe.cpp b/cvpcb/cvframe.cpp index 9f18b82ce2..5739c6adc4 100644 --- a/cvpcb/cvframe.cpp +++ b/cvpcb/cvframe.cpp @@ -470,8 +470,6 @@ void CVPCB_MAINFRAME::LoadNetList( wxCommandEvent& event ) { SetTitle( wxGetApp().GetTitle() + wxT( " " ) + GetBuildVersion() ); } - - ReCreateMenuBar(); } diff --git a/cvpcb/cvpcb.cpp b/cvpcb/cvpcb.cpp index 9239c2c841..cf82e5e9f3 100644 --- a/cvpcb/cvpcb.cpp +++ b/cvpcb/cvpcb.cpp @@ -69,9 +69,6 @@ void WinEDA_App::MacOpenFile(const wxString &fileName) { frame->SetTitle( wxGetApp().GetTitle() + wxT( " " ) + GetBuildVersion() ); } - - frame->ReCreateMenuBar(); - } // Create a new application object diff --git a/cvpcb/menubar.cpp b/cvpcb/menubar.cpp index c759f816b0..d698df9698 100644 --- a/cvpcb/menubar.cpp +++ b/cvpcb/menubar.cpp @@ -23,7 +23,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar() wxMenuItem* item; wxMenuBar* menuBar = GetMenuBar(); - if( ! menuBar ) + if( ! menuBar ) // Delete all menus menuBar = new wxMenuBar(); // Delete all existing menus so they can be rebuilt.