X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6636ef8ddf9eda0d0352c29d98cb141676a51a2d..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/osx/carbon/dataobj.cpp?ds=inline diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp index 2820e47c45..a4cfb843af 100644 --- a/src/osx/carbon/dataobj.cpp +++ b/src/osx/carbon/dataobj.cpp @@ -162,6 +162,10 @@ void wxDataFormat::SetId( NativeFormat format ) { m_type = wxDF_UNICODETEXT; } + else if ( UTTypeConformsTo( (CFStringRef)format, CFSTR("public.utf16-external-plain-text") ) ) + { + m_type = wxDF_UNICODETEXT; + } else if ( UTTypeConformsTo( (CFStringRef)format, CFSTR("public.plain-text") ) ) { m_type = wxDF_TEXT; @@ -530,7 +534,7 @@ bool wxDataObject::HasDataInPasteboard( void * pb ) wxDataFormat flavorFormat( (wxDataFormat::NativeFormat) flavorType ); if ( dataFormat == flavorFormat || - dataFormat.GetType() == wxDF_UNICODETEXT && flavorFormat.GetType() == wxDF_TEXT ) + (dataFormat.GetType() == wxDF_UNICODETEXT && flavorFormat.GetType() == wxDF_TEXT) ) { hasData = true; } @@ -632,7 +636,7 @@ wxBitmapDataObject::wxBitmapDataObject( const wxBitmap& rBitmap ) { Init(); - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { SetBitmap( rBitmap ); } @@ -647,7 +651,7 @@ void wxBitmapDataObject::SetBitmap( const wxBitmap& rBitmap ) { Clear(); wxBitmapDataObjectBase::SetBitmap( rBitmap ); - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { CGImageRef cgImageRef = (CGImageRef) m_bitmap.CreateCGImage(); @@ -738,8 +742,8 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf ) if ( source ) { cgImageRef = CGImageSourceCreateImageAtIndex(source, 0, NULL); + CFRelease( source ); } - CFRelease( source ); CFRelease( data ); if ( cgImageRef ) @@ -752,7 +756,7 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf ) cgImageRef = NULL; } - return m_bitmap.Ok(); + return m_bitmap.IsOk(); } #endif