From 7802da36fa043e7fdc162a70e97821754a2f2f14 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 3 Oct 2008 22:15:40 +0000
Subject: [PATCH] don't duplicate base class m_acceleratorTable as m_accelTable
 in wxMenuBar, this is not only unnecessary but also doesn't allow using
 GetAcceleratorTable() to retrieve the menu bar accelerators (#9654)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/menu.h | 7 -------
 src/msw/frame.cpp     | 9 +++------
 src/msw/menu.cpp      | 2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 8262a9f180..213c9d1675 100644
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -183,9 +183,6 @@ public:
 #endif
 
 #if wxUSE_ACCEL
-    // get the accel table for all the menus
-    const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }
-
     // update the accel table (must be called after adding/deleting a menu)
     void RebuildAccelTable();
 #endif // wxUSE_ACCEL
@@ -213,10 +210,6 @@ protected:
     // Return the MSW position for a wxMenu which is sometimes different from
     // the wxWidgets position.
     int MSWPositionForWxMenu(wxMenu *menu, int wxpos);
-#if wxUSE_ACCEL
-    // the accelerator table for all accelerators in all our menus
-    wxAcceleratorTable m_accelTable;
-#endif // wxUSE_ACCEL
 
 #if defined(__WXWINCE__) && wxUSE_TOOLBAR
     wxToolBar*  m_toolBar;
diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 76615b04fa..2477f815d8 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -828,13 +828,10 @@ bool wxFrame::MSWDoTranslateMessage(wxFrame *frame, WXMSG *pMsg)
         return true;
 
 #if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
-    // try the menu bar accels
+    // try the menu bar accelerators
     wxMenuBar *menuBar = GetMenuBar();
-    if ( menuBar )
-    {
-        const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
-        return acceleratorTable.Translate(frame, pMsg);
-    }
+    if ( menuBar && menuBar->GetAcceleratorTable()->Translate(frame, pMsg) )
+        return true;
 #endif // wxUSE_MENUS && wxUSE_ACCEL
 
     return false;
diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 3cf48b33d3..4c929adce5 100644
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -1347,7 +1347,7 @@ void wxMenuBar::RebuildAccelTable()
             nAccelCount += (*it)->CopyAccels(&accelEntries[nAccelCount]);
         }
 
-        m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries);
+        SetAcceleratorTable(wxAcceleratorTable(nAccelCount, accelEntries));
 
         delete [] accelEntries;
     }