[ 1823588 ] gtk filedlg - droping support for gtk 2.2

[wxWidgets.git] / include / wx / gtk / collpane.h

diff --git a/include/wx/gtk/collpane.h b/include/wx/gtk/collpane.h
index b5455c37d9cde3269a28407a419d338d9d29e573..563ad8f3df4739f3efa34b8305d91ba124a4478f 100644 (file)
--- a/include/wx/gtk/collpane.h
+++ b/include/wx/gtk/collpane.h
@@ -14,13 +14,11 @@
 
 #include "wx/generic/collpaneg.h"
 
 
 #include "wx/generic/collpaneg.h"
 

-extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxCollapsiblePaneNameStr[];
-

 // ----------------------------------------------------------------------------
 // wxCollapsiblePane
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxCollapsiblePane
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_ADV wxCollapsiblePane : public wxGenericCollapsiblePane
+class WXDLLIMPEXP_CORE wxCollapsiblePane : public wxGenericCollapsiblePane

 {
 public:
     wxCollapsiblePane() { Init(); }
 {
 public:
     wxCollapsiblePane() { Init(); }


@@ -30,7 +28,7 @@ public:
                         const wxString& label,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         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)
     {
                         const wxValidator& val = wxDefaultValidator,
                         const wxString& name = wxCollapsiblePaneNameStr)
     {


@@ -49,29 +47,26 @@ public:
                 const wxString& label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 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);
 
                 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 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
 
 public:     // used by GTK callbacks

-

     bool m_bIgnoreNextChange;
     wxSize m_szCollapsed;
 
 private:
     bool m_bIgnoreNextChange;
     wxSize m_szCollapsed;
 
 private:

+    void OnSize(wxSizeEvent&);
+

     DECLARE_DYNAMIC_CLASS(wxCollapsiblePane)
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_DYNAMIC_CLASS(wxCollapsiblePane)
     DECLARE_EVENT_TABLE()
 };
 

-
-#endif
-    // _WX_COLLAPSABLE_PANEL_H_GTK_
+#endif // _WX_COLLAPSABLE_PANEL_H_GTK_