X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a4c6734ad039e2cf4ec6a36e578cde893b561d9..f34105c6159bec8e1359a662bedecdc78c7a11d2:/src/mac/carbon/button.cpp?ds=sidebyside diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index f280182a11..6d9d195748 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -1,57 +1,67 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: button.cpp +// Name: src/mac/carbon/button.cpp // Purpose: wxButton // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// 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 -bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) +IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) + + +bool wxButton::Create(wxWindow *parent, + wxWindowID id, + const wxString& lbl, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) { - m_macIsUserPane = FALSE ; - + 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 ; + m_labelOrig = m_label = label ; + + OSStatus err; Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - m_peer = new wxMacControl() ; + 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() ) ); + err = 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 + // 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 ; @@ -67,79 +77,112 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, bounds.bottom = bounds.top + 15 ; m_maxHeight = 15 ; } -#endif - verify_noerr ( CreatePushButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , m_peer->GetControlRefAddr() ) ); + err = 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() ) ); + err = 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; + + 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 ) ; } - if ( btnOldDefault ) - btnOldDefault->m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 0 ) ; m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 1 ) ; + + return btnOldDefault; } wxSize wxButton::DoGetBestSize() const { 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 ) + switch (GetWindowVariant()) { - sz.y = 17 ; - charspace = 8 ; - } - else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI ) - { - sz.y = 15 ; - charspace = 8 ; + 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 ) ) + if ( EmptyRect( &bestsize ) || ( GetWindowStyle() & wxBU_EXACTFIT) ) { - wBtn = m_label.Length() * charspace + 12 ; + Point bounds; + + ControlFontStyleRec controlFont; + OSStatus err = m_peer->GetData( kControlEntireControl, kControlFontStyleTag, &controlFont ); + verify_noerr( err ); + + wxMacCFStringHolder 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; + } + + wBtn = bounds.h + sz.y; } else { wBtn = bestsize.right - bestsize.left ; - sz.y = bestsize.bottom - bestsize.top ; + // non 'normal' window variants don't return the correct height + // sz.y = bestsize.bottom - bestsize.top ; } - - if (wBtn > sz.x || ( GetWindowStyle() & wxBU_EXACTFIT) ) + + if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT)) sz.x = wBtn; return sz ; @@ -147,23 +190,23 @@ wxSize wxButton::DoGetBestSize() const wxSize wxButton::GetDefaultSize() { - int wBtn = 70 ; + int wBtn = 70 ; int hBtn = 20 ; - + return wxSize(wBtn, hBtn); } void wxButton::Command (wxCommandEvent & event) { m_peer->Flash(kControlButtonPart) ; - ProcessCommand (event); + ProcessCommand(event); } -wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) +wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) { - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId ); + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId); event.SetEventObject(this); ProcessCommand(event); - return noErr ; -} + return noErr; +}