From 866a1da2da73c8ec3d055140252bd16b7242bd88 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 25 Nov 2002 01:51:04 +0000 Subject: [PATCH] define (empty) ~wxDataObject everywhere: apparently it's needed for AIX and not only Darwin git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/dataobj.h | 6 ++---- include/wx/gtk1/dataobj.h | 6 ++---- src/gtk/dataobj.cpp | 5 +++++ src/gtk1/dataobj.cpp | 5 +++++ 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/include/wx/gtk/dataobj.h b/include/wx/gtk/dataobj.h index 019d5f657f..52ea20c7bd 100644 --- a/include/wx/gtk/dataobj.h +++ b/include/wx/gtk/dataobj.h @@ -22,10 +22,8 @@ class wxDataObject : public wxDataObjectBase { public: wxDataObject(); -#ifdef __DARWIN__ - virtual ~wxDataObject() { } -#endif - + virtual ~wxDataObject(); + virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; }; diff --git a/include/wx/gtk1/dataobj.h b/include/wx/gtk1/dataobj.h index 019d5f657f..52ea20c7bd 100644 --- a/include/wx/gtk1/dataobj.h +++ b/include/wx/gtk1/dataobj.h @@ -22,10 +22,8 @@ class wxDataObject : public wxDataObjectBase { public: wxDataObject(); -#ifdef __DARWIN__ - virtual ~wxDataObject() { } -#endif - + virtual ~wxDataObject(); + virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; }; diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index ca8fb4dbd6..2b0f4f43ae 100644 --- a/src/gtk/dataobj.cpp +++ b/src/gtk/dataobj.cpp @@ -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 { size_t nFormatCount = GetFormatCount(dir); diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp index ca8fb4dbd6..2b0f4f43ae 100644 --- a/src/gtk1/dataobj.cpp +++ b/src/gtk1/dataobj.cpp @@ -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 { size_t nFormatCount = GetFormatCount(dir);