Remove the bogus fixme.

[lyx.git] / src / Cursor.cpp

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index acc3f0e8e59a4d3b783bd94003371dac0f532c73..00963af21d2385883dc0568144c8a327062cb9a9 100644 (file)
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -27,7 +27,6 @@
 #include "FuncRequest.h"
 #include "Language.h"
 #include "LyXAction.h"
-#include "LyXFunc.h" // only for setMessage()
 #include "LyXRC.h"
 #include "Paragraph.h"
 #include "ParIterator.h"
@@ -315,6 +314,12 @@ bool Cursor::getStatus(FuncRequest const & cmd, FuncStatus & status) const
 }
 
 
+void Cursor::saveBeforeDispatchPosXY()
+{
+       getPos(beforeDispatchPosX_, beforeDispatchPosY_);
+}
+
+
 void Cursor::dispatch(FuncRequest const & cmd0)
 {
        LYXERR(Debug::DEBUG, "cmd: " << cmd0 << '\n' << *this);
@@ -1662,8 +1667,8 @@ bool Cursor::upDownInMath(bool up)
        int xo = 0;
        int yo = 0;
        getPos(xo, yo);
-       xo = theLyXFunc().cursorBeforeDispatchX();
-       
+       xo = beforeDispatchPosX_;
+
        // check if we had something else in mind, if not, this is the future
        // target
        if (x_target_ == -1)
@@ -1712,7 +1717,7 @@ bool Cursor::upDownInMath(bool up)
                                int x;
                                int y;
                                getPos(x, y);
-                               int oy = theLyXFunc().cursorBeforeDispatchY();
+                               int oy = beforeDispatchPosY_;
                                if ((!up && y <= oy) ||
                                                (up && y >= oy))
                                        operator=(old);
@@ -1733,7 +1738,7 @@ bool Cursor::upDownInMath(bool up)
                                int x;
                                int y;
                                getPos(x, y);
-                               int oy = theLyXFunc().cursorBeforeDispatchY();
+                               int oy = beforeDispatchPosY_;
                                if ((!up && y <= oy) ||
                                                (up && y >= oy))
                                        operator=(old);
@@ -1757,7 +1762,7 @@ bool Cursor::upDownInMath(bool up)
                //lyxerr << "updown: popBackward succeeded" << endl;
                int xnew;
                int ynew;
-               int yold = theLyXFunc().cursorBeforeDispatchY();
+               int yold = beforeDispatchPosY_;
                getPos(xnew, ynew);
                if (up ? ynew < yold : ynew > yold)
                        return true;
@@ -1799,7 +1804,7 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
        int xo = 0;
        int yo = 0;
        getPos(xo, yo);
-       xo = theLyXFunc().cursorBeforeDispatchX();
+       xo = beforeDispatchPosX_;
 
        // update the targetX - this is here before the "return false"
        // to set a new target which can be used by InsetTexts above
@@ -1983,13 +1988,14 @@ void Cursor::handleFont(string const & font)
 
 void Cursor::message(docstring const & msg) const
 {
-       theLyXFunc().setMessage(msg);
+       disp_.setMessage(msg);
 }
 
 
 void Cursor::errorMessage(docstring const & msg) const
 {
-       theLyXFunc().setErrorMessage(msg);
+       disp_.setMessage(msg);
+       disp_.setError(true);
 }