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

Missed one instance of the Shift-JIS font. Hopefully this fixes issue 2736? 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5633 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-06-08 02:03:44 +00:00
parent 3603f05398
commit 91e1d053d3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinWX/Src/MemcardManager.cpp
View File

@ -760,7 +760,11 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card)
if (!memoryCard[card]->DEntry_Comment2(j, comment)) comment[0]=0; if (!memoryCard[card]->DEntry_Comment2(j, comment)) comment[0]=0;
bool ascii = memoryCard[card]->IsAsciiEncoding(); bool ascii = memoryCard[card]->IsAsciiEncoding();
wxCSConv SJISConv(wxT("SHIFT_JIS")); #ifdef __linux__
wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_EUC_JP));
#else
wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS));
#endif
wxTitle = wxString(title, ascii ? *wxConvCurrent : SJISConv); wxTitle = wxString(title, ascii ? *wxConvCurrent : SJISConv);
wxComment = wxString(comment, ascii ? *wxConvCurrent : SJISConv); wxComment = wxString(comment, ascii ? *wxConvCurrent : SJISConv);

1
Source/Core/DolphinWX/Src/MemcardManager.h
View File

@ -25,6 +25,7 @@
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/listctrl.h> #include <wx/listctrl.h>
#include <wx/imaglist.h> #include <wx/imaglist.h>
#include <wx/fontmap.h>
#include "IniFile.h" #include "IniFile.h"
#include "FileUtil.h" #include "FileUtil.h"