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 3f6e6a7c55aa1b6a047324db16edc5d4f3172bec..74fe2b78f0818ace169cfe027c5fb47db20e827d 100644 (file)
--- a/src/frontends/Painter.C
+++ b/src/frontends/Painter.C
@@ -6,18 +6,21 @@
  * \author unknown
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #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;