Fix incomplete stripping of menu text.

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 3d7ac675257d55f9f63578d23c01718cbb2faf34..f4d591fe98dde0c4a634648ea9a6b4444823dba5 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -797,6 +797,9 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 
     for ( const wxChar *pc = text.c_str(); *pc; pc++ )
     {
+        if ( *pc == wxT('\t'))
+            break;
+    
         if ( *pc == wxT('_') )
         {
             // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx"

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 3d7ac675257d55f9f63578d23c01718cbb2faf34..f4d591fe98dde0c4a634648ea9a6b4444823dba5 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -797,6 +797,9 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 
     for ( const wxChar *pc = text.c_str(); *pc; pc++ )
     {
+        if ( *pc == wxT('\t'))
+            break;
+    
         if ( *pc == wxT('_') )
         {
             // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx"