split inset -> inset + updatableinset

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

diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h
index 5d8e81474fe17e78f2a8967422b1081ef494c24c..9c53c47c57bb8aabd727eee9afadb9c512a620e3 100644 (file)
--- a/src/mathed/formulabase.h
+++ b/src/mathed/formulabase.h
@@ -13,11 +13,8 @@
 #ifndef INSET_FORMULABASE_H
 #define INSET_FORMULABASE_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
-#include "insets/inset.h"
+#include "insets/updatableinset.h"
 #include "frontends/mouse_state.h"
 #include "lyxfont.h"
 
@@ -79,7 +76,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 &);
 
@@ -96,10 +93,10 @@ public:
 
        ///
        virtual bool searchForward(BufferView *, string const &,
-                                  bool = true, bool = false);
+                                  bool = true, bool = false);
        ///
        virtual bool searchBackward(BufferView *, string const &,
-                                   bool = true, bool = false);
+                                   bool = true, bool = false);
        ///
        virtual bool isTextInset() const { return true; }
        ///
@@ -118,12 +115,12 @@ private:
        void operator=(const InsetFormulaBase &);
        /// common base for handling accents
        void handleAccent(BufferView * bv, string const & arg, string const & name);
-       /// lfun handler 
-       RESULT lfunMousePress(FuncRequest const &);
+       /// lfun handler
+       dispatch_result lfunMousePress(FuncRequest const &);
        ///
-       RESULT lfunMouseRelease(FuncRequest const &);
+       dispatch_result lfunMouseRelease(FuncRequest const &);
        ///
-       RESULT lfunMouseMotion(FuncRequest const &);
+       dispatch_result lfunMouseMotion(FuncRequest const &);
 
 protected:
        ///