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

[lyx.git] / src / cursor.h

diff --git a/src/cursor.h b/src/cursor.h
index 8238f2422ace78d198c385f6c6679c8d93e721cf..e934700244e060bdbe3c7b9b197cb0e8d39cfa9d 100644 (file)
--- a/src/cursor.h
+++ b/src/cursor.h
@@ -26,7 +26,7 @@ class Point;
 class LyXFont;
 
 // these should go
-class MathUnknownInset;
+class InsetMathUnknown;
 class Encoding;
 
 
@@ -261,7 +261,7 @@ public:
        /// are we currently typing the name of a macro?
        bool inMacroMode() const;
        /// get access to the macro we are currently typing
-       MathUnknownInset * activeMacro();
+       InsetMathUnknown * activeMacro();
 
        /// replace selected stuff with at, placing the former
        // selection in given cell of atom
@@ -283,9 +283,9 @@ public:
        void handleFont(std::string const & font);
 
        /// display a message
-       void message(std::string const & msg) const;
+       void message(lyx::docstring const & msg) const;
        /// display an error message
-       void errorMessage(std::string const & msg) const;
+       void errorMessage(lyx::docstring const & msg) const;
        ///
        std::string getPossibleLabel();