1) wxFileConfig now longer tries to delete system-wide config file in DeleteAll

   (only the user's one)
2) wxLogStream "un#indef'ed" under wxGTK

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

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 46ea7077a3bb7b3a9a28e8e0257f735397a8a6ac..a4df6e1d65f49298cfe9b8f6c9f282b1db200f91 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -673,10 +673,6 @@ bool wxFileConfig::DeleteAll()
   if ( remove(szFile) == -1 )
     wxLogSysError(_("can't delete user configuration file '%s'"), szFile);
 
   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();
 
   m_strLocalFile = m_strGlobalFile = "";
   Init();
 


@@ -1339,8 +1335,10 @@ wxString FilterOut(const wxString& str)
         break;
 
       case '"':
         break;
 
       case '"':

-        if ( bQuote )
+        if ( bQuote ) {

           c = '"';
           c = '"';

+          break;
+        }

         //else: fall through
 
       default:
         //else: fall through
 
       default:

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 525f8cfd190ddd5fb0947b1f075c00e3c856f544..94e4db061fcb62a9028bac9befe924d179ad393b 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -362,17 +362,13 @@ void wxLogStream::DoLogString(const char *szString)
 // ----------------------------------------------------------------------------
 wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
 // @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf
 // ----------------------------------------------------------------------------
 wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
 // @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf

-#ifndef __WXGTK__

              : wxLogStream(new ostream(pTextCtrl))
              : wxLogStream(new ostream(pTextCtrl))

-#endif //GTK

 {
 }
 
 wxLogTextCtrl::~wxLogTextCtrl()
 {
 {
 }
 
 wxLogTextCtrl::~wxLogTextCtrl()
 {

-  #ifndef __WXGTK__
-    delete m_ostr;
-  #endif //GTK
+  delete m_ostr;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------