Fixed a minor bug in hotKey handling.

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index f5662e116a5ba097fb9e0cc676cefd6b3bf9c897..6907fe1d684178cf59daa4129d6c83f104e2e24d 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -500,8 +500,11 @@ void wxMenuItem::SetName( const wxString& str )
     /* only GTK 1.2 know about hot keys */
     m_hotKey = _T("");
 #if (GTK_MINOR_VERSION > 0)
     /* only GTK 1.2 know about hot keys */
     m_hotKey = _T("");
 #if (GTK_MINOR_VERSION > 0)

-    pc++;
-    m_hotKey = pc;
+    if(*pc == _T('\t'))
+    {
+       pc++;
+       m_hotKey = pc;
+    }

 #endif
 
     if (m_menuItem)
 #endif
 
     if (m_menuItem)

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index f5662e116a5ba097fb9e0cc676cefd6b3bf9c897..6907fe1d684178cf59daa4129d6c83f104e2e24d 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -500,8 +500,11 @@ void wxMenuItem::SetName( const wxString& str )
     /* only GTK 1.2 know about hot keys */
     m_hotKey = _T("");
 #if (GTK_MINOR_VERSION > 0)
     /* only GTK 1.2 know about hot keys */
     m_hotKey = _T("");
 #if (GTK_MINOR_VERSION > 0)

-    pc++;
-    m_hotKey = pc;
+    if(*pc == _T('\t'))
+    {
+       pc++;
+       m_hotKey = pc;
+    }

 #endif
 
     if (m_menuItem)
 #endif
 
     if (m_menuItem)