LyX Drinkers Union: patch 1

[lyx.git] / src / lyxcursor.h

diff --git a/src/lyxcursor.h b/src/lyxcursor.h
index 7606a066b0205dfdfd3fcd9d6383dabfb2be7398..0fdf06a2961d30637f34f768f4fea6e619932d55 100644 (file)
--- a/src/lyxcursor.h
+++ b/src/lyxcursor.h
@@ -5,14 +5,18 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #ifndef LYXCURSOR_H
 #define LYXCURSOR_H
 
-#include "lyxparagraph.h"
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include "paragraph.h"
 
 struct Row;
 
@@ -20,16 +24,17 @@ struct Row;
  */
 class LyXCursor {
 public:
+       LyXCursor();
        ///
-       void par(LyXParagraph * p);
+       void par(Paragraph * p);
        ///
-       LyXParagraph * par();
+       Paragraph * par();
        ///
-       LyXParagraph * par() const;
+       Paragraph * par() const;
        ///
-       void pos(LyXParagraph::size_type p);
+       void pos(Paragraph::size_type p);
        ///
-       LyXParagraph::size_type pos() const;
+       Paragraph::size_type pos() const;
        ///
        void boundary(bool b);
        ///
@@ -43,9 +48,9 @@ public:
        ///
        int x_fix() const;
        ///
-       void y(unsigned long i);
+       void y(int i);
        ///
-       unsigned long y() const;
+       int y() const;
        ///
        void row(Row * r);
        ///
@@ -54,9 +59,9 @@ public:
        Row * row() const;
 private:
        /// The paragraph the cursor is in.
-       LyXParagraph * par_;
+       Paragraph * par_;
        /// The position inside the paragraph
-       LyXParagraph::size_type pos_;
+       Paragraph::size_type pos_;
        ///
        bool boundary_;
        ///
@@ -64,12 +69,11 @@ private:
        ///
        int x_fix_;
        ///
-       unsigned long y_;
+       int y_;
        ///
        Row * row_;
 };
 
-
 ///
 inline
 bool operator==(LyXCursor const & a, LyXCursor const & b)
@@ -79,7 +83,6 @@ bool operator==(LyXCursor const & a, LyXCursor const & b)
                && a.boundary() == b.boundary();
 }
 
-
 ///
 inline
 bool operator!=(LyXCursor const & a, LyXCursor const & b)