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
This commit is contained in:
@@ -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;
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user