cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / metricsinfo.h

diff --git a/src/metricsinfo.h b/src/metricsinfo.h
index 84163116955aed6655a96635074848916987a527..669679d39c50fa1b6323ba34f4ff4678cdd1ee85 100644 (file)
--- a/src/metricsinfo.h
+++ b/src/metricsinfo.h
@@ -13,9 +13,7 @@
 #define METRICSINFO_H
 
 #include "lyxfont.h"
-#include "support/types.h"
-
-#include <string>
+#include "support/docstring.h"
 
 class BufferView;
 
@@ -87,9 +85,9 @@ public:
        ///
        PainterInfo(BufferView * bv, lyx::frontend::Painter & pain);
        ///
-       void draw(int x, int y, char c);
+        void draw(int x, int y, lyx::char_type c);
        ///
-       void draw(int x, int y, std::string const & str);
+       void draw(int x, int y, lyx::docstring const & str);
 
        ///
        MetricsBase base;
@@ -106,9 +104,13 @@ class TextMetricsInfo {};
 class ViewMetricsInfo
 {
 public:
+       ViewMetricsInfo()
+               : p1(0), p2(0), y1(0), y2(0),
+                 singlepar(false), size(0) {}
        ViewMetricsInfo(lyx::pit_type p1, lyx::pit_type p2, int y1, int y2,
-                       bool singlepar, lyx::pit_type size) : p1(p1), p2(p2),
-                       y1(y1), y2(y2), singlepar(singlepar), size(size) {}
+                       bool singlepar, lyx::pit_type size)
+               : p1(p1), p2(p2), y1(y1), y2(y2),
+                 singlepar(singlepar), size(size) {}
        lyx::pit_type p1;
        lyx::pit_type p2;
        int y1;