A few resize bugs removed

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

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 380af241267b2314f62fa918717f69f383329f9a..fce544bd25e3ef67f40f920a1d92f3d75be76053 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -22,6 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/button.h"
+#include "wx/brush.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -30,7 +31,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 #endif
 
-#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
+#define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10)
 
 // Buttons
 
@@ -56,8 +57,8 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
   SetValidator(validator);
 
   parent->AddChild((wxButton *)this);
-  m_backgroundColour = parent->GetDefaultBackgroundColour() ;
-  m_foregroundColour = parent->GetDefaultForegroundColour() ;
+  m_backgroundColour = parent->GetBackgroundColour() ;
+  m_foregroundColour = parent->GetForegroundColour() ;
 
   m_windowStyle = (long&)style;
 
@@ -87,7 +88,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
   // Subclass again for purposes of dialog editing mode
   SubclassWin((WXHWND)wx_button);
 
-  SetFont(* parent->GetFont());
+  SetFont(parent->GetFont());
 
   SetSize(x, y, width, height);
   ShowWindow(wx_button, SW_SHOW);
@@ -117,7 +118,8 @@ void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags)
   int cyf;
   char buf[300];
   GetWindowText((HWND) GetHWND(), buf, 300);
-  GetTextExtent(buf, &current_width, &cyf,NULL,NULL,GetFont());
+  GetTextExtent(buf, &current_width, &cyf,NULL,NULL,
+    & this->GetFont());
 
   // If we're prepared to use the existing width, then...
   if (width == -1 && ((sizeFlags & wxSIZE_AUTO_WIDTH) != wxSIZE_AUTO_WIDTH))
@@ -126,7 +128,7 @@ void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags)
   {
     int cx;
     int cy;
-    wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
+    wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
     actualWidth = (int)(current_width + 3*cx) ;
   }
   
@@ -135,7 +137,7 @@ void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags)
     actualHeight = hh;
   else if (height == -1)
   {
-    actualHeight = (int)(cyf*BUTTON_HEIGHT_FACTOR) ;
+    actualHeight = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cyf);
   }
 
   MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);
@@ -149,8 +151,10 @@ void wxButton::SetDefault(void)
 
   if (parent)
   {
-    SendMessage((HWND) parent->GetHWND(), DM_SETDEFID, m_windowId, 0L);
+    SendMessage((HWND)parent->GetHWND(), DM_SETDEFID, m_windowId, 0L);
   }
+
+  SendMessage((HWND)GetHWND(), BM_SETSTYLE, BS_DEFPUSHBUTTON, 1L);
 }
 
 wxString wxButton::GetLabel(void) const