X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2cbf701441257a130ba79489dcdd37db518cc08e..56c6aab7e6fe6dccd753fd94d07a44ded2ba70d1:/include/wx/generic/collpaneg.h?ds=sidebyside

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index b58bf5a395..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 WXDLLEXPORT_DATA(const wxChar) wxGenericCollapsiblePaneNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxGenericCollapsiblePaneNameStr[];
 
 
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT 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,
@@ -71,20 +76,23 @@ public:
     virtual wxString GetLabel() const
         { return m_strLabel; }
 
-protected: 
+
+    // implementation only, don't use
+    void OnStateChange(const wxSize& sizeNew);
+
+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;
@@ -98,6 +106,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
+#endif // wxUSE_BUTTON && wxUSE_STATLINE
 
-#endif // _WX_COLLAPSABLE_PANE_H_GENERIC_
 
+#endif // _WX_COLLAPSABLE_PANE_H_GENERIC_