From d89af57a1a617f969110bdc66d3770452b4afdaf Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 26 Jun 2008 07:19:05 +0000 Subject: [PATCH] fixing an incorrect conversion path from utf8 to plain ascii instead of unicode, closes #9629 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/dataobj.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp index 3b9de39223..0a4cb0f0be 100644 --- a/src/osx/carbon/dataobj.cpp +++ b/src/osx/carbon/dataobj.cpp @@ -403,6 +403,11 @@ bool wxDataObject::GetFromPasteboard( void * pb ) flavorType = (CFStringRef)CFArrayGetValueAtIndex( flavorTypeArray, flavorIndex ); + // avoid utf8 being treated closer to plain-text than unicode by forcing a conversion + if ( UTTypeConformsTo(flavorType, CFSTR("public.utf8-plain-text") ) ) + { + flavorType = CFSTR("public.utf16-plain-text"); + } wxDataFormat flavorFormat( (wxDataFormat::NativeFormat) flavorType ); if ( dataFormat == flavorFormat ) -- 2.47.2