last commit was incomplete... not sure how I managed this..

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

diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index 18ba304c9b7840eb12090e3d5a383b108ab241f8..3e8e1a7087904a898e6504930d9fc5dae39eea67 100644 (file)
--- a/src/mathed/InsetMathNest.h
+++ b/src/mathed/InsetMathNest.h
@@ -12,7 +12,7 @@
 #ifndef MATH_NESTINSET_H
 #define MATH_NESTINSET_H
 
-#include "InsetMathDim.h"
+#include "InsetMath.h"
 
 
 namespace lyx {
@@ -23,10 +23,12 @@ namespace lyx {
     single symbol.
 */
 
-class InsetMathNest : public InsetMathDim {
+class InsetMathNest : public InsetMath {
 public:
        /// nestinsets have a fixed size to start with
        explicit InsetMathNest(idx_type ncells);
+       ///
+       virtual ~InsetMathNest() {}
 
        /// the size is usually some sort of convex hull of the cells
        /// hides inset::metrics() intentionally!
@@ -48,7 +50,7 @@ public:
        ///
        void edit(Cursor & cur, bool left);
        ///
-       InsetBase * editXY(Cursor & cur, int x, int y);
+       Inset * editXY(Cursor & cur, int x, int y);
 
        /// order of movement through the cells when pressing the left key
        bool idxLeft(Cursor &) const;
@@ -77,8 +79,8 @@ public:
        /// direct access to the cell.
        /// inlined because shows in profile.
        //@{
-       MathArray & cell(idx_type i) { return cells_[i]; }
-       MathArray const & cell(idx_type i) const { return cells_[i]; }
+       MathData & cell(idx_type i) { return cells_[i]; }
+       MathData const & cell(idx_type i) const { return cells_[i]; }
        //@}
 
        /// can we move into this cell (see macroarg.h)
@@ -89,9 +91,9 @@ public:
        /// replace in all cells
        void replace(ReplaceData &);
        /// do we contain a given pattern?
-       bool contains(MathArray const &) const;
+       bool contains(MathData const &) const;
        /// glue everything to a single cell
-       MathArray glue() const;
+       MathData glue() const;
 
        /// debug helper
        void dump() const;
@@ -103,8 +105,17 @@ public:
        ///
        int latex(Buffer const &, odocstream & os,
                        OutputParams const & runparams) const;
+       ///
+       bool setMouseHover(bool mouse_hover);
+       ///
+       bool mouseHovered() const { return mouse_hover_; }
 
 protected:
+       ///
+       InsetMathNest(InsetMathNest const & inset);
+       ///
+       InsetMathNest & operator=(InsetMathNest const &);
+
        ///
        virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
        /// do we want to handle this event?
@@ -141,11 +152,13 @@ private:
 
 protected:
        /// we store the cells in a vector
-       typedef std::vector<MathArray> cells_type;
+       typedef std::vector<MathData> cells_type;
        /// thusly:
        cells_type cells_;
        /// if the inset is locked, it can't be entered with the cursor
        bool lock_;
+       ///
+       bool mouse_hover_;
 };