fixed menu accel

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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 9e8b340bfa0939e9aa3d26b285859f5659bc2b0e..57cc5bed8d3af89986fa490a2f1df8ad366438b9 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -170,7 +170,7 @@ bool MyApp::OnInit()
   file_menu->Append(DIALOGS_REPLACE, "Find and &replace dialog\tShift-Ctrl-F", "", TRUE);
 #endif // wxUSE_FINDREPLDLG
   file_menu->AppendSeparator();
   file_menu->Append(DIALOGS_REPLACE, "Find and &replace dialog\tShift-Ctrl-F", "", TRUE);
 #endif // wxUSE_FINDREPLDLG
   file_menu->AppendSeparator();

-  file_menu->Append(DIALOGS_MODAL, "Mo&dal dialog\tCtrl-D");
+  file_menu->Append(DIALOGS_MODAL, "Mo&dal dialog\tCtrl-W");

   file_menu->Append(DIALOGS_MODELESS, "Modeless &dialog\tCtrl-Z", "", TRUE);
   file_menu->AppendSeparator();
   file_menu->Append(wxID_EXIT, "E&xit\tAlt-X");
   file_menu->Append(DIALOGS_MODELESS, "Modeless &dialog\tCtrl-Z", "", TRUE);
   file_menu->AppendSeparator();
   file_menu->Append(wxID_EXIT, "E&xit\tAlt-X");


@@ -848,8 +848,10 @@ MyModalDialog::MyModalDialog(wxWindow *parent)
 
     m_btnFocused = new wxButton(this, -1, "Default button");
     m_btnDelete = new wxButton(this, -1, "&Delete button");
 
     m_btnFocused = new wxButton(this, -1, "Default button");
     m_btnDelete = new wxButton(this, -1, "&Delete button");

+    wxButton *btnOk = new wxButton(this, wxID_CANCEL, "&Close");

     sizerTop->Add(m_btnFocused, 0, wxALIGN_CENTER | wxALL, 5);
     sizerTop->Add(m_btnDelete, 0, wxALIGN_CENTER | wxALL, 5);
     sizerTop->Add(m_btnFocused, 0, wxALIGN_CENTER | wxALL, 5);
     sizerTop->Add(m_btnDelete, 0, wxALIGN_CENTER | wxALL, 5);

+    sizerTop->Add(btnOk, 0, wxALIGN_CENTER | wxALL, 5);

 
     SetAutoLayout(TRUE);
     SetSizer(sizerTop);
 
     SetAutoLayout(TRUE);
     SetSizer(sizerTop);