correct ifdef+defined construct

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34813 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 04d6fa96a4211f85758ceb06633737cab3824f9e..801dff7ab3a15b977cda274ab10aa83d53be2e64 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -1328,7 +1328,7 @@ SpellChecker * theSpellChecker()
 
 void setSpellChecker()
 {
-#ifdef USE_MACOSX_PACKAGING || defined(LYX_PLATFORM_DARWIN10)
+#if defined(USE_MACOSX_PACKAGING) || defined(LYX_PLATFORM_DARWIN10)
        if (lyxrc.spellchecker == "native") {
                if (!singleton_->pimpl_->apple_spell_checker_)
                        singleton_->pimpl_->apple_spell_checker_ = new AppleSpellChecker();

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 79c39d29b9a9ce816e40a9b40306e8abd7e364b0..f1a37e99c0cc5d0ae87c39e82d2d0814cfdb5139 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -286,7 +286,7 @@ void LyXRC::setDefaults()
        display_graphics = true;
        // Spellchecker settings:
 // FIXME: this check should test the target platform (darwin)
-#ifdef USE_MACOSX_PACKAGING || defined(LYX_PLATFORM_DARWIN10)
+#if defined(USE_MACOSX_PACKAGING) || defined(LYX_PLATFORM_DARWIN10)
        spellchecker = "native";
 #elif defined(USE_ASPELL)
        spellchecker = "aspell";

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 8ee71f911bb7f142dd960ad9c2ddcbaf57dea9d4..38c5d314a3485ebe1ebe2e54e9618a54e72872ba 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -1336,7 +1336,7 @@ PrefSpellchecker::PrefSpellchecker(GuiPreferences * form)
        setupUi(this);
 
 // FIXME: this check should test the target platform (darwin)
-#ifdef USE_MACOSX_PACKAGING
+#if defined(USE_MACOSX_PACKAGING) || defined(LYX_PLATFORM_DARWIN10)
        spellcheckerCB->addItem(qt_("native"), QString("native"));
 #define CONNECT_APPLESPELL
 #else