adding command - comma as shortcut of stockitem wxID_PRERENCES on OSX - and make...

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

diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp
index 4d05f3de4df865e286bec50e7d218a7a5b5b5164..a90fdda01df1d6b96c59aee46dd5c2d958e2f06b 100644 (file)
--- 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 0892b1bfe9a8a29f6b926f197a5e0d95045dda09..71fdc44deee15f2d437c88f7e190a23167f262f7 100644 (file)
--- 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: