Andreas' patch to prevent crash on click on previewd inset

[lyx.git] / src / mathed / math_gridinset.h

diff --git a/src/mathed/math_gridinset.h b/src/mathed/math_gridinset.h
index e2710daf9f297c102ae2530baa13638cb0a10436..525eb8c43deb303c334b29025f724cf0f0651292 100644 (file)
--- a/src/mathed/math_gridinset.h
+++ b/src/mathed/math_gridinset.h
@@ -54,7 +54,7 @@ public:
                /// cached offset
                mutable int offset_;
                /// how many hlines above this row?
-               int lines_;
+               unsigned int lines_;
                /// parameter to the line break
                LyXLength crskip_;
                /// extra distance between lines
@@ -74,12 +74,8 @@ public:
                mutable int width_;
                /// cached offset
                mutable int offset_;
-               /// do we need a line to the left?
-               bool leftline_;
-               /// do we need a line to the right?
-               bool rightline_;
                /// how many lines to the left of this column?
-               int lines_;
+               unsigned int lines_;
                /// additional amount to be skipped when drawing
                int skip_;
        };
@@ -102,6 +98,9 @@ public:
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
+       void drawWithMargin(PainterInfo & pi, int x, int y,
+               int lmargin = 0, int rmargin = 0) const;
+       ///
        void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
        ///
        void drawT(TextPainter & pi, int x, int y) const;
@@ -159,21 +158,21 @@ public:
        /// pulls cell after pressing erase
        void idxGlue(idx_type idx);
 
-       ///
+       /// add a row
        virtual void addRow(row_type r);
-       ///
+       /// delete a row
        virtual void delRow(row_type r);
-       ///
+       /// copy a row
        virtual void copyRow(row_type r);
-       ///
+       /// swap two rows
        virtual void swapRow(row_type r);
-       ///
+       /// add a column
        virtual void addCol(col_type c);
-       ///
+       /// delete a column
        virtual void delCol(col_type c);
-       ///
+       /// copy a column
        virtual void copyCol(col_type c);
-       ///
+       /// swap two columns
        virtual void swapCol(col_type c);
        ///
        virtual void appendRow();
@@ -229,9 +228,11 @@ protected:
        void splitCell(LCursor & cur);
 
 public:
-       /// row info
+       /// row info.
+       /// rowinfo_[nrows()] is a dummy row used only for hlines.
        std::vector<RowInfo> rowinfo_;
-       /// column info
+       /// column info.
+       /// colinfo_[ncols()] is a dummy column used only for vlines.
        std::vector<ColInfo> colinfo_;
        /// cell info
        std::vector<CellInfo> cellinfo_;