Don't use "Cancel" button in the about dialog of the listctrl sample.

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

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index e635c6aaf72db9507fe6486c9c5871a7ef934118..4b632703207d402ca81e7a81a9c48931aa394fc7 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -1,85 +1,72 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        fileconf.cpp
+// Name:        src/common/fileconf.cpp

 // Purpose:     implementation of wxFileConfig derivation of wxConfig
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.04.98 (adapted from appconf.cpp)
 // RCS-ID:      $Id$
 // Purpose:     implementation of wxFileConfig derivation of wxConfig
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.04.98 (adapted from appconf.cpp)
 // RCS-ID:      $Id$

-// Copyright:   (c) 1997 Karsten Ballüder   &  Vadim Zeitlin
+// Copyright:   (c) 1997 Karsten Ballueder  &  Vadim Zeitlin

 //                       Ballueder@usa.net     <zeitlin@dptmaths.ens-cachan.fr>
 //                       Ballueder@usa.net     <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "fileconf.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 

+// For compilers that support precompilation, includes "wx.h".

 #include  "wx/wxprec.h"
 
 #ifdef    __BORLANDC__
 #include  "wx/wxprec.h"
 
 #ifdef    __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif  //__BORLANDC__
 
 #endif  //__BORLANDC__
 

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

 
 #ifndef   WX_PRECOMP
 
 #ifndef   WX_PRECOMP

-  #include  "wx/string.h"
-  #include  "wx/intl.h"
+    #include  "wx/dynarray.h"
+    #include  "wx/string.h"
+    #include  "wx/intl.h"
+    #include  "wx/log.h"
+    #include  "wx/app.h"
+    #include  "wx/utils.h"    // for wxGetHomeDir
+    #if wxUSE_STREAMS
+        #include  "wx/stream.h"
+    #endif // wxUSE_STREAMS

 #endif  //WX_PRECOMP
 
 #endif  //WX_PRECOMP
 

-#include  "wx/app.h"
-#include  "wx/dynarray.h"

 #include  "wx/file.h"
 #include  "wx/file.h"

-#include  "wx/log.h"

 #include  "wx/textfile.h"
 #include  "wx/memtext.h"
 #include  "wx/config.h"
 #include  "wx/fileconf.h"
 #include  "wx/textfile.h"
 #include  "wx/memtext.h"
 #include  "wx/config.h"
 #include  "wx/fileconf.h"

+#include  "wx/filefn.h"

 
 

-#if wxUSE_STREAMS
-    #include  "wx/stream.h"
-#endif // wxUSE_STREAMS
-
-#include  "wx/utils.h"    // for wxGetHomeDir
+#include "wx/base64.h"

 
 

-#if defined(__WXMAC__)
-  #include  "wx/mac/private.h"  // includes mac headers
-#endif
+#include  "wx/stdpaths.h"

 
 

-#if defined(__WXMSW__)
-  #include "wx/msw/private.h"
+#if defined(__WINDOWS__)
+    #include "wx/msw/private.h"

 #endif  //windows.h
 #if defined(__WXPM__)
 #endif  //windows.h
 #if defined(__WXPM__)

-  #define INCL_DOS
-  #include <os2.h>
+    #define INCL_DOS
+    #include <os2.h>

 #endif
 
 #include  <stdlib.h>
 #include  <ctype.h>
 
 #endif
 
 #include  <stdlib.h>
 #include  <ctype.h>
 

-// headers needed for umask()
-#ifdef __UNIX__
-    #include <sys/types.h>
-    #include <sys/stat.h>
-#endif // __UNIX__
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-#define CONST_CAST ((wxFileConfig *)this)->
-

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 #ifndef MAX_PATH
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 #ifndef MAX_PATH

-  #define MAX_PATH 512
+    #define MAX_PATH 512

 #endif
 
 #endif
 

+#define FILECONF_TRACE_MASK wxT("fileconf")
+

 // ----------------------------------------------------------------------------
 // global functions declarations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global functions declarations
 // ----------------------------------------------------------------------------


@@ -106,8 +93,15 @@ static wxString GetAppName(const wxString& appname);
 // "template" array types
 // ----------------------------------------------------------------------------
 
 // "template" array types
 // ----------------------------------------------------------------------------
 

-WX_DEFINE_SORTED_EXPORTED_ARRAY(wxFileConfigEntry *, ArrayEntries);
-WX_DEFINE_SORTED_EXPORTED_ARRAY(wxFileConfigGroup *, ArrayGroups);
+#ifdef WXMAKINGDLL_BASE
+    WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(wxFileConfigEntry *, ArrayEntries,
+                                         WXDLLIMPEXP_BASE);
+    WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(wxFileConfigGroup *, ArrayGroups,
+                                         WXDLLIMPEXP_BASE);
+#else
+    WX_DEFINE_SORTED_ARRAY(wxFileConfigEntry *, ArrayEntries);
+    WX_DEFINE_SORTED_ARRAY(wxFileConfigGroup *, ArrayGroups);
+#endif

 
 // ----------------------------------------------------------------------------
 // wxFileConfigLineList
 
 // ----------------------------------------------------------------------------
 // wxFileConfigLineList


@@ -137,6 +131,8 @@ private:
   wxString  m_strLine;                  // line contents
   wxFileConfigLineList *m_pNext,        // next node
                        *m_pPrev;        // previous one
   wxString  m_strLine;                  // line contents
   wxFileConfigLineList *m_pNext,        // next node
                        *m_pPrev;        // previous one

+
+    wxDECLARE_NO_COPY_CLASS(wxFileConfigLineList);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -150,8 +146,7 @@ private:
 
   wxString      m_strName,      // entry name
                 m_strValue;     //       value
 
   wxString      m_strName,      // entry name
                 m_strValue;     //       value

-  bool          m_bDirty:1,     // changed since last read?
-                m_bImmutable:1, // can be overriden locally?
+  bool          m_bImmutable:1, // can be overridden locally?

                 m_bHasValue:1;  // set after first call to SetValue()
 
   int           m_nLine;        // used if m_pLine == NULL only
                 m_bHasValue:1;  // set after first call to SetValue()
 
   int           m_nLine;        // used if m_pLine == NULL only


@@ -168,7 +163,6 @@ public:
   const wxString& Name()        const { return m_strName;    }
   const wxString& Value()       const { return m_strValue;   }
   wxFileConfigGroup *Group()    const { return m_pParent;    }
   const wxString& Name()        const { return m_strName;    }
   const wxString& Value()       const { return m_strValue;   }
   wxFileConfigGroup *Group()    const { return m_pParent;    }

-  bool            IsDirty()     const { return m_bDirty;     }

   bool            IsImmutable() const { return m_bImmutable; }
   bool            IsLocal()     const { return m_pLine != 0; }
   int             Line()        const { return m_nLine;      }
   bool            IsImmutable() const { return m_bImmutable; }
   bool            IsLocal()     const { return m_pLine != 0; }
   int             Line()        const { return m_nLine;      }


@@ -176,9 +170,10 @@ public:
                   GetLine()     const { return m_pLine;      }
 
   // modify entry attributes
                   GetLine()     const { return m_pLine;      }
 
   // modify entry attributes

-  void SetValue(const wxString& strValue, bool bUser = TRUE);
-  void SetDirty();
+  void SetValue(const wxString& strValue, bool bUser = true);

   void SetLine(wxFileConfigLineList *pLine);
   void SetLine(wxFileConfigLineList *pLine);

+
+    wxDECLARE_NO_COPY_CLASS(wxFileConfigEntry);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -193,7 +188,6 @@ private:
   ArrayEntries  m_aEntries;         // entries in this group
   ArrayGroups   m_aSubgroups;       // subgroups
   wxString      m_strName;          // group's name
   ArrayEntries  m_aEntries;         // entries in this group
   ArrayGroups   m_aSubgroups;       // subgroups
   wxString      m_strName;          // group's name

-  bool          m_bDirty;           // if FALSE => all subgroups are not dirty

   wxFileConfigLineList *m_pLine;    // pointer to our line in the linked list
   wxFileConfigEntry *m_pLastEntry;  // last entry/subgroup of this group in the
   wxFileConfigGroup *m_pLastGroup;  // local file (we insert new ones after it)
   wxFileConfigLineList *m_pLine;    // pointer to our line in the linked list
   wxFileConfigEntry *m_pLastEntry;  // last entry/subgroup of this group in the
   wxFileConfigGroup *m_pLastGroup;  // local file (we insert new ones after it)


@@ -201,6 +195,9 @@ private:
   // DeleteSubgroupByName helper
   bool DeleteSubgroup(wxFileConfigGroup *pGroup);
 
   // DeleteSubgroupByName helper
   bool DeleteSubgroup(wxFileConfigGroup *pGroup);
 

+  // used by Rename()
+  void UpdateGroupAndSubgroupsLines();
+

 public:
   // ctor
   wxFileConfigGroup(wxFileConfigGroup *pParent, const wxString& strName, wxFileConfig *);
 public:
   // ctor
   wxFileConfigGroup(wxFileConfigGroup *pParent, const wxString& strName, wxFileConfig *);


@@ -212,26 +209,23 @@ public:
   const wxString& Name()    const { return m_strName; }
   wxFileConfigGroup    *Parent()  const { return m_pParent; }
   wxFileConfig   *Config()  const { return m_pConfig; }
   const wxString& Name()    const { return m_strName; }
   wxFileConfigGroup    *Parent()  const { return m_pParent; }
   wxFileConfig   *Config()  const { return m_pConfig; }

-  bool            IsDirty() const { return m_bDirty;  }

 
   const ArrayEntries& Entries() const { return m_aEntries;   }
   const ArrayGroups&  Groups()  const { return m_aSubgroups; }
   bool  IsEmpty() const { return Entries().IsEmpty() && Groups().IsEmpty(); }
 
   // find entry/subgroup (NULL if not found)
 
   const ArrayEntries& Entries() const { return m_aEntries;   }
   const ArrayGroups&  Groups()  const { return m_aSubgroups; }
   bool  IsEmpty() const { return Entries().IsEmpty() && Groups().IsEmpty(); }
 
   // find entry/subgroup (NULL if not found)

-  wxFileConfigGroup *FindSubgroup(const wxChar *szName) const;
-  wxFileConfigEntry *FindEntry   (const wxChar *szName) const;
+  wxFileConfigGroup *FindSubgroup(const wxString& name) const;
+  wxFileConfigEntry *FindEntry   (const wxString& name) const;

 
 

-  // delete entry/subgroup, return FALSE if doesn't exist
-  bool DeleteSubgroupByName(const wxChar *szName);
-  bool DeleteEntry(const wxChar *szName);
+  // delete entry/subgroup, return false if doesn't exist
+  bool DeleteSubgroupByName(const wxString& name);
+  bool DeleteEntry(const wxString& name);

 
   // create new entry/subgroup returning pointer to newly created element
   wxFileConfigGroup *AddSubgroup(const wxString& strName);
   wxFileConfigEntry *AddEntry   (const wxString& strName, int nLine = wxNOT_FOUND);
 
 
   // create new entry/subgroup returning pointer to newly created element
   wxFileConfigGroup *AddSubgroup(const wxString& strName);
   wxFileConfigEntry *AddEntry   (const wxString& strName, int nLine = wxNOT_FOUND);
 

-  // will also recursively set parent's dirty flag
-  void SetDirty();

   void SetLine(wxFileConfigLineList *pLine);
 
   // rename: no checks are done to ensure that the name is unique!
   void SetLine(wxFileConfigLineList *pLine);
 
   // rename: no checks are done to ensure that the name is unique!


@@ -242,12 +236,16 @@ public:
 
   // get the last line belonging to an entry/subgroup of this group
   wxFileConfigLineList *GetGroupLine();     // line which contains [group]
 
   // get the last line belonging to an entry/subgroup of this group
   wxFileConfigLineList *GetGroupLine();     // line which contains [group]

+                                            // may be NULL for "/" only

   wxFileConfigLineList *GetLastEntryLine(); // after which our subgroups start
   wxFileConfigLineList *GetLastGroupLine(); // after which the next group starts
 
   // called by entries/subgroups when they're created/deleted
   wxFileConfigLineList *GetLastEntryLine(); // after which our subgroups start
   wxFileConfigLineList *GetLastGroupLine(); // after which the next group starts
 
   // called by entries/subgroups when they're created/deleted

-  void SetLastEntry(wxFileConfigEntry *pEntry) { m_pLastEntry = pEntry; }
-  void SetLastGroup(wxFileConfigGroup *pGroup) { m_pLastGroup = pGroup; }
+  void SetLastEntry(wxFileConfigEntry *pEntry);
+  void SetLastGroup(wxFileConfigGroup *pGroup)
+    { m_pLastGroup = pGroup; }
+
+  wxDECLARE_NO_COPY_CLASS(wxFileConfigGroup);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -257,304 +255,301 @@ public:
 // ----------------------------------------------------------------------------
 // static functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static functions
 // ----------------------------------------------------------------------------

-wxString wxFileConfig::GetGlobalDir()
+
+// this function modifies in place the given wxFileName object if it doesn't
+// already have an extension
+//
+// note that it's slightly misnamed under Mac as there it doesn't add an
+// extension but modifies the file name instead, so you shouldn't suppose that
+// fn.HasExt() is true after it returns
+static void AddConfFileExtIfNeeded(wxFileName& fn)

 {
 {

-  wxString strDir;
-
-  #ifdef __VMS__ // Note if __VMS is defined __UNIX is also defined
-    strDir = wxT("sys$manager:");
-  #elif defined(__WXMAC__)
-    strDir = wxMacFindFolder(  (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
-  #elif defined( __UNIX__ )
-    strDir = wxT("/etc/");
-  #elif defined(__WXPM__)
-    ULONG                           aulSysInfo[QSV_MAX] = {0};
-    UINT                            drive;
-    APIRET                          rc;
-
-    rc = DosQuerySysInfo( 1L, QSV_MAX, (PVOID)aulSysInfo, sizeof(ULONG)*QSV_MAX);
-    if (rc == 0)
+    if ( !fn.HasExt() )

     {
     {

-        drive = aulSysInfo[QSV_BOOT_DRIVE - 1];
-        strDir.Printf(wxT("%c:\\OS2\\"), 'A'+drive-1);
+#if defined( __WXMAC__ )
+        fn.SetName(fn.GetName() + wxT(" Preferences"));
+#elif defined( __UNIX__ )
+        fn.SetExt(wxT("conf"));
+#else   // Windows
+        fn.SetExt(wxT("ini"));
+#endif  // UNIX/Win

     }
     }

-  #elif defined(__WXSTUBS__)
-    wxASSERT_MSG( FALSE, wxT("TODO") ) ;
-  #elif defined(__DOS__)
-    // There's no such thing as global cfg dir in MS-DOS, let's return
-    // current directory (FIXME_MGL?)
-    return wxT(".\\");
-  #else // Windows
-    wxChar szWinDir[MAX_PATH];
-    ::GetWindowsDirectory(szWinDir, MAX_PATH);
-
-    strDir = szWinDir;
-    strDir << wxT('\\');
-  #endif // Unix/Windows
+}

 
 

-  return strDir;
+wxString wxFileConfig::GetGlobalDir()
+{
+    return wxStandardPaths::Get().GetConfigDir();

 }
 
 }
 

-wxString wxFileConfig::GetLocalDir()
+wxString wxFileConfig::GetLocalDir(int style)

 {
 {

-  wxString strDir;
+    wxUnusedVar(style);

 
 

-#if defined(__WXMAC__) || defined(__DOS__)
-  // no local dir concept on Mac OS 9 or MS-DOS
-  return GetGlobalDir() ;
-#else
-  wxGetHomeDir(&strDir);
-
-#  ifdef  __UNIX__
-#  ifdef __VMS
-  if (strDir.Last() != wxT(']'))
-#  endif
-      if (strDir.Last() != wxT('/')) strDir << wxT('/');
-#  else
-  if (strDir.Last() != wxT('\\')) strDir << wxT('\\');
-#  endif
-#endif
+    wxStandardPathsBase& stdp = wxStandardPaths::Get();

 
 

-  return strDir;
+    // it so happens that user data directory is a subdirectory of user config
+    // directory on all supported platforms, which explains why we use it here
+    return style & wxCONFIG_USE_SUBDIR ? stdp.GetUserDataDir()
+                                       : stdp.GetUserConfigDir();

 }
 
 }
 

-wxString wxFileConfig::GetGlobalFileName(const wxChar *szFile)
+wxFileName wxFileConfig::GetGlobalFile(const wxString& szFile)

 {
 {

-  wxString str = GetGlobalDir();
-  str << szFile;
+    wxFileName fn(GetGlobalDir(), szFile);

 
 

-  if ( wxStrchr(szFile, wxT('.')) == NULL )
-  #if defined( __WXMAC__ )
-     str << " Preferences";
-  #elif defined( __UNIX__ )
-    str << wxT(".conf");
-  #else   // Windows
-    str << wxT(".ini");
-  #endif  // UNIX/Win
+    AddConfFileExtIfNeeded(fn);

 
 

-  return str;
+    return fn;

 }
 
 }
 

-wxString wxFileConfig::GetLocalFileName(const wxChar *szFile)
+wxFileName wxFileConfig::GetLocalFile(const wxString& szFile, int style)

 {
 {

-#ifdef __VMS__ // On VMS I saw the problem that the home directory was appended
-   // twice for the configuration file. Does that also happen for other
-   // platforms?
-   wxString str = wxT( '.' ); 
-#else
-   wxString str = GetLocalDir();
-#endif
-   
-  #if defined( __UNIX__ ) && !defined( __VMS ) && !defined( __WXMAC__ )
-    str << wxT('.');
-  #endif
-
-  str << szFile;
+    wxFileName fn(GetLocalDir(style), szFile);

 
 

-  #if defined(__WINDOWS__) || defined(__DOS__)
-    if ( wxStrchr(szFile, wxT('.')) == NULL )
-      str << wxT(".ini");
-  #endif
+#if defined( __UNIX__ ) && !defined( __WXMAC__ )
+    if ( !(style & wxCONFIG_USE_SUBDIR) )
+    {
+        // dot-files under Unix start with, well, a dot (but OTOH they usually
+        // don't have any specific extension)
+        fn.SetName(wxT('.') + fn.GetName());
+    }
+    else // we do append ".conf" extension to config files in subdirectories
+#endif // defined( __UNIX__ ) && !defined( __WXMAC__ )
+    {
+        AddConfFileExtIfNeeded(fn);
+    }

 
 

-  #ifdef __WXMAC__
-     str << " Preferences";
-  #endif
-  return str;
+    return fn;

 }
 
 // ----------------------------------------------------------------------------
 // ctor
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
 // ctor
 // ----------------------------------------------------------------------------

+IMPLEMENT_ABSTRACT_CLASS(wxFileConfig, wxConfigBase)

 
 void wxFileConfig::Init()
 {
 
 void wxFileConfig::Init()
 {

-  m_pCurrentGroup =
-  m_pRootGroup    = new wxFileConfigGroup(NULL, "", this);
+    m_pCurrentGroup =
+    m_pRootGroup    = new wxFileConfigGroup(NULL, wxEmptyString, this);

 
 

-  m_linesHead =
-  m_linesTail = NULL;
+    m_linesHead =
+    m_linesTail = NULL;

 
 

-  // it's not an error if (one of the) file(s) doesn't exist
+    // It's not an error if (one of the) file(s) doesn't exist.

 
 

-  // parse the global file
-  if ( !m_strGlobalFile.IsEmpty() && wxFile::Exists(m_strGlobalFile) ) {
-    wxTextFile fileGlobal(m_strGlobalFile);
+    // parse the global file
+    if ( m_fnGlobalFile.IsOk() && m_fnGlobalFile.FileExists() )
+    {
+        wxTextFile fileGlobal(m_fnGlobalFile.GetFullPath());

 
 

-    if ( fileGlobal.Open() ) {
-      Parse(fileGlobal, FALSE /* global */);
-      SetRootPath();
+        if ( fileGlobal.Open(*m_conv/*ignored in ANSI build*/) )
+        {
+            Parse(fileGlobal, false /* global */);
+            SetRootPath();
+        }
+        else
+        {
+            wxLogWarning(_("can't open global configuration file '%s'."), m_fnGlobalFile.GetFullPath().c_str());
+        }

     }
     }

-    else
-      wxLogWarning(_("can't open global configuration file '%s'."),
-                   m_strGlobalFile.c_str());
-  }

 
 

-  // parse the local file
-  if ( !m_strLocalFile.IsEmpty() && wxFile::Exists(m_strLocalFile) ) {
-    wxTextFile fileLocal(m_strLocalFile);
-    if ( fileLocal.Open() ) {
-      Parse(fileLocal, TRUE /* local */);
-      SetRootPath();
+    // parse the local file
+    if ( m_fnLocalFile.IsOk() && m_fnLocalFile.FileExists() )
+    {
+        wxTextFile fileLocal(m_fnLocalFile.GetFullPath());
+        if ( fileLocal.Open(*m_conv/*ignored in ANSI build*/) )
+        {
+            Parse(fileLocal, true /* local */);
+            SetRootPath();
+        }
+        else
+        {
+            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();
+            }
+        }

     }
     }

-    else
-      wxLogWarning(_("can't open user configuration file '%s'."),
-                   m_strLocalFile.c_str());
-  }
+
+    m_isDirty = false;

 }
 
 // constructor supports creation of wxFileConfig objects of any type
 wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
                            const wxString& strLocal, const wxString& strGlobal,
 }
 
 // constructor supports creation of wxFileConfig objects of any type
 wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
                            const wxString& strLocal, const wxString& strGlobal,

-                           long style)
+                           long style,
+                           const wxMBConv& conv)

             : wxConfigBase(::GetAppName(appName), vendorName,
                            strLocal, strGlobal,
                            style),
             : wxConfigBase(::GetAppName(appName), vendorName,
                            strLocal, strGlobal,
                            style),

-              m_strLocalFile(strLocal), m_strGlobalFile(strGlobal)
+              m_fnLocalFile(strLocal),
+              m_fnGlobalFile(strGlobal),
+              m_conv(conv.Clone())

 {
 {

-  // Make up names for files if empty
-  if ( m_strLocalFile.IsEmpty() && (style & wxCONFIG_USE_LOCAL_FILE) )
-  {
-    m_strLocalFile = GetLocalFileName(GetAppName());
-  }
+    // Make up names for files if empty
+    if ( !m_fnLocalFile.IsOk() && (style & wxCONFIG_USE_LOCAL_FILE) )
+        m_fnLocalFile = GetLocalFile(GetAppName(), style);

 
 

-  if ( m_strGlobalFile.IsEmpty() && (style & wxCONFIG_USE_GLOBAL_FILE) )
-  {
-    m_strGlobalFile = GetGlobalFileName(GetAppName());
-  }
+    if ( !m_fnGlobalFile.IsOk() && (style & wxCONFIG_USE_GLOBAL_FILE) )
+        m_fnGlobalFile = GetGlobalFile(GetAppName());

 
 

-  // Check if styles are not supplied, but filenames are, in which case
-  // add the correct styles.
-  if ( !m_strLocalFile.IsEmpty() )
-    SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);
+    // Check if styles are not supplied, but filenames are, in which case
+    // add the correct styles.
+    if ( m_fnLocalFile.IsOk() )
+        SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);

 
 

-  if ( !m_strGlobalFile.IsEmpty() )
-    SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE);
+    if ( m_fnGlobalFile.IsOk() )
+        SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE);

 
 

-  // if the path is not absolute, prepend the standard directory to it
-  // UNLESS wxCONFIG_USE_RELATIVE_PATH style is set
-  if ( !(style & wxCONFIG_USE_RELATIVE_PATH) )
-  {
-      if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) )
-      {
-          wxString strLocal = m_strLocalFile;
-          m_strLocalFile = GetLocalDir();
-          m_strLocalFile << strLocal;
-      }
+    // if the path is not absolute, prepend the standard directory to it
+    // unless explicitly asked not to
+    if ( !(style & wxCONFIG_USE_RELATIVE_PATH) )
+    {
+        if ( m_fnLocalFile.IsOk() )
+            m_fnLocalFile.MakeAbsolute(GetLocalDir(style));

 
 

-      if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) )
-      {
-          wxString strGlobal = m_strGlobalFile;
-          m_strGlobalFile = GetGlobalDir();
-          m_strGlobalFile << strGlobal;
-      }
-  }
+        if ( m_fnGlobalFile.IsOk() )
+            m_fnGlobalFile.MakeAbsolute(GetGlobalDir());
+    }

 
 

-  SetUmask(-1);
+    SetUmask(-1);

 
 

-  Init();
+    Init();

 }
 
 #if wxUSE_STREAMS
 
 }
 
 #if wxUSE_STREAMS
 

-wxFileConfig::wxFileConfig(wxInputStream &inStream)
+wxFileConfig::wxFileConfig(wxInputStream &inStream, const wxMBConv& conv)
+            : m_conv(conv.Clone())

 {
     // always local_file when this constructor is called (?)
     SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);
 
     m_pCurrentGroup =
 {
     // always local_file when this constructor is called (?)
     SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);
 
     m_pCurrentGroup =

-    m_pRootGroup    = new wxFileConfigGroup(NULL, "", this);
+    m_pRootGroup    = new wxFileConfigGroup(NULL, wxEmptyString, this);

 
     m_linesHead =
     m_linesTail = NULL;
 
 
     m_linesHead =
     m_linesTail = NULL;
 

-    // translate everything to the current (platform-dependent) line
-    // termination character
-    wxString strTrans;
-    {
-        wxString strTmp;
+    // read the entire stream contents in memory
+    wxWxCharBuffer cbuf;
+    static const size_t chunkLen = 1024;

 
 

-        char buf[1024];
-        while ( !inStream.Read(buf, WXSIZEOF(buf)).Eof() )
-            strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
+    wxMemoryBuffer buf(chunkLen);
+    do
+    {
+        inStream.Read(buf.GetAppendBuf(chunkLen), chunkLen);
+        buf.UngetAppendBuf(inStream.LastRead());

 
 

-        strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
+        const wxStreamError err = inStream.GetLastError();

 
 

-        strTrans = wxTextBuffer::Translate(strTmp);
+        if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF )
+        {
+            wxLogError(_("Error reading config options."));
+            break;
+        }

     }
     }

+    while ( !inStream.Eof() );

 
 

-    wxMemoryText memText;
-
-    // Now we can add the text to the memory text. To do this we extract line
-    // by line from the translated string, until we've reached the end.
-    //
-    // VZ: all this is horribly inefficient, we should do the translation on
-    //     the fly in one pass saving both memory and time (TODO)
-
-    const wxChar *pEOL = wxTextBuffer::GetEOL(wxTextBuffer::typeDefault);
-    const size_t EOLLen = wxStrlen(pEOL);
-
-    int posLineStart = strTrans.Find(pEOL);
-    while ( posLineStart != -1 )
+#if wxUSE_UNICODE
+    size_t len;
+    cbuf = conv.cMB2WC((char *)buf.GetData(), buf.GetDataLen() + 1, &len);
+    if ( !len && buf.GetDataLen() )

     {
     {

-        wxString line(strTrans.Left(posLineStart));
-
-        memText.AddLine(line);
-
-        strTrans = strTrans.Mid(posLineStart + EOLLen);
-
-        posLineStart = strTrans.Find(pEOL);
+        wxLogError(_("Failed to read config options."));

     }
     }

+#else // !wxUSE_UNICODE
+    // no need for conversion
+    cbuf = wxCharBuffer::CreateNonOwned((char *)buf.GetData(), buf.GetDataLen());
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE

 
 

-    // also add whatever we have left in the translated string.
-    memText.AddLine(strTrans);
+    // parse the input contents if there is anything to parse
+    if ( cbuf )
+    {
+        // now break it into lines
+        wxMemoryText memText;
+        for ( const wxChar *s = cbuf; ; ++s )
+        {
+            const wxChar *e = s;
+            while ( *e != '\0' && *e != '\n' && *e != '\r' )
+                ++e;
+
+            // notice that we throw away the original EOL kind here, maybe we
+            // should preserve it?
+            if ( e != s )
+                memText.AddLine(wxString(s, e));
+
+            if ( *e == '\0' )
+                break;
+
+            // skip the second EOL byte if it's a DOS one
+            if ( *e == '\r' && e[1] == '\n' )
+                ++e;
+
+            s = e;
+        }

 
 

-    // Finally we can parse it all.
-    Parse(memText, TRUE /* local */);
+        // Finally we can parse it all.
+        Parse(memText, true /* local */);
+    }

 
     SetRootPath();
 
     SetRootPath();

+    ResetDirty();

 }
 
 #endif // wxUSE_STREAMS
 
 void wxFileConfig::CleanUp()
 {
 }
 
 #endif // wxUSE_STREAMS
 
 void wxFileConfig::CleanUp()
 {

-  delete m_pRootGroup;
+    delete m_pRootGroup;

 
 

-  wxFileConfigLineList *pCur = m_linesHead;
-  while ( pCur != NULL ) {
-    wxFileConfigLineList *pNext = pCur->Next();
-    delete pCur;
-    pCur = pNext;
-  }
+    wxFileConfigLineList *pCur = m_linesHead;
+    while ( pCur != NULL ) {
+        wxFileConfigLineList *pNext = pCur->Next();
+        delete pCur;
+        pCur = pNext;
+    }

 }
 
 wxFileConfig::~wxFileConfig()
 {
 }
 
 wxFileConfig::~wxFileConfig()
 {

-  Flush();
+    Flush();

 
 

-  CleanUp();
+    CleanUp();
+
+    delete m_conv;

 }
 
 // ----------------------------------------------------------------------------
 // parse a config file
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // parse a config file
 // ----------------------------------------------------------------------------
 

-void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
+void wxFileConfig::Parse(const wxTextBuffer& buffer, bool bLocal)

 {
 {

-  const wxChar *pStart;
-  const wxChar *pEnd;
-  wxString strLine;

 
   size_t nLineCount = buffer.GetLineCount();
 
   size_t nLineCount = buffer.GetLineCount();

-  for ( size_t n = 0; n < nLineCount; n++ ) {
-    strLine = buffer[n];
+
+  for ( size_t n = 0; n < nLineCount; n++ )
+  {
+    wxString strLine = buffer[n];
+    // FIXME-UTF8: rewrite using iterators, without this buffer
+    wxWxCharBuffer buf(strLine.c_str());
+    const wxChar *pStart;
+    const wxChar *pEnd;

 
     // add the line to linked list
     if ( bLocal )
       LineListAppend(strLine);
 
 
     // add the line to linked list
     if ( bLocal )
       LineListAppend(strLine);
 

+

     // skip leading spaces
     // skip leading spaces

-    for ( pStart = strLine; wxIsspace(*pStart); pStart++ )
+    for ( pStart = buf; wxIsspace(*pStart); pStart++ )

       ;
 
     // skip blank/comment lines
       ;
 
     // skip blank/comment lines


@@ -592,15 +587,19 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
       SetPath(strGroup);
 
       if ( bLocal )
       SetPath(strGroup);
 
       if ( bLocal )

+      {
+        if ( m_pCurrentGroup->Parent() )
+          m_pCurrentGroup->Parent()->SetLastGroup(m_pCurrentGroup);

         m_pCurrentGroup->SetLine(m_linesTail);
         m_pCurrentGroup->SetLine(m_linesTail);

+      }

 
       // check that there is nothing except comments left on this line
 
       // check that there is nothing except comments left on this line

-      bool bCont = TRUE;
+      bool bCont = true;

       while ( *++pEnd != wxT('\0') && bCont ) {
         switch ( *pEnd ) {
           case wxT('#'):
           case wxT(';'):
       while ( *++pEnd != wxT('\0') && bCont ) {
         switch ( *pEnd ) {
           case wxT('#'):
           case wxT(';'):

-            bCont = FALSE;
+            bCont = false;

             break;
 
           case wxT(' '):
             break;
 
           case wxT(' '):


@@ -611,13 +610,13 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
           default:
             wxLogWarning(_("file '%s', line %d: '%s' ignored after group header."),
                          buffer.GetName(), n + 1, pEnd);
           default:
             wxLogWarning(_("file '%s', line %d: '%s' ignored after group header."),
                          buffer.GetName(), n + 1, pEnd);

-            bCont = FALSE;
+            bCont = false;

         }
       }
     }
     else {                        // a key
         }
       }
     }
     else {                        // a key

-      const wxChar *pEnd = pStart;
-      while ( *pEnd && *pEnd != wxT('=') && !wxIsspace(*pEnd) ) {
+      pEnd = pStart;
+      while ( *pEnd && *pEnd != wxT('=') /* && !wxIsspace(*pEnd)*/ ) {

         if ( *pEnd == wxT('\\') ) {
           // next character may be space or not - still take it because it's
           // quoted (unless there is nothing)
         if ( *pEnd == wxT('\\') ) {
           // next character may be space or not - still take it because it's
           // quoted (unless there is nothing)


@@ -631,7 +630,7 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
         pEnd++;
       }
 
         pEnd++;
       }
 

-      wxString strKey(FilterInEntryName(wxString(pStart, pEnd)));
+      wxString strKey(FilterInEntryName(wxString(pStart, pEnd).Trim()));

 
       // skip whitespace
       while ( wxIsspace(*pEnd) )
 
       // skip whitespace
       while ( wxIsspace(*pEnd) )


@@ -647,9 +646,6 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
         if ( pEntry == NULL ) {
           // new entry
           pEntry = m_pCurrentGroup->AddEntry(strKey, n);
         if ( pEntry == NULL ) {
           // new entry
           pEntry = m_pCurrentGroup->AddEntry(strKey, n);

-
-          if ( bLocal )
-            pEntry->SetLine(m_linesTail);

         }
         else {
           if ( bLocal && pEntry->IsImmutable() ) {
         }
         else {
           if ( bLocal && pEntry->IsImmutable() ) {


@@ -665,18 +661,23 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
           // which is exactly what we want.
           else if ( !bLocal || pEntry->IsLocal() ) {
             wxLogWarning(_("file '%s', line %d: key '%s' was first found at line %d."),
           // which is exactly what we want.
           else if ( !bLocal || pEntry->IsLocal() ) {
             wxLogWarning(_("file '%s', line %d: key '%s' was first found at line %d."),

-                         buffer.GetName(), n + 1, strKey.c_str(), pEntry->Line());
+                         buffer.GetName(), (int)n + 1, strKey.c_str(), pEntry->Line());

 
 

-            if ( bLocal )
-              pEntry->SetLine(m_linesTail);

           }
         }
 
           }
         }
 

+        if ( bLocal )
+          pEntry->SetLine(m_linesTail);
+

         // skip whitespace
         while ( wxIsspace(*pEnd) )
           pEnd++;
 
         // skip whitespace
         while ( wxIsspace(*pEnd) )
           pEnd++;
 

-        pEntry->SetValue(FilterInValue(pEnd), FALSE /* read from file */);
+        wxString value = pEnd;
+        if ( !(GetStyle() & wxCONFIG_USE_NO_ESCAPE_CHARACTERS) )
+            value = FilterInValue(value);
+
+        pEntry->SetValue(value, false);

       }
     }
   }
       }
     }
   }


@@ -688,45 +689,64 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
 
 void wxFileConfig::SetRootPath()
 {
 
 void wxFileConfig::SetRootPath()
 {

-  m_strPath.Empty();
-  m_pCurrentGroup = m_pRootGroup;
+    m_strPath.Empty();
+    m_pCurrentGroup = m_pRootGroup;

 }
 
 }
 

-void wxFileConfig::SetPath(const wxString& strPath)
+bool
+wxFileConfig::DoSetPath(const wxString& strPath, bool createMissingComponents)

 {
 {

-  wxArrayString aParts;
+    wxArrayString aParts;

 
 

-  if ( strPath.IsEmpty() ) {
-    SetRootPath();
-    return;
-  }
+    if ( strPath.empty() ) {
+        SetRootPath();
+        return true;
+    }

 
 

-  if ( strPath[0] == wxCONFIG_PATH_SEPARATOR ) {
-    // absolute path
-    wxSplitPath(aParts, strPath);
-  }
-  else {
-    // relative path, combine with current one
-    wxString strFullPath = m_strPath;
-    strFullPath << wxCONFIG_PATH_SEPARATOR << strPath;
-    wxSplitPath(aParts, strFullPath);
-  }
+    if ( strPath[0] == wxCONFIG_PATH_SEPARATOR ) {
+        // absolute path
+        wxSplitPath(aParts, strPath);
+    }
+    else {
+        // relative path, combine with current one
+        wxString strFullPath = m_strPath;
+        strFullPath << wxCONFIG_PATH_SEPARATOR << strPath;
+        wxSplitPath(aParts, strFullPath);
+    }

 
 

-  // change current group
-  size_t n;
-  m_pCurrentGroup = m_pRootGroup;
-  for ( n = 0; n < aParts.Count(); n++ ) {
-    wxFileConfigGroup *pNextGroup = m_pCurrentGroup->FindSubgroup(aParts[n]);
-    if ( pNextGroup == NULL )
-      pNextGroup = m_pCurrentGroup->AddSubgroup(aParts[n]);
-    m_pCurrentGroup = pNextGroup;
-  }
+    // change current group
+    size_t n;
+    m_pCurrentGroup = m_pRootGroup;
+    for ( n = 0; n < aParts.GetCount(); n++ ) {
+        wxFileConfigGroup *pNextGroup = m_pCurrentGroup->FindSubgroup(aParts[n]);
+        if ( pNextGroup == NULL )
+        {
+            if ( !createMissingComponents )
+                return false;
+
+            pNextGroup = m_pCurrentGroup->AddSubgroup(aParts[n]);
+        }

 
 

-  // recombine path parts in one variable
-  m_strPath.Empty();
-  for ( n = 0; n < aParts.Count(); n++ ) {
-    m_strPath << wxCONFIG_PATH_SEPARATOR << aParts[n];
-  }
+        m_pCurrentGroup = pNextGroup;
+    }
+
+    // recombine path parts in one variable
+    m_strPath.Empty();
+    for ( n = 0; n < aParts.GetCount(); n++ ) {
+        m_strPath << wxCONFIG_PATH_SEPARATOR << aParts[n];
+    }
+
+    return true;
+}
+
+void wxFileConfig::SetPath(const wxString& strPath)
+{
+    DoSetPath(strPath, true /* create missing path components */);
+}
+
+const wxString& wxFileConfig::GetPath() const
+{
+    return m_strPath;

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


@@ -735,66 +755,70 @@ void wxFileConfig::SetPath(const wxString& strPath)
 
 bool wxFileConfig::GetFirstGroup(wxString& str, long& lIndex) const
 {
 
 bool wxFileConfig::GetFirstGroup(wxString& str, long& lIndex) const
 {

-  lIndex = 0;
-  return GetNextGroup(str, lIndex);
+    lIndex = 0;
+    return GetNextGroup(str, lIndex);

 }
 
 bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) const
 {
 }
 
 bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) const
 {

-  if ( size_t(lIndex) < m_pCurrentGroup->Groups().Count() ) {
-    str = m_pCurrentGroup->Groups()[(size_t)lIndex++]->Name();
-    return TRUE;
-  }
-  else
-    return FALSE;
+    if ( size_t(lIndex) < m_pCurrentGroup->Groups().GetCount() ) {
+        str = m_pCurrentGroup->Groups()[(size_t)lIndex++]->Name();
+        return true;
+    }
+    else
+        return false;

 }
 
 bool wxFileConfig::GetFirstEntry(wxString& str, long& lIndex) const
 {
 }
 
 bool wxFileConfig::GetFirstEntry(wxString& str, long& lIndex) const
 {

-  lIndex = 0;
-  return GetNextEntry(str, lIndex);
+    lIndex = 0;
+    return GetNextEntry(str, lIndex);

 }
 
 bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
 {
 }
 
 bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
 {

-  if ( size_t(lIndex) < m_pCurrentGroup->Entries().Count() ) {
-    str = m_pCurrentGroup->Entries()[(size_t)lIndex++]->Name();
-    return TRUE;
-  }
-  else
-    return FALSE;
+    if ( size_t(lIndex) < m_pCurrentGroup->Entries().GetCount() ) {
+        str = m_pCurrentGroup->Entries()[(size_t)lIndex++]->Name();
+        return true;
+    }
+    else
+        return false;

 }
 
 size_t wxFileConfig::GetNumberOfEntries(bool bRecursive) const
 {
 }
 
 size_t wxFileConfig::GetNumberOfEntries(bool bRecursive) const
 {

-  size_t n = m_pCurrentGroup->Entries().Count();
-  if ( bRecursive ) {
-    wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
-    size_t nSubgroups = m_pCurrentGroup->Groups().Count();
-    for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
-      CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
-      n += GetNumberOfEntries(TRUE);
-      CONST_CAST m_pCurrentGroup = pOldCurrentGroup;
+    size_t n = m_pCurrentGroup->Entries().GetCount();
+    if ( bRecursive ) {
+        wxFileConfig * const self = const_cast<wxFileConfig *>(this);
+
+        wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
+        size_t nSubgroups = m_pCurrentGroup->Groups().GetCount();
+        for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
+            self->m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
+            n += GetNumberOfEntries(true);
+            self->m_pCurrentGroup = pOldCurrentGroup;
+        }

     }
     }

-  }

 
 

-  return n;
+    return n;

 }
 
 size_t wxFileConfig::GetNumberOfGroups(bool bRecursive) const
 {
 }
 
 size_t wxFileConfig::GetNumberOfGroups(bool bRecursive) const
 {

-  size_t n = m_pCurrentGroup->Groups().Count();
-  if ( bRecursive ) {
-    wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
-    size_t nSubgroups = m_pCurrentGroup->Groups().Count();
-    for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
-      CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
-      n += GetNumberOfGroups(TRUE);
-      CONST_CAST m_pCurrentGroup = pOldCurrentGroup;
+    size_t n = m_pCurrentGroup->Groups().GetCount();
+    if ( bRecursive ) {
+        wxFileConfig * const self = const_cast<wxFileConfig *>(this);
+
+        wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
+        size_t nSubgroups = m_pCurrentGroup->Groups().GetCount();
+        for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
+            self->m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
+            n += GetNumberOfGroups(true);
+            self->m_pCurrentGroup = pOldCurrentGroup;
+        }

     }
     }

-  }

 
 

-  return n;
+    return n;

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


@@ -803,18 +827,60 @@ size_t wxFileConfig::GetNumberOfGroups(bool bRecursive) const
 
 bool wxFileConfig::HasGroup(const wxString& strName) const
 {
 
 bool wxFileConfig::HasGroup(const wxString& strName) const
 {

-  wxConfigPathChanger path(this, strName);
+    // special case: DoSetPath("") does work as it's equivalent to DoSetPath("/")
+    // but there is no group with empty name so treat this separately
+    if ( strName.empty() )
+        return false;
+
+    const wxString pathOld = GetPath();

 
 

-  wxFileConfigGroup *pGroup = m_pCurrentGroup->FindSubgroup(path.Name());
-  return pGroup != NULL;
+    wxFileConfig *self = const_cast<wxFileConfig *>(this);
+    const bool
+        rc = self->DoSetPath(strName, false /* don't create missing components */);
+
+    self->SetPath(pathOld);
+
+    return rc;

 }
 
 }
 

-bool wxFileConfig::HasEntry(const wxString& strName) const
+bool wxFileConfig::HasEntry(const wxString& entry) const

 {
 {

-  wxConfigPathChanger path(this, strName);
+    // path is the part before the last "/"
+    wxString path = entry.BeforeLast(wxCONFIG_PATH_SEPARATOR);
+
+    // except in the special case of "/keyname" when there is nothing before "/"
+    if ( path.empty() && *entry.c_str() == wxCONFIG_PATH_SEPARATOR )
+    {
+        path = wxCONFIG_PATH_SEPARATOR;
+    }
+
+    // change to the path of the entry if necessary and remember the old path
+    // to restore it later
+    wxString pathOld;
+    wxFileConfig * const self = const_cast<wxFileConfig *>(this);
+    if ( !path.empty() )
+    {
+        pathOld = GetPath();
+        if ( pathOld.empty() )
+            pathOld = wxCONFIG_PATH_SEPARATOR;
+
+        if ( !self->DoSetPath(path, false /* don't create if doesn't exist */) )
+        {
+            return false;
+        }
+    }
+
+    // check if the entry exists in this group
+    const bool exists = m_pCurrentGroup->FindEntry(
+                            entry.AfterLast(wxCONFIG_PATH_SEPARATOR)) != NULL;

 
 

-  wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
-  return pEntry != NULL;
+    // restore the old path if we changed it above
+    if ( !pathOld.empty() )
+    {
+        self->SetPath(pathOld);
+    }
+
+    return exists;

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


@@ -823,136 +889,192 @@ bool wxFileConfig::HasEntry(const wxString& strName) const
 
 bool wxFileConfig::DoReadString(const wxString& key, wxString* pStr) const
 {
 
 bool wxFileConfig::DoReadString(const wxString& key, wxString* pStr) const
 {

-  wxConfigPathChanger path(this, key);
+    wxConfigPathChanger path(this, key);

 
 

-  wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
-  if (pEntry == NULL) {
-    return FALSE;
-  }
+    wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
+    if (pEntry == NULL) {
+        return false;
+    }

 
 

-  *pStr = pEntry->Value();
+    *pStr = pEntry->Value();

 
 

-  return TRUE;
+    return true;

 }
 
 bool wxFileConfig::DoReadLong(const wxString& key, long *pl) const
 {
 }
 
 bool wxFileConfig::DoReadLong(const wxString& key, long *pl) const
 {

-  wxString str;
-  if ( !Read(key, & str) )
-  {
-    return FALSE;
-  }
-  return str.ToLong(pl) ;
+    wxString str;
+    if ( !Read(key, &str) )
+        return false;
+
+    // extra spaces shouldn't prevent us from reading numeric values
+    str.Trim();
+
+    return str.ToLong(pl);

 }
 
 }
 

+#if wxUSE_BASE64
+
+bool wxFileConfig::DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const
+{
+    wxCHECK_MSG( buf, false, wxT("NULL buffer") );
+
+    wxString str;
+    if ( !Read(key, &str) )
+        return false;
+
+    *buf = wxBase64Decode(str);
+    return true;
+}
+
+#endif // wxUSE_BASE64
+

 bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)
 {
 bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)
 {

-  wxConfigPathChanger path(this, key);
+    wxConfigPathChanger     path(this, key);
+    wxString                strName = path.Name();

 
 

-  wxString strName = path.Name();
-  if ( strName.IsEmpty() ) {
-    // setting the value of a group is an error
-    wxASSERT_MSG( wxIsEmpty(szValue), wxT("can't set value of a group!") );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("  Writing String '%s' = '%s' to Group '%s'"),
+                strName.c_str(),
+                szValue.c_str(),
+                GetPath().c_str() );

 
 

-    // ... except if it's empty in which case it's a way to force it's creation
-    m_pCurrentGroup->SetDirty();
+    if ( strName.empty() )
+    {
+            // setting the value of a group is an error

 
 

-    // this will add a line for this group if it didn't have it before
-    (void)m_pCurrentGroup->GetGroupLine();
-  }
-  else {
-    // writing an entry
-
-    // check that the name is reasonable
-    if ( strName[0u] == wxCONFIG_IMMUTABLE_PREFIX ) {
-      wxLogError(_("Config entry name cannot start with '%c'."),
-                 wxCONFIG_IMMUTABLE_PREFIX);
-      return FALSE;
+        wxASSERT_MSG( szValue.empty(), wxT("can't set value of a group!") );
+
+            // ... except if it's empty in which case it's a way to force it's creation
+
+        wxLogTrace( FILECONF_TRACE_MASK,
+                    wxT("  Creating group %s"),
+                    m_pCurrentGroup->Name().c_str() );
+
+        SetDirty();
+
+        // this will add a line for this group if it didn't have it before (or
+        // do nothing for the root but it's ok as it always exists anyhow)
+        (void)m_pCurrentGroup->GetGroupLine();

     }
     }

+    else
+    {
+        // writing an entry check that the name is reasonable
+        if ( strName[0u] == wxCONFIG_IMMUTABLE_PREFIX )
+        {
+            wxLogError( _("Config entry name cannot start with '%c'."),
+                        wxCONFIG_IMMUTABLE_PREFIX);
+            return false;
+        }

 
 

-    wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(strName);
-    if ( pEntry == NULL )
-      pEntry = m_pCurrentGroup->AddEntry(strName);
+        wxFileConfigEntry   *pEntry = m_pCurrentGroup->FindEntry(strName);

 
 

-    pEntry->SetValue(szValue);
-  }
+        if ( pEntry == 0 )
+        {
+            wxLogTrace( FILECONF_TRACE_MASK,
+                        wxT("  Adding Entry %s"),
+                        strName.c_str() );
+            pEntry = m_pCurrentGroup->AddEntry(strName);
+        }

 
 

-  return TRUE;
+        wxLogTrace( FILECONF_TRACE_MASK,
+                    wxT("  Setting value %s"),
+                    szValue.c_str() );
+        pEntry->SetValue(szValue);
+
+        SetDirty();
+    }
+
+    return true;

 }
 
 bool wxFileConfig::DoWriteLong(const wxString& key, long lValue)
 {
 }
 
 bool wxFileConfig::DoWriteLong(const wxString& key, long lValue)
 {

-  return Write(key, wxString::Format(_T("%ld"), lValue));
+  return Write(key, wxString::Format(wxT("%ld"), lValue));
+}
+
+#if wxUSE_BASE64
+
+bool wxFileConfig::DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf)
+{
+  return Write(key, wxBase64Encode(buf));

 }
 
 }
 

+#endif // wxUSE_BASE64
+

 bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 {
 bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 {

-  if ( LineListIsEmpty() || !m_pRootGroup->IsDirty() || !m_strLocalFile )
-    return TRUE;
+  if ( !IsDirty() || !m_fnLocalFile.GetFullPath() )
+    return true;

 
 

-#ifdef __UNIX__

   // set the umask if needed
   // set the umask if needed

-  mode_t umaskOld = 0;
-  if ( m_umask != -1 )
-  {
-      umaskOld = umask((mode_t)m_umask);
-  }
-#endif // __UNIX__
+  wxCHANGE_UMASK(m_umask);

 
 

-  wxTempFile file(m_strLocalFile);
+  wxTempFile file(m_fnLocalFile.GetFullPath());

 
   if ( !file.IsOpened() )
   {
     wxLogError(_("can't open user configuration file."));
 
   if ( !file.IsOpened() )
   {
     wxLogError(_("can't open user configuration file."));

-    return FALSE;
+    return false;

   }
 
   // write all strings to file
   }
 
   // write all strings to file

+  wxString filetext;
+  filetext.reserve(4096);

   for ( wxFileConfigLineList *p = m_linesHead; p != NULL; p = p->Next() )
   {
   for ( wxFileConfigLineList *p = m_linesHead; p != NULL; p = p->Next() )
   {

-    wxString line = p->Text();
-    line += wxTextFile::GetEOL();
-#if wxUSE_UNICODE
-    wxCharBuffer buf = wxConvLocal.cWX2MB( line );
-    if ( !file.Write( (const char*)buf, strlen( (const char*) buf ) ) )
-#else
-    if ( !file.Write( line.c_str(), line.Len() ) )
-#endif
-    {
-      wxLogError(_("can't write user configuration file."));
-      return FALSE;
-    }
+    filetext << p->Text() << wxTextFile::GetEOL();

   }
 
   }
 

-  bool ret = file.Commit();
-
-#if defined(__WXMAC__)
-  if ( ret )
+  if ( !file.Write(filetext, *m_conv) )

   {
   {

-       FSSpec spec ;
-       
-       wxMacFilename2FSSpec( m_strLocalFile , &spec ) ;
-       FInfo finfo ;
-       if ( FSpGetFInfo( &spec , &finfo ) == noErr )
-       {
-               finfo.fdType = 'TEXT' ;
-               finfo.fdCreator = 'ttxt' ;
-               FSpSetFInfo( &spec , &finfo ) ;
-       }
+    wxLogError(_("can't write user configuration file."));
+    return false;

   }
   }

-#endif // __WXMAC__

 
 

-#ifdef __UNIX__
-  // restore the old umask if we changed it
-  if ( m_umask != -1 )
+  if ( !file.Commit() )

   {
   {

-      (void)umask(umaskOld);
+      wxLogError(_("Failed to update user configuration file."));
+
+      return false;

   }
   }

-#endif // __UNIX__

 
 

-  return ret;
+  ResetDirty();
+
+#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
+  m_fnLocalFile.MacSetTypeAndCreator('TEXT', 'ttxt');
+#endif // __WXMAC__
+
+  return true;

 }
 
 }
 

+#if wxUSE_STREAMS
+
+bool wxFileConfig::Save(wxOutputStream& os, const wxMBConv& conv)
+{
+    // save unconditionally, even if not dirty
+    for ( wxFileConfigLineList *p = m_linesHead; p != NULL; p = p->Next() )
+    {
+        wxString line = p->Text();
+        line += wxTextFile::GetEOL();
+
+        wxCharBuffer buf(line.mb_str(conv));
+        if ( !os.Write(buf, strlen(buf)) )
+        {
+            wxLogError(_("Error saving user configuration data."));
+
+            return false;
+        }
+    }
+
+    ResetDirty();
+
+    return true;
+}
+
+#endif // wxUSE_STREAMS
+

 // ----------------------------------------------------------------------------
 // renaming groups/entries
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // renaming groups/entries
 // ----------------------------------------------------------------------------


@@ -960,24 +1082,29 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 bool wxFileConfig::RenameEntry(const wxString& oldName,
                                const wxString& newName)
 {
 bool wxFileConfig::RenameEntry(const wxString& oldName,
                                const wxString& newName)
 {

+    wxASSERT_MSG( oldName.find(wxCONFIG_PATH_SEPARATOR) == wxString::npos,
+                   wxT("RenameEntry(): paths are not supported") );
+

     // check that the entry exists
     wxFileConfigEntry *oldEntry = m_pCurrentGroup->FindEntry(oldName);
     if ( !oldEntry )
     // check that the entry exists
     wxFileConfigEntry *oldEntry = m_pCurrentGroup->FindEntry(oldName);
     if ( !oldEntry )

-        return FALSE;
+        return false;

 
     // check that the new entry doesn't already exist
     if ( m_pCurrentGroup->FindEntry(newName) )
 
     // check that the new entry doesn't already exist
     if ( m_pCurrentGroup->FindEntry(newName) )

-        return FALSE;
+        return false;

 
     // delete the old entry, create the new one
     wxString value = oldEntry->Value();
     if ( !m_pCurrentGroup->DeleteEntry(oldName) )
 
     // delete the old entry, create the new one
     wxString value = oldEntry->Value();
     if ( !m_pCurrentGroup->DeleteEntry(oldName) )

-        return FALSE;
+        return false;
+
+    SetDirty();

 
     wxFileConfigEntry *newEntry = m_pCurrentGroup->AddEntry(newName);
     newEntry->SetValue(value);
 
 
     wxFileConfigEntry *newEntry = m_pCurrentGroup->AddEntry(newName);
     newEntry->SetValue(value);
 

-    return TRUE;
+    return true;

 }
 
 bool wxFileConfig::RenameGroup(const wxString& oldName,
 }
 
 bool wxFileConfig::RenameGroup(const wxString& oldName,


@@ -986,15 +1113,17 @@ bool wxFileConfig::RenameGroup(const wxString& oldName,
     // check that the group exists
     wxFileConfigGroup *group = m_pCurrentGroup->FindSubgroup(oldName);
     if ( !group )
     // check that the group exists
     wxFileConfigGroup *group = m_pCurrentGroup->FindSubgroup(oldName);
     if ( !group )

-        return FALSE;
+        return false;

 
     // check that the new group doesn't already exist
     if ( m_pCurrentGroup->FindSubgroup(newName) )
 
     // check that the new group doesn't already exist
     if ( m_pCurrentGroup->FindSubgroup(newName) )

-        return FALSE;
+        return false;

 
     group->Rename(newName);
 
 
     group->Rename(newName);
 

-    return TRUE;
+    SetDirty();
+
+    return true;

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


@@ -1006,7 +1135,9 @@ bool wxFileConfig::DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso)
   wxConfigPathChanger path(this, key);
 
   if ( !m_pCurrentGroup->DeleteEntry(path.Name()) )
   wxConfigPathChanger path(this, key);
 
   if ( !m_pCurrentGroup->DeleteEntry(path.Name()) )

-    return FALSE;
+    return false;
+
+  SetDirty();

 
   if ( bGroupIfEmptyAlso && m_pCurrentGroup->IsEmpty() ) {
     if ( m_pCurrentGroup != m_pRootGroup ) {
 
   if ( bGroupIfEmptyAlso && m_pCurrentGroup->IsEmpty() ) {
     if ( m_pCurrentGroup != m_pRootGroup ) {


@@ -1017,101 +1148,188 @@ bool wxFileConfig::DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso)
     //else: never delete the root group
   }
 
     //else: never delete the root group
   }
 

-  return TRUE;
+  return true;

 }
 
 bool wxFileConfig::DeleteGroup(const wxString& key)
 {
 }
 
 bool wxFileConfig::DeleteGroup(const wxString& key)
 {

-  wxConfigPathChanger path(this, key);
+  wxConfigPathChanger path(this, RemoveTrailingSeparator(key));
+
+  if ( !m_pCurrentGroup->DeleteSubgroupByName(path.Name()) )
+      return false;
+
+  path.UpdateIfDeleted();

 
 

-  return m_pCurrentGroup->DeleteSubgroupByName(path.Name());
+  SetDirty();
+
+  return true;

 }
 
 bool wxFileConfig::DeleteAll()
 {
   CleanUp();
 
 }
 
 bool wxFileConfig::DeleteAll()
 {
   CleanUp();
 

-  if ( wxRemove(m_strLocalFile) == -1 )
-    wxLogSysError(_("can't delete user configuration file '%s'"), m_strLocalFile.c_str());
+  if ( m_fnLocalFile.IsOk() )
+  {
+      if ( m_fnLocalFile.FileExists() &&
+           !wxRemoveFile(m_fnLocalFile.GetFullPath()) )
+      {
+          wxLogSysError(_("can't delete user configuration file '%s'"),
+                        m_fnLocalFile.GetFullPath().c_str());
+          return false;
+      }
+  }

 
 

-  m_strLocalFile = m_strGlobalFile = wxT("");

   Init();
 
   Init();
 

-  return TRUE;
+  return true;

 }
 
 // ----------------------------------------------------------------------------
 // linked list functions
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // linked list functions
 // ----------------------------------------------------------------------------
 

-// append a new line to the end of the list
+    // append a new line to the end of the list
+

 wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str)
 {
 wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str)
 {

-  wxFileConfigLineList *pLine = new wxFileConfigLineList(str);
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("    ** Adding Line '%s'"),
+                str.c_str() );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("        head: %s"),
+                ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
+                               : wxEmptyString) );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("        tail: %s"),
+                ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
+                               : wxEmptyString) );
+
+    wxFileConfigLineList *pLine = new wxFileConfigLineList(str);
+
+    if ( m_linesTail == NULL )
+    {
+        // list is empty
+        m_linesHead = pLine;
+    }
+    else
+    {
+        // adjust pointers
+        m_linesTail->SetNext(pLine);
+        pLine->SetPrev(m_linesTail);
+    }

 
 

-  if ( m_linesTail == NULL ) {
-    // list is empty
-    m_linesHead = pLine;
-  }
-  else {
-    // adjust pointers
-    m_linesTail->SetNext(pLine);
-    pLine->SetPrev(m_linesTail);
-  }
+    m_linesTail = pLine;
+
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("        head: %s"),
+                ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
+                               : wxEmptyString) );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("        tail: %s"),
+                ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
+                               : wxEmptyString) );

 
 

-  m_linesTail = pLine;
-  return m_linesTail;
+    return m_linesTail;

 }
 
 // insert a new line after the given one or in the very beginning if !pLine
 wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str,
 }
 
 // insert a new line after the given one or in the very beginning if !pLine
 wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str,

-                                                     wxFileConfigLineList *pLine)
-{
-  if ( pLine == m_linesTail )
-    return LineListAppend(str);
+                                                   wxFileConfigLineList *pLine)
+{
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("    ** Inserting Line '%s' after '%s'"),
+                str.c_str(),
+                ((pLine) ? (const wxChar*)pLine->Text().c_str()
+                         : wxEmptyString) );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("        head: %s"),
+                ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
+                               : wxEmptyString) );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("        tail: %s"),
+                ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
+                               : wxEmptyString) );
+
+    if ( pLine == m_linesTail )
+        return LineListAppend(str);
+
+    wxFileConfigLineList *pNewLine = new wxFileConfigLineList(str);
+    if ( pLine == NULL )
+    {
+        // prepend to the list
+        pNewLine->SetNext(m_linesHead);
+        m_linesHead->SetPrev(pNewLine);
+        m_linesHead = pNewLine;
+    }
+    else
+    {
+        // insert before pLine
+        wxFileConfigLineList *pNext = pLine->Next();
+        pNewLine->SetNext(pNext);
+        pNewLine->SetPrev(pLine);
+        pNext->SetPrev(pNewLine);
+        pLine->SetNext(pNewLine);
+    }

 
 

-  wxFileConfigLineList *pNewLine = new wxFileConfigLineList(str);
-  if ( pLine == NULL ) {
-    // prepend to the list
-    pNewLine->SetNext(m_linesHead);
-    m_linesHead->SetPrev(pNewLine);
-    m_linesHead = pNewLine;
-  }
-  else {
-    // insert before pLine
-    wxFileConfigLineList *pNext = pLine->Next();
-    pNewLine->SetNext(pNext);
-    pNewLine->SetPrev(pLine);
-    pNext->SetPrev(pNewLine);
-    pLine->SetNext(pNewLine);
-  }
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("        head: %s"),
+                ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
+                               : wxEmptyString) );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("        tail: %s"),
+                ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
+                               : wxEmptyString) );

 
 

-  return pNewLine;
+    return pNewLine;

 }
 
 void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine)
 {
 }
 
 void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine)
 {

-  wxFileConfigLineList *pPrev = pLine->Prev(),
-           *pNext = pLine->Next();
-
-  // first entry?
-  if ( pPrev == NULL )
-    m_linesHead = pNext;
-  else
-    pPrev->SetNext(pNext);
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("    ** Removing Line '%s'"),
+                pLine->Text().c_str() );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("        head: %s"),
+                ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
+                               : wxEmptyString) );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("        tail: %s"),
+                ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
+                               : wxEmptyString) );
+
+    wxFileConfigLineList    *pPrev = pLine->Prev(),
+                            *pNext = pLine->Next();
+
+        // first entry?
+
+    if ( pPrev == NULL )
+        m_linesHead = pNext;
+    else
+        pPrev->SetNext(pNext);

 
 

-  // last entry?
-  if ( pNext == NULL )
-    m_linesTail = pPrev;
-  else
-    pNext->SetPrev(pPrev);
+        // last entry?

 
 

-  delete pLine;
+    if ( pNext == NULL )
+        m_linesTail = pPrev;
+    else
+        pNext->SetPrev(pPrev);
+
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("        head: %s"),
+                ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
+                               : wxEmptyString) );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("        tail: %s"),
+                ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
+                               : wxEmptyString) );
+
+    delete pLine;

 }
 
 bool wxFileConfig::LineListIsEmpty()
 {
 }
 
 bool wxFileConfig::LineListIsEmpty()
 {

-  return m_linesHead == NULL;
+    return m_linesHead == NULL;

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -1132,7 +1350,6 @@ wxFileConfigGroup::wxFileConfigGroup(wxFileConfigGroup *pParent,
 {
   m_pConfig = pConfig;
   m_pParent = pParent;
 {
   m_pConfig = pConfig;
   m_pParent = pParent;

-  m_bDirty  = FALSE;

   m_pLine   = NULL;
 
   m_pLastEntry = NULL;
   m_pLine   = NULL;
 
   m_pLastEntry = NULL;


@@ -1143,12 +1360,12 @@ wxFileConfigGroup::wxFileConfigGroup(wxFileConfigGroup *pParent,
 wxFileConfigGroup::~wxFileConfigGroup()
 {
   // entries
 wxFileConfigGroup::~wxFileConfigGroup()
 {
   // entries

-  size_t n, nCount = m_aEntries.Count();
+  size_t n, nCount = m_aEntries.GetCount();

   for ( n = 0; n < nCount; n++ )
     delete m_aEntries[n];
 
   // subgroups
   for ( n = 0; n < nCount; n++ )
     delete m_aEntries[n];
 
   // subgroups

-  nCount = m_aSubgroups.Count();
+  nCount = m_aSubgroups.GetCount();

   for ( n = 0; n < nCount; n++ )
     delete m_aSubgroups[n];
 }
   for ( n = 0; n < nCount; n++ )
     delete m_aSubgroups[n];
 }


@@ -1159,9 +1376,12 @@ wxFileConfigGroup::~wxFileConfigGroup()
 
 void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine)
 {
 
 void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine)
 {

-  wxASSERT( m_pLine == NULL ); // shouldn't be called twice
+    // for a normal (i.e. not root) group this method shouldn't be called twice
+    // unless we are resetting the line
+    wxASSERT_MSG( !m_pParent || !m_pLine || !pLine,
+                   wxT("changing line for a non-root group?") );

 
 

-  m_pLine = pLine;
+    m_pLine = pLine;

 }
 
 /*
 }
 
 /*


@@ -1200,27 +1420,39 @@ void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine)
 // have it or in the very beginning if we're the root group.
 wxFileConfigLineList *wxFileConfigGroup::GetGroupLine()
 {
 // have it or in the very beginning if we're the root group.
 wxFileConfigLineList *wxFileConfigGroup::GetGroupLine()
 {

-  if ( m_pLine == NULL ) {
-    wxFileConfigGroup *pParent = Parent();
-
-    // this group wasn't present in local config file, add it now
-    if ( pParent != NULL ) {
-      wxString strFullName;
-      strFullName << wxT("[")
-                  // +1: no '/'
-                  << FilterOutEntryName(GetFullName().c_str() + 1)
-                  << wxT("]");
-      m_pLine = m_pConfig->LineListInsert(strFullName,
-                                          pParent->GetLastGroupLine());
-      pParent->SetLastGroup(this);  // we're surely after all the others
-    }
-    else {
-      // we return NULL, so that LineListInsert() will insert us in the
-      // very beginning
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("  GetGroupLine() for Group '%s'"),
+                Name().c_str() );
+
+    if ( !m_pLine )
+    {
+        wxLogTrace( FILECONF_TRACE_MASK,
+                    wxT("    Getting Line item pointer") );
+
+        wxFileConfigGroup   *pParent = Parent();
+
+        // this group wasn't present in local config file, add it now
+        if ( pParent )
+        {
+            wxLogTrace( FILECONF_TRACE_MASK,
+                        wxT("    checking parent '%s'"),
+                        pParent->Name().c_str() );
+
+            wxString    strFullName;
+
+            // add 1 to the name because we don't want to start with '/'
+            strFullName << wxT("[")
+                        << FilterOutEntryName(GetFullName().c_str() + 1)
+                        << wxT("]");
+            m_pLine = m_pConfig->LineListInsert(strFullName,
+                                                pParent->GetLastGroupLine());
+            pParent->SetLastGroup(this);  // we're surely after all the others
+        }
+        //else: this is the root group and so we return NULL because we don't
+        //      have any group line

     }
     }

-  }

 
 

-  return m_pLine;
+    return m_pLine;

 }
 
 // Return the last line belonging to the subgroups of this group (after which
 }
 
 // Return the last line belonging to the subgroups of this group (after which


@@ -1228,17 +1460,19 @@ wxFileConfigLineList *wxFileConfigGroup::GetGroupLine()
 // last line is the group line (m_pLine) itself.
 wxFileConfigLineList *wxFileConfigGroup::GetLastGroupLine()
 {
 // last line is the group line (m_pLine) itself.
 wxFileConfigLineList *wxFileConfigGroup::GetLastGroupLine()
 {

-  // if we have any subgroups, our last line is the last line of the last
-  // subgroup
-  if ( m_pLastGroup != NULL ) {
-    wxFileConfigLineList *pLine = m_pLastGroup->GetLastGroupLine();
+    // if we have any subgroups, our last line is the last line of the last
+    // subgroup
+    if ( m_pLastGroup )
+    {
+        wxFileConfigLineList *pLine = m_pLastGroup->GetLastGroupLine();

 
 

-    wxASSERT( pLine != NULL );  // last group must have !NULL associated line
-    return pLine;
-  }
+        wxASSERT_MSG( pLine, wxT("last group must have !NULL associated line") );

 
 

-  // no subgroups, so the last line is the line of thelast entry (if any)
-  return GetLastEntryLine();
+        return pLine;
+    }
+
+    // no subgroups, so the last line is the line of thelast entry (if any)
+    return GetLastEntryLine();

 }
 
 // return the last line belonging to the entries of this group (after which
 }
 
 // return the last line belonging to the entries of this group (after which


@@ -1246,39 +1480,87 @@ wxFileConfigLineList *wxFileConfigGroup::GetLastGroupLine()
 // one immediately after the group line itself.
 wxFileConfigLineList *wxFileConfigGroup::GetLastEntryLine()
 {
 // one immediately after the group line itself.
 wxFileConfigLineList *wxFileConfigGroup::GetLastEntryLine()
 {

-  if ( m_pLastEntry != NULL ) {
-    wxFileConfigLineList *pLine = m_pLastEntry->GetLine();
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("  GetLastEntryLine() for Group '%s'"),
+                Name().c_str() );

 
 

-    wxASSERT( pLine != NULL );  // last entry must have !NULL associated line
-    return pLine;
-  }
+    if ( m_pLastEntry )
+    {
+        wxFileConfigLineList    *pLine = m_pLastEntry->GetLine();
+
+        wxASSERT_MSG( pLine, wxT("last entry must have !NULL associated line") );

 
 

-  // no entries: insert after the group header
-  return GetGroupLine();
+        return pLine;
+    }
+
+    // no entries: insert after the group header, if any
+    return GetGroupLine();
+}
+
+void wxFileConfigGroup::SetLastEntry(wxFileConfigEntry *pEntry)
+{
+    m_pLastEntry = pEntry;
+
+    if ( !m_pLine )
+    {
+        // the only situation in which a group without its own line can have
+        // an entry is when the first entry is added to the initially empty
+        // root pseudo-group
+        wxASSERT_MSG( !m_pParent, wxT("unexpected for non root group") );
+
+        // let the group know that it does have a line in the file now
+        m_pLine = pEntry->GetLine();
+    }

 }
 
 // ----------------------------------------------------------------------------
 // group name
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // group name
 // ----------------------------------------------------------------------------
 

+void wxFileConfigGroup::UpdateGroupAndSubgroupsLines()
+{
+    // update the line of this group
+    wxFileConfigLineList *line = GetGroupLine();
+    wxCHECK_RET( line, wxT("a non root group must have a corresponding line!") );
+
+    // +1: skip the leading '/'
+    line->SetText(wxString::Format(wxT("[%s]"), GetFullName().c_str() + 1));
+
+
+    // also update all subgroups as they have this groups name in their lines
+    const size_t nCount = m_aSubgroups.GetCount();
+    for ( size_t n = 0; n < nCount; n++ )
+    {
+        m_aSubgroups[n]->UpdateGroupAndSubgroupsLines();
+    }
+}
+

 void wxFileConfigGroup::Rename(const wxString& newName)
 {
 void wxFileConfigGroup::Rename(const wxString& newName)
 {

+    wxCHECK_RET( m_pParent, wxT("the root group can't be renamed") );
+
+    if ( newName == m_strName )
+        return;
+
+    // we need to remove the group from the parent and it back under the new
+    // name to keep the parents array of subgroups alphabetically sorted
+    m_pParent->m_aSubgroups.Remove(this);
+

     m_strName = newName;
 
     m_strName = newName;
 

-    wxFileConfigLineList *line = GetGroupLine();
-    wxString strFullName;
-    strFullName << wxT("[") << (GetFullName().c_str() + 1) << wxT("]"); // +1: no '/'
-    line->SetText(strFullName);
+    m_pParent->m_aSubgroups.Add(this);

 
 

-    SetDirty();
+    // update the group lines recursively
+    UpdateGroupAndSubgroupsLines();

 }
 
 wxString wxFileConfigGroup::GetFullName() const
 {
 }
 
 wxString wxFileConfigGroup::GetFullName() const
 {

-  if ( Parent() )
-    return Parent()->GetFullName() + wxCONFIG_PATH_SEPARATOR + Name();
-  else
-    return wxT("");
+    wxString fullname;
+    if ( Parent() )
+        fullname = Parent()->GetFullName() + wxCONFIG_PATH_SEPARATOR + Name();
+
+    return fullname;

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


@@ -1287,11 +1569,11 @@ wxString wxFileConfigGroup::GetFullName() const
 
 // use binary search because the array is sorted
 wxFileConfigEntry *
 
 // use binary search because the array is sorted
 wxFileConfigEntry *

-wxFileConfigGroup::FindEntry(const wxChar *szName) const
+wxFileConfigGroup::FindEntry(const wxString& name) const

 {
   size_t i,
        lo = 0,
 {
   size_t i,
        lo = 0,

-       hi = m_aEntries.Count();
+       hi = m_aEntries.GetCount();

   int res;
   wxFileConfigEntry *pEntry;
 
   int res;
   wxFileConfigEntry *pEntry;
 


@@ -1300,9 +1582,9 @@ wxFileConfigGroup::FindEntry(const wxChar *szName) const
     pEntry = m_aEntries[i];
 
     #if wxCONFIG_CASE_SENSITIVE
     pEntry = m_aEntries[i];
 
     #if wxCONFIG_CASE_SENSITIVE

-      res = wxStrcmp(pEntry->Name(), szName);
+      res = pEntry->Name().compare(name);

     #else
     #else

-      res = wxStricmp(pEntry->Name(), szName);
+      res = pEntry->Name().CmpNoCase(name);

     #endif
 
     if ( res > 0 )
     #endif
 
     if ( res > 0 )


@@ -1317,11 +1599,11 @@ wxFileConfigGroup::FindEntry(const wxChar *szName) const
 }
 
 wxFileConfigGroup *
 }
 
 wxFileConfigGroup *

-wxFileConfigGroup::FindSubgroup(const wxChar *szName) const
+wxFileConfigGroup::FindSubgroup(const wxString& name) const

 {
   size_t i,
        lo = 0,
 {
   size_t i,
        lo = 0,

-       hi = m_aSubgroups.Count();
+       hi = m_aSubgroups.GetCount();

   int res;
   wxFileConfigGroup *pGroup;
 
   int res;
   wxFileConfigGroup *pGroup;
 


@@ -1330,9 +1612,9 @@ wxFileConfigGroup::FindSubgroup(const wxChar *szName) const
     pGroup = m_aSubgroups[i];
 
     #if wxCONFIG_CASE_SENSITIVE
     pGroup = m_aSubgroups[i];
 
     #if wxCONFIG_CASE_SENSITIVE

-      res = wxStrcmp(pGroup->Name(), szName);
+      res = pGroup->Name().compare(name);

     #else
     #else

-      res = wxStricmp(pGroup->Name(), szName);
+      res = pGroup->Name().CmpNoCase(name);

     #endif
 
     if ( res > 0 )
     #endif
 
     if ( res > 0 )


@@ -1351,27 +1633,25 @@ wxFileConfigGroup::FindSubgroup(const wxChar *szName) const
 // ----------------------------------------------------------------------------
 
 // create a new entry and add it to the current group
 // ----------------------------------------------------------------------------
 
 // create a new entry and add it to the current group

-wxFileConfigEntry *
-wxFileConfigGroup::AddEntry(const wxString& strName, int nLine)
+wxFileConfigEntry *wxFileConfigGroup::AddEntry(const wxString& strName, int nLine)

 {
 {

-  wxASSERT( FindEntry(strName) == NULL );
+    wxASSERT( FindEntry(strName) == 0 );

 
 

-  wxFileConfigEntry *pEntry = new wxFileConfigEntry(this, strName, nLine);
-  m_aEntries.Add(pEntry);
+    wxFileConfigEntry   *pEntry = new wxFileConfigEntry(this, strName, nLine);

 
 

-  return pEntry;
+    m_aEntries.Add(pEntry);
+    return pEntry;

 }
 
 // create a new group and add it to the current group
 }
 
 // create a new group and add it to the current group

-wxFileConfigGroup *
-wxFileConfigGroup::AddSubgroup(const wxString& strName)
+wxFileConfigGroup *wxFileConfigGroup::AddSubgroup(const wxString& strName)

 {
 {

-  wxASSERT( FindSubgroup(strName) == NULL );
+    wxASSERT( FindSubgroup(strName) == 0 );

 
 

-  wxFileConfigGroup *pGroup = new wxFileConfigGroup(this, strName, m_pConfig);
-  m_aSubgroups.Add(pGroup);
+    wxFileConfigGroup   *pGroup = new wxFileConfigGroup(this, strName, m_pConfig);

 
 

-  return pGroup;
+    m_aSubgroups.Add(pGroup);
+    return pGroup;

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


@@ -1385,82 +1665,135 @@ wxFileConfigGroup::AddSubgroup(const wxString& strName)
   delete several of them.
  */
 
   delete several of them.
  */
 

-bool wxFileConfigGroup::DeleteSubgroupByName(const wxChar *szName)
+bool wxFileConfigGroup::DeleteSubgroupByName(const wxString& name)

 {
 {

-  return DeleteSubgroup(FindSubgroup(szName));
+    wxFileConfigGroup * const pGroup = FindSubgroup(name);
+
+    return pGroup ? DeleteSubgroup(pGroup) : false;

 }
 
 }
 

-// doesn't delete the subgroup itself, but does remove references to it from
-// all other data structures (and normally the returned pointer should be
-// deleted a.s.a.p. because there is nothing much to be done with it anyhow)
+// Delete the subgroup and remove all references to it from
+// other data structures.

 bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
 {
 bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
 {

-  wxCHECK( pGroup != NULL, FALSE ); // deleting non existing group?
+    wxCHECK_MSG( pGroup, false, wxT("deleting non existing group?") );

 
 

-  // delete all entries
-  size_t nCount = pGroup->m_aEntries.Count();
-  for ( size_t nEntry = 0; nEntry < nCount; nEntry++ ) {
-    wxFileConfigLineList *pLine = pGroup->m_aEntries[nEntry]->GetLine();
-    if ( pLine != NULL )
-      m_pConfig->LineListRemove(pLine);
-  }
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("Deleting group '%s' from '%s'"),
+                pGroup->Name().c_str(),
+                Name().c_str() );

 
 

-  // and subgroups of this sungroup
-  nCount = pGroup->m_aSubgroups.Count();
-  for ( size_t nGroup = 0; nGroup < nCount; nGroup++ ) {
-    pGroup->DeleteSubgroup(pGroup->m_aSubgroups[0]);
-  }
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("  (m_pLine) = prev: %p, this %p, next %p"),
+                m_pLine ? static_cast<void*>(m_pLine->Prev()) : 0,
+                static_cast<void*>(m_pLine),
+                m_pLine ? static_cast<void*>(m_pLine->Next()) : 0 );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("  text: '%s'"),
+                m_pLine ? (const wxChar*)m_pLine->Text().c_str()
+                        : wxEmptyString );

 
 

-  wxFileConfigLineList *pLine = pGroup->m_pLine;
-  if ( pLine != NULL ) {
-    // notice that we may do this test inside the previous "if" because the
-    // last entry's line is surely !NULL
-    if ( pGroup == m_pLastGroup ) {
-      // our last entry is being deleted - find the last one which stays
-      wxASSERT( m_pLine != NULL );  // we have a subgroup with !NULL pLine...
-
-      // go back until we find a subgroup or reach the group's line
-      wxFileConfigGroup *pNewLast = NULL;
-      size_t n, nSubgroups = m_aSubgroups.Count();
-      wxFileConfigLineList *pl;
-      for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) {
-        // is it our subgroup?
-        for ( n = 0; (pNewLast == NULL) && (n < nSubgroups); n++ ) {
-          // do _not_ call GetGroupLine! we don't want to add it to the local
-          // file if it's not already there
-          if ( m_aSubgroups[n]->m_pLine == m_pLine )
-            pNewLast = m_aSubgroups[n];
+    // delete all entries...
+    size_t nCount = pGroup->m_aEntries.GetCount();
+
+    wxLogTrace(FILECONF_TRACE_MASK,
+               wxT("Removing %lu entries"), (unsigned long)nCount );
+
+    for ( size_t nEntry = 0; nEntry < nCount; nEntry++ )
+    {
+        wxFileConfigLineList *pLine = pGroup->m_aEntries[nEntry]->GetLine();
+
+        if ( pLine )
+        {
+            wxLogTrace( FILECONF_TRACE_MASK,
+                        wxT("    '%s'"),
+                        pLine->Text().c_str() );
+            m_pConfig->LineListRemove(pLine);

         }
         }

+    }

 
 

-        if ( pNewLast != NULL ) // found?
-          break;
-      }
+    // ...and subgroups of this subgroup
+    nCount = pGroup->m_aSubgroups.GetCount();

 
 

-      if ( pl == m_pLine ) {
-        wxASSERT( !pNewLast );  // how comes it has the same line as we?
+    wxLogTrace( FILECONF_TRACE_MASK,
+                wxT("Removing %lu subgroups"), (unsigned long)nCount );

 
 

-        // we've reached the group line without finding any subgroups
-        m_pLastGroup = NULL;
-      }
-      else
-        m_pLastGroup = pNewLast;
+    for ( size_t nGroup = 0; nGroup < nCount; nGroup++ )
+    {
+        pGroup->DeleteSubgroup(pGroup->m_aSubgroups[0]);

     }
 
     }
 

-    m_pConfig->LineListRemove(pLine);
-  }
+    // and then finally the group itself
+    wxFileConfigLineList *pLine = pGroup->m_pLine;
+    if ( pLine )
+    {
+        wxLogTrace( FILECONF_TRACE_MASK,
+                    wxT("  Removing line for group '%s' : '%s'"),
+                    pGroup->Name().c_str(),
+                    pLine->Text().c_str() );
+        wxLogTrace( FILECONF_TRACE_MASK,
+                    wxT("  Removing from group '%s' : '%s'"),
+                    Name().c_str(),
+                    ((m_pLine) ? (const wxChar*)m_pLine->Text().c_str()
+                               : wxEmptyString) );
+
+        // notice that we may do this test inside the previous "if"
+        // because the last entry's line is surely !NULL
+        if ( pGroup == m_pLastGroup )
+        {
+            wxLogTrace( FILECONF_TRACE_MASK,
+                        wxT("  Removing last group") );
+
+            // our last entry is being deleted, so find the last one which
+            // stays by going back until we find a subgroup or reach the
+            // group line
+            const size_t nSubgroups = m_aSubgroups.GetCount();
+
+            m_pLastGroup = NULL;
+            for ( wxFileConfigLineList *pl = pLine->Prev();
+                  pl && !m_pLastGroup;
+                  pl = pl->Prev() )
+            {
+                // does this line belong to our subgroup?
+                for ( size_t n = 0; n < nSubgroups; n++ )
+                {
+                    // do _not_ call GetGroupLine! we don't want to add it to
+                    // the local file if it's not already there
+                    if ( m_aSubgroups[n]->m_pLine == pl )
+                    {
+                        m_pLastGroup = m_aSubgroups[n];
+                        break;
+                    }
+                }
+
+                if ( pl == m_pLine )
+                    break;
+            }
+        }

 
 

-  SetDirty();
+        m_pConfig->LineListRemove(pLine);
+    }
+    else
+    {
+        wxLogTrace( FILECONF_TRACE_MASK,
+                    wxT("  No line entry for Group '%s'?"),
+                    pGroup->Name().c_str() );
+    }

 
 

-  m_aSubgroups.Remove(pGroup);
-  delete pGroup;
+    m_aSubgroups.Remove(pGroup);
+    delete pGroup;

 
 

-  return TRUE;
+    return true;

 }
 
 }
 

-bool wxFileConfigGroup::DeleteEntry(const wxChar *szName)
+bool wxFileConfigGroup::DeleteEntry(const wxString& name)

 {
 {

-  wxFileConfigEntry *pEntry = FindEntry(szName);
-  wxCHECK( pEntry != NULL, FALSE );  // deleting non existing item?
+  wxFileConfigEntry *pEntry = FindEntry(name);
+  if ( !pEntry )
+  {
+      // entry doesn't exist, nothing to do
+      return false;
+  }

 
   wxFileConfigLineList *pLine = pEntry->GetLine();
   if ( pLine != NULL ) {
 
   wxFileConfigLineList *pLine = pEntry->GetLine();
   if ( pLine != NULL ) {


@@ -1470,51 +1803,35 @@ bool wxFileConfigGroup::DeleteEntry(const wxChar *szName)
       // our last entry is being deleted - find the last one which stays
       wxASSERT( m_pLine != NULL );  // if we have an entry with !NULL pLine...
 
       // our last entry is being deleted - find the last one which stays
       wxASSERT( m_pLine != NULL );  // if we have an entry with !NULL pLine...
 

-      // go back until we find another entry or reach the group's line
+      // find the previous entry (if any)

       wxFileConfigEntry *pNewLast = NULL;
       wxFileConfigEntry *pNewLast = NULL;

-      size_t n, nEntries = m_aEntries.Count();
-      wxFileConfigLineList *pl;
-      for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) {
-        // is it our subgroup?
-        for ( n = 0; (pNewLast == NULL) && (n < nEntries); n++ ) {
-          if ( m_aEntries[n]->GetLine() == m_pLine )
-            pNewLast = m_aEntries[n];
-        }
-
-        if ( pNewLast != NULL ) // found?
+      const wxFileConfigLineList * const
+        pNewLastLine = m_pLastEntry->GetLine()->Prev();
+      const size_t nEntries = m_aEntries.GetCount();
+      for ( size_t n = 0; n < nEntries; n++ ) {
+        if ( m_aEntries[n]->GetLine() == pNewLastLine ) {
+          pNewLast = m_aEntries[n];

           break;
           break;

+        }

       }
 
       }
 

-      if ( pl == m_pLine ) {
-        wxASSERT( !pNewLast );  // how comes it has the same line as we?
+      // pNewLast can be NULL here -- it's ok and can happen if we have no
+      // entries left
+      m_pLastEntry = pNewLast;

 
 

-        // we've reached the group line without finding any subgroups
-        m_pLastEntry = NULL;
-      }
-      else
-        m_pLastEntry = pNewLast;
+      // For the root group only, we could be removing the first group line
+      // here, so update m_pLine to avoid keeping a dangling pointer.
+      if ( pLine == m_pLine )
+          SetLine(NULL);

     }
 
     m_pConfig->LineListRemove(pLine);
   }
 
     }
 
     m_pConfig->LineListRemove(pLine);
   }
 

-  // we must be written back for the changes to be saved
-  SetDirty();
-

   m_aEntries.Remove(pEntry);
   delete pEntry;
 
   m_aEntries.Remove(pEntry);
   delete pEntry;
 

-  return TRUE;
-}
-
-// ----------------------------------------------------------------------------
-//
-// ----------------------------------------------------------------------------
-void wxFileConfigGroup::SetDirty()
-{
-  m_bDirty = TRUE;
-  if ( Parent() != NULL )             // propagate upwards
-    Parent()->SetDirty();
+  return true;

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -1529,14 +1846,13 @@ wxFileConfigEntry::wxFileConfigEntry(wxFileConfigGroup *pParent,
                                        int nLine)
                          : m_strName(strName)
 {
                                        int nLine)
                          : m_strName(strName)
 {

-  wxASSERT( !strName.IsEmpty() );
+  wxASSERT( !strName.empty() );

 
   m_pParent = pParent;
   m_nLine   = nLine;
   m_pLine   = NULL;
 
 
   m_pParent = pParent;
   m_nLine   = nLine;
   m_pLine   = NULL;
 

-  m_bDirty =
-  m_bHasValue = FALSE;
+  m_bHasValue = false;

 
   m_bImmutable = strName[0] == wxCONFIG_IMMUTABLE_PREFIX;
   if ( m_bImmutable )
 
   m_bImmutable = strName[0] == wxCONFIG_IMMUTABLE_PREFIX;
   if ( m_bImmutable )


@@ -1558,50 +1874,57 @@ void wxFileConfigEntry::SetLine(wxFileConfigLineList *pLine)
   Group()->SetLastEntry(this);
 }
 
   Group()->SetLastEntry(this);
 }
 

-// second parameter is FALSE if we read the value from file and prevents the
+// second parameter is false if we read the value from file and prevents the

 // entry from being marked as 'dirty'
 void wxFileConfigEntry::SetValue(const wxString& strValue, bool bUser)
 {
 // entry from being marked as 'dirty'
 void wxFileConfigEntry::SetValue(const wxString& strValue, bool bUser)
 {

-  if ( bUser && IsImmutable() ) {
-    wxLogWarning(_("attempt to change immutable key '%s' ignored."),
-                 Name().c_str());
-    return;
-  }
-
-  // do nothing if it's the same value: but don't test for it if m_bHasValue
-  // hadn't been set yet or we'd never write empty values to the file
-  if ( m_bHasValue && strValue == m_strValue )
-    return;
+    if ( bUser && IsImmutable() )
+    {
+        wxLogWarning( _("attempt to change immutable key '%s' ignored."),
+                      Name().c_str());
+        return;
+    }

 
 

-  m_bHasValue = TRUE;
-  m_strValue = strValue;
+    // do nothing if it's the same value: but don't test for it if m_bHasValue
+    // hadn't been set yet or we'd never write empty values to the file
+    if ( m_bHasValue && strValue == m_strValue )
+        return;

 
 

-  if ( bUser ) {
-    wxString strVal = FilterOutValue(strValue);
-    wxString strLine;
-    strLine << FilterOutEntryName(m_strName) << wxT('=') << strVal;
+    m_bHasValue = true;
+    m_strValue = strValue;

 
 

-    if ( m_pLine != NULL ) {
-      // entry was read from the local config file, just modify the line
-      m_pLine->SetText(strLine);
-    }
-    else {
-      // add a new line to the file
-      wxASSERT( m_nLine == wxNOT_FOUND );   // consistency check
+    if ( bUser )
+    {
+        wxString strValFiltered;

 
 

-      m_pLine = Group()->Config()->LineListInsert(strLine,
-                                                  Group()->GetLastEntryLine());
-      Group()->SetLastEntry(this);
-    }
+        if ( Group()->Config()->GetStyle() & wxCONFIG_USE_NO_ESCAPE_CHARACTERS )
+        {
+            strValFiltered = strValue;
+        }
+        else {
+            strValFiltered = FilterOutValue(strValue);
+        }

 
 

-    SetDirty();
-  }
-}
+        wxString    strLine;
+        strLine << FilterOutEntryName(m_strName) << wxT('=') << strValFiltered;

 
 

-void wxFileConfigEntry::SetDirty()
-{
-  m_bDirty = TRUE;
-  Group()->SetDirty();
+        if ( m_pLine )
+        {
+            // entry was read from the local config file, just modify the line
+            m_pLine->SetText(strLine);
+        }
+        else // this entry didn't exist in the local file
+        {
+            // add a new line to the file: note that line returned by
+            // GetLastEntryLine() may be NULL if we're in the root group and it
+            // doesn't have any entries yet, but this is ok as passing NULL
+            // line to LineListInsert() means to prepend new line to the list
+            wxFileConfigLineList *line = Group()->GetLastEntryLine();
+            m_pLine = Group()->Config()->LineListInsert(strLine, line);
+
+            Group()->SetLastEntry(this);
+        }
+    }

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -1614,20 +1937,20 @@ void wxFileConfigEntry::SetDirty()
 
 int CompareEntries(wxFileConfigEntry *p1, wxFileConfigEntry *p2)
 {
 
 int CompareEntries(wxFileConfigEntry *p1, wxFileConfigEntry *p2)
 {

-  #if wxCONFIG_CASE_SENSITIVE
-    return wxStrcmp(p1->Name(), p2->Name());
-  #else
-    return wxStricmp(p1->Name(), p2->Name());
-  #endif
+#if wxCONFIG_CASE_SENSITIVE
+    return p1->Name().compare(p2->Name());
+#else
+    return p1->Name().CmpNoCase(p2->Name());
+#endif

 }
 
 int CompareGroups(wxFileConfigGroup *p1, wxFileConfigGroup *p2)
 {
 }
 
 int CompareGroups(wxFileConfigGroup *p1, wxFileConfigGroup *p2)
 {

-  #if wxCONFIG_CASE_SENSITIVE
-    return wxStrcmp(p1->Name(), p2->Name());
-  #else
-    return wxStricmp(p1->Name(), p2->Name());
-  #endif
+#if wxCONFIG_CASE_SENSITIVE
+    return p1->Name().compare(p2->Name());
+#else
+    return p1->Name().CmpNoCase(p2->Name());
+#endif

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


@@ -1637,47 +1960,66 @@ int CompareGroups(wxFileConfigGroup *p1, wxFileConfigGroup *p2)
 // undo FilterOutValue
 static wxString FilterInValue(const wxString& str)
 {
 // undo FilterOutValue
 static wxString FilterInValue(const wxString& str)
 {

-  wxString strResult;
-  strResult.Alloc(str.Len());
+    wxString strResult;
+    if ( str.empty() )
+        return strResult;

 
 

-  bool bQuoted = !str.IsEmpty() && str[0] == '"';
+    strResult.reserve(str.length());

 
 

-  for ( size_t n = bQuoted ? 1 : 0; n < str.Len(); n++ ) {
-    if ( str[n] == wxT('\\') ) {
-      switch ( str[++n] ) {
-        case wxT('n'):
-          strResult += wxT('\n');
-          break;
+    wxString::const_iterator i = str.begin();
+    const bool bQuoted = *i == '"';
+    if ( bQuoted )
+        ++i;

 
 

-        case wxT('r'):
-          strResult += wxT('\r');
-          break;
-
-        case wxT('t'):
-          strResult += wxT('\t');
-          break;
-
-        case wxT('\\'):
-          strResult += wxT('\\');
-          break;
-
-        case wxT('"'):
-          strResult += wxT('"');
-          break;
-      }
-    }
-    else {
-      if ( str[n] != wxT('"') || !bQuoted )
-        strResult += str[n];
-      else if ( n != str.Len() - 1 ) {
-        wxLogWarning(_("unexpected \" at position %d in '%s'."),
-                     n, str.c_str());
-      }
-      //else: it's the last quote of a quoted string, ok
+    for ( const wxString::const_iterator end = str.end(); i != end; ++i )
+    {
+        if ( *i == wxT('\\') )
+        {
+            if ( ++i == end )
+            {
+                wxLogWarning(_("trailing backslash ignored in '%s'"), str.c_str());
+                break;
+            }
+
+            switch ( (*i).GetValue() )
+            {
+                case wxT('n'):
+                    strResult += wxT('\n');
+                    break;
+
+                case wxT('r'):
+                    strResult += wxT('\r');
+                    break;
+
+                case wxT('t'):
+                    strResult += wxT('\t');
+                    break;
+
+                case wxT('\\'):
+                    strResult += wxT('\\');
+                    break;
+
+                case wxT('"'):
+                    strResult += wxT('"');
+                    break;
+            }
+        }
+        else // not a backslash
+        {
+            if ( *i != wxT('"') || !bQuoted )
+            {
+                strResult += *i;
+            }
+            else if ( i != end - 1 )
+            {
+                wxLogWarning(_("unexpected \" at position %d in '%s'."),
+                             i - str.begin(), str.c_str());
+            }
+            //else: it's the last quote of a quoted string, ok
+        }

     }
     }

-  }

 
 

-  return strResult;
+    return strResult;

 }
 
 // quote the string before writing it to file
 }
 
 // quote the string before writing it to file


@@ -1697,7 +2039,7 @@ static wxString FilterOutValue(const wxString& str)
 
   wxChar c;
   for ( size_t n = 0; n < str.Len(); n++ ) {
 
   wxChar c;
   for ( size_t n = 0; n < str.Len(); n++ ) {

-    switch ( str[n] ) {
+    switch ( str[n].GetValue() ) {

       case wxT('\n'):
         c = wxT('n');
         break;
       case wxT('\n'):
         c = wxT('n');
         break;


@@ -1743,8 +2085,11 @@ static wxString FilterInEntryName(const wxString& str)
   strResult.Alloc(str.Len());
 
   for ( const wxChar *pc = str.c_str(); *pc != '\0'; pc++ ) {
   strResult.Alloc(str.Len());
 
   for ( const wxChar *pc = str.c_str(); *pc != '\0'; pc++ ) {

-    if ( *pc == wxT('\\') )
-      pc++;
+    if ( *pc == wxT('\\') ) {
+      // we need to test it here or we'd skip past the NUL in the loop line
+      if ( *++pc == wxT('\0') )
+        break;
+    }

 
     strResult += *pc;
   }
 
     strResult += *pc;
   }


@@ -1759,14 +2104,22 @@ static wxString FilterOutEntryName(const wxString& str)
   strResult.Alloc(str.Len());
 
   for ( const wxChar *pc = str.c_str(); *pc != wxT('\0'); pc++ ) {
   strResult.Alloc(str.Len());
 
   for ( const wxChar *pc = str.c_str(); *pc != wxT('\0'); pc++ ) {

-    wxChar c = *pc;
+    const wxChar c = *pc;

 
     // we explicitly allow some of "safe" chars and 8bit ASCII characters
 
     // we explicitly allow some of "safe" chars and 8bit ASCII characters

-    // which will probably never have special meaning
+    // which will probably never have special meaning and with which we can't
+    // use isalnum() anyhow (in ASCII built, in Unicode it's just fine)
+    //

     // NB: note that wxCONFIG_IMMUTABLE_PREFIX and wxCONFIG_PATH_SEPARATOR
     //     should *not* be quoted
     // NB: note that wxCONFIG_IMMUTABLE_PREFIX and wxCONFIG_PATH_SEPARATOR
     //     should *not* be quoted

-    if ( !wxIsalnum(c) && !wxStrchr(wxT("@_/-!.*%"), c) && ((c & 0x80) == 0) )
+    if (
+#if !wxUSE_UNICODE
+            ((unsigned char)c < 127) &&
+#endif // ANSI
+         !wxIsalnum(c) && !wxStrchr(wxT("@_/-!.*%()"), c) )
+    {

       strResult += wxT('\\');
       strResult += wxT('\\');

+    }

 
     strResult += c;
   }
 
     strResult += c;
   }


@@ -1785,4 +2138,3 @@ static wxString GetAppName(const wxString& appName)
 }
 
 #endif // wxUSE_CONFIG
 }
 
 #endif // wxUSE_CONFIG

-