Use more informative descriptions fro Springer layouts

[lyx.git] / src / support / AppleSpeller.m

diff --git a/src/support/AppleSpeller.m b/src/support/AppleSpeller.m
index a50365c7cb926d04fd48251820b6034ae55082a2..806ae2be21129323af5bea90f6c541218f22c84d 100644 (file)
--- a/src/support/AppleSpeller.m
+++ b/src/support/AppleSpeller.m
@@ -8,7 +8,6 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
 #import <AvailabilityMacros.h>
@@ -67,7 +66,7 @@ static NSString * toLanguage(AppleSpeller speller, const char * lang)
        NSString * lang_ = toString(lang);
        if ([NSSpellChecker instancesRespondToSelector:@selector(availableLanguages)]) {
                NSArray * languages = [speller->checker availableLanguages];
-               
+
                for (NSString *element in languages) {
                        if (0 == [element caseInsensitiveCompare:lang_]) {
                                result = element;
@@ -95,7 +94,7 @@ SpellCheckResult AppleSpeller_check(AppleSpeller speller, const char * word, con
        SpellCheckResult result = SPELL_CHECK_FAILED;
        int start = 0;
        int length = [word_ length];
-       
+
        [speller->misspelled release];
        speller->misspelled = nil;
 
@@ -163,16 +162,11 @@ size_t AppleSpeller_makeSuggestion(AppleSpeller speller, const char * word, cons
        // Mac OS X 10.6 only
        NSInteger slen = [word_ length];
        NSRange range = { 0, slen };
-       
-       if ([NSSpellChecker instancesRespondToSelector:@selector(guessesForWordRange:)]) {
-               result = [speller->checker guessesForWordRange:range
-                       inString:word_
-                       language:lang_
-                       inSpellDocumentWithTag:speller->doctag];
-       } else {
-               [speller->checker setLanguage:lang_];
-               result = [speller->checker guessesForWord:word_];
-       }
+
+       result = [speller->checker guessesForWordRange:range
+               inString:word_
+               language:lang_
+               inSpellDocumentWithTag:speller->doctag];
 #else
        [speller->checker setLanguage:lang_];
        result = [speller->checker guessesForWord:word_];
@@ -207,7 +201,7 @@ void AppleSpeller_learn(AppleSpeller speller, const char * word)
 
        if ([NSSpellChecker instancesRespondToSelector:@selector(learnWord:)])
                [speller->checker learnWord:word_];
-       
+
        [word_ release];
        [pool release];
 #endif
@@ -222,7 +216,7 @@ void AppleSpeller_unlearn(AppleSpeller speller, const char * word)
 
        if ([NSSpellChecker instancesRespondToSelector:@selector(unlearnWord:)])
                [speller->checker unlearnWord:word_];
-       
+
        [word_ release];
        [pool release];
 #endif
@@ -249,5 +243,9 @@ void AppleSpeller_misspelledWord(AppleSpeller speller, int index, int * start, i
 
 int AppleSpeller_hasLanguage(AppleSpeller speller, const char * lang)
 {
+#if defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)
        return toLanguage(speller, lang) != nil;
+#else
+       return true;
+#endif
 }