fix #1073

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

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index a4473a9847e7d4f0115bdd6dfbbef3d4857668c5..5cbf21b179ca26fb1c6979ff8e60e6ece72530da 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -13,18 +13,15 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "formulamacro.h"
-#include "commandtags.h"
+#include "lfuns.h"
 #include "math_cursor.h"
 #include "math_parser.h"
 #include "math_macro.h"
 #include "math_macrotable.h"
 #include "math_macrotemplate.h"
-#include "math_metricsinfo.h"
+#include "metricsinfo.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
 #include "BufferView.h"
@@ -40,7 +37,7 @@
 
 #include "Lsstream.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 using std::ostream;
 
@@ -128,7 +125,11 @@ void InsetFormulaMacro::read(std::istream & is)
 
 string InsetFormulaMacro::prefix() const
 {
-       return boost::io::str(boost::format(_(" Macro: %1$s: ")) % getInsetName());
+#if USE_BOOST_FORMAT
+       return boost::io::str(boost::format(_(" Macro: %s: ")) % getInsetName());
+#else
+       return _(" Macro: ") + getInsetName() + ": ";
+#endif
 }
 
 
@@ -170,13 +171,13 @@ Inset::Code InsetFormulaMacro::lyxCode() const
 
 
 void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
-                            int y, float & xx, bool /*cleared*/) const
+                            int y, float & xx) const
 {
        // label
        LyXFont font(f);
        font.setColor(LColor::math);
 
-       MathPainterInfo pi = MathPainterInfo(bv->painter());
+       PainterInfo pi = PainterInfo(bv->painter());
        pi.base.style = LM_ST_TEXT;
        pi.base.font  = font;