more IU

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

diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h
index cd788189ec8407f5473fdb2dce575ddad3b551c0..dfc58331ffe4d16d450aaa374d13f65128aff431 100644 (file)
--- a/src/mathed/formulabase.h
+++ b/src/mathed/formulabase.h
@@ -16,10 +16,10 @@
 
 #include "insets/updatableinset.h"
 
-
 class Buffer;
 class BufferView;
 class MathAtom;
+class CursorSlice;
 
 
 /// An abstract base class for all math related LyX insets
@@ -44,11 +44,11 @@ public:
        ///
        virtual InsetOld::Code lyxCode() const;
        /// what appears in the minibuffer when opening
-       virtual string const editMessage() const;
+       virtual std::string const editMessage() const;
+       ///
+       virtual void getCursorPos(int cell, int & x, int & y) const;
        ///
-       virtual void fitInsetCursor(BufferView *) const;
-       /// FIXME
-       virtual void getCursorPos(BufferView *, int &, int &) const;
+       virtual void getCursorDim(int &, int &) const;
        /// get the absolute document x,y of the cursor
        virtual void getCursor(BufferView & bv, int & x, int & y) const;
        ///
@@ -56,8 +56,6 @@ public:
        ///
        virtual void insetUnlock(BufferView *);
 
-       /// To allow transparent use of math editing functions
-       virtual dispatch_result localDispatch(FuncRequest const &);
        /// To allow transparent use of math editing functions
        //virtual void status(FuncRequest const &);
 
@@ -66,14 +64,11 @@ public:
        ///
        virtual MathAtom & par() = 0;
        ///
-       // And shouldn't this really return a shared_ptr<BufferView> instead?
-       BufferView * view() const;
-
        ///
-       virtual bool searchForward(BufferView *, string const &,
+       virtual bool searchForward(BufferView *, std::string const &,
                                   bool = true, bool = false);
        ///
-       virtual bool searchBackward(BufferView *, string const &,
+       virtual bool searchBackward(BufferView *, std::string const &,
                                    bool = true, bool = false);
        ///
        virtual bool isTextInset() const { return true; }
@@ -85,36 +80,43 @@ public:
        virtual EDITABLE editable() const { return HIGHLY_EDITABLE; }
        ///
        bool display() const;
-       // return the selection as string
-       string selectionAsString() const;
-
+       // return the selection as std::string
+       std::string selectionAsString() const;
+       ///
+       void edit(BufferView * bv, bool);
+       ///
+       void edit(BufferView * bv, int, int);
+protected:
+       /// To allow transparent use of math editing functions
+       virtual
+       DispatchResult
+       priv_dispatch(FuncRequest const &, idx_type &, pos_type &);
 private:
        /// unimplemented
        void operator=(const InsetFormulaBase &);
        /// common base for handling accents
-       void handleAccent(BufferView * bv, string const & arg, string const & name);
+       void handleAccent(BufferView * bv, std::string const & arg, std::string const & name);
        /// lfun handler
-       dispatch_result lfunMousePress(FuncRequest const &);
+       DispatchResult lfunMousePress(FuncRequest const &);
        ///
-       dispatch_result lfunMouseRelease(FuncRequest const &);
+       DispatchResult lfunMouseRelease(FuncRequest const &);
        ///
-       dispatch_result lfunMouseMotion(FuncRequest const &);
+       DispatchResult lfunMouseMotion(FuncRequest const &);
 
 protected:
-       ///
-       //mutable boost::weak_ptr<BufferView> view_;
-       mutable BufferView * view_;
 
-protected:
-       ///
-       void handleFont(BufferView * bv, string const & arg, string const & font);
-       ///
-       void handleFont2(BufferView * bv, string const & arg);
+       /** Find the PreviewLoader, add a LaTeX snippet to it and
+        *  start the loading process.
+        *
+        *  Most insets have no interest in this capability, so the method
+        *  defaults to empty.
+        */
+       virtual void generatePreview(Buffer const &) const {}
 
        ///
-       mutable int xo_;
+       void handleFont(BufferView * bv, std::string const & arg, std::string const & font);
        ///
-       mutable int yo_;
+       void handleFont2(BufferView * bv, std::string const & arg);
 };
 
 // We don't really mess want around with mathed stuff outside mathed.