fixing overrelease and out-of-bounds write, fixes #13725

[wxWidgets.git] / src / common / accelcmn.cpp

diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp
index a90fdda01df1d6b96c59aee46dd5c2d958e2f06b..2b3165ec373150f250f4e6d7fd5c357b76f08d8a 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


@@ -300,26 +302,43 @@ bool wxAcceleratorEntry::FromString(const wxString& str)
     return ParseAccel(str, &m_flags, &m_keyCode);
 }
 
     return ParseAccel(str, &m_flags, &m_keyCode);
 }
 

-wxString wxAcceleratorEntry::ToString() const
+namespace
+{
+
+wxString PossiblyLocalize(const wxString& str, bool localize)
+{
+    return localize ? wxGetTranslation(str) : str;
+}
+
+}
+
+wxString wxAcceleratorEntry::AsPossiblyLocalizedString(bool localized) const

 {
     wxString text;
 
     int flags = GetFlags();
     if ( flags & wxACCEL_ALT )
 {
     wxString text;
 
     int flags = GetFlags();
     if ( flags & wxACCEL_ALT )

-        text += _("Alt+");
+        text += PossiblyLocalize(wxTRANSLATE("Alt+"), localized);

     if ( flags & wxACCEL_CTRL )
     if ( flags & wxACCEL_CTRL )

-        text += _("Ctrl+");
+        text += PossiblyLocalize(wxTRANSLATE("Ctrl+"), localized);

     if ( flags & wxACCEL_SHIFT )
     if ( flags & wxACCEL_SHIFT )

-        text += _("Shift+");
-
+        text += PossiblyLocalize(wxTRANSLATE("Shift+"), localized);
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+    if ( flags & wxACCEL_RAW_CTRL )
+        text += PossiblyLocalize(wxTRANSLATE("RawCtrl+"), localized);
+#endif
+    

     const int code = GetKeyCode();
 
     if ( code >= WXK_F1 && code <= WXK_F12 )
     const int code = GetKeyCode();
 
     if ( code >= WXK_F1 && code <= WXK_F12 )

-        text << _("F") << code - WXK_F1 + 1;
+        text << PossiblyLocalize(wxTRANSLATE("F"), localized)
+             << code - WXK_F1 + 1;

     else if ( code >= WXK_NUMPAD0 && code <= WXK_NUMPAD9 )
     else if ( code >= WXK_NUMPAD0 && code <= WXK_NUMPAD9 )

-        text << _("KP_") << code - WXK_NUMPAD0;
+        text << PossiblyLocalize(wxTRANSLATE("KP_"), localized)
+             << code - WXK_NUMPAD0;

     else if ( code >= WXK_SPECIAL1 && code <= WXK_SPECIAL20 )
     else if ( code >= WXK_SPECIAL1 && code <= WXK_SPECIAL20 )

-        text << _("SPECIAL") << code - WXK_SPECIAL1 + 1;
+        text << PossiblyLocalize(wxTRANSLATE("SPECIAL"), localized)
+             << code - WXK_SPECIAL1 + 1;

     else // check the named keys
     {
         size_t n;
     else // check the named keys
     {
         size_t n;


@@ -328,7 +347,7 @@ wxString wxAcceleratorEntry::ToString() const
             const wxKeyName& kn = wxKeyNames[n];
             if ( code == kn.code )
             {
             const wxKeyName& kn = wxKeyNames[n];
             if ( code == kn.code )
             {

-                text << wxGetTranslation(kn.name);
+                text << PossiblyLocalize(kn.name, localized);

                 break;
             }
         }
                 break;
             }
         }