X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/037c7b4c7b6c87c40f3ba966a0c3e91a402b4dfa..8257d7cd478c54532cc7d8fd0ace9faf5e9efb23:/include/wx/generic/collpaneg.h diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h index e8fd85a06e..09aa1e08b0 100644 --- a/include/wx/generic/collpaneg.h +++ b/include/wx/generic/collpaneg.h @@ -12,15 +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 @@ -64,7 +61,6 @@ public: const wxValidator& val = wxDefaultValidator, const wxString& name = wxCollapsiblePaneNameStr); - // public wxCollapsiblePane API virtual void Collapse(bool collapse = true); virtual void SetLabel(const wxString &label); @@ -76,6 +72,7 @@ public: virtual wxString GetLabel() const { return m_strLabel; } + virtual bool Layout(); // implementation only, don't use void OnStateChange(const wxSize& sizeNew); @@ -83,13 +80,16 @@ public: protected: // overridden methods virtual wxSize DoGetBestSize() const; - bool Layout(); wxString GetBtnLabel() const; int GetBorder() const; // child controls +#ifdef __WXMAC__ + wxDisclosureTriangle *m_pButton; +#else wxButton *m_pButton; +#endif wxStaticLine *m_pStaticLine; wxWindow *m_pPane; wxSizer *m_sz; @@ -106,7 +106,4 @@ private: DECLARE_EVENT_TABLE() }; -#endif // wxUSE_BUTTON && wxUSE_STATLINE - - #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_