avoid duplicated empty help menu in localized applications (patch 1600747)

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

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index a5843bc275073f53a54792e85544f3d5b12056fe..87969e0411da4450b8d2623b22dabae99dfa0de7 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -184,7 +184,6 @@ wxAcceleratorEntry::ParseAccel(const wxString& text, int *flagsOut, int *keyOut)
     int posTab = label.Find(wxT('\t'));
     if ( posTab == wxNOT_FOUND )
     {
     int posTab = label.Find(wxT('\t'));
     if ( posTab == wxNOT_FOUND )
     {

-        wxLogDebug(wxT("Invalid menu label: no accelerators"));

         return false;
     }
 
         return false;
     }
 


@@ -320,9 +319,7 @@ wxString wxAcceleratorEntry::ToString() const
 
     const int code = GetKeyCode();
 
 
     const int code = GetKeyCode();
 

-    if ( wxIsalnum(code) )
-        text << (wxChar)code;
-    else if ( code >= WXK_F1 && code <= WXK_F12 )
+    if ( code >= WXK_F1 && code <= WXK_F12 )

         text << _("F") << code - WXK_F1 + 1;
     else if ( code >= WXK_NUMPAD0 && code <= WXK_NUMPAD9 )
         text << _("KP_") << code - WXK_NUMPAD0;
         text << _("F") << code - WXK_F1 + 1;
     else if ( code >= WXK_NUMPAD0 && code <= WXK_NUMPAD9 )
         text << _("KP_") << code - WXK_NUMPAD0;


@@ -341,8 +338,22 @@ wxString wxAcceleratorEntry::ToString() const
             }
         }
 
             }
         }
 

-        wxASSERT_MSG( n != WXSIZEOF(wxKeyNames),
-                      wxT("unknown keyboard accelerator code") );
+        if ( n == WXSIZEOF(wxKeyNames) )
+        {
+            // must be a simple key
+            if (
+#if !wxUSE_UNICODE
+                 isascii(code) &&
+#endif // ANSI
+                    wxIsalnum(code) )
+            {
+                text << (wxChar)code;
+            }
+            else
+            {
+                wxFAIL_MSG( wxT("unknown keyboard accelerator code") );
+            }
+        }

     }
 
     return text;
     }
 
     return text;