match CFTypeRef declaration to the one in defs.h

[wxWidgets.git] / include / wx / mac / carbon / dataobj.h

diff --git a/include/wx/mac/carbon/dataobj.h b/include/wx/mac/carbon/dataobj.h
index 074ada9014878b4b09a0044b5286eccc78cc72f2..e5c0fda881b9fac8ae1f3722e4074a00163a1580 100644 (file)
--- a/include/wx/mac/carbon/dataobj.h
+++ b/include/wx/mac/carbon/dataobj.h
@@ -6,16 +6,12 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_DATAOBJ_H_
 #define _WX_MAC_DATAOBJ_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "dataobj.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // wxDataObject is the same as wxDataObjectBase under wxGTK
 // ----------------------------------------------------------------------------
@@ -25,10 +21,16 @@ class WXDLLEXPORT wxDataObject : public wxDataObjectBase
 public:
     wxDataObject();
 #ifdef __DARWIN__
-    ~wxDataObject() { }
+    virtual ~wxDataObject() { }
 #endif
 
     virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;
+    void AddToPasteboard( void * pasteboardRef , int itemID );
+    // returns true if the passed in format is present in the pasteboard
+    static bool IsFormatInPasteboard( void * pasteboardRef, const wxDataFormat &dataFormat );
+    // returns true if any of the accepted formats of this dataobj is in the pasteboard
+    bool HasDataInPasteboard( void * pasteboardRef );
+    bool GetFromPasteboard( void * pasteboardRef );
 };
 
 #endif // _WX_MAC_DATAOBJ_H_