Compil fix

[lyx.git] / src / Cursor.h

diff --git a/src/Cursor.h b/src/Cursor.h
index 134c95cd916596c90c6f005dc776b8d5d950610f..719a2cbd4f8138e49259badd6abd6ac065cb22ce 100644 (file)
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -36,9 +36,6 @@ class Encoding;
 
 
 /// The cursor class describes the position of a cursor within a document.
-
-// The public inheritance should go in favour of a suitable data member
-// (or maybe private inheritance) at some point of time.
 class Cursor : public DocIterator
 {
 public:
@@ -201,7 +198,11 @@ public:
        int textTargetOffset() const;
 
        /// access to normalized selection anchor
-       CursorSlice anchor() const;
+       CursorSlice normalAnchor() const;
+       // FIXME: this can't be a const & and a const function because
+       // LFUN_TAB_* wants to move the real anchor.
+       /// access to real selection anchor
+       DocIterator & realAnchor();
        /// sets anchor to cursor position
        void resetAnchor();
        /// access to owning BufferView
@@ -227,8 +228,14 @@ public:
        void undispatched();
        /// the event was already dispatched
        void dispatched();
-       /// Set which update should be done
-       void updateFlags(Update::flags f);
+       /// Set which screen update should be done
+       void screenUpdateFlags(Update::flags f);
+       /// Forces an updateBuffer() call
+       void forceBufferUpdate();
+       /// Removes any pending updateBuffer() call
+       void clearBufferUpdate();
+       /// Do we need to call updateBuffer()?
+       bool needBufferUpdate() const;
        /**
         * don't call update() when done
         *
@@ -237,9 +244,9 @@ public:
         * not need to be re-drawn and all entries in the coord cache stay
         * valid (and there are no other things to put in the coord cache).
         * This is a fairly rare event as well and only some optimization.
-        * Not using noUpdate() should never be wrong.
+        * Not using noScreenUpdate() should never be wrong.
         */
-       void noUpdate();
+       void noScreenUpdate();
        /// fix cursor in circumstances that should never happen.
        /// \retval true if a fix occured.
        bool fixIfBroken();
@@ -285,11 +292,7 @@ public:
        void checkBufferStructure();
 
 public:
-       ///
-       BufferView * bv_;
 //private:
-       /// the anchor position
-       DocIterator anchor_;
        
        ///
        DocIterator const & beforeDispatchCursor() const { return beforeDispatchCursor_; }
@@ -297,6 +300,10 @@ public:
        void saveBeforeDispatchPosXY();
 
 private:
+       ///
+       BufferView * bv_;
+       /// the anchor position
+       DocIterator anchor_;
        ///
        mutable DispatchResult disp_;
        /**