From 1165fdbbe222ae7e25a7ed1bd64c680054514b18 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 28 Nov 2011 10:24:13 +0000 Subject: [PATCH] supporting rawctrl strings, fixes #13496, rawctrl is correctly interpreted for all platforms git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/accelcmn.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp index a90fdda01d..1ed6c5947d 100644 --- a/src/common/accelcmn.cpp +++ b/src/common/accelcmn.cpp @@ -186,6 +186,8 @@ wxAcceleratorEntry::ParseAccel(const wxString& text, int *flagsOut, int *keyOut) accelFlags |= wxACCEL_ALT; else if ( CompareAccelString(current, wxTRANSLATE("shift")) ) accelFlags |= wxACCEL_SHIFT; + else if ( CompareAccelString(current, wxTRANSLATE("rawctrl")) ) + accelFlags |= wxACCEL_RAW_CTRL; else // not a recognized modifier name { // we may have "Ctrl-+", for example, but we still want to @@ -311,7 +313,11 @@ wxString wxAcceleratorEntry::ToString() const text += _("Ctrl+"); if ( flags & wxACCEL_SHIFT ) text += _("Shift+"); - +#if defined(__WXMAC__) || defined(__WXCOCOA__) + if ( flags & wxACCEL_RAW_CTRL ) + text += _("RawCtrl+"); +#endif + const int code = GetKeyCode(); if ( code >= WXK_F1 && code <= WXK_F12 ) -- 2.47.2