From 8f787613ffd133fb2c2ab596d41ad624fd2a10a8 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 12 Jun 2008 20:25:44 +0000 Subject: [PATCH] Correction for menu code problem introduced in 2.8.5 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/menu.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 51e62790f4..d635584f0c 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -773,12 +773,15 @@ wxMenuItem::~wxMenuItem() /* static */ wxString wxMenuItemBase::GetLabelFromText(const wxString& text) { +#if 0 // The argument to this function will now always be in wxWidgets standard label // format, not GTK+ format, so we do what the other ports do. + // Actually, m_text is in GTK+ format this function is used on it + // we need to retain the original code below. return wxStripMenuCodes(text); -#if 0 +#else wxString label; for ( const wxChar *pc = text.c_str(); *pc; pc++ )