small simplification

[lyx.git] / src / Cursor.h

diff --git a/src/Cursor.h b/src/Cursor.h
index cf2344f2c6d53de788f809131d7441bdac754efa..27f2174d3c4dafade8277518d98e9a0121423ba8 100644 (file)
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -14,6 +14,7 @@
 
 #include "DispatchResult.h"
 #include "DocIterator.h"
+#include "Font.h"
 
 #include <iosfwd>
 #include <vector>
@@ -25,7 +26,6 @@ class Buffer;
 class BufferView;
 class FuncStatus;
 class FuncRequest;
-class Font;
 class Row;
 
 // these should go
@@ -61,6 +61,9 @@ public:
        /// sets cursor part
        void setCursor(DocIterator const & it);
 
+       ///
+       void setCurrentFont();
+
        //
        // selection
        //
@@ -179,8 +182,9 @@ public:
         * Not using noUpdate() should never be wrong.
         */
        void noUpdate();
-       /// fix cursor in circumstances that should never happen
-       void fixIfBroken();
+       /// fix cursor in circumstances that should never happen.
+       /// \retval true if a fix occured.
+       bool fixIfBroken();
 
        /// output
        friend std::ostream & operator<<(std::ostream & os, Cursor const & cur);
@@ -229,6 +233,13 @@ private:
        /// position before dispatch started
        DocIterator beforeDispatchCursor_;
 
+// FIXME: make them private.
+public:
+       /// the current font settings
+       Font current_font;
+       /// the current font
+       Font real_current_font;
+
 private:
 
        //