#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)
{
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;