added an error message if a bitmap can't be addedto the image list

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

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 0bf48eeb78eb9730b6b70a6fa91f9b04b3404e9a..5366c66d4a41f2b8d8bbd721ffc749140f2569ae 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -14,30 +14,31 @@
 #pragma implementation "fileconf.h"
 #endif
 
 #pragma implementation "fileconf.h"
 #endif
 

-// ============================================================================
-// declarations
-// ============================================================================
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 #include  "wx/wxprec.h"
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 #include  "wx/wxprec.h"
 

+#include  "wx/fileconf.h"
+
+#ifdef wxUSE_CONFIG
+

 #ifdef    __BORLANDC__
   #pragma hdrstop
 #endif  //__BORLANDC__
 
 #ifndef   WX_PRECOMP
 #ifdef    __BORLANDC__
   #pragma hdrstop
 #endif  //__BORLANDC__
 
 #ifndef   WX_PRECOMP

-  #include  <wx/string.h>
-  #include  <wx/intl.h>
+  #include  "wx/wx.h"

 #endif  //WX_PRECOMP
 
 #endif  //WX_PRECOMP
 

-#include  <wx/dynarray.h>
-#include  <wx/file.h>
-#include  <wx/log.h>
-#include  <wx/textfile.h>
-#include  <wx/config.h>
-#include  <wx/fileconf.h>
+#include  "wx/app.h"
+#include  "wx/dynarray.h"
+#include  "wx/file.h"
+#include  "wx/log.h"
+#include  "wx/textfile.h"
+#include  "wx/config.h"
+
+#include  "wx/utils.h"    // for wxGetHomeDir

 
 // _WINDOWS_ is defined when windows.h is included,
 // __WXMSW__ is defined for MS Windows compilation
 
 // _WINDOWS_ is defined when windows.h is included,
 // __WXMSW__ is defined for MS Windows compilation


@@ -53,6 +54,13 @@
 // ----------------------------------------------------------------------------
 #define CONST_CAST ((wxFileConfig *)this)->
 
 // ----------------------------------------------------------------------------
 #define CONST_CAST ((wxFileConfig *)this)->
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+#ifndef MAX_PATH
+  #define MAX_PATH 512
+#endif
+

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


@@ -85,13 +93,13 @@ wxString wxFileConfig::GetGlobalDir()
 
   #ifdef __UNIX__
     strDir = "/etc/";
 
   #ifdef __UNIX__
     strDir = "/etc/";

+  #elif defined(__WXSTUBS__)
+    wxASSERT_MSG( FALSE, "TODO" ) ;
+  #elif defined(__WXMAC__)
+    wxASSERT_MSG( FALSE, "TODO" ) ;

   #else // Windows
   #else // Windows

-    #ifndef _MAX_PATH
-      #define _MAX_PATH 512
-    #endif
-
-    char szWinDir[_MAX_PATH];
-    ::GetWindowsDirectory(szWinDir, _MAX_PATH);
+    char szWinDir[MAX_PATH];
+    ::GetWindowsDirectory(szWinDir, MAX_PATH);

 
     strDir = szWinDir;
     strDir << '\\';
 
     strDir = szWinDir;
     strDir << '\\';


@@ -104,29 +112,13 @@ wxString wxFileConfig::GetLocalDir()
 {
   wxString strDir;
 
 {
   wxString strDir;
 

-  #ifdef __UNIX__
-    const char *szHome = getenv("HOME");
-    if ( szHome == NULL ) {
-      // we're homeless...
-      wxLogWarning(_("can't find user's HOME, using current directory."));
-      strDir = ".";
-    }
-    else
-       strDir = szHome;
-    strDir << '/'; // a double slash is no problem, a missin one yes
-  #else   // Windows
-    #ifdef  __WIN32__
-      const char *szHome = getenv("HOMEDRIVE");
-      if ( szHome != NULL )
-        strDir << szHome;
-      szHome = getenv("HOMEPATH");
-      if ( szHome != NULL )
-        strDir << szHome;
-    #else   // Win16
-      // Win16 has no idea about home, so use the current directory instead
-      strDir = ".\\";
-    #endif  // WIN16/32
-  #endif  // UNIX/Win
+  wxGetHomeDir(&strDir);
+
+#ifdef  __UNIX__
+  if (strDir.Last() != '/') strDir << '/';
+#else
+  if (strDir.Last() != '\\') strDir << '\\';
+#endif

 
   return strDir;
 }
 
   return strDir;
 }


@@ -204,34 +196,53 @@ void wxFileConfig::Init()
   }
 }
 
   }
 }
 

-wxFileConfig::wxFileConfig(const char *szAppName, bool bLocalOnly)
+// 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)
+            : wxConfigBase(appName, vendorName, strLocal, strGlobal, style),
+              m_strLocalFile(strLocal), m_strGlobalFile(strGlobal)

 {
 {

-  wxASSERT( !IsEmpty(szAppName) ); // invent a name for your application!
+  // Make up an application name if not supplied
+  if (appName.IsEmpty() && wxTheApp)
+  {
+    SetAppName(wxTheApp->GetAppName());
+  }

 
 

-  m_strLocalFile = GetLocalFileName(szAppName);
-  if ( !bLocalOnly )
-    m_strGlobalFile = GetGlobalFileName(szAppName);
-  //else: it's going to be empty and we won't use the global file
+  // Make up names for files if empty
+  if ( m_strLocalFile.IsEmpty() && (style & wxCONFIG_USE_LOCAL_FILE) )
+  {
+    m_strLocalFile = GetLocalFileName(GetAppName());
+  }

 
 

-  Init();
-}
+  if ( m_strGlobalFile.IsEmpty() && (style & wxCONFIG_USE_GLOBAL_FILE) )
+  {
+    m_strGlobalFile = GetGlobalFileName(GetAppName());
+  }

 
 

-wxFileConfig::wxFileConfig(const wxString& strLocal, const wxString& strGlobal)
-            : m_strLocalFile(strLocal), m_strGlobalFile(strGlobal)
-{
-  // if the path is not absolute, prepend the standard directory to it
+  // 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);

 
 

-  if ( !strLocal.IsEmpty() && !wxIsPathSeparator(strLocal[0u]) )
+  if ( !m_strGlobalFile.IsEmpty() )
+    SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE);
+
+  // if the path is not absolute, prepend the standard directory to it
+  if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) )

   {
   {

-     m_strLocalFile = GetLocalDir();
-     m_strLocalFile << strLocal;
+    wxString strLocal = m_strLocalFile;
+    m_strLocalFile = GetLocalDir();
+    m_strLocalFile << strLocal;

   }
   }

-  
-  if ( !strGlobal.IsEmpty() && !wxIsPathSeparator(strGlobal[0u]) )
+
+  if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) )

   {
   {

-     m_strGlobalFile = GetGlobalDir();
-     m_strGlobalFile << strGlobal;
+    wxString strGlobal = m_strGlobalFile;
+    m_strGlobalFile = GetGlobalDir();
+    m_strGlobalFile << strGlobal;

   }
   }

+

   Init();
 }
 
   Init();
 }
 


@@ -264,8 +275,8 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
   const char *pEnd;
   wxString strLine;
 
   const char *pEnd;
   wxString strLine;
 

-  uint nLineCount = file.GetLineCount();
-  for ( uint n = 0; n < nLineCount; n++ ) {
+  size_t nLineCount = file.GetLineCount();
+  for ( size_t n = 0; n < nLineCount; n++ ) {

     strLine = file[n];
 
     // add the line to linked list
     strLine = file[n];
 
     // add the line to linked list


@@ -416,7 +427,7 @@ void wxFileConfig::SetPath(const wxString& strPath)
   }
 
   // change current group
   }
 
   // change current group

-  uint n;
+  size_t n;

   m_pCurrentGroup = m_pRootGroup;
   for ( n = 0; n < aParts.Count(); n++ ) {
     ConfigGroup *pNextGroup = m_pCurrentGroup->FindSubgroup(aParts[n]);
   m_pCurrentGroup = m_pRootGroup;
   for ( n = 0; n < aParts.Count(); n++ ) {
     ConfigGroup *pNextGroup = m_pCurrentGroup->FindSubgroup(aParts[n]);


@@ -444,7 +455,7 @@ bool wxFileConfig::GetFirstGroup(wxString& str, long& lIndex) const
 
 bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) const
 {
 
 bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) const
 {

-  if ( uint(lIndex) < m_pCurrentGroup->Groups().Count() ) {
+  if ( size_t(lIndex) < m_pCurrentGroup->Groups().Count() ) {

     str = m_pCurrentGroup->Groups()[lIndex++]->Name();
     return TRUE;
   }
     str = m_pCurrentGroup->Groups()[lIndex++]->Name();
     return TRUE;
   }


@@ -460,7 +471,7 @@ bool wxFileConfig::GetFirstEntry(wxString& str, long& lIndex) const
 
 bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
 {
 
 bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
 {

-  if ( uint(lIndex) < m_pCurrentGroup->Entries().Count() ) {
+  if ( size_t(lIndex) < m_pCurrentGroup->Entries().Count() ) {

     str = m_pCurrentGroup->Entries()[lIndex++]->Name();
     return TRUE;
   }
     str = m_pCurrentGroup->Entries()[lIndex++]->Name();
     return TRUE;
   }


@@ -468,13 +479,13 @@ bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
     return FALSE;
 }
 
     return FALSE;
 }
 

-uint wxFileConfig::GetNumberOfEntries(bool bRecursive) const
+size_t wxFileConfig::GetNumberOfEntries(bool bRecursive) const

 {
 {

-  uint n = m_pCurrentGroup->Entries().Count();
+  size_t n = m_pCurrentGroup->Entries().Count();

   if ( bRecursive ) {
     ConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
   if ( bRecursive ) {
     ConfigGroup *pOldCurrentGroup = m_pCurrentGroup;

-    uint nSubgroups = m_pCurrentGroup->Groups().Count();
-    for ( uint nGroup = 0; nGroup < nSubgroups; 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);
       CONST_CAST m_pCurrentGroup = pOldCurrentGroup;
       CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
       n += GetNumberOfEntries(TRUE);
       CONST_CAST m_pCurrentGroup = pOldCurrentGroup;


@@ -484,13 +495,13 @@ uint wxFileConfig::GetNumberOfEntries(bool bRecursive) const
   return n;
 }
 
   return n;
 }
 

-uint wxFileConfig::GetNumberOfGroups(bool bRecursive) const
+size_t wxFileConfig::GetNumberOfGroups(bool bRecursive) const

 {
 {

-  uint n = m_pCurrentGroup->Groups().Count();
+  size_t n = m_pCurrentGroup->Groups().Count();

   if ( bRecursive ) {
     ConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
   if ( bRecursive ) {
     ConfigGroup *pOldCurrentGroup = m_pCurrentGroup;

-    uint nSubgroups = m_pCurrentGroup->Groups().Count();
-    for ( uint nGroup = 0; nGroup < nSubgroups; 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);
       CONST_CAST m_pCurrentGroup = pOldCurrentGroup;
       CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
       n += GetNumberOfGroups(TRUE);
       CONST_CAST m_pCurrentGroup = pOldCurrentGroup;


@@ -506,7 +517,7 @@ uint wxFileConfig::GetNumberOfGroups(bool bRecursive) const
 
 bool wxFileConfig::HasGroup(const wxString& strName) const
 {
 
 bool wxFileConfig::HasGroup(const wxString& strName) const
 {

-  PathChanger path(this, strName);
+  wxConfigPathChanger path(this, strName);

 
   ConfigGroup *pGroup = m_pCurrentGroup->FindSubgroup(path.Name());
   return pGroup != NULL;
 
   ConfigGroup *pGroup = m_pCurrentGroup->FindSubgroup(path.Name());
   return pGroup != NULL;


@@ -514,7 +525,7 @@ bool wxFileConfig::HasGroup(const wxString& strName) const
 
 bool wxFileConfig::HasEntry(const wxString& strName) const
 {
 
 bool wxFileConfig::HasEntry(const wxString& strName) const
 {

-  PathChanger path(this, strName);
+  wxConfigPathChanger path(this, strName);

 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   return pEntry != NULL;
 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   return pEntry != NULL;


@@ -524,53 +535,59 @@ bool wxFileConfig::HasEntry(const wxString& strName) const
 // read/write values
 // ----------------------------------------------------------------------------
 
 // read/write values
 // ----------------------------------------------------------------------------
 

-bool wxFileConfig::Read(wxString   *pstr,
-                        const char *szKey,
-                        const char *szDefault) const
+bool wxFileConfig::Read(const wxString& key,
+                        wxString* pStr) const

 {
 {

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

 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   if (pEntry == NULL) {
 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   if (pEntry == NULL) {

-    *pstr = ExpandEnvVars(szDefault);

     return FALSE;
   }
   else {
     return FALSE;
   }
   else {

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

     return TRUE;
   }
 }
 
     return TRUE;
   }
 }
 

-const char *wxFileConfig::Read(const char *szKey,
-                               const char *szDefault) const
+bool wxFileConfig::Read(const wxString& key,
+                        wxString* pStr, const wxString& defVal) const

 {
 {

-  static wxString s_str;
-  Read(&s_str, szKey, szDefault);
+  wxConfigPathChanger path(this, key);

 
 

-  return s_str.c_str();
+  ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
+  if (pEntry == NULL) {
+    if( IsRecordingDefaults() )
+      ((wxFileConfig *)this)->Write(key,defVal);
+    *pStr = ExpandEnvVars(defVal);
+    return FALSE;
+  }
+  else {
+    *pStr = ExpandEnvVars(pEntry->Value());
+    return TRUE;
+  }

 }
 
 }
 

-bool wxFileConfig::Read(long *pl, const char *szKey, long lDefault) const
+bool wxFileConfig::Read(const wxString& key, long *pl) const

 {
   wxString str;
 {
   wxString str;

-  if ( Read(&str, szKey) ) {
+  if ( Read(key, & str) ) {

     *pl = atol(str);
     return TRUE;
   }
   else {
     *pl = atol(str);
     return TRUE;
   }
   else {

-    *pl = lDefault;

     return FALSE;
   }
 }
 
     return FALSE;
   }
 }
 

-bool wxFileConfig::Write(const char *szKey, const char *szValue)
+bool wxFileConfig::Write(const wxString& key, const wxString& szValue)

 {
 {

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

 
   wxString strName = path.Name();
   if ( strName.IsEmpty() ) {
     // setting the value of a group is an error
 
   wxString strName = path.Name();
   if ( strName.IsEmpty() ) {
     // setting the value of a group is an error

-    wxASSERT_MSG( IsEmpty(szValue), "can't set value of a group!" );
+    wxASSERT_MSG( IsEmpty(szValue), _("can't set value of a group!") );

 
     // ... except if it's empty in which case it's a way to force it's creation
     m_pCurrentGroup->SetDirty();
 
     // ... except if it's empty in which case it's a way to force it's creation
     m_pCurrentGroup->SetDirty();


@@ -606,12 +623,12 @@ bool wxFileConfig::Write(const char *szKey, const char *szValue)
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxFileConfig::Write(const char *szKey, long lValue)
+bool wxFileConfig::Write(const wxString& key, long lValue)

 {
   // ltoa() is not ANSI :-(
 {
   // ltoa() is not ANSI :-(

-  char szBuf[40];   // should be good for sizeof(long) <= 16 (128 bits)
-  sprintf(szBuf, "%ld", lValue);
-  return Write(szKey, szBuf);
+  wxString buf;
+  buf.Printf("%ld", lValue);
+  return Write(key, buf);

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


@@ -641,9 +658,9 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 // delete groups/entries
 // ----------------------------------------------------------------------------
 
 // delete groups/entries
 // ----------------------------------------------------------------------------
 

-bool wxFileConfig::DeleteEntry(const char *szKey, bool bGroupIfEmptyAlso)
+bool wxFileConfig::DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso)

 {
 {

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

 
   if ( !m_pCurrentGroup->DeleteEntry(path.Name()) )
     return FALSE;
 
   if ( !m_pCurrentGroup->DeleteEntry(path.Name()) )
     return FALSE;


@@ -660,9 +677,9 @@ bool wxFileConfig::DeleteEntry(const char *szKey, bool bGroupIfEmptyAlso)
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxFileConfig::DeleteGroup(const char *szKey)
+bool wxFileConfig::DeleteGroup(const wxString& key)

 {
 {

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

 
   return m_pCurrentGroup->DeleteSubgroupByName(path.Name());
 }
 
   return m_pCurrentGroup->DeleteSubgroupByName(path.Name());
 }


@@ -745,7 +762,7 @@ void wxFileConfig::LineListRemove(LineList *pLine)
   // last entry?
   if ( pNext == NULL )
     m_linesTail = pPrev;
   // last entry?
   if ( pNext == NULL )
     m_linesTail = pPrev;

-  else    
+  else

     pNext->SetPrev(pPrev);
 
   delete pLine;
     pNext->SetPrev(pPrev);
 
   delete pLine;


@@ -785,7 +802,7 @@ wxFileConfig::ConfigGroup::ConfigGroup(wxFileConfig::ConfigGroup *pParent,
 wxFileConfig::ConfigGroup::~ConfigGroup()
 {
   // entries
 wxFileConfig::ConfigGroup::~ConfigGroup()
 {
   // entries

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

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


@@ -848,7 +865,7 @@ wxFileConfig::LineList *wxFileConfig::ConfigGroup::GetGroupLine()
     // this group wasn't present in local config file, add it now
     if ( pParent != NULL ) {
       wxString strFullName;
     // this group wasn't present in local config file, add it now
     if ( pParent != NULL ) {
       wxString strFullName;

-      strFullName << "[" << GetFullName().c_str() + 1 << "]"; // +1: no '/'
+      strFullName << "[" << (GetFullName().c_str() + 1) << "]"; // +1: no '/'

       m_pLine = m_pConfig->LineListInsert(strFullName,
                                           pParent->GetLastGroupLine());
       pParent->SetLastGroup(this);  // we're surely after all the others
       m_pLine = m_pConfig->LineListInsert(strFullName,
                                           pParent->GetLastGroupLine());
       pParent->SetLastGroup(this);  // we're surely after all the others


@@ -916,7 +933,7 @@ wxString wxFileConfig::ConfigGroup::GetFullName() const
 wxFileConfig::ConfigEntry *
 wxFileConfig::ConfigGroup::FindEntry(const char *szName) const
 {
 wxFileConfig::ConfigEntry *
 wxFileConfig::ConfigGroup::FindEntry(const char *szName) const
 {

-  uint i,
+  size_t i,

        lo = 0,
        hi = m_aEntries.Count();
   int res;
        lo = 0,
        hi = m_aEntries.Count();
   int res;


@@ -946,7 +963,7 @@ wxFileConfig::ConfigGroup::FindEntry(const char *szName) const
 wxFileConfig::ConfigGroup *
 wxFileConfig::ConfigGroup::FindSubgroup(const char *szName) const
 {
 wxFileConfig::ConfigGroup *
 wxFileConfig::ConfigGroup::FindSubgroup(const char *szName) const
 {

-  uint i,
+  size_t i,

        lo = 0,
        hi = m_aSubgroups.Count();
   int res;
        lo = 0,
        hi = m_aSubgroups.Count();
   int res;


@@ -1025,8 +1042,8 @@ bool wxFileConfig::ConfigGroup::DeleteSubgroup(ConfigGroup *pGroup)
   wxCHECK( pGroup != NULL, FALSE ); // deleting non existing group?
 
   // delete all entries
   wxCHECK( pGroup != NULL, FALSE ); // deleting non existing group?
 
   // delete all entries

-  uint nCount = pGroup->m_aEntries.Count();
-  for ( uint nEntry = 0; nEntry < nCount; nEntry++ ) {
+  size_t nCount = pGroup->m_aEntries.Count();
+  for ( size_t nEntry = 0; nEntry < nCount; nEntry++ ) {

     LineList *pLine = pGroup->m_aEntries[nEntry]->GetLine();
     if ( pLine != NULL )
       m_pConfig->LineListRemove(pLine);
     LineList *pLine = pGroup->m_aEntries[nEntry]->GetLine();
     if ( pLine != NULL )
       m_pConfig->LineListRemove(pLine);


@@ -1034,7 +1051,7 @@ bool wxFileConfig::ConfigGroup::DeleteSubgroup(ConfigGroup *pGroup)
 
   // and subgroups of this sungroup
   nCount = pGroup->m_aSubgroups.Count();
 
   // and subgroups of this sungroup
   nCount = pGroup->m_aSubgroups.Count();

-  for ( uint nGroup = 0; nGroup < nCount; nGroup++ ) {
+  for ( size_t nGroup = 0; nGroup < nCount; nGroup++ ) {

     pGroup->DeleteSubgroup(pGroup->m_aSubgroups[nGroup]);
   }
 
     pGroup->DeleteSubgroup(pGroup->m_aSubgroups[nGroup]);
   }
 


@@ -1048,7 +1065,7 @@ bool wxFileConfig::ConfigGroup::DeleteSubgroup(ConfigGroup *pGroup)
 
       // go back until we find a subgroup or reach the group's line
       ConfigGroup *pNewLast = NULL;
 
       // go back until we find a subgroup or reach the group's line
       ConfigGroup *pNewLast = NULL;

-      uint n, nSubgroups = m_aSubgroups.Count();
+      size_t n, nSubgroups = m_aSubgroups.Count();

       LineList *pl;
       for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) {
         // is it our subgroup?
       LineList *pl;
       for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) {
         // is it our subgroup?


@@ -1099,7 +1116,7 @@ bool wxFileConfig::ConfigGroup::DeleteEntry(const char *szName)
 
       // go back until we find another entry or reach the group's line
       ConfigEntry *pNewLast = NULL;
 
       // go back until we find another entry or reach the group's line
       ConfigEntry *pNewLast = NULL;

-      uint n, nEntries = m_aEntries.Count();
+      size_t n, nEntries = m_aEntries.Count();

       LineList *pl;
       for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) {
         // is it our subgroup?
       LineList *pl;
       for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) {
         // is it our subgroup?


@@ -1268,7 +1285,7 @@ wxString FilterIn(const wxString& str)
 
   bool bQuoted = !str.IsEmpty() && str[0] == '"';
 
 
   bool bQuoted = !str.IsEmpty() && str[0] == '"';
 

-  for ( uint n = bQuoted ? 1 : 0; n < str.Len(); n++ ) {
+  for ( size_t n = bQuoted ? 1 : 0; n < str.Len(); n++ ) {

     if ( str[n] == '\\' ) {
       switch ( str[++n] ) {
         case 'n':
     if ( str[n] == '\\' ) {
       switch ( str[++n] ) {
         case 'n':


@@ -1309,6 +1326,9 @@ wxString FilterIn(const wxString& str)
 // quote the string before writing it to file
 wxString FilterOut(const wxString& str)
 {
 // quote the string before writing it to file
 wxString FilterOut(const wxString& str)
 {

+   if(str.IsEmpty())
+      return str;
+

   wxString strResult;
   strResult.Alloc(str.Len());
 
   wxString strResult;
   strResult.Alloc(str.Len());
 


@@ -1319,7 +1339,7 @@ wxString FilterOut(const wxString& str)
     strResult += '"';
 
   char c;
     strResult += '"';
 
   char c;

-  for ( uint n = 0; n < str.Len(); n++ ) {
+  for ( size_t n = 0; n < str.Len(); n++ ) {

     switch ( str[n] ) {
       case '\n':
         c = 'n';
     switch ( str[n] ) {
       case '\n':
         c = 'n';


@@ -1358,3 +1378,7 @@ wxString FilterOut(const wxString& str)
 
   return strResult;
 }
 
   return strResult;
 }

+
+#endif
+
+   // wxUSE_CONFIG