From 588ca87143ddc9b069cb2312863bcc7cd7dd68ce Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 11 Jun 2009 16:02:16 +0000 Subject: [PATCH] Mac appearance fixes: only use a border for wxDisclosureTriangle if wxCollapsiblePane itself has a border; don't set hardcoded background colour git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/collpaneg.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp index 176a597b85..b032263be6 100644 --- a/src/generic/collpaneg.cpp +++ b/src/generic/collpaneg.cpp @@ -89,14 +89,12 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent, #if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) // 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(), - wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER ); - m_pButton->SetBackgroundColour( wxColour( 221, 226, 239 ) ); + m_pButton = new wxDisclosureTriangle(this, wxID_ANY, GetBtnLabel(), + wxDefaultPosition, wxDefaultSize, + style & wxBORDER_MASK); m_sz = new wxBoxSizer(wxHORIZONTAL); - // m_sz->Add(4,4); where shall we put it? - m_sz->Add( m_pButton, 1); + m_sz->Add(m_pButton, wxSizerFlags(1).Expand()); #else // create children and lay them out using a wxBoxSizer // (so that we automatically get RTL features)