Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moving collapsible pane a few steps forward os OSX

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-12-08 22:33:24 +00:00
parent 5dd1b7a669
commit f2412e6a4e
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/generic/collpaneg.cpp
View File

@@ -71,11 +71,14 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
#ifdef __WXMAC__ #ifdef __WXMAC__
// on Mac we use the disclosure triangle // 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_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 = new wxBoxSizer(wxHORIZONTAL);
// m_sz->Add(4,4); where shall we put it? // m_sz->Add(4,4); where shall we put it?
m_sz->Add( m_pButton ); m_sz->Add( m_pButton, 1);
#else #else
// create children and lay them out using a wxBoxSizer // create children and lay them out using a wxBoxSizer
// (so that we automatically get RTL features) // (so that we automatically get RTL features)
@@ -133,7 +136,12 @@ wxSize wxGenericCollapsiblePane::DoGetBestSize() const
wxString wxGenericCollapsiblePane::GetBtnLabel() 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(" <<")); return m_strLabel + (IsCollapsed() ? wxT(" >>") : wxT(" <<"));
#endif
} }
void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz) void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz)
@@ -218,7 +226,7 @@ void wxGenericCollapsiblePane::Collapse(bool collapse)
// update button label // update button label
#ifdef __WXMAC__ #ifdef __WXMAC__
m_pButton->SetLabel(GetBtnLabel()); m_pButton->SetOpen( !collapse );
#else #else
// NB: this must be done after updating our "state" // NB: this must be done after updating our "state"
m_pButton->SetLabel(GetBtnLabel()); m_pButton->SetLabel(GetBtnLabel());