summaryrefslogtreecommitdiff
path: root/Source/Core/DebuggerWX/src
diff options
context:
space:
mode:
authorMaarten ter Huurne <maarten@treewalker.org>2008-08-24 19:47:10 +0000
committerMaarten ter Huurne <maarten@treewalker.org>2008-08-24 19:47:10 +0000
commit2babda7a800a9dafa3ce3db626c475456131f6b5 (patch)
treed76a029cf19e21997ae0b752f5fa72fdd6704d83 /Source/Core/DebuggerWX/src
parentc0c6fc9e6daa10a5a30e4dfb3444d29a0baf482c (diff)
Explicitly convert from C string to wxString. Fixes build on Linux.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@295 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DebuggerWX/src')
-rw-r--r--Source/Core/DebuggerWX/src/CodeWindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DebuggerWX/src/CodeWindow.cpp b/Source/Core/DebuggerWX/src/CodeWindow.cpp
index 045268debf..eb73f7112d 100644
--- a/Source/Core/DebuggerWX/src/CodeWindow.cpp
+++ b/Source/Core/DebuggerWX/src/CodeWindow.cpp
@@ -470,7 +470,7 @@ void CCodeWindow::NotifyMapLoaded()
for (SymbolDB::XFuncMap::iterator iter = g_symbolDB.GetIterator(); iter != g_symbolDB.End(); iter++)
{
- int idx = symbols->Append(iter->second.name.c_str());
+ int idx = symbols->Append(wxString::FromAscii(iter->second.name.c_str()));
symbols->SetClientData(idx, (void*)&iter->second);
}
symbols->Show(true);