X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d1d2d465d9a6ce219df35fd97c02a37aba40d03..18c98e42eeb75317f75c9ba20b09a5bd531a690c:/src/msw/button.cpp?ds=sidebyside

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index daa665f297..18a3cc42e6 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"
@@ -64,10 +67,11 @@ bool wxButton::Create(wxWindow *parent,
                       const wxValidator& validator,
                       const wxString& name)
 {
-    if ( !CreateBase(parent, id, pos, size, style, name) )
+    if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;
 
-    SetValidator(validator);
+    // Validator was set in CreateBase
+    //SetValidator(validator);
 
     parent->AddChild((wxButton *)this);
 
@@ -77,10 +81,10 @@ bool wxButton::Create(wxWindow *parent,
     m_hWnd = (WXHWND)CreateWindowEx
                      (
                       MakeExtendedStyle(m_windowStyle),
-                      _T("BUTTON"),
+                      wxT("BUTTON"),
                       label,
                       WS_VISIBLE | WS_TABSTOP | WS_CHILD,
-                      0, 0, 0, 0, 
+                      0, 0, 0, 0,
                       GetWinHwnd(parent),
                       (HMENU)m_windowId,
                       wxGetInstance(),
@@ -94,6 +98,17 @@ bool wxButton::Create(wxWindow *parent,
 
     SetSize(pos.x, pos.y, size.x, size.y);
 
+    // bad hack added by Robert to make buttons at least
+    // 80 pixels wide. There are probably better ways...
+    // TODO. FIXME.
+    wxSize nsize( GetSize() );
+    if ((nsize.x < 80) || (nsize.y < 23))
+    {
+        if ((size.x == -1) && (nsize.x < 80)) nsize.x = 80;
+	if ((size.y == -1) && (nsize.y < 23)) nsize.y = 23;
+        SetSize( nsize );
+    }
+
     return TRUE;
 }
 
@@ -135,15 +150,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 +192,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);