Removed __WXUNIVERSAL__ part of condition

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

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index ca997d69266e7382fb3a20fe7a6e1085ba936422..253671b6fecd2ffdcab542a648ec84a63f5effb6 100644 (file)
--- a/src/mac/button.cpp
+++ b/src/mac/button.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:    wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -34,23 +34,26 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxValidator& validator,
            const wxString& name)
 {
-       Rect bounds ;
-       Str255 title ;
+    if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )
+        return false;
+
+    Rect bounds ;
+    Str255 title ;
 
     if ( UMAHasAquaLayout() )
     {
         m_macHorizontalBorder = kMacOSXHorizontalBorder;
         m_macVerticalBorder = kMacOSXVerticalBorder;
     }
-       
-       MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
-
-       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
-               kControlPushButtonProc , (long) this ) ;
-       wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
-       
-       MacPostControlCreate() ;
-       
+    
+    MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
+
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
+          kControlPushButtonProc , (long) this ) ;
+    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
+    
+    MacPostControlCreate() ;
+    
   return TRUE;
 }
 
@@ -65,19 +68,19 @@ void wxButton::SetDefault()
         parent->SetDefaultItem(this);
     }
 
-       Boolean inData;
-       if ( btnOldDefault && btnOldDefault->m_macControl )
-       {
-               inData = 0;
-               ::SetControlData( (ControlHandle) btnOldDefault->m_macControl , kControlButtonPart ,
-                                                  kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
-       }
-       if ( (ControlHandle) m_macControl )
-       {
-               inData = 1;
-               ::SetControlData(  (ControlHandle) m_macControl , kControlButtonPart ,
-                                                  kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
-       }
+    Boolean inData;
+    if ( btnOldDefault && btnOldDefault->m_macControl )
+    {
+          inData = 0;
+        ::SetControlData( (ControlHandle) btnOldDefault->m_macControl , kControlButtonPart ,
+                           kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
+    }
+    if ( (ControlHandle) m_macControl )
+    {
+          inData = 1;
+        ::SetControlData(  (ControlHandle) m_macControl , kControlButtonPart ,
+                           kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
+    }
 }
 
 wxSize wxButton::DoGetBestSize() const
@@ -85,7 +88,7 @@ wxSize wxButton::DoGetBestSize() const
   wxSize sz = GetDefaultSize() ;
   
   int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
-       
+    
   if (wBtn > sz.x) sz.x = wBtn;
   
   return sz ;
@@ -94,7 +97,7 @@ wxSize wxButton::DoGetBestSize() const
 wxSize wxButton::GetDefaultSize()
 {
     int wBtn = 70 ; 
-       int hBtn = 20 ;
+    int hBtn = 20 ;
 
     if ( UMAHasAquaLayout() )
     {
@@ -117,7 +120,7 @@ void wxButton::Command (wxCommandEvent & event)
     ProcessCommand (event);
 }
 
-void wxButton::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 controlpart ) 
+void wxButton::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 controlpart , bool WXUNUSED(mouseStillDown) ) 
 {
     if ( controlpart != kControlNoPart )
     {