diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 53485199e3..35b664a22d 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -434,6 +434,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index) // company: 0x007030 int ImageIndex = -1; + wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252)); #ifdef _WIN32 wxCSConv SJISConv(*(wxCSConv*)wxConvCurrent); static bool validCP932 = ::IsValidCodePage(932) != 0; @@ -494,25 +495,25 @@ void CGameListCtrl::InsertItemInReportView(long _Index) case DiscIO::IVolume::COUNTRY_USA: rISOFile.GetName(wname); SetItem(_Index, COLUMN_TITLE, - wxString::From8BitData(rISOFile.GetName(0).c_str()), -1); + wxString(rISOFile.GetName(0).c_str(), WindowsCP1252), -1); m_gameList.append(StringFromFormat("%s (U)\n", rISOFile.GetName(0).c_str())); SetItem(_Index, COLUMN_NOTES, - wxString::From8BitData(company.size() ? - company.c_str() : rISOFile.GetDescription(0).c_str()), -1); + wxString(company.size() ? + company.c_str() : rISOFile.GetDescription(0).c_str(), WindowsCP1252), -1); break; default: rISOFile.GetName(wname, SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage); SetItem(_Index, COLUMN_TITLE, - wxString::From8BitData( - rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), + wxString( + rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str(), WindowsCP1252), -1); m_gameList.append(StringFromFormat("%s (E)\n", rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str())); SetItem(_Index, COLUMN_NOTES, - wxString::From8BitData(company.size() ? + wxString(company.size() ? company.c_str() : - rISOFile.GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), + rISOFile.GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str(), WindowsCP1252), -1); break; } diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 40c78bba4e..51bbdcda30 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -1265,7 +1265,8 @@ void CISOProperties::ChangeBannerDetails(int lang) wxString shortName, comment, maker; - + + wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252)); #ifdef _WIN32 wxCSConv SJISConv(*(wxCSConv*)wxConvCurrent); static bool validCP932 = ::IsValidCodePage(932) != 0; @@ -1300,19 +1301,19 @@ void CISOProperties::ChangeBannerDetails(int lang) if (OpenGameListItem->GetName(wname)) shortName = wname; else - shortName = wxString::From8BitData(OpenGameListItem->GetName(0).c_str()); + shortName = wxString(OpenGameListItem->GetName(0).c_str(), WindowsCP1252); if ((comment = OpenGameListItem->GetDescription()).size() == 0) - comment = wxString(OpenGameListItem->GetDescription(0).c_str(), SJISConv); - maker = wxString::From8BitData(OpenGameListItem->GetCompany().c_str()); + comment = wxString(OpenGameListItem->GetDescription(0).c_str(), WindowsCP1252); + maker = wxString(OpenGameListItem->GetCompany().c_str(), WindowsCP1252); break; default: if (OpenGameListItem->GetName(wname, lang)) shortName = wname; else - shortName = wxString::From8BitData(OpenGameListItem->GetName(lang).c_str()); + shortName = wxString(OpenGameListItem->GetName(lang).c_str(), WindowsCP1252); if ((comment = OpenGameListItem->GetDescription()).size() == 0) - comment = wxString(OpenGameListItem->GetDescription(lang).c_str(), SJISConv); - maker = wxString::From8BitData(OpenGameListItem->GetCompany().c_str()); + comment = wxString(OpenGameListItem->GetDescription(lang).c_str(), WindowsCP1252); + maker = wxString(OpenGameListItem->GetCompany().c_str(), WindowsCP1252); break; break;