add support for asynchronous execution in wxBase (patch 1906889)

[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 15b58e3a37284fa3067e3a5c4026b745266531cd..e5c0fda881b9fac8ae1f3722e4074a00163a1580 100644 (file)
--- a/include/wx/mac/carbon/dataobj.h
+++ b/include/wx/mac/carbon/dataobj.h
@@ -12,10 +12,6 @@
 #ifndef _WX_MAC_DATAOBJ_H_
 #define _WX_MAC_DATAOBJ_H_
 
 #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDataObject is the same as wxDataObjectBase under wxGTK
 // ----------------------------------------------------------------------------


@@ -25,10 +21,16 @@ class WXDLLEXPORT wxDataObject : public wxDataObjectBase
 public:
     wxDataObject();
 #ifdef __DARWIN__
 public:
     wxDataObject();
 #ifdef __DARWIN__

-    ~wxDataObject() { }
+    virtual ~wxDataObject() { }

 #endif
 
     virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;
 #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_
 };
 
 #endif // _WX_MAC_DATAOBJ_H_