/////////////////////////////////////////////////////////////////////////////
-// 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
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#include "wx/button.h"
-#include "wx/panel.h"
+
+#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"
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(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
if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
{
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() );
}
+ verify_noerr( err );
wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid Mac control") ) ;
- MacPostControlCreate(pos, size) ;
+ MacPostControlCreate( pos, size );
return true;
}
-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()
{
- wxWindow *parent = GetParent();
- wxButton *btnOldDefault = NULL;
+ wxWindow *btnOldDefault = wxButtonBase::SetDefault();
- if ( parent )
+ 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
return wxSize( 20 , 20 ) ;
wxSize sz = GetDefaultSize() ;
- int charspace = 8 ;
switch (GetWindowVariant())
{
- case wxWINDOW_VARIANT_NORMAL:
- case wxWINDOW_VARIANT_LARGE:
+ case wxWINDOW_VARIANT_NORMAL:
+ case wxWINDOW_VARIANT_LARGE:
sz.y = 20 ;
- charspace = 10 ;
break;
- case wxWINDOW_VARIANT_SMALL:
+ case wxWINDOW_VARIANT_SMALL:
sz.y = 17 ;
break;
- case wxWINDOW_VARIANT_MINI:
+ case wxWINDOW_VARIANT_MINI:
sz.y = 15 ;
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<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
+ verify_noerr( err );
+
+ wxCFStringRef str( m_label, GetFont().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<wxButton*>(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 ;
wxSize wxButton::GetDefaultSize()
{
- int wBtn = 70 ;
+ int wBtn = 70 ;
int hBtn = 20 ;
return wxSize(wBtn, hBtn);
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);
+ 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 )
{
- wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
+ 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);
+}
+
+
projects / wxWidgets.git / blobdiff