X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FPainter.C;h=74fe2b78f0818ace169cfe027c5fb47db20e827d;hb=2f1d525ee1d41bc20adbfe766a9c5d90469aa4b2;hp=f3294346c80b0e8fbbbbed168c32f995f3aaa3ea;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/frontends/Painter.C b/src/frontends/Painter.C
index f3294346c8..74fe2b78f0 100644
--- a/src/frontends/Painter.C
+++ b/src/frontends/Painter.C
@@ -11,13 +11,16 @@
 
 #include <config.h>
 
-
 #include "Painter.h"
-#include "lyxfont.h"
+#include "font_metrics.h"
 #include "WorkArea.h"
-#include "frontends/font_metrics.h"
+
+#include "LColor.h"
+#include "lyxfont.h"
 
 using std::max;
+using std::string;
+
 
 Painter & Painter::button(int x, int y, int w, int h)
 {
@@ -57,8 +60,8 @@ Painter & Painter::buttonFrame(int x, int y, int w, int h)
 Painter & Painter::rectText(int x, int baseline,
 	string const & str,
 	LyXFont const & font,
-	LColor::color back,
-	LColor::color frame)
+	LColor_color back,
+	LColor_color frame)
 {
 	int width;
 	int ascent;