From ade77e30cf965003e119f0e40e54441cf7dd8b6b Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 24 Jun 2014 12:43:53 -0700 Subject: [PATCH] Ignore code that is preventing stock data format IDs from being used with custom data objects. --- src/osx/carbon/dataobj.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp index 758e3a7928..c03c6a1bfe 100644 --- a/src/osx/carbon/dataobj.cpp +++ b/src/osx/carbon/dataobj.cpp @@ -458,12 +458,14 @@ bool wxDataObject::GetFromPasteboard( void * pb ) pastelocationset = true; } } +#if 0 // See https://groups.google.com/forum/#!topic/wx-dev/wFxevpvbhvQ/discussion else if ( flavorFormat.GetType() != wxDF_PRIVATE ) { // indicate the expected format for the type, benefiting from native conversions eg utf8 -> utf16 flavorType = (CFStringRef) wxDataFormat( flavorFormat.GetType()).GetFormatId(); } - +#endif + err = PasteboardCopyItemFlavorData( pasteboard, itemID, flavorType , &flavorData ); if ( err == noErr ) {