Introduce LFUN_PRINT.

[lyx.git] / src / frontends / xforms / XPainter.C

diff --git a/src/frontends/xforms/XPainter.C b/src/frontends/xforms/XPainter.C
index dc762f7cfed950312a6ac6afed7a8a93f670afc5..265ee41d099bb1ae15ee35b1f3d94aa245886b80 100644 (file)
--- a/src/frontends/xforms/XPainter.C
+++ b/src/frontends/xforms/XPainter.C
@@ -30,6 +30,8 @@
 
 using lyx::support::uppercase;
 
+using std::string;
+
 
 XPainter::XPainter(XWorkArea & xwa)
        : Painter(), owner_(xwa)
@@ -49,7 +51,7 @@ int XPainter::paperHeight() const
 }
 
 
-Painter & XPainter::point(int x, int y, EnumLColor c)
+Painter & XPainter::point(int x, int y, LColor_color c)
 {
        XDrawPoint(fl_get_display(), owner_.getPixmap(),
                lyxColorHandler->getGCForeground(c), x, y);
@@ -59,7 +61,7 @@ Painter & XPainter::point(int x, int y, EnumLColor c)
 
 Painter & XPainter::line(int x1, int y1,
        int x2, int y2,
-       EnumLColor col,
+       LColor_color col,
        line_style ls,
        line_width lw)
 {
@@ -72,7 +74,7 @@ Painter & XPainter::line(int x1, int y1,
 
 Painter & XPainter::lines(int const * xp, int const * yp,
        int np,
-       EnumLColor col,
+       LColor_color col,
        line_style ls,
        line_width lw)
 {
@@ -93,7 +95,7 @@ Painter & XPainter::lines(int const * xp, int const * yp,
 
 Painter & XPainter::rectangle(int x, int y,
        int w, int h,
-       EnumLColor col,
+       LColor_color col,
        line_style ls,
        line_width lw)
 {
@@ -106,7 +108,7 @@ Painter & XPainter::rectangle(int x, int y,
 
 Painter & XPainter::fillRectangle(int x, int y,
        int w, int h,
-       EnumLColor col)
+       LColor_color col)
 {
        XFillRectangle(fl_get_display(), owner_.getPixmap(),
                lyxColorHandler->getGCForeground(col), x, y, w, h);
@@ -115,7 +117,7 @@ Painter & XPainter::fillRectangle(int x, int y,
 
 
 Painter & XPainter::fillPolygon(int const * xp, int const * yp,
-       int np, EnumLColor col)
+       int np, LColor_color col)
 {
        boost::scoped_array<XPoint> points(new XPoint[np]);
 
@@ -134,7 +136,7 @@ Painter & XPainter::fillPolygon(int const * xp, int const * yp,
 
 Painter & XPainter::arc(int x, int y,
        unsigned int w, unsigned int h,
-       int a1, int a2, EnumLColor col)
+       int a1, int a2, LColor_color col)
 {
        XDrawArc(fl_get_display(), owner_.getPixmap(),
                lyxColorHandler->getGCForeground(col),