diff options
| author | magumagu9 <magumagu9@gmail.com> | 2008-12-17 09:46:32 +0000 |
|---|---|---|
| committer | magumagu9 <magumagu9@gmail.com> | 2008-12-17 09:46:32 +0000 |
| commit | ea2045e536cbaa26ec9016f205e9a9f148ae3908 (patch) | |
| tree | 281d144eef4aaae2fa9da40168a9919feab551e8 /Source/Core | |
| parent | 0944564cf060fabfda58a0c9e7b3031e132c27ba (diff) | |
A couple of compile fixes; standard string screwups.
I'm also running into an error in Source/Core/Core/Src/MemTools.cpp, but
I'm not sure what the right fix is there.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1562 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/ISOProperties.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp index 27e9a85999..676c2599a3 100644 --- a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp +++ b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp @@ -86,5 +86,5 @@ void CARCodeAddEdit::UpdateTextCtrl(ActionReplay::ARCode arCode) EditCheatCode->Clear();
for (int i = 0; i < arCode.ops.size(); i++)
- EditCheatCode->AppendText(wxString::Format("%08X %08X\n", arCode.ops.at(i).cmd_addr, arCode.ops.at(i).value));
+ EditCheatCode->AppendText(wxString::Format(wxT("%08X %08X\n"), arCode.ops.at(i).cmd_addr, arCode.ops.at(i).value));
}
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index d3cb32cdf7..9233739980 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -718,7 +718,7 @@ void CISOProperties::ActionReplayList_Save() for (std::vector<ActionReplay::AREntry>::const_iterator iter2 = code.ops.begin(); iter2 != code.ops.end(); ++iter2) { - lines.push_back(wxString::Format("%08X %08X", iter2->cmd_addr, iter2->value).mb_str()); + lines.push_back(std::string(wxString::Format(wxT("%08X %08X"), iter2->cmd_addr, iter2->value).mb_str())); } ++index; } |