Enable the correct code making sure that subwindows will always receive a wxSizeEvent...

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

diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index d347294f26706885465064dc97ffe20e7e7c67c4..25450bf9ce9ec46c0b58a2015b754f6b22756eab 100644 (file)
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -39,13 +39,13 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-const wxChar wxCollapsiblePaneNameStr[] = wxT("collapsiblePane");
+const char wxCollapsiblePaneNameStr[] = "collapsiblePane";

 
 //-----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 //-----------------------------------------------------------------------------
 

-DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLLPANE_CHANGED)
+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)
 


@@ -82,11 +82,11 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
 
     m_strLabel = label;
 
 
     m_strLabel = label;
 

-#ifdef __WXMAC__
+#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;
     // 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(), 
+    m_pButton = new wxDisclosureTriangle( this, wxID_ANY, GetBtnLabel(),

                                          wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER );
     m_pButton->SetBackgroundColour( wxColour( 221, 226, 239 ) );
     m_sz = new wxBoxSizer(wxHORIZONTAL);
                                          wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER );
     m_pButton->SetBackgroundColour( wxColour( 221, 226, 239 ) );
     m_sz = new wxBoxSizer(wxHORIZONTAL);


@@ -112,7 +112,7 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
 
     // do not set sz as our sizers since we handle the pane window without using sizers
     m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
 
     // do not set sz as our sizers since we handle the pane window without using sizers
     m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,

-                          wxTAB_TRAVERSAL|wxNO_BORDER);
+                          wxTAB_TRAVERSAL|wxNO_BORDER, wxT("wxCollapsiblePanePane") );

 
     // start as collapsed:
     m_pPane->Hide();
 
     // start as collapsed:
     m_pPane->Hide();


@@ -124,10 +124,10 @@ wxGenericCollapsiblePane::~wxGenericCollapsiblePane()
 {
     if (m_pButton)
         m_pButton->SetContainingSizer(NULL);
 {
     if (m_pButton)
         m_pButton->SetContainingSizer(NULL);

-    
+

     if (m_pStaticLine)
         m_pStaticLine->SetContainingSizer(NULL);
     if (m_pStaticLine)
         m_pStaticLine->SetContainingSizer(NULL);

-    
+

     // our sizer is not deleted automatically since we didn't use SetSizer()!
     wxDELETE(m_sz);
 }
     // our sizer is not deleted automatically since we didn't use SetSizer()!
     wxDELETE(m_sz);
 }


@@ -160,7 +160,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))


@@ -197,7 +197,7 @@ void wxGenericCollapsiblePane::Collapse(bool collapse)
     m_pPane->Show(!collapse);
 
     // update button label
     m_pPane->Show(!collapse);
 
     // update button label

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)

     m_pButton->SetOpen( !collapse );
 #else
     // NB: this must be done after updating our "state"
     m_pButton->SetOpen( !collapse );
 #else
     // NB: this must be done after updating our "state"