OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
verify_noerr( err );
- SInt16 baseline;
- wxMacCFStringHolder str( m_label, m_font.GetEncoding() );
+ wxCFStringRef str( m_label, GetFont().GetEncoding() );
-#ifndef __LP64__
+#if wxMAC_USE_ATSU_TEXT
+ SInt16 baseline;
if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
{
err = GetThemeTextDimensions(
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 )
+{
+ 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);
+}
+
+