From e848390818198f77553de271adbf3345e64899cf Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sat, 20 Oct 2018 17:24:23 -0400
Subject: [PATCH] Define table for Extra Edit menu

---
 src/Menus.cpp | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/Menus.cpp b/src/Menus.cpp
index aab0198b1..d1fae4982 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -543,6 +543,7 @@ MenuTable::BaseItemPtr ExtraMenu( AudacityProject& );
 MenuTable::BaseItemPtr ExtraTransportMenu( AudacityProject & );
 MenuTable::BaseItemPtr ExtraToolsMenu( AudacityProject & );
 MenuTable::BaseItemPtr ExtraMixerMenu( AudacityProject & );
+MenuTable::BaseItemPtr ExtraEditMenu( AudacityProject & );
 }
 
 // Tables of menu factories.
@@ -551,6 +552,7 @@ static const std::shared_ptr<MenuTable::BaseItem> extraItems = MenuTable::Items(
    ExtraTransportMenu
    , ExtraToolsMenu
    , ExtraMixerMenu
+   , ExtraEditMenu
 );
 
 static const auto menuTree = MenuTable::Items(
@@ -1806,6 +1808,22 @@ MenuTable::BaseItemPtr ExtraMixerMenu( AudacityProject & )
    );
 }
 
+MenuTable::BaseItemPtr ExtraEditMenu( AudacityProject & )
+{
+   using namespace MenuTable;
+   using Options = CommandManager::Options;
+   constexpr auto flags =
+      AudioIONotBusyFlag | TracksSelectedFlag | TimeSelectedFlag;
+   return Menu( _("&Edit"),
+      Command( wxT("DeleteKey"), XXO("&Delete Key"), FN(OnDelete),
+         (flags | NoAutoSelect),
+         Options{ wxT("Backspace") }.Mask( flags ) ),
+      Command( wxT("DeleteKey2"), XXO("Delete Key&2"), FN(OnDelete),
+         (flags | NoAutoSelect),
+         Options{ wxT("Delete") }.Mask( flags ) )
+   );
+}
+
 }
 
 void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
@@ -1840,21 +1858,6 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
 
       //////////////////////////////////////////////////////////////////////////
 
-      c->BeginMenu( _("&Edit") );
-
-      c->AddItem( wxT("DeleteKey"), XXO("&Delete Key"), FN(OnDelete),
-         AudioIONotBusyFlag | TracksSelectedFlag | TimeSelectedFlag | NoAutoSelect,
-         Options{ wxT("Backspace") }
-            .Mask( AudioIONotBusyFlag | TracksSelectedFlag | TimeSelectedFlag ) );
-
-      c->AddItem( wxT("DeleteKey2"), XXO("Delete Key&2"), FN(OnDelete),
-         AudioIONotBusyFlag | TracksSelectedFlag | TimeSelectedFlag | NoAutoSelect,
-         Options{ wxT("Delete") }
-            .Mask( AudioIONotBusyFlag | TracksSelectedFlag | TimeSelectedFlag ) );
-      c->EndMenu();
-
-      //////////////////////////////////////////////////////////////////////////
-
       c->BeginMenu( _("&Play-at-Speed") );
 
       /* i18n-hint: 'Normal Play-at-Speed' doesn't loop or cut preview. */