update the screen while spellchecking and merging changes

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

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1304ef41bf23484c3e0e6bd39ae41474423f1aa8..8cd4ed3c54bfb7cfa6215a5652f4fdab543d53aa 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -49,6 +49,7 @@ src/frontends/gtk/GMathsMatrix.C
 src/frontends/gtk/GNote.C
 src/frontends/gtk/GParagraph.C
 src/frontends/gtk/GSearch.C
+src/frontends/gtk/GSendto.C
 src/frontends/gtk/GShowFile.C
 src/frontends/gtk/GSpellchecker.C
 src/frontends/gtk/GTableCreate.C

diff --git a/src/ChangeLog b/src/ChangeLog
index 8a02027c49b79dddedb796d1e3d80910f3f0d919..f70d86ac623992bf5951ad28ecf928234f11e054 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-22  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * lyxfind.C (findNextChange): update the bufferview after setting
+       the selection
+
 2004-11-16  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * text3.C (getStatus): disable LFUN_INSET_OPTARG when the max

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 3bcae6a7524c598ce54eef362467ddf1e2acc507..93a04392727dd26ca4e4db8968a8ec7f3c8a2dfa 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-22  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * ControlSpellchecker.C (check): update the view when setting the
+       selection
+
 2004-11-18  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * ControlSpellchecker.C (nextWord): rewrite to skip words

diff --git a/src/frontends/controllers/ControlSpellchecker.C b/src/frontends/controllers/ControlSpellchecker.C
index 9f8098806af4f0686625bf04a9e8935823d702f6..0321b166dcc958c0eb3eea2957d65f9c36e6c159 100644 (file)
--- a/src/frontends/controllers/ControlSpellchecker.C
+++ b/src/frontends/controllers/ControlSpellchecker.C
@@ -199,8 +199,10 @@ void ControlSpellchecker::check()
                word_ = nextWord(cur, start, bufferparams);
 
                // end of document
-               if (getWord().empty())
-                       break;
+               if (getWord().empty()) {
+                       showSummary();
+                       return;
+               }
 
                ++count_;
 
@@ -227,14 +229,15 @@ void ControlSpellchecker::check()
 
        lyxerr[Debug::GUI] << "Found word \"" << getWord() << "\"" << endl;
 
-       if (getWord().empty()) {
-               showSummary();
-               return;
-       }
-
        int const size = getWord().size();
        cur.pos() -= size;
        kernel().bufferview()->putSelectionAt(cur, size, false);
+       // if we used a lfun like in find/replace, dispatch would do
+       // that for us
+       kernel().bufferview()->update();
+       if (kernel().bufferview()->fitCursor())
+               kernel().bufferview()->update();
+
 
        // set suggestions
        if (res != SpellBase::OK && res != SpellBase::IGNORE) {

diff --git a/src/lyxfind.C b/src/lyxfind.C
index ee0f53dda032a15bf2e5a8480ccd156e8ea70a2d..a8100fdd833228507132da5bca9d35f67679cb07 100644 (file)
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -363,6 +363,11 @@ bool findNextChange(BufferView * bv)
        }
        pos_type length = end - pos;
        bv->putSelectionAt(cur, length, false);
+       // if we used a lfun like in find/replace, dispatch would do
+       // that for us
+       bv->update();
+       if (bv->fitCursor())
+               bv->update();
 
        return true;
 }