X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/544bdbbee2c81c8ab3a69e100bbd441b6461d609..2ddb4d13585d5235556119fb1937273da9e433a3:/src/mac/carbon/dataobj.cpp

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index 33e738e0b9..e6e4af8767 100644
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -17,13 +17,11 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma implementation "dataobj.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_DATAOBJ
+
 #ifndef WX_PRECOMP
 #include "wx/intl.h"
 #endif
@@ -35,7 +33,9 @@
 #include "wx/image.h"
 #include "wx/metafile.h"
 #include "wx/mac/private.h"
+#ifndef __DARWIN__
 #include <Scrap.h>
+#endif
 
 // ----------------------------------------------------------------------------
 // functions
@@ -95,13 +95,10 @@ void wxDataFormat::SetType(  wxDataFormatId  Type )
 
 wxString wxDataFormat::GetId() const
 {
-    // note that m_format is not a pointer to string, it *is* itself a 4
-    // character string
-    char text[5] ;
-    strncpy( text , (char*) &m_format , 4 ) ;
-    text[4] = 0 ;
+    wxCHECK_MSG( !IsStandard(), wxEmptyString ,
+                 wxT("name of predefined format cannot be retrieved") );
 
-    return wxString::FromAscii( text ) ;
+    return m_id ;
 }
 
 void wxDataFormat::SetId(  NativeFormat  format )
@@ -117,13 +114,32 @@ void wxDataFormat::SetId(  NativeFormat  format )
     else if (m_format == kDragFlavorTypeHFS )
         m_type = wxDF_FILENAME;
     else
+    {
         m_type = wxDF_PRIVATE;
+        char text[5] ;
+        strncpy( text , (char*) &format , 4 ) ;
+        text[4] = 0 ;
+        m_id = wxString::FromAscii( text ) ;
+    }
 }
 
 void wxDataFormat::SetId( const wxChar* zId )
 {
     m_type = wxDF_PRIVATE;
-    m_format = 0;// TODO: get the format gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE );
+    m_id = zId ;
+    m_format = 'WXPR' ;
+}
+
+bool wxDataFormat::operator==(const wxDataFormat& format) const 
+{
+    if ( IsStandard() || format.IsStandard() )
+    {
+        return ( format.m_type == m_type ) ;
+    }
+    else
+    {
+        return ( m_id == format.m_id ) ;
+    }
 }
 
 //-------------------------------------------------------------------------
@@ -252,8 +268,8 @@ wxBitmapDataObject::wxBitmapDataObject(
     Init();
     if ( m_bitmap.Ok() )
     {
-        m_pictHandle = wxMacCreatePicHandle( rBitmap ) ;
-        m_pictCreated = true ;
+        m_pictHandle = m_bitmap.GetBitmapData()->GetPictHandle() ;
+        m_pictCreated = false ;
     }
 }
 
@@ -270,8 +286,8 @@ void wxBitmapDataObject::SetBitmap(
     wxBitmapDataObjectBase::SetBitmap(rBitmap);
     if ( m_bitmap.Ok() )
     {
-        m_pictHandle = wxMacCreatePicHandle( rBitmap ) ;
-        m_pictCreated = true ;
+        m_pictHandle = m_bitmap.GetBitmapData()->GetPictHandle() ;
+        m_pictCreated = false ;
     }
 }
 
@@ -331,3 +347,5 @@ bool wxBitmapDataObject::SetData(
     
     return m_bitmap.Ok();
 }
+
+#endif
\ No newline at end of file