From 1d8729431c8c202bd57aadccf87e0a4777baa055 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Sat, 21 Jul 2001 05:32:09 +0000 Subject: [PATCH] corrections for wxGtk compilation under Darwin/Mac OS X git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/dataobj.h | 5 ++++- include/wx/gtk/popupwin.h | 5 ++++- include/wx/gtk1/dataobj.h | 5 ++++- include/wx/gtk1/popupwin.h | 5 ++++- include/wx/popupwin.h | 3 +++ 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/include/wx/gtk/dataobj.h b/include/wx/gtk/dataobj.h index 0794fcf51f..bd6783c977 100644 --- a/include/wx/gtk/dataobj.h +++ b/include/wx/gtk/dataobj.h @@ -22,7 +22,10 @@ class wxDataObject : public wxDataObjectBase { public: wxDataObject(); - +#ifdef __DARWIN__ + virtual ~wxDataObject() { } +#endif + virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; }; diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h index ef0b43b49f..63c17d793d 100644 --- a/include/wx/gtk/popupwin.h +++ b/include/wx/gtk/popupwin.h @@ -27,7 +27,10 @@ class wxPopupWindow: public wxPopupWindowBase { public: wxPopupWindow() { } - +#ifdef __DARWIN__ + virtual ~wxPopupWindow() { } +#endif + wxPopupWindow(wxWindow *parent) { (void)Create(parent); } bool Create(wxWindow *parent, int flags = wxBORDER_NONE); diff --git a/include/wx/gtk1/dataobj.h b/include/wx/gtk1/dataobj.h index 0794fcf51f..bd6783c977 100644 --- a/include/wx/gtk1/dataobj.h +++ b/include/wx/gtk1/dataobj.h @@ -22,7 +22,10 @@ class wxDataObject : public wxDataObjectBase { public: wxDataObject(); - +#ifdef __DARWIN__ + virtual ~wxDataObject() { } +#endif + virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; }; diff --git a/include/wx/gtk1/popupwin.h b/include/wx/gtk1/popupwin.h index ef0b43b49f..63c17d793d 100644 --- a/include/wx/gtk1/popupwin.h +++ b/include/wx/gtk1/popupwin.h @@ -27,7 +27,10 @@ class wxPopupWindow: public wxPopupWindowBase { public: wxPopupWindow() { } - +#ifdef __DARWIN__ + virtual ~wxPopupWindow() { } +#endif + wxPopupWindow(wxWindow *parent) { (void)Create(parent); } bool Create(wxWindow *parent, int flags = wxBORDER_NONE); diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index ea63c1484b..bd9524c08f 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -29,6 +29,9 @@ class WXDLLEXPORT wxPopupWindowBase : public wxWindow { public: wxPopupWindowBase() { } +#ifdef __DARWIN__ + virtual ~wxPopupWindowBase() { } +#endif // create the popup window // -- 2.45.2