diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 3b1e080dc1..5c1a3b8871 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -372,7 +372,11 @@ void CGameListCtrl::InsertItemInReportView(long _Index) // title: 0xFF0000 // company: 0x007030 int ImageIndex = -1; +#ifdef __linux__ + wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_EUC_JP)); +#else wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS)); +#endif GameListItem& rISOFile = m_ISOFiles[_Index]; m_gamePath.append(rISOFile.GetFileName() + '\n'); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index cb65e72a00..0e2cd3d0fb 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -1154,7 +1154,11 @@ void CISOProperties::ChangeBannerDetails(int lang) || OpenGameListItem->GetCountry() == DiscIO::IVolume::COUNTRY_TAIWAN || OpenGameListItem->GetPlatform() == GameListItem::WII_WAD) { +#ifdef __linux__ + wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_EUC_JP)); +#else wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS)); +#endif wxString name = wxString(OpenGameListItem->GetName(0).c_str(), SJISConv); // Updates the informations shown in the window diff --git a/Source/Core/DolphinWX/Src/LogWindow.cpp b/Source/Core/DolphinWX/Src/LogWindow.cpp index c96daf99e3..9ad607df98 100644 --- a/Source/Core/DolphinWX/Src/LogWindow.cpp +++ b/Source/Core/DolphinWX/Src/LogWindow.cpp @@ -53,7 +53,11 @@ CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxString &, const wx , Parent(parent) , m_LogAccess(true) , m_Log(NULL), m_cmdline(NULL), m_FontChoice(NULL) , m_LogSection(1) +#ifdef __linux__ + , m_SJISConv(wxFONTENCODING_EUC_JP) +#else , m_SJISConv(wxFONTENCODING_SHIFT_JIS) +#endif { m_LogManager = LogManager::GetInstance(); for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)