X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulamacro.C;h=16f8c3c58b0448fc457991ed66dd19c1cc7231ee;hb=c649284611c4198c9d70be8a16d153cdf1ec0700;hp=8eb819d6ba1a5459a4217be3578a948da7f0ffb4;hpb=2dabaa33dec0a1fa17c9309e3d6cf029d6a76509;p=lyx.git

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index 8eb819d6ba..16f8c3c58b 100644
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -99,7 +99,7 @@ int InsetFormulaMacro::linuxdoc(Buffer const * buf, ostream & os) const
 }
 
 
-int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os) const
+int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os, bool) const
 {
 	return ascii(buf, os, 0);
 }
@@ -167,7 +167,7 @@ MathInsetTypes InsetFormulaMacro::getType() const
 void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
 			     int y, float & xx, bool /*cleared*/) const
 {
-	Painter & pain = bv->painter();
+	MathPainterInfo pain = MathPainterInfo(bv->painter());
 	LyXFont font(f);
 
 	// label
@@ -179,14 +179,14 @@ void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
 	int const h = ascent(bv, font) + descent(bv, font) - 2;
 
 	// LColor::mathbg used to be "AntiqueWhite" but is "linen" now, too
-	pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
-	pain.rectangle(x, a, w, h, LColor::mathframe);
+	pain.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
+	pain.pain.rectangle(x, a, w, h, LColor::mathframe);
 
 	if (mathcursor &&
 			const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
 		mathcursor->drawSelection(pain);
 
-	pain.text(x + 2, y, prefix(), font);
+	pain.pain.text(x + 2, y, prefix(), font);
 
 	// formula
 	par()->draw(pain, x + font_metrics::width(prefix(), f) + 5, y);