piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

r6928 redux

Browse Source 
removes memleak in exchange for 2 additional calls to ::IsValidCodePage

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6941 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
LPFaint99
2011-01-27 23:59:12 +00:00
parent 179fb38716
commit 72d604d3f2
6 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/DolphinWX/Src/WxUtils.cpp
View File

@ -19,26 +19,9 @@
#include <wx/wx.h>
#include <wx/string.h>
#include <wx/fontmap.h>
namespace WxUtils {
wxCSConv *SJISConv()
{
#ifdef _WIN32
static bool validCP932 = ::IsValidCodePage(932) != 0;
if (validCP932)
{
return new wxCSConv(wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS));
}
WARN_LOG(COMMON, "Cannot Convert from Charset Windows Japanese cp 932");
return (wxCSConv*)wxConvCurrent;
#else
return new wxCSConv(wxFontMapper::GetEncodingName(wxFONTENCODING_EUC_JP));
#endif
}
// Launch a file according to its mime type
void Launch(const char *filename)
{