Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert my old hack for a dataformat issue on OSX, it caused more troubles than it fixes.

Browse Source
This commit is contained in:
Robin Dunn
2016-08-02 14:59:06 -07:00
parent fe65419be3
commit 73fca4c37d
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osx/carbon/dataobj.cpp
View File

@@ -458,13 +458,11 @@ bool wxDataObject::GetFromPasteboard( void * pb )
pastelocationset = true; pastelocationset = true;
} }
} }
#if 0 // See https://groups.google.com/forum/#!topic/wx-dev/wFxevpvbhvQ/discussion
else if ( flavorFormat.GetType() != wxDF_PRIVATE ) else if ( flavorFormat.GetType() != wxDF_PRIVATE )
{ {
// indicate the expected format for the type, benefiting from native conversions eg utf8 -> utf16 // indicate the expected format for the type, benefiting from native conversions eg utf8 -> utf16
flavorType = (CFStringRef) wxDataFormat( flavorFormat.GetType()).GetFormatId(); flavorType = (CFStringRef) wxDataFormat( flavorFormat.GetType()).GetFormatId();
} }
#endif
err = PasteboardCopyItemFlavorData( pasteboard, itemID, flavorType , &flavorData ); err = PasteboardCopyItemFlavorData( pasteboard, itemID, flavorType , &flavorData );
if ( err == noErr ) if ( err == noErr )