* lyx_gui: parse_lyxrc() and getStatus() methods deleted.

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

diff --git a/src/frontends/lyx_gui.C b/src/frontends/lyx_gui.C
index b401f319d32f8361d7ddab07548396d2e52d34f1..951e2a2827476efd19a6be71c2c2cb12d7adb6c3 100644 (file)
--- a/src/frontends/lyx_gui.C
+++ b/src/frontends/lyx_gui.C
@@ -15,8 +15,6 @@
 
 #include "Application.h"
 
-#include "funcrequest.h"
-
 using std::string;
 
 lyx::frontend::Application * theApp;
@@ -26,23 +24,4 @@ namespace lyx_gui {
 
 bool use_gui = true;
 
-void parse_lyxrc()
-{}
-
-
-FuncStatus getStatus(FuncRequest const & ev)
-{
-       FuncStatus flag;
-       switch (ev.action) {
-       case LFUN_TOOLTIPS_TOGGLE:
-               flag.unknown(true);
-               break;
-       default:
-               break;
-       }
-
-       return flag;
-}
-
-
 }; // namespace lyx_gui

diff --git a/src/frontends/lyx_gui.h b/src/frontends/lyx_gui.h
index 50628c2d877448b74f6b1c42c86f4ebbb54a991e..22ed0f1360e84ae6d66f4d84a4078e3c22ad72cc 100644 (file)
--- a/src/frontends/lyx_gui.h
+++ b/src/frontends/lyx_gui.h
@@ -36,12 +36,6 @@ namespace lyx_gui {
 /// are we using the GUI at all
 extern bool use_gui;
 
-/**
- * set up GUI parameters. At this point lyxrc may
- * be used.
- */
-void parse_lyxrc();
-
 /**
  * Enter the main event loop (\sa LyX::exec2)
  */
@@ -52,12 +46,6 @@ int exec(int & argc, char * argv[]);
  */
 void sync_events();
 
-/**
- * return the status flag for a given action. This can be used to tell
- * that a given lfun is not implemented by a frontend
- */
-FuncStatus getStatus(FuncRequest const & ev);
-
 /**
  * Given col, fills r, g, b in the range 0-255.
  * The function returns true if successful.

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 828a66bedf1d5c7b47becdcc4d7fac08c197bf23..958f2fdd39a9bc4fe48183b28ad16976cfc56bbc 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -250,9 +250,6 @@ int LyX::exec2(int & argc, char * argv[])
        if (!success)
                return EXIT_FAILURE;
 
-       if (lyx_gui::use_gui)
-               lyx_gui::parse_lyxrc();
-
        vector<string> files;
 
        for (int argi = argc - 1; argi >= 1; --argi)

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 783bef10f036a30e8e8e3fd0e79cfe754278f67f..6945cc176d652c568ed21445c216133108fa55b2 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -368,8 +368,13 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
                flag.unknown(true);
                flag.enabled(false);
                break;
+
+       case LFUN_TOOLTIPS_TOGGLE:
+               flag.unknown(true);
+               break;
+
        default:
-               flag |= lyx_gui::getStatus(cmd);
+               break;
        }
 
        if (flag.unknown()) {