From 5dd1b7a66948c8e3aaaf4c39ea596957614bce17 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 8 Dec 2007 22:32:21 +0000 Subject: [PATCH] moving collapsible pane a few steps forward os OSX git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/button.cpp | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index 0f95274ff4..1c04183a78 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -229,39 +229,30 @@ bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxStrin OSStatus err = CreateDisclosureTriangleControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds, kControlDisclosureTrianglePointDefault, - CFSTR("Test"), + 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 ) { - // TODO + m_peer->SetValue( open ? 1 : 0 ); } bool wxDisclosureTriangle::IsOpen() const { - // TODO - return true; -} - -void wxDisclosureTriangle::SetLabel( const wxString &label ) -{ - // TODO -} - -wxString wxDisclosureTriangle::GetLabel() const -{ - return wxEmptyString; + return m_peer->GetValue() == 1; } wxInt32 wxDisclosureTriangle::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) -- 2.47.2