Allow OS X Cocoa (or any OS X port) to override GetBestSize and provide a native...

[wxWidgets.git] / include / wx / generic / collpaneg.h

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index 01a782ae129facf6699d3d08aad8370d5df6e601..b25c39db4ec9b8d6cb832431838fc9413f76db08 100644 (file)
--- 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;
 // 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
 
 class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle;
 #endif
 


@@ -68,6 +68,11 @@ public:
 
     virtual bool Layout();
 
 
     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);
 
     // implementation only, don't use
     void OnStateChange(const wxSize& sizeNew);
 


@@ -79,7 +84,7 @@ protected:
     int GetBorder() const;
 
     // child controls
     int GetBorder() const;
 
     // child controls

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

     wxDisclosureTriangle *m_pButton;
 #else
     wxButton *m_pButton;
     wxDisclosureTriangle *m_pButton;
 #else
     wxButton *m_pButton;