fixed to correctly use #if wxUSE_SPINCTRL

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

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 706aae70b89024baa661b12b67c1c19d824d3c11..490c1154e420892c82a2305f3185aaa59cfc701a 100644 (file)
--- 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/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"
 #endif
 
 #include "wx/msw/private.h"


@@ -67,8 +70,6 @@ bool wxButton::Create(wxWindow *parent,
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;
 
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;
 

-    SetValidator(validator);
-

     parent->AddChild((wxButton *)this);
 
     m_backgroundColour = parent->GetBackgroundColour() ;
     parent->AddChild((wxButton *)this);
 
     m_backgroundColour = parent->GetBackgroundColour() ;


@@ -77,10 +78,10 @@ bool wxButton::Create(wxWindow *parent,
     m_hWnd = (WXHWND)CreateWindowEx
                      (
                       MakeExtendedStyle(m_windowStyle),
     m_hWnd = (WXHWND)CreateWindowEx
                      (
                       MakeExtendedStyle(m_windowStyle),

-                      _T("BUTTON"),
+                      wxT("BUTTON"),

                       label,
                       WS_VISIBLE | WS_TABSTOP | WS_CHILD,
                       label,
                       WS_VISIBLE | WS_TABSTOP | WS_CHILD,

-                      0, 0, 0, 0, 
+                      0, 0, 0, 0,

                       GetWinHwnd(parent),
                       (HMENU)m_windowId,
                       wxGetInstance(),
                       GetWinHwnd(parent),
                       (HMENU)m_windowId,
                       wxGetInstance(),


@@ -94,6 +95,19 @@ bool wxButton::Create(wxWindow *parent,
 
     SetSize(pos.x, pos.y, size.x, size.y);
 
 
     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;
 }
 
     return TRUE;
 }
 


@@ -114,7 +128,7 @@ wxButton::~wxButton()
 // size management including autosizing
 // ----------------------------------------------------------------------------
 
 // size management including autosizing
 // ----------------------------------------------------------------------------
 

-wxSize wxButton::DoGetBestSize()
+wxSize wxButton::DoGetBestSize() const

 {
     wxString label = wxGetWindowText(GetHWND());
     int wBtn;
 {
     wxString label = wxGetWindowText(GetHWND());
     int wBtn;


@@ -135,15 +149,26 @@ wxSize wxButton::DoGetBestSize()
 /* static */
 wxSize wxButton::GetDefaultSize()
 {
 /* 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 +191,9 @@ void wxButton::SetDefault()
         SendMessage(GetWinHwnd(parent), DM_SETDEFID, m_windowId, 0L);
     }
 
         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);
     {
         // remove the BS_DEFPUSHBUTTON style from the other button
         long style = GetWindowLong(GetHwndOf(btnOldDefault), GWL_STYLE);


@@ -206,7 +233,7 @@ bool wxButton::MSWCommand(WXUINT param, WXWORD id)
     bool processed = FALSE;
     switch ( param )
     {
     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;
         case BN_CLICKED:
             processed = SendClickEvent();
             break;


@@ -215,15 +242,28 @@ bool wxButton::MSWCommand(WXUINT param, WXWORD id)
     return processed;
 }
 
     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);

 }
 }

-