X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fcdb954037be5fd49dcc6676d138b2f33a5d3752..4a00d37c9662eaf6f663e716c809f629549f1322:/src/generic/collpaneg.cpp?ds=sidebyside diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp index 25450bf9ce..b032263be6 100644 --- a/src/generic/collpaneg.cpp +++ b/src/generic/collpaneg.cpp @@ -16,6 +16,11 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + #include "wx/defs.h" #if wxUSE_COLLPANE && wxUSE_BUTTON && wxUSE_STATLINE @@ -45,7 +50,7 @@ const char wxCollapsiblePaneNameStr[] = "collapsiblePane"; // wxGenericCollapsiblePane //----------------------------------------------------------------------------- -wxDEFINE_EVENT( wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent ); IMPLEMENT_DYNAMIC_CLASS(wxGenericCollapsiblePane, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent) @@ -84,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)