From d1c5f107a1abb970af9d775a4eaea28bd450d85e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= Date: Fri, 31 Mar 2017 19:08:57 +0200 Subject: [PATCH] Fix crash with Vietnamese input method on macOS --- src/osx/cocoa/textctrl.mm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm index 5b77fcdffe..3e3ea709b1 100644 --- a/src/osx/cocoa/textctrl.mm +++ b/src/osx/cocoa/textctrl.mm @@ -724,12 +724,13 @@ bool wxNSTextViewControl::CanFocus() const return true; } -void wxNSTextViewControl::insertText(NSString* text, WXWidget slf, void *_cmd) +void wxNSTextViewControl::insertText(NSString* str, WXWidget slf, void *_cmd) { + NSString *text = [str isKindOfClass:[NSAttributedString class]] ? [str string] : str; if ( m_lastKeyDownEvent ==NULL || !DoHandleCharEvent(m_lastKeyDownEvent, text) ) { wxOSX_TextEventHandlerPtr superimpl = (wxOSX_TextEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; - superimpl(slf, (SEL)_cmd, text); + superimpl(slf, (SEL)_cmd, str); } }