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 cd622ced2df9e86a4773b8b913424cf3e597f6fe..669679d39c50fa1b6323ba34f4ff4678cdd1ee85 100644 (file)
--- a/src/metricsinfo.h
+++ b/src/metricsinfo.h
@@ -13,12 +13,15 @@
 #define METRICSINFO_H
 
 #include "lyxfont.h"
-#include "support/types.h"
+#include "support/docstring.h"
 
-#include <string>
+class BufferView;
 
+namespace lyx {
+namespace frontend {
 class Painter;
-class BufferView;
+}
+}
 
 
 /// Standard Sizes (mode styles)
@@ -37,7 +40,8 @@ enum Styles {
 //
 // This is the part common to MetricsInfo and PainterInfo
 //
-struct MetricsBase {
+class MetricsBase {
+public:
        ///
        MetricsBase();
        ///
@@ -60,7 +64,8 @@ struct MetricsBase {
 // This contains a MetricsBase and information that's only relevant during
 // the first phase of the two-phase draw
 //
-struct MetricsInfo {
+class MetricsInfo {
+public:
        ///
        MetricsInfo();
        ///
@@ -75,31 +80,43 @@ struct MetricsInfo {
 // This contains a MetricsBase and information that's only relevant during
 // the second phase of the two-phase draw
 //
-struct PainterInfo {
+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, lyx::char_type c);
+       ///
+       void draw(int x, int y, lyx::docstring 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_;
 };
 
-struct TextMetricsInfo {};
-
+class TextMetricsInfo {};
 
-struct ViewMetricsInfo
+class ViewMetricsInfo
 {
-       ViewMetricsInfo(lyx::pit_type p1, lyx::pit_type p2,
-                       int y1, int y2) : p1(p1), p2(p2), y1(y1), y2(y2) {}
+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) {}
        lyx::pit_type p1;
        lyx::pit_type p2;
        int y1;
        int y2;
+       bool singlepar;
+       lyx::pit_type size;
 };
 
 
@@ -107,7 +124,8 @@ struct ViewMetricsInfo
 // The original state gets restored when the Changer is destructed.
 
 template <class Struct, class Temp = Struct>
-struct Changer {
+class Changer {
+public:
        ///
        Changer(Struct & orig) : orig_(orig) {}
 protected:
@@ -120,7 +138,8 @@ protected:
 
 
 // temporarily change some aspect of a font
-struct FontChanger : public Changer<LyXFont> {
+class FontChanger : public Changer<LyXFont> {
+public:
        ///
        FontChanger(LyXFont & orig, char const * font);
        ///
@@ -129,7 +148,8 @@ struct FontChanger : public Changer<LyXFont> {
 
 
 // temporarily change a full font
-struct FontSetChanger : public Changer<MetricsBase> {
+class FontSetChanger : public Changer<MetricsBase> {
+public:
        ///
        FontSetChanger(MetricsBase & mb, char const * font);
        ///
@@ -138,7 +158,8 @@ struct FontSetChanger : public Changer<MetricsBase> {
 
 
 // temporarily change the style
-struct StyleChanger : public Changer<MetricsBase> {
+class StyleChanger : public Changer<MetricsBase> {
+public:
        ///
        StyleChanger(MetricsBase & mb, Styles style);
        ///
@@ -147,21 +168,24 @@ struct StyleChanger : public Changer<MetricsBase> {
 
 
 // temporarily change the style to script style
-struct ScriptChanger : public StyleChanger {
+class ScriptChanger : public StyleChanger {
+public:
        ///
        ScriptChanger(MetricsBase & mb);
 };
 
 
 // temporarily change the style suitable for use in fractions
-struct FracChanger : public StyleChanger {
+class FracChanger : public StyleChanger {
+public:
        ///
        FracChanger(MetricsBase & mb);
 };
 
 
 // temporarily change the style suitable for use in tabulars and arrays
-struct ArrayChanger : public StyleChanger {
+class ArrayChanger : public StyleChanger {
+public:
        ///
        ArrayChanger(MetricsBase & mb);
 };
@@ -169,7 +193,8 @@ struct ArrayChanger : public StyleChanger {
 
 
 // temporarily change the shape of a font
-struct ShapeChanger : public Changer<LyXFont, LyXFont::FONT_SHAPE> {
+class ShapeChanger : public Changer<LyXFont, LyXFont::FONT_SHAPE> {
+public:
        ///
        ShapeChanger(LyXFont & font, LyXFont::FONT_SHAPE shape);
        ///
@@ -178,8 +203,9 @@ struct ShapeChanger : public Changer<LyXFont, LyXFont::FONT_SHAPE> {
 
 
 // temporarily change the available text width
-struct WidthChanger : public Changer<MetricsBase>
+class WidthChanger : public Changer<MetricsBase>
 {
+public:
        ///
        WidthChanger(MetricsBase & mb, int width);
        ///
@@ -188,7 +214,8 @@ struct WidthChanger : public Changer<MetricsBase>
 
 
 // temporarily change the used color
-struct ColorChanger : public Changer<LyXFont, std::string> {
+class ColorChanger : public Changer<LyXFont, std::string> {
+public:
        ///
        ColorChanger(LyXFont & font, std::string const & color);
        ///