wxTLW::SetLeft/RightMenu of smart phones documented.

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

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 0b884e942f863fa81c4968743d7508f453110586..6215e1fe374fe64873da631475003bb2e88e6051 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -7,10 +7,10 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Karsten Ballüder   &  Vadim Zeitlin
 //                       Ballueder@usa.net     <zeitlin@dptmaths.ens-cachan.fr>
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Karsten Ballüder   &  Vadim Zeitlin
 //                       Ballueder@usa.net     <zeitlin@dptmaths.ens-cachan.fr>

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

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "fileconf.h"
 #endif
 
 #pragma implementation "fileconf.h"
 #endif
 


@@ -24,7 +24,7 @@
   #pragma hdrstop
 #endif  //__BORLANDC__
 
   #pragma hdrstop
 #endif  //__BORLANDC__
 

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

 
 #ifndef   WX_PRECOMP
   #include  "wx/string.h"
 
 #ifndef   WX_PRECOMP
   #include  "wx/string.h"


@@ -106,8 +106,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


@@ -178,7 +185,7 @@ 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 SetValue(const wxString& strValue, bool bUser = true);

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


@@ -197,7 +204,7 @@ 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
+  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)


@@ -226,7 +233,7 @@ public:
   wxFileConfigGroup *FindSubgroup(const wxChar *szName) const;
   wxFileConfigEntry *FindEntry   (const wxChar *szName) const;
 
   wxFileConfigGroup *FindSubgroup(const wxChar *szName) const;
   wxFileConfigEntry *FindEntry   (const wxChar *szName) const;
 

-  // delete entry/subgroup, return FALSE if doesn't exist
+  // delete entry/subgroup, return false if doesn't exist

   bool DeleteSubgroupByName(const wxChar *szName);
   bool DeleteEntry(const wxChar *szName);
 
   bool DeleteSubgroupByName(const wxChar *szName);
   bool DeleteEntry(const wxChar *szName);
 


@@ -250,10 +257,11 @@ public:
   wxFileConfigLineList *GetLastGroupLine(); // after which the next group starts
 
   // called by entries/subgroups when they're created/deleted
   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; }

 
 

-    DECLARE_NO_COPY_CLASS(wxFileConfigGroup)
+  DECLARE_NO_COPY_CLASS(wxFileConfigGroup)

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


@@ -285,7 +293,7 @@ wxString wxFileConfig::GetGlobalDir()
         strDir.Printf(wxT("%c:\\OS2\\"), 'A'+drive-1);
     }
 #elif defined(__WXSTUBS__)
         strDir.Printf(wxT("%c:\\OS2\\"), 'A'+drive-1);
     }
 #elif defined(__WXSTUBS__)

-    wxASSERT_MSG( FALSE, wxT("TODO") ) ;
+    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?)
 #elif defined(__DOS__)
     // There's no such thing as global cfg dir in MS-DOS, let's return
     // current directory (FIXME_MGL?)


@@ -331,7 +339,7 @@ wxString wxFileConfig::GetGlobalFileName(const wxChar *szFile)
 
     if ( wxStrchr(szFile, wxT('.')) == NULL )
 #if defined( __WXMAC__ )
 
     if ( wxStrchr(szFile, wxT('.')) == NULL )
 #if defined( __WXMAC__ )

-        str << " Preferences";
+        str << wxT(" Preferences") ;

 #elif defined( __UNIX__ )
         str << wxT(".conf");
 #else   // Windows
 #elif defined( __UNIX__ )
         str << wxT(".conf");
 #else   // Windows


@@ -364,7 +372,7 @@ wxString wxFileConfig::GetLocalFileName(const wxChar *szFile)
 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

-    str << " Preferences";
+    str << wxT(" Preferences") ;

 #endif
 
     return str;
 #endif
 
     return str;


@@ -389,13 +397,9 @@ void wxFileConfig::Init()
     {
         wxTextFile fileGlobal(m_strGlobalFile);
 
     {
         wxTextFile fileGlobal(m_strGlobalFile);
 

-#if defined(__WXGTK20__) && wxUSE_UNICODE
-        if ( fileGlobal.Open( wxConvUTF8 ) )
-#else
-        if ( fileGlobal.Open() )
-#endif
+        if ( fileGlobal.Open(m_conv/*ignored in ANSI build*/) )

         {
         {

-            Parse(fileGlobal, FALSE /* global */);
+            Parse(fileGlobal, false /* global */);

             SetRootPath();
         }
         else
             SetRootPath();
         }
         else


@@ -408,13 +412,9 @@ void wxFileConfig::Init()
     if ( !m_strLocalFile.IsEmpty() && wxFile::Exists(m_strLocalFile) )
     {
         wxTextFile fileLocal(m_strLocalFile);
     if ( !m_strLocalFile.IsEmpty() && wxFile::Exists(m_strLocalFile) )
     {
         wxTextFile fileLocal(m_strLocalFile);

-#if defined(__WXGTK20__) && wxUSE_UNICODE
-        if ( fileLocal.Open( wxConvUTF8 ) )
-#else
-        if ( fileLocal.Open() )
-#endif
+        if ( fileLocal.Open(m_conv/*ignored in ANSI build*/) )

         {
         {

-            Parse(fileLocal, TRUE /* local */);
+            Parse(fileLocal, true /* local */);

             SetRootPath();
         }
         else
             SetRootPath();
         }
         else


@@ -427,11 +427,12 @@ void wxFileConfig::Init()
 // 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, wxMBConv& conv)

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

-              m_strLocalFile(strLocal), m_strGlobalFile(strGlobal)
+              m_strLocalFile(strLocal), m_strGlobalFile(strGlobal),
+              m_conv(conv)

 {
     // Make up names for files if empty
     if ( m_strLocalFile.IsEmpty() && (style & wxCONFIG_USE_LOCAL_FILE) )
 {
     // Make up names for files if empty
     if ( m_strLocalFile.IsEmpty() && (style & wxCONFIG_USE_LOCAL_FILE) )


@@ -474,7 +475,8 @@ wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

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

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


@@ -492,10 +494,21 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream)
         wxString strTmp;
 
         char buf[1024];
         wxString strTmp;
 
         char buf[1024];

-        while ( !inStream.Read(buf, WXSIZEOF(buf)).Eof() )
-            strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
+        do
+        {
+            inStream.Read(buf, WXSIZEOF(buf));

 
 

-        strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
+            const wxStreamError err = inStream.GetLastError();
+
+            if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF )
+            {
+                wxLogError(_("Error reading config options."));
+                break;
+            }
+
+            strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
+        }
+        while ( !inStream.Eof() );

 
         strTrans = wxTextBuffer::Translate(strTmp);
     }
 
         strTrans = wxTextBuffer::Translate(strTmp);
     }


@@ -527,7 +540,7 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream)
     memText.AddLine(strTrans);
 
     // Finally we can parse it all.
     memText.AddLine(strTrans);
 
     // Finally we can parse it all.

-    Parse(memText, TRUE /* local */);
+    Parse(memText, true /* local */);

 
     SetRootPath();
 }
 
     SetRootPath();
 }


@@ -571,8 +584,17 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
 
     // add the line to linked list
     if ( bLocal )
 
     // add the line to linked list
     if ( bLocal )

+    {

       LineListAppend(strLine);
 
       LineListAppend(strLine);
 

+      // let the root group have it start line as well
+      if ( !n )
+      {
+        m_pCurrentGroup->SetLine(m_linesTail);
+      }
+    }
+
+

     // skip leading spaces
     for ( pStart = strLine; wxIsspace(*pStart); pStart++ )
       ;
     // skip leading spaces
     for ( pStart = strLine; wxIsspace(*pStart); pStart++ )
       ;


@@ -612,15 +634,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(' '):


@@ -631,13 +657,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
       const wxChar *pEnd = pStart;
         }
       }
     }
     else {                        // a key
       const wxChar *pEnd = pStart;

-      while ( *pEnd && *pEnd != wxT('=') && !wxIsspace(*pEnd) ) {
+      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)


@@ -651,7 +677,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) )


@@ -667,9 +693,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() ) {


@@ -687,11 +710,12 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
             wxLogWarning(_("file '%s', line %d: key '%s' was first found at line %d."),
                          buffer.GetName(), n + 1, strKey.c_str(), pEntry->Line());
 
             wxLogWarning(_("file '%s', line %d: key '%s' was first found at line %d."),
                          buffer.GetName(), 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++;


@@ -700,7 +724,7 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
         if ( !(GetStyle() & wxCONFIG_USE_NO_ESCAPE_CHARACTERS) )
             value = FilterInValue(value);
 
         if ( !(GetStyle() & wxCONFIG_USE_NO_ESCAPE_CHARACTERS) )
             value = FilterInValue(value);
 

-        pEntry->SetValue(value, FALSE);
+        pEntry->SetValue(value, false);

       }
     }
   }
       }
     }
   }


@@ -767,10 +791,10 @@ bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) const
 {
   if ( size_t(lIndex) < m_pCurrentGroup->Groups().Count() ) {
     str = m_pCurrentGroup->Groups()[(size_t)lIndex++]->Name();
 {
   if ( size_t(lIndex) < m_pCurrentGroup->Groups().Count() ) {
     str = m_pCurrentGroup->Groups()[(size_t)lIndex++]->Name();

-    return TRUE;
+    return true;

   }
   else
   }
   else

-    return FALSE;
+    return false;

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


@@ -783,10 +807,10 @@ bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
 {
   if ( size_t(lIndex) < m_pCurrentGroup->Entries().Count() ) {
     str = m_pCurrentGroup->Entries()[(size_t)lIndex++]->Name();
 {
   if ( size_t(lIndex) < m_pCurrentGroup->Entries().Count() ) {
     str = m_pCurrentGroup->Entries()[(size_t)lIndex++]->Name();

-    return TRUE;
+    return true;

   }
   else
   }
   else

-    return FALSE;
+    return false;

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


@@ -797,7 +821,7 @@ size_t wxFileConfig::GetNumberOfEntries(bool bRecursive) const
     size_t nSubgroups = m_pCurrentGroup->Groups().Count();
     for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
       CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
     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);
+      n += GetNumberOfEntries(true);

       CONST_CAST m_pCurrentGroup = pOldCurrentGroup;
     }
   }
       CONST_CAST m_pCurrentGroup = pOldCurrentGroup;
     }
   }


@@ -813,7 +837,7 @@ size_t wxFileConfig::GetNumberOfGroups(bool bRecursive) const
     size_t nSubgroups = m_pCurrentGroup->Groups().Count();
     for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
       CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
     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);
+      n += GetNumberOfGroups(true);

       CONST_CAST m_pCurrentGroup = pOldCurrentGroup;
     }
   }
       CONST_CAST m_pCurrentGroup = pOldCurrentGroup;
     }
   }


@@ -851,22 +875,24 @@ bool wxFileConfig::DoReadString(const wxString& key, wxString* pStr) const
 
   wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   if (pEntry == NULL) {
 
   wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   if (pEntry == NULL) {

-    return FALSE;
+    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);

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


@@ -907,7 +933,7 @@ bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)
         {
             wxLogError( _("Config entry name cannot start with '%c'."),
                         wxCONFIG_IMMUTABLE_PREFIX);
         {
             wxLogError( _("Config entry name cannot start with '%c'."),
                         wxCONFIG_IMMUTABLE_PREFIX);

-            return FALSE;
+            return false;

         }
 
         wxFileConfigEntry   *pEntry = m_pCurrentGroup->FindEntry(strName);
         }
 
         wxFileConfigEntry   *pEntry = m_pCurrentGroup->FindEntry(strName);


@@ -926,7 +952,7 @@ bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)
         pEntry->SetValue(szValue);
     }
 
         pEntry->SetValue(szValue);
     }
 

-    return TRUE;
+    return true;

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


@@ -937,7 +963,7 @@ bool wxFileConfig::DoWriteLong(const wxString& key, long lValue)
 bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 {
   if ( LineListIsEmpty() || !m_pRootGroup->IsDirty() || !m_strLocalFile )
 bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 {
   if ( LineListIsEmpty() || !m_pRootGroup->IsDirty() || !m_strLocalFile )

-    return TRUE;
+    return true;

 
 #ifdef __UNIX__
   // set the umask if needed
 
 #ifdef __UNIX__
   // set the umask if needed


@@ -953,7 +979,7 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
   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


@@ -961,34 +987,33 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
   {
     wxString line = p->Text();
     line += wxTextFile::GetEOL();
   {
     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
+    if ( !file.Write(line, m_conv) )

     {
       wxLogError(_("can't write user configuration file."));
     {
       wxLogError(_("can't write user configuration file."));

-      return FALSE;
+      return false;

     }
   }
 
   bool ret = file.Commit();
 
 #if defined(__WXMAC__)
     }
   }
 
   bool ret = file.Commit();
 
 #if defined(__WXMAC__)

-  if ( ret )
-  {
-       FSSpec spec ;
-
-       wxMacFilename2FSSpec( m_strLocalFile , &spec ) ;
-       FInfo finfo ;
-       if ( FSpGetFInfo( &spec , &finfo ) == noErr )
-       {
-               finfo.fdType = 'TEXT' ;
-               finfo.fdCreator = 'ttxt' ;
-               FSpSetFInfo( &spec , &finfo ) ;
-       }
-  }
+    if ( ret )
+    {
+        FSRef fsRef ;
+        FSCatalogInfo catInfo;
+        FileInfo *finfo ;
+
+        if ( wxMacPathToFSRef( m_strLocalFile , &fsRef ) == noErr )
+        {
+            if ( FSGetCatalogInfo (&fsRef, kFSCatInfoFinderInfo, &catInfo, NULL, NULL, NULL) == noErr )
+            {
+                finfo = (FileInfo*)&catInfo.finderInfo;
+                finfo->fileType = 'TEXT' ;
+                finfo->fileCreator = 'ttxt' ;
+                FSSetCatalogInfo( &fsRef, kFSCatInfoFinderInfo, &catInfo ) ;
+            }
+        }
+    }

 #endif // __WXMAC__
 
 #ifdef __UNIX__
 #endif // __WXMAC__
 
 #ifdef __UNIX__


@@ -1012,21 +1037,21 @@ bool wxFileConfig::RenameEntry(const wxString& oldName,
     // 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;

 
     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,


@@ -1035,15 +1060,15 @@ 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;
+    return true;

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


@@ -1055,7 +1080,7 @@ 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;

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


@@ -1066,7 +1091,7 @@ 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)


@@ -1080,13 +1105,16 @@ bool wxFileConfig::DeleteAll()
 {
   CleanUp();
 
 {
   CleanUp();
 

-  if ( wxRemove(m_strLocalFile) == -1 )
-    wxLogSysError(_("can't delete user configuration file '%s'"), m_strLocalFile.c_str());
+  if ( wxFile::Exists(m_strLocalFile) && wxRemove(m_strLocalFile) == -1 )
+  {
+      wxLogSysError(_("can't delete user configuration file '%s'"), m_strLocalFile.c_str());
+      return false;
+  }

 
   m_strLocalFile = m_strGlobalFile = wxT("");
   Init();
 
 
   m_strLocalFile = m_strGlobalFile = wxT("");
   Init();
 

-  return TRUE;
+  return true;

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


@@ -1133,8 +1161,7 @@ wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str)
     return m_linesTail;
 }
 
     return m_linesTail;
 }
 

-    // insert a new line after the given one or in the very beginning if !pLine
-
+// insert a new line after the given one or in the very beginning if !pLine

 wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str,
                                                    wxFileConfigLineList *pLine)
 {
 wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str,
                                                    wxFileConfigLineList *pLine)
 {


@@ -1242,7 +1269,7 @@ wxFileConfigGroup::wxFileConfigGroup(wxFileConfigGroup *pParent,
 {
   m_pConfig = pConfig;
   m_pParent = pParent;
 {
   m_pConfig = pConfig;
   m_pParent = pParent;

-  m_bDirty  = FALSE;
+  m_bDirty  = false;

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


@@ -1313,16 +1340,15 @@ wxFileConfigLineList *wxFileConfigGroup::GetGroupLine()
                 _T("  GetGroupLine() for Group '%s'"),
                 Name().c_str() );
 
                 _T("  GetGroupLine() for Group '%s'"),
                 Name().c_str() );
 

-    if ( m_pLine == 0 )
+    if ( !m_pLine )

     {
         wxLogTrace( _T("wxFileConfig"),
                     _T("    Getting Line item pointer") );
 
         wxFileConfigGroup   *pParent = Parent();
 
     {
         wxLogTrace( _T("wxFileConfig"),
                     _T("    Getting Line item pointer") );
 
         wxFileConfigGroup   *pParent = Parent();
 

-            // this group wasn't present in local config file, add it now
-
-        if ( pParent != 0 )
+        // this group wasn't present in local config file, add it now
+        if ( pParent )

         {
             wxLogTrace( _T("wxFileConfig"),
                         _T("    checking parent '%s'"),
         {
             wxLogTrace( _T("wxFileConfig"),
                         _T("    checking parent '%s'"),


@@ -1330,18 +1356,16 @@ wxFileConfigLineList *wxFileConfigGroup::GetGroupLine()
 
             wxString    strFullName;
 
 
             wxString    strFullName;
 

-            strFullName << wxT("[")         // +1: no '/'
+            // 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
         }
                         << 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
-        }
+        //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;


@@ -1352,19 +1376,18 @@ 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 != 0 )
+    // if we have any subgroups, our last line is the last line of the last
+    // subgroup
+    if ( m_pLastGroup )

     {
         wxFileConfigLineList *pLine = m_pLastGroup->GetLastGroupLine();
 
     {
         wxFileConfigLineList *pLine = m_pLastGroup->GetLastGroupLine();
 

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

         return pLine;
     }
 
         return pLine;
     }
 

-        // no subgroups, so the last line is the line of thelast entry (if any)
-
+    // no subgroups, so the last line is the line of thelast entry (if any)

     return GetLastEntryLine();
 }
 
     return GetLastEntryLine();
 }
 


@@ -1377,30 +1400,52 @@ wxFileConfigLineList *wxFileConfigGroup::GetLastEntryLine()
                 _T("  GetLastEntryLine() for Group '%s'"),
                 Name().c_str() );
 
                 _T("  GetLastEntryLine() for Group '%s'"),
                 Name().c_str() );
 

-    if ( m_pLastEntry != 0 )
+    if ( m_pLastEntry )

     {
         wxFileConfigLineList    *pLine = m_pLastEntry->GetLine();
 
     {
         wxFileConfigLineList    *pLine = m_pLastEntry->GetLine();
 

-        wxASSERT( pLine != 0 );  // last entry must have !NULL associated line
+        wxASSERT_MSG( pLine, _T("last entry must have !NULL associated line") );
+

         return pLine;
     }
 
         return pLine;
     }
 

-        // no entries: insert after the group header
-
+    // no entries: insert after the group header, if any

     return GetGroupLine();
 }
 
     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, _T("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
 // ----------------------------------------------------------------------------
 
 void wxFileConfigGroup::Rename(const wxString& newName)
 {
 // ----------------------------------------------------------------------------
 // group name
 // ----------------------------------------------------------------------------
 
 void wxFileConfigGroup::Rename(const wxString& newName)
 {

+    wxCHECK_RET( m_pParent, _T("the root group can't be renamed") );
+

     m_strName = newName;
 
     m_strName = newName;
 

-    wxFileConfigLineList *line = GetGroupLine();
+    // +1: no leading '/'

     wxString strFullName;
     wxString strFullName;

-    strFullName << wxT("[") << (GetFullName().c_str() + 1) << wxT("]"); // +1: no '/'
+    strFullName << wxT("[") << (GetFullName().c_str() + 1) << wxT("]");
+
+    wxFileConfigLineList *line = GetGroupLine();
+    wxCHECK_RET( line, _T("a non root group must have a corresponding line!") );
+

     line->SetText(strFullName);
 
     SetDirty();
     line->SetText(strFullName);
 
     SetDirty();


@@ -1520,14 +1565,14 @@ bool wxFileConfigGroup::DeleteSubgroupByName(const wxChar *szName)
 {
     wxFileConfigGroup * const pGroup = FindSubgroup(szName);
 
 {
     wxFileConfigGroup * const pGroup = FindSubgroup(szName);
 

-    return pGroup ? DeleteSubgroup(pGroup) : FALSE;
+    return pGroup ? DeleteSubgroup(pGroup) : false;

 }
 
 // Delete the subgroup and remove all references to it from
 // other data structures.
 bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
 {
 }
 
 // Delete the subgroup and remove all references to it from
 // other data structures.
 bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
 {

-    wxCHECK_MSG( pGroup, FALSE, _T("deleting non existing group?") );
+    wxCHECK_MSG( pGroup, false, _T("deleting non existing group?") );

 
     wxLogTrace( _T("wxFileConfig"),
                 _T("Deleting group '%s' from '%s'"),
 
     wxLogTrace( _T("wxFileConfig"),
                 _T("Deleting group '%s' from '%s'"),


@@ -1661,13 +1706,13 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
     m_aSubgroups.Remove(pGroup);
     delete pGroup;
 
     m_aSubgroups.Remove(pGroup);
     delete pGroup;
 

-    return TRUE;
+    return true;

 }
 
 bool wxFileConfigGroup::DeleteEntry(const wxChar *szName)
 {
   wxFileConfigEntry *pEntry = FindEntry(szName);
 }
 
 bool wxFileConfigGroup::DeleteEntry(const wxChar *szName)
 {
   wxFileConfigEntry *pEntry = FindEntry(szName);

-  wxCHECK( pEntry != NULL, FALSE );  // deleting non existing item?
+  wxCHECK( pEntry != NULL, false );  // deleting non existing item?

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


@@ -1711,7 +1756,7 @@ bool wxFileConfigGroup::DeleteEntry(const wxChar *szName)
   m_aEntries.Remove(pEntry);
   delete pEntry;
 
   m_aEntries.Remove(pEntry);
   delete pEntry;
 

-  return TRUE;
+  return true;

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


@@ -1719,7 +1764,7 @@ bool wxFileConfigGroup::DeleteEntry(const wxChar *szName)
 // ----------------------------------------------------------------------------
 void wxFileConfigGroup::SetDirty()
 {
 // ----------------------------------------------------------------------------
 void wxFileConfigGroup::SetDirty()
 {

-  m_bDirty = TRUE;
+  m_bDirty = true;

   if ( Parent() != NULL )             // propagate upwards
     Parent()->SetDirty();
 }
   if ( Parent() != NULL )             // propagate upwards
     Parent()->SetDirty();
 }


@@ -1743,7 +1788,7 @@ wxFileConfigEntry::wxFileConfigEntry(wxFileConfigGroup *pParent,
   m_pLine   = NULL;
 
   m_bDirty =
   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 )


@@ -1765,7 +1810,7 @@ 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)
 {


@@ -1783,7 +1828,7 @@ void wxFileConfigEntry::SetValue(const wxString& strValue, bool bUser)
     if ( m_bHasValue && strValue == m_strValue )
         return;
 
     if ( m_bHasValue && strValue == m_strValue )
         return;
 

-    m_bHasValue = TRUE;
+    m_bHasValue = true;

     m_strValue = strValue;
 
     if ( bUser )
     m_strValue = strValue;
 
     if ( bUser )


@@ -1801,17 +1846,17 @@ void wxFileConfigEntry::SetValue(const wxString& strValue, bool bUser)
         wxString    strLine;
         strLine << FilterOutEntryName(m_strName) << wxT('=') << strValFiltered;
 
         wxString    strLine;
         strLine << FilterOutEntryName(m_strName) << wxT('=') << strValFiltered;
 

-        if ( m_pLine != 0 )
+        if ( m_pLine )

         {
             // entry was read from the local config file, just modify the line
             m_pLine->SetText(strLine);
         }
         {
             // entry was read from the local config file, just modify the line
             m_pLine->SetText(strLine);
         }

-        else {
+        else // this entry didn't exist in the local file
+        {

             // add a new line to the file
             // add a new line to the file

-            wxASSERT( m_nLine == wxNOT_FOUND );   // consistency check
+            wxFileConfigLineList *line = Group()->GetLastEntryLine();
+            m_pLine = Group()->Config()->LineListInsert(strLine, line);

 
 

-            m_pLine = Group()->Config()->LineListInsert(strLine,
-                                                        Group()->GetLastEntryLine());

             Group()->SetLastEntry(this);
         }
 
             Group()->SetLastEntry(this);
         }
 


@@ -1821,7 +1866,7 @@ void wxFileConfigEntry::SetValue(const wxString& strValue, bool bUser)
 
 void wxFileConfigEntry::SetDirty()
 {
 
 void wxFileConfigEntry::SetDirty()
 {

-  m_bDirty = TRUE;
+  m_bDirty = true;

   Group()->SetDirty();
 }
 
   Group()->SetDirty();
 }
 


@@ -1980,14 +2025,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;
   }