From 0fe9d7c3bbd5c10665d41719d59129110895fb06 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Mon, 5 Feb 2018 10:02:48 -0800
Subject: [PATCH] Revert e41a1b1cbb "Menubar accelerators are now preserved"

It overwrites any existing accelerator table, and menubar accelerators
seem to work fine without it. See #18053
---
 src/gtk/frame.cpp | 67 -----------------------------------------------
 1 file changed, 67 deletions(-)

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 862a424e41..f902f70fea 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -111,78 +111,11 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
         *height = 0;
 }
 
-#if wxUSE_MENUS && wxUSE_ACCEL
-// Helper for wxCreateAcceleratorTableForMenuBar
-static void wxAddAccelerators(wxList& accelEntries, wxMenu* menu)
-{
-    size_t i;
-    for (i = 0; i < menu->GetMenuItems().GetCount(); i++)
-    {
-        wxMenuItem* item = (wxMenuItem*) menu->GetMenuItems().Item(i)->GetData();
-        if (item->GetSubMenu())
-        {
-            wxAddAccelerators(accelEntries, item->GetSubMenu());
-        }
-        else if (!item->GetItemLabel().IsEmpty())
-        {
-            wxAcceleratorEntry* entry = wxAcceleratorEntry::Create(item->GetItemLabel());
-            if (entry)
-            {
-                entry->Set(entry->GetFlags(), entry->GetKeyCode(), item->GetId());
-                accelEntries.Append((wxObject*) entry);
-            }
-        }
-    }
-}
-
-// Create an accelerator table consisting of all the accelerators
-// from the menubar in the given menus
-static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar)
-{
-    wxList accelEntries;
-
-    size_t i;
-    for (i = 0; i < menuBar->GetMenuCount(); i++)
-    {
-        wxAddAccelerators(accelEntries, menuBar->GetMenu(i));
-    }
-
-    size_t n = accelEntries.GetCount();
-
-    if (n == 0)
-        return wxAcceleratorTable();
-
-    wxAcceleratorEntry* entries = new wxAcceleratorEntry[n];
-
-    for (i = 0; i < accelEntries.GetCount(); i++)
-    {
-        wxAcceleratorEntry* entry = (wxAcceleratorEntry*) accelEntries.Item(i)->GetData();
-        entries[i] = (*entry);
-        delete entry;
-
-    }
-
-    wxAcceleratorTable table(n, entries);
-    delete[] entries;
-
-    return table;
-}
-#endif // wxUSE_MENUS && wxUSE_ACCEL
-
 bool wxFrame::ShowFullScreen(bool show, long style)
 {
     if (!wxFrameBase::ShowFullScreen(show, style))
         return false;
 
-#if wxUSE_MENUS && wxUSE_ACCEL
-    if (show && GetMenuBar())
-    {
-        wxAcceleratorTable table(wxCreateAcceleratorTableForMenuBar(GetMenuBar()));
-        if (table.IsOk())
-            SetAcceleratorTable(table);
-    }
-#endif // wxUSE_MENUS && wxUSE_ACCEL
-
     wxWindow* const bar[] = {
 #if wxUSE_MENUS
         m_frameMenuBar,