Move Color::color enum to ColorCode.h

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

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index bc67d27ff6b5b1a5c9f453a69b1e74d20fab8c91..9fc31a57e761934d2859b04fb9eee97699b1e7b4 100644 (file)
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -13,12 +13,13 @@
 #ifndef PAINTER_H
 #define PAINTER_H
 
+#include "ColorCode.h"
+
 #include "support/docstring.h"
 
 namespace lyx {
 
-class Color_color;
-class LyXFont;
+class Font;
 
 namespace graphics { class Image; }
 
@@ -80,7 +81,7 @@ public:
        virtual void line(
                int x1, int y1,
                int x2, int y2,
-               Color_color,
+               ColorCode,
                line_style = line_solid,
                line_width = line_thin) = 0;
 
@@ -94,7 +95,7 @@ public:
                int const * xp,
                int const * yp,
                int np,
-               Color_color,
+               ColorCode,
                line_style = line_solid,
                line_width = line_thin) = 0;
 
@@ -102,7 +103,7 @@ public:
        virtual void rectangle(
                int x, int y,
                int w, int h,
-               Color_color,
+               ColorCode,
                line_style = line_solid,
                line_width = line_thin) = 0;
 
@@ -110,19 +111,19 @@ public:
        virtual void fillRectangle(
                int x, int y,
                int w, int h,
-               Color_color) = 0;
+               ColorCode) = 0;
 
        /// draw an arc
        virtual void arc(
                int x, int y,
                unsigned int w, unsigned int h,
                int a1, int a2,
-               Color_color) = 0;
+               ColorCode) = 0;
 
        /// draw a pixel
        virtual void point(
                int x, int y,
-               Color_color) = 0;
+               ColorCode) = 0;
 
        /// draw a filled rectangle with the shape of a 3D button
        virtual void button(int x, int y,
@@ -138,7 +139,7 @@ public:
        * \return the width of the drawn text.
        */
        virtual int text(int x, int y,
-               docstring const & str, LyXFont const & f) = 0;
+               docstring const & str, Font const & f) = 0;
 
        void setDrawingEnabled(bool drawing_enabled = true)
        { drawing_enabled_ = drawing_enabled; }
@@ -147,7 +148,7 @@ public:
        /**
        * \return the width of the drawn text.
        */
-       virtual int text(int x, int y, char_type c, LyXFont const & f) = 0;
+       virtual int text(int x, int y, char_type c, Font const & f) = 0;
 
        /**
         * Draw a string and enclose it inside a rectangle. If
@@ -157,25 +158,25 @@ public:
         */
        void rectText(int x, int baseline,
                docstring const & str,
-               LyXFont const & font,
-               Color_color back,
-               Color_color frame);
+               Font const & font,
+               ColorCode back,
+               ColorCode frame);
 
        /// draw a string and enclose it inside a button frame
        void buttonText(int x, int baseline, docstring const & s,
-               LyXFont const & font, bool mouseHover);
+               Font const & font, bool mouseHover);
 
        /// draw a character of a preedit string for cjk support.
        int preeditText(int x, int y,
-               char_type c, LyXFont const & f, preedit_style style);
+               char_type c, Font const & f, preedit_style style);
 
 protected:
        /// check the font, and if set, draw an underline
-       void underline(LyXFont const & f,
+       void underline(Font const & f,
                int x, int y, int width);
 
        /// check the font, and if set, draw an dashed underline
-       void dashedUnderline(LyXFont const & f,
+       void dashedUnderline(Font const & f,
                int x, int y, int width);
 
        /// draw a bevelled button border