Introduce LFUN_PRINT.

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

diff --git a/src/frontends/xforms/XPainter.h b/src/frontends/xforms/XPainter.h
index 58a70bff958ca1134b31fb0ae285918c7831bc4e..3bf855b6c184578b52f7b44f0bcbad720757d66a 100644 (file)
--- a/src/frontends/xforms/XPainter.h
+++ b/src/frontends/xforms/XPainter.h
@@ -14,7 +14,6 @@
 #define XPAINTER_H
 
 #include "frontends/Painter.h"
-#include "LString.h"
 
 #include <X11/Xlib.h>
 
@@ -38,7 +37,7 @@ public:
        virtual Painter & line(
                int x1, int y1,
                int x2, int y2,
-               LColor::color = LColor::foreground,
+               LColor_color,
                line_style = line_solid,
                line_width = line_thin);
 
@@ -52,7 +51,7 @@ public:
                int const * xp,
                int const * yp,
                int np,
-               LColor::color = LColor::foreground,
+               LColor_color,
                line_style = line_solid,
                line_width = line_thin);
 
@@ -60,7 +59,7 @@ public:
        virtual Painter & rectangle(
                int x, int y,
                int w, int h,
-               LColor::color = LColor::foreground,
+               LColor_color,
                line_style = line_solid,
                line_width = line_thin);
 
@@ -68,26 +67,26 @@ public:
        virtual Painter & fillRectangle(
                int x, int y,
                int w, int h,
-               LColor::color);
+               LColor_color);
 
        /// draw a filled (irregular) polygon
        virtual Painter & fillPolygon(
                int const * xp,
                int const * yp,
                int np,
-               LColor::color = LColor::foreground);
+               LColor_color);
 
        /// draw an arc
        virtual Painter & arc(
                int x, int y,
                unsigned int w, unsigned int h,
                int a1, int a2,
-               LColor::color = LColor::foreground);
+               LColor_color);
 
        /// draw a pixel
        virtual Painter & point(
                int x, int y,
-               LColor::color = LColor::foreground);
+               LColor_color);
 
        /// draw an image from the image cache
        virtual Painter & image(int x, int y,
@@ -96,7 +95,7 @@ public:
 
        /// draw a string at position x, y (y is the baseline)
        virtual Painter & text(int x, int y,
-               string const & str, LyXFont const & f);
+               std::string const & str, LyXFont const & f);
 
        /** Draw a string at position x, y (y is the baseline)
         *  This is just for fast drawing