Make Helge happy: no more crash on arrow up/down in math macro

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

diff --git a/src/mathed/math_commentinset.C b/src/mathed/math_commentinset.C
index 6887dc23bbe754fa6240fd4b437108002673598e..790871ccbe1204683796be45d5e66d7bf47b6699 100644 (file)
--- a/src/mathed/math_commentinset.C
+++ b/src/mathed/math_commentinset.C
@@ -1,15 +1,23 @@
-#include <config.h>
+/**
+ * \file math_commentinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "math_commentinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "LaTeXFeatures.h"
-#include "support/LOstream.h"
-#include "textpainter.h"
+#include "math_support.h"
+#include "support/std_ostream.h"
 
+using std::string;
+using std::auto_ptr;
 
 
 MathCommentInset::MathCommentInset()
@@ -20,33 +28,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::doClone() 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);
-       metricsMarkers();
+       cell(0).metrics(mi, dim);
+       metricsMarkers(dim);
+       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);
 }
 
 
@@ -62,17 +71,17 @@ void MathCommentInset::write(WriteStream & os) const
 }
 
 
-void MathCommentInset::maplize(MapleStream & os) const
+void MathCommentInset::maple(MapleStream & os) const
 {
        os << '#' << cell(0) << "\n";
 }
 
 
-void MathCommentInset::mathematicize(MathematicaStream &) const
+void MathCommentInset::mathematica(MathematicaStream &) const
 {}
 
 
-void MathCommentInset::octavize(OctaveStream &) const
+void MathCommentInset::octave(OctaveStream &) const
 {}