Make @genericAppearance Doxygen macro consistent with @appearance.

[wxWidgets.git] / src / osx / carbon / dataobj.cpp

diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp
index b48ce932e9d3d3a6d0e7ff21476721ba0e1df6f5..2b625d0e06c7a326b038469320ddc12819680833 100644 (file)
--- a/src/osx/carbon/dataobj.cpp
+++ b/src/osx/carbon/dataobj.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     10/21/99
-// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -260,7 +259,7 @@ bool wxDataObject::IsSupportedFormat( const wxDataFormat& rFormat, Direction vDi
     return found;
 }
 
-void wxDataObject::AddToPasteboard( void * pb, int itemID )
+void wxDataObject::AddToPasteboard( void * pb, wxIntPtr itemID )
 {
     PasteboardRef pasteboard = (PasteboardRef) pb;
    // get formats from wxDataObjects
@@ -302,7 +301,7 @@ void wxDataObject::AddToPasteboard( void * pb, int itemID )
             memset( buf, 0, sz );
             if ( GetDataHere( thisFormat, buf ) )
             {
-                int counter = 1 ;
+                wxIntPtr counter = 1 ;
                 if ( thisFormat.GetType() == wxDF_FILENAME )
                 {
                     // the data is D-normalized UTF8 strings of filenames delimited with \n
@@ -629,6 +628,10 @@ void wxDataObject::AddSupportedTypes( void* cfarray)
         {
             CFArrayAppendValue((CFMutableArrayRef)cfarray, kUTTypePDF);
         }
+        else if ( dataFormat.GetType() == wxDF_PRIVATE )
+        {
+            CFArrayAppendValue((CFMutableArrayRef)cfarray, (CFStringRef) dataFormat.GetFormatId());
+        }
     }
     delete[] array;
 }