move around stuff, remove unneeded declarations etc

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

diff --git a/src/mathed/math_amsarrayinset.C b/src/mathed/math_amsarrayinset.C
index 64ae7399348b4a9617a55ed2c7f1a20f62c63074..6fdca3e708c506c3b696f7143b19f6df61e091b0 100644 (file)
--- a/src/mathed/math_amsarrayinset.C
+++ b/src/mathed/math_amsarrayinset.C
@@ -1,11 +1,23 @@
+/**
+ * \file math_amsarrayinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #include <config.h>
 
 #include "math_amsarrayinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "metricsinfo.h"
 #include "math_streamstr.h"
 #include "math_support.h"
-#include "Lsstream.h"
+
+using std::string;
+using std::auto_ptr;
 
 
 MathAMSArrayInset::MathAMSArrayInset(string const & name, int m, int n)
@@ -18,9 +30,9 @@ MathAMSArrayInset::MathAMSArrayInset(string const & name)
 {}
 
 
-InsetBase * MathAMSArrayInset::clone() const
+auto_ptr<InsetBase> MathAMSArrayInset::clone() const
 {
-       return new MathAMSArrayInset(*this);
+       return auto_ptr<InsetBase>(new MathAMSArrayInset(*this));
 }
 
 
@@ -61,9 +73,9 @@ 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_.wid += 12;
-       dim = dim_;
+       MathGridInset::metrics(m, dim);
+       dim.wid += 12;
+       dim_ = dim;
 }
 
 
@@ -73,6 +85,7 @@ void MathAMSArrayInset::draw(PainterInfo & pi, int x, int y) const
        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());
+       setPosCache(pi, x, y);
 }