Fix list of viewable formats in view/update menu.

[lyx.git] / src / Cursor.h

diff --git a/src/Cursor.h b/src/Cursor.h
index d1e13f684e297792c6a9b700793308a470c18a1b..1e66778e99c5e69011ce1df5b4674a467c0113ae 100644 (file)
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -72,7 +72,6 @@ class Row;
 
 // these should go
 class InsetMathUnknown;
-class Encoding;
 
 /**
  * This class describes the position of a cursor within a document,
@@ -205,7 +204,7 @@ public:
        ///
        docstring selectionAsString(bool with_label) const;
        ///
-       docstring currentState() const;
+       docstring currentState(bool devel_mode) const;
 
        /// auto-correct mode
        bool autocorrect() const { return autocorrect_; }
@@ -300,7 +299,7 @@ public:
        /// access to owning BufferView
        BufferView & bv() const;
        /// get some interesting description of top position
-       void info(odocstream & os) const;
+       void info(odocstream & os, bool devel_mode) const;
        /// are we in math mode (2), text mode (1) or unsure (0)?
        int currentMode();
        /// reset cursor bottom to the beginning of the top inset
@@ -503,9 +502,9 @@ public:
        void setScreenPos(int x, int y);
        /// current offset in the top cell
 
-       /// interpret name a name of a macro. Returns true if
-       /// something got inserted.
-       bool macroModeClose();
+       /// interpret name of a macro or ditch it if \c cancel is true.
+       /// Returns true if something got inserted.
+       bool macroModeClose(bool cancel = false);
        /// are we currently typing the name of a macro?
        bool inMacroMode() const;
        /// get access to the macro we are currently typing
@@ -546,8 +545,6 @@ public:
        int macroNamePos();
        /// can we enter the inset?
        bool openable(MathAtom const &) const;
-       ///
-       Encoding const * getEncoding() const;
        /// font at cursor position
        Font getFont() const;
 };