Generalize some __linux__ ifdefs for Unix/X11.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6793 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-01-09 14:11:46 +00:00
parent d4158f076a
commit b7767b63a3
6 changed files with 16 additions and 18 deletions

View File

@ -48,10 +48,10 @@ CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxPoint& pos,
, 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
#ifdef _WIN32
, m_SJISConv(wxFONTENCODING_SHIFT_JIS)
#else
, m_SJISConv(wxFONTENCODING_EUC_JP)
#endif
{
m_LogManager = LogManager::GetInstance();