From 2708d4553a2aac10b5a72c762070f1c44927a7ab Mon Sep 17 00:00:00 2001 From: "glennricster@gmail.com" Date: Tue, 8 Jun 2010 02:03:44 +0000 Subject: [PATCH] Missed one instance of the Shift-JIS font. Hopefully this fixes issue 2736? git-svn-id: http://dolphin-emu.googlecode.com/svn/trunk@5633 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/MemcardManager.cpp | 6 +++++- Source/Core/DolphinWX/Src/MemcardManager.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index f8634c57c..c5833bba6 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -760,7 +760,11 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) if (!memoryCard[card]->DEntry_Comment2(j, comment)) comment[0]=0; 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); wxComment = wxString(comment, ascii ? *wxConvCurrent : SJISConv); diff --git a/Source/Core/DolphinWX/Src/MemcardManager.h b/Source/Core/DolphinWX/Src/MemcardManager.h index cb001870d..32f7e82dc 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.h +++ b/Source/Core/DolphinWX/Src/MemcardManager.h @@ -25,6 +25,7 @@ #include #include #include +#include #include "IniFile.h" #include "FileUtil.h" -- 2.11.4.GIT