From f0b72e0d9aeb1e3a44372078017b12528fec036d Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Sun, 18 Apr 2004 10:15:52 +0000
Subject: [PATCH] Fix incomplete stripping of menu text.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/gtk/menu.cpp | 3 +++
src/gtk1/menu.cpp | 3 +++
2 files changed, 6 insertions(+)
diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 3d7ac67525..f4d591fe98 100644
--- 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 3d7ac67525..f4d591fe98 100644
--- 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"
--
2.49.0