Use wstring for vertlabels

stable-0.4
PilzAdam 2013-08-31 21:07:53 +02:00
parent 5d0f19fd7d
commit 71a6ffa762
1 changed files with 5 additions and 6 deletions

View File

@ -1069,7 +1069,7 @@ void GUIFormSpecMenu::parseVertLabel(parserData* data,std::string element) {
if (parts.size() == 2) { if (parts.size() == 2) {
std::vector<std::string> v_pos = split(parts[0],','); std::vector<std::string> v_pos = split(parts[0],',');
std::string text = parts[1]; std::wstring text = narrow_to_wide(unescape_string(parts[1]));
MY_CHECKPOS("vertlabel",1); MY_CHECKPOS("vertlabel",1);
@ -1082,17 +1082,16 @@ void GUIFormSpecMenu::parseVertLabel(parserData* data,std::string element) {
if(data->bp_set != 2) if(data->bp_set != 2)
errorstream<<"WARNING: invalid use of label without a size[] element"<<std::endl; errorstream<<"WARNING: invalid use of label without a size[] element"<<std::endl;
text = unescape_string(text); std::wstring label = L"";
std::string label = "";
for (unsigned int i=0; i < text.length(); i++) { for (unsigned int i=0; i < text.length(); i++) {
label += text.c_str()[i]; label += text[i];
label += "\n"; label += L"\n";
} }
FieldSpec spec = FieldSpec( FieldSpec spec = FieldSpec(
L"", L"",
narrow_to_wide(label.c_str()), label,
L"", L"",
258+m_fields.size() 258+m_fields.size()
); );