// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
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("") , (ControlRef*) &m_macControl ) ) ;
+ verify_noerr ( CreatePushButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , *m_peer ) );
}
else
{
ControlButtonContentInfo info ;
info.contentType = kControlNoContent ;
verify_noerr(CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds,CFSTR(""),
- kControlBevelButtonLargeBevel , kControlBehaviorPushbutton , &info , 0 , 0 , 0 , (ControlRef*) &m_macControl ) ) ;
+ kControlBevelButtonLargeBevel , kControlBehaviorPushbutton , &info , 0 , 0 , 0 , *m_peer ) );
}
- wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ;
+
+ wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
MacPostControlCreate(pos,size) ;
parent->SetDefaultItem(this);
}
- Boolean inData;
- if ( btnOldDefault && btnOldDefault->m_macControl )
- {
- inData = 0;
- ::SetControlData( (ControlRef) btnOldDefault->m_macControl , kControlButtonPart ,
- kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
- }
- if ( (ControlRef) m_macControl )
- {
- inData = 1;
- ::SetControlData( (ControlRef) 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() ;
-
- 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 ;
- }
+ 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() * charspace + 12 ;
-
- if (wBtn > sz.x) sz.x = wBtn;
+ Rect bestsize = { 0 , 0 , 0 , 0 } ;
+ short baselineoffset ;
+ ::GetBestControlRect( *m_peer , &bestsize , &baselineoffset ) ;
- return sz ;
+ int wBtn = 0 ;
+ if ( EmptyRect( &bestsize ) )
+ {
+ int wBtn = m_label.Length() * charspace + 12 ;
+ }
+ else
+ {
+ sz.x = 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()
void wxButton::Command (wxCommandEvent & event)
{
- if ( (ControlRef) m_macControl )
- {
- HiliteControl( (ControlRef) m_macControl , kControlButtonPart ) ;
- unsigned long finalTicks ;
- Delay( 8 , &finalTicks ) ;
- HiliteControl( (ControlRef) m_macControl , 0 ) ;
- }
+ m_peer->Flash(kControlButtonPart) ;
ProcessCommand (event);
}