Push the Quit/Close menu logic down into common.

common/tool/conditional_menu.cpp

@@ -26,6 +26,7 @@
 #include <tool/conditional_menu.h>
 #include <tool/action_menu.h>
 #include <menus_helpers.h>
+#include <kiface_i.h>
 
 
 CONDITIONAL_MENU::CONDITIONAL_MENU( bool isContextMenu, TOOL_INTERACTIVE* aTool ) :
@@ -98,6 +99,21 @@ void CONDITIONAL_MENU::AddSeparator( int aOrder )
 }
 
 
+void CONDITIONAL_MENU::AddQuitOrClose( KIFACE_I* aKiface )
+{
+    if( !aKiface || aKiface->IsSingle() ) // not when under a project mgr
+    {
+        // Don't use ACTIONS::quit; wxWidgets moves this on OSX and expects to find it via
+        // wxID_EXIT
+        AddItem( wxID_EXIT, _( "Quit" ), "", exit_xpm, SELECTION_CONDITIONS::ShowAlways );
+    }
+    else
+    {
+        AddItem( wxID_CLOSE, _( "Close\tCTRL+W" ), "", exit_xpm, SELECTION_CONDITIONS::ShowAlways );
+    }
+}
+
+
 SELECTION g_resolveDummySelection;
 
 

eeschema/menubar.cpp

@@ -115,16 +115,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
     fileMenu->AddItem( ACTIONS::plot,              EE_CONDITIONS::ShowAlways );
 
     fileMenu->AddSeparator();
-
+    fileMenu->AddQuitOrClose( &Kiface() );
-    if( Kiface().IsSingle() ) // not when under a project mgr
-    {
-        // 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, EE_CONDITIONS::ShowAlways );
-    }
-    else
-    {
-        fileMenu->AddItem( wxID_CLOSE, _( "Close" ), "", exit_xpm, EE_CONDITIONS::ShowAlways );
-    }
 
     fileMenu->Resolve();
 

gerbview/menubar.cpp

@@ -139,8 +139,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
     fileMenu->AddItem( ACTIONS::print,            SELECTION_CONDITIONS::ShowAlways );
 
     fileMenu->AddSeparator();
-    // Don't use ACTIONS::quit; wxWidgets moves this on OSX and expects to find it via wxID_EXIT
+    fileMenu->AddQuitOrClose( &Kiface() );
-    fileMenu->AddItem( wxID_EXIT, _( "Quit" ), "", exit_xpm, SELECTION_CONDITIONS::ShowAlways );
 
     fileMenu->Resolve();
 

include/tool/conditional_menu.h

@@ -30,10 +30,10 @@
 #include <list>
 #include <wx/wx.h>
 
-
 class SELECTION_TOOL;
 class TOOL_ACTION;
 class TOOL_INTERACTIVE;
+class KIFACE_I;
 
 
 class CONDITIONAL_MENU : public ACTION_MENU
@@ -100,6 +100,14 @@ public:
      */
     void AddSeparator( int aOrder = ANY_ORDER );
 
+    /**
+     * Functions AddQuitOrClose()
+     *
+     * Adds either a standard Quit or Close item to the menu (depending on whether or not the
+     * app was launched stand-alone).
+     */
+    void AddQuitOrClose( KIFACE_I* aKiface );
+
     /**
      * Function Evaluate()
      *

kicad/menubar.cpp

@@ -84,8 +84,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar()
                        unzip_xpm,                              SELECTION_CONDITIONS::ShowAlways );
 
     fileMenu->AddSeparator();
-    // Don't use ACTIONS::quit; wxWidgets moves this on OSX and expects to find it via wxID_EXIT
+    fileMenu->AddQuitOrClose( nullptr );
-    fileMenu->AddItem( wxID_EXIT, _( "Quit" ), "", exit_xpm,   SELECTION_CONDITIONS::ShowAlways );
 
     fileMenu->Resolve();
 

pagelayout_editor/menubar.cpp

@@ -78,18 +78,7 @@ void PL_EDITOR_FRAME::ReCreateMenuBar()
     fileMenu->AddItem( ACTIONS::print,         SELECTION_CONDITIONS::ShowAlways );
 
     fileMenu->AddSeparator();
-
+    fileMenu->AddQuitOrClose( &Kiface() );
-    if( Kiface().IsSingle() )
-    {
-        // 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 );
-    }
-    else
-    {
-        fileMenu->AddItem( wxID_CLOSE, _( "Close" ), "", exit_xpm,
-                SELECTION_CONDITIONS::ShowAlways );
-    }
 
     fileMenu->Resolve();
 

pcbnew/menubar_pcb_editor.cpp

@@ -193,17 +193,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     fileMenu->AddMenu( submenuArchive,               SELECTION_CONDITIONS::ShowAlways );
 
     fileMenu->AddSeparator();
-
+    fileMenu->AddQuitOrClose( &Kiface() );
-    if( Kiface().IsSingle() ) // not when under a project mgr
-    {
-        // 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 );
-    }
-    else
-    {
-        fileMenu->AddItem(
-                wxID_CLOSE, _( "Close" ), "", exit_xpm, SELECTION_CONDITIONS::ShowAlways );
-    }
 
     fileMenu->Resolve();