don't complain if file doesn't exist in DeleteFile(); do return false if it exists...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 9035aa91a0ca1bfb027254dfad4e34579eb7bc46..7cece1bb7a498274e44fa3c7e0e4e67c5db89c1c 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -72,6 +72,7 @@ All:
 - added gettext plural forms support to wxLocale (Michael N. Filippov)
 - wxFileName::Normalize(wxPATH_NORM_ALL) doesn't lower filename case any more
 - wxFileName::Normalize(wxPATH_NORM_ENV_VARS) now works
+- check if file exists in wxFileConfig::DeleteFile() (Christian Sturmlechner)
 
 All (GUI):
 

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 9899d67a9dcf89292da137ca6e2afa2245aeaff4..6423bbe8e9e72128523896e77f5759144f3aec41 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -1090,8 +1090,11 @@ bool wxFileConfig::DeleteAll()
 {
   CleanUp();
 
-  if ( wxRemove(m_strLocalFile) == -1 )
-    wxLogSysError(_("can't delete user configuration file '%s'"), m_strLocalFile.c_str());
+  if ( wxFile::Exists(m_strLocalFile) && wxRemove(m_strLocalFile) == -1 )
+  {
+      wxLogSysError(_("can't delete user configuration file '%s'"), m_strLocalFile.c_str());
+      return FALSE;
+  }
 
   m_strLocalFile = m_strGlobalFile = wxT("");
   Init();

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index 370256f3c04e727ee0ae302534c5ed121523bce9..cc7986e716f8f5d3e774305f183af1a49c421519 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -439,7 +439,7 @@ bool wxIniConfig::DeleteAll()
   wxString strFile = szBuf;
   strFile << '\\' << m_strLocalFilename;
 
-  if ( !wxRemoveFile(strFile) ) {
+  if ( wxFile::Exists(strFile) && !wxRemoveFile(strFile) ) {
     wxLogSysError(_("Can't delete the INI file '%s'"), strFile.c_str());
     return FALSE;
   }