Minipage is no more (long live the box inset)

[lyx.git] / src / frontends / Painter.C

diff --git a/src/frontends/Painter.C b/src/frontends/Painter.C
index 6fd9fd166f50083b322053f30263bb699305ecbd..74fe2b78f0818ace169cfe027c5fb47db20e827d 100644 (file)
--- a/src/frontends/Painter.C
+++ b/src/frontends/Painter.C
@@ -13,10 +13,13 @@
 
 #include "Painter.h"
 #include "font_metrics.h"
-#include "lyxfont.h"
 #include "WorkArea.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;