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
This commit is contained in:
Vadim Zeitlin
2005-07-28 23:23:27 +00:00
parent 86110e1a19
commit e9333003ea
4 changed files with 11 additions and 6 deletions

View File

@@ -52,7 +52,7 @@ enum
applied to the wxCaptionBar in question, meaning it will be created using the default internals. When setting i.e 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. the color, font or panel style, these styles become active to be used.
*/ */
class wxCaptionBarStyle class WXDLLIMPEXP_FOLDBAR wxCaptionBarStyle
{ {
private: private:
// boolean flags for default transparency on styles // boolean flags for default transparency on styles

View File

@@ -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 /** \class wxFoldPanelBar
The wxFoldPanelBar is a class which can maintain a list of collapsable panels. Once a panel is collapsed, only 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 class WXDLLIMPEXP_FOLDBAR wxFoldPanelBar: public wxPanel
{ {
private: private:
DECLARE_CLASS( wxFoldPanelBar ) DECLARE_DYNAMIC_CLASS( wxFoldPanelBar )
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
wxImageList *m_images; wxImageList *m_images;

View File

@@ -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_

View File

@@ -30,7 +30,7 @@
// wxFoldPanelBar // wxFoldPanelBar
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
IMPLEMENT_CLASS( wxFoldPanelBar, wxPanel ) IMPLEMENT_DYNAMIC_CLASS( wxFoldPanelBar, wxPanel )
BEGIN_EVENT_TABLE(wxFoldPanelBar,wxPanel) BEGIN_EVENT_TABLE(wxFoldPanelBar,wxPanel)
EVT_SIZE(wxFoldPanelBar::OnSizePanel) EVT_SIZE(wxFoldPanelBar::OnSizePanel)
@@ -39,13 +39,18 @@ BEGIN_EVENT_TABLE(wxFoldPanelBar,wxPanel)
END_EVENT_TABLE() END_EVENT_TABLE()
wxFoldPanelBar::wxFoldPanelBar() wxFoldPanelBar::wxFoldPanelBar()
: wxPanel()
, m_foldPanel(NULL)
, m_bottomPanel(NULL)
, m_controlCreated(false)
{ {
} }
wxFoldPanelBar::wxFoldPanelBar( wxWindow *parent, wxWindowID id, const wxPoint &position, wxFoldPanelBar::wxFoldPanelBar( wxWindow *parent, wxWindowID id, const wxPoint &position,
const wxSize& size, long style, long extraStyle) const wxSize& size, long style, long extraStyle)
: m_foldPanel(NULL) : wxPanel()
, m_foldPanel(NULL)
, m_bottomPanel(NULL) , m_bottomPanel(NULL)
, m_controlCreated(false) , m_controlCreated(false)
{ {