diff --git a/clientgui/ViewTransfersGrid.cpp b/clientgui/ViewTransfersGrid.cpp index e37436d1c7..925c1c135d 100644 --- a/clientgui/ViewTransfersGrid.cpp +++ b/clientgui/ViewTransfersGrid.cpp @@ -258,7 +258,7 @@ wxInt32 CViewTransfersGrid::FormatProjectName(wxInt32 item, wxString& strBuffer) FILE_TRANSFER* transfer = wxGetApp().GetDocument()->file_transfer(item); if (transfer) { - strBuffer = wxString(" ") + wxString(transfer->project_name.c_str(), wxConvUTF8); + strBuffer = wxString(" ", wxConvUTF8) + wxString(transfer->project_name.c_str(), wxConvUTF8); } return 0; } @@ -268,7 +268,7 @@ wxInt32 CViewTransfersGrid::FormatFileName(wxInt32 item, wxString& strBuffer) co FILE_TRANSFER* transfer = wxGetApp().GetDocument()->file_transfer(item); if (transfer) { - strBuffer = wxString(" ") + wxString(transfer->name.c_str(), wxConvUTF8); + strBuffer = wxString(" ", wxConvUTF8) + wxString(transfer->name.c_str(), wxConvUTF8); } return 0; } @@ -341,7 +341,7 @@ wxInt32 CViewTransfersGrid::FormatSize(wxInt32 item, wxString& strBuffer) const } } - strBuffer = wxString(" ") + strBuffer; + strBuffer = wxString(" ", wxConvUTF8) + strBuffer; return 0; } @@ -365,7 +365,7 @@ wxInt32 CViewTransfersGrid::FormatTime(wxInt32 item, wxString& strBuffer) const ts = wxTimeSpan(iHour, iMin, iSec); - strBuffer = wxString(" ") + ts.Format(); + strBuffer = wxString(" ", wxConvUTF8) + ts.Format(); return 0; } @@ -427,7 +427,7 @@ wxInt32 CViewTransfersGrid::FormatStatus(wxInt32 item, wxString& strBuffer) cons strBuffer = _("Suspended") + strBuffer; } - strBuffer = wxString(" ") + strBuffer; + strBuffer = wxString(" ", wxConvUTF8) + strBuffer; return 0; } diff --git a/clientgui/ViewWorkGrid.cpp b/clientgui/ViewWorkGrid.cpp index 55f3740d4f..692c6c8706 100644 --- a/clientgui/ViewWorkGrid.cpp +++ b/clientgui/ViewWorkGrid.cpp @@ -472,7 +472,7 @@ wxInt32 CViewWorkGrid::FormatProjectName(wxInt32 item, wxString& strBuffer) cons state_project = doc->state.lookup_project(result->project_url); if (state_project) { state_project->get_name(project_name); - strBuffer = wxString(" ") + wxString(project_name.c_str(), wxConvUTF8); + strBuffer = wxString(" ", wxConvUTF8) + wxString(project_name.c_str(), wxConvUTF8); } else { doc->ForceCacheUpdate(); } @@ -518,7 +518,7 @@ wxInt32 CViewWorkGrid::FormatName(wxInt32 item, wxString& strBuffer) const { wxASSERT(result); if (result) { - strBuffer = wxString(" ") + wxString(result->name.c_str(), wxConvUTF8); + strBuffer = wxString(" ", wxConvUTF8) + wxString(result->name.c_str(), wxConvUTF8); } return 0; @@ -554,7 +554,7 @@ wxInt32 CViewWorkGrid::FormatCPUTime(wxInt32 item, wxString& strBuffer) const { ts = wxTimeSpan(iHour, iMin, iSec); - strBuffer = wxString(" ") + ts.Format(); + strBuffer = wxString(" ", wxConvUTF8) + ts.Format(); } return 0; @@ -604,7 +604,7 @@ wxInt32 CViewWorkGrid::FormatTimeToCompletion(wxInt32 item, wxString& strBuffer) ts = wxTimeSpan(iHour, iMin, iSec); - strBuffer = wxString(" ") + ts.Format(); + strBuffer = wxString(" ", wxConvUTF8) + ts.Format(); } return 0; @@ -617,7 +617,7 @@ wxInt32 CViewWorkGrid::FormatReportDeadline(wxInt32 item, wxString& strBuffer) c if (result) { dtTemp.Set((time_t)result->report_deadline); - strBuffer = wxString(" ") + dtTemp.Format(); + strBuffer = wxString(" ", wxConvUTF8) + dtTemp.Format(); } return 0; @@ -727,7 +727,7 @@ wxInt32 CViewWorkGrid::FormatStatus(wxInt32 item, wxString& strBuffer) const { strBuffer = _("Activities suspended by user") + strBuffer; } - strBuffer = wxString(" ") + strBuffer; + strBuffer = wxString(" ", wxConvUTF8) + strBuffer; return 0; }