Must strip menu codes from labels before measuring (fixes bug 1400552)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 16:16:36 +00:00
parent 90c4e038d0
commit 9f8130d6b3
6 changed files with 6 additions and 6 deletions
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -218,7 +218,7 @@ wxSize wxButton::DoGetBestSize() const

    wxCoord wBtn,
            hBtn;
-    dc.GetMultiLineTextExtent(GetLabel(), &wBtn, &hBtn);
+    dc.GetMultiLineTextExtent(wxStripMenuCodes(GetLabel()), &wBtn, &hBtn);

    // add a margin -- the button is wider than just its label
    wBtn += 3*GetCharWidth();