more changes, read the Changelog

[lyx.git] / src / tabular.h

diff --git a/src/tabular.h b/src/tabular.h
index 5430545b83a8f1d7187cbec1784fd1a389e170b9..0b19167c7cddade50e2234488fdc2dd24541ba2b 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -19,10 +19,11 @@
 
 #include "lyxlex.h"
 #include "LString.h"
+#include "insets/insettext.h"
 
 class InsetTabular;
-class InsetText;
 class LaTeXFeatures;
+class Buffer;
 
 /* The features the text class offers for tables */ 
 
@@ -76,7 +77,7 @@ public:
     LyXTabular(InsetTabular *, LyXTabular const &);
     ///
     explicit
-    LyXTabular(InsetTabular *, LyXLex & lex);
+    LyXTabular(Buffer const *, InsetTabular *, LyXLex & lex);
     ///
     ~LyXTabular();
     ///
@@ -116,10 +117,10 @@ public:
     int GetDescentOfRow(int row) const;
     ///
     int GetHeightOfTabular() const;
-    ///
-    void SetAscentOfRow(int row, int height);
-    ///
-    void SetDescentOfRow(int row, int height);
+    /// Returns true if a complete update is necessary, otherwise false
+    bool SetAscentOfRow(int row, int height);
+    /// Returns true if a complete update is necessary, otherwise false
+    bool SetDescentOfRow(int row, int height);
     /// Returns true if a complete update is necessary, otherwise false
     bool SetWidthOfCell(int cell, int new_width);
     /// Returns true if a complete update is necessary, otherwise false
@@ -169,9 +170,9 @@ public:
     ///
     int NumberOfCellsInRow(int cell) const;
     ///
-    void Write(std::ostream &) const;
+    void Write(Buffer const *, std::ostream &) const;
     ///
-    void Read(LyXLex &);
+    void Read(Buffer const *, LyXLex &);
     ///
     void OldFormatRead(LyXLex &, string const &);
     ///
@@ -182,7 +183,7 @@ public:
     int TeXCellPreamble(std::ostream &, int cell) const;
     int TeXCellPostamble(std::ostream &, int cell) const;
     ///
-    int Latex(std::ostream &, bool, bool) const;
+    int Latex(Buffer const *, std::ostream &, bool, bool) const;
     ///
     int DocBookEndOfCell(std::ostream &, int cell, int & depth) const;
 #if 0
@@ -271,11 +272,13 @@ private: //////////////////////////////////////////////////////////////////
        ///
         cellstruct();
        ///
+#ifdef INSET_POINTER
        ~cellstruct();
        ///
         cellstruct(cellstruct const &);
        ///
        cellstruct & operator=(cellstruct const &);
+#endif
        ///
        int cellno;
        ///
@@ -297,7 +300,7 @@ private: //////////////////////////////////////////////////////////////////
        ///
        string p_width; // this is only set for multicolumn!!!
        ///
-       InsetText * inset;
+       InsetText inset;
     };
     typedef std::vector<cellstruct> cell_vector;
     typedef std::vector<cell_vector> cell_vvector;