Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added overwrite parameter to wxRenameFile (patch 1467041)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-04-16 21:14:00 +00:00
parent e3950b1852
commit 57e988b8ef
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/filefn.cpp
View File

@@ -1106,8 +1106,19 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
}
bool
wxRenameFile (const wxString& file1, const wxString& file2)
wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite)
{
if ( !overwrite && wxFileExists(file2) )
{
wxLogSysError
(
_("Failed to rename the file '%s' to '%s' because the destination file already exists."),
file1.c_str(), file2.c_str()
);
return false;
}
#if !defined(__WXWINCE__) && !defined(__WXPALMOS__)
// Normal system call
if ( wxRename (file1, file2) == 0 )
@@ -1115,7 +1126,7 @@ wxRenameFile (const wxString& file1, const wxString& file2)
#endif
// Try to copy
if (wxCopyFile(file1, file2)) {
if (wxCopyFile(file1, file2, overwrite)) {
wxRemoveFile(file1);
return true;
}