From 21825700a2a645ad1cb5ddcc0cc31edd72600748 Mon Sep 17 00:00:00 2001 From: Neil Hodgson Date: Thu, 10 Jul 2014 14:46:05 +1000 Subject: Fix the insertText: method on ScintillaView to accept NSAttributedString as well as NSString, since insertText: is from the NSResponder superclass where it is defined to accept both. --- cocoa/ScintillaView.h | 2 +- cocoa/ScintillaView.mm | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'cocoa') diff --git a/cocoa/ScintillaView.h b/cocoa/ScintillaView.h index f3a76e322..419c2f28f 100644 --- a/cocoa/ScintillaView.h +++ b/cocoa/ScintillaView.h @@ -135,7 +135,7 @@ extern NSString *const SCIUpdateUINotification; // NSTextView compatibility layer. - (NSString*) string; - (void) setString: (NSString*) aString; -- (void) insertText: (NSString*) aString; +- (void) insertText: (id) aString; - (void) setEditable: (BOOL) editable; - (BOOL) isEditable; - (NSRange) selectedRange; diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm index bca3b167f..2ca7ed6bc 100644 --- a/cocoa/ScintillaView.mm +++ b/cocoa/ScintillaView.mm @@ -1658,9 +1658,12 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) //-------------------------------------------------------------------------------------------------- -- (void)insertText: (NSString*)text +- (void)insertText: (id) aString { - mBackend->InsertText(text); + if ([aString isKindOfClass:[NSString class]]) + mBackend->InsertText(aString); + else if ([aString isKindOfClass:[NSAttributedString class]]) + mBackend->InsertText([aString string]); } //-------------------------------------------------------------------------------------------------- -- cgit v1.2.3