architectural changes to tex2lyx

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

diff --git a/src/mathed/math_frameboxinset.C b/src/mathed/math_frameboxinset.C
index a8381fb386041f992730754290ae5fece00b8df4..f077e11eb06332243263c7cec2616432f4e25dce 100644 (file)
--- a/src/mathed/math_frameboxinset.C
+++ b/src/mathed/math_frameboxinset.C
@@ -1,12 +1,12 @@
 #include <config.h>
 
-
 #include "math_frameboxinset.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "frontends/Painter.h"
 
+using std::auto_ptr;
 
 
 MathFrameboxInset::MathFrameboxInset()
@@ -14,30 +14,30 @@ MathFrameboxInset::MathFrameboxInset()
 {}
 
 
-MathInset * MathFrameboxInset::clone() const
+auto_ptr<InsetBase> MathFrameboxInset::clone() const
 {
-       return new MathFrameboxInset(*this);
+       return auto_ptr<InsetBase>(new MathFrameboxInset(*this));
 }
 
 
-void MathFrameboxInset::metrics(MetricsInfo & mi) const
+void MathFrameboxInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        FontSetChanger dummy(mi.base, "textnormal");
        w_ = mathed_char_width(mi.base.font, '[');
        MathNestInset::metrics(mi);
-       dim_    = cell(0).dim();
-       dim_   += cell(1).dim();
-       dim_   += cell(2).dim();
-       dim_.wid += 4 * w_ + 4;
-       metricsMarkers2(5); // 5 pixels margin
+       dim_  = cell(0).dim();
+       dim_ += cell(1).dim();
+       dim_ += cell(2).dim();
+       metricsMarkers();
+       dim = dim_;
 }
 
 
 void MathFrameboxInset::draw(PainterInfo & pi, int x, int y) const
 {
        FontSetChanger dummy(pi.base, "textnormal");
-       pi.pain.rectangle(x + 1, y - ascent() + 1, width() - 2, height() - 2,
-                       LColor::foreground);
+       pi.pain.rectangle(x + 1, y - dim_.ascent() + 1,
+               dim_.width() - 2, dim_.height() - 2, LColor::foreground);
        x += 5;
 
        drawStrBlack(pi, x, y, "[");