added except sample

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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index cbc1d846d95bf5ca56a7c54f1d034813a45b3e86..b9dee54353a8e70b9a31fe13af5ce7a18aace334 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        button.cpp
 // Purpose:     wxButton
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -25,24 +25,37 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 #include "wx/mac/uma.h"
 // Button
 
-
 bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxString& name)
 {
-       Rect bounds ;
-       Str255 title ;
-       
-       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() ;
-
+    m_macIsUserPane = FALSE ;
+    
+    if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )
+        return false;
+    
+    m_label = label ;
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    m_peer = new wxMacControl() ;
+    if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
+    {
+        verify_noerr ( CreatePushButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , m_peer->GetControlRefAddr() ) );
+    }
+    else
+    {
+        ControlButtonContentInfo info ;
+        info.contentType = kControlNoContent ;
+        verify_noerr(CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds,CFSTR(""),
+            kControlBevelButtonLargeBevel , kControlBehaviorPushbutton , &info , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
+    }
+    
+    wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
+    
+    MacPostControlCreate(pos,size) ;
+    
   return TRUE;
 }
 
@@ -57,61 +70,71 @@ 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) ) ;
-       }
+    if ( btnOldDefault )
+        btnOldDefault->m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 0 ) ;
+    m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 1 ) ;
 }
 
 wxSize wxButton::DoGetBestSize() const
 {
-  wxSize sz = GetDefaultSize() ;
+    wxSize sz = GetDefaultSize() ;
+
+    int charspace = 8 ;
+    if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
+    {
+        sz.y = 20 ;
+        charspace = 10 ;
+    }
+    else if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
+    {
+        sz.y = 17 ;
+        charspace = 8 ;
+    }
+    else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
+    {
+        sz.y = 15 ;
+        charspace = 8 ;
+    }
   
-    int wBtn = m_label.Length() * 8 + 12 ;
-       int hBtn = 20 ;
-       
-  if (wBtn > sz.x) sz.x = wBtn;
-  if (hBtn > sz.y) sz.y = hBtn;
+    Rect    bestsize = { 0 , 0 , 0 , 0 } ;
+    m_peer->GetBestRect( &bestsize ) ;
   
-  return sz ;
+    int wBtn;
+    if ( EmptyRect( &bestsize ) )
+    {
+        wBtn = m_label.Length() * charspace + 12 ;
+    }
+    else
+    {
+        wBtn = bestsize.right - bestsize.left ;
+        sz.y = bestsize.bottom - bestsize.top ;
+    }
+    
+    if (wBtn > sz.x || ( GetWindowStyle() & wxBU_EXACTFIT) ) 
+        sz.x = wBtn;
+
+    return sz ;
 }
 
 wxSize wxButton::GetDefaultSize()
 {
-    int wBtn = 70 /* + 2 * m_macHorizontalBorder */ ; 
-       int hBtn = 20 /* +  2 * m_macVerticalBorder */ ;
-
+    int wBtn = 70 ; 
+    int hBtn = 20 ;
+    
     return wxSize(wBtn, hBtn);
 }
 
 void wxButton::Command (wxCommandEvent & event)
 {
-       if ( (ControlHandle) m_macControl )
-       {
-               HiliteControl(  (ControlHandle) m_macControl , kControlButtonPart ) ;
-               unsigned long finalTicks ;
-               Delay( 8 , &finalTicks ) ;
-               HiliteControl(  (ControlHandle) m_macControl , 0 ) ;
-       }
+    m_peer->Flash(kControlButtonPart) ;
     ProcessCommand (event);
 }
 
-void wxButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 
 {
-  if ( controlpart != kControlNoPart )
-  {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
     event.SetEventObject(this);
     ProcessCommand(event);
-  }
+    return noErr ;
 }