bug + spped fixes + small stuff

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

diff --git a/src/mathed/math_fboxinset.C b/src/mathed/math_fboxinset.C
index 4824231ddfdb5487305a63a9c7a83c0317e1d45b..7411545fb4351bd63c363f3bbe4b82df7c5d6cf0 100644 (file)
--- a/src/mathed/math_fboxinset.C
+++ b/src/mathed/math_fboxinset.C
@@ -11,10 +11,11 @@
 #include <config.h>
 
 #include "math_fboxinset.h"
-#include "math_support.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "math_streamstr.h"
 #include "math_parser.h"
+#include "math_streamstr.h"
+#include "LColor.h"
 #include "frontends/Painter.h"
 
 using std::auto_ptr;
@@ -43,12 +44,12 @@ void MathFboxInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        if (key_->name == "fbox") {
                FontSetChanger dummy(mi.base, "textnormal");
-               cell(0).metrics(mi, dim_);
+               cell(0).metrics(mi, dim);
        } else {
-               cell(0).metrics(mi, dim_);
+               cell(0).metrics(mi, dim);
        }
-       metricsMarkers(5); // 5 pixels margin
-       dim = dim_;
+       metricsMarkers(dim, 5); // 5 pixels margin
+       dim_ = dim;
 }