fix for the first item on Martin's list

[lyx.git] / src / mathed / math_metricsinfo.h

diff --git a/src/mathed/math_metricsinfo.h b/src/mathed/math_metricsinfo.h
index db5a3c2caf2a2cd125f08ec0a184ffb5c2c6d140..3046587bef8645dad56291877d8e7acc336354c5 100644 (file)
--- a/src/mathed/math_metricsinfo.h
+++ b/src/mathed/math_metricsinfo.h
@@ -1,8 +1,11 @@
-#ifndef MATH_METRICSINFO
-#define MATH_METRICSINFO
+#ifndef MATH_METRICSINFO_H
+#define MATH_METRICSINFO_H
+
+#include "lyxfont.h"
+#include "textpainter.h"
 
 class BufferView;
-class LyXFont;
+class MathNestInset;
 
 
 /// Standard Math Sizes (Math mode styles)
@@ -21,19 +24,34 @@ enum MathStyles {
 struct MathMetricsInfo {
        ///
        MathMetricsInfo()
-               : view(0), font(0), style(LM_ST_TEXT)
+               : view(0), font(), style(LM_ST_TEXT), inset(0)
        {}
        ///
-       MathMetricsInfo(BufferView * v, LyXFont const * f, MathStyles s)
-               : view(v), font(f), style(s)
+       MathMetricsInfo(BufferView * v, LyXFont const & f, MathStyles s)
+               : view(v), font(f), style(s), inset(0)
        {}
 
        ///
        BufferView * view;
        ///
-       LyXFont const * font;
+       LyXFont font;
        ///
        MathStyles style;
+       /// used to pass some info down
+       MathNestInset const * inset;
+       ///
+       int idx;
+};
+
+
+struct TextMetricsInfo {
+       ///
+       TextMetricsInfo()
+               {}
+       /// used to pass some info down
+       MathNestInset const * inset;
+       ///
+       int idx;
 };
 
 #endif