compilation fixed for wxDataViewCtrl: almost no class was properly exported in wxGTK...

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 261bb63cc7b02c2abafa6fab50a2a9a6382f40a0..ce1ea6e74d4bf95b3ae86f5e3c901186849a021e 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -118,7 +118,8 @@ private:
 // wxDataViewModel
 // ---------------------------------------------------------
 
 // wxDataViewModel
 // ---------------------------------------------------------
 

-WX_DECLARE_LIST(wxDataViewModelNotifier, wxDataViewModelNotifiers );
+WX_DECLARE_LIST_WITH_DECL(wxDataViewModelNotifier, wxDataViewModelNotifiers,
+                          class WXDLLIMPEXP_ADV);

 
 class WXDLLIMPEXP_ADV wxDataViewModel: public wxObjectRefData
 {
 
 class WXDLLIMPEXP_ADV wxDataViewModel: public wxObjectRefData
 {


@@ -175,7 +176,7 @@ protected:
 // wxDataViewIndexListModel
 // ---------------------------------------------------------
 
 // wxDataViewIndexListModel
 // ---------------------------------------------------------
 

-class wxDataViewIndexListModel: public wxDataViewModel
+class WXDLLIMPEXP_ADV wxDataViewIndexListModel: public wxDataViewModel

 {
 public:
     wxDataViewIndexListModel( unsigned int initial_size = 0 );
 {
 public:
     wxDataViewIndexListModel( unsigned int initial_size = 0 );


@@ -331,7 +332,7 @@ protected:
 // wxDataViewIconText
 //-----------------------------------------------------------------------------
 
 // wxDataViewIconText
 //-----------------------------------------------------------------------------
 

-class wxDataViewIconText: public wxObject
+class WXDLLIMPEXP_ADV wxDataViewIconText: public wxObject

 {
 public:
     wxDataViewIconText( const wxString &text = wxEmptyString, const wxIcon& icon = wxNullIcon )
 {
 public:
     wxDataViewIconText( const wxString &text = wxEmptyString, const wxIcon& icon = wxNullIcon )


@@ -354,7 +355,7 @@ private:
 
 bool operator == (const wxDataViewIconText &one, const wxDataViewIconText &two);
 
 
 bool operator == (const wxDataViewIconText &one, const wxDataViewIconText &two);
 

-DECLARE_VARIANT_OBJECT(wxDataViewIconText)
+DECLARE_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV)

 
 // ---------------------------------------------------------
 // wxDataViewColumnBase
 
 // ---------------------------------------------------------
 // wxDataViewColumnBase

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index bbb7f6b7e8245dd8db1fb483b4c5eab499947da0..8a3ac99e4803558aa71ab96f37f819d992cba664 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -19,15 +19,15 @@
 // classes
 // --------------------------------------------------------- 
 
 // classes
 // --------------------------------------------------------- 
 

-class WXDLLIMPEXP_FWD_CORE wxDataViewCtrl;
-class WXDLLIMPEXP_FWD_CORE wxDataViewCtrlInternal;
+class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
+class WXDLLIMPEXP_FWD_ADV wxDataViewCtrlInternal;

 
 
 // --------------------------------------------------------- 
 // wxDataViewRenderer
 // --------------------------------------------------------- 
 
 
 
 // --------------------------------------------------------- 
 // wxDataViewRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewRenderer: public wxDataViewRendererBase
+class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewRendererBase

 {
 public:
     wxDataViewRenderer( const wxString &varianttype, 
 {
 public:
     wxDataViewRenderer( const wxString &varianttype, 


@@ -55,7 +55,7 @@ protected:
 // wxDataViewTextRenderer
 // --------------------------------------------------------- 
 
 // wxDataViewTextRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewTextRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewTextRenderer: public wxDataViewRenderer

 {
 public:
     wxDataViewTextRenderer( const wxString &varianttype = wxT("string"), 
 {
 public:
     wxDataViewTextRenderer( const wxString &varianttype = wxT("string"), 


@@ -75,7 +75,7 @@ protected:
 // wxDataViewBitmapRenderer
 // --------------------------------------------------------- 
 
 // wxDataViewBitmapRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewBitmapRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewRenderer

 {
 public:
     wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"), 
 {
 public:
     wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"), 


@@ -93,7 +93,7 @@ protected:
 // wxDataViewToggleRenderer
 // --------------------------------------------------------- 
 
 // wxDataViewToggleRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewToggleRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer

 {
 public:
     wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"), 
 {
 public:
     wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"), 


@@ -111,7 +111,7 @@ protected:
 // wxDataViewCustomRenderer
 // --------------------------------------------------------- 
 
 // wxDataViewCustomRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewCustomRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewCustomRenderer: public wxDataViewRenderer

 {
 public:
     wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"), 
 {
 public:
     wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"), 


@@ -157,7 +157,7 @@ protected:
 // wxDataViewProgressRenderer
 // --------------------------------------------------------- 
 
 // wxDataViewProgressRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewProgressRenderer: public wxDataViewCustomRenderer
+class WXDLLIMPEXP_ADV wxDataViewProgressRenderer: public wxDataViewCustomRenderer

 {
 public:
     wxDataViewProgressRenderer( const wxString &label = wxEmptyString, 
 {
 public:
     wxDataViewProgressRenderer( const wxString &label = wxEmptyString, 


@@ -184,7 +184,7 @@ protected:
 // wxDataViewIconTextRenderer
 // --------------------------------------------------------- 
 
 // wxDataViewIconTextRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
+class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewCustomRenderer

 {
 public:
     wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"), 
 {
 public:
     wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"), 


@@ -213,7 +213,7 @@ protected:
 // wxDataViewDateRenderer
 // --------------------------------------------------------- 
 
 // wxDataViewDateRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewDateRenderer: public wxDataViewCustomRenderer
+class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewCustomRenderer

 {
 public:
     wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"), 
 {
 public:
     wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"), 


@@ -239,7 +239,7 @@ protected:
 // wxDataViewColumn
 // --------------------------------------------------------- 
 
 // wxDataViewColumn
 // --------------------------------------------------------- 
 

-class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
+class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase

 {
 public:
     wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,
 {
 public:
     wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,


@@ -305,13 +305,14 @@ protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
 };
 

-WX_DECLARE_LIST(wxDataViewColumn, wxDataViewColumnList );
+WX_DECLARE_LIST_WITH_DECL(wxDataViewColumn, wxDataViewColumnList,
+                          class WXDLLIMPEXP_ADV);

 
 // --------------------------------------------------------- 
 // wxDataViewCtrl
 // --------------------------------------------------------- 
 
 
 // --------------------------------------------------------- 
 // wxDataViewCtrl
 // --------------------------------------------------------- 
 

-class WXDLLIMPEXP_CORE wxDataViewCtrl: public wxDataViewCtrlBase
+class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase

 {
 public:
     wxDataViewCtrl() 
 {
 public:
     wxDataViewCtrl() 

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 6d99b9684f4893ee41278237682181d96b74601a..bf54efcfda20aa6f54d2993133dd0d7b5c3c89ea 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -404,7 +404,7 @@ unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item,
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewIconText,wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewIconText,wxObject)
 

-IMPLEMENT_VARIANT_OBJECT(wxDataViewIconText)
+IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV)

 
 bool operator == (const wxDataViewIconText &one, const wxDataViewIconText &two)
 {
 
 bool operator == (const wxDataViewIconText &one, const wxDataViewIconText &two)
 {