Amend f441590c

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

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index 221da4ada72bb5e30375d54dd640fdefece8772e..d077a1fc904842749dde9c17eb87be3119e72380 100644 (file)
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -56,7 +56,7 @@ class Painter {
 public:
        Painter(double pixel_ratio) : drawing_enabled_(true), pixel_ratio_(pixel_ratio) {}
 
-       static const float thin_line;
+       static const int thin_line;
 
        /// possible line styles
        enum line_style {
@@ -64,6 +64,13 @@ public:
                line_onoffdash //< dashes with spaces
        };
 
+       /// possible fill styles
+       enum fill_style {
+               fill_none,
+               fill_oddeven,
+               fill_winding
+       };
+
        /// possible character styles of preedit string.
        /// This is used for CJK input method support.
        enum preedit_style {
@@ -76,7 +83,7 @@ public:
 
        /// draw a line from point to point
        virtual void line(int x1, int y1, int x2, int y2, Color,
-               line_style = line_solid, float line_width = thin_line) = 0;
+               line_style = line_solid, int line_width = thin_line) = 0;
 
        /**
         * lines -  draw a set of lines
@@ -85,11 +92,12 @@ public:
         * @param np size of the points array
         */
        virtual void lines(int const * xp, int const * yp, int np, Color,
-               line_style = line_solid, float line_width = thin_line) = 0;
+               fill_style = fill_none, line_style = line_solid,
+               int line_width = thin_line) = 0;
 
        /// draw a rectangle
        virtual void rectangle(int x, int y, int w, int h, Color,
-               line_style = line_solid, float line_width = thin_line) = 0;
+               line_style = line_solid, int line_width = thin_line) = 0;
 
        /// draw a filled rectangle
        virtual void fillRectangle(int x, int y, int w, int h, Color) = 0;
@@ -112,13 +120,15 @@ public:
         * text direction is given by \c rtl.
         * \return the width of the drawn text.
         */
-       virtual int text(int x, int y, docstring const & str, FontInfo const & f, bool rtl = false) = 0;
+       virtual int text(int x, int y, docstring const & str, FontInfo const & f,
+                     bool rtl = false, double wordspacing = 0.0) = 0;
 
        /** draw a string at position x, y (y is the baseline). The
         * text direction is enforced by the \c Font.
         * \return the width of the drawn text.
         */
-       virtual int text(int x, int y, docstring const & str, Font const & f) = 0;
+       virtual int text(int x, int y, docstring const & str, Font const & f,
+                     double wordspacing = 0.0) = 0;
 
        /** draw a string at position x, y (y is the baseline), but
         * make sure that the part between \c from and \c to is in
@@ -126,7 +136,8 @@ public:
         * \return the width of the drawn text.
         */
        virtual int text(int x, int y, docstring const & str, Font const & f,
-                        Color other, size_type from, size_type to) = 0;
+                     Color other, size_type from, size_type to,
+                     double const wordspacing) = 0;
 
        void setDrawingEnabled(bool drawing_enabled)
        { drawing_enabled_ = drawing_enabled; }