X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abbe3d379e8de94a99e6f7886bd9369669bc65cd..7e1f1a13289c49100d011559e8bdc47d9c92024d:/include/wx/generic/collpaneg.h

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index 843b8d6dc2..daaea636fe 100644
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -12,19 +12,21 @@
 #ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_
 #define _WX_COLLAPSABLE_PANE_H_GENERIC_
 
+#if wxUSE_BUTTON && wxUSE_STATLINE
+
 // forward declared
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxStaticLine;
 
 // class name
-extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGenericCollapsiblePaneNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxGenericCollapsiblePaneNameStr[];
 
 
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxGenericCollapsiblePane : public wxCollapsiblePaneBase
+class WXDLLIMPEXP_CORE wxGenericCollapsiblePane : public wxCollapsiblePaneBase
 {
 public:
     wxGenericCollapsiblePane() { Init(); }
@@ -46,10 +48,13 @@ public:
     void Init()
     {
         m_pButton = NULL;
-        m_pStatLine = NULL;
         m_pPane = NULL;
+        m_pStaticLine = NULL;
+        m_sz = NULL;
     }
 
+    ~wxGenericCollapsiblePane();
+
     bool Create(wxWindow *parent,
                 wxWindowID winid,
                 const wxString& label,
@@ -78,17 +83,16 @@ public:
 protected:
     // overridden methods
     virtual wxSize DoGetBestSize() const;
-
-    // internal helpers
-    void LayoutChildren();
+    bool Layout();
 
     wxString GetBtnLabel() const;
-
+    int GetBorder() const;
 
     // child controls
     wxButton *m_pButton;
-    wxStaticLine *m_pStatLine;
+    wxStaticLine *m_pStaticLine;
     wxWindow *m_pPane;
+    wxSizer *m_sz;
 
     // the button label without ">>" or "<<"
     wxString m_strLabel;
@@ -102,5 +106,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
+#endif // wxUSE_BUTTON && wxUSE_STATLINE
+
 
 #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_