simplify GuiToc / TocWidget interaction. Much can still be simplified...

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

diff --git a/src/mathed/MathMacroTemplate.h b/src/mathed/MathMacroTemplate.h
index 4851693b5d26eed4a7f43783b3e4dcdd8c736e02..6f2fa1d3b7e03b7696760bdf4f3390a82fb948a1 100644 (file)
--- a/src/mathed/MathMacroTemplate.h
+++ b/src/mathed/MathMacroTemplate.h
@@ -38,9 +38,7 @@ public:
        ///
        EDITABLE editable() const { return HIGHLY_EDITABLE; }
        ///
-       void edit(Cursor & cur, bool left);
-       ///
-       Inset * editXY(Cursor & cur, int x, int y);
+       void edit(Cursor & cur, bool front, EntryDirection entry_from);
        ///
        bool notifyCursorLeaves(Cursor & cur);
        ///
@@ -82,6 +80,9 @@ public:
        /// Remove everything from the name which makes it invalid 
        /// and return true iff it is valid.
        bool fixNameAndCheckIfValid();
+       
+       /// request "external features"
+       virtual void validate(LaTeXFeatures &) const;
 
        /// decide whether its a redefinition
        void updateToContext(MacroContext const & mc) const;
@@ -107,6 +108,10 @@ protected:
                FuncStatus & status) const;
 
 private:
+       friend class InsetLabelBox;
+       friend class DisplayLabelBox;
+       
+       ///
        virtual Inset * clone() const;
 
        /// remove #n with from<=n<=to
@@ -144,8 +149,6 @@ private:
        /// defined before already?
        mutable bool redefinition_;
        ///
-       mutable bool editing_;
-       ///
        void createLook() const;
        ///
        mutable bool lookOutdated_;
@@ -155,9 +158,6 @@ private:
        mutable int labelBoxAscent_;
        ///
        mutable int labelBoxDescent_;
-
-private:
-       friend class InsetLabelBox;
        ///
        bool premetrics() const { return premetrics_; }
        ///