Fix working of the spellchecker dialog with ispell when there are no

[lyx.git] / src / ToolbarDefaults.C

diff --git a/src/ToolbarDefaults.C b/src/ToolbarDefaults.C
index 28813df5e8b8bee3c160d6ed0263c42b8b07a83d..83a45ce48c41b7dd9a5ed6d05ef296ed070c3dd8 100644 (file)
--- a/src/ToolbarDefaults.C
+++ b/src/ToolbarDefaults.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  *
  * ====================================================== */
@@ -20,6 +20,7 @@
 #include "lyxlex.h"
 #include "debug.h"
 #include "lyxlex.h"
+#include "support/lstrings.h"
 
 using std::endl;
 
@@ -64,7 +65,6 @@ void ToolbarDefaults::init()
        add(LFUN_DEPTH);
        add(SEPARATOR);
 
-       add(LFUN_TEX);
         add(LFUN_MATH_MODE);
        add(SEPARATOR);
 
@@ -95,13 +95,13 @@ struct keyword_item toolTags[TO_LAST - 1] = {
 void ToolbarDefaults::read(LyXLex & lex) 
 {
        //consistency check
-       if (compare_no_case(lex.GetString(), "toolbar"))
+       if (compare_no_case(lex.getString(), "toolbar")) {
                lyxerr << "Toolbar::read: ERROR wrong token:`"
-                      << lex.GetString() << '\'' << endl;
+                      << lex.getString() << '\'' << endl;
+       }
 
        defaults.clear();
        
-       string func;
        bool quit = false;
        
        lex.pushTable(toolTags, TO_LAST - 1);
@@ -109,11 +109,11 @@ void ToolbarDefaults::read(LyXLex & lex)
        if (lyxerr.debugging(Debug::PARSER))
                lex.printTable(lyxerr);
 
-       while (lex.IsOK() && !quit) {
+       while (lex.isOK() && !quit) {
                switch (lex.lex()) {
                case TO_ADD:
-                       if (lex.next()) {
-                               func = lex.GetString();
+                       if (lex.next(true)) {
+                               string const func = lex.getString();
                                lyxerr[Debug::PARSER]
                                        << "Toolbar::read TO_ADD func: `"
                                        << func << "'" << endl;
@@ -153,8 +153,8 @@ void ToolbarDefaults::add(string const & func)
        int const tf = lyxaction.LookupFunc(func);
 
        if (tf == -1) {
-               lyxerr << "Toolbar::add: no LyX command called`"
-                      << func << "'exists!" << endl; 
+               lyxerr << "Toolbar::add: no LyX command called `"
+                      << func << "' exists!" << endl; 
        } else {
                add(tf);
        }