last commit was incomplete... not sure how I managed this..

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

diff --git a/src/mathed/InsetMathBoxed.cpp b/src/mathed/InsetMathBoxed.cpp
index 2ff48888f771fc0aaba0674460a658a2098333e7..d9e52c3e1fe4047178274676a162a9b474642870 100644 (file)
--- a/src/mathed/InsetMathBoxed.cpp
+++ b/src/mathed/InsetMathBoxed.cpp
@@ -14,7 +14,7 @@
 #include "MathData.h"
 #include "MathStream.h"
 #include "LaTeXFeatures.h"
-#include "LColor.h"
+#include "Color.h"
 
 #include "support/std_ostream.h"
 #include "frontends/Painter.h"
@@ -22,35 +22,31 @@
 
 namespace lyx {
 
-using std::auto_ptr;
-
-
 InsetMathBoxed::InsetMathBoxed()
        : InsetMathNest(1)
 {}
 
 
-auto_ptr<InsetBase> InsetMathBoxed::doClone() const
+Inset * InsetMathBoxed::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathBoxed(*this));
+       return new InsetMathBoxed(*this);
 }
 
 
-bool InsetMathBoxed::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathBoxed::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi, dim);
        metricsMarkers2(dim, 3); // 1 pixel space, 1 frame, 1 space
-       if (dim_ == dim)
-               return false;
-       dim_ = dim;
-       return true;
+       // Cache the inset dimension. 
+       setDimCache(mi, dim);
 }
 
 
 void InsetMathBoxed::draw(PainterInfo & pi, int x, int y) const
 {
-       pi.pain.rectangle(x + 1, y - dim_.ascent() + 1,
-               dim_.width() - 2, dim_.height() - 2, LColor::foreground);
+       Dimension const dim = dimension(*pi.base.bv);
+       pi.pain.rectangle(x + 1, y - dim.ascent() + 1,
+               dim.width() - 2, dim.height() - 2, Color::foreground);
        cell(0).draw(pi, x + 3, y);
        setPosCache(pi, x, y);
 }