X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93076559ba3b3af103ea94802dcdb4f9e80fa66e..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/gtk/collpane.h?ds=sidebyside

diff --git a/include/wx/gtk/collpane.h b/include/wx/gtk/collpane.h
index b5455c37d9..563ad8f3df 100644
--- a/include/wx/gtk/collpane.h
+++ b/include/wx/gtk/collpane.h
@@ -14,13 +14,11 @@
 
 #include "wx/generic/collpaneg.h"
 
-extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxCollapsiblePaneNameStr[];
-
 // ----------------------------------------------------------------------------
 // wxCollapsiblePane
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxCollapsiblePane : public wxGenericCollapsiblePane
+class WXDLLIMPEXP_CORE wxCollapsiblePane : public wxGenericCollapsiblePane
 {
 public:
     wxCollapsiblePane() { Init(); }
@@ -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_