X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cd7bc23d574ea5ec62f1abea73eb363a9ea8126..a201463482dc4417592ee014ff1a9706e8971dd6:/src/mac/carbon/dataobj.cpp

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index 07a1e39a98..748c387ad6 100644
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -49,11 +49,6 @@ wxDataFormat::wxDataFormat( wxDataFormatId vType )
     SetType( vType );
 }
 
-wxDataFormat::wxDataFormat( const wxChar *zId )
-{
-    SetId( zId );
-}
-
 wxDataFormat::wxDataFormat( const wxString& rId )
 {
     SetId( rId );
@@ -137,7 +132,7 @@ void wxDataFormat::SetId( NativeFormat format )
     }
 }
 
-void wxDataFormat::SetId( const wxChar* zId )
+void wxDataFormat::SetId( const wxString& zId )
 {
     m_type = wxDF_PRIVATE;
     m_id = zId;
@@ -361,13 +356,16 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf )
 #ifndef __LP64__
     Rect frame;
     wxMacGetPictureBounds( picHandle, &frame );
-
+#if wxUSE_METAFILE
     wxMetafile mf;
     mf.SetHMETAFILE( (WXHMETAFILE)m_pictHandle );
+#endif
     wxMemoryDC mdc;
     m_bitmap.Create( frame.right - frame.left, frame.bottom - frame.top );
     mdc.SelectObject( m_bitmap );
+#if wxUSE_METAFILE  
     mf.Play( &mdc );
+#endif
     mdc.SelectObject( wxNullBitmap );
 #endif