cursor is no more damaging the background. L-shaped cursor is broken right now....

[lyx.git] / src / mathed / InsetMathMakebox.C

diff --git a/src/mathed/InsetMathMakebox.C b/src/mathed/InsetMathMakebox.C
index 4fca51552e5a6d7c062e92cc7261838ae21bab1c..068d42327a3ec204cab38e27f2df3931abf4a51c 100644 (file)
--- a/src/mathed/InsetMathMakebox.C
+++ b/src/mathed/InsetMathMakebox.C
@@ -12,11 +12,14 @@
 
 #include "InsetMathMakebox.h"
 #include "MathData.h"
-#include "MathMLStream.h"
+#include "MathStream.h"
 #include "MathSupport.h"
 
 #include "support/std_ostream.h"
 
+
+namespace lyx {
+
 using std::auto_ptr;
 
 
@@ -33,7 +36,7 @@ auto_ptr<InsetBase> InsetMathMakebox::doClone() const
 
 void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       FontSetChanger dummy(mi.base, "textnormal");
+       FontSetChanger dummy(mi.base, from_ascii("textnormal"));
        w_ = mathed_char_width(mi.base.font, '[');
        InsetMathNest::metrics(mi);
        dim   = cell(0).dim();
@@ -47,21 +50,21 @@ void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetMathMakebox::draw(PainterInfo & pi, int x, int y) const
 {
-       FontSetChanger dummy(pi.base, "textnormal");
+       FontSetChanger dummy(pi.base, from_ascii("textnormal"));
        drawMarkers(pi, x, y);
 
-       drawStrBlack(pi, x, y, "[");
+       drawStrBlack(pi, x, y, from_ascii("["));
        x += w_;
        cell(0).draw(pi, x, y);
        x += cell(0).width();
-       drawStrBlack(pi, x, y, "]");
+       drawStrBlack(pi, x, y, from_ascii("]"));
        x += w_ + 2;
 
-       drawStrBlack(pi, x, y, "[");
+       drawStrBlack(pi, x, y, from_ascii("["));
        x += w_;
        cell(1).draw(pi, x, y);
        x += cell(1).width();
-       drawStrBlack(pi, x, y, "]");
+       drawStrBlack(pi, x, y, from_ascii("]"));
        x += w_ + 2;
 
        cell(2).draw(pi, x, y);
@@ -85,8 +88,11 @@ void InsetMathMakebox::normalize(NormalStream & os) const
 }
 
 
-void InsetMathMakebox::infoize(std::ostream & os) const
+void InsetMathMakebox::infoize(odocstream & os) const
 {
        os << "Makebox (width: " << cell(0)
            << " pos: " << cell(1) << ")";
 }
+
+
+} // namespace lyx