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 0aca0bb6883691f30098d5e9bf762862fee21eb4..6fdca3e708c506c3b696f7143b19f6df61e091b0 100644 (file)
--- a/src/mathed/math_amsarrayinset.C
+++ b/src/mathed/math_amsarrayinset.C
@@ -11,10 +11,12 @@
 #include <config.h>
 
 #include "math_amsarrayinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "math_support.h"
 
+using std::string;
 using std::auto_ptr;
 
 
@@ -71,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;
 }
 
 
@@ -83,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);
 }