From 889285fd212ccd26e6870659d18edec365a749f4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 21 Sep 2003 15:22:15 +0000
Subject: [PATCH] don't return & in strings returned by GetLabelTop() (closes
 687905)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt | 1 +
 src/msw/menu.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index a5b56fe933..e3a9b90961 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -224,6 +224,7 @@ wxMSW:
 - fixed release mode build with VC 7.x (Martin Ecker)
 - fix iostream.h problem with VC 7.1 (it doesn't support it any longer) 
 - compilation fix for XRC with mingw32
+- strip ampersands from strings returned by wxMenuBar::GetLabelTop()
 
 wxMotif:
 
diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 6420604cc5..8dc394f671 100644
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -669,7 +669,7 @@ wxString wxMenuBar::GetLabelTop(size_t pos) const
     wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
                  wxT("invalid menu index in wxMenuBar::GetLabelTop") );
 
-    return m_titles[pos];
+    return wxMenuItem::GetLabelFromText(m_titles[pos]);
 }
 
 // ---------------------------------------------------------------------------