From eb3cb4925c02e71698216d06b3a2cba22066217d Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 30 Aug 2011 07:01:25 +0000 Subject: [PATCH] adding command - comma as shortcut of stockitem wxID_PRERENCES on OSX - and make sure it's working by adapting ToString() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/accelcmn.cpp | 2 +- src/common/stockitem.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp index 4d05f3de4d..a90fdda01d 100644 --- a/src/common/accelcmn.cpp +++ b/src/common/accelcmn.cpp @@ -342,7 +342,7 @@ wxString wxAcceleratorEntry::ToString() const // build as they're only defined for the ASCII range (or EOF) wxIsascii(code) && #endif // ANSI - wxIsalnum(code) ) + wxIsprint(code) ) { text << (wxChar)code; } diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp index 0892b1bfe9..71fdc44dee 100644 --- a/src/common/stockitem.cpp +++ b/src/common/stockitem.cpp @@ -302,6 +302,9 @@ wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id) STOCKITEM(wxID_REPLACE, wxACCEL_CTRL,'R') STOCKITEM(wxID_SAVE, wxACCEL_CTRL,'S') STOCKITEM(wxID_UNDO, wxACCEL_CTRL,'Z') +#ifdef __WXOSX__ + STOCKITEM(wxID_PREFERENCES, wxACCEL_CTRL,',') +#endif default: // set the wxAcceleratorEntry to return into an invalid state: -- 2.45.2