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

fixed convertion between const char * and wxString to make code compile 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@495 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-09-12 07:58:19 +00:00
parent 8f04cf2f4b
commit 7230dc58da
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -405,22 +405,26 @@ void CFrame::OnPlay(wxCommandEvent& WXUNUSED (event))
} }
else if (!SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM.empty()) else if (!SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM.empty())
{ {
if (wxFileExists(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM.c_str())) if (wxFileExists(wxString(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM.c_str(), wxConvUTF8)))
{ {
BootManager::BootCore(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM); BootManager::BootCore(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM);
} }
else else
{ {
wxMessageBox("The default ISO you have set is invalid.\n" wxMessageBox(_("The default ISO you have set is invalid.\n"
"Please pick on new one by right clicking on a game\n" "Please pick on new one by right clicking on a game\n"
"and selecting \"Set as default ISO\".", "Invalid Default ISO", wxOK, this); "and selecting \"Set as default ISO\"."),
_("Invalid Default ISO"),
wxOK, this);
} }
} }
else else
{ {
wxMessageBox("You can set an ISO to load by default.\n" wxMessageBox(_("You can set an ISO to load by default.\n"
"Choose one by right clicking on a game and selecting\n" "Choose one by right clicking on a game and selecting\n"
"\"Set as default ISO\".", "Set Default ISO", wxOK, this); "\"Set as default ISO\"."),
_("Set Default ISO"),
wxOK, this);
} }
} }

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

@ -288,7 +288,7 @@ void CGameListCtrl::ScanForISOs()
dialog.CenterOnParent(); dialog.CenterOnParent();
for (int i = 0; i < rFilenames.size(); i++) for (u32 i = 0; i < rFilenames.size(); i++)
{ {
std::string FileName; std::string FileName;
SplitPath(rFilenames[i], NULL, &FileName, NULL); SplitPath(rFilenames[i], NULL, &FileName, NULL);