X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0822896b3354f8698835d234ce2655daa640704..7de24929eb363ba8c52b68a04e20d2774dd0b6b2:/src/mac/clipbrd.cpp diff --git a/src/mac/clipbrd.cpp b/src/mac/clipbrd.cpp index cb69904f95..7854006d09 100644 --- a/src/mac/clipbrd.cpp +++ b/src/mac/clipbrd.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: clipbrd.cpp // Purpose: Clipboard functionality -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -21,6 +21,12 @@ #include "wx/metafile.h" #include "wx/clipbrd.h" #include "wx/intl.h" +#include "wx/log.h" + +#ifndef __DARWIN__ +#include +#endif +#include "wx/mac/uma.h" #define wxUSE_DATAOBJ 1 @@ -34,12 +40,13 @@ static const wxChar *TRACE_CLIPBOARD = _T("clipboard"); void *wxGetClipboardData(wxDataFormat dataFormat, long *len) { #if !TARGET_CARBON - OSErr err = noErr ; + OSErr err = noErr ; #else - OSStatus err = noErr ; + OSStatus err = noErr ; #endif - void * data = NULL ; - + void * data = NULL ; + Size byteCount; + switch (dataFormat.GetType()) { case wxDF_OEMTEXT: @@ -48,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.")); @@ -56,57 +66,56 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len) } #if TARGET_CARBON - ScrapRef scrapRef; - - err = GetCurrentScrap( &scrapRef ); - if ( err != noTypeErr && err != memFullErr ) - { - ScrapFlavorFlags flavorFlags; - Size byteCount; - - if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr) - { - if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr) - { - if ( dataFormat.GetType() == wxDF_TEXT ) - byteCount++ ; - + ScrapRef scrapRef; + + err = GetCurrentScrap( &scrapRef ); + if ( err != noTypeErr && err != memFullErr ) + { + ScrapFlavorFlags flavorFlags; + + if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr) + { + if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr) + { + if ( dataFormat.GetType() == wxDF_TEXT ) + byteCount++ ; + data = new char[ byteCount ] ; if (( err = GetScrapFlavorData( scrapRef, dataFormat.GetFormatId(), &byteCount , data )) == noErr ) { *len = byteCount ; - if ( dataFormat.GetType() == wxDF_TEXT ) - ((char*)data)[byteCount] = 0 ; + if ( dataFormat.GetType() == wxDF_TEXT ) + ((char*)data)[byteCount] = 0 ; } else { - delete[] data ; + delete[] ((char *)data) ; data = NULL ; } - } - } - } - + } + } + } + #else - long offset ; - Handle datahandle = NewHandle(0) ; - HLock( datahandle ) ; - GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ; - HUnlock( datahandle ) ; - if ( GetHandleSize( datahandle ) > 0 ) - { - long byteCount = GetHandleSize( datahandle ) ; - if ( dataFormat.GetType() == wxDF_TEXT ) - data = new char[ byteCount + 1] ; + long offset ; + Handle datahandle = NewHandle(0) ; + HLock( datahandle ) ; + GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ; + HUnlock( datahandle ) ; + if ( GetHandleSize( datahandle ) > 0 ) + { + byteCount = GetHandleSize( datahandle ) ; + if ( dataFormat.GetType() == wxDF_TEXT ) + data = new char[ byteCount + 1] ; else data = new char[ byteCount ] ; - memcpy( (char*) data , (char*) *datahandle , byteCount ) ; - if ( dataFormat.GetType() == wxDF_TEXT ) - ((char*)data)[byteCount] = 0 ; - * len = byteCount ; - } - DisposeHandle( datahandle ) ; + memcpy( (char*) data , (char*) *datahandle , byteCount ) ; + if ( dataFormat.GetType() == wxDF_TEXT ) + ((char*)data)[byteCount] = 0 ; + *len = byteCount ; + } + DisposeHandle( datahandle ) ; #endif if ( err ) { @@ -116,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; } @@ -126,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() { @@ -151,16 +160,16 @@ void wxClipboard::Clear() m_data = (wxDataObject*) NULL; } #if TARGET_CARBON - OSStatus err ; - err = ClearCurrentScrap( ); + OSStatus err ; + err = ClearCurrentScrap( ); #else - OSErr err ; - err = ZeroScrap( ); + OSErr err ; + err = ZeroScrap( ); #endif - if ( err ) - { + if ( err ) + { wxLogSysError(_("Failed to empty the clipboard.")); - } + } } bool wxClipboard::Flush() @@ -197,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(); @@ -215,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() ) @@ -227,52 +234,49 @@ bool wxClipboard::AddData( wxDataObject *data ) { wxTextDataObject* textDataObject = (wxTextDataObject*) data; wxString str(textDataObject->GetText()); - wxString mac ; - if ( wxApp::s_macDefaultEncodingIsPC ) - { - mac = wxMacMakeMacStringFromPC(textDataObject->GetText()) ; - } - else - { - 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 + wxString mac ; + if ( wxApp::s_macDefaultEncodingIsPC ) + { + mac = wxMacMakeMacStringFromPC(textDataObject->GetText()) ; + } + else + { + mac = textDataObject->GetText() ; + } + err = UMAPutScrap( mac.Length() , 'TEXT' , (void*) mac.c_str() ) ; } + break ; #if wxUSE_DRAG_AND_DROP case wxDF_METAFILE: { - wxMetafileDataObject* metaFileDataObject = + wxMetafileDataObject* metaFileDataObject = (wxMetafileDataObject*) data; - wxMetafile metaFile = metaFileDataObject->GetMetafile(); - PicHandle pict = 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 ; #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 ; + break ; } } @@ -294,34 +298,34 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat ) return m_data->IsSupported( dataFormat ) ; } #if TARGET_CARBON - OSStatus err = noErr; - ScrapRef scrapRef; - - err = GetCurrentScrap( &scrapRef ); - if ( err != noTypeErr && err != memFullErr ) - { - ScrapFlavorFlags flavorFlags; - Size byteCount; - - if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr) - { - if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr) - { - return TRUE ; - } - } - } - return FALSE; - + OSStatus err = noErr; + ScrapRef scrapRef; + + err = GetCurrentScrap( &scrapRef ); + if ( err != noTypeErr && err != memFullErr ) + { + ScrapFlavorFlags flavorFlags; + Size byteCount; + + if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr) + { + if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr) + { + return TRUE ; + } + } + } + return FALSE; + #else - long offset ; - Handle datahandle = NewHandle(0) ; - HLock( datahandle ) ; - GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ; - HUnlock( datahandle ) ; - bool hasData = GetHandleSize( datahandle ) > 0 ; - DisposeHandle( datahandle ) ; - return hasData ; + long offset ; + Handle datahandle = NewHandle(0) ; + HLock( datahandle ) ; + GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ; + HUnlock( datahandle ) ; + bool hasData = GetHandleSize( datahandle ) > 0 ; + DisposeHandle( datahandle ) ; + return hasData ; #endif } @@ -329,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] ); @@ -363,19 +367,16 @@ 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] ; 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 ); @@ -387,6 +388,8 @@ bool wxClipboard::GetData( wxDataObject& data ) transferred = true ; } } + break ; + default : break ; }