* Fixes and new features in wxObject*Stream

[wxWidgets.git] / src / common / fileconf.cpp

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 46ea7077a3bb7b3a9a28e8e0257f735397a8a6ac..0bf48eeb78eb9730b6b70a6fa91f9b04b3404e9a 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -222,13 +222,16 @@ wxFileConfig::wxFileConfig(const wxString& strLocal, const wxString& strGlobal)
   // if the path is not absolute, prepend the standard directory to it
 
   if ( !strLocal.IsEmpty() && !wxIsPathSeparator(strLocal[0u]) )
-    m_strLocalFile = GetLocalDir();
-  m_strLocalFile << strLocal;
-
+  {
+     m_strLocalFile = GetLocalDir();
+     m_strLocalFile << strLocal;
+  }
+  
   if ( !strGlobal.IsEmpty() && !wxIsPathSeparator(strGlobal[0u]) )
-    m_strGlobalFile = GetGlobalDir();
-  m_strGlobalFile << strGlobal;
-
+  {
+     m_strGlobalFile = GetGlobalDir();
+     m_strGlobalFile << strGlobal;
+  }
   Init();
 }
 
@@ -673,10 +676,6 @@ bool wxFileConfig::DeleteAll()
   if ( remove(szFile) == -1 )
     wxLogSysError(_("can't delete user configuration file '%s'"), szFile);
 
-  szFile = m_strGlobalFile;
-  if ( remove(szFile) )
-    wxLogSysError(_("can't delete system configuration file '%s'"), szFile);
-
   m_strLocalFile = m_strGlobalFile = "";
   Init();
 
@@ -1339,8 +1338,10 @@ wxString FilterOut(const wxString& str)
         break;
 
       case '"':
-        if ( bQuote )
+        if ( bQuote ) {
           c = '"';
+          break;
+        }
         //else: fall through
 
       default: