Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/math_makeboxinset.C b/src/mathed/math_makeboxinset.C
index 1ae10b02701d7c7511c734ef70991f17c0362837..a3d6d4b480b07b0a1875c6ff541c3089b38063b2 100644 (file)
--- a/src/mathed/math_makeboxinset.C
+++ b/src/mathed/math_makeboxinset.C
@@ -11,10 +11,11 @@
 #include <config.h>
 
 #include "math_makeboxinset.h"
-#include "math_support.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "frontends/Painter.h"
+#include "math_support.h"
+
+#include "support/std_ostream.h"
 
 using std::auto_ptr;
 
@@ -24,7 +25,7 @@ MathMakeboxInset::MathMakeboxInset()
 {}
 
 
-auto_ptr<InsetBase> MathMakeboxInset::clone() const
+auto_ptr<InsetBase> MathMakeboxInset::doClone() const
 {
        return auto_ptr<InsetBase>(new MathMakeboxInset(*this));
 }
@@ -35,12 +36,12 @@ void MathMakeboxInset::metrics(MetricsInfo & mi, Dimension & dim) const
        FontSetChanger dummy(mi.base, "textnormal");
        w_ = mathed_char_width(mi.base.font, '[');
        MathNestInset::metrics(mi);
-       dim_   = cell(0).dim();
-       dim_  += cell(1).dim();
-       dim_  += cell(2).dim();
-       dim_.wid += 4 * w_ + 4;
-       metricsMarkers();
-       dim = dim_;
+       dim   = cell(0).dim();
+       dim  += cell(1).dim();
+       dim  += cell(2).dim();
+       dim.wid += 4 * w_ + 4;
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
@@ -64,6 +65,7 @@ void MathMakeboxInset::draw(PainterInfo & pi, int x, int y) const
        x += w_ + 2;
 
        cell(2).draw(pi, x, y);
+       setPosCache(pi, x, y);
 }
 
 
@@ -81,3 +83,10 @@ void MathMakeboxInset::normalize(NormalStream & os) const
 {
        os << "[makebox " << cell(0) << ' ' << cell(1) << ' ' << cell(2) << ']';
 }
+
+
+void MathMakeboxInset::infoize(std::ostream & os) const
+{
+       os << "Makebox (width: " << cell(0)
+           << " pos: " << cell(1) << ")";
+}