architectural changes to tex2lyx

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

diff --git a/src/mathed/math_commentinset.C b/src/mathed/math_commentinset.C
index 929b544e57cbaa3d71d5b395584fc6e7519ec1bc..8c9247cb4342db6b18adeb456fb9ec7f33c8d415 100644 (file)
--- a/src/mathed/math_commentinset.C
+++ b/src/mathed/math_commentinset.C
@@ -1,12 +1,14 @@
 #include <config.h>
 
-
 #include "math_commentinset.h"
+#include "math_data.h"
+#include "math_support.h"
 #include "math_mathmlstream.h"
 #include "LaTeXFeatures.h"
 #include "support/LOstream.h"
 #include "textpainter.h"
 
+using std::auto_ptr;
 
 
 MathCommentInset::MathCommentInset()
@@ -17,33 +19,34 @@ MathCommentInset::MathCommentInset()
 MathCommentInset::MathCommentInset(string const & str)
        : MathNestInset(1)
 {
-       cell(0) = asArray(str);
+       asArray(str, cell(0));
 }
 
 
-MathInset * MathCommentInset::clone() const
+auto_ptr<InsetBase> MathCommentInset::clone() const
 {
-       return new MathCommentInset(*this);
+       return auto_ptr<InsetBase>(new MathCommentInset(*this));
 }
 
 
-void MathCommentInset::metrics(MathMetricsInfo & mi) const
+void MathCommentInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       dim_ = cell(0).metrics(mi);
+       cell(0).metrics(mi);
        metricsMarkers();
+       dim = dim_;
 }
 
 
-void MathCommentInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathCommentInset::draw(PainterInfo & pi, int x, int y) const
 {
        cell(0).draw(pi, x + 1, y);
        drawMarkers(pi, x, y);
 }
 
 
-void MathCommentInset::metricsT(TextMetricsInfo const & mi) const
+void MathCommentInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
 {
-       dim_ = cell(0).metricsT(mi);
+       cell(0).metricsT(mi, dim);
 }