X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxrow.h;h=f427b7a8a44aa189fcad9768637d73c3d18cfefe;hb=98c966c64594611e469313314abd1e59524adb4a;hp=e480cfaf18b6d140ad390d724b83480e388fa6a9;hpb=2889b5fd3e8987d0c265ff4726a7fb6c6cb6c034;p=lyx.git

diff --git a/src/lyxrow.h b/src/lyxrow.h
index e480cfaf18..f427b7a8a4 100644
--- a/src/lyxrow.h
+++ b/src/lyxrow.h
@@ -1,18 +1,24 @@
 // -*- C++ -*-
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 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;
 
 ///
 class Row {
@@ -20,15 +26,15 @@ public:
 	///
 	Row();
 	///
-	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(lyx::pos_type p);
 	///
-	LyXParagraph::size_type pos() const;
+	lyx::pos_type pos() const;
 	///
 	void fill(int f);
 	///
@@ -38,6 +44,10 @@ public:
 	///
 	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;
@@ -55,15 +65,17 @@ public:
 	Row * previous() const;
 private:
 	///
-	LyXParagraph * par_;
+	Paragraph * par_;
 	///
-	LyXParagraph::size_type pos_;
+	lyx::pos_type pos_;
 	/** what is missing to a full row can be negative.
 	  Needed for hfills, flushright, block etc. */
 	mutable int fill_;
 	///
 	unsigned short height_;
 	///
+	unsigned int width_;
+	///
 	unsigned short ascent_of_text_;
 	///
 	unsigned int baseline_;
@@ -73,4 +85,32 @@ private:
 	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