replace all instances of wxString with std::string in all cases not

directly involved in either the GUI or other wxWidget classes like wxFile
This commit is contained in:
Peter Tissen 2014-04-01 02:33:55 +02:00
parent b1894ac6cb
commit 8ac226ae69
124 changed files with 1716 additions and 1502 deletions

View file

@ -257,11 +257,11 @@ void InterpreterDisAsmFrame::ShowAddr(const u64 addr)
if(IsBreakPoint(PC))
{
m_list->SetItem(i, 0, ">>> " + disasm->last_opcode);
m_list->SetItem(i, 0, fmt::FromUTF8(">>> " + disasm->last_opcode));
}
else
{
m_list->SetItem(i, 0, " " + disasm->last_opcode);
m_list->SetItem(i, 0, fmt::FromUTF8(" " + disasm->last_opcode));
}
wxColour colour;
@ -318,11 +318,11 @@ void InterpreterDisAsmFrame::WriteRegs()
return;
}
const wxString data = CPU->RegsToString();
const std::string data = CPU->RegsToString();
m_regs->Freeze();
m_regs->Clear();
m_regs->WriteText(data);
m_regs->WriteText(fmt::FromUTF8(data));
m_regs->Thaw();
}
@ -334,11 +334,11 @@ void InterpreterDisAsmFrame::WriteCallStack()
return;
}
const wxString data = CPU->CallStackToString();
const std::string data = CPU->CallStackToString();
m_calls->Freeze();
m_calls->Clear();
m_calls->WriteText(data);
m_calls->WriteText(fmt::FromUTF8(data));
m_calls->Thaw();
}