git-svn-id: svn://db.shs.com.ru/pip@909 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

2020-03-06 07:56:42 +00:00
parent d8f0393f0f
commit 88267912c3
1 changed files with 8 additions and 2 deletions
--- a/src_main/core/pichar.cpp
+++ b/src_main/core/pichar.cpp
@@ -312,9 +312,15 @@ PICout operator <<(PICout s, const PIChar & v) {
 		s << v.toSystem();
 	//else
 	//	s << v.toConsole1Byte();
-#else
-	s << v.toCharPtr();
 #endif
+	if (v.isAscii()) s << char(v.ch);
+	else {
+		char tc[8];
+		wctomb(0, 0);
+		int sz = wctomb(tc, v.ch);
+		for (int b = 0; b < sz; ++b)
+			s << tc[b];
+	}
 	s.restoreControl();
 	return s;
 }