X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d99be5f5381dad56492da02c2df1c3ec0750926..bf3e0fbd1ff071caa5d929f01ad6ef9a64ee6494:/src/msw/button.cpp?ds=sidebyside

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 706aae70b8..9a8122e079 100644
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -31,6 +31,9 @@
     #include "wx/button.h"
     #include "wx/brush.h"
     #include "wx/panel.h"
+    #include "wx/bmpbuttn.h"
+    #include "wx/settings.h"
+    #include "wx/dcscreen.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -135,15 +138,26 @@ wxSize wxButton::DoGetBestSize()
 /* static */
 wxSize wxButton::GetDefaultSize()
 {
-    // the base unit is the height of the system GUI font
-    int wChar, hChar;
-    wxGetCharSize(0, &wChar, &hChar, NULL);
+    static wxSize s_sizeBtn;
 
-    // the button height is proportional to the height of the font used
-    int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
+    if ( s_sizeBtn.x == 0 )
+    {
+        wxScreenDC dc;
+        dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+
+        // the size of a standard button in the dialog units is 50x14,
+        // translate this to pixels
+        // NB1: the multipliers come from the Windows convention
+        // NB2: the extra +1/+2 were needed to get the size be the same as the
+        //      size of the buttons in the standard dialog - I don't know how
+        //      this happens, but on my system this size is 75x23 in pixels and
+        //      23*8 isn't even divisible by 14... Would be nice to understand
+        //      why these constants are needed though!
+        s_sizeBtn.x = (50 * (dc.GetCharWidth() + 1))/4;
+        s_sizeBtn.y = ((14 * dc.GetCharHeight()) + 2)/8;
+    }
 
-    // and the width/height ration is 75/23
-    return wxSize((75 * hBtn) / 23, hBtn);
+    return s_sizeBtn;
 }
 
 // ----------------------------------------------------------------------------
@@ -166,7 +180,9 @@ void wxButton::SetDefault()
         SendMessage(GetWinHwnd(parent), DM_SETDEFID, m_windowId, 0L);
     }
 
-    if ( btnOldDefault )
+    // this doesn't work with bitmap buttons because it also removes the
+    // "ownerdrawn" style...
+    if ( btnOldDefault && !wxDynamicCast(btnOldDefault, wxBitmapButton) )
     {
         // remove the BS_DEFPUSHBUTTON style from the other button
         long style = GetWindowLong(GetHwndOf(btnOldDefault), GWL_STYLE);