Don't put selected stuff into the clipboard on delete and backspace keys

(Patch from Michael Schmitt).

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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 954d997279950a9701752059c9096c1e200fab64..2dcdd1442606b3261894c2b3a0a1d49b9c17ed16 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-07  Juergen Vigna  <jug@lyx.org>
+
+       * insettabular.C (localDispatch): make delete not put the stuff
+       in the clipboard only do this on a cut operation.
+
+       * insettext.C (localDispatch): make delete and backspace not put
+       selected stuff to the clipboard.
 
 2002-08-07  André Pönitz <poenitz@gmx.net>
 

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index b5df68b3eac2856f4227b54d60c4f46ba9c6d2fa..8a4bb1c0b90997967e0c72d22458876560436b75 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -1107,7 +1107,6 @@ InsetTabular::localDispatch(BufferView * bv, FuncRequest const & ev)
        case LFUN_UP_PARAGRAPH:
        case LFUN_UP_PARAGRAPHSEL:
        case LFUN_BACKSPACE:
-       case LFUN_DELETE:
        case LFUN_HOME:
        case LFUN_HOMESEL:
        case LFUN_END:
@@ -1141,6 +1140,8 @@ InsetTabular::localDispatch(BufferView * bv, FuncRequest const & ev)
        case LFUN_CUT:
                if (!copySelection(bv))
                        break;
+               // no break here!
+       case LFUN_DELETE:
                setUndo(bv, Undo::DELETE,
                        bv->text->cursor.par(),
                        bv->text->cursor.par()->next());
@@ -1593,7 +1594,7 @@ void InsetTabular::resetPos(BufferView * bv) const
        } else if ((cursor_.x() - offset) < 20) {
                scroll(bv, 20 - cursor_.x() + offset);
                updateLocal(bv, FULL, false);
-       } else if (scroll(false) && top_x > 20 &&
+       } else if (scroll() && top_x > 20 &&
                   (top_x + tabular->GetWidthOfTabular()) > (bv->workWidth() - 20)) {
                scroll(bv, old_x - cursor_.x());
                updateLocal(bv, FULL, false);

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 93187b791683603e102fbb206ec9217297d429f8..c2aebda3629d89207f4d7cac50ee812f2ea7c3ed 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -1260,7 +1260,7 @@ InsetText::localDispatch(BufferView * bv, FuncRequest const & ev)
                        bv->switchKeyMap();
                        if (lyxrc.auto_region_delete) {
                                if (lt->selection.set()) {
-                                       lt->cutSelection(bv, false);
+                                       lt->cutSelection(bv, false, false);
                                }
                        }
                        lt->clearSelection();
@@ -1332,7 +1332,7 @@ InsetText::localDispatch(BufferView * bv, FuncRequest const & ev)
                setUndo(bv, Undo::DELETE,
                        lt->cursor.par(), lt->cursor.par()->next());
                if (lt->selection.set())
-                       lt->cutSelection(bv);
+                       lt->cutSelection(bv, true, false);
                else
                        lt->backspace(bv);
                updwhat = CURSOR_PAR;
@@ -1344,7 +1344,7 @@ InsetText::localDispatch(BufferView * bv, FuncRequest const & ev)
                setUndo(bv, Undo::DELETE,
                        lt->cursor.par(), lt->cursor.par()->next());
                if (lt->selection.set()) {
-                       lt->cutSelection(bv);
+                       lt->cutSelection(bv, true, false);
                } else {
                        lt->Delete(bv);
                }