bug + spped fixes + small stuff

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

diff --git a/src/mathed/math_macroarg.C b/src/mathed/math_macroarg.C
index eb290c7a3e15af548838c7c96cb1634b00f042c2..5073c37087aab4f7764ecbef34a25d9e4cea0043 100644 (file)
--- a/src/mathed/math_macroarg.C
+++ b/src/mathed/math_macroarg.C
@@ -1,6 +1,15 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
+/**
+ * \file math_macroarg.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
 
 #include "math_macroarg.h"
 #include "math_macro.h"
@@ -8,8 +17,8 @@
 #include "math_support.h"
 #include "debug.h"
 
-
 using std::endl;
+using std::auto_ptr;
 
 
 MathMacroArgument::MathMacroArgument(int n)
@@ -25,9 +34,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 +46,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_);
 }