* src/frontends/qt4/GuiSelection.C

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

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index 6badb61439038449ecb7a70e5f6541aa75a28b41..40f624b420f73edda88fa512b0b1e6ec22f24a5b 100644 (file)
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -13,13 +13,11 @@
 #ifndef PAINTER_H
 #define PAINTER_H
 
-#include "LColor.h"
-
 #include "support/docstring.h"
 
-
 namespace lyx {
 
+class LColor_color;
 class LyXFont;
 
 namespace graphics { class Image; }
@@ -45,6 +43,13 @@ namespace frontend {
  * management.
  *
  * Note that the methods return *this for convenience.
+ *
+ * Caution: All char_type and docstring arguments of the text drawing
+ * methods of this class are no UCS4 chars or strings if the font is a
+ * symbol font. They simply denote the code points of the font instead.
+ * You have to keep this in mind when you implement the methods in a
+ * frontend. You must not pass these parameters to a unicode conversion
+ * function in particular.
  */
 class Painter {
 public:
@@ -63,12 +68,6 @@ public:
 
        virtual ~Painter() {}
 
-       /// begin painting
-       //virtual void start() {}
-
-       /// end painting
-       ////virtual void end() {}
-
        /// draw a line from point to point
        virtual void line(
                int x1, int y1,
@@ -119,7 +118,7 @@ public:
 
        /// draw a filled rectangle with the shape of a 3D button
        virtual void button(int x, int y,
-               int w, int h);
+               int w, int h, bool mouseHover);
 
        /// draw an image from the image cache
        virtual void image(int x, int y,
@@ -156,23 +155,23 @@ public:
         * the given color. If frame is specified, a thin frame is drawn
         * around the text with the given color.
         */
-       virtual void rectText(int x, int baseline,
+       void rectText(int x, int baseline,
                docstring const & str,
                LyXFont const & font,
                LColor_color back,
                LColor_color frame);
 
        /// draw a string and enclose it inside a button frame
-       virtual void buttonText(int x,
-               int baseline, docstring const & s, LyXFont const & font);
+       void buttonText(int x, int baseline, docstring const & s,
+               LyXFont const & font, bool mouseHover);
 
 protected:
        /// check the font, and if set, draw an underline
-       virtual void underline(LyXFont const & f,
+       void underline(LyXFont const & f,
                int x, int y, int width);
 
        /// draw a bevelled button border
-       virtual void buttonFrame(int x, int y, int w, int h);
+       void buttonFrame(int x, int y, int w, int h);
 
        /// Indicate wether real screen drawing shall be done or not.
        bool isDrawingEnabled() const { return drawing_enabled_; }