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

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

diff --git a/src/mathed/MathMacroArgument.C b/src/mathed/MathMacroArgument.C
index 0ffaa799ec017fa69c28e56891d8e1387cf20a00..d73877c85a0269b63149b1d1ca8f03db60111e5b 100644 (file)
--- a/src/mathed/MathMacroArgument.C
+++ b/src/mathed/MathMacroArgument.C
@@ -13,13 +13,17 @@
 
 #include "MathMacroArgument.h"
 #include "InsetMathMacro.h"
-#include "MathMLStream.h"
+#include "MathStream.h"
 #include "MathSupport.h"
 #include "debug.h"
 
+
+namespace lyx {
+
 using std::endl;
 using std::auto_ptr;
 using std::size_t;
+using std::vector;
 
 
 MathMacroArgument::MathMacroArgument(size_t n)
@@ -29,8 +33,9 @@ MathMacroArgument::MathMacroArgument(size_t n)
                lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
                        << n << endl;
        }
+       str_.resize(3);
        str_[0] = '#';
-       str_[1] = static_cast<unsigned char>('0' + n);
+       str_[1] = static_cast<char_type>('0' + n);
        str_[2] = '\0';
 }
 
@@ -49,15 +54,14 @@ void MathMacroArgument::write(WriteStream & os) const
 
 void MathMacroArgument::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       mathed_string_dim(mi.base.font, lyx::from_utf8(str_), dim_);
+       mathed_string_dim(mi.base.font, str_, dim_);
        dim = dim_;
 }
 
 
 void MathMacroArgument::draw(PainterInfo & pi, int x, int y) const
 {
-       // FIXME UNICODE
-       drawStrRed(pi, x, y, lyx::from_utf8(str_));
+       drawStrRed(pi, x, y, str_);
        setPosCache(pi, x, y);
 }
 
@@ -66,3 +70,6 @@ void MathMacroArgument::normalize(NormalStream & os) const
 {
        os << "[macroarg " << str_ << "] ";
 }
+
+
+} // namespace lyx