Always set the background colour for XP, for consistent toolbar backgrounds

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

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 6b1f5f5df2a48b454ddaae3d7d9169169c3c0846..07da5e6ff2874f585bee22af703840078c4ff936 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -372,7 +372,16 @@ void wxFileConfig::Init()
         }
         else
         {
         }
         else
         {

-            wxLogWarning(_("can't open user configuration file '%s'."),  m_fnLocalFile.GetFullPath().c_str() );
+            const wxString path = m_fnLocalFile.GetFullPath();
+            wxLogWarning(_("can't open user configuration file '%s'."),
+                         path.c_str());
+
+            if ( m_fnLocalFile.FileExists() )
+            {
+                wxLogWarning(_("Changes won't be saved to avoid overwriting the existing file \"%s\""),
+                             path.c_str());
+                m_fnLocalFile.Clear();
+            }

         }
     }
 
         }
     }
 


@@ -458,7 +467,7 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, const wxMBConv& conv)
 
 #if wxUSE_UNICODE
     size_t len;
 
 #if wxUSE_UNICODE
     size_t len;

-    cbuf = conv.cMB2WC((char *)buf.GetData(), buf.GetDataLen(), &len);
+    cbuf = conv.cMB2WC((char *)buf.GetData(), buf.GetDataLen() + 1, &len);

     if ( !len && buf.GetDataLen() )
     {
         wxLogError(_("Failed to read config options."));
     if ( !len && buf.GetDataLen() )
     {
         wxLogError(_("Failed to read config options."));