X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..623d5f80029803f1394e89732e16e19e82a22e2a:/src/mac/carbon/button.cpp?ds=inline diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index befd0d7156..c5a3f521bd 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -1,75 +1,189 @@ ///////////////////////////////////////////////////////////////////////////// -// 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/wxprec.h" #include "wx/button.h" -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) +#ifndef WX_PRECOMP + #include "wx/panel.h" #endif -// Button +#include "wx/stockitem.h" -bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) -{ - SetName(name); - SetValidator(validator); - m_windowStyle = style; +#include "wx/mac/uma.h" + +IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) - parent->AddChild((wxButton *)this); - if (id == -1) - m_windowId = NewControlId(); +bool wxButton::Create(wxWindow *parent, + wxWindowID id, + const wxString& lbl, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) +{ + 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 ; + + OSStatus err; + 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); + 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 + 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 + + err = CreatePushButtonControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()), + &bounds, CFSTR(""), m_peer->GetControlRefAddr() ); + } else - m_windowId = id; + { + ControlButtonContentInfo info ; + info.contentType = kControlNoContent ; + err = CreateBevelButtonControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds, CFSTR(""), + kControlBevelButtonLargeBevel, kControlBehaviorPushbutton, + &info, 0, 0, 0, m_peer->GetControlRefAddr() ); + } - // TODO: create button + verify_noerr( err ); + wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid Mac control") ) ; - return FALSE; -} + MacPostControlCreate( pos, size ); -void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags) -{ - // TODO + return true; } void wxButton::SetDefault() { - wxWindow *parent = (wxWindow *)GetParent(); - if (parent) + wxWindow *parent = GetParent(); + wxButton *btnOldDefault = NULL; + + if ( parent ) + { + btnOldDefault = wxDynamicCast(parent->GetDefaultItem(), wxButton); parent->SetDefaultItem(this); + } + + if ( btnOldDefault ) + btnOldDefault->m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 0 ) ; - // TODO: make button the default + m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 1 ) ; } -wxString wxButton::GetLabel() const +wxSize wxButton::DoGetBestSize() const { - // TODO - return wxString(""); + if ( GetId() == wxID_HELP ) + return wxSize( 20 , 20 ) ; + + wxSize sz = GetDefaultSize() ; + int charspace = 8 ; + + switch (GetWindowVariant()) + { + case wxWINDOW_VARIANT_NORMAL: + case wxWINDOW_VARIANT_LARGE: + sz.y = 20 ; + charspace = 10 ; + 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 ) ) + { + 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 ; } -void wxButton::SetLabel(const wxString& label) +wxSize wxButton::GetDefaultSize() { - // TODO + int wBtn = 70 ; + int hBtn = 20 ; + + return wxSize(wBtn, hBtn); } void wxButton::Command (wxCommandEvent & event) { - ProcessCommand (event); + m_peer->Flash(kControlButtonPart) ; + ProcessCommand(event); } +wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) +{ + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId); + event.SetEventObject(this); + ProcessCommand(event); + + return noErr; +}