From d094934cf46c17daa77b5068e5e6a0694600d5c8 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Fri, 16 Aug 2019 11:08:43 +0100
Subject: [PATCH] Put Place & Inspect menus in standard order.
---
common/tool/action_menu.cpp | 3 +--
pagelayout_editor/menubar.cpp | 15 ++++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/common/tool/action_menu.cpp b/common/tool/action_menu.cpp
index 9174ca948c..57416304bb 100644
--- a/common/tool/action_menu.cpp
+++ b/common/tool/action_menu.cpp
@@ -172,8 +172,7 @@ wxMenuItem* ACTION_MENU::Add( const TOOL_ACTION& aAction, bool aIsCheckmarkEntry
m_toolActions[getMenuId( aAction )] = &aAction;
- wxMenuItem* i = Append( item );
- return i;
+ return Append( item );
}
diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp
index 0843d85276..41de9d0a7b 100644
--- a/pagelayout_editor/menubar.cpp
+++ b/pagelayout_editor/menubar.cpp
@@ -138,12 +138,6 @@ void PL_EDITOR_FRAME::ReCreateMenuBar()
viewMenu->Resolve();
- //-- Inspector menu -------------------------------------------------------
- //
- CONDITIONAL_MENU* inspectorMenu = new CONDITIONAL_MENU( false, selTool );
- inspectorMenu->AddItem( PL_ACTIONS::showInspector, SELECTION_CONDITIONS::ShowAlways );
- inspectorMenu->Resolve();
-
//-- Place menu -------------------------------------------------------
//
CONDITIONAL_MENU* placeMenu = new CONDITIONAL_MENU( false, selTool );
@@ -158,6 +152,13 @@ void PL_EDITOR_FRAME::ReCreateMenuBar()
placeMenu->Resolve();
+ //-- Inspector menu -------------------------------------------------------
+ //
+ CONDITIONAL_MENU* inspectorMenu = new CONDITIONAL_MENU( false, selTool );
+ inspectorMenu->AddItem( PL_ACTIONS::showInspector, SELECTION_CONDITIONS::ShowAlways );
+
+ inspectorMenu->Resolve();
+
//-- Preferences menu --------------------------------------------------
//
CONDITIONAL_MENU* preferencesMenu = new CONDITIONAL_MENU( false, selTool );
@@ -177,8 +178,8 @@ void PL_EDITOR_FRAME::ReCreateMenuBar()
menuBar->Append( fileMenu, _( "&File" ) );
menuBar->Append( editMenu, _( "&Edit" ) );
menuBar->Append( viewMenu, _( "&View" ) );
- menuBar->Append( inspectorMenu, _( "&Inspect" ) );
menuBar->Append( placeMenu, _( "&Place" ) );
+ menuBar->Append( inspectorMenu, _( "&Inspect" ) );
menuBar->Append( preferencesMenu, _( "P&references" ) );
AddStandardHelpMenu( menuBar );