From b5fcf8a4b842c30377bcd4b86ad1a8517eca7dcc Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 28 Feb 2002 10:43:24 +0000 Subject: [PATCH] next try at fixing 214; dist bugfix from Kayvan git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3602 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 4 ++++ src/Makefile.am | 1 - src/insets/ChangeLog | 7 +++++++ src/insets/inset.h | 7 +++---- src/insets/insetcommand.C | 6 ------ src/insets/insetcommand.h | 2 -- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5d6e0e4ba7..86e3bdc936 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2002-02-28 Jean-Marc Lasgouttes + + * Makefile.am (lyx_SOURCES): remove vms_defines.h + 2002-02-27 Martin Vermeer * text2.C (setLayout): get rid of redundant code diff --git a/src/Makefile.am b/src/Makefile.am index 13818ac81e..47b2abe95f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -229,7 +229,6 @@ lyx_SOURCES = \ vc-backend.h \ version.C \ version.h \ - vms_defines.h \ vspace.C \ vspace.h diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index bed1020648..f0a1e09368 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,10 @@ +2002-02-28 Jean-Marc Lasgouttes + + * inset.h: ... and add a better one here. + + * insetcommand.C (insetButtonRelease): remove that one which was a + bit broken... + 2002-02-27 Jean-Marc Lasgouttes * insetcommand.C (insetButtonRelease): ... and move it here. diff --git a/src/insets/inset.h b/src/insets/inset.h index 5093c3eeea..b17950499c 100644 --- a/src/insets/inset.h +++ b/src/insets/inset.h @@ -160,11 +160,10 @@ public: virtual void insetButtonPress(BufferView *, int, int, int) {} /// This is called when the user releases the button inside an inset // the bool return is used to see if we opened a dialog so that we can - // check this from an outer inset and open the dialog of the outer inset - // if that one has one! - /// + // check this from an outer inset and open the dialog of the + // outer inset if that one has one! virtual bool insetButtonRelease(BufferView *, int, int, int) - { return false; } + { return editable() == IS_EDITABLE; } /// This is called when the user moves the mouse inside an inset virtual void insetMotionNotify(BufferView *, int , int , int) {} /// diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C index 7dd367698d..a5d2f391c5 100644 --- a/src/insets/insetcommand.C +++ b/src/insets/insetcommand.C @@ -217,9 +217,3 @@ int InsetCommand::docbook(Buffer const *, ostream &) const { return 0; } - - -bool InsetCommand::insetButtonRelease(BufferView *, int, int, int) -{ - return true; -} diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h index 2977beb283..b3a78524d9 100644 --- a/src/insets/insetcommand.h +++ b/src/insets/insetcommand.h @@ -121,8 +121,6 @@ public: void setParams(InsetCommandParams const &); /// SigC::Signal0 hideDialog; - /// - bool insetButtonRelease(BufferView *, int x, int y, int button); private: /// -- 2.39.2