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 9bf41db58c38b464a385c8ae2402849a983505f2..265ee41d099bb1ae15ee35b1f3d94aa245886b80 100644 (file)
--- a/src/frontends/xforms/XPainter.C
+++ b/src/frontends/xforms/XPainter.C
@@ -22,12 +22,15 @@
 
 #include "encoding.h"
 #include "language.h"
+#include "LColor.h"
 #include "lyxfont.h"
 #include "lyxrc.h"
 
 #include "support/lstrings.h"
 
-using namespace lyx::support;
+using lyx::support::uppercase;
+
+using std::string;
 
 
 XPainter::XPainter(XWorkArea & xwa)
@@ -48,7 +51,7 @@ int XPainter::paperHeight() const
 }
 
 
-Painter & XPainter::point(int x, int y, LColor::color c)
+Painter & XPainter::point(int x, int y, LColor_color c)
 {
        XDrawPoint(fl_get_display(), owner_.getPixmap(),
                lyxColorHandler->getGCForeground(c), x, y);
@@ -58,7 +61,7 @@ Painter & XPainter::point(int x, int y, LColor::color c)
 
 Painter & XPainter::line(int x1, int y1,
        int x2, int y2,
-       LColor::color col,
+       LColor_color col,
        line_style ls,
        line_width lw)
 {
@@ -71,7 +74,7 @@ Painter & XPainter::line(int x1, int y1,
 
 Painter & XPainter::lines(int const * xp, int const * yp,
        int np,
-       LColor::color col,
+       LColor_color col,
        line_style ls,
        line_width lw)
 {
@@ -92,7 +95,7 @@ Painter & XPainter::lines(int const * xp, int const * yp,
 
 Painter & XPainter::rectangle(int x, int y,
        int w, int h,
-       LColor::color col,
+       LColor_color col,
        line_style ls,
        line_width lw)
 {
@@ -105,7 +108,7 @@ Painter & XPainter::rectangle(int x, int y,
 
 Painter & XPainter::fillRectangle(int x, int y,
        int w, int h,
-       LColor::color col)
+       LColor_color col)
 {
        XFillRectangle(fl_get_display(), owner_.getPixmap(),
                lyxColorHandler->getGCForeground(col), x, y, w, h);
@@ -114,7 +117,7 @@ Painter & XPainter::fillRectangle(int x, int y,
 
 
 Painter & XPainter::fillPolygon(int const * xp, int const * yp,
-       int np, LColor::color col)
+       int np, LColor_color col)
 {
        boost::scoped_array<XPoint> points(new XPoint[np]);
 
@@ -133,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, LColor::color col)
+       int a1, int a2, LColor_color col)
 {
        XDrawArc(fl_get_display(), owner_.getPixmap(),
                lyxColorHandler->getGCForeground(col),