Check return value of regex_match instead of looking at first match

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

diff --git a/src/support/AppleSpeller.m b/src/support/AppleSpeller.m
index a50365c7cb926d04fd48251820b6034ae55082a2..08e3f5972214e38218ec72e1a37ec5529aba1e4d 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>
@@ -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_];
@@ -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
 }