split inset -> inset + updatableinset

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

diff --git a/src/mathed/math_stackrelinset.C b/src/mathed/math_stackrelinset.C
index 73500944eb02a6cb3b29f791868372d2b8cbea67..afcd72b85248ea18fd5f697692e4d1b6fecbf6ea 100644 (file)
--- a/src/mathed/math_stackrelinset.C
+++ b/src/mathed/math_stackrelinset.C
@@ -1,6 +1,3 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_stackrelinset.h"
 #include "math_mathmlstream.h"
@@ -20,24 +17,24 @@ MathInset * MathStackrelInset::clone() const
 }
 
 
-void MathStackrelInset::metrics(MathMetricsInfo const & mi) const
+void MathStackrelInset::metrics(MathMetricsInfo & mi) const
 {
-       MathMetricsInfo m = mi;
-       smallerStyleFrac(m);
-       xcell(0).metrics(m);
-       xcell(1).metrics(mi);
-       width_   = max(xcell(0).width(), xcell(1).width()) + 4;
-       ascent_  = xcell(1).ascent() + xcell(0).height() + 4;
-       descent_ = xcell(1).descent();
+       cell(1).metrics(mi);
+       MathFracChanger dummy(mi.base);
+       cell(0).metrics(mi);
+       dim_.w = max(cell(0).width(), cell(1).width()) + 4;
+       dim_.a = cell(1).ascent() + cell(0).height() + 4;
+       dim_.d = cell(1).descent();
 }
 
 
-void MathStackrelInset::draw(Painter & pain, int x, int y) const
+void MathStackrelInset::draw(MathPainterInfo & pi, int x, int y) const
 {
        int m  = x + width() / 2;
-       int yo = y - xcell(1).ascent() - xcell(0).descent() - 1;
-       xcell(0).draw(pain, m - xcell(0).width() / 2, yo);
-       xcell(1).draw(pain, m - xcell(1).width() / 2, y);
+       int yo = y - cell(1).ascent() - cell(0).descent() - 1;
+       cell(1).draw(pi, m - cell(1).width() / 2, y);
+       MathFracChanger dummy(pi.base);
+       cell(0).draw(pi, m - cell(0).width() / 2, yo);
 }