This commit saves the need to check for lyx::use_gui in a number of places.

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

diff --git a/src/mathed/InsetFormulaMacro.C b/src/mathed/InsetFormulaMacro.C
index 1406d1bb73738d39f7e26181862b23ff62dfd0d1..1c0df28003ef5f48af63335d27c765f18d547064 100644 (file)
--- a/src/mathed/InsetFormulaMacro.C
+++ b/src/mathed/InsetFormulaMacro.C
@@ -13,7 +13,7 @@
 
 #include "InsetFormulaMacro.h"
 #include "MathMacroTable.h"
-#include "MatheMacroTemplate.h"
+#include "MathMacroTemplate.h"
 #include "MathMLStream.h"
 
 #include "BufferView.h"
@@ -24,8 +24,8 @@
 #include "lyxlex.h"
 #include "outputparams.h"
 
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
-#include "frontends/font_metrics.h"
 
 #include "support/lstrings.h"
 
@@ -85,7 +85,7 @@ int InsetFormulaMacro::latex(Buffer const &, ostream & os,
 }
 
 
-int InsetFormulaMacro::plaintext(Buffer const &, ostream & os,
+int InsetFormulaMacro::plaintext(Buffer const &, lyx::odocstream & os,
                             OutputParams const &) const
 {
        WriteStream wi(os, false, true);
@@ -127,7 +127,7 @@ void InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) const
        tmpl()->metrics(mi, dim);
        dim.asc += 5;
        dim.des += 5;
-       dim.wid += 10 + font_metrics::width(prefix(), mi.base.font);
+       dim.wid += 10 + theFontMetrics(mi.base.font).width(prefix());
        dim_ = dim;
 }
 
@@ -162,7 +162,9 @@ void InsetFormulaMacro::draw(PainterInfo & p, int x, int y) const
        pi.pain.text(x + 2, y, prefix(), font);
 
        // body
-       tmpl()->draw(pi, x + font_metrics::width(prefix(), p.base.font) + 5, y);
+       tmpl()->draw(pi,
+               x + theFontMetrics(p.base.font).width(prefix()) + 5,
+               y);
 
        setPosCache(pi, x, y);
 }