X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4438caf41af49f00f3c8137ac801871f59cce386..10a0bdb1933046d8f84d7c910c49cfa646181a39:/src/msw/button.cpp

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 1a34a34d0e..490c1154e4 100644
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -30,6 +30,10 @@
 #ifndef WX_PRECOMP
     #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"
@@ -63,11 +67,9 @@ 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);
-
     parent->AddChild((wxButton *)this);
 
     m_backgroundColour = parent->GetBackgroundColour() ;
@@ -76,10 +78,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(),
@@ -93,6 +95,19 @@ 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;
 }
 
@@ -113,7 +128,7 @@ wxButton::~wxButton()
 // size management including autosizing
 // ----------------------------------------------------------------------------
 
-wxSize wxButton::DoGetBestSize()
+wxSize wxButton::DoGetBestSize() const
 {
     wxString label = wxGetWindowText(GetHWND());
     int wBtn;
@@ -131,6 +146,31 @@ wxSize wxButton::DoGetBestSize()
     return wxSize(wBtn, hBtn);
 }
 
+/* static */
+wxSize wxButton::GetDefaultSize()
+{
+    static wxSize s_sizeBtn;
+
+    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;
+    }
+
+    return s_sizeBtn;
+}
+
 // ----------------------------------------------------------------------------
 // set this button as the default one in its panel
 // ----------------------------------------------------------------------------
@@ -138,16 +178,33 @@ wxSize wxButton::DoGetBestSize()
 void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();
+    wxButton *btnOldDefault = NULL;
     wxPanel *panel = wxDynamicCast(parent, wxPanel);
     if ( panel )
+    {
+        btnOldDefault = panel->GetDefaultItem();
         panel->SetDefaultItem(this);
+    }
 
     if ( parent )
     {
         SendMessage(GetWinHwnd(parent), DM_SETDEFID, m_windowId, 0L);
     }
 
-    SendMessage(GetHwnd(), BM_SETSTYLE, BS_DEFPUSHBUTTON, 1L);
+    // 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);
+        style &= ~BS_DEFPUSHBUTTON;
+        SendMessage(GetHwndOf(btnOldDefault), BM_SETSTYLE, style, 1L);
+    }
+
+    // set this button as the default
+    long style = GetWindowLong(GetHwnd(), GWL_STYLE);
+    style |= BS_DEFPUSHBUTTON;
+    SendMessage(GetHwnd(), BM_SETSTYLE, style, 1L);
 }
 
 // ----------------------------------------------------------------------------
@@ -176,7 +233,7 @@ bool wxButton::MSWCommand(WXUINT param, WXWORD id)
     bool processed = FALSE;
     switch ( param )
     {
-        case 1:                                             // 1 for accelerator
+        case 1: // means that the message came from an accelerator
         case BN_CLICKED:
             processed = SendClickEvent();
             break;
@@ -185,15 +242,28 @@ bool wxButton::MSWCommand(WXUINT param, WXWORD id)
     return processed;
 }
 
-WXHBRUSH wxButton::OnCtlColor(WXHDC pDC,
-                              WXHWND pWnd,
-                              WXUINT nCtlColor,
-                              WXUINT message,
-                              WXWPARAM wParam,
-                              WXLPARAM lParam)
+long wxButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
-  wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+    // make sure that we won't have BS_DEFPUSHBUTTON style any more if the
+    // focus is being transfered to another button with the same parent -
+    // otherwise, we could finish with 2 default buttons inside one panel
+    if ( (nMsg == WM_KILLFOCUS) &&
+         (GetWindowLong(GetHwnd(), GWL_STYLE) & BS_DEFPUSHBUTTON) )
+    {
+        wxWindow *parent = GetParent();
+        wxWindow *win = wxFindWinFromHandle((WXHWND)wParam);
+        if ( win && win->GetParent() == parent )
+        {
+            wxPanel *panel = wxDynamicCast(parent, wxPanel);
+            if ( panel )
+            {
+                panel->SetDefaultItem(this);
+            }
+            // else: I don't know what to do - we'll still have the problem
+            //       with multiple default buttons in a dialog...
+        }
+    }
 
-  return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+    // let the base class do all real processing
+    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }
-