X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93076559ba3b3af103ea94802dcdb4f9e80fa66e..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/gtk/collpane.h?ds=inline diff --git a/include/wx/gtk/collpane.h b/include/wx/gtk/collpane.h index b5455c37d9..f0b6af1ab0 100644 --- a/include/wx/gtk/collpane.h +++ b/include/wx/gtk/collpane.h @@ -12,15 +12,11 @@ #ifndef _WX_COLLAPSABLE_PANEL_H_GTK_ #define _WX_COLLAPSABLE_PANEL_H_GTK_ -#include "wx/generic/collpaneg.h" - -extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxCollapsiblePaneNameStr[]; - // ---------------------------------------------------------------------------- // wxCollapsiblePane // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_ADV wxCollapsiblePane : public wxGenericCollapsiblePane +class WXDLLIMPEXP_CORE wxCollapsiblePane : public wxCollapsiblePaneBase { public: wxCollapsiblePane() { Init(); } @@ -30,7 +26,7 @@ public: const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxTAB_TRAVERSAL | wxNO_BORDER, + long style = wxCP_DEFAULT_STYLE, const wxValidator& val = wxDefaultValidator, const wxString& name = wxCollapsiblePaneNameStr) { @@ -39,39 +35,46 @@ public: Create(parent, winid, label, pos, size, style, val, name); } - void Init() - { - m_bIgnoreNextChange = false; - } - bool Create(wxWindow *parent, wxWindowID winid, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxTAB_TRAVERSAL | wxNO_BORDER, + long style = wxCP_DEFAULT_STYLE, const wxValidator& val = wxDefaultValidator, const wxString& name = wxCollapsiblePaneNameStr); -public: // public API + virtual void Collapse(bool collapse = true); + virtual bool IsCollapsed() const; + virtual void SetLabel(const wxString& str); - wxSize DoGetBestSize() const; - void Collapse(bool collapse = true); - bool IsCollapsed() const; - void SetLabel(const wxString &str); + virtual wxWindow *GetPane() const { return m_pPane; } + virtual wxString GetLabel() const { return m_strLabel; } - void OnSize(wxSizeEvent&); +protected: + virtual wxSize DoGetBestSize() const; public: // used by GTK callbacks - bool m_bIgnoreNextChange; wxSize m_szCollapsed; + wxWindow *m_pPane; + + // the button label without ">>" or "<<" + wxString m_strLabel; + private: + void Init() + { + m_bIgnoreNextChange = false; + } + + void OnSize(wxSizeEvent&); + virtual void AddChildGTK(wxWindowGTK* child); + GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + DECLARE_DYNAMIC_CLASS(wxCollapsiblePane) DECLARE_EVENT_TABLE() }; - -#endif - // _WX_COLLAPSABLE_PANEL_H_GTK_ +#endif // _WX_COLLAPSABLE_PANEL_H_GTK_