get_wraped_wxString(): Adapted to work with UTF8

src/libslic3r/utils.cpp

@@ -866,8 +866,13 @@ std::string normalize_utf8_nfc(const char *src)
 size_t get_utf8_sequence_length(const std::string& text, size_t pos)
 {
 	assert(pos < text.size());
+	return get_utf8_sequence_length(text.c_str() + pos, text.size() - pos);
+}
+
+size_t get_utf8_sequence_length(const char *seq, size_t size)
+{
 	size_t length = 0;
-	unsigned char c = text[pos];
+	unsigned char c = seq[0];
 	if (c < 0x80) { // 0x00-0x7F
 		// is ASCII letter
 		length++;
@@ -876,8 +881,8 @@ size_t get_utf8_sequence_length(const std::string& text, size_t pos)
 	// pos is in the middle of a utf-8 sequence. Add the utf-8 trailer bytes.
 	else if (c < 0xC0) { // 0x80-0xBF
 		length++;
-		while (pos + length < text.size()) {
-			c = text[pos + length];
+		while (length < size) {
+			c = seq[length];
 			if (c < 0x80 || c >= 0xC0) {
 				break; // prevent overrun
 			}
@@ -888,36 +893,36 @@ size_t get_utf8_sequence_length(const std::string& text, size_t pos)
 	// The number of one bits above the topmost zero bit indicates the number of bytes (including this one) in the whole sequence.
 	else if (c < 0xE0) { // 0xC0-0xDF
 	 // add a utf-8 sequence (2 bytes)
-		if (pos + 2 > text.size()) {
-			return text.size() - pos; // prevent overrun
+		if (2 > size) {
+			return size; // prevent overrun
 		}
 		length += 2;
 	}
 	else if (c < 0xF0) { // 0xE0-0xEF
 	 // add a utf-8 sequence (3 bytes)
-		if (pos + 3 > text.size()) {
-			return text.size() - pos; // prevent overrun
+		if (3 > size) {
+			return size; // prevent overrun
 		}
 		length += 3;
 	}
 	else if (c < 0xF8) { // 0xF0-0xF7
 	 // add a utf-8 sequence (4 bytes)
-		if (pos + 4 > text.size()) {
-			return text.size() - pos; // prevent overrun
+		if (4 > size) {
+			return size; // prevent overrun
 		}
 		length += 4;
 	}
 	else if (c < 0xFC) { // 0xF8-0xFB
 	 // add a utf-8 sequence (5 bytes)
-		if (pos + 5 > text.size()) {
-			return text.size() - pos; // prevent overrun
+		if (5 > size) {
+			return size; // prevent overrun
 		}
 		length += 5;
 	}
 	else if (c < 0xFE) { // 0xFC-0xFD
 	 // add a utf-8 sequence (6 bytes)
-		if (pos + 6 > text.size()) {
-			return text.size() - pos; // prevent overrun
+		if (6 > size) {
+			return size; // prevent overrun
 		}
 		length += 6;
 	}