From d66289dc9573533248e8dc6636fd77e8993c0083 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 1 Feb 2016 16:03:31 +0100 Subject: [PATCH] Don't use the standard OS X Cmd+Q accelerator in the samples Or, more precisely, don't use for anything else than exiting the application. Closes #4326. --- samples/dialogs/dialogs.cpp | 2 +- samples/propgrid/propgrid.cpp | 2 +- samples/sockets/client.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 0091c817c1..5f20670fd6 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -443,7 +443,7 @@ bool MyApp::OnInit() wxMenu *filedlg_menu = new wxMenu; filedlg_menu->Append(DIALOGS_FILE_OPEN, wxT("&Open file\tCtrl-O")); filedlg_menu->Append(DIALOGS_FILE_OPEN2, wxT("&Second open file\tCtrl-2")); - filedlg_menu->Append(DIALOGS_FILES_OPEN, wxT("Open &files\tCtrl-Q")); + filedlg_menu->Append(DIALOGS_FILES_OPEN, wxT("Open &files\tShift-Ctrl-O")); filedlg_menu->Append(DIALOGS_FILE_SAVE, wxT("Sa&ve file\tCtrl-S")); #if USE_FILEDLG_GENERIC diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index 39b4e2d82d..3a6669c975 100644 --- a/samples/propgrid/propgrid.cpp +++ b/samples/propgrid/propgrid.cpp @@ -2039,7 +2039,7 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size menuTools1->Append(ID_APPENDPROP, wxT("Append New Property") ); menuTools1->Append(ID_APPENDCAT, wxT("Append New Category\tCtrl-S") ); menuTools1->AppendSeparator(); - menuTools1->Append(ID_INSERTPROP, wxT("Insert New Property\tCtrl-Q") ); + menuTools1->Append(ID_INSERTPROP, wxT("Insert New Property\tCtrl-I") ); menuTools1->Append(ID_INSERTCAT, wxT("Insert New Category\tCtrl-W") ); menuTools1->AppendSeparator(); menuTools1->Append(ID_DELETE, wxT("Delete Selected") ); diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp index 2e11482d44..b59736b2ed 100644 --- a/samples/sockets/client.cpp +++ b/samples/sockets/client.cpp @@ -225,7 +225,7 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY, m_menuSocket->Append(CLIENT_TEST2, _("Test &2\tCtrl-F2"), _("Test ReadMsg and WriteMsg")); m_menuSocket->Append(CLIENT_TEST3, _("Test &3\tCtrl-F3"), _("Test large data transfer")); m_menuSocket->AppendSeparator(); - m_menuSocket->Append(CLIENT_CLOSE, _("&Close session\tCtrl-Q"), _("Close connection")); + m_menuSocket->Append(CLIENT_CLOSE, _("&Close session\tCtrl-C"), _("Close connection")); m_menuDatagramSocket = new wxMenu(); m_menuDatagramSocket->Append(CLIENT_DGRAM, _("&Datagram test\tCtrl-D"), _("Test UDP sockets"));