From 73fca4c37d1ee2e9e495aaa68442cdfcb4243b52 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Tue, 2 Aug 2016 14:59:06 -0700
Subject: [PATCH] Revert my old hack for a dataformat issue on OSX, it caused
 more troubles than it fixes.

---
 src/osx/carbon/dataobj.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp
index c03c6a1bfe..c363f23213 100644
--- a/src/osx/carbon/dataobj.cpp
+++ b/src/osx/carbon/dataobj.cpp
@@ -458,13 +458,11 @@ 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 )