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 4ec3824e002703bbe725d7c394f10254e063a315..c4e345234f8d77aad73dec12c6ddc107d050e45d 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -232,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);
        ///
@@ -260,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;