Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-10-10 19:44:26 +00:00
parent b1ab476240
commit d350fbec22
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/dataview.h
View File

@@ -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: public:
wxDataViewIndexListModel( unsigned int initial_size = 0 ); wxDataViewIndexListModel( unsigned int initial_size = 0 );
@@ -331,7 +332,7 @@ protected:
// wxDataViewIconText // wxDataViewIconText
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxDataViewIconText: public wxObject class WXDLLIMPEXP_ADV wxDataViewIconText: public wxObject
{ {
public: public:
wxDataViewIconText( const wxString &text = wxEmptyString, const wxIcon& icon = wxNullIcon ) 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

27
include/wx/gtk/dataview.h
View File

@@ -19,15 +19,15 @@
// classes // classes
// --------------------------------------------------------- // ---------------------------------------------------------
class WXDLLIMPEXP_FWD_CORE wxDataViewCtrl; class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
class WXDLLIMPEXP_FWD_CORE wxDataViewCtrlInternal; class WXDLLIMPEXP_FWD_ADV wxDataViewCtrlInternal;
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewRenderer // wxDataViewRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class wxDataViewRenderer: public wxDataViewRendererBase class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewRendererBase
{ {
public: public:
wxDataViewRenderer( const wxString &varianttype, wxDataViewRenderer( const wxString &varianttype,
@@ -55,7 +55,7 @@ protected:
// wxDataViewTextRenderer // wxDataViewTextRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class wxDataViewTextRenderer: public wxDataViewRenderer class WXDLLIMPEXP_ADV wxDataViewTextRenderer: public wxDataViewRenderer
{ {
public: public:
wxDataViewTextRenderer( const wxString &varianttype = wxT("string"), wxDataViewTextRenderer( const wxString &varianttype = wxT("string"),
@@ -75,7 +75,7 @@ protected:
// wxDataViewBitmapRenderer // wxDataViewBitmapRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class wxDataViewBitmapRenderer: public wxDataViewRenderer class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewRenderer
{ {
public: public:
wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"), wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"),
@@ -93,7 +93,7 @@ protected:
// wxDataViewToggleRenderer // wxDataViewToggleRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class wxDataViewToggleRenderer: public wxDataViewRenderer class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer
{ {
public: public:
wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"), wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"),
@@ -111,7 +111,7 @@ protected:
// wxDataViewCustomRenderer // wxDataViewCustomRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class wxDataViewCustomRenderer: public wxDataViewRenderer class WXDLLIMPEXP_ADV wxDataViewCustomRenderer: public wxDataViewRenderer
{ {
public: public:
wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"), wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"),
@@ -157,7 +157,7 @@ protected:
// wxDataViewProgressRenderer // wxDataViewProgressRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class wxDataViewProgressRenderer: public wxDataViewCustomRenderer class WXDLLIMPEXP_ADV wxDataViewProgressRenderer: public wxDataViewCustomRenderer
{ {
public: public:
wxDataViewProgressRenderer( const wxString &label = wxEmptyString, wxDataViewProgressRenderer( const wxString &label = wxEmptyString,
@@ -184,7 +184,7 @@ protected:
// wxDataViewIconTextRenderer // wxDataViewIconTextRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class wxDataViewIconTextRenderer: public wxDataViewCustomRenderer class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
{ {
public: public:
wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"), wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"),
@@ -213,7 +213,7 @@ protected:
// wxDataViewDateRenderer // wxDataViewDateRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class wxDataViewDateRenderer: public wxDataViewCustomRenderer class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewCustomRenderer
{ {
public: public:
wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"), 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: public:
wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer, 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: public:
wxDataViewCtrl() wxDataViewCtrl()

2
src/common/datavcmn.cpp
View File

@@ -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)
{ {