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 = _(""); + wxString currentName = wxT(""); 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)); diff --git a/Source/Plugins/Plugin_PadSimpleEvnt/Src/SConscript b/Source/Plugins/Plugin_PadSimpleEvnt/Src/SConscript index c5ee9791a7..4fdaebe337 100644 --- a/Source/Plugins/Plugin_PadSimpleEvnt/Src/SConscript +++ b/Source/Plugins/Plugin_PadSimpleEvnt/Src/SConscript @@ -19,6 +19,6 @@ if padeenv['HAVE_WX']: "GUI/ConfigDlg.cpp", ] -padeenv.Append(LIBS = [ 'common', 'core' ]) +padeenv.Append(LIBS = [ 'core', 'common' ]) padeenv.SharedLibrary(env['plugin_dir']+name, files)