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

define (empty) ~wxDataObject everywhere: apparently it's needed for AIX and not only Darwin

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-11-25 01:51:04 +00:00
parent 14ee3dc323
commit 866a1da2da
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/dataobj.h
View File

@@ -22,10 +22,8 @@ class wxDataObject : public wxDataObjectBase
{ {
public: public:
wxDataObject(); wxDataObject();
#ifdef __DARWIN__ virtual ~wxDataObject();
virtual ~wxDataObject() { }
#endif
virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;
}; };

6
include/wx/gtk1/dataobj.h
View File

@@ -22,10 +22,8 @@ class wxDataObject : public wxDataObjectBase
{ {
public: public:
wxDataObject(); wxDataObject();
#ifdef __DARWIN__ virtual ~wxDataObject();
virtual ~wxDataObject() { }
#endif
virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;
}; };

5
src/gtk/dataobj.cpp
View File

@@ -158,6 +158,11 @@ wxDataObject::wxDataObject()
{ {
} }
wxDataObject::~wxDataObject()
{
// dtor is empty but needed for Darwin and AIX -- otherwise it doesn't link
}
bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
{ {
size_t nFormatCount = GetFormatCount(dir); size_t nFormatCount = GetFormatCount(dir);

5
src/gtk1/dataobj.cpp
View File

@@ -158,6 +158,11 @@ wxDataObject::wxDataObject()
{ {
} }
wxDataObject::~wxDataObject()
{
// dtor is empty but needed for Darwin and AIX -- otherwise it doesn't link
}
bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
{ {
size_t nFormatCount = GetFormatCount(dir); size_t nFormatCount = GetFormatCount(dir);