cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index dbb957d7746445cfa41a572dd948fe70f14ce799..c4e345234f8d77aad73dec12c6ddc107d050e45d 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -30,6 +30,7 @@ class BufferParams;
 class BufferView;
 class CursorSlice;
 class Dimension;
+class ErrorList;
 class InsetBase;
 class InsetBase_code;
 class FuncRequest;
@@ -50,6 +51,8 @@ public:
        ///
        typedef lyx::pos_type pos_type;
        ///
+       typedef lyx::char_type char_type;
+       ///
        typedef lyx::pit_type pit_type;
 
        /// constructor
@@ -229,6 +232,8 @@ public:
        bool backspacePos0(LCursor & cur);
        /// Delete character before cursor. Honour CT
        bool backspace(LCursor & cur);
+       // Dissolve the inset under cursor
+       bool dissolveInset(LCursor & cur);
        ///
        bool selectWordWhenUnderCursor(LCursor & cur, lyx::word_location);
        ///
@@ -257,9 +262,9 @@ public:
        /* these things are for search and replace */
 
        /// needed to insert the selection
-       void insertStringAsLines(LCursor & cur, std::string const & str);
+       void insertStringAsLines(LCursor & cur, lyx::docstring const & str);
        /// needed to insert the selection
-       void insertStringAsParagraphs(LCursor & cur, std::string const & str);
+       void insertStringAsParagraphs(LCursor & cur, lyx::docstring const & str);
 
        /// current text width
        int width() const;
@@ -274,7 +279,7 @@ public:
        int singleWidth(Paragraph const & par, pos_type pos) const;
        ///
        int singleWidth(Paragraph const & par,
-               pos_type pos, char c, LyXFont const & Font) const;
+               pos_type pos, char_type c, LyXFont const & Font) const;
 
        /// return the color of the canvas
        LColor_color backgroundColor() const;
@@ -320,7 +325,7 @@ public:
        ///
        void write(Buffer const & buf, std::ostream & os) const;
        /// returns whether we've seen our usual 'end' marker
-       bool read(Buffer const & buf, LyXLex & lex);
+       bool read(Buffer const & buf, LyXLex & lex, ErrorList & errorList);
 
        ///
        int ascent() const;
@@ -334,9 +339,6 @@ public:
        /// delete double space or empty paragraphs around old cursor
        bool deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old);
 
-       ///
-       friend class LyXScreen;
-
 public:
        ///
        Dimension dim_;