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 6ca93af411e72ff6eab6229ed9896ab3fb5f37d8..0d276337ea25a58361ff43ed9ac9f1963e52ada1 100644 (file)
--- 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.
 */
     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
 {
 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 a1363eb2a8382067bec1df6023da8500b98d15f4..68e70ec18552b4881ba1f27f371fce1a923b42b9 100644 (file)
--- a/contrib/include/wx/foldbar/foldpanelbar.h
+++ b/contrib/include/wx/foldbar/foldpanelbar.h
@@ -87,7 +87,7 @@ public:
 };
 
 #include <wx/dynarray.h>
 };
 
 #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
 
 /** \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:
 class WXDLLIMPEXP_FOLDBAR wxFoldPanelBar: public wxPanel
 {
 private:

-    DECLARE_CLASS( wxFoldPanelBar )
+    DECLARE_DYNAMIC_CLASS( wxFoldPanelBar )

     DECLARE_EVENT_TABLE()
 
     wxImageList *m_images;
     DECLARE_EVENT_TABLE()
 
     wxImageList *m_images;

diff --git a/contrib/include/wx/foldbar/foldpanelitem.h b/contrib/include/wx/foldbar/foldpanelitem.h
index 39bbe024350016c0526e1453cb197f051898fabc..2b8d490e3ac78c67c900dafe79dc63b8ca956327 100644 (file)
--- a/contrib/include/wx/foldbar/foldpanelitem.h
+++ b/contrib/include/wx/foldbar/foldpanelitem.h
@@ -146,7 +146,7 @@ public:
 };
 
 #include <wx/dynarray.h>
 };
 
 #include <wx/dynarray.h>

-WX_DECLARE_OBJARRAY(wxFoldWindowItem, wxFoldWindowItemArray);
+WX_DECLARE_OBJARRAY_WITH_DECL(wxFoldWindowItem, wxFoldWindowItemArray, class WXDLLIMPEXP_FOLDBAR);

 
 #ifndef _NO_DOXYGEN_
 
 
 #ifndef _NO_DOXYGEN_
 

diff --git a/contrib/src/foldbar/foldpanelbar.cpp b/contrib/src/foldbar/foldpanelbar.cpp
index c4870c882740c72b040836ac2f275ece231d3ca5..17ce2023663c4342f5de6c6fddc2c638abdf88e0 100644 (file)
--- a/contrib/src/foldbar/foldpanelbar.cpp
+++ b/contrib/src/foldbar/foldpanelbar.cpp
@@ -30,7 +30,7 @@
 // wxFoldPanelBar
 //----------------------------------------------------------------------------
 
 // wxFoldPanelBar
 //----------------------------------------------------------------------------
 

-IMPLEMENT_CLASS( wxFoldPanelBar, wxPanel )
+IMPLEMENT_DYNAMIC_CLASS( wxFoldPanelBar, wxPanel )

 
 BEGIN_EVENT_TABLE(wxFoldPanelBar,wxPanel)
     EVT_SIZE(wxFoldPanelBar::OnSizePanel)
 
 BEGIN_EVENT_TABLE(wxFoldPanelBar,wxPanel)
     EVT_SIZE(wxFoldPanelBar::OnSizePanel)


@@ -39,13 +39,18 @@ BEGIN_EVENT_TABLE(wxFoldPanelBar,wxPanel)
 END_EVENT_TABLE()
 
 wxFoldPanelBar::wxFoldPanelBar()
 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)
 {
 
 }
 
 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)
 {
     , m_bottomPanel(NULL)
     , m_controlCreated(false)
 {