update SCons

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index e1bb5a92f7b58043dd9ca61bf19ce0184a88f0c4..fda6fc360214d829cb8cdfc42af48b91407b4fc5 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -17,6 +17,7 @@
 
 #include "LyX.h"
 
+#include "AppleSpellChecker.h"
 #include "AspellChecker.h"
 #include "Buffer.h"
 #include "BufferList.h"
@@ -130,7 +131,7 @@ void reconfigureUserLyXDir()
 /// The main application class private implementation.
 struct LyX::Impl
 {
-       Impl() : spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0)
+       Impl() : spell_checker_(0), apple_spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0)
        {
                // Set the default User Interface language as soon as possible.
                // The language used will be derived from the environment
@@ -140,6 +141,7 @@ struct LyX::Impl
 
        ~Impl()
        {
+               delete apple_spell_checker_;
                delete aspell_checker_;
                delete enchant_checker_;
                delete hunspell_checker_;
@@ -187,6 +189,8 @@ struct LyX::Impl
        ///
        SpellChecker * spell_checker_;
        ///
+       SpellChecker * apple_spell_checker_;
+       ///
        SpellChecker * aspell_checker_;
        ///
        SpellChecker * enchant_checker_;
@@ -512,7 +516,7 @@ void LyX::execCommands()
        if (LayoutFileList::get().empty()) {
                switch (Alert::prompt(
                        _("No textclass is found"),
-                       _("LyX will have minimal functionality because no textclasses "
+                       _("LyX will only have minimal functionality because no textclasses "
                                "have been found. You can either try to reconfigure LyX normally, "
                                "try to reconfigure using only the defaults, or continue."),
                        0, 2,
@@ -1324,6 +1328,14 @@ SpellChecker * theSpellChecker()
 
 void setSpellChecker()
 {
+#if defined(USE_MACOSX_PACKAGING)
+       if (lyxrc.spellchecker == "native") {
+               if (!singleton_->pimpl_->apple_spell_checker_)
+                       singleton_->pimpl_->apple_spell_checker_ = new AppleSpellChecker();
+               singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->apple_spell_checker_;
+               return;
+       }
+#endif
 #if defined(USE_ASPELL)
        if (lyxrc.spellchecker == "aspell") {
                if (!singleton_->pimpl_->aspell_checker_)