// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include "wx/mac/uma.h"
// Button
-static const int kMacOSXHorizontalBorder = 1 ;
-static const int kMacOSXVerticalBorder = 1 ;
-
bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos,
const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
- Rect bounds ;
- Str255 title ;
-
- if ( UMAHasAquaLayout() )
+ m_macIsUserPane = FALSE ;
+
+ if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )
+ return false;
+
+ m_label = label ;
+
+ Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+ if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
{
- m_macHorizontalBorder = kMacOSXHorizontalBorder;
- m_macVerticalBorder = kMacOSXVerticalBorder;
+ m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , 1,
+ kControlPushButtonProc , (long) this ) ;
}
-
- 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() ;
-
+ else
+ {
+ ControlButtonContentInfo info ;
+ info.contentType = kControlNoContent ;
+ verify_noerr(CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds,CFSTR(""),
+ kControlBevelButtonLargeBevel , kControlBehaviorPushbutton , &info , 0 , 0 , 0 , (ControlRef*) &m_macControl ) ) ;
+ }
+ wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ;
+
+ MacPostControlCreate(pos,size) ;
+
return TRUE;
}
parent->SetDefaultItem(this);
}
- 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) ) ;
- }
+ 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) ) ;
+ }
}
wxSize wxButton::DoGetBestSize() const
{
wxSize sz = GetDefaultSize() ;
- int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
-
+ 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;
return sz ;
wxSize wxButton::GetDefaultSize()
{
int wBtn = 70 ;
- int hBtn = 20 ;
-
- if ( UMAHasAquaLayout() )
- {
- wBtn += 2 * kMacOSXHorizontalBorder ;
- hBtn += 2 * kMacOSXVerticalBorder ;
- }
-
+ int hBtn = 20 ;
+
return wxSize(wBtn, hBtn);
}
void wxButton::Command (wxCommandEvent & event)
{
- if ( (ControlHandle) m_macControl )
+ if ( (ControlRef) m_macControl )
{
- HiliteControl( (ControlHandle) m_macControl , kControlButtonPart ) ;
+ HiliteControl( (ControlRef) m_macControl , kControlButtonPart ) ;
unsigned long finalTicks ;
Delay( 8 , &finalTicks ) ;
- HiliteControl( (ControlHandle) m_macControl , 0 ) ;
+ HiliteControl( (ControlRef) m_macControl , 0 ) ;
}
ProcessCommand (event);
}
-void wxButton::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 controlpart )
+void wxButton::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 controlpart , bool WXUNUSED(mouseStillDown) )
{
if ( controlpart != kControlNoPart )
{