don't use Pango hack for drawing underlined text when using new enough version of...

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

diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp
index 55368ab31c653684c5c48756a5e33cbe04d7239f..906c430116b868ffc6c16c2313b09b020dea3745 100644 (file)
--- a/src/msw/tglbtn.cpp
+++ b/src/msw/tglbtn.cpp
@@ -2,8 +2,8 @@
 // Name:        src/msw/tglbtn.cpp
 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button under wxMSW.
-// Author: John Norris, minor changes by Axel Schlueter
-// and William Gallafent.
+// Author:      John Norris, minor changes by Axel Schlueter
+//              and William Gallafent.
 // Modified by:
 // Created:     08.02.01
 // RCS-ID:      $Id$
@@ -25,10 +25,10 @@
     #pragma hdrstop
 #endif
 
-#include "wx/tglbtn.h"
-
 #if wxUSE_TOGGLEBTN
 
+#include "wx/tglbtn.h"
+
 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/brush.h"
@@ -114,7 +114,7 @@ wxSize wxToggleButton::DoGetBestSize() const
 {
    wxString label = wxGetWindowText(GetHWND());
    int wBtn;
-   GetTextExtent(label, &wBtn, NULL);
+   GetTextExtent(GetLabelText(label), &wBtn, NULL);
 
    int wChar, hChar;
    wxGetCharSize(GetHWND(), &wChar, &hChar, GetFont());
@@ -126,14 +126,18 @@ wxSize wxToggleButton::DoGetBestSize() const
    int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
 
 #if wxUSE_BUTTON
-   wxSize sz = wxButton::GetDefaultSize();
-   if (wBtn > sz.x)
-       sz.x = wBtn;
-   if (hBtn > sz.y)
-       sz.y = hBtn;
-#else
+   // make all buttons of at least standard size unless wxBU_EXACTFIT is given
+   if ( !HasFlag(wxBU_EXACTFIT) )
+   {
+       const wxSize szMin = wxButton::GetDefaultSize();
+       if ( wBtn < szMin.x )
+           wBtn = szMin.x;
+       if ( hBtn < szMin.y )
+           hBtn = szMin.y;
+   }
+#endif // wxUSE_BUTTON
+
    wxSize sz(wBtn, hBtn);
-#endif
 
    CacheBestSize(sz);
    return sz;
@@ -164,4 +168,3 @@ void wxToggleButton::Command(wxCommandEvent & event)
 }
 
 #endif // wxUSE_TOGGLEBTN
-