added support for user-defined types to wxConfig (patch 1753875)

[wxWidgets.git] / include / wx / generic / collpaneg.h

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index c8466c690d58d2481042cc336ac6effe0d9a2dce..9249aec213f67b788f9f0f1ec2cd5f5ec58f65df 100644 (file)
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -12,21 +12,18 @@
 #ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_
 #define _WX_COLLAPSABLE_PANE_H_GENERIC_
 
 #ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_
 #define _WX_COLLAPSABLE_PANE_H_GENERIC_
 

-#if wxUSE_BUTTON && wxUSE_STATLINE
-

 // forward declared
 // forward declared

-class WXDLLEXPORT wxButton;
-class WXDLLEXPORT wxStaticLine;
+class WXDLLIMPEXP_FWD_CORE wxButton;
+class WXDLLIMPEXP_FWD_CORE wxStaticLine;

 
 // class name
 
 // class name

-extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGenericCollapsiblePaneNameStr[];
-
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
 

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

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


@@ -36,9 +33,9 @@ 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 wxValidator& val = wxDefaultValidator,

-                        const wxString& name = wxGenericCollapsiblePaneNameStr)
+                        const wxString& name = wxCollapsiblePaneNameStr)

     {
         Init();
 
     {
         Init();
 


@@ -48,19 +45,21 @@ public:
     void Init()
     {
         m_pButton = NULL;
     void Init()
     {
         m_pButton = NULL;

-        m_pStatLine = NULL;

         m_pPane = NULL;
         m_pPane = NULL;

+        m_pStaticLine = NULL;
+        m_sz = NULL;

     }
 
     }
 

+    ~wxGenericCollapsiblePane();
+

     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 wxValidator& val = wxDefaultValidator,

-                const wxString& name = wxGenericCollapsiblePaneNameStr);
-
+                const wxString& name = wxCollapsiblePaneNameStr);

 
     // public wxCollapsiblePane API
     virtual void Collapse(bool collapse = true);
 
     // public wxCollapsiblePane API
     virtual void Collapse(bool collapse = true);


@@ -73,6 +72,7 @@ public:
     virtual wxString GetLabel() const
         { return m_strLabel; }
 
     virtual wxString GetLabel() const
         { return m_strLabel; }
 

+    virtual bool Layout();

 
     // implementation only, don't use
     void OnStateChange(const wxSize& sizeNew);
 
     // implementation only, don't use
     void OnStateChange(const wxSize& sizeNew);


@@ -81,16 +81,14 @@ protected:
     // overridden methods
     virtual wxSize DoGetBestSize() const;
 
     // overridden methods
     virtual wxSize DoGetBestSize() const;
 

-    // internal helpers
-    void LayoutChildren();
-

     wxString GetBtnLabel() const;
     wxString GetBtnLabel() const;

-
+    int GetBorder() const;

 
     // child controls
     wxButton *m_pButton;
 
     // child controls
     wxButton *m_pButton;

-    wxStaticLine *m_pStatLine;
+    wxStaticLine *m_pStaticLine;

     wxWindow *m_pPane;
     wxWindow *m_pPane;

+    wxSizer *m_sz;

 
     // the button label without ">>" or "<<"
     wxString m_strLabel;
 
     // the button label without ">>" or "<<"
     wxString m_strLabel;


@@ -104,7 +102,4 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-#endif // wxUSE_BUTTON && wxUSE_STATLINE
-
-

 #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_
 #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_