* Fixed two memory leaks.

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index b2d66b5ffd81f9aaeaf89a790441195b6d7c14f7..2eb6facd54442274d7c63172e61e5fc996b05a1d 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -18,7 +18,7 @@
 // headers
 // ----------------------------------------------------------------------------
 #ifdef __GNUG__
 // headers
 // ----------------------------------------------------------------------------
 #ifdef __GNUG__

-  #pragma implementation "config.h"
+  #pragma implementation "confbase.h"

 #endif
 
 #include  "wx/wxprec.h"
 #endif
 
 #include  "wx/wxprec.h"


@@ -36,7 +36,7 @@
 #include  <wx/file.h>
 #include  <wx/log.h>
 #include  <wx/textfile.h>
 #include  <wx/file.h>
 #include  <wx/log.h>
 #include  <wx/textfile.h>

-#include  <wx/config.h>
+#include  <wx/confbase.h>

 
 // we must include (one of) these files for wxConfigBase::Create
 #if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE)
 
 // we must include (one of) these files for wxConfigBase::Create
 #if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE)


@@ -114,7 +114,7 @@ wxConfigBase::PathChanger::PathChanger(const wxConfigBase *pContainer,
   wxString strPath = strEntry.Before(wxCONFIG_PATH_SEPARATOR);
 
   // special case of "/keyname" when there is nothing before "/"
   wxString strPath = strEntry.Before(wxCONFIG_PATH_SEPARATOR);
 
   // special case of "/keyname" when there is nothing before "/"

-  if ( (!strPath.IsEmpty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR )
+  if ( strPath.IsEmpty() && ((!strEntry.IsEmpty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR ))

     strPath = wxCONFIG_PATH_SEPARATOR;
 
   if ( !strPath.IsEmpty() ) {
     strPath = wxCONFIG_PATH_SEPARATOR;
 
   if ( !strPath.IsEmpty() ) {


@@ -164,8 +164,8 @@ wxString wxExpandEnvVars(const wxString& str)
 #endif
   };
 
 #endif
   };
 

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

     switch ( str[n] ) {
 #ifdef  __WXMSW__
       case '%':
     switch ( str[n] ) {
 #ifdef  __WXMSW__
       case '%':