Fix bug #6280: Wrong context menu is opened in an auto-opened inset.

[lyx.git] / src / insets / Inset.h

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 3e2cc24314d486945e774ec83e87cdd178820fad..10e1f4a28c940b68aa3c35fd11963db8f405da94 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -27,7 +27,6 @@ namespace lyx {
 
 class BiblioInfo;
 class Buffer;
-class BufferParams;
 class BufferView;
 class Change;
 class CompletionList;
@@ -97,8 +96,9 @@ public:
        virtual ~Inset() {}
 
        /// change associated Buffer
-       /// FIXME this should go.
        virtual void setBuffer(Buffer & buffer);
+       /// remove the buffer reference
+       void resetBuffer() { setBuffer( *static_cast<Buffer *>(0)); }
        /// retrieve associated Buffer
        virtual Buffer & buffer();
        virtual Buffer const & buffer() const;
@@ -121,6 +121,8 @@ public:
 
        /// identification as math inset
        virtual InsetMath * asInsetMath() { return 0; }
+       /// identification as math inset
+       virtual InsetMath const * asInsetMath() const { return 0; }
        /// true for 'math' math inset, but not for e.g. mbox
        virtual bool inMathed() const { return false; }
        /// is this inset based on the InsetText class?
@@ -307,7 +309,7 @@ public:
        virtual bool hasSettings() const;
        /// can we go further down on mouse click?
        // true for InsetCaption, InsetCollapsables (not ButtonOnly), InsetTabular
-       virtual bool descendable() const { return false; }
+       virtual bool descendable(BufferView const &) const { return false; }
        /// is this an inset that can be moved into?
        /// FIXME: merge with editable()
        // true for InsetTabular & InsetText
@@ -487,9 +489,9 @@ public:
        /// set the change for the entire inset
        virtual void setChange(Change const &) {}
        /// accept the changes within the inset
-       virtual void acceptChanges(BufferParams const &) {};
+       virtual void acceptChanges() {};
        /// reject the changes within the inset
-       virtual void rejectChanges(BufferParams const &) {};
+       virtual void rejectChanges() {};
 
        ///
        virtual Dimension const dimension(BufferView const &) const;