From 64b9adaeda87f522b7549ee132a064b1c3c13b18 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 4 Oct 2007 04:58:35 +0000 Subject: [PATCH] fixing utf16 recognition, as this always conforms to public-plain-text the sequence needs to be inverted git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/dataobj.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp index 008a1cc844..b0de98fc3d 100644 --- a/src/mac/carbon/dataobj.cpp +++ b/src/mac/carbon/dataobj.cpp @@ -169,14 +169,14 @@ void wxDataFormat::SetId( NativeFormat format ) m_format = 0; } m_format = (NativeFormat) CFStringCreateCopy(NULL, (CFStringRef)format); - if ( UTTypeConformsTo( (CFStringRef)format, CFSTR("public.plain-text") ) ) + if ( UTTypeConformsTo( (CFStringRef)format, CFSTR("public.utf16-plain-text") ) ) + { + m_type = wxDF_UNICODETEXT; + } + else if ( UTTypeConformsTo( (CFStringRef)format, CFSTR("public.plain-text") ) ) { m_type = wxDF_TEXT; } - else if ( UTTypeConformsTo( (CFStringRef)format, CFSTR("public.utf16-plain-text") ) ) - { - m_type = wxDF_UNICODETEXT; - } #if wxMAC_USE_CORE_GRAPHICS else if ( UTTypeConformsTo( (CFStringRef)format, CFSTR("public.tiff") ) ) {