bump subrelease number

[wxWidgets.git] / src / msw / button.cpp

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index d8fd8eea603e6757578898a671952e481f68b6ff..13f270d4c57f7b8a603ead2f0567774a5e97d09a 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -254,7 +254,7 @@ wxSize wxButton::DoGetBestSize() const
 
     wxCoord wBtn,
             hBtn;
 
     wxCoord wBtn,
             hBtn;

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

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


@@ -849,11 +849,10 @@ bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
     }
 
     COLORREF colFg = wxColourToRGB(GetForegroundColour());
     }
 
     COLORREF colFg = wxColourToRGB(GetForegroundColour());

-    DrawButtonText(hdc, &rectBtn,
-                   (state & ODS_NOACCEL ? wxStripMenuCodes(GetLabel())
-                                        : GetLabel()),
-                   state & ODS_DISABLED ? GetSysColor(COLOR_GRAYTEXT)
-                                        : colFg);
+    if ( state & ODS_DISABLED ) colFg = GetSysColor(COLOR_GRAYTEXT) ;
+    wxString label = GetLabel();
+    if ( state & ODS_NOACCEL ) label = GetLabelText() ;
+    DrawButtonText(hdc, &rectBtn, label, colFg);

 
     return true;
 }
 
     return true;
 }