* remove various xforms relicts, in particular:

[lyx.git] / src / metricsinfo.h

diff --git a/src/metricsinfo.h b/src/metricsinfo.h
index d0cd5580f8dbc5ff5c28aa788d0df3d4cc21da5d..b2366783f6266f6aeec1092895393da7e4e557e2 100644 (file)
--- a/src/metricsinfo.h
+++ b/src/metricsinfo.h
@@ -17,9 +17,14 @@
 
 #include <string>
 
-class Painter;
 class BufferView;
 
+namespace lyx {
+namespace frontend {
+class Painter;
+}
+}
+
 
 /// Standard Sizes (mode styles)
 enum Styles {
@@ -80,16 +85,20 @@ public:
 class PainterInfo {
 public:
        ///
-       PainterInfo(BufferView * bv, Painter & pain);
+       PainterInfo(BufferView * bv, lyx::frontend::Painter & pain);
        ///
        void draw(int x, int y, char c);
+       ///
+       void draw(int x, int y, std::string const & str);
 
        ///
        MetricsBase base;
        ///
-       Painter & pain;
+       lyx::frontend::Painter & pain;
        /// Whether the text at this point is right-to-left (for InsetNewline)
        bool ltr_pos;
+       /// Whether the parent is deleted (change tracking)
+       bool erased_;
 };
 
 class TextMetricsInfo {};
@@ -97,12 +106,19 @@ class TextMetricsInfo {};
 class ViewMetricsInfo
 {
 public:
-       ViewMetricsInfo(lyx::pit_type p1, lyx::pit_type p2,
-                       int y1, int y2) : p1(p1), p2(p2), y1(y1), y2(y2) {}
+       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) {}
        lyx::pit_type p1;
        lyx::pit_type p2;
        int y1;
        int y2;
+       bool singlepar;
+       lyx::pit_type size;
 };