architectural changes to tex2lyx

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

diff --git a/src/mathed/math_undersetinset.C b/src/mathed/math_undersetinset.C
index 7a027299bdfeb4fc95d60a2e34ce50b553751e70..526981fa3dd3fdf32aeab6b04abd58d7d4021b0a 100644 (file)
--- a/src/mathed/math_undersetinset.C
+++ b/src/mathed/math_undersetinset.C
@@ -1,43 +1,41 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "math_undersetinset.h"
 #include "math_mathmlstream.h"
 #include "math_support.h"
 
 
 using std::max;
+using std::auto_ptr;
 
 
 MathUndersetInset::MathUndersetInset()
 {}
 
 
-MathInset * MathUndersetInset::clone() const
+auto_ptr<InsetBase> MathUndersetInset::clone() const
 {
-       return new MathUndersetInset(*this);
+       return auto_ptr<InsetBase>(new MathUndersetInset(*this));
 }
 
 
-void MathUndersetInset::metrics(MathMetricsInfo & mi) const
+void MathUndersetInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       xcell(1).metrics(mi);
-       MathFracChanger dummy(mi.base);
-       xcell(0).metrics(mi);
-       width_   = max(xcell(0).width(), xcell(1).width()) + 4;
-       ascent_  = xcell(1).ascent();
-       descent_ = xcell(1).descent() + xcell(0).height() + 4;
+       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();
+       dim_.des = cell(1).descent() + cell(0).height() + 4;
+       dim = dim_;
 }
 
 
-void MathUndersetInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathUndersetInset::draw(PainterInfo & pi, int x, int y) const
 {
-       int m  = x + width() / 2;
-       int yo = y + xcell(1).descent() + xcell(0).ascent() + 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 + pi.width / 2;
+       int yo = y + cell(1).descent() + cell(0).ascent() + 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);
 }