use LCursor & in notifyCursorLeave

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

diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h
index 77115c1bf5fffa09c7f039c75f05060766c0785f..bd1e3054d74f1272032807f5cef14ccceb45c16d 100644 (file)
--- a/src/insets/insetbase.h
+++ b/src/insets/insetbase.h
@@ -67,12 +67,14 @@ public:
        virtual MathInset * asMathInset() { return 0; }
        /// identification as non-math inset
        virtual UpdatableInset * asUpdatableInset() { return 0; }
+       /// true for 'math' math inset, but not for e.g. mbox
+       virtual bool inMathed() const { return false; }
 
        // the real dispatcher
-       void dispatch(LCursor & cur, FuncRequest const & cmd);
+       void dispatch(LCursor & cur, FuncRequest & cmd);
        /// do we want to handle this event?
        virtual bool getStatus(LCursor & cur, FuncRequest const & cmd,
-               FuncStatus & status);
+               FuncStatus & status) const;
 
        /// cursor enters
        virtual void edit(LCursor & cur, bool left);
@@ -105,7 +107,7 @@ public:
        virtual bool covers(int x, int y) const;
        /// get the screen positions of the cursor (see note in cursor.C)
        virtual void getCursorPos(CursorSlice const & cur, int & x, int & y) const;
- 
+
        /// is this an inset that can be moved into?
        virtual bool isActive() const { return nargs() > 0; }
        /// Where should we go when we press the up or down cursor key?
@@ -127,11 +129,6 @@ public:
        /// Target pos when we enter the inset from the right by pressing "Left"
        virtual bool idxLast(LCursor &) const { return false; }
 
-       /// Where should we go if we press home?
-       virtual bool idxHome(LCursor &) const { return false; }
-       /// Where should we go if we press end?
-       virtual bool idxEnd(LCursor &) const { return false; }
-
        /// Delete a cell and move cursor
        virtual bool idxDelete(idx_type &) { return false; }
        /// pulls cell after pressing erase
@@ -150,16 +147,14 @@ public:
        virtual int cellXOffset(idx_type) const { return 0; }
        /// any additional y-offset when drawing a cell?
        virtual int cellYOffset(idx_type) const { return 0; }
-       /// can we enter this cell?
-       virtual bool validCell(idx_type) const { return true; }
-       /// number of embedded cells
-       virtual size_t nargs() const { return 0; }
-       /// number of rows in gridlike structures
-       virtual size_t nrows() const { return 0; }
-       /// number of columns in gridlike structures
-       virtual size_t ncols() const { return 0; }
+       /// number of embedded cells
+       virtual size_t nargs() const { return 0; }
+       /// number of rows in gridlike structures
+       virtual size_t nrows() const { return 0; }
+       /// number of columns in gridlike structures
+       virtual size_t ncols() const { return 0; }
        /// is called when the cursor leaves this inset
-       virtual void notifyCursorLeaves(idx_type) {}
+       virtual void notifyCursorLeaves(LCursor &) {}
 
        /// request "external features"
        virtual void validate(LaTeXFeatures &) const {}
@@ -303,6 +298,12 @@ public:
                ///
                MATHHULL_CODE
        };
+
+       /** returns the Code corresponding to the \c name.
+        *  Eg, translate("branch") == BRANCH_CODE
+        */
+       static Code translate(std::string const & name);
+
        /// returns true the inset can hold an inset of given type
        virtual bool insetAllowed(Code) const { return false; }
        // if this inset has paragraphs should they be output all as default
@@ -354,7 +355,7 @@ public:
        virtual void addPreview(lyx::graphics::PreviewLoader &) const {}
 protected:
        // the real dispatcher
-       virtual void priv_dispatch(LCursor & cur, FuncRequest const & cmd);
+       virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd);
 public:
        /// returns LyX code associated with the inset. Used for TOC, ...)
        virtual Code lyxCode() const { return NO_CODE; }
@@ -364,11 +365,6 @@ public:
        /// return text or mathmode if that is possible to determine
        virtual mode_type currentMode() const { return UNDECIDED_MODE; }
 
-       /// FIXME: This ought to die.
-       virtual void setOwner(UpdatableInset *) {}
-       ///
-       virtual UpdatableInset * owner() const { return 0; }
-
        /// is this inset allowed within a font change?
        virtual bool noFontChange() const { return false; }