removed conditional for Apple DevTools now that mac headers are not included

[wxWidgets.git] / src / mac / clipbrd.cpp

diff --git a/src/mac/clipbrd.cpp b/src/mac/clipbrd.cpp
index cb69904f95b2567f1e7d7fa3cc4d9e6b376a5e03..8e3cd7767860f1dab040867738c5980df709b09b 100644 (file)
--- 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] ;