Fix bug 2474; partial fix for 1777. Added last_reference_ member to QRef class and...

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index c61681ed4aaba67be61bca1ac284c82652fd8d21..7a05ca4325cf0b745aa596d74f354dac812ed34c 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -548,25 +548,24 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
                string const name = cmd.getArg(0);
                if (!buf)
                        enable = name == "aboutlyx"
-                               || name == "file"
-                               || name == "forks"
+                               || name == "file" //FIXME: should be removed.
                                || name == "prefs"
                                || name == "texinfo";
                else if (name == "print")
                        enable = Exporter::isExportable(*buf, "dvi")
                                && lyxrc.print_command != "none";
-               else if (name == "character" || name == "mathpanel")
+               else if (name == "character")
                        enable = cur.inset().lyxCode() != InsetBase::ERT_CODE;
                else if (name == "latexlog")
                        enable = isFileReadable(FileName(buf->getLogName().second));
-#if !defined (USE_ASPELL) && !defined (USE_ISPELL) && !defined (USE_PSPELL)
                else if (name == "spellchecker")
+#if defined (USE_ASPELL) || defined (USE_ISPELL) || defined (USE_PSPELL)
+                       enable = !buf->isReadonly();
+#else
                        enable = false;
 #endif
                else if (name == "vclog")
                        enable = buf->lyxvc().inUse();
-               else if (name == "view-source")
-                       enable = buf;
                break;
        }
 
@@ -609,9 +608,9 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
                break;
 
        case LFUN_TOOLBAR_TOGGLE_STATE: {
-               ToolbarBackend::Flags flags = lyx_view_->getToolbarState(to_utf8(cmd.argument()));
-               if (!(flags & ToolbarBackend::AUTO))
-                       flag.setOnOff(flags & ToolbarBackend::ON);
+               ToolbarInfo::Flags flags = lyx_view_->getToolbarState(to_utf8(cmd.argument()));
+               if (!(flags & ToolbarInfo::AUTO))
+                       flag.setOnOff(flags & ToolbarInfo::ON);
                break;
        }