diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp index 9cffdeb7cc4bdeed3fe91aaeb24cbca9fe1a86bb..430caf93734739b09770458c5974d38556087517 100644 --- a/aegisub/src/dialog_fonts_collector.cpp +++ b/aegisub/src/dialog_fonts_collector.cpp @@ -546,7 +546,7 @@ int FontsCollectorThread::CopyFont(wxString filename) { wxFileName fn(filename); wxString dstName = destFolder + _T("//") + fn.GetFullName(); if (wxFileName::FileExists(dstName)) return 2; - return CopyFile(filename,dstName) ? 1 : 0; + return wxCopyFile(filename,dstName,true) ? 1 : 0; } diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index 6460b4f718fd66395c5d280673704422ef1029b7..4375808908eb11a3ab0c19b3fbc4998f7e723cf6 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -725,7 +725,7 @@ void FrameMain::LoadSubtitles (wxString filename,wxString charset) { // Save wxString backup = path + origfile.GetName() + _T(".ORIGINAL.") + origfile.GetExt(); - CopyFile(filename,backup); + wxCopyFile(filename,backup,true); } // Sync diff --git a/aegisub/src/utils.cpp b/aegisub/src/utils.cpp index e305dde74851acd7b3aa14dfaff04b0d77873be9..8696e8ef7bbc18aa0ccd218ec8842647148218cb 100644 --- a/aegisub/src/utils.cpp +++ b/aegisub/src/utils.cpp @@ -74,24 +74,6 @@ int CountMatches(wxString parent,wxString child) { } -/////////////// -// Copy a file -bool CopyFile(wxString src,wxString dst) { - // Windows - #if defined(__WINDOWS__) - BOOL result = CopyFile(src.wc_str(),dst.wc_str(),false); - return (result != 0); - - // Linux - #elif defined(__UNIX__) - return link(src.mb_str(),dst.mb_str()) != 0; - - // Error - #else - #error "don't know how to backup files" - #endif -} - ///////////////////////////////////// // Make a path relative to reference wxString MakeRelativePath(wxString _path,wxString reference) { diff --git a/aegisub/src/utils.h b/aegisub/src/utils.h index 88965a46a2bcb3b41188436fa3e5e1046047e2c9..198afc8df88a37b793f3307d34c71310a5388a6c 100644 --- a/aegisub/src/utils.h +++ b/aegisub/src/utils.h @@ -56,7 +56,6 @@ typedef std::vector<std::pair<int,int> > IntPairVector; int64_t abs64(int64_t input); #endif int CountMatches(wxString parent,wxString child); -bool CopyFile(wxString src,wxString dst); wxString MakeRelativePath(wxString path,wxString reference); wxString DecodeRelativePath(wxString path,wxString reference); wxString PrettyFloat(wxString src);