mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-30 04:21:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1254 from RachelBryk/unicode

Browse Source 
Replace wxFileExists() with File::Exists().
This commit is contained in:
Ryan Houdek 2014-10-10 17:35:22 -05:00
commit f6233cd531
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -624,14 +624,14 @@ void CFrame::BootGame(const std::string& filename)
bootfile = m_GameListCtrl->GetSelectedISO()->GetFileName(); bootfile = m_GameListCtrl->GetSelectedISO()->GetFileName();
} }
else if (!StartUp.m_strDefaultGCM.empty() && else if (!StartUp.m_strDefaultGCM.empty() &&
wxFileExists(wxSafeConvertMB2WX(StartUp.m_strDefaultGCM.c_str()))) File::Exists(StartUp.m_strDefaultGCM))
{ {
bootfile = StartUp.m_strDefaultGCM; bootfile = StartUp.m_strDefaultGCM;
} }
else else
{ {
if (!SConfig::GetInstance().m_LastFilename.empty() && if (!SConfig::GetInstance().m_LastFilename.empty() &&
wxFileExists(wxSafeConvertMB2WX(SConfig::GetInstance().m_LastFilename.c_str()))) File::Exists(SConfig::GetInstance().m_LastFilename))
{ {
bootfile = SConfig::GetInstance().m_LastFilename; bootfile = SConfig::GetInstance().m_LastFilename;
} }
@ -1782,7 +1782,7 @@ void CFrame::UpdateGUI()
} }
// Prepare to load last selected file, enable play button // Prepare to load last selected file, enable play button
else if (!SConfig::GetInstance().m_LastFilename.empty() && else if (!SConfig::GetInstance().m_LastFilename.empty() &&
wxFileExists(wxSafeConvertMB2WX(SConfig::GetInstance().m_LastFilename.c_str()))) File::Exists(SConfig::GetInstance().m_LastFilename))
{ {
if (m_ToolBar) if (m_ToolBar)
m_ToolBar->EnableTool(IDM_PLAY, true); m_ToolBar->EnableTool(IDM_PLAY, true);

4
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -1119,7 +1119,7 @@ void CGameListCtrl::CompressSelection(bool _compress)
WxStrToStr(browseDialog.GetPath()), WxStrToStr(browseDialog.GetPath()),
FileName); FileName);
if (wxFileExists(StrToWxStr(OutputFileName)) && if (File::Exists(OutputFileName) &&
wxMessageBox( wxMessageBox(
wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"), wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"),
StrToWxStr(OutputFileName)), StrToWxStr(OutputFileName)),
@ -1147,7 +1147,7 @@ void CGameListCtrl::CompressSelection(bool _compress)
WxStrToStr(browseDialog.GetPath()), WxStrToStr(browseDialog.GetPath()),
FileName); FileName);
if (wxFileExists(StrToWxStr(OutputFileName)) && if (File::Exists(OutputFileName) &&
wxMessageBox( wxMessageBox(
wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"), wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"),
StrToWxStr(OutputFileName)), StrToWxStr(OutputFileName)),