* src/LyXRC.{cpp,h}:

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index 32baef17590be047e909b006efa897ec6c2f2c79..f1583d193cebc289b071b6ad21bb1a6089af355c 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -5,6 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author André Pönitz
+ * \author Stefan Schimanski
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,8 +13,12 @@
 #ifndef METRICSINFO_H
 #define METRICSINFO_H
 
+#include "ColorCode.h"
 #include "FontInfo.h"
-#include "support/docstring.h"
+
+#include "support/strfwd.h"
+#include "support/types.h"
+
 #include <string>
 
 class BufferView;
@@ -21,6 +26,7 @@ class BufferView;
 namespace lyx {
 
 namespace frontend { class Painter; }
+class MacroContext;
 
 
 /// Standard Sizes (mode styles)
@@ -68,10 +74,12 @@ public:
        ///
        MetricsInfo();
        ///
-       MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth);
+       MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth, MacroContext const & mc);
 
        ///
        MetricsBase base;
+       /// The context to resolve macros
+       MacroContext const & macrocontext;
 };
 
 
@@ -99,7 +107,7 @@ public:
        ///
        bool full_repaint;
        ///
-       int background_color;
+       ColorCode background_color;
 };
 
 class TextMetricsInfo {};