namespace lyx {
-using std::auto_ptr;
-
-
InsetMathMakebox::InsetMathMakebox()
: InsetMathNest(3)
{}
-auto_ptr<InsetBase> InsetMathMakebox::doClone() const
+Inset * InsetMathMakebox::clone() const
{
- return auto_ptr<InsetBase>(new InsetMathMakebox(*this));
+ return new InsetMathMakebox(*this);
}
-bool InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
{
FontSetChanger dummy(mi.base, from_ascii("textnormal"));
w_ = mathed_char_width(mi.base.font, '[');
InsetMathNest::metrics(mi);
- dim = cell(0).dim();
- dim += cell(1).dim();
- dim += cell(2).dim();
+ dim = cell(0).dimension(*mi.base.bv);
+ dim += cell(1).dimension(*mi.base.bv);
+ dim += cell(2).dimension(*mi.base.bv);
dim.wid += 4 * w_ + 4;
metricsMarkers(dim);
- if (dim_ == dim)
- return false;
- dim_ = dim;
- return true;
+ // Cache the inset dimension.
+ setDimCache(mi, dim);
}
drawStrBlack(pi, x, y, from_ascii("["));
x += w_;
cell(0).draw(pi, x, y);
- x += cell(0).width();
+ x += cell(0).dimension(*pi.base.bv).width();
drawStrBlack(pi, x, y, from_ascii("]"));
x += w_ + 2;
drawStrBlack(pi, x, y, from_ascii("["));
x += w_;
cell(1).draw(pi, x, y);
- x += cell(1).width();
+ x += cell(1).dimension(*pi.base.bv).wid;
drawStrBlack(pi, x, y, from_ascii("]"));
x += w_ + 2;