diff options
| author | Glenn Rice <glennricster@gmail.com> | 2010-03-23 20:52:37 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2010-03-23 20:52:37 +0000 |
| commit | 9fc6383a94233deca477a091971d5de4ffce09ca (patch) | |
| tree | ce5fec09536985d17df22627074278a55b2b096c | |
| parent | f6db5b7d8d31b7bbcceb7a36bef696af0b84f70f (diff) | |
Change log window font back to SJIS.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5225 8ced0084-cf51-0410-be5f-012b33b47a6e
| -rw-r--r-- | Source/Core/DolphinWX/Src/LogWindow.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/LogWindow.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Src/LogWindow.cpp b/Source/Core/DolphinWX/Src/LogWindow.cpp index 0d1016b44f..c96daf99e3 100644 --- a/Source/Core/DolphinWX/Src/LogWindow.cpp +++ b/Source/Core/DolphinWX/Src/LogWindow.cpp @@ -53,7 +53,7 @@ CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxString &, const wx , Parent(parent) , m_LogAccess(true) , m_Log(NULL), m_cmdline(NULL), m_FontChoice(NULL) , m_LogSection(1) - , m_CSConv(wxConvLocal) + , m_SJISConv(wxFONTENCODING_SHIFT_JIS) { m_LogManager = LogManager::GetInstance(); 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(); if (msgQueue.size() >= 100) 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(); } diff --git a/Source/Core/DolphinWX/Src/LogWindow.h b/Source/Core/DolphinWX/Src/LogWindow.h index 5c8bf9932c..cde2e80aab 100644 --- a/Source/Core/DolphinWX/Src/LogWindow.h +++ b/Source/Core/DolphinWX/Src/LogWindow.h @@ -86,7 +86,7 @@ private: Common::CriticalSection m_LogSection; - wxCSConv m_CSConv; + wxCSConv m_SJISConv; DECLARE_EVENT_TABLE() |