From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 28 Jul 2005 23:23:27 +0000 (+0000)
Subject: missing dll decl stuff and members initialization in ctor (patch 1211900)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e9333003ea622fe35d219dd313f61b45c9ba116a?hp=86110e1a1917b01b23f5ac7fc0f4270f6d27a188

missing dll decl stuff and members initialization in ctor (patch 1211900)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/contrib/include/wx/foldbar/captionbar.h b/contrib/include/wx/foldbar/captionbar.h
index 6ca93af411..0d276337ea 100644
--- a/contrib/include/wx/foldbar/captionbar.h
+++ b/contrib/include/wx/foldbar/captionbar.h
@@ -52,7 +52,7 @@ enum
     applied to the wxCaptionBar in question, meaning it will be created using the default internals. When setting i.e
     the color, font or panel style, these styles become active to be used.
 */
-class wxCaptionBarStyle
+class WXDLLIMPEXP_FOLDBAR wxCaptionBarStyle
 {
 private:
     // boolean flags for default transparency on styles
diff --git a/contrib/include/wx/foldbar/foldpanelbar.h b/contrib/include/wx/foldbar/foldpanelbar.h
index a1363eb2a8..68e70ec185 100644
--- a/contrib/include/wx/foldbar/foldpanelbar.h
+++ b/contrib/include/wx/foldbar/foldpanelbar.h
@@ -87,7 +87,7 @@ public:
 };
 
 #include <wx/dynarray.h>
-WX_DEFINE_ARRAY_PTR(wxFoldPanelItem *, wxFoldPanelItemArray);
+WX_DEFINE_ARRAY_WITH_DECL_PTR(wxFoldPanelItem *, wxFoldPanelItemArray, class WXDLLIMPEXP_FOLDBAR);
 
 /** \class wxFoldPanelBar
     The wxFoldPanelBar is a class which can maintain a list of collapsable panels. Once a panel is collapsed, only
@@ -105,7 +105,7 @@ WX_DEFINE_ARRAY_PTR(wxFoldPanelItem *, wxFoldPanelItemArray);
 class WXDLLIMPEXP_FOLDBAR wxFoldPanelBar: public wxPanel
 {
 private:
-    DECLARE_CLASS( wxFoldPanelBar )
+    DECLARE_DYNAMIC_CLASS( wxFoldPanelBar )
     DECLARE_EVENT_TABLE()
 
     wxImageList *m_images;
diff --git a/contrib/include/wx/foldbar/foldpanelitem.h b/contrib/include/wx/foldbar/foldpanelitem.h
index 39bbe02435..2b8d490e3a 100644
--- a/contrib/include/wx/foldbar/foldpanelitem.h
+++ b/contrib/include/wx/foldbar/foldpanelitem.h
@@ -146,7 +146,7 @@ public:
 };
 
 #include <wx/dynarray.h>
-WX_DECLARE_OBJARRAY(wxFoldWindowItem, wxFoldWindowItemArray);
+WX_DECLARE_OBJARRAY_WITH_DECL(wxFoldWindowItem, wxFoldWindowItemArray, class WXDLLIMPEXP_FOLDBAR);
 
 #ifndef _NO_DOXYGEN_
 
diff --git a/contrib/src/foldbar/foldpanelbar.cpp b/contrib/src/foldbar/foldpanelbar.cpp
index c4870c8827..17ce202366 100644
--- a/contrib/src/foldbar/foldpanelbar.cpp
+++ b/contrib/src/foldbar/foldpanelbar.cpp
@@ -30,7 +30,7 @@
 // wxFoldPanelBar
 //----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS( wxFoldPanelBar, wxPanel )
+IMPLEMENT_DYNAMIC_CLASS( wxFoldPanelBar, wxPanel )
 
 BEGIN_EVENT_TABLE(wxFoldPanelBar,wxPanel)
     EVT_SIZE(wxFoldPanelBar::OnSizePanel)
@@ -39,13 +39,18 @@ BEGIN_EVENT_TABLE(wxFoldPanelBar,wxPanel)
 END_EVENT_TABLE()
 
 wxFoldPanelBar::wxFoldPanelBar()
+    : wxPanel()
+    , m_foldPanel(NULL)
+    , m_bottomPanel(NULL)
+    , m_controlCreated(false)
 {
 
 }
 
 wxFoldPanelBar::wxFoldPanelBar( wxWindow *parent, wxWindowID id, const wxPoint &position,
                                 const wxSize& size, long style, long extraStyle)
-    : m_foldPanel(NULL)
+    : wxPanel()
+    , m_foldPanel(NULL)
     , m_bottomPanel(NULL)
     , m_controlCreated(false)
 {