diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index 09aa1e08b0..01a782ae12 100644
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -19,6 +19,8 @@ class WXDLLIMPEXP_FWD_CORE wxStaticLine;
 class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle;
 #endif
 
+#include "wx/containr.h"
+
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
@@ -42,15 +44,7 @@ public:
         Create(parent, winid, label, pos, size, style, val, name);
     }
 
-    void Init()
-    {
-        m_pButton = NULL;
-        m_pPane = NULL;
-        m_pStaticLine = NULL;
-        m_sz = NULL;
-    }
-
-    ~wxGenericCollapsiblePane();
+    virtual ~wxGenericCollapsiblePane();
 
     bool Create(wxWindow *parent,
                 wxWindowID winid,
@@ -98,10 +92,13 @@ protected:
     wxString m_strLabel;
 
 private:
+    void Init();
+
     // event handlers
     void OnButton(wxCommandEvent &ev);
     void OnSize(wxSizeEvent &ev);
 
+    WX_DECLARE_CONTROL_CONTAINER();
     DECLARE_DYNAMIC_CLASS(wxGenericCollapsiblePane)
     DECLARE_EVENT_TABLE()
 };
diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index db24dbd952..ac01c8942c 100644
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -52,8 +52,21 @@ 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()
 
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxGenericCollapsiblePane, wxControl)
+
+void wxGenericCollapsiblePane::Init()
+{
+    WX_INIT_CONTROL_CONTAINER();
+
+    m_pButton = NULL;
+    m_pPane = NULL;
+    m_pStaticLine = NULL;
+    m_sz = NULL;
+}
 
 bool wxGenericCollapsiblePane::Create(wxWindow *parent,
                                       wxWindowID id,