several small fixes for mathed

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

diff --git a/src/mathed/math_stackrelinset.C b/src/mathed/math_stackrelinset.C
index 4a45a515c69e3da9e3a23e5028e188c7be935390..4254f1869da8340b0732a0d905a75e3ecc4c0b9f 100644 (file)
--- a/src/mathed/math_stackrelinset.C
+++ b/src/mathed/math_stackrelinset.C
@@ -1,43 +1,55 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
+/**
+ * \file math_stackrelinset.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_stackrelinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "math_support.h"
 
 
 using std::max;
+using std::auto_ptr;
 
 
 MathStackrelInset::MathStackrelInset()
 {}
 
 
-MathInset * MathStackrelInset::clone() const
+auto_ptr<InsetBase> MathStackrelInset::clone() const
 {
-       return new MathStackrelInset(*this);
+       return auto_ptr<InsetBase>(new MathStackrelInset(*this));
 }
 
 
-void MathStackrelInset::metrics(MathMetricsInfo & mi) const
+void MathStackrelInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       xcell(1).metrics(mi);
-       MathFracChanger dummy(mi.base);
-       xcell(0).metrics(mi);
-       dim_.w = max(xcell(0).width(), xcell(1).width()) + 4;
-       dim_.a = xcell(1).ascent() + xcell(0).height() + 4;
-       dim_.d = xcell(1).descent();
+       cell(1).metrics(mi);
+       FracChanger dummy(mi.base);
+       cell(0).metrics(mi);
+       dim.wid = max(cell(0).width(), cell(1).width()) + 4;
+       dim.asc = cell(1).ascent() + cell(0).height() + 4;
+       dim.des = cell(1).descent();
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
-void MathStackrelInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathStackrelInset::draw(PainterInfo & pi, int x, int y) const
 {
-       int m  = x + width() / 2;
-       int yo = y - xcell(1).ascent() - xcell(0).descent() - 1;
-       xcell(1).draw(pi, m - xcell(1).width() / 2, y);
-       MathFracChanger dummy(pi.base);
-       xcell(0).draw(pi, m - xcell(0).width() / 2, yo);
+       int m  = x + dim_.width() / 2;
+       int yo = y - cell(1).ascent() - cell(0).descent() - 1;
+       cell(1).draw(pi, m - cell(1).width() / 2, y);
+       FracChanger dummy(pi.base);
+       cell(0).draw(pi, m - cell(0).width() / 2, yo);
+       drawMarkers(pi, x, y);
 }