Fix to bug 2362: Deleting superscript also deletes subscript.

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

diff --git a/src/mathed/math_binominset.C b/src/mathed/math_binominset.C
index fd7aa7ad73fecadfabc696af88467d0438555371..7e89c8f3f3a2c3f886eae54607c2cbe0d6bdd0ff 100644 (file)
--- a/src/mathed/math_binominset.C
+++ b/src/mathed/math_binominset.C
@@ -1,12 +1,23 @@
+/**
+ * \file math_binominset.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_binominset.h"
+#include "math_data.h"
 #include "math_support.h"
-#include "support/LOstream.h"
 #include "math_mathmlstream.h"
 
 
 using std::max;
+using std::auto_ptr;
 
 
 MathBinomInset::MathBinomInset(bool choose)
@@ -14,9 +25,9 @@ MathBinomInset::MathBinomInset(bool choose)
 {}
 
 
-MathInset * MathBinomInset::clone() const
+auto_ptr<InsetBase> MathBinomInset::doClone() const
 {
-       return new MathBinomInset(*this);
+       return auto_ptr<InsetBase>(new MathBinomInset(*this));
 }
 
 
@@ -36,10 +47,11 @@ void MathBinomInset::metrics(MetricsInfo & mi, Dimension & dim) const
        ScriptChanger dummy(mi.base);
        cell(0).metrics(mi);
        cell(1).metrics(mi);
-       dim_.asc = cell(0).height() + 4 + 5;
-       dim_.des = cell(1).height() + 4 - 5;
-       dim_.wid = max(cell(0).width(), cell(1).width()) + 2 * dw() + 4;
-       dim = dim_;
+       dim.asc = cell(0).height() + 4 + 5;
+       dim.des = cell(1).height() + 4 - 5;
+       dim.wid = max(cell(0).width(), cell(1).width()) + 2 * dw() + 4;
+       metricsMarkers2(dim);
+       dim_ = dim;
 }
 
 
@@ -52,6 +64,7 @@ void MathBinomInset::draw(PainterInfo & pi, int x, int y) const
        mathed_draw_deco(pi, x, y - dim_.ascent(), dw(), dim_.height(), "(");
        mathed_draw_deco(pi, x + dim_.width() - dw(), y - dim_.ascent(),
                dw(), dim_.height(), ")");
+       drawMarkers2(pi, x, y);
 }