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
2003-09-21 15:22:15 +00:00
parent ec5b49cf64
commit 889285fd21
2 changed files with 2 additions and 1 deletions
--- 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:

--- 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]);
 }

 // ---------------------------------------------------------------------------