rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

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

diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h
index 49d48a4bcdb0d94ece4b5cc961825d79c8509722..1459c894a3b14bf30b2dc482ea6ad33858e1e853 100644 (file)
--- a/src/mathed/formulabase.h
+++ b/src/mathed/formulabase.h
@@ -14,7 +14,7 @@
 #define INSET_FORMULABASE_H
 
 
-#include "insets/inset.h"
+#include "insets/updatableinset.h"
 #include "frontends/mouse_state.h"
 #include "lyxfont.h"
 
@@ -37,7 +37,7 @@ public:
        ///
        virtual int width(BufferView *, LyXFont const &) const = 0;
        ///
-       virtual void draw(BufferView *,LyXFont const &, int, float &, bool) const = 0;
+       virtual void draw(BufferView *,LyXFont const &, int, float &) const = 0;
        /// lowest x coordinate
        virtual int xlow() const;
        /// highest x coordinate
@@ -49,6 +49,8 @@ public:
 
 public:
        ///
+       // Don't use this for AMS validation as long as there is no
+       // user-accessible way to override "false positives"
        virtual void validate(LaTeXFeatures &) const;
        ///
        virtual Inset * clone(Buffer const &, bool same_id = false) const = 0;
@@ -76,7 +78,7 @@ public:
        virtual void insetUnlock(BufferView *);
 
        /// To allow transparent use of math editing functions
-       virtual RESULT localDispatch(FuncRequest const &);
+       virtual dispatch_result localDispatch(FuncRequest const &);
        /// To allow transparent use of math editing functions
        //virtual void status(FuncRequest const &);
 
@@ -87,9 +89,8 @@ public:
        ///
        virtual MathAtom & par() = 0;
        ///
-       virtual void updateLocal(BufferView * bv, bool mark_dirty);
-       ///
-       BufferView * view() const { return view_.get(); }
+       // And shouldn't this really return a shared_ptr<BufferView> instead?
+       BufferView * view() const;
 
        ///
        virtual bool searchForward(BufferView *, string const &,
@@ -116,11 +117,11 @@ private:
        /// common base for handling accents
        void handleAccent(BufferView * bv, string const & arg, string const & name);
        /// lfun handler
-       RESULT lfunMousePress(FuncRequest const &);
+       dispatch_result lfunMousePress(FuncRequest const &);
        ///
-       RESULT lfunMouseRelease(FuncRequest const &);
+       dispatch_result lfunMouseRelease(FuncRequest const &);
        ///
-       RESULT lfunMouseMotion(FuncRequest const &);
+       dispatch_result lfunMouseMotion(FuncRequest const &);
 
 protected:
        ///