insetcharstyle drawing cosmetics

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

diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h
index bd1e3054d74f1272032807f5cef14ccceb45c16d..d87ac7c15a96ddae2fb8a22e4215d985d3b5e4b8 100644 (file)
--- a/src/insets/insetbase.h
+++ b/src/insets/insetbase.h
@@ -79,7 +79,7 @@ public:
        /// cursor enters
        virtual void edit(LCursor & cur, bool left);
        /// cursor enters
-       virtual InsetBase * editXY(LCursor & cur, int x, int y);
+       virtual InsetBase * editXY(LCursor & cur, int x, int y) const;
 
        /// compute the size of the object returned in dim
        virtual void metrics(MetricsInfo & mi, Dimension & dim) const = 0;
@@ -98,15 +98,15 @@ public:
        /// add space for markers
        void metricsMarkers2(Dimension & dim, int framesize = 1) const;
        /// last drawn position for 'important' insets
-       virtual int xo() const { return 0; }
+       int xo() const;
        /// last drawn position for 'important' insets
-       virtual int yo() const { return 0; }
+       int yo() const;
        /// set x/y drawing position cache if available
        virtual void setPosCache(PainterInfo const &, int, int) const {}
        /// do we cover screen position x/y?
        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;
+       virtual void getCursorPos(LCursor const & cur, int & x, int & y) const;
 
        /// is this an inset that can be moved into?
        virtual bool isActive() const { return nargs() > 0; }
@@ -294,9 +294,7 @@ public:
                ///
                VSPACE_CODE,
                ///
-               MATHGRID_CODE,
-               ///
-               MATHHULL_CODE
+               MATHMACROARG_CODE
        };
 
        /** returns the Code corresponding to the \c name.
@@ -364,6 +362,8 @@ public:
        enum mode_type {UNDECIDED_MODE, TEXT_MODE, MATH_MODE};
        /// return text or mathmode if that is possible to determine
        virtual mode_type currentMode() const { return UNDECIDED_MODE; }
+       /// returns whether this inset is allowed in other insets of given mode
+       virtual bool allowedIn(mode_type) const { return true; }
 
        /// is this inset allowed within a font change?
        virtual bool noFontChange() const { return false; }