Better fix for bug #8679

[lyx.git] / src / mathed / InsetMathNest.h

diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index ac95fbb35381ac7094c8ca1a5bd9a7b57e26e411..a503fb96db3563c7ce2f527c5ba8985db940ec35 100644 (file)
--- a/src/mathed/InsetMathNest.h
+++ b/src/mathed/InsetMathNest.h
@@ -14,8 +14,7 @@
 
 #include "InsetMath.h"
 
-// FIXME: remove
-#include "support/docstring.h"
+#include <map>
 
 namespace lyx {
 
@@ -29,7 +28,7 @@ public:
        /// nestinsets have a fixed size to start with
        InsetMathNest(Buffer * buf, idx_type ncells);
        ///
-       virtual ~InsetMathNest() {}
+       virtual ~InsetMathNest();
        ///
        void setBuffer(Buffer &);
 
@@ -44,7 +43,7 @@ public:
        void drawDecoration(PainterInfo & pi, int x, int y) const
        { drawMarkers(pi, x, y); }
        ///
-       void updateLabels(ParIterator const &, UpdateType);
+       void updateBuffer(ParIterator const &, UpdateType);
        /// identifies NestInsets
        InsetMathNest * asNestInset() { return this; }
        /// identifies NestInsets
@@ -109,11 +108,12 @@ public:
        /// writes [, name(), and args in []
        void normalize(NormalStream & os) const;
        ///
-       int latex(odocstream & os, OutputParams const & runparams) const;
+       void latex(otexstream & os, OutputParams const & runparams) const;
        ///
-       bool setMouseHover(bool mouse_hover);
+       bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
        ///
-       bool mouseHovered() const { return mouse_hover_; }
+       bool mouseHovered(BufferView const * bv) const 
+               { return mouse_hover_[bv]; }
 
        ///
        bool completionSupported(Cursor const &) const;
@@ -169,7 +169,7 @@ public:
        /// interpret \p str and insert the result at the current position of
        /// \p cur if it is something known. Return whether \p cur was
        /// inserted.
-       bool interpretString(Cursor & cur, docstring const & str);
+       virtual bool interpretString(Cursor & cur, docstring const & str);
 
 private:
        /// lfun handler
@@ -194,8 +194,8 @@ protected:
        /// if the inset is locked, it can't be entered with the cursor
        bool lock_;
        ///
-       bool mouse_hover_;
-};
+       mutable std::map<BufferView const *, bool> mouse_hover_;
+};