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

Ignore code that is preventing stock data format IDs from being used

Browse Source 
with custom data objects.
This commit is contained in:
Robin Dunn
2014-06-24 12:43:53 -07:00
parent e19a2263bd
commit ade77e30cf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -458,11 +458,13 @@ 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 )