architectural changes to tex2lyx

[lyx.git] / src / mathed / math_amsarrayinset.C

diff --git a/src/mathed/math_amsarrayinset.C b/src/mathed/math_amsarrayinset.C
index ca329ca0417d99d601f48a6cdd516ba5923b1646..cc8804f0ed7544f13d40a28ec6949ead1b8122ca 100644 (file)
--- a/src/mathed/math_amsarrayinset.C
+++ b/src/mathed/math_amsarrayinset.C
@@ -1,14 +1,14 @@
 #include <config.h>
 
-
 #include "math_amsarrayinset.h"
 #include "math_mathmlstream.h"
 #include "metricsinfo.h"
-#include "math_support.h"
 #include "math_streamstr.h"
 #include "math_support.h"
 #include "Lsstream.h"
 
+using std::auto_ptr;
+
 
 MathAMSArrayInset::MathAMSArrayInset(string const & name, int m, int n)
        : MathGridInset(m, n), name_(name)
@@ -20,9 +20,9 @@ MathAMSArrayInset::MathAMSArrayInset(string const & name)
 {}
 
 
-MathInset * MathAMSArrayInset::clone() const
+auto_ptr<InsetBase> MathAMSArrayInset::clone() const
 {
-       return new MathAMSArrayInset(*this);
+       return auto_ptr<InsetBase>(new MathAMSArrayInset(*this));
 }
 
 
@@ -58,22 +58,23 @@ char const * MathAMSArrayInset::name_right() const
 }
 
 
-void MathAMSArrayInset::metrics(MetricsInfo & mi) const
+void MathAMSArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        MetricsInfo m = mi;
        if (m.base.style == LM_ST_DISPLAY)
                m.base.style = LM_ST_TEXT;
        MathGridInset::metrics(m);
-       dim_.w += 12;
+       dim_.wid += 12;
+       dim = dim_;
 }
 
 
 void MathAMSArrayInset::draw(PainterInfo & pi, int x, int y) const
 {
        MathGridInset::draw(pi, x + 6, y);
-       int const yy = y - ascent();
-       mathed_draw_deco(pi, x + 1, yy, 5, height(), name_left());
-       mathed_draw_deco(pi, x + width() - 6, yy, 5, height(), name_right());
+       int const yy = y - dim_.ascent();
+       mathed_draw_deco(pi, x + 1, yy, 5, dim_.height(), name_left());
+       mathed_draw_deco(pi, x + dim_.width() - 6, yy, 5, dim_.height(), name_right());
 }