Added wxDataViewListIndexModel::Reset(), clarified and corrected wxDataViewModel...

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

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index 6f3cd078520ecb7f47948fc99a4f061746d05fc2..09aa1e08b063e3c5ae23e07a80e2efa14cd486c4 100644 (file)
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -12,14 +12,12 @@
 #ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_
 #define _WX_COLLAPSABLE_PANE_H_GENERIC_
 
-#if wxUSE_BUTTON && wxUSE_STATLINE
-
 // forward declared
-class WXDLLEXPORT wxButton;
-class WXDLLEXPORT wxStaticLine;
-
-// class name
-extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];
+class WXDLLIMPEXP_FWD_CORE wxButton;
+class WXDLLIMPEXP_FWD_CORE wxStaticLine;
+#ifdef __WXMAC__
+class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle;
+#endif
 
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
@@ -87,7 +85,11 @@ protected:
     int GetBorder() const;
 
     // child controls
+#ifdef __WXMAC__
+    wxDisclosureTriangle *m_pButton;
+#else
     wxButton *m_pButton;
+#endif
     wxStaticLine *m_pStaticLine;
     wxWindow *m_pPane;
     wxSizer *m_sz;
@@ -104,5 +106,4 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#endif // wxUSE_BUTTON && wxUSE_STATLINE
 #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_