From 6c6cc08975f7d161076315cebe1cd2b1a12ea4fe Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 13 Jul 2018 10:44:44 +0200
Subject: [PATCH] Fixing drop on macos native dataview when 
 wxNEEDS_UTF16_FOR_TEXT_DATAOBJ

see #18165
---
 src/osx/cocoa/dataview.mm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index f70eaae314..a95d29190e 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -622,7 +622,11 @@ outlineView:(NSOutlineView*)outlineView
                     (
                      kCFAllocatorDefault,
                      (CFStringRef)[pasteboard stringForType:NSStringPboardType],
+#if defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
+                     kCFStringEncodingUTF16,
+#else
                      kCFStringEncodingUTF8,
+#endif
                      32
                     );
         if (textDataObject->SetData(::CFDataGetLength(osxData),
@@ -850,7 +854,13 @@ outlineView:(NSOutlineView*)outlineView
         wxDataObjectComposite* dataObjects   (new wxDataObjectComposite());
         wxTextDataObject*      textDataObject(new wxTextDataObject());
 
-        osxData = ::CFStringCreateExternalRepresentation(kCFAllocatorDefault,(CFStringRef)[pasteboard stringForType:NSStringPboardType],kCFStringEncodingUTF8,32);
+        osxData = ::CFStringCreateExternalRepresentation(kCFAllocatorDefault,(CFStringRef)[pasteboard stringForType:NSStringPboardType],
+#if defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
+                                                         kCFStringEncodingUTF16,
+#else
+                                                         kCFStringEncodingUTF8,
+#endif
+                                                         32);
         if (textDataObject->SetData(::CFDataGetLength(osxData),::CFDataGetBytePtr(osxData)))
             dataObjects->Add(textDataObject);
         else