X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c6fa82663b728ef9771caad39cff1c6b3da170c..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk/collpane.h diff --git a/include/wx/gtk/collpane.h b/include/wx/gtk/collpane.h index 72ece131ed..563ad8f3df 100644 --- a/include/wx/gtk/collpane.h +++ b/include/wx/gtk/collpane.h @@ -14,8 +14,6 @@ #include "wx/generic/collpaneg.h" -extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[]; - // ---------------------------------------------------------------------------- // wxCollapsiblePane // ---------------------------------------------------------------------------- @@ -30,7 +28,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) { @@ -49,29 +47,26 @@ 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); -public: // public API - - wxSize DoGetBestSize() const; void Collapse(bool collapse = true); bool IsCollapsed() const; void SetLabel(const wxString &str); - void OnSize(wxSizeEvent&); +protected: + virtual wxSize DoGetBestSize() const; public: // used by GTK callbacks - bool m_bIgnoreNextChange; wxSize m_szCollapsed; private: + void OnSize(wxSizeEvent&); + DECLARE_DYNAMIC_CLASS(wxCollapsiblePane) DECLARE_EVENT_TABLE() }; - -#endif - // _WX_COLLAPSABLE_PANEL_H_GTK_ +#endif // _WX_COLLAPSABLE_PANEL_H_GTK_