From 31c4aa49c5011c90562d78532f0cbcf5e9586d2c Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Thu, 9 Aug 2012 00:56:10 +0000
Subject: [PATCH] MGR: Fix build break

svn path=/trunk/boinc/; revision=25997
---
 checkin_notes                   | 7 +++++++
 clientgui/DlgItemProperties.cpp | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 0a81c6f3ce..aa585503de 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5379,3 +5379,10 @@ David  8 Aug 2012
     lib/
         gui_rpc_client_ops.cpp
         coproc.cpp,h
+
+Charlie 8 Aug 2012
+    - MGR: Fix build break.
+    
+     clientgui/
+        DlgItemProperties.cpp
+   
\ No newline at end of file
diff --git a/clientgui/DlgItemProperties.cpp b/clientgui/DlgItemProperties.cpp
index 5f2204cf16..45f35daf42 100644
--- a/clientgui/DlgItemProperties.cpp
+++ b/clientgui/DlgItemProperties.cpp
@@ -269,10 +269,10 @@ void CDlgItemProperties::renderInfos(PROJECT* project_in) {
         addProperty(_("Scheduling priority"), wxString::Format(wxT("%0.2f"), project->sched_priority));
         show_rsc(_("CPU"), project->rsc_desc_cpu);
         if (pDoc->state.have_nvidia) {
-            show_rsc(proc_type_name(PROC_TYPE_NVIDIA_GPU), project->rsc_desc_nvidia);
+            show_rsc(wxString(proc_type_name(PROC_TYPE_NVIDIA_GPU), wxConvUTF8), project->rsc_desc_nvidia);
         }
         if (pDoc->state.have_ati) {
-            show_rsc(proc_type_name(PROC_TYPE_AMD_GPU), project->rsc_desc_ati);
+            show_rsc(wxString(proc_type_name(PROC_TYPE_AMD_GPU), wxConvUTF8), project->rsc_desc_ati);
         }
         addProperty(_("Duration correction factor"), wxString::Format(wxT("%0.4f"), project->duration_correction_factor));
     }