diff options
| author | nakeee <nakeee@gmail.com> | 2009-01-03 22:21:34 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-01-03 22:21:34 +0000 |
| commit | 22753f9e3c8d72e1442518f720708633ddebadbb (patch) | |
| tree | 51e3712a77b5c4b127522e747a61ed42c893cb15 /Source/Core | |
| parent | 161d7f369a09b271b1ba83261d2f53f113e0519e (diff) | |
compile fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1754 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/PatchAddEdit.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Src/PatchAddEdit.cpp b/Source/Core/DolphinWX/Src/PatchAddEdit.cpp index 7a7c67277e..54f6dbb661 100644 --- a/Source/Core/DolphinWX/Src/PatchAddEdit.cpp +++ b/Source/Core/DolphinWX/Src/PatchAddEdit.cpp @@ -41,7 +41,7 @@ CPatchAddEdit::~CPatchAddEdit() void CPatchAddEdit::CreateGUIControls(int _selection) { - std::string currentName = _("<Insert name here>"); + wxString currentName = wxT("<Insert name here>"); if (_selection == -1) { @@ -49,14 +49,14 @@ void CPatchAddEdit::CreateGUIControls(int _selection) } else { - currentName = onFrame.at(_selection).name; - tempEntries = onFrame.at(_selection).entries; + currentName = wxString::FromAscii(onFrame.at(_selection).name.c_str()); + tempEntries = onFrame.at(_selection).entries; } wxBoxSizer* sEditPatch = new wxBoxSizer(wxVERTICAL); wxStaticText* EditPatchNameText = new wxStaticText(this, ID_EDITPATCH_NAME_TEXT, _("Name:"), wxDefaultPosition, wxDefaultSize); EditPatchName = new wxTextCtrl(this, ID_EDITPATCH_NAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); - EditPatchName->SetValue(wxString::FromAscii(currentName.c_str())); + EditPatchName->SetValue(currentName); wxStaticText* EditPatchOffsetText = new wxStaticText(this, ID_EDITPATCH_OFFSET_TEXT, _("Offset:"), wxDefaultPosition, wxDefaultSize); EditPatchOffset = new wxTextCtrl(this, ID_EDITPATCH_OFFSET, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); EditPatchOffset->SetValue(wxString::Format(wxT("%08X"), tempEntries.at(0).address)); |