* support/qstring_helpers.h: erase ucs4_to_qstring() method.

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

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index da59eee1f122cfada926c696420c1d558030daf5..2b3de17435f5b050708a212dee00e297ecce3e72 100644 (file)
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -43,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:
@@ -111,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,
@@ -128,14 +135,6 @@ public:
        void setDrawingEnabled(bool drawing_enabled = true)
        { drawing_enabled_ = drawing_enabled; }
 
-       /**
-        * Draw a string at position x, y (y is the baseline)
-        * This is just for fast drawing
-        * \return the width of the drawn text.
-        */
-       virtual int text(int x, int y,
-               char_type const * str, size_t l, LyXFont const & f) = 0;
-
        /// draw a char at position x, y (y is the baseline)
        /**
        * \return the width of the drawn text.
@@ -148,23 +147,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_; }