Removed my buggy bug-fix

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

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 13f671d53b5cfeb9e1bca94eb33620e18e9e2e8a..764c28db6f071628331ab2cf4bbdf7b88a8553c6 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,13 +31,13 @@
 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
 
 bool wxButton::MSWCommand(WXUINT param, WXWORD id)
 {
-  if (param == BN_CLICKED)
+  if (param == BN_CLICKED || (param == 1)) // 1 for accelerator
   {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, id);
     event.SetEventObject(this);
@@ -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;
 
@@ -77,17 +78,12 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
                     0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                     wxGetInstance(), NULL);
 
-#if CTL3D
-//  if (!(GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS))
-//    Ctl3dSubclassCtl(wx_button);
-#endif
-
   m_hWnd = (WXHWND)wx_button;
 
   // 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);
@@ -95,7 +91,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
   return TRUE;
 }
 
-void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxButton::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
@@ -106,6 +102,8 @@ void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags)
   if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     y1 = currentY;
 
+  AdjustForParentClientOrigin(x1, y1, sizeFlags);
+
   int actualWidth = width;
   int actualHeight = height;
   int ww, hh;
@@ -115,7 +113,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))
@@ -124,7 +123,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) ;
   }
   
@@ -133,7 +132,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);
@@ -147,8 +146,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