architectural changes to tex2lyx

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

diff --git a/src/mathed/math_macroarg.C b/src/mathed/math_macroarg.C
index eb290c7a3e15af548838c7c96cb1634b00f042c2..09f3626f7ea23084f7637bd7820c2253306a33f3 100644 (file)
--- a/src/mathed/math_macroarg.C
+++ b/src/mathed/math_macroarg.C
@@ -1,15 +1,11 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "math_macroarg.h"
 #include "math_macro.h"
 #include "math_mathmlstream.h"
 #include "math_support.h"
 #include "debug.h"
 
-
 using std::endl;
+using std::auto_ptr;
 
 
 MathMacroArgument::MathMacroArgument(int n)
@@ -25,9 +21,9 @@ MathMacroArgument::MathMacroArgument(int n)
 }
 
 
-MathInset * MathMacroArgument::clone() const
+auto_ptr<InsetBase> MathMacroArgument::clone() const
 {
-       return new MathMacroArgument(*this);
+       return auto_ptr<InsetBase>(new MathMacroArgument(*this));
 }
 
 
@@ -37,19 +33,20 @@ void MathMacroArgument::write(WriteStream & os) const
 }
 
 
-void MathMacroArgument::metrics(MathMetricsInfo & mi) const
+void MathMacroArgument::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        if (expanded_)
-               dim_ = xcell(0).metrics(mi);
+               cell(0).metrics(mi, dim_);
        else
                mathed_string_dim(mi.base.font, str_, dim_);
+       dim = dim_;
 }
 
 
-void MathMacroArgument::draw(MathPainterInfo & pi, int x, int y) const
+void MathMacroArgument::draw(PainterInfo & pi, int x, int y) const
 {
        if (expanded_)
-               xcell(0).draw(pi, x, y);
+               cell(0).draw(pi, x, y);
        else
                drawStrRed(pi, x, y, str_);
 }