added generic color dialog to setup

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

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index 47f66425e2ed97fdf2f939ad9fad1d895263bb13..d4837fd54a90709aaeb3b6b281215ff1785f7ddd 100644 (file)
--- a/src/mac/button.cpp
+++ b/src/mac/button.cpp
@@ -13,7 +13,10 @@
 #pragma implementation "button.h"
 #endif
 
 #pragma implementation "button.h"
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/button.h"
 #include "wx/button.h"

+#include "wx/panel.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)


@@ -34,7 +37,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
        
        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" ) ;
        
                kControlPushButtonProc , (long) this ) ;
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
        


@@ -53,31 +56,51 @@ void wxButton::SetDefault()
         btnOldDefault = panel->GetDefaultItem();
         panel->SetDefaultItem(this);
     }
         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() const
 {
 }
 
 wxSize wxButton::DoGetBestSize() const
 {

+  wxSize sz = GetDefaultSize() ;
+  

     int wBtn = m_label.Length() * 8 + 12 ;
        int hBtn = 20 ;
        
     int wBtn = m_label.Length() * 8 + 12 ;
        int hBtn = 20 ;
        

-       if ( wBtn < 80 )
-               wBtn = 80 ;
-
-    return wxSize(wBtn, hBtn);
+  if (wBtn > sz.x) sz.x = wBtn;
+  if (hBtn > sz.y) sz.y = hBtn;
+  
+  return sz ;

 }
 
 wxSize wxButton::GetDefaultSize()
 {
 }
 
 wxSize wxButton::GetDefaultSize()
 {

-    int wBtn = 80 /* + 2 * m_macHorizontalBorder */ ; 
+    int wBtn = 70 /* + 2 * m_macHorizontalBorder */ ; 

        int hBtn = 20 /* +  2 * m_macVerticalBorder */ ;
 
     return wxSize(wBtn, hBtn);
        int hBtn = 20 /* +  2 * m_macVerticalBorder */ ;
 
     return wxSize(wBtn, hBtn);