Put back some code that was commented out for testing

[wxWidgets.git] / samples / docvwmdi / docview.cpp

diff --git a/samples/docvwmdi/docview.cpp b/samples/docvwmdi/docview.cpp
index 00a2ea7340943ed854abe6b70452fb7dc1aebda9..9be2d6edab21740ab88a5e47d2ae39a1b353df18 100644 (file)
--- a/samples/docvwmdi/docview.cpp
+++ b/samples/docvwmdi/docview.cpp
@@ -30,7 +30,11 @@
 #endif
 
 #if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
+#endif
+
+#if !wxUSE_MDI_ARCHITECTURE
+#error You must set wxUSE_MDI_ARCHITECTURE to 1 in setup.h!
 #endif
 
 #include "docview.h"
@@ -74,17 +78,17 @@ bool MyApp::OnInit(void)
   wxMenu *file_menu = new wxMenu;
   wxMenu *edit_menu = (wxMenu *) NULL;
 
-  file_menu->Append(wxID_NEW, "&New...");
-  file_menu->Append(wxID_OPEN, "&Open...");
+  file_menu->Append(wxID_NEW, "&New...\tCtrl-N");
+  file_menu->Append(wxID_OPEN, "&Open...\tCtrl-X");
 
   file_menu->AppendSeparator();
-  file_menu->Append(wxID_EXIT, "E&xit");
+  file_menu->Append(wxID_EXIT, "E&xit\tAlt-X");
   
   // A nice touch: a history of files visited. Use this menu.
   m_docManager->FileHistoryUseMenu(file_menu);
 
   wxMenu *help_menu = new wxMenu;
-  help_menu->Append(DOCVIEW_ABOUT, "&About");
+  help_menu->Append(DOCVIEW_ABOUT, "&About\tF1");
 
   wxMenuBar *menu_bar = new wxMenuBar;