Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/math_frameboxinset.C b/src/mathed/math_frameboxinset.C
index f09c40c2c44484e5c75360115e2110dabae5e04b..bb6badd6bb7590b1404052c1f5fa8de8f591ccd3 100644 (file)
--- a/src/mathed/math_frameboxinset.C
+++ b/src/mathed/math_frameboxinset.C
@@ -11,8 +11,10 @@
 #include <config.h>
 
 #include "math_frameboxinset.h"
-#include "math_support.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
+#include "math_support.h"
+#include "LColor.h"
 #include "frontends/Painter.h"
 
 using std::auto_ptr;
@@ -23,7 +25,7 @@ MathFrameboxInset::MathFrameboxInset()
 {}
 
 
-auto_ptr<InsetBase> MathFrameboxInset::clone() const
+auto_ptr<InsetBase> MathFrameboxInset::doClone() const
 {
        return auto_ptr<InsetBase>(new MathFrameboxInset(*this));
 }
@@ -34,11 +36,11 @@ void MathFrameboxInset::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();
-       metricsMarkers();
-       dim = dim_;
+       dim  = cell(0).dim();
+       dim += cell(1).dim();
+       dim += cell(2).dim();
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
@@ -64,6 +66,7 @@ void MathFrameboxInset::draw(PainterInfo & pi, int x, int y) const
        x += w_ + 4;
 
        cell(2).draw(pi, x, y);
+       drawMarkers(pi, x, y);
 }