Joao latest bits

[lyx.git] / src / frontends / Painter.h

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index 4d287f3b489f22e597889f12b8f48bc948177dca..18835ff4686f3d171d732e3ea0435c84ae8844e2 100644 (file)
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -5,26 +5,26 @@
  * Licence details can be found in the file COPYING.
  *
  * \author unknown
- * \author John Levon 
+ * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef PAINTER_H
 #define PAINTER_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include <string>
 
-#include "LString.h"
-#include "LColor.h"
 
+class LColor_color;
 class LyXFont;
 
-namespace grfx {
+namespace lyx {
+namespace graphics {
        class Image;
 }
+}
+
 
 /**
  * Painter - A painter class to encapsulate all graphics parameters and operations
@@ -64,10 +64,10 @@ public:
 
        /// begin painting
        virtual void start() {}
- 
+
        /// end painting
        virtual void end() {}
- 
+
        /// return the width of the work area in pixels
        virtual int paperWidth() const = 0;
        /// return the height of the work area in pixels
@@ -77,7 +77,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) = 0;
 
@@ -91,7 +91,7 @@ public:
                int const * xp,
                int const * yp,
                int np,
-               LColor::color = LColor::foreground,
+               LColor_color,
                line_style = line_solid,
                line_width = line_thin) = 0;
 
@@ -99,35 +99,35 @@ 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) = 0;
-       
+
        /// draw a filled rectangle
        virtual Painter & fillRectangle(
                int x, int y,
                int w, int h,
-               LColor::color) = 0;
-       
+               LColor_color) = 0;
+
        /// draw a filled (irregular) polygon
        virtual Painter & fillPolygon(
                int const * xp,
                int const * yp,
                int np,
-               LColor::color = LColor::foreground) = 0;
+               LColor_color) = 0;
 
        /// draw an arc
        virtual Painter & arc(
                int x, int y,
                unsigned int w, unsigned int h,
                int a1, int a2,
-               LColor::color = LColor::foreground) = 0;
+               LColor_color) = 0;
 
        /// draw a pixel
        virtual Painter & point(
                int x, int y,
-               LColor::color = LColor::foreground) = 0;
-       
+               LColor_color) = 0;
+
        /// draw a filled rectangle with the shape of a 3D button
        virtual Painter & button(int x, int y,
                int w, int h);
@@ -135,11 +135,11 @@ public:
        /// draw an image from the image cache
        virtual Painter & image(int x, int y,
                int w, int h,
-               grfx::Image const & image) = 0;
-       
+               lyx::graphics::Image const & image) = 0;
+
        /// draw a string at position x, y (y is the baseline)
        virtual Painter & text(int x, int y,
-               string const & str, LyXFont const & f) = 0;
+               std::string const & str, LyXFont const & f) = 0;
 
        /**
         * Draw a string at position x, y (y is the baseline)
@@ -160,23 +160,23 @@ public:
         * around the text with the given color.
         */
        Painter & rectText(int x, int baseline,
-               string const & string,
+               std::string const & str,
                LyXFont const & font,
-               LColor::color back = LColor::none,
-               LColor::color frame = LColor::none);
+               LColor_color back,
+               LColor_color frame);
 
        /// draw a string and enclose it inside a button frame
        Painter & buttonText(int x,
-               int baseline, string const & s,
+               int baseline, std::string const & s,
                LyXFont const & font);
 
 protected:
        /// check the font, and if set, draw an underline
-       void underline(LyXFont const & f, 
+       void underline(LyXFont const & f,
                int x, int y, int width);
-       
+
        /// draw a bevelled button border
-        Painter & buttonFrame(int x, int y, int w, int h);
+       Painter & buttonFrame(int x, int y, int w, int h);
 };
 
 #endif // PAINTER_H