From 58cfc136499c370815f1a0794bbe421752da0d3c Mon Sep 17 00:00:00 2001 From: Michael Kavanagh Date: Tue, 30 Jul 2019 14:55:30 +0100 Subject: [PATCH] Fix some lost menubar menu separators --- gerbview/menubar.cpp | 6 ++---- pagelayout_editor/menubar.cpp | 2 +- pcbnew/menubar_footprint_editor.cpp | 4 ++-- pcbnew/menubar_pcb_editor.cpp | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp index 8f9b5a318c..f171ff83de 100644 --- a/gerbview/menubar.cpp +++ b/gerbview/menubar.cpp @@ -190,8 +190,6 @@ void GERBVIEW_FRAME::ReCreateMenuBar() _( "Show &Layers Manager" ), _( "Show or hide the layer manager" ), layers_manager_xpm, layersManagerShownCondition ); - viewMenu->AppendSeparator(); - viewMenu->AddSeparator(); viewMenu->AddItem( ACTIONS::zoomInCenter, SELECTION_CONDITIONS::ShowAlways ); viewMenu->AddItem( ACTIONS::zoomOutCenter, SELECTION_CONDITIONS::ShowAlways ); @@ -199,7 +197,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar() viewMenu->AddItem( ACTIONS::zoomTool, SELECTION_CONDITIONS::ShowAlways ); viewMenu->AddItem( ACTIONS::zoomRedraw, SELECTION_CONDITIONS::ShowAlways ); - viewMenu->AppendSeparator(); + viewMenu->AddSeparator(); viewMenu->AddCheckItem( ACTIONS::toggleGrid, gridShownCondition ); viewMenu->AddCheckItem( ACTIONS::togglePolarCoords, polarCoordsCondition ); @@ -211,7 +209,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar() unitsSubMenu->AddCheckItem( ACTIONS::metricUnits, metricUnitsCondition ); viewMenu->AddMenu( unitsSubMenu ); - viewMenu->AppendSeparator(); + viewMenu->AddSeparator(); viewMenu->AddCheckItem( GERBVIEW_ACTIONS::flashedDisplayOutlines, sketchFlashedCondition ); viewMenu->AddCheckItem( GERBVIEW_ACTIONS::linesDisplayOutlines, sketchLinesCondition ); viewMenu->AddCheckItem( GERBVIEW_ACTIONS::polygonsDisplayOutlines, sketchPolygonsCondition ); diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp index ae0d4ab452..865794f897 100644 --- a/pagelayout_editor/menubar.cpp +++ b/pagelayout_editor/menubar.cpp @@ -78,7 +78,7 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() fileMenu->AddItem( ACTIONS::pageSettings, SELECTION_CONDITIONS::ShowAlways ); fileMenu->AddItem( ACTIONS::print, SELECTION_CONDITIONS::ShowAlways ); - fileMenu->AppendSeparator(); + fileMenu->AddSeparator(); // Don't use ACTIONS::quit; wxWidgets moves this on OSX and expects to find it via wxID_EXIT fileMenu->AddItem( wxID_EXIT, _( "Quit" ), "", exit_xpm, SELECTION_CONDITIONS::ShowAlways ); diff --git a/pcbnew/menubar_footprint_editor.cpp b/pcbnew/menubar_footprint_editor.cpp index 947151588c..e845437f7b 100644 --- a/pcbnew/menubar_footprint_editor.cpp +++ b/pcbnew/menubar_footprint_editor.cpp @@ -226,14 +226,14 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() placeMenu->AddItem( PCB_ACTIONS::placePad, haveFootprintCondition ); - placeMenu->AppendSeparator(); + placeMenu->AddSeparator(); placeMenu->AddItem( PCB_ACTIONS::placeText, haveFootprintCondition ); placeMenu->AddItem( PCB_ACTIONS::drawArc, haveFootprintCondition ); placeMenu->AddItem( PCB_ACTIONS::drawCircle, haveFootprintCondition ); placeMenu->AddItem( PCB_ACTIONS::drawLine, haveFootprintCondition ); placeMenu->AddItem( PCB_ACTIONS::drawPolygon, haveFootprintCondition ); - placeMenu->AppendSeparator(); + placeMenu->AddSeparator(); placeMenu->AddItem( PCB_ACTIONS::setAnchor, haveFootprintCondition ); placeMenu->AddItem( ACTIONS::gridSetOrigin, haveFootprintCondition ); diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp index 98b879ea0d..2063ffcfe2 100644 --- a/pcbnew/menubar_pcb_editor.cpp +++ b/pcbnew/menubar_pcb_editor.cpp @@ -319,7 +319,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() viewMenu->AddItem( ACTIONS::zoomTool, SELECTION_CONDITIONS::ShowAlways ); viewMenu->AddItem( ACTIONS::zoomRedraw, SELECTION_CONDITIONS::ShowAlways ); - viewMenu->AppendSeparator(); + viewMenu->AddSeparator(); viewMenu->AddCheckItem( ACTIONS::toggleGrid, gridShownCondition ); viewMenu->AddItem( ACTIONS::gridProperties, SELECTION_CONDITIONS::ShowAlways ); viewMenu->AddCheckItem( PCB_ACTIONS::togglePolarCoords, polarCoordsCondition ); @@ -367,7 +367,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() viewMenu->AddCheckItem( PCB_ACTIONS::flipBoard, boardFlippedCondition ); #ifdef __APPLE__ - viewMenu->AppendSeparator(); + viewMenu->AddSeparator(); #endif viewMenu->Resolve();