the spellcheck cleanup

[lyx.git] / src / text3.C

diff --git a/src/text3.C b/src/text3.C
index 62eaa28e74dc0f4525066eef48a66c8f8c53d47f..5635facaa402ba1f98555c350f29ff7e2ded670f 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -21,6 +21,7 @@
 #include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
+#include "dispatchresult.h"
 #include "factory.h"
 #include "funcrequest.h"
 #include "gettext.h"
@@ -259,7 +260,7 @@ void LyXText::cursorPrevious()
                return;
        }
 
-       setCursorFromCoordinates(cursor.x_fix(), y);
+       setCursorFromCoordinates(bv()->x_target(), y);
        finishUndo();
 
        if (crit == bv()->text->cursorRow()) {
@@ -312,7 +313,7 @@ void LyXText::cursorNext()
        Row const & rr = *getRowNearY(y, dummypit);
        y = dummypit->y + rr.y_offset();
 
-       setCursorFromCoordinates(cursor.x_fix(), y);
+       setCursorFromCoordinates(bv()->x_target(), y);
        // + bv->workHeight());
        finishUndo();
 
@@ -389,7 +390,7 @@ void doInsertInset(LyXText * lt, FuncRequest const & cmd,
 } // anon namespace
 
 
-dispatch_result LyXText::dispatch(FuncRequest const & cmd)
+DispatchResult LyXText::dispatch(FuncRequest const & cmd)
 {
        lyxerr[Debug::ACTION] << "LyXText::dispatch: action[" << cmd.action
                              <<"] arg[" << cmd.argument << ']' << "xy[" <<
@@ -981,14 +982,14 @@ dispatch_result LyXText::dispatch(FuncRequest const & cmd)
 
        case LFUN_BEGINNINGBUFSEL:
                if (inset_owner)
-                       return UNDISPATCHED;
+                       return DispatchResult(false);
                cursorTop();
                finishChange(bv, true);
                break;
 
        case LFUN_ENDBUFSEL:
                if (inset_owner)
-                       return UNDISPATCHED;
+                       return DispatchResult(false);
                cursorBottom();
                finishChange(bv, true);
                break;
@@ -1325,7 +1326,7 @@ dispatch_result LyXText::dispatch(FuncRequest const & cmd)
                        bv->text->setCursorFromCoordinates(x, y + screen_first);
                finishUndo();
                bv->text->selection.cursor = bv->text->cursor;
-               bv->text->cursor.x_fix(bv->text->cursor.x());
+               bv->x_target(bv->text->cursor.x());
 
                if (bv->fitCursor())
                        selection_possible = false;
@@ -1533,8 +1534,8 @@ dispatch_result LyXText::dispatch(FuncRequest const & cmd)
                break;
 
        default:
-               return UNDISPATCHED;
+               return DispatchResult(false);
        }
 
-       return DISPATCHED;
+       return DispatchResult(true, true);
 }