warning fix

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

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index 849aeee0e3addf5bcb96144244b0459e5258e2a2..53c0861dbe5bac228463e87318395a9d38180b2c 100644 (file)
--- a/src/mac/button.cpp
+++ b/src/mac/button.cpp
@@ -14,8 +14,11 @@
 #endif
 
 #include "wx/button.h"
+#include "wx/panel.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
+#endif
 
 #include <wx/mac/uma.h>
 // Button
@@ -29,12 +32,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" ) ;
        
@@ -53,35 +54,65 @@ void wxButton::SetDefault()
         btnOldDefault = panel->GetDefaultItem();
         panel->SetDefaultItem(this);
     }
-  
-  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) ) ;
-  }
+
+#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()
+wxSize wxButton::DoGetBestSize() const
 {
-    int wBtn = m_label.Length() * 8 + 12 + 2 * m_macHorizontalBorder;
-       int hBtn = 13 + 2 * m_macVerticalBorder;
-
-    return wxSize(wBtn, hBtn);
+  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 = 15 * 8 + 12 + 2 * 2;
-       int hBtn = 13 + 2 * 2;
+    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);
 }