revert last patch. there's something wrong, possibly unrelated to this

[lyx.git] / src / mathed / InsetMathXArrow.cpp

diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp
index 02a1e4147b40234f2117f3d43c558bdafd22afb5..3faee295f3b10602d7590e3fd5f6dbb91a7cf631 100644 (file)
--- a/src/mathed/InsetMathXArrow.cpp
+++ b/src/mathed/InsetMathXArrow.cpp
@@ -18,37 +18,33 @@
 
 #include "LaTeXFeatures.h"
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
-using std::auto_ptr;
-
 
 InsetMathXArrow::InsetMathXArrow(docstring const & name)
        : InsetMathFracBase(), name_(name)
 {}
 
 
-auto_ptr<Inset> InsetMathXArrow::doClone() const
+Inset * InsetMathXArrow::clone() const
 {
-       return auto_ptr<Inset>(new InsetMathXArrow(*this));
+       return new InsetMathXArrow(*this);
 }
 
 
-bool InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        ScriptChanger dummy(mi.base);
-       cell(0).metrics(mi);
-       cell(1).metrics(mi);
-       dim.wid = std::max(cell(0).width(), cell(1).width()) + 10;
-       dim.asc = cell(0).height() + 10;
-       dim.des = cell(1).height();
+       Dimension dim0;
+       cell(0).metrics(mi, dim0);
+       Dimension dim1;
+       cell(1).metrics(mi, dim1);
+       dim.wid = max(dim0.width(), dim1.width()) + 10;
+       dim.asc = dim0.height() + 10;
+       dim.des = dim1.height();
        metricsMarkers(dim);
-       if (dim_ == dim)
-               return false;
-       dim_ = dim;
-       return true;
 }
 
 
@@ -56,8 +52,10 @@ void InsetMathXArrow::draw(PainterInfo & pi, int x, int y) const
 {
        ScriptChanger dummy(pi.base);
        cell(0).draw(pi, x + 5, y - 10);
-       cell(1).draw(pi, x + 5, y + cell(1).height());
-       mathed_draw_deco(pi, x + 1, y - 7, width() - 2, 5, name_);
+       Dimension const & dim1 = cell(1).dimension(*pi.base.bv);
+       cell(1).draw(pi, x + 5, y + dim1.height());
+       Dimension const dim = dimension(*pi.base.bv);
+       mathed_draw_deco(pi, x + 1, y - 7, dim.wid - 2, 5, name_);
        drawMarkers(pi, x, y);
 }