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
This commit is contained in:
@@ -169,14 +169,14 @@ void wxDataFormat::SetId( NativeFormat format )
|
|||||||
m_format = 0;
|
m_format = 0;
|
||||||
}
|
}
|
||||||
m_format = (NativeFormat) CFStringCreateCopy(NULL, (CFStringRef)format);
|
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_TEXT;
|
|
||||||
}
|
|
||||||
else if ( UTTypeConformsTo( (CFStringRef)format, CFSTR("public.utf16-plain-text") ) )
|
|
||||||
{
|
{
|
||||||
m_type = wxDF_UNICODETEXT;
|
m_type = wxDF_UNICODETEXT;
|
||||||
}
|
}
|
||||||
|
else if ( UTTypeConformsTo( (CFStringRef)format, CFSTR("public.plain-text") ) )
|
||||||
|
{
|
||||||
|
m_type = wxDF_TEXT;
|
||||||
|
}
|
||||||
#if wxMAC_USE_CORE_GRAPHICS
|
#if wxMAC_USE_CORE_GRAPHICS
|
||||||
else if ( UTTypeConformsTo( (CFStringRef)format, CFSTR("public.tiff") ) )
|
else if ( UTTypeConformsTo( (CFStringRef)format, CFSTR("public.tiff") ) )
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user