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 84cdaaf5099313cbd68702b7c622f3d529d3c7ba..00e324f676b90eefe2def93b74bb5e0ce7c09c90 100644 (file)
--- a/src/mathed/math_gridinset.h
+++ b/src/mathed/math_gridinset.h
@@ -6,14 +6,13 @@
 #include "vspace.h"
 #include "LString.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 /** Gridded math inset base class.
     This is the base to all grid-like editable math objects
     like array and eqnarray.
-    \author André Pönitz 2001
+ *  \author André Pönitz 2001
+ *
+ * Full author contact details are available in file CREDITS
 */
 
 class MathGridInset : public MathNestInset {
@@ -88,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();
+       ///
+       InsetBase * clone() const;
        ///
-       MathInset * clone() const;
+       void metrics(MetricsInfo & mi) const;
        ///
-       void metrics(MathMetricsInfo & mi) const;
+       void metrics(MetricsInfo & mi, Dimension &) const;
        ///
-       void draw(MathPainterInfo & pi, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
-       void metricsT(TextMetricsInfo const & mi) const;
+       void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
        ///
        void drawT(TextPainter & pi, int x, int y) const;
        ///
@@ -122,14 +125,14 @@ public:
        RowInfo & rowinfo(row_type row);
        ///
        const CellInfo & cellinfo(idx_type idx) const { return cellinfo_[idx]; }
-       /// 
+       ///
        CellInfo & cellinfo(idx_type idx) { return cellinfo_[idx]; }
        /// identifies GridInset
        MathGridInset * asGridInset() { return this; }
        /// 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;
@@ -204,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