carbon cfm fixes

[wxWidgets.git] / include / wx / gtk / dataobj.h

diff --git a/include/wx/gtk/dataobj.h b/include/wx/gtk/dataobj.h
index 019d5f657f510e089b6655c9a6739cb0f57c3718..fa14819b1793c1b9c7cd952d066f44266c71c807 100644 (file)
--- a/include/wx/gtk/dataobj.h
+++ b/include/wx/gtk/dataobj.h
@@ -4,13 +4,13 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_DATAOBJ_H_
 #define _WX_GTK_DATAOBJ_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_DATAOBJ_H_
 #define _WX_GTK_DATAOBJ_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "dataobj.h"
 #endif
 
     #pragma interface "dataobj.h"
 #endif
 


@@ -22,10 +22,8 @@ class wxDataObject : public wxDataObjectBase
 {
 public:
     wxDataObject();
 {
 public:
     wxDataObject();

-#ifdef __DARWIN__
-    virtual ~wxDataObject() { }
-#endif
-    
+    virtual ~wxDataObject();
+

     virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;
 };
 
     virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;
 };