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

Buildfix.

This commit is contained in:
Jordan Woyak 2013-02-28 03:11:10 -06:00
parent 03ec9a2e08
commit 95558cdc69
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp
View File

@ -285,7 +285,7 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
if (!path.IsEmpty()) if (!path.IsEmpty())
{ {
std::ifstream f(WxStrToStr(path)); std::ifstream f(WxStrToStr(path).c_str());
std::string line; std::string line;
while (std::getline(f, line)) while (std::getline(f, line))

2
Source/Core/DolphinWX/Src/InputConfigDiag.cpp
View File

@ -612,7 +612,7 @@ void GamepadPage::DeleteProfile(wxCommandEvent&)
if (File::Exists(fnamecstr) && if (File::Exists(fnamecstr) &&
AskYesNoT("Are you sure you want to delete \"%s\"?", AskYesNoT("Are you sure you want to delete \"%s\"?",
WxStrToStr(profile_cbox->GetValue()))) WxStrToStr(profile_cbox->GetValue()).c_str()))
{ {
File::Delete(fnamecstr); File::Delete(fnamecstr);

3
Source/Core/DolphinWX/Src/WxUtils.cpp
View File

@ -57,10 +57,11 @@ void Explore(const char *path)
std::string WxStrToStr(const wxString& str) std::string WxStrToStr(const wxString& str)
{ {
return str.ToUTF8(); return str.ToUTF8().data();
} }
wxString StrToWxStr(const std::string& str) wxString StrToWxStr(const std::string& str)
{ {
//return wxString::FromUTF8Unchecked(str.c_str());
return wxString::FromUTF8(str.c_str()); return wxString::FromUTF8(str.c_str());
} }