enable Font cache only for MacOSX and inline width() for other platform.

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

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index 9680acb2e2d10205f227767029b88e9e6a0904f5..9dd8731c447ef612082c18dc3ab5425e45723835 100644 (file)
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -15,9 +15,7 @@
 
 #include "LColor.h"
 
-#include "support/types.h"
-
-#include <string>
+#include "support/docstring.h"
 
 
 class LyXFont;
@@ -112,13 +110,6 @@ public:
                int w, int h,
                LColor_color) = 0;
 
-       /// draw a filled (irregular) polygon (UNUSED, could be removed)
-       virtual void fillPolygon(
-               int const * xp,
-               int const * yp,
-               int np,
-               LColor_color) = 0;
-
        /// draw an arc
        virtual void arc(
                int x, int y,
@@ -142,14 +133,14 @@ public:
 
        /// draw a string at position x, y (y is the baseline)
        virtual void text(int x, int y,
-               std::string const & str, LyXFont const & f) = 0;
+               lyx::docstring const & str, LyXFont const & f) = 0;
 
        /**
         * Draw a string at position x, y (y is the baseline)
         * This is just for fast drawing
         */
        virtual void text(int x, int y,
-               char const * str, size_t l,
+               lyx::char_type const * str, size_t l,
                LyXFont const & f) = 0;
 
        /// draw a char at position x, y (y is the baseline)
@@ -163,14 +154,14 @@ public:
         * around the text with the given color.
         */
        virtual void rectText(int x, int baseline,
-               std::string const & str,
+               lyx::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, std::string const & s,
+               int baseline, lyx::docstring const & s,
                LyXFont const & font);
 
 protected: