From 82412e6428a8e5744d3fa2e7e03dd1782c3cc3db Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sat, 12 Oct 2013 08:41:37 -0700 Subject: [PATCH] Fix compilation with UTF-8 wxString --- aegisub/src/base_grid.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp index 4b4d37fff..2e0f3a7f0 100644 --- a/aegisub/src/base_grid.cpp +++ b/aegisub/src/base_grid.cpp @@ -590,9 +590,9 @@ void BaseGrid::GetRowStrings(int row, AssDialogue *line, bool *paint_columns, wx if (paint_columns[4]) strings[4] = to_wx(line->Style); if (paint_columns[5]) strings[5] = to_wx(line->Actor); if (paint_columns[6]) strings[6] = to_wx(line->Effect); - if (paint_columns[7]) strings[7] = line->Margin[0] ? std::to_wstring(line->Margin[0]) : wxS(""); - if (paint_columns[8]) strings[8] = line->Margin[1] ? std::to_wstring(line->Margin[1]) : wxS(""); - if (paint_columns[9]) strings[9] = line->Margin[2] ? std::to_wstring(line->Margin[2]) : wxS(""); + if (paint_columns[7]) strings[7] = line->Margin[0] ? std::to_wstring(line->Margin[0]) : wxString(); + if (paint_columns[8]) strings[8] = line->Margin[1] ? std::to_wstring(line->Margin[1]) : wxString(); + if (paint_columns[9]) strings[9] = line->Margin[2] ? std::to_wstring(line->Margin[2]) : wxString(); if (paint_columns[10]) { strings[10].clear();