From f2412e6a4ec276ed61b827b3073eb6f5960a87a8 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 8 Dec 2007 22:33:24 +0000 Subject: [PATCH] moving collapsible pane a few steps forward os OSX git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/collpaneg.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp index 8eb359e81b..db24dbd952 100644 --- a/src/generic/collpaneg.cpp +++ b/src/generic/collpaneg.cpp @@ -71,11 +71,14 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent, #ifdef __WXMAC__ // on Mac we use the disclosure triangle + // we need a light gray line above and below, lets approximate with the frame m_pStaticLine = NULL; - m_pButton = new wxDisclosureTriangle( this, wxID_ANY, GetBtnLabel() ); + m_pButton = new wxDisclosureTriangle( this, wxID_ANY, GetBtnLabel(), + wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER ); + m_pButton->SetBackgroundColour( wxColour( 221, 226, 239 ) ); m_sz = new wxBoxSizer(wxHORIZONTAL); // m_sz->Add(4,4); where shall we put it? - m_sz->Add( m_pButton ); + m_sz->Add( m_pButton, 1); #else // create children and lay them out using a wxBoxSizer // (so that we automatically get RTL features) @@ -133,7 +136,12 @@ wxSize wxGenericCollapsiblePane::DoGetBestSize() const wxString wxGenericCollapsiblePane::GetBtnLabel() const { + // on mac the triangle indicates the state, no string change +#ifdef __WXMAC__ + return m_strLabel; +#else return m_strLabel + (IsCollapsed() ? wxT(" >>") : wxT(" <<")); +#endif } void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz) @@ -218,7 +226,7 @@ void wxGenericCollapsiblePane::Collapse(bool collapse) // update button label #ifdef __WXMAC__ - m_pButton->SetLabel(GetBtnLabel()); + m_pButton->SetOpen( !collapse ); #else // NB: this must be done after updating our "state" m_pButton->SetLabel(GetBtnLabel()); -- 2.45.2