From 1adee1bfb0860441a3a6fbcf73686d6aa4441e7f Mon Sep 17 00:00:00 2001 From: rmottola Date: Mon, 28 Mar 2011 14:38:17 +0000 Subject: [PATCH] remove c99-ism git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@32725 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 3 ++- Source/NSTextView.m | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01058c453..c6b724bc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2011-03-28 Riccardo Mottola - * Source/NSSearchFieldCell.m: + * Source/NSSearchFieldCell.m, + * Source/NSTextView.m: Remove c99-ism * Source/NSSpeechSynthesizer.m: diff --git a/Source/NSTextView.m b/Source/NSTextView.m index 20e71f28d..ffa14c596 100644 --- a/Source/NSTextView.m +++ b/Source/NSTextView.m @@ -1518,9 +1518,10 @@ to make sure syncing is handled properly in all cases. if (_tf.continuous_spell_checking && !flag) { - _tf.continuous_spell_checking = 0; - const NSRange allRange = NSMakeRange(0, [[self string] length]); + + _tf.continuous_spell_checking = 0; + [_layoutManager removeTemporaryAttribute: @"NSTextChecked" forCharacterRange: allRange]; [_layoutManager removeTemporaryAttribute: NSSpellingStateAttributeName @@ -6066,6 +6067,9 @@ or add guards } else { + NSRange prevNonCharacter; + NSRange nextNonCharacter; + NSRange range; NSCharacterSet *boundary = [[NSCharacterSet letterCharacterSet] invertedSet]; if (selected.location == [[self string] length] && selected.location > 0) @@ -6073,9 +6077,8 @@ or add guards selected.location--; } - NSRange prevNonCharacter = [[self string] rangeOfCharacterFromSet: boundary options: NSBackwardsSearch range: NSMakeRange(0, selected.location)]; - NSRange nextNonCharacter = [[self string] rangeOfCharacterFromSet: boundary options: 0 range: NSMakeRange(NSMaxRange(selected), [[self string] length] - NSMaxRange(selected))]; - NSRange range; + prevNonCharacter = [[self string] rangeOfCharacterFromSet: boundary options: NSBackwardsSearch range: NSMakeRange(0, selected.location)]; + nextNonCharacter = [[self string] rangeOfCharacterFromSet: boundary options: 0 range: NSMakeRange(NSMaxRange(selected), [[self string] length] - NSMaxRange(selected))]; if (prevNonCharacter.length == 0) {