X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68b1c87866119e78971b11d60a46b8e7e973ef80..9bd5c5fcda3fe2222bf37f1615961516d6b40e7f:/include/wx/generic/collpaneg.h

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index 01a782ae12..4ee8cafcf8 100644
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -15,7 +15,7 @@
 // forward declared
 class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxStaticLine;
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
 class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle;
 #endif
 
@@ -25,7 +25,8 @@ class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle;
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGenericCollapsiblePane : public wxCollapsiblePaneBase
+class WXDLLIMPEXP_CORE wxGenericCollapsiblePane :
+    public wxNavigationEnabled<wxCollapsiblePaneBase>
 {
 public:
     wxGenericCollapsiblePane() { Init(); }
@@ -68,6 +69,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);
 
@@ -79,7 +85,7 @@ protected:
     int GetBorder() const;
 
     // child controls
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
     wxDisclosureTriangle *m_pButton;
 #else
     wxButton *m_pButton;
@@ -98,7 +104,6 @@ private:
     void OnButton(wxCommandEvent &ev);
     void OnSize(wxSizeEvent &ev);
 
-    WX_DECLARE_CONTROL_CONTAINER();
     DECLARE_DYNAMIC_CLASS(wxGenericCollapsiblePane)
     DECLARE_EVENT_TABLE()
 };