From 241896ee4cf401ec88887d4d5c9162e3994db7d1 Mon Sep 17 00:00:00 2001 From: Sonicadvance1 Date: Sun, 24 Aug 2008 20:32:46 +0000 Subject: [PATCH] Build fixes git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@299 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DebuggerWX/src/CodeWindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/DebuggerWX/src/CodeWindow.cpp b/Source/Core/DebuggerWX/src/CodeWindow.cpp index 02c6adde10..46c28debb7 100644 --- a/Source/Core/DebuggerWX/src/CodeWindow.cpp +++ b/Source/Core/DebuggerWX/src/CodeWindow.cpp @@ -441,7 +441,7 @@ void CCodeWindow::UpdateLists() { u32 caller_addr = symbol->callers[i].callAddress; Symbol *caller_symbol = g_symbolDB.GetSymbolFromAddr(caller_addr); - int idx = callers->Append(StringFromFormat("< %s (%08x)", caller_symbol->name.c_str(), caller_addr).c_str()); + int idx = callers->Append(wxString::Format( _T("< %s (%08x)"), caller_symbol->name.c_str(), caller_addr)); callers->SetClientData(idx, (void*)caller_addr); } @@ -450,7 +450,7 @@ void CCodeWindow::UpdateLists() { u32 call_addr = symbol->calls[i].function; Symbol *call_symbol = g_symbolDB.GetSymbolFromAddr(call_addr); - int idx = calls->Append(StringFromFormat("> %s (%08x)", call_symbol->name.c_str(), call_addr).c_str()); + int idx = calls->Append(wxString::Format( _T("> %s (%08x)"), call_symbol->name.c_str(), call_addr)); calls->SetClientData(idx, (void*)call_addr); } } @@ -467,7 +467,7 @@ void CCodeWindow::OnAddrBoxChange(wxCommandEvent& event) wxTextCtrl* pAddrCtrl = (wxTextCtrl*)GetToolBar()->FindControl(IDM_ADDRBOX); wxString txt = pAddrCtrl->GetValue(); - std::string text(txt.c_str()); + std::string text(txt.mb_str()); text = StripSpaces(text); if (text.size() == 8) {