diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-10-10 17:35:22 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-10-10 17:35:22 -0500 |
| commit | f6233cd531f94b9d3cd106ca4ebf704a98f5dfca (patch) | |
| tree | 48a371bc65b576e9403b0c60f9f4a05c80a9a816 /Source/Core | |
| parent | 5c1acc99fb9114e36a9b067c417d309a5896e5ef (diff) | |
| parent | bf7de71fd067932a567aeea7f7fc83438b877f15 (diff) | |
Merge pull request #1254 from RachelBryk/unicode
Replace wxFileExists() with File::Exists().
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/GameListCtrl.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 9c54986500..5159502d97 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -624,14 +624,14 @@ void CFrame::BootGame(const std::string& filename) bootfile = m_GameListCtrl->GetSelectedISO()->GetFileName(); } else if (!StartUp.m_strDefaultGCM.empty() && - wxFileExists(wxSafeConvertMB2WX(StartUp.m_strDefaultGCM.c_str()))) + File::Exists(StartUp.m_strDefaultGCM)) { bootfile = StartUp.m_strDefaultGCM; } else { 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; } @@ -1782,7 +1782,7 @@ void CFrame::UpdateGUI() } // Prepare to load last selected file, enable play button else if (!SConfig::GetInstance().m_LastFilename.empty() && - wxFileExists(wxSafeConvertMB2WX(SConfig::GetInstance().m_LastFilename.c_str()))) + File::Exists(SConfig::GetInstance().m_LastFilename)) { if (m_ToolBar) m_ToolBar->EnableTool(IDM_PLAY, true); diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 71a62c665c..b801199d84 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -1119,7 +1119,7 @@ void CGameListCtrl::CompressSelection(bool _compress) WxStrToStr(browseDialog.GetPath()), FileName); - if (wxFileExists(StrToWxStr(OutputFileName)) && + if (File::Exists(OutputFileName) && wxMessageBox( wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"), StrToWxStr(OutputFileName)), @@ -1147,7 +1147,7 @@ void CGameListCtrl::CompressSelection(bool _compress) WxStrToStr(browseDialog.GetPath()), FileName); - if (wxFileExists(StrToWxStr(OutputFileName)) && + if (File::Exists(OutputFileName) && wxMessageBox( wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"), StrToWxStr(OutputFileName)), |