X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_charinset.C;h=8f2674bba30fc1e90ddb6f247783962f919b2afe;hb=701b99ecd70ac472aa53c8b2317af44def4f9670;hp=d6c2331cb338975b2bb04435c137150afb285cfb;hpb=6af06846fd8b037e2b7e60b2f4838c64da602555;p=lyx.git

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index d6c2331cb3..8f2674bba3 100644
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -17,28 +17,23 @@
 
 #include "debug.h"
 #include "dimension.h"
+#include "support/lstrings.h"
 #include "textpainter.h"
 
 using std::auto_ptr;
 
-#ifndef CXX_GLOBAL_CSTD
-using std::strchr;
-#endif
-
-
 extern bool has_math_fonts;
 
 namespace {
 
 	bool isBinaryOp(char c)
 	{
-		return strchr("+-<>=/*", c);
+		return lyx::support::contains("+-<>=/*", c);
 	}
 
 
 	bool slanted(char c)
 	{
-		//if (strchr("0123456789;:!|[]().,?+/-*<>=", c)
 		return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z');
 	}
 
@@ -51,7 +46,7 @@ MathCharInset::MathCharInset(char c)
 
 
 
-auto_ptr<InsetBase> MathCharInset::clone() const
+auto_ptr<InsetBase> MathCharInset::doClone() const
 {
 	return auto_ptr<InsetBase>(new MathCharInset(*this));
 }
@@ -84,7 +79,7 @@ void MathCharInset::metrics(MetricsInfo & mi, Dimension & dim) const
 		width_ += 2 * font_metrics::width(' ', font_);
 	lyxerr << "MathCharInset::metrics: " << dim << endl;
 #endif
-	dim_ = dim;
+	width_ = dim.wid;
 }