Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use the standard OS X Cmd+Q accelerator in the samples

Browse Source 
Or, more precisely, don't use for anything else than exiting the application.

Closes #4326.
This commit is contained in:
Vadim Zeitlin
2016-02-01 16:03:31 +01:00
parent 8d42890df4
commit d66289dc95
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/dialogs/dialogs.cpp
View File

@@ -443,7 +443,7 @@ bool MyApp::OnInit()
wxMenu *filedlg_menu = new wxMenu; wxMenu *filedlg_menu = new wxMenu;
filedlg_menu->Append(DIALOGS_FILE_OPEN, wxT("&Open file\tCtrl-O")); 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_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")); filedlg_menu->Append(DIALOGS_FILE_SAVE, wxT("Sa&ve file\tCtrl-S"));
#if USE_FILEDLG_GENERIC #if USE_FILEDLG_GENERIC

2
samples/propgrid/propgrid.cpp
View File

@@ -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_APPENDPROP, wxT("Append New Property") );
menuTools1->Append(ID_APPENDCAT, wxT("Append New Category\tCtrl-S") ); menuTools1->Append(ID_APPENDCAT, wxT("Append New Category\tCtrl-S") );
menuTools1->AppendSeparator(); 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->Append(ID_INSERTCAT, wxT("Insert New Category\tCtrl-W") );
menuTools1->AppendSeparator(); menuTools1->AppendSeparator();
menuTools1->Append(ID_DELETE, wxT("Delete Selected") ); menuTools1->Append(ID_DELETE, wxT("Delete Selected") );

2
samples/sockets/client.cpp
View File

@@ -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_TEST2, _("Test &2\tCtrl-F2"), _("Test ReadMsg and WriteMsg"));
m_menuSocket->Append(CLIENT_TEST3, _("Test &3\tCtrl-F3"), _("Test large data transfer")); m_menuSocket->Append(CLIENT_TEST3, _("Test &3\tCtrl-F3"), _("Test large data transfer"));
m_menuSocket->AppendSeparator(); 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 = new wxMenu();
m_menuDatagramSocket->Append(CLIENT_DGRAM, _("&Datagram test\tCtrl-D"), _("Test UDP sockets")); m_menuDatagramSocket->Append(CLIENT_DGRAM, _("&Datagram test\tCtrl-D"), _("Test UDP sockets"));