make it compile again (hopefully)

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

diff --git a/src/mathed/InsetFormulaMacro.C b/src/mathed/InsetFormulaMacro.C
index 4544151305ef600cc72bf01345b5eae752966192..f0f76de90dc7beb72568ebbc3246c75bee647114 100644 (file)
--- a/src/mathed/InsetFormulaMacro.C
+++ b/src/mathed/InsetFormulaMacro.C
@@ -24,13 +24,14 @@
 #include "lyxlex.h"
 #include "outputparams.h"
 
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
-#include "frontends/font_metrics.h"
 
 #include "support/lstrings.h"
 
 #include <sstream>
 
+using lyx::odocstream;
 using lyx::support::bformat;
 
 using std::string;
@@ -75,7 +76,7 @@ void InsetFormulaMacro::write(Buffer const &, ostream & os) const
 }
 
 
-int InsetFormulaMacro::latex(Buffer const &, ostream & os,
+int InsetFormulaMacro::latex(Buffer const &, odocstream & os,
                             OutputParams const & runparams) const
 {
        //lyxerr << "InsetFormulaMacro::latex" << endl;
@@ -85,7 +86,7 @@ int InsetFormulaMacro::latex(Buffer const &, ostream & os,
 }
 
 
-int InsetFormulaMacro::plaintext(Buffer const &, ostream & os,
+int InsetFormulaMacro::plaintext(Buffer const &, odocstream & os,
                             OutputParams const &) const
 {
        WriteStream wi(os, false, true);
@@ -127,7 +128,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 +163,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);
 }