put property sheets in their own submenu; resolve accelerators conflict

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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index cd8f98926249ec851d8b611890a39bb9b23e4ccd..cf0d3469e74053ed29206db7a9d824d1b497053b 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -360,9 +360,11 @@ bool MyApp::OnInit()
 #endif // USE_MODAL_PRESENTATION
 
 #if USE_SETTINGS_DIALOG
 #endif // USE_MODAL_PRESENTATION
 
 #if USE_SETTINGS_DIALOG

-    file_menu->Append(DIALOGS_PROPERTY_SHEET, _T("&Property Sheet Dialog\tCtrl-P"));
-    file_menu->Append(DIALOGS_PROPERTY_SHEET_TOOLBOOK, _T("Property Sheet Dialog using &ToolBook"));
-#endif
+    wxMenu *sheet_menu = new wxMenu;
+    sheet_menu->Append(DIALOGS_PROPERTY_SHEET, _T("&Standard property sheet\tShift-Ctrl-P"));
+    sheet_menu->Append(DIALOGS_PROPERTY_SHEET_TOOLBOOK, _T("&Toolbook sheet\tShift-Ctrl-T"));
+    file_menu->Append(wxID_ANY, _T("&Property sheets"), sheet_menu);
+#endif // USE_SETTINGS_DIALOG

 
     file_menu->Append(DIALOGS_REQUEST, _T("&Request user attention\tCtrl-R"));
 
 
     file_menu->Append(DIALOGS_REQUEST, _T("&Request user attention\tCtrl-R"));