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

[lyx.git] / src / dociterator.h

diff --git a/src/dociterator.h b/src/dociterator.h
index c69c703c515893ecdfd670f09a529558cb86ee67..95b59765bbc02db8bf6e04d2927c2647e0bd738d 100644 (file)
--- a/src/dociterator.h
+++ b/src/dociterator.h
@@ -23,7 +23,6 @@ class Paragraph;
 class Row;
 
 
-
 // only needed for gcc 2.95, remove when support terminated
 template <typename A, typename B>
 bool ptr_cmp(A const * a, B const * b)
@@ -164,6 +163,8 @@ public:
        LyXText * text();
        ///
        LyXText const * text() const;
+       /// the containing inset or the cell, respectively
+       InsetBase * realInset() const;
        ///
        InsetBase * innerInsetOfType(int code) const;
        ///
@@ -176,8 +177,11 @@ public:
        //
        /// move on one logical position, do not descend into nested insets
        void forwardPosNoDescend();
-       /// move on one logical position, descend into nested insets
-       void forwardPos();
+       /**
+        * move on one logical position, descend into nested insets
+        * skip collapsed insets if \p ignorecollapsed is true
+        */
+       void forwardPos(bool ignorecollapsed = false);
        /// move on one physical character or inset
        void forwardChar();
        /// move on one paragraph