fix small clash between patches

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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index f79d824ece94de7d53313fe721595311ee3475e9..0af93679a4fa164225414c52e9d7bce96f8caa34 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-17  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * insettext.C (insetButtonRelease): fix compile problem
+
 2001-12-17  Juergen Vigna  <jug@sad.it>
 
        * insettext.C (insetButtonPress): set the selection cursor!
@@ -11,7 +15,7 @@
        can be opened.
 
        * insetcollapsable.C (insetButtonRelease): changed so that it can
-       open evetual existing popup dialogs on mousebutton==3.
+       open eventual existing popup dialogs on mousebutton==3.
 
        * insetfloat.C (insetButtonRelease): removed not needed anymore!
 

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 0ee5f7979c411dc4fb33f10c076d9759b27f356b..3bd324d4676acf2006294d2b0c98aaad2d503cf6 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -1009,7 +1009,7 @@ bool InsetText::insetButtonRelease(BufferView * bv, int x, int y, int button)
        }
        int tmp_x = x - drawTextXOffset;
        int tmp_y = y + insetAscent - getLyXText(bv)->first;
-       Inset * inset = bv->checkInsetHit(getLyXText(bv), tmp_x, tmp_y, button);
+       Inset * inset = bv->checkInsetHit(getLyXText(bv), tmp_x, tmp_y);
        bool ret = false;
        if (inset) {
                if (isHighlyEditableInset(inset)) {