X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0150a5b8b9fec7f1db67b732be4b041844fd61b3..24377c46813426a325a209c45bbca0a9e8da054b:/src/mac/carbon/button.cpp?ds=sidebyside diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index d85d8bf7be..1c04183a78 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -1,129 +1,273 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: button.cpp +// Name: src/mac/carbon/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" -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) +#ifndef WX_PRECOMP + #include "wx/panel.h" + #include "wx/toplevel.h" + #include "wx/dcclient.h" #endif +#include "wx/stockitem.h" + #include "wx/mac/uma.h" -// Button -static const int kMacOSXHorizontalBorder = 1 ; -static const int kMacOSXVerticalBorder = 1 ; +IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) -bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) + +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 ; + 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_labelOrig = m_label = label ; - if ( UMAHasAquaLayout() ) + OSStatus err; + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + m_peer = new wxMacControl(this) ; + if ( id == wxID_HELP ) { - m_macHorizontalBorder = kMacOSXHorizontalBorder; - m_macVerticalBorder = kMacOSXVerticalBorder; + ControlButtonContentInfo info ; + info.contentType = kControlContentIconRef ; + GetIconRef(kOnSystemDisk, kSystemIconsCreator, kHelpIcon, &info.u.iconRef); + err = CreateRoundButtonControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()), + &bounds, kControlRoundButtonNormalSize, + &info, m_peer->GetControlRefAddr() ); } - - 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() ; - - return TRUE; + else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND) + { + // 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 ; + } + err = CreatePushButtonControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()), + &bounds, CFSTR(""), m_peer->GetControlRefAddr() ); + } + else + { + ControlButtonContentInfo info ; + info.contentType = kControlNoContent ; + err = CreateBevelButtonControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds, CFSTR(""), + kControlBevelButtonLargeBevel, kControlBehaviorPushbutton, + &info, 0, 0, 0, m_peer->GetControlRefAddr() ); + } + + verify_noerr( err ); + wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid Mac control") ) ; + + MacPostControlCreate( pos, size ); + + return true; } -void wxButton::SetDefault() +wxWindow *wxButton::SetDefault() { - wxWindow *parent = GetParent(); - wxButton *btnOldDefault = NULL; - if ( parent ) + wxWindow *btnOldDefault = wxButtonBase::SetDefault(); + + if ( btnOldDefault ) { - btnOldDefault = wxDynamicCast(parent->GetDefaultItem(), - wxButton); - parent->SetDefaultItem(this); + // cast needed to access the protected member + btnOldDefault->GetPeer()->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 0 ) ; } - 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) ) ; - } + m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 1 ) ; + + return btnOldDefault; } 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 ; -} + if ( GetId() == wxID_HELP ) + return wxSize( 20 , 20 ) ; -wxSize wxButton::GetDefaultSize() -{ - int wBtn = 70 ; - int hBtn = 20 ; + wxSize sz = GetDefaultSize() ; + + switch (GetWindowVariant()) + { + case wxWINDOW_VARIANT_NORMAL: + case wxWINDOW_VARIANT_LARGE: + sz.y = 20 ; + break; + + case wxWINDOW_VARIANT_SMALL: + sz.y = 17 ; + break; + + case wxWINDOW_VARIANT_MINI: + sz.y = 15 ; + break; + + default: + break; + } + + Rect bestsize = { 0 , 0 , 0 , 0 } ; + m_peer->GetBestRect( &bestsize ) ; + + int wBtn; + if ( EmptyRect( &bestsize ) || ( GetWindowStyle() & wxBU_EXACTFIT) ) + { + Point bounds; + + ControlFontStyleRec controlFont; + OSStatus err = m_peer->GetData( kControlEntireControl, kControlFontStyleTag, &controlFont ); + verify_noerr( err ); + + wxCFStringRef str( m_label, m_font.GetEncoding() ); + +#if wxMAC_USE_ATSU_TEXT + SInt16 baseline; + if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont ) + { + err = GetThemeTextDimensions( + (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")), + m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline ); + verify_noerr( err ); + } + else +#endif + { + wxClientDC dc(const_cast(this)); + wxCoord width, height ; + dc.GetTextExtent( m_label , &width, &height); + bounds.h = width; + bounds.v = height; + } - if ( UMAHasAquaLayout() ) + wBtn = bounds.h + sz.y; + } + else { - wBtn += 2 * kMacOSXHorizontalBorder ; - hBtn += 2 * kMacOSXVerticalBorder ; + wBtn = bestsize.right - bestsize.left ; + // non 'normal' window variants don't return the correct height + // sz.y = bestsize.bottom - bestsize.top ; } + if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT)) + sz.x = wBtn; + + return sz ; +} + +wxSize wxButton::GetDefaultSize() +{ + 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 ) ; - } - ProcessCommand (event); + m_peer->Flash(kControlButtonPart) ; + ProcessCommand(event); } -void wxButton::MacHandleControlClick( WXWidget WXUNUSED(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); - } + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId); + event.SetEventObject(this); + ProcessCommand(event); + + return noErr; +} + +//------------------------------------------------------- +// wxDisclosureTriangle +//------------------------------------------------------- + +bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxString& label, + const wxPoint& pos, const wxSize& size, long style,const wxValidator& validator, const wxString& name ) +{ + m_macIsUserPane = false ; + + if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) + return false; + + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + m_peer = new wxMacControl(this) ; + + OSStatus err = CreateDisclosureTriangleControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds, + kControlDisclosureTrianglePointDefault, + wxCFStringRef( label ), + 0, // closed + TRUE, // draw title + TRUE, // auto toggle back and forth + m_peer->GetControlRefAddr() ); + + verify_noerr( err ); + wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid Mac control") ) ; + + MacPostControlCreate( pos, size ); + // passing the text in the param doesn't seem to work, so lets do if again + SetLabel( label ); + + return true; +} + +void wxDisclosureTriangle::SetOpen( bool open ) +{ + m_peer->SetValue( open ? 1 : 0 ); +} + +bool wxDisclosureTriangle::IsOpen() const +{ + return m_peer->GetValue() == 1; } +wxInt32 wxDisclosureTriangle::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) +{ + // Just emit button event for now + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId); + event.SetEventObject(this); + ProcessCommand(event); + + return noErr; +} + +wxSize wxDisclosureTriangle::DoGetBestSize() const +{ + return wxSize(16,16); +} + +