From 4649416822fa934618082abfa2cd343dede72cc6 Mon Sep 17 00:00:00 2001 From: hyperiris Date: Tue, 3 Feb 2009 16:04:23 +0000 Subject: [PATCH] linux build fix. thanks nakee points out that wxChar is not char under Linux, and I guess wxString::FromAscii will cut off > 127 characters, so I change it to wxString::From8BitData. I hop it works, please check it under other platform. BTW: If dolphin can not run, plz clean up your cache directory, delete all cache file. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2091 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 55b261ef03..f8ec1a6f23 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -274,20 +274,18 @@ void CGameListCtrl::InsertItemInReportView(long _Index) } break; case DiscIO::IVolume::COUNTRY_USA: - SetItem(_Index, COLUMN_TITLE, wxString(rISOFile.GetName(0).c_str()), -1); - SetItem(_Index, COLUMN_NOTES, wxString(rISOFile.GetDescription(0).c_str()), -1); + SetItem(_Index, COLUMN_TITLE, wxString::From8BitData(rISOFile.GetName(0).c_str()), -1); + SetItem(_Index, COLUMN_NOTES, wxString::From8BitData(rISOFile.GetDescription(0).c_str()), -1); break; default: SetItem(_Index, COLUMN_TITLE, - //wxString::FromAscii(rISOFile.GetName((int)SConfig::GetInstance().m_InterfaceLanguage).c_str()), -1); - wxString(rISOFile.GetName((int)SConfig::GetInstance().m_InterfaceLanguage).c_str()), -1); + wxString::From8BitData(rISOFile.GetName((int)SConfig::GetInstance().m_InterfaceLanguage).c_str()), -1); SetItem(_Index, COLUMN_NOTES, - //wxString::FromAscii(rISOFile.GetDescription((int)SConfig::GetInstance().m_InterfaceLanguage).c_str()), -1); - wxString(rISOFile.GetDescription((int)SConfig::GetInstance().m_InterfaceLanguage).c_str()), -1); + wxString::From8BitData(rISOFile.GetDescription((int)SConfig::GetInstance().m_InterfaceLanguage).c_str()), -1); break; } - SetItem(_Index, COLUMN_COMPANY, wxString::FromAscii(rISOFile.GetCompany().c_str()), -1); + SetItem(_Index, COLUMN_COMPANY, wxString::From8BitData(rISOFile.GetCompany().c_str()), -1); SetItem(_Index, COLUMN_SIZE, NiceSizeFormat(rISOFile.GetFileSize()), -1);