corrected GetDepth method and wrong disposal calls for pixmap

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

diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index 2f7651852aa227aeb73b69186208187d936fceca..0aa8806e032968e1adb57eee99f46ab964eb70e8 100644 (file)
--- a/src/mac/carbon/clipbrd.cpp
+++ b/src/mac/carbon/clipbrd.cpp
@@ -22,6 +22,11 @@
 #include "wx/clipbrd.h"
 #include "wx/intl.h"
 
 #include "wx/clipbrd.h"
 #include "wx/intl.h"
 

+#include "wx/mac/private.h"
+#ifndef __DARWIN__
+#include <Scrap.h>
+#endif
+

 #define wxUSE_DATAOBJ 1
 
 #include <string.h>
 #define wxUSE_DATAOBJ 1
 
 #include <string.h>


@@ -254,7 +259,7 @@ bool wxClipboard::AddData( wxDataObject *data )
               wxMetafileDataObject* metaFileDataObject =
                 (wxMetafileDataObject*) data;
               wxMetafile metaFile = metaFileDataObject->GetMetafile();
               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 ) ;
                                HLock( (Handle) pict ) ;
       #if !TARGET_CARBON
                                err = PutScrap( GetHandleSize(  (Handle) pict ) , 'PICT' , *pict ) ;