#7379 avoid the wrap spell check question when buffer is empty

[lyx.git] / src / insets / InsetInfo.cpp

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 4dbee710aee6b839b43d6d05c2fe5ef3e9699336..acea3acb25acdbcd1d3a9496e846a5b723ec8eea 100644 (file)
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -27,6 +27,7 @@
 #include "LyXVC.h"
 #include "Lexer.h"
 #include "ParagraphParameters.h"
+#include "version.h"
 
 #include "frontends/Application.h"
 
@@ -358,6 +359,10 @@ void InsetInfo::updateInfo()
                        break;
                }
                // iterate through the menubackend to find it
+               if (!theApp()) {
+                       error("Can't determine menu entry for action %1$s in batch mode");
+                       break;
+               }
                if (!theApp()->searchMenu(func, names)) {
                        error("No menu entry for action %1$s");
                        break;
@@ -389,11 +394,15 @@ void InsetInfo::updateInfo()
        }
        case ICON_INFO: {
                FuncRequest func = lyxaction.lookupFunc(name_);
-               docstring icon_name = theApp()->iconName(func, true);
+               docstring icon_name = frontend::Application::iconName(func, true);
                //FIXME: We should use the icon directly instead of
                // going through FileName. The code below won't work
                // if the icon is embedded in the executable through
                // the Qt resource system.
+               // This is only a negligible performance problem:
+               // If the installed icon differs from the resource icon the
+               // installed one is preferred anyway, and all icons that are
+               // embedded in the resources are installed as well.
                FileName file(to_utf8(icon_name));
                if (!file.exists())
                        break;
@@ -446,12 +455,20 @@ void InsetInfo::updateInfo()
        }
        case LYX_INFO:
                if (name_ == "version")
-                       setText(from_ascii(PACKAGE_VERSION));
+                       setText(from_ascii(lyx_version));
                break;
        }
 }
 
 
+docstring InsetInfo::contextMenu(BufferView const &, int, int) const
+{
+       //FIXME: We override the implementation of InsetCollapsable,
+       //because this inset is not a collapsable inset.
+       return contextMenuName();
+}
+
+
 docstring InsetInfo::contextMenuName() const
 {
        return from_ascii("context-info");