supporting rawctrl strings, fixes #13496, rawctrl is correctly interpreted for all...

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

diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp
index a90fdda01df1d6b96c59aee46dd5c2d958e2f06b..1ed6c5947d99c540eab849196cdc9cfaf435c470 100644 (file)
--- 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;
                 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
             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+");
         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 )
     const int code = GetKeyCode();
 
     if ( code >= WXK_F1 && code <= WXK_F12 )