bug + spped fixes + small stuff

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

diff --git a/src/mathed/math_nestinset.h b/src/mathed/math_nestinset.h
index 853a33aa54f7a8ca89f0b4cf0943d50987a45038..471e0bb2829c3d02a9d39a8a904c332bee26002b 100644 (file)
--- a/src/mathed/math_nestinset.h
+++ b/src/mathed/math_nestinset.h
@@ -31,8 +31,7 @@ public:
        /// draw background if locked
        void draw(PainterInfo & pi, int x, int y) const;
        /// draw selection background
-       void drawSelection(PainterInfo & pi,
-               idx_type idx1, pos_type pos1, idx_type idx2, pos_type pos2) const;
+       void drawSelection(PainterInfo & pi, int x, int y) const;
        /// appends itself with macro arguments substituted
        void substitute(MathMacro const & macro);
        /// identifies NestInsets
@@ -42,7 +41,9 @@ public:
        /// get cursor position
        void getCursorPos(CursorSlice const & cur, int & x, int & y) const;
        ///
-       void edit(LCursor & cur, int, int);
+       void edit(LCursor & cur, bool left);
+       ///
+       void edit(LCursor & cur, int x, int y);
 
        /// order of movement through the cells when pressing the left key
        bool idxLeft(LCursor &) const;
@@ -97,6 +98,7 @@ public:
        void write(WriteStream & os) const;
        /// writes [, name(), and args in []
        void normalize(NormalStream & os) const;
+
 protected:
        ///
        DispatchResult priv_dispatch(LCursor & cur, FuncRequest const & cmd);
@@ -106,6 +108,16 @@ protected:
        ///
        void handleFont2(LCursor & cur, std::string const & arg);
 
+
+private:
+       /// lfun handler
+       DispatchResult lfunMousePress(LCursor &, FuncRequest const &);
+       ///
+       DispatchResult lfunMouseRelease(LCursor &, FuncRequest const &);
+       ///
+       DispatchResult lfunMouseMotion(LCursor &, FuncRequest const &);
+
+protected:
        /// we store the cells in a vector
        typedef std::vector<MathArray> cells_type;
        /// thusly: