* output_plaintext.C: cosmetics in comment: line length cannot be < 0

[lyx.git] / src / metricsinfo.h

diff --git a/src/metricsinfo.h b/src/metricsinfo.h
index 5c6e81c1c96ee6ae9694d5044c1cad6d04598415..733bccd3f239ec0caa4820ef38c767a4ae230c66 100644 (file)
--- a/src/metricsinfo.h
+++ b/src/metricsinfo.h
@@ -14,6 +14,7 @@
 
 #include "lyxfont.h"
 #include "support/docstring.h"
+#include <string>
 
 class BufferView;
 
@@ -99,22 +100,31 @@ public:
 
 class TextMetricsInfo {};
 
+enum ScreenUpdateStrategy {
+       NoScreenUpdate,
+       SingleParUpdate,
+       FullScreenUpdate,
+       DecorationUpdate
+};
+
 class ViewMetricsInfo
 {
 public:
        ViewMetricsInfo()
-                       : p1(0), p2(0), y1(0), y2(0), singlepar(false), size(0)
+                       : p1(0), p2(0), y1(0), y2(0),
+                       update_strategy(FullScreenUpdate), size(0)
                {}
        ViewMetricsInfo(pit_type p1, pit_type p2, int y1, int y2,
-                       bool singlepar, pit_type size)
-                       : p1(p1), p2(p2), y1(y1), y2(y2), singlepar(singlepar), size(size)
+                       ScreenUpdateStrategy updatestrategy, pit_type size)
+                       : p1(p1), p2(p2), y1(y1), y2(y2),
+                       update_strategy(updatestrategy), size(size)
                {}
 
        pit_type p1;
        pit_type p2;
        int y1;
        int y2;
-       bool singlepar;
+       ScreenUpdateStrategy update_strategy;
        pit_type size;
 };
 
@@ -140,7 +150,8 @@ protected:
 class FontChanger : public Changer<LyXFont> {
 public:
        ///
-       FontChanger(LyXFont & orig, char const * font);
+       FontChanger(LyXFont & orig, docstring const & font);
+       FontChanger(MetricsBase & mb, char const * const font);
        ///
        ~FontChanger();
 };
@@ -150,7 +161,8 @@ public:
 class FontSetChanger : public Changer<MetricsBase> {
 public:
        ///
-       FontSetChanger(MetricsBase & mb, char const * font);
+       FontSetChanger(MetricsBase & mb, docstring const & font);
+       FontSetChanger(MetricsBase & mb, char const * const font);
        ///
        ~FontSetChanger();
 };