Fix install_name_tool calls in OS X "make install".

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

diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index 894345be6b0cf238e9282895450c9467a4004bf2..1dc4e47e6ec88678c827be0817335a2f5bd026e5 100644 (file)
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified By:
 // Created:     8/10/2006
 // Author:      Francesco Montorsi
 // Modified By:
 // Created:     8/10/2006

-// Id:          $Id$

 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -50,23 +49,17 @@ const char wxCollapsiblePaneNameStr[] = "collapsiblePane";
 // wxGenericCollapsiblePane
 //-----------------------------------------------------------------------------
 
 // wxGenericCollapsiblePane
 //-----------------------------------------------------------------------------
 

-wxDEFINE_EVENT( wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent );
+wxDEFINE_EVENT( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEvent );

 IMPLEMENT_DYNAMIC_CLASS(wxGenericCollapsiblePane, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
 
 BEGIN_EVENT_TABLE(wxGenericCollapsiblePane, wxControl)
     EVT_BUTTON(wxID_ANY, wxGenericCollapsiblePane::OnButton)
     EVT_SIZE(wxGenericCollapsiblePane::OnSize)
 IMPLEMENT_DYNAMIC_CLASS(wxGenericCollapsiblePane, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
 
 BEGIN_EVENT_TABLE(wxGenericCollapsiblePane, wxControl)
     EVT_BUTTON(wxID_ANY, wxGenericCollapsiblePane::OnButton)
     EVT_SIZE(wxGenericCollapsiblePane::OnSize)

-
-    WX_EVENT_TABLE_CONTROL_CONTAINER(wxGenericCollapsiblePane)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-WX_DELEGATE_TO_CONTROL_CONTAINER(wxGenericCollapsiblePane, wxControl)
-

 void wxGenericCollapsiblePane::Init()
 {
 void wxGenericCollapsiblePane::Init()
 {

-    WX_INIT_CONTROL_CONTAINER();
-

     m_pButton = NULL;
     m_pPane = NULL;
     m_pStaticLine = NULL;
     m_pButton = NULL;
     m_pPane = NULL;
     m_pStaticLine = NULL;


@@ -168,7 +161,7 @@ void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz)
 
     if (this->HasFlag(wxCP_NO_TLW_RESIZE))
     {
 
     if (this->HasFlag(wxCP_NO_TLW_RESIZE))
     {

-        // the user asked to explicitely handle the resizing itself...
+        // the user asked to explicitly handle the resizing itself...

         return;
     }
 
         return;
     }
 


@@ -196,6 +189,8 @@ void wxGenericCollapsiblePane::Collapse(bool collapse)
     if ( IsCollapsed() == collapse )
         return;
 
     if ( IsCollapsed() == collapse )
         return;
 

+    InvalidateBestSize();
+

     // update our state
     m_pPane->Show(!collapse);
 
     // update our state
     m_pPane->Show(!collapse);