piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #608 from lioncash/compat

Browse Source 
DolphinWX: Remove the use of some wx 1.0 compatibility function calls.
This commit is contained in:
shuffle2
2014-07-14 01:56:09 -07:00
parent 0c6eeaff05 d931637d63
commit 3ac4e9f171
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -753,7 +753,7 @@ void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event))
if (DiscIO::IsVolumeWiiDisc(OpenISO))
{
int partitionNum = wxAtoi(File.Mid(File.find_first_of("/") - 1, 1));
File.Remove(0, File.find_first_of("/") + 1); // Remove "Partition x/"
File.erase(0, File.find_first_of("/") + 1); // Remove "Partition x/"
WiiDisc.at(partitionNum).FileSystem->ExportFile(WxStrToStr(File), WxStrToStr(Path));
}
else
@ -866,9 +866,9 @@ void CISOProperties::OnExtractDir(wxCommandEvent& event)
{
if (DiscIO::IsVolumeWiiDisc(OpenISO))
for (u32 i = 0; i < WiiDisc.size(); i++)
ExportDir("", WxStrToStr(Path).c_str(), i);
ExportDir("", WxStrToStr(Path), i);
else
ExportDir("", WxStrToStr(Path).c_str());
ExportDir("", WxStrToStr(Path));
return;
}
@ -886,7 +886,7 @@ void CISOProperties::OnExtractDir(wxCommandEvent& event)
if (DiscIO::IsVolumeWiiDisc(OpenISO))
{
int partitionNum = wxAtoi(Directory.Mid(Directory.find_first_of("/") - 1, 1));
Directory.Remove(0, Directory.find_first_of("/") + 1); // Remove "Partition x/"
Directory.erase(0, Directory.find_first_of("/") + 1); // Remove "Partition x/"
ExportDir(WxStrToStr(Directory), WxStrToStr(Path), partitionNum);
}
else