X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxrow.h;h=ac71a2d6615b6b56c1781d4bed02085b52d45103;hb=d899c547de3f689b09cd440a76a46e45cf75c7b0;hp=1f7416c02149dcfda244a07589a55ab5f5c6b127;hpb=dfe1bc44b44903faf77ef454c98c4c3e56c1d5e3;p=lyx.git

diff --git a/src/lyxrow.h b/src/lyxrow.h
index 1f7416c021..ac71a2d661 100644
--- a/src/lyxrow.h
+++ b/src/lyxrow.h
@@ -1,43 +1,116 @@
 // -*- C++ -*-
 /* This file is part of
- * ======================================================
+ * ====================================================== 
  * 
  *           LyX, The Document Processor
  * 	 
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #ifndef LYXROW_H
 #define LYXROW_H
 
-#include "lyxparagraph.h"
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include "support/types.h"
+
+class Paragraph;
 
 ///
-struct Row {
+class Row {
+public:
 	///
-	LyXParagraph * par;
+	Row();
 	///
-#ifdef NEW_TEXT
-	LyXParagraph::size_type pos;
-#else
-	int pos;
-#endif
+	void par(Paragraph * p);
+	///
+	Paragraph * par();
+	///
+	Paragraph * par() const;
+	///
+	void pos(lyx::pos_type p);
+	///
+	lyx::pos_type pos() const;
+	///
+	void fill(int f);
+	///
+	int fill() const;
+	///
+	void height(unsigned short h);
+	///
+	unsigned short height() const;
+	///
+	void width(unsigned int w);
+	///
+	unsigned int width() const;
+	///
+	void ascent_of_text(unsigned short a);
+	///
+	unsigned short ascent_of_text() const;
+	///
+	void baseline(unsigned int b);
 	///
-	unsigned short  baseline;
+	unsigned int baseline() const;
+	///
+	void next(Row * r);
+	///
+	Row * next() const;
+	///
+	void previous(Row * r);
+	///
+	Row * previous() const;
+private:
+	///
+	Paragraph * par_;
+	///
+	lyx::pos_type pos_;
 	/** what is missing to a full row can be negative.
 	  Needed for hfills, flushright, block etc. */
-	int fill;
+	mutable int fill_;
+	///
+	unsigned short height_;
+	///
+	unsigned int width_;
 	///
-	unsigned short  height;
+	unsigned short ascent_of_text_;
 	///
-	unsigned short ascent_of_text;
-	
+	unsigned int baseline_;
 	///
-	Row * next;
+	Row * next_;
 	///
-	Row * previous;
+	Row * previous_;
 };
 
+
+inline
+Paragraph * Row::par()
+{
+	return par_;
+}
+
+
+inline
+Paragraph * Row::par() const
+{
+	return par_;
+}
+
+
+inline
+unsigned short Row::height() const
+{
+	return height_;
+}
+
+
+inline
+Row * Row::next() const
+{
+	return next_;
+}
+
 #endif