* GuiToolbar.cpp:

[lyx.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 4c286da8275b8519b0ea21843498be75c5bd1c54..a90a62bc176d7fa3c5662f8412bb646ed35286b9 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -18,12 +18,13 @@
 
 #include "frontends/Painter.h"
 
-#include <boost/assert.hpp>
+#include "support/docstring.h"
 
+#include "support/lassert.h"
 
-namespace lyx {
+using namespace std;
 
-using std::string;
+namespace lyx {
 
 
 MetricsBase::MetricsBase()
@@ -38,17 +39,12 @@ MetricsBase::MetricsBase(BufferView * b, FontInfo const & f, int w)
 {}
 
 
-
-MetricsInfo::MetricsInfo()
+MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth, 
+       MacroContext const & mc)
+       : base(bv, font, textwidth), macrocontext(mc)
 {}
 
 
-MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth)
-       : base(bv, font, textwidth)
-{}
-
-
-
 PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
        : pain(painter), ltr_pos(false), erased_(false), full_repaint(true),
        background_color(Color_background)