Fix wxDataViewCtrl to omit expander space for all kinds of lists.

[wxWidgets.git] / src / generic / collpaneg.cpp

diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index b032263be6220f2c48b37edd658aa58431db4445..894345be6b0cf238e9282895450c9467a4004bf2 100644 (file)
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -87,22 +87,22 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
 
     m_strLabel = label;
 
 
     m_strLabel = label;
 

+    // sizer containing the expand button and possibly a static line
+    m_sz = new wxBoxSizer(wxHORIZONTAL);
+

 #if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
 #if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)

-    // on Mac we use the disclosure triangle
+    // on Mac we use the special disclosure triangle button

     m_pStaticLine = NULL;
     m_pStaticLine = NULL;

-    m_pButton = new wxDisclosureTriangle(this, wxID_ANY, GetBtnLabel(),
-                                         wxDefaultPosition, wxDefaultSize,
-                                         style & wxBORDER_MASK);
-    m_sz = new wxBoxSizer(wxHORIZONTAL);
-    m_sz->Add(m_pButton, wxSizerFlags(1).Expand());
+    m_pButton = new wxDisclosureTriangle(this, wxID_ANY, GetBtnLabel());
+    m_sz->Add(m_pButton);

 #else
     // create children and lay them out using a wxBoxSizer
     // (so that we automatically get RTL features)
     m_pButton = new wxButton(this, wxID_ANY, GetBtnLabel(), wxPoint(0, 0),
                              wxDefaultSize, wxBU_EXACTFIT);
     m_pStaticLine = new wxStaticLine(this, wxID_ANY);
 #else
     // create children and lay them out using a wxBoxSizer
     // (so that we automatically get RTL features)
     m_pButton = new wxButton(this, wxID_ANY, GetBtnLabel(), wxPoint(0, 0),
                              wxDefaultSize, wxBU_EXACTFIT);
     m_pStaticLine = new wxStaticLine(this, wxID_ANY);

+

     // on other platforms we put the static line and the button horizontally
     // on other platforms we put the static line and the button horizontally

-    m_sz = new wxBoxSizer(wxHORIZONTAL);

     m_sz->Add(m_pButton, 0, wxLEFT|wxTOP|wxBOTTOM, GetBorder());
     m_sz->Add(m_pStaticLine, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT, GetBorder());
 #endif
     m_sz->Add(m_pButton, 0, wxLEFT|wxTOP|wxBOTTOM, GetBorder());
     m_sz->Add(m_pStaticLine, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT, GetBorder());
 #endif