haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebuild apple menu along with others when language changes. 

Fixes: lp:1761848
* https://bugs.launchpad.net/kicad/+bug/1761848
This commit is contained in:
Jeff Young 2018-04-07 00:24:02 +01:00
parent 2bfbff104e
commit be4d7987d3
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/menubar_pcb_editor.cpp
View File

@ -84,17 +84,7 @@ static void prepareHelpMenu( wxMenu* aParentMenu );
void PCB_EDIT_FRAME::ReCreateMenuBar() void PCB_EDIT_FRAME::ReCreateMenuBar()
{ {
wxString text; wxString text;
wxMenuBar* menuBar = GetMenuBar(); wxMenuBar* menuBar = new wxMenuBar();
if( !menuBar )
menuBar = new wxMenuBar();
// Delete all existing menus so they can be rebuilt.
// This allows language changes of the menu text on the fly.
menuBar->Freeze();
while( menuBar->GetMenuCount() )
delete menuBar->Remove( 0 );
// Recreate all menus: // Recreate all menus:
@ -153,13 +143,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
menuBar->Append( configmenu, _( "P&references" ) ); menuBar->Append( configmenu, _( "P&references" ) );
menuBar->Append( helpMenu, _( "&Help" ) ); menuBar->Append( helpMenu, _( "&Help" ) );
menuBar->Thaw();
// Associate the menu bar with the frame, if no previous menubar
if( GetMenuBar() == NULL )
SetMenuBar( menuBar ); SetMenuBar( menuBar );
else
menuBar->Refresh();
#if defined(KICAD_SCRIPTING) && defined(KICAD_SCRIPTING_ACTION_MENU) #if defined(KICAD_SCRIPTING) && defined(KICAD_SCRIPTING_ACTION_MENU)
// Populate the Action Plugin sub-menu // Populate the Action Plugin sub-menu