Bugfix in GSocket_Cleanup()

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

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


@@ -63,7 +67,7 @@ bool wxButton::Create(wxWindow *parent,
                       const wxValidator& validator,
                       const wxString& name)
 {
                       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);
         return FALSE;
 
     SetValidator(validator);


@@ -93,6 +97,17 @@ 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;
 }
 


@@ -113,68 +128,83 @@ wxButton::~wxButton()
 // size management including autosizing
 // ----------------------------------------------------------------------------
 
 // size management including autosizing
 // ----------------------------------------------------------------------------
 

-void wxButton::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+wxSize wxButton::DoGetBestSize()

 {
 {

-    int currentX, currentY;
-    GetPosition(&currentX, &currentY);
-    int x1 = x;
-    int y1 = y;
-    if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        x1 = currentX;
-    if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        y1 = currentY;
-
-    AdjustForParentClientOrigin(x1, y1, sizeFlags);
-
-    int actualWidth = width;
-    int actualHeight = height;
-    int ww, hh;
-    GetSize(&ww, &hh);
-
-    int current_width;
-    int cyf;
-    wxString buf = wxGetWindowText(GetHWND());
-    GetTextExtent(buf, &current_width, &cyf, NULL, NULL, &GetFont());
-
-    // If we're prepared to use the existing width, then...
-    if (width == -1 && ((sizeFlags & wxSIZE_AUTO_WIDTH) != wxSIZE_AUTO_WIDTH))
-    {
-        actualWidth = ww;
-    }
-    else if (width == -1)
-    {
-        int cx;
-        int cy;
-        wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
-        actualWidth = (int)(current_width + 3*cx) ;
-    }
+    wxString label = wxGetWindowText(GetHWND());
+    int wBtn;
+    GetTextExtent(label, &wBtn, NULL);

 
 

-    // If we're prepared to use the existing height, then...
-    if (height == -1 && ((sizeFlags & wxSIZE_AUTO_HEIGHT) != wxSIZE_AUTO_HEIGHT))
-    {
-        actualHeight = hh;
-    }
-    else if (height == -1)
+    int wChar, hChar;
+    wxGetCharSize(GetHWND(), &wChar, &hChar, &GetFont());
+
+    // add a margin - the button is wider than just its label
+    wBtn += 3*wChar;
+
+    // the button height is proportional to the height of the font used
+    int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
+
+    return wxSize(wBtn, hBtn);
+}
+
+/* static */
+wxSize wxButton::GetDefaultSize()
+{
+    static wxSize s_sizeBtn;
+
+    if ( s_sizeBtn.x == 0 )

     {
     {

-        actualHeight = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cyf);
+        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;

     }
 
     }
 

-    MoveWindow(GetHwnd(), x1, y1, actualWidth, actualHeight, TRUE);
+    return s_sizeBtn;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// set this button as the default one in its panel
+// ----------------------------------------------------------------------------
+

 void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();
 void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();

+    wxButton *btnOldDefault = NULL;

     wxPanel *panel = wxDynamicCast(parent, wxPanel);
     if ( panel )
     wxPanel *panel = wxDynamicCast(parent, wxPanel);
     if ( panel )

+    {
+        btnOldDefault = panel->GetDefaultItem();

         panel->SetDefaultItem(this);
         panel->SetDefaultItem(this);

+    }

 
     if ( parent )
     {
         SendMessage(GetWinHwnd(parent), DM_SETDEFID, m_windowId, 0L);
     }
 
 
     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);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -201,9 +231,12 @@ void wxButton::Command(wxCommandEvent & event)
 bool wxButton::MSWCommand(WXUINT param, WXWORD id)
 {
     bool processed = FALSE;
 bool wxButton::MSWCommand(WXUINT param, WXWORD id)
 {
     bool processed = FALSE;

-    if ( param == BN_CLICKED || param == 1 ) // 1 for accelerator
+    switch ( param )

     {
     {

-        processed = SendClickEvent();
+        case 1:                                             // 1 for accelerator
+        case BN_CLICKED:
+            processed = SendClickEvent();
+            break;

     }
 
     return processed;
     }
 
     return processed;