From 12d3ca28862982e724d8d542d88e72a7e19ded6c Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 17 Dec 2001 15:08:51 +0000 Subject: [PATCH] fix small clash between patches git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3229 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 6 +++++- src/insets/insettext.C | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index f79d824ece..0af93679a4 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2001-12-17 Jean-Marc Lasgouttes + + * insettext.C (insetButtonRelease): fix compile problem + 2001-12-17 Juergen Vigna * 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 0ee5f7979c..3bd324d467 100644 --- 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)) { -- 2.39.2