applied patch #1348053 "[msw] Strip mnemonics when calc best size for static text"

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

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index e881b3f838f72fdf60a10b2759ee651329e4dba4..0ea485b4f716a127310f0e0ca871a1a595621642 100644 (file)
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -135,7 +135,8 @@ wxSize wxStaticText::DoGetBestSize() const
     dc.SetFont(font);
 
     wxCoord widthTextMax, heightTextTotal;
-    dc.GetMultiLineTextExtent(GetLabel(), &widthTextMax, &heightTextTotal);
+    dc.GetMultiLineTextExtent(::wxStripMenuCodes(GetLabel()),
+        &widthTextMax, &heightTextTotal);
 
 #ifdef __WXWINCE__
     if ( widthTextMax )