From 90dad08e7724f029c84076dba936ef814cc44e39 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 12 Mar 2011 15:57:37 +0000 Subject: [PATCH] add external utf16 text type explicitely, as it otherwise gets treated like plain-text git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/dataobj.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp index 2820e47c45..b330edff1c 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; -- 2.47.2