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

diff --git a/src/ChangeLog b/src/ChangeLog
index 5d6e0e4ba75f1e9f8914d21ec18fe5f2fe206bb0..86e3bdc936b963b0e25f57d669cb7f3762615705 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-28  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * Makefile.am (lyx_SOURCES): remove vms_defines.h
+
 2002-02-27  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * text2.C (setLayout): get rid of redundant code

diff --git a/src/Makefile.am b/src/Makefile.am
index 13818ac81e666ba3a1e1e547212d5d020a4032f8..47b2abe95fed66294a7665ebec95a4b70d06c4a0 100644 (file)
--- 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 bed1020648d4af8a854da3a65170eb6813932ddc..f0a1e093686624fcb73b5275a4b85b5003fd7c8d 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-28  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * 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  <lasgouttes@freesurf.fr>
 
        * insetcommand.C (insetButtonRelease): ... and move it here.

diff --git a/src/insets/inset.h b/src/insets/inset.h
index 5093c3eeea3ffd7cb1fd92c061a9e791998a005a..b17950499c377e366f01fe6a7632cb996314e263 100644 (file)
--- 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 7dd367698dc0e18a9b42723b1de0e0b8a81f5869..a5d2f391c5d230700939757af3c76fd4282d4bdd 100644 (file)
--- 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 2977beb283bfb0dce26287d7dc0f440aa2e6d97c..b3a78524d9369ec45e542d9e6019d4bb73d6d65d 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -121,8 +121,6 @@ public:
        void setParams(InsetCommandParams const &);
        ///
        SigC::Signal0<void> hideDialog;
-       ///
-       bool insetButtonRelease(BufferView *, int x, int y, int button);
 
 private:
        ///