/////////////////////////////////////////////////////////////////////////////
// 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
+// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#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
#else
OSStatus err = noErr ;
#endif
- void * data = NULL ;
+ void * data = NULL ;
+ Size byteCount;
switch (dataFormat.GetType())
{
- case wxDF_OEMTEXT:
- dataFormat = wxDF_TEXT;
- // fall through
-
- case wxDF_TEXT:
- break;
- default:
- {
- wxLogError(_("Unsupported clipboard format."));
- return NULL;
- }
+ case wxDF_OEMTEXT:
+ dataFormat = wxDF_TEXT;
+ // fall through
+
+ case wxDF_TEXT:
+ break;
+ case wxDF_UNICODETEXT:
+ break;
+ case wxDF_BITMAP :
+ case wxDF_METAFILE :
+ break ;
+ default:
+ {
+ wxLogError(_("Unsupported clipboard format."));
+ return NULL;
+ }
}
-
+
#if TARGET_CARBON
ScrapRef 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++ ;
-
- data = new char[ byteCount ] ;
- if (( err = GetScrapFlavorData( scrapRef, dataFormat.GetFormatId(), &byteCount , data )) == noErr )
- {
- *len = byteCount ;
+ Size allocSize = byteCount ;
if ( dataFormat.GetType() == wxDF_TEXT )
- ((char*)data)[byteCount] = 0 ;
- }
- else
- {
- delete[] ((char *)data) ;
- data = NULL ;
- }
+ allocSize += 1 ;
+ else if ( dataFormat.GetType() == wxDF_UNICODETEXT )
+ allocSize += 2 ;
+
+ data = new char[ allocSize ] ;
+
+ if (( err = GetScrapFlavorData( scrapRef, dataFormat.GetFormatId(), &byteCount , data )) == noErr )
+ {
+ *len = allocSize ;
+ if ( dataFormat.GetType() == wxDF_TEXT )
+ ((char*)data)[byteCount] = 0 ;
+ if ( dataFormat.GetType() == wxDF_UNICODETEXT )
+ ((wxChar*)data)[byteCount/2] = 0 ;
+ }
+ else
+ {
+ delete[] ((char *)data) ;
+ data = NULL ;
+ }
}
}
}
HUnlock( datahandle ) ;
if ( GetHandleSize( datahandle ) > 0 )
{
- long 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 ;
+ byteCount = GetHandleSize( datahandle ) ;
+ Size allocSize = byteCount ;
+ if ( dataFormat.GetType() == wxDF_TEXT )
+ allocSize += 1 ;
+ else if ( dataFormat.GetType() == wxDF_UNICODETEXT )
+ allocSize += 2 ;
+
+ data = new char[ allocSize ] ;
+
+ memcpy( (char*) data , (char*) *datahandle , byteCount ) ;
+ if ( dataFormat.GetType() == wxDF_TEXT )
+ ((char*)data)[byteCount] = 0 ;
+ if ( dataFormat.GetType() == wxDF_UNICODETEXT )
+ ((wxChar*)data)[byteCount/2] = 0 ;
+ *len = byteCount ;
}
DisposeHandle( datahandle ) ;
#endif
if ( err )
{
wxLogSysError(_("Failed to get clipboard data."));
-
+
return NULL ;
}
+
if ( dataFormat.GetType() == wxDF_TEXT && wxApp::s_macDefaultEncodingIsPC )
{
- wxMacConvertToPC((char*)data) ;
+ wxString st = wxMacMakeStringFromCString( (char*) data ) ;
+#if wxUSE_UNICODE
+ wxCharBuffer buf = st.ToAscii() ;
+#else
+ char* buf = st ;
+#endif
+ char* newdata = new char[strlen(buf)+1] ;
+ memcpy( newdata , buf , strlen(buf)+1 ) ;
+ delete[] ((char*) data ) ;
+ data = newdata ;
}
+
return data;
}
wxClipboard::wxClipboard()
{
- m_open = false ;
- m_data = NULL ;
+ m_open = false ;
+ m_data = NULL ;
}
wxClipboard::~wxClipboard()
wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
- wxDataFormat format = data->GetPreferredFormat();
-
/* we can only store one wxDataObject */
Clear();
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() )
{
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
+ wxCharBuffer buf = wxMacStringToCString( str ) ;
+ err = UMAPutScrap( strlen(buf) , kScrapFlavorTypeText , (void*) buf.data() ) ;
}
break ;
-
+#if wxUSE_UNICODE
+ case wxDF_UNICODETEXT :
+ {
+ wxTextDataObject* textDataObject = (wxTextDataObject*) data;
+ wxString str(textDataObject->GetText());
+ err = UMAPutScrap( str.Length() * sizeof(wxChar) , kScrapFlavorTypeUnicode , (void*) str.wc_str() ) ;
+ }
+ break ;
+#endif
#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 ) , kScrapFlavorTypePicture , *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 ) , kScrapFlavorTypePicture , *pict ) ;
+ HUnlock( (Handle) pict ) ;
+ if ( created )
+ KillPicture( pict ) ;
+ }
default:
break ;
}
{
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] );
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 );
transferred = true ;
}
}
- break ;
+ break ;
default :
break ;
projects / wxWidgets.git / blobdiff