Change the factory constructor to not use a predefined wxMBConv object as it

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

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index 0e2b0f4915dcc8de8133c1a5d816ea9a76c3a917..e8fd85a06ee53ab58069a49c9b7791bf402efebb 100644 (file)
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -19,14 +19,14 @@ class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxStaticLine;
 
 // class name
-extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGenericCollapsiblePaneNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];
 
 
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxGenericCollapsiblePane : public wxCollapsiblePaneBase
+class WXDLLIMPEXP_CORE wxGenericCollapsiblePane : public wxCollapsiblePaneBase
 {
 public:
     wxGenericCollapsiblePane() { Init(); }
@@ -36,9 +36,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,9 +60,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