X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0822896b3354f8698835d234ce2655daa640704..f1f6d4659ca0581c6dcf3bfbbe9265a42627bbe7:/src/mac/clipbrd.cpp

diff --git a/src/mac/clipbrd.cpp b/src/mac/clipbrd.cpp
index cb69904f95..8e3cd77678 100644
--- a/src/mac/clipbrd.cpp
+++ b/src/mac/clipbrd.cpp
@@ -22,6 +22,8 @@
 #include "wx/clipbrd.h"
 #include "wx/intl.h"
 
+#include "wx/mac/private.h"
+
 #define wxUSE_DATAOBJ 1
 
 #include <string.h>
@@ -80,7 +82,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
           }
           else
           {
-            delete[] data ;
+            delete[] ((char *)data) ;
             data = NULL ;
           }
 	   		}
@@ -254,7 +256,7 @@ bool wxClipboard::AddData( wxDataObject *data )
               wxMetafileDataObject* metaFileDataObject =
                 (wxMetafileDataObject*) data;
               wxMetafile metaFile = metaFileDataObject->GetMetafile();
-      				PicHandle pict = metaFile->GetHMETAFILE() ;
+      				PicHandle pict = (PicHandle) metaFile.GetHMETAFILE() ;
       				HLock( (Handle) pict ) ;
       #if !TARGET_CARBON
       				err = PutScrap( GetHandleSize(  (Handle) pict ) , 'PICT' , *pict ) ;
@@ -363,11 +365,6 @@ bool wxClipboard::GetData( wxDataObject& data )
     /* get formats from wxDataObjects */
     if ( !transferred ) 
     {
-  #if !TARGET_CARBON
-  	OSErr err = noErr ;
-  #else
-  	OSStatus err = noErr ;
-  #endif
       for (size_t i = 0; !transferred && i < formatcount ; i++)
       {
           wxDataFormat format = array[i] ;