Change log window font back to SJIS.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5225 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-03-23 20:52:37 +00:00
parent f6db5b7d8d
commit 9fc6383a94
2 changed files with 3 additions and 3 deletions

View File

@ -53,7 +53,7 @@ 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)
, m_CSConv(wxConvLocal) , m_SJISConv(wxFONTENCODING_SHIFT_JIS)
{ {
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)
@ -529,6 +529,6 @@ void CLogWindow::Log(LogTypes::LOG_LEVELS level, const char *text)
m_LogSection.Enter(); m_LogSection.Enter();
if (msgQueue.size() >= 100) if (msgQueue.size() >= 100)
msgQueue.pop(); msgQueue.pop();
msgQueue.push(std::pair<u8, wxString>((u8)level, wxString(text, m_CSConv))); msgQueue.push(std::pair<u8, wxString>((u8)level, wxString(text, m_SJISConv)));
m_LogSection.Leave(); m_LogSection.Leave();
} }

View File

@ -86,7 +86,7 @@ private:
Common::CriticalSection m_LogSection; Common::CriticalSection m_LogSection;
wxCSConv m_CSConv; wxCSConv m_SJISConv;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()