Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/math_oversetinset.C b/src/mathed/math_oversetinset.C
index c38fc7fcf5749ac0e518c193227451739490f390..ed4670407bdd501d8f47efe493b9fe37e250f020 100644 (file)
--- a/src/mathed/math_oversetinset.C
+++ b/src/mathed/math_oversetinset.C
@@ -14,12 +14,14 @@
 #include "math_data.h"
 #include "math_mathmlstream.h"
 
+#include "cursor.h"
+#include "LaTeXFeatures.h"
 
 using std::max;
 using std::auto_ptr;
 
 
-auto_ptr<InsetBase> MathOversetInset::clone() const
+auto_ptr<InsetBase> MathOversetInset::doClone() const
 {
        return auto_ptr<InsetBase>(new MathOversetInset(*this));
 }
@@ -30,35 +32,37 @@ void MathOversetInset::metrics(MetricsInfo & mi, Dimension & dim) const
        cell(1).metrics(mi);
        FracChanger dummy(mi.base);
        cell(0).metrics(mi);
-       dim_.wid = max(cell(0).width(), cell(1).width()) + 4;
-       dim_.asc = cell(1).ascent() + cell(0).height() + 4;
-       dim_.des = cell(1).descent();
-       dim = dim_;
+       dim.wid = max(cell(0).width(), cell(1).width()) + 4;
+       dim.asc = cell(1).ascent() + cell(0).height() + 4;
+       dim.des = cell(1).descent();
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
 void MathOversetInset::draw(PainterInfo & pi, int x, int y) const
 {
-       int m  = x + pi.width / 2;
+       int m  = x + width() / 2;
        int yo = y - cell(1).ascent() + cell(0).descent() - 1;
        cell(1).draw(pi, m - cell(1).width() / 2, y);
        FracChanger dummy(pi.base);
        cell(0).draw(pi, m - cell(0).width() / 2, yo);
+       drawMarkers(pi, x, y);
 }
 
 
-bool MathOversetInset::idxFirst(idx_type & i, pos_type & pos) const
+bool MathOversetInset::idxFirst(LCursor & cur) const
 {
-       i = 1;
-       pos = 0;
+       cur.idx() = 1;
+       cur.pos() = 0;
        return true;
 }
 
 
-bool MathOversetInset::idxLast(idx_type & i, pos_type & pos) const
+bool MathOversetInset::idxLast(LCursor & cur) const
 {
-       i = 1;
-       pos = cell(i).size();
+       cur.idx() = 1;
+       cur.pos() = cur.lastpos();
        return true;
 }
 
@@ -73,3 +77,10 @@ void MathOversetInset::normalize(NormalStream & os) const
 {
        os << "[overset " << cell(0) << ' ' << cell(1) << ']';
 }
+
+
+void MathOversetInset::validate(LaTeXFeatures & features) const
+{
+       features.require("amsmath");
+       MathNestInset::validate(features);
+}