X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41c9a21f8cc72250ee4b0d5230c5f529c0ab0aab..8b2858410444b111cb192d1539ef6c76209091fd:/src/mac/carbon/button.cpp?ds=sidebyside

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 072ba01720..9ece344ddf 100644
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -1,48 +1,86 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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__
-#pragma implementation "button.h"
-#endif
-
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #include "wx/button.h"
 #include "wx/panel.h"
+#include "wx/stockitem.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-#endif
 
 #include "wx/mac/uma.h"
 // Button
 
-
-bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
+bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
            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( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
-	  	kControlPushButtonProc , (long) this ) ;
-	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
-	
-	MacPostControlCreate() ;
-
+    wxString label(lbl);
+    if (label.empty() && wxIsStockID(id))
+        label = wxGetStockLabel(id);
+    
+    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(this) ;
+    if ( id == wxID_HELP )
+    {
+        ControlButtonContentInfo info ;
+        info.contentType = kControlContentIconRef ;
+        GetIconRef(kOnSystemDisk, kSystemIconsCreator, kHelpIcon, &info.u.iconRef);
+        verify_noerr ( CreateRoundButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , kControlRoundButtonNormalSize , 
+            &info , m_peer->GetControlRefAddr() ) );
+    }
+    else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
+    {
+#if TARGET_API_MAC_OSX
+        //Button height is static in Mac, can't be changed, so we need to force it here
+        if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
+        {
+            bounds.bottom = bounds.top + 20 ;
+            m_maxHeight = 20 ;
+        }
+        else if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
+        {
+            bounds.bottom = bounds.top + 17 ;
+            m_maxHeight = 17 ;
+        }
+        else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
+        {
+            bounds.bottom = bounds.top + 15 ;
+            m_maxHeight = 15 ;
+        }
+#endif
+        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 +95,74 @@ void wxButton::SetDefault()
         parent->SetDefaultItem(this);
     }
 
-	Boolean inData;
-	if ( btnOldDefault && btnOldDefault->m_macControl )
-	{
-  		inData = 0;
-		::SetControlData( btnOldDefault->m_macControl , kControlButtonPart ,
-						   kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
-	}
-	if ( m_macControl )
-	{
-  		inData = 1;
-		::SetControlData( 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() ;
+    if ( GetId() == wxID_HELP )
+        return wxSize( 20 , 20 ) ;
+        
+    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 ( m_macControl )
-	{
-		HiliteControl( m_macControl , kControlButtonPart ) ;
-		unsigned long finalTicks ;
-		Delay( 8 , &finalTicks ) ;
-		HiliteControl( m_macControl , 0 ) ;
-	}
+    m_peer->Flash(kControlButtonPart) ;
     ProcessCommand (event);
 }
 
-void wxButton::MacHandleControlClick( ControlHandle control , SInt16 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 ;
 }