Fix.

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

diff --git a/src/mathed/math_cursor.h b/src/mathed/math_cursor.h
index 722beac95c8a1cf824621f1760d3f38e1c690ffb..b0d3a240d63320e3e634e26e2ad805c049737e9d 100644 (file)
--- a/src/mathed/math_cursor.h
+++ b/src/mathed/math_cursor.h
@@ -17,9 +17,6 @@
 #ifndef MATH_CURSOR
 #define MATH_CURSOR
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 #include "math_inset.h"
 #include "math_iterator.h"
@@ -46,6 +43,8 @@ class MathCursor {
 public:
        /// short of anything else reasonable
        typedef MathInset::size_type       size_type;
+       /// type for column numbers
+       typedef MathArray::difference_type difference_type;
        /// type for cursor positions within a cell
        typedef MathInset::pos_type        pos_type;
        /// type for cell indices
@@ -65,10 +64,10 @@ public:
        void insert(MathArray const &);
        ///
        void paste(string const & data);
-       ///
-       void erase();
-       ///
-       void backspace();
+       /// return false for empty math insets
+       bool erase();
+       /// return false for empty math insets
+       bool backspace();
        /// called for LFUN_HOME etc
        bool home(bool sel = false);
        /// called for LFUN_END etc
@@ -114,8 +113,8 @@ public:
        void popToEnclosingHull();
        /// go up to the hull inset
        void popToHere(MathInset const * p);
-       /// adjust position after deletion/insertion
-       void adjust(pos_type from, size_type size);
+       /// adjust anchor position after deletions/insertions
+       void adjust(pos_type from, difference_type diff);
        ///
        InsetFormulaBase * formula() const;
        /// current offset in the current cell
@@ -126,7 +125,7 @@ public:
        size_type size() const;
        ///
        bool script(bool);
-       /// 
+       ///
        bool interpret(char);
        /// interpret name a name of a macro
        void macroModeClose();
@@ -228,7 +227,7 @@ public:
        void dump(char const * str) const;
        /// moves on
        void setSelection(MathIterator const & where, size_type n);
-       /// grab selection marked by anchor and current cursor 
+       /// grab selection marked by anchor and current cursor
        string grabSelection() const;
        /// guess what
        string grabAndEraseSelection();
@@ -273,7 +272,7 @@ private:
        /// the name of the macro we are currently inputting
        string macroName() const;
        /// where in the curent cell does the macro name start?
-       MathInset::difference_type macroNamePos() const;
+       difference_type macroNamePos() const;
        /// can we enter the inset?
        bool openable(MathAtom const &, bool selection) const;
        /// write access to cursor cell position