From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 10 Oct 2000 13:55:10 +0000 (+0000)
Subject: fixed MDI accel bug, more tests for it in the sample
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5a2762f083962cecf9c5f226e1ad01ab29b160a6

fixed MDI accel bug, more tests for it in the sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 19d784f35c..9d880d5094 100644
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -233,17 +233,17 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
-    file_menu->Append(MDI_NEW_WINDOW, "&New window");
+    file_menu->Append(MDI_NEW_WINDOW, "&New window\tCtrl-N");
     file_menu->Append(MDI_CHILD_QUIT, "&Close child", "Close this window");
-    file_menu->Append(MDI_QUIT, "&Exit");
+    file_menu->Append(MDI_QUIT, "&Exit\tAlt-X");
 
     wxMenu *option_menu = new wxMenu;
 
-    option_menu->Append(MDI_REFRESH, "&Refresh picture");
+    option_menu->Append(MDI_REFRESH, "&Refresh picture\tF5");
     option_menu->Append(MDI_CHANGE_TITLE, "Change &title...\tCtrl-T");
 
     wxMenu *help_menu = new wxMenu;
-    help_menu->Append(MDI_ABOUT, "&About");
+    help_menu->Append(MDI_ABOUT, "&About\tF1");
 
     wxMenuBar *menu_bar = new wxMenuBar;
 
diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 6d9792c740..2b9ff86e5e 100644
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -1038,7 +1038,7 @@ long wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXUINT wParam, WXLPARAM l
 
 bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg)
 {
-    return m_acceleratorTable.Translate(GetParent(), msg);
+    return wxFrame::MSWTranslateMessage(msg);
 }
 
 // ---------------------------------------------------------------------------