Fix bug 2485 and crash on middle mouse paste on math

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 30f17b8e8941a0d6998e9aa38a947b9b6cfa0e7a..dbb957d7746445cfa41a572dd948fe70f14ce799 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -21,7 +21,7 @@
 #include "lyxfont.h"
 #include "layout.h"
 #include "lyxlayout_ptr_fwd.h"
-#include "ParagraphList_fwd.h"
+#include "ParagraphList.h"
 
 #include <iosfwd>
 
@@ -108,7 +108,7 @@ public:
        std::string getStringToIndex(LCursor const & cur);
 
        /// insert a character at cursor position
-       void insertChar(LCursor & cur, char c);
+       void insertChar(LCursor & cur, lyx::char_type c);
        /// insert an inset at cursor position
        void insertInset(LCursor & cur, InsetBase * inset);
 
@@ -168,7 +168,7 @@ public:
        void setCursor(CursorSlice &, pit_type par, pos_type pos);
        ///
        void setCursorIntern(LCursor & cur, pit_type par,
-                pos_type pos, bool setfont = true, bool boundary = false);
+                pos_type pos, bool setfont = true, bool boundary = false);
        ///
        void setCurrentFont(LCursor & cur);
 
@@ -209,22 +209,25 @@ public:
        ///
        bool cursorDownParagraph(LCursor & cur);
        ///
-       void cursorHome(LCursor & cur);
+       bool cursorHome(LCursor & cur);
        ///
-       void cursorEnd(LCursor & cur);
+       bool cursorEnd(LCursor & cur);
        ///
        bool cursorPrevious(LCursor & cur);
        ///
        bool cursorNext(LCursor & cur);
        ///
-       void cursorTop(LCursor & cur);
-       ///
-       void cursorBottom(LCursor & cur);
-       ///
-       bool Delete(LCursor & cur);
+       bool cursorTop(LCursor & cur);
        ///
+       bool cursorBottom(LCursor & cur);
+       /// Erase character at cursor. Honour change tracking
+       bool erase(LCursor & cur);
+       /** At cursor position 0, merge paragraph with the one before it.
+        * Ignore CT (this is used in \c acceptChange, \c rejectChange for
+        * physical deletion of paragraph break)
+        */
        bool backspacePos0(LCursor & cur);
-       ///
+       /// Delete character before cursor. Honour CT
        bool backspace(LCursor & cur);
        ///
        bool selectWordWhenUnderCursor(LCursor & cur, lyx::word_location);