fix compilation without wxUSE_STREAMS (closes #10900)

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

diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index 85874c573fdd6234c27edfcdca2816ecfa2b8a7e..b032263be6220f2c48b37edd658aa58431db4445 100644 (file)
--- 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"
 
 // 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
 #include "wx/defs.h"
 
 #if wxUSE_COLLPANE && wxUSE_BUTTON && wxUSE_STATLINE


@@ -45,7 +50,7 @@ const char wxCollapsiblePaneNameStr[] = "collapsiblePane";
 // wxGenericCollapsiblePane
 //-----------------------------------------------------------------------------
 
 // 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)
 
 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
 
 #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_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 = 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)
 #else
     // create children and lay them out using a wxBoxSizer
     // (so that we automatically get RTL features)


@@ -160,7 +163,7 @@ wxString wxGenericCollapsiblePane::GetBtnLabel() const
 void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz)
 {
     // minimal size has priority over the best size so set here our min size
 void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz)
 {
     // minimal size has priority over the best size so set here our min size

-    SetMinSize(sz);
+//    SetMinSize(sz);

     SetSize(sz);
 
     if (this->HasFlag(wxCP_NO_TLW_RESIZE))
     SetSize(sz);
 
     if (this->HasFlag(wxCP_NO_TLW_RESIZE))