Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/math_braceinset.C b/src/mathed/math_braceinset.C
index 10387173366ffdba330d9bc7fcf1c44f70867bb6..7e8a70234969bf181baddd470e7044a3dcdf87e5 100644 (file)
--- a/src/mathed/math_braceinset.C
+++ b/src/mathed/math_braceinset.C
@@ -1,13 +1,25 @@
-#include <config.h>
+/**
+ * \file math_braceinset.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.
+ */
 
+#include <config.h>
 
 #include "math_braceinset.h"
-#include "math_parser.h"
-#include "math_support.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "support/LOstream.h"
+#include "math_support.h"
+#include "LColor.h"
+#include "support/std_ostream.h"
+#include "frontends/Painter.h"
 
 using std::max;
+using std::auto_ptr;
 
 
 MathBraceInset::MathBraceInset()
@@ -22,31 +34,35 @@ MathBraceInset::MathBraceInset(MathArray const & ar)
 }
 
 
-MathInset * MathBraceInset::clone() const
+auto_ptr<InsetBase> MathBraceInset::doClone() const
 {
-       return new MathBraceInset(*this);
+       return auto_ptr<InsetBase>(new MathBraceInset(*this));
 }
 
 
-void MathBraceInset::metrics(MathMetricsInfo & mi) const
+void MathBraceInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi);
        Dimension t;
        mathed_char_dim(mi.base.font, '{', t);
-       wid_ = t.w;
-       dim_.a = max(cell(0).ascent(), t.a);
-       dim_.d = max(cell(0).descent(), t.a);
-       dim_.w = cell(0).width() + 2 * wid_;
+       dim.asc = max(cell(0).ascent(), t.asc);
+       dim.des = max(cell(0).descent(), t.des);
+       dim.wid = cell(0).width() + 2 * t.wid;
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
-void MathBraceInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathBraceInset::draw(PainterInfo & pi, int x, int y) const
 {
        LyXFont font = pi.base.font;
        font.setColor(LColor::latex);
-       drawChar(pi, font, x, y, '{');
-       cell(0).draw(pi, x + wid_, y);
-       drawChar(pi, font, x + width() - wid_, y, '}');
+       Dimension t;
+       mathed_char_dim(font, '{', t);
+       pi.pain.text(x, y, '{', font);
+       cell(0).draw(pi, x + t.wid, y);
+       pi.pain.text(x + t.wid + cell(0).width(), y, '}', font);
+       drawMarkers(pi, x, y);
 }
 
 
@@ -62,13 +78,13 @@ void MathBraceInset::normalize(NormalStream & os) const
 }
 
 
-void MathBraceInset::maplize(MapleStream & os) const
+void MathBraceInset::maple(MapleStream & os) const
 {
        os << cell(0);
 }
 
 
-void MathBraceInset::octavize(OctaveStream & os) const
+void MathBraceInset::octave(OctaveStream & os) const
 {
        os << cell(0);
 }
@@ -80,7 +96,7 @@ void MathBraceInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathBraceInset::mathematicize(MathematicaStream & os) const
+void MathBraceInset::mathematica(MathematicaStream & os) const
 {
        os << cell(0);
 }