X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c6fa82663b728ef9771caad39cff1c6b3da170c..6798451bb28561eb2e903ff43a9fa572824145a2:/include/wx/generic/collpaneg.h

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index daaea636fe..9249aec213 100644
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -12,15 +12,12 @@
 #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 WXDLLIMPEXP_FWD_CORE wxButton;
+class WXDLLIMPEXP_FWD_CORE wxStaticLine;
 
 // class name
-extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxGenericCollapsiblePaneNameStr[];
-
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
@@ -36,9 +33,9 @@ public:
                         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 = wxGenericCollapsiblePaneNameStr)
+                        const wxString& name = wxCollapsiblePaneNameStr)
     {
         Init();
 
@@ -60,10 +57,9 @@ public:
                 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 = wxGenericCollapsiblePaneNameStr);
-
+                const wxString& name = wxCollapsiblePaneNameStr);
 
     // public wxCollapsiblePane API
     virtual void Collapse(bool collapse = true);
@@ -76,6 +72,7 @@ public:
     virtual wxString GetLabel() const
         { return m_strLabel; }
 
+    virtual bool Layout();
 
     // implementation only, don't use
     void OnStateChange(const wxSize& sizeNew);
@@ -83,7 +80,6 @@ public:
 protected:
     // overridden methods
     virtual wxSize DoGetBestSize() const;
-    bool Layout();
 
     wxString GetBtnLabel() const;
     int GetBorder() const;
@@ -106,7 +102,4 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#endif // wxUSE_BUTTON && wxUSE_STATLINE
-
-
 #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_