ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Shift-JIS is not available on most linux platforms as it is not unicode compliant. Substitute EUC-JP instead. Should fix issue 2736 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5632 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-06-07 16:02:25 +00:00
parent f78332a259
commit 3603f05398
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Src/GameListCtrl.cpp
View File

@ -372,7 +372,11 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
// title: 0xFF0000 // title: 0xFF0000
// company: 0x007030 // company: 0x007030
int ImageIndex = -1; int ImageIndex = -1;
#ifdef __linux__
wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_EUC_JP));
#else
wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS)); wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS));
#endif
GameListItem& rISOFile = m_ISOFiles[_Index]; GameListItem& rISOFile = m_ISOFiles[_Index];
m_gamePath.append(rISOFile.GetFileName() + '\n'); m_gamePath.append(rISOFile.GetFileName() + '\n');

4
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -1154,7 +1154,11 @@ void CISOProperties::ChangeBannerDetails(int lang)
|| OpenGameListItem->GetCountry() == DiscIO::IVolume::COUNTRY_TAIWAN || OpenGameListItem->GetCountry() == DiscIO::IVolume::COUNTRY_TAIWAN
|| OpenGameListItem->GetPlatform() == GameListItem::WII_WAD) || OpenGameListItem->GetPlatform() == GameListItem::WII_WAD)
{ {
#ifdef __linux__
wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_EUC_JP));
#else
wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS)); wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS));
#endif
wxString name = wxString(OpenGameListItem->GetName(0).c_str(), SJISConv); wxString name = wxString(OpenGameListItem->GetName(0).c_str(), SJISConv);
// Updates the informations shown in the window // Updates the informations shown in the window

4
Source/Core/DolphinWX/Src/LogWindow.cpp
View File

@ -53,7 +53,11 @@ CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxString &, const wx
, Parent(parent) , m_LogAccess(true) , Parent(parent) , m_LogAccess(true)
, m_Log(NULL), m_cmdline(NULL), m_FontChoice(NULL) , m_Log(NULL), m_cmdline(NULL), m_FontChoice(NULL)
, m_LogSection(1) , m_LogSection(1)
#ifdef __linux__
, m_SJISConv(wxFONTENCODING_EUC_JP)
#else
, m_SJISConv(wxFONTENCODING_SHIFT_JIS) , m_SJISConv(wxFONTENCODING_SHIFT_JIS)
#endif
{ {
m_LogManager = LogManager::GetInstance(); m_LogManager = LogManager::GetInstance();
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)