X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/479228883164516b7678a8e7f96d83efec4c981b..e4c903b2ea42fe104ef50d0ea6028f14d8309dfa:/include/wx/generic/collpaneg.h

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index dd31df6dab..b25c39db4e 100644
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -15,6 +15,11 @@
 // forward declared
 class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxStaticLine;
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
+class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle;
+#endif
+
+#include "wx/containr.h"
 
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
@@ -39,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,
@@ -71,6 +68,11 @@ public:
 
     virtual bool Layout();
 
+
+    // for the generic collapsible pane only:
+    wxControl* GetControlWidget() const
+        { return (wxControl*)m_pButton; }
+
     // implementation only, don't use
     void OnStateChange(const wxSize& sizeNew);
 
@@ -82,7 +84,7 @@ protected:
     int GetBorder() const;
 
     // child controls
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
     wxDisclosureTriangle *m_pButton;
 #else
     wxButton *m_pButton;
@@ -95,10 +97,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()
 };