No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk/collpane.h b/include/wx/gtk/collpane.h
index b5455c37d9cde3269a28407a419d338d9d29e573..7503b8e1b23f39db529a6a27fa64df5cb051aa83 100644 (file)
--- a/include/wx/gtk/collpane.h
+++ b/include/wx/gtk/collpane.h
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     8/10/2006
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     8/10/2006

-// RCS-ID:      $Id$

 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,15 +11,11 @@
 #ifndef _WX_COLLAPSABLE_PANEL_H_GTK_
 #define _WX_COLLAPSABLE_PANEL_H_GTK_
 
 #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
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxCollapsiblePane
 // ----------------------------------------------------------------------------
 

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

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


@@ -30,7 +25,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)
     {


@@ -39,39 +34,46 @@ public:
         Create(parent, winid, label, pos, size, style, val, name);
     }
 
         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,
     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);
 
                 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
 
 public:     // used by GTK callbacks

-

     bool m_bIgnoreNextChange;
     wxSize m_szCollapsed;
 
     bool m_bIgnoreNextChange;
     wxSize m_szCollapsed;
 

+    wxWindow *m_pPane;
+
+    // the button label without ">>" or "<<"
+    wxString m_strLabel;
+

 private:
 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()
 };
 
     DECLARE_DYNAMIC_CLASS(wxCollapsiblePane)
     DECLARE_EVENT_TABLE()
 };
 

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