Compile fix gcc 2.95 + stlport

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

diff --git a/src/mathed/math_nestinset.h b/src/mathed/math_nestinset.h
index 9fd8401a81fd5ded46367c04c279b50eaf8108ca..77ce4d5e56d122eb7c3974fc12988af320f4c663 100644 (file)
--- a/src/mathed/math_nestinset.h
+++ b/src/mathed/math_nestinset.h
@@ -25,14 +25,13 @@ public:
        /// nestinsets have a fixed size to start with
        explicit MathNestInset(idx_type ncells);
 
-       /// the size is usuall some sort of convex hull of the cells
+       /// the size is usually some sort of convex hull of the cells
        /// hides inset::metrics() intentionally!
        void metrics(MetricsInfo const & mi) const;
        /// 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
@@ -40,7 +39,9 @@ public:
        /// identifies NestInsets
        MathNestInset const * asNestInset() const { return this; }
        /// get cursor position
-       void getScreenPos(idx_type idx, pos_type pos, int & x, int & y) const;
+       void getCursorPos(CursorSlice const & cur, int & x, int & y) const;
+       ///
+       void edit(LCursor & cur, int, int);
 
        /// order of movement through the cells when pressing the left key
        bool idxLeft(LCursor &) const;
@@ -90,8 +91,6 @@ public:
 
        /// debug helper
        void dump() const;
-       /// is the cursor currently somewhere within this inset?
-       virtual bool editing() const;
 
        /// writes \\, name(), and args in braces and '\\lyxlock' if necessary
        void write(WriteStream & os) const;
@@ -99,9 +98,12 @@ public:
        void normalize(NormalStream & os) const;
 protected:
        ///
-       virtual
-       DispatchResult
-       priv_dispatch(BufferView & bv, FuncRequest const & cmd);
+       DispatchResult priv_dispatch(LCursor & cur, FuncRequest const & cmd);
+       ///
+       void handleFont(LCursor & cur,
+               std::string const & arg, std::string const & font);
+       ///
+       void handleFont2(LCursor & cur, std::string const & arg);
 
        /// we store the cells in a vector
        typedef std::vector<MathArray> cells_type;
@@ -109,16 +111,6 @@ protected:
        cells_type cells_;
        /// if the inset is locked, it can't be entered with the cursor
        bool lock_;
-
-       /// draw four angular markers
-       void drawMarkers(PainterInfo & pi, int x, int y) const;
-       /// draw two angular markers
-       void drawMarkers2(PainterInfo & pi, int x, int y) const;
-
-       /// add space for markers
-       void metricsMarkers(int frame = 1) const;
-       /// add space for markers
-       void metricsMarkers2(int frame = 1) const;
 };
 
 #endif