summaryrefslogtreecommitdiff
path: root/Source/Core/DebuggerWX/src/LogWindow.cpp
diff options
context:
space:
mode:
authorSonicadvance1 <sonicadvance1@gmail.com>2008-07-20 11:02:41 +0000
committerSonicadvance1 <sonicadvance1@gmail.com>2008-07-20 11:02:41 +0000
commitc7795c41b7f44bed9e6c1dbab40edebfe8566ded (patch)
treec22daf09bb367e78062cddd4a806f85aaa6e83a9 /Source/Core/DebuggerWX/src/LogWindow.cpp
parent35950043a663ac0e07666a44955de526fb1ee8c6 (diff)
Linux: Fix ups for people running Linux. If it breaks anything, punch me in the face.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@30 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DebuggerWX/src/LogWindow.cpp')
-rw-r--r--Source/Core/DebuggerWX/src/LogWindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DebuggerWX/src/LogWindow.cpp b/Source/Core/DebuggerWX/src/LogWindow.cpp
index cb47b64d91..0cd1233823 100644
--- a/Source/Core/DebuggerWX/src/LogWindow.cpp
+++ b/Source/Core/DebuggerWX/src/LogWindow.cpp
@@ -74,7 +74,7 @@ CLogWindow::CLogWindow(wxWindow* parent)
void CLogWindow::OnSubmit(wxCommandEvent& event)
{
- Console_Submit(m_cmdline->GetValue().c_str());
+ Console_Submit(m_cmdline->GetValue().To8BitData());
m_cmdline->SetValue(_T(""));
NotifyUpdate();
}
@@ -128,7 +128,7 @@ void CLogWindow::UpdateChecks()
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
{
- m_checks->Append(LogManager::m_Log[i]->m_szName);
+ m_checks->Append(wxString::FromAscii(LogManager::m_Log[i]->m_szName));
}
m_checks->Show(true);
@@ -218,7 +218,7 @@ void CLogWindow::UpdateLog()
}
*p = 0; //end the string
- m_log->SetValue(m_logBuffer);
+ m_log->SetValue(wxString::FromAscii(m_logBuffer));
m_log->SetInsertionPoint(p - m_logBuffer - 1);
}