ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compile fix 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1754 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-01-03 22:21:34 +00:00
parent 161d7f369a
commit 22753f9e3c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/Src/PatchAddEdit.cpp
View File

@ -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));

2
Source/Plugins/Plugin_PadSimpleEvnt/Src/SConscript
View File

@ -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)