introduce namespace lyx::support

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

diff --git a/src/mathed/math_gridinset.h b/src/mathed/math_gridinset.h
index c4de2a27ea7545a330851f9ffeaee78b7aef3e90..00e324f676b90eefe2def93b74bb5e0ce7c09c90 100644 (file)
--- a/src/mathed/math_gridinset.h
+++ b/src/mathed/math_gridinset.h
@@ -87,14 +87,18 @@ public:
        MathGridInset(col_type m, row_type n);
        ///
        MathGridInset(col_type m, row_type n, char valign, string const & halign);
+       /// Ensures that the dialog is closed.
+       ~MathGridInset();
        ///
-       MathInset * clone() const;
+       InsetBase * clone() const;
        ///
-       void metrics(MathMetricsInfo & mi) const;
+       void metrics(MetricsInfo & mi) const;
        ///
-       void draw(MathPainterInfo & pi, int x, int y) const;
+       void metrics(MetricsInfo & mi, Dimension &) const;
        ///
-       void metricsT(TextMetricsInfo const & mi) const;
+       void draw(PainterInfo & pi, int x, int y) const;
+       ///
+       void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
        ///
        void drawT(TextPainter & pi, int x, int y) const;
        ///
@@ -128,7 +132,7 @@ public:
        /// identifies GridInset
        MathGridInset const * asGridInset() const { return this; }
        /// local dispatcher
-       result_type dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
+       dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
 
        ///
        col_type ncols() const;
@@ -203,11 +207,11 @@ public:
        ///
        void normalize(NormalStream &) const;
        ///
-       //void maplize(MapleStream &) const;
+       //void maple(MapleStream &) const;
        ///
        void mathmlize(MathMLStream &) const;
        ///
-       //void octavize(OctaveStream &) const;
+       //void octave(OctaveStream &) const;
 
 protected:
        /// returns x offset of cell compared to inset