Update the GuiLabel view when the document is read-only. Also disable the text field.

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index f09edcdda24f483cb56469e4fb9ea4c88d5f4cce..7b5c07636f00556e3b9fa21e5d44ecc3a9424b2c 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -132,7 +132,8 @@ struct LyX::Impl
 
        ~Impl()
        {
-               delete spell_checker_;
+               delete aspell_checker_;
+               delete hunspell_checker_;
        }
 
        /// our function handler
@@ -226,7 +227,6 @@ LyX::LyX()
 {
        singleton_ = this;
        pimpl_ = new Impl;
-       setSpellChecker();
 }
 
 
@@ -750,7 +750,7 @@ bool LyX::init()
        if (!LyXSetStyle())
                return false;
        //...and the modules
-       moduleList.read();
+       theModuleList.read();
 
        // read keymap and ui files in batch mode as well
        // because InsetInfo needs to know these to produce
@@ -765,8 +765,6 @@ bool LyX::init()
        // load user bind file user.bind
        pimpl_->toplevel_keymap_.read("user", 0, KeyMap::MissingOK);
 
-       pimpl_->lyxfunc_.initKeySequences(&pimpl_->toplevel_keymap_);
-
        if (lyxerr.debugging(Debug::LYXRC))
                lyxrc.print();
 
@@ -959,7 +957,7 @@ int parse_dbg(string const & arg, string const &, string &)
        }
        lyxerr << to_utf8(bformat(_("Setting debug level to %1$s"), from_utf8(arg))) << endl;
 
-       lyxerr.level(Debug::value(arg));
+       lyxerr.setLevel(Debug::value(arg));
        Debug::showLevel(lyxerr, lyxerr.level());
        return 1;
 }
@@ -1274,6 +1272,8 @@ CmdDef & theTopLevelCmdDef()
 
 SpellChecker * theSpellChecker()
 {
+       if (!singleton_->pimpl_->spell_checker_)
+               setSpellChecker();
        return singleton_->pimpl_->spell_checker_;
 }