X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/generic/collpaneg.h diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h index 9249aec213..b25c39db4e 100644 --- a/include/wx/generic/collpaneg.h +++ b/include/wx/generic/collpaneg.h @@ -15,9 +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 -// class name -extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[]; +#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, @@ -74,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); @@ -85,7 +84,11 @@ protected: int GetBorder() const; // child controls +#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) + wxDisclosureTriangle *m_pButton; +#else wxButton *m_pButton; +#endif wxStaticLine *m_pStaticLine; wxWindow *m_pPane; wxSizer *m_sz; @@ -94,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() };