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

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

diff --git a/src/frontends/nullpainter.h b/src/frontends/nullpainter.h
index 5b5ae13b25737ad5b5d139d80dd99170b71895e8..bb77976bcae84e75de4d9514b79baa4b055ece96 100644 (file)
--- a/src/frontends/nullpainter.h
+++ b/src/frontends/nullpainter.h
@@ -12,11 +12,13 @@
 #ifndef NULLPAINTER_H
 #define NULLPAINTER_H
 
-#include <config.h>
-
 #include "LColor.h"
 #include "Painter.h"
 
+
+namespace lyx {
+namespace frontend {
+
 class NullPainter : public Painter {
 public:
        ///
@@ -46,8 +48,6 @@ public:
        ///
        void fillRectangle(int, int, int, int, LColor_color) {}
        ///
-       void fillPolygon(int const *, int const *, int, LColor_color) {}
-       ///
        void arc(int, int,      unsigned int, unsigned int,
                int, int, LColor_color) {}
        ///
@@ -57,20 +57,25 @@ public:
        ///
        void image(int, int, int, int, lyx::graphics::Image const &) {}
        ///
-       void text(int, int, std::string const &, LyXFont const &) {}
+       void text(int, int, lyx::docstring const &, LyXFont const &) {}
+//     ///
+//     void text(int, int, char const *, size_t, LyXFont const &) {}
        ///
-       void text(int, int, char const *, size_t, LyXFont const &) {}
+       void text(int, int, lyx::char_type const *, size_t, LyXFont const &) {}
        ///
-       void text(int, int, char, LyXFont const &) {}
+       void text(int, int, lyx::char_type, LyXFont const &) {}
        ///
-       void rectText(int, int, std::string const &,
+       void rectText(int, int, lyx::docstring const &,
                LyXFont const &, LColor_color, LColor_color) {}
        ///
-       void buttonText(int, int, std::string const &, LyXFont const &) {}
+       void buttonText(int, int, lyx::docstring const &, LyXFont const &) {}
        ///
        void underline(LyXFont const &, int, int, int) {}
        ///
        void buttonFrame(int, int, int, int) {}
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif // NULLPAINTER_H