From 9036c001521883300c30c8e2d7ef6775dc00f918 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Wed, 29 Jun 2016 13:42:37 -0400 Subject: [PATCH] Bug1300, improved: don't truncate the pasted string --- lib-src/FileDialog/mac/FileDialogPrivate.mm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.mm b/lib-src/FileDialog/mac/FileDialogPrivate.mm index 3dd488dd6..508d8b800 100644 --- a/lib-src/FileDialog/mac/FileDialogPrivate.mm +++ b/lib-src/FileDialog/mac/FileDialogPrivate.mm @@ -630,10 +630,12 @@ int FileDialog::ShowModal() wxTheClipboard->GetData(data); wxTheClipboard->Close(); wxString text = data.GetText(); + auto rawText = text.utf8_str(); + auto length = text.Length(); NSString *myString = [[NSString alloc] - initWithCharacters: - (unsigned short*)text.c_str().AsWChar() - length:text.Length() + initWithBytes:rawText.data() + length: rawText.length() + encoding: NSUTF8StringEncoding ]; [sPanel setNameFieldStringValue:myString]; [myString release];