From a065555ca5192f25cb2a14727b4a785700512064 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Wed, 9 Jul 2008 16:42:15 +0000 Subject: [PATCH] - MGR: Fix the application name for both views. (ANSI/Unicode compatible)(VS/GCC compatible) clientgui/ ViewWork.cpp ViewWorkGrid.cpp svn path=/trunk/boinc/; revision=15584 --- checkin_notes | 9 +++++++++ clientgui/ViewWork.cpp | 2 +- clientgui/ViewWorkGrid.cpp | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index 68d6d3316e..8d49208504 100644 --- a/checkin_notes +++ b/checkin_notes @@ -5616,3 +5616,12 @@ Charlie 9 July 2008 client/ app_control.C cs_benchmark.C + +Rom 8 July 2008 + - MGR: Fix the application name for both views. + (ANSI/Unicode compatible)(VS/GCC compatible) + + clientgui/ + ViewWork.cpp + ViewWorkGrid.cpp + diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp index a18ac6a2a4..adc54a010e 100644 --- a/clientgui/ViewWork.cpp +++ b/clientgui/ViewWork.cpp @@ -761,7 +761,7 @@ void CViewWork::GetDocApplicationName(wxInt32 item, wxString& strBuffer) const { if (state_result->wup->avp->plan_class.size()) { strClassBuffer.Printf( wxT(" (%s)"), - state_result->wup->avp->plan_class.c_str() + wxString(state_result->wup->avp->plan_class.c_str(), wxConvUTF8).c_str() ); } diff --git a/clientgui/ViewWorkGrid.cpp b/clientgui/ViewWorkGrid.cpp index 36f884a914..d4b956119d 100644 --- a/clientgui/ViewWorkGrid.cpp +++ b/clientgui/ViewWorkGrid.cpp @@ -625,7 +625,7 @@ wxInt32 CViewWorkGrid::FormatApplicationName(wxInt32 item, wxString& strBuffer) if (state_result->wup->avp->plan_class.size()) { strClassBuffer.Printf( wxT(" (%s)"), - state_result->wup->avp->plan_class.c_str() + wxString(state_result->wup->avp->plan_class.c_str(), wxConvUTF8).c_str() ); }