X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed60b5022b9438672922d7879980ab7008c62fd6..2ad50cc75b44bdb79c3c1a031e1a548d0fa5bfb9:/src/mac/clipbrd.cpp?ds=sidebyside

diff --git a/src/mac/clipbrd.cpp b/src/mac/clipbrd.cpp
index 651f6f4722..997be2fb36 100644
--- a/src/mac/clipbrd.cpp
+++ b/src/mac/clipbrd.cpp
@@ -21,11 +21,12 @@
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
 #include "wx/intl.h"
+#include "wx/log.h"
 
-#include "wx/mac/private.h"
 #ifndef __DARWIN__
 #include <Scrap.h>
 #endif
+#include "wx/mac/uma.h"
 
 #define wxUSE_DATAOBJ 1
 
@@ -43,7 +44,8 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 #else
     OSStatus err = noErr ;
 #endif
-  void * data = NULL ;
+  	void * data = NULL ;
+	Size byteCount;
     
     switch (dataFormat.GetType())
     {
@@ -53,6 +55,9 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 
         case wxDF_TEXT:
                 break;
+        case wxDF_BITMAP :
+        case wxDF_METAFILE :
+        		break ;
         default:
             {
                 wxLogError(_("Unsupported clipboard format."));
@@ -67,7 +72,6 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
     if ( err != noTypeErr && err != memFullErr )    
     {
         ScrapFlavorFlags    flavorFlags;
-        Size                byteCount;
         
         if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
         {
@@ -100,7 +104,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
     HUnlock( datahandle ) ;
     if ( GetHandleSize( datahandle ) > 0 )
     {
-      long byteCount = GetHandleSize( datahandle ) ;
+      byteCount = GetHandleSize( datahandle ) ;
       if ( dataFormat.GetType() == wxDF_TEXT )  
         data = new char[ byteCount + 1] ;
       else
@@ -109,7 +113,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
       memcpy( (char*) data , (char*) *datahandle , byteCount ) ;
       if ( dataFormat.GetType() == wxDF_TEXT )  
           ((char*)data)[byteCount] = 0 ;
-      * len = byteCount ;
+      *len = byteCount ;
     }
     DisposeHandle( datahandle ) ;
 #endif
@@ -121,7 +125,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
     }
     if ( dataFormat.GetType() == wxDF_TEXT && wxApp::s_macDefaultEncodingIsPC )
     {
-      wxMacConvertToPC((char*)data) ;
+      wxMacConvertToPC((char*)data,(char*)data,byteCount) ;
     }
     return data;
 }
@@ -131,7 +135,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
  * Generalized clipboard implementation by Matthew Flatt
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxClipboardBase)
+IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 wxClipboard::wxClipboard()
 {
@@ -202,8 +206,6 @@ bool wxClipboard::AddData( wxDataObject *data )
 
     wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
 
-    wxDataFormat format = data->GetPreferredFormat();
-
     /* we can only store one wxDataObject */
     Clear();
 
@@ -220,9 +222,9 @@ bool wxClipboard::AddData( wxDataObject *data )
                     array[i].GetId().c_str() );
 
 #if !TARGET_CARBON
-          OSErr err = noErr ;
+        OSErr err = noErr ;
 #else
-          OSStatus err = noErr ;
+        OSStatus err = noErr ;
 #endif
 
        switch ( array[i].GetType() )
@@ -241,43 +243,38 @@ bool wxClipboard::AddData( wxDataObject *data )
                 {
                     mac = textDataObject->GetText() ;
                 }
-        #if !TARGET_CARBON
-                        err = PutScrap( mac.Length() , 'TEXT' , mac.c_str() ) ;
-        #else
-                        ScrapRef    scrap;
-                        err = GetCurrentScrap (&scrap); 
-                        if ( !err )
-                        {
-                            err = PutScrapFlavor (scrap, 'TEXT', 0, mac.Length(), mac.c_str());
-                        }
-        #endif
+                err = UMAPutScrap( mac.Length() , 'TEXT' , (void*) mac.c_str()  ) ;
            }
-           break;
+           break ;
 
 #if wxUSE_DRAG_AND_DROP
         case wxDF_METAFILE:
            {
-              wxMetafileDataObject* metaFileDataObject =
+				wxMetafileDataObject* metaFileDataObject =
                 (wxMetafileDataObject*) data;
-              wxMetafile metaFile = metaFileDataObject->GetMetafile();
-                    PicHandle pict = (PicHandle) metaFile.GetHMETAFILE() ;
-                    HLock( (Handle) pict ) ;
-      #if !TARGET_CARBON
-                    err = PutScrap( GetHandleSize(  (Handle) pict ) , 'PICT' , *pict ) ;
-      #else
-                    ScrapRef    scrap;
-                    err = GetCurrentScrap (&scrap); 
-                    if ( !err )
-                    {
-                        err = PutScrapFlavor (scrap, 'PICT', 0, GetHandleSize((Handle) pict), *pict);
-                    }
-      #endif
-                    HUnlock(  (Handle) pict ) ;
+              	wxMetafile metaFile = metaFileDataObject->GetMetafile();
+            	PicHandle pict = (PicHandle) metaFile.GetHMETAFILE() ;
+              	HLock( (Handle) pict ) ;
+              	err = UMAPutScrap( GetHandleSize(  (Handle) pict ) , 'PICT' , *pict ) ;
+              	HUnlock(  (Handle) pict ) ;
            }
-           break;
+           break ;
 #endif
            case wxDF_BITMAP:
            case wxDF_DIB:
+           {
+           		bool created = false ;
+           		PicHandle pict = NULL ;
+           		
+           		wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data ;
+           		pict = (PicHandle) bitmapDataObject->GetBitmap().GetPict( &created ) ;
+
+              	HLock( (Handle) pict ) ;
+              	err = UMAPutScrap( GetHandleSize(  (Handle) pict ) , 'PICT' , *pict ) ;
+              	HUnlock(  (Handle) pict ) ;
+              	if ( created )
+              		KillPicture( pict ) ;
+           }
            default:
                 break ;
        }
@@ -336,7 +333,7 @@ bool wxClipboard::GetData( wxDataObject& data )
 {
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
 
-    int formatcount = data.GetFormatCount() + 1 ;
+    size_t formatcount = data.GetFormatCount() + 1 ;
     wxDataFormat *array = new wxDataFormat[ formatcount  ];
     array[0] = data.GetPreferredFormat();
     data.GetAllFormats( &array[1] );
@@ -376,8 +373,10 @@ bool wxClipboard::GetData( wxDataObject& data )
 
           switch ( format.GetType() )
           {
-              case wxDF_TEXT:
-              case wxDF_OEMTEXT:
+              case wxDF_TEXT :
+              case wxDF_OEMTEXT :
+              case wxDF_BITMAP :
+              case wxDF_METAFILE :
               {
                   long len ;
                   char* s = (char*)wxGetClipboardData(format, &len );
@@ -389,6 +388,8 @@ bool wxClipboard::GetData( wxDataObject& data )
                     transferred = true ;
                   }
               }
+							break ;
+
               default :
                 break ;
           }