several mac fixes (Mark Newsams patches)

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

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index cb447864436f46509010b71e92df25801593cfa2..d4837fd54a90709aaeb3b6b281215ff1785f7ddd 100644 (file)
--- a/src/mac/button.cpp
+++ b/src/mac/button.cpp
@@ -13,7 +13,10 @@
 #pragma implementation "button.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/button.h"
+#include "wx/panel.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
@@ -31,12 +34,10 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 {
        Rect bounds ;
        Str255 title ;
-       m_macHorizontalBorder = 2 ; // additional pixels around the real control
-       m_macVerticalBorder = 2 ;
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
+       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlPushButtonProc , (long) this ) ;
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
        
@@ -47,18 +48,73 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
 void wxButton::SetDefault()
 {
-  wxWindow *parent = (wxWindow *)GetParent();
-  if (parent)
-      parent->SetDefaultItem(this);
+    wxWindow *parent = GetParent();
+    wxButton *btnOldDefault = NULL;
+    wxPanel *panel = wxDynamicCast(parent, wxPanel);
+    if ( panel )
+    {
+        btnOldDefault = panel->GetDefaultItem();
+        panel->SetDefaultItem(this);
+    }
 
-  if ( m_macControl )
-  {
-               UMASetControlData( m_macControl , kControlButtonPart , kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)1) ) ;
+#ifdef __UNIX__
+       Boolean inData;
+       if ( btnOldDefault && btnOldDefault->m_macControl )
+       {
+               inData = 0;
+               UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart ,
+                                                  kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
+       }
+       if ( m_macControl )
+       {
+               inData = 1;
+               UMASetControlData( m_macControl , kControlButtonPart ,
+                                                  kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
+       }
+#else
+       if ( btnOldDefault && btnOldDefault->m_macControl )
+       {
+               UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart ,
+                                                  kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)0) ) ;
+       }
+       if ( m_macControl )
+       {
+               UMASetControlData( m_macControl , kControlButtonPart ,
+                                                  kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)1) ) ;
        }
+#endif
+}
+
+wxSize wxButton::DoGetBestSize() const
+{
+  wxSize sz = GetDefaultSize() ;
+  
+    int wBtn = m_label.Length() * 8 + 12 ;
+       int hBtn = 20 ;
+       
+  if (wBtn > sz.x) sz.x = wBtn;
+  if (hBtn > sz.y) sz.y = hBtn;
+  
+  return sz ;
+}
+
+wxSize wxButton::GetDefaultSize()
+{
+    int wBtn = 70 /* + 2 * m_macHorizontalBorder */ ; 
+       int hBtn = 20 /* +  2 * m_macVerticalBorder */ ;
+
+    return wxSize(wBtn, hBtn);
 }
 
 void wxButton::Command (wxCommandEvent & event)
 {
+       if ( m_macControl )
+       {
+               HiliteControl( m_macControl , kControlButtonPart ) ;
+               unsigned long finalTicks ;
+               Delay( 8 , &finalTicks ) ;
+               HiliteControl( m_macControl , 0 ) ;
+       }
     ProcessCommand (event);
 }