final revision

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 9f49fa0783573ee254445d383fbbf80c0d83623f..17db0fca5aedaa314917dc19ed1851ac5e2cae8a 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -57,6 +57,7 @@ bool          wxConfigBase::ms_bAutoCreate = true;
 // ----------------------------------------------------------------------------
 // wxConfigBase
 // ----------------------------------------------------------------------------
+IMPLEMENT_ABSTRACT_CLASS(wxConfigBase, wxObject)
 
 // Not all args will always be used by derived classes, but including them all
 // in each class ensures compatibility.
@@ -274,6 +275,21 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
   }
 }
 
+void wxConfigPathChanger::UpdateIfDeleted()
+{
+    // we don't have to do anything at all if we didn't change the path
+    if ( !m_bChanged )
+        return;
+
+    // find the deepest still existing parent path of the original path
+    while ( !m_pContainer->HasGroup(m_strOldPath) )
+    {
+        m_strOldPath = m_strOldPath.BeforeLast(wxCONFIG_PATH_SEPARATOR);
+        if ( m_strOldPath.empty() )
+            m_strOldPath = wxCONFIG_PATH_SEPARATOR;
+    }
+}
+
 wxConfigPathChanger::~wxConfigPathChanger()
 {
   // only restore path if it was changed
@@ -282,6 +298,24 @@ wxConfigPathChanger::~wxConfigPathChanger()
   }
 }
 
+// this is a wxConfig method but it's mainly used with wxConfigPathChanger
+/* static */
+wxString wxConfigBase::RemoveTrailingSeparator(const wxString& key)
+{
+    wxString path(key);
+
+    // don't remove the only separator from a root group path!
+    while ( path.length() > 1 )
+    {
+        if ( *path.rbegin() != wxCONFIG_PATH_SEPARATOR )
+            break;
+
+        path.erase(path.end() - 1);
+    }
+
+    return path;
+}
+
 #endif // wxUSE_CONFIG
 
 // ----------------------------------------------------------------------------
@@ -312,7 +346,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
   size_t m;
   for ( size_t n = 0; n < str.length(); n++ ) {
-    switch ( str[n] ) {
+    switch ( str[n].GetValue() ) {
 #ifdef  __WXMSW__
       case wxT('%'):
 #endif  //WINDOWS
@@ -328,7 +362,7 @@ wxString wxExpandEnvVars(const wxString& str)
             bracket = Bracket_None;
           }
           else {
-            switch ( str[n + 1] ) {
+            switch ( str[n + 1].GetValue() ) {
               case wxT('('):
                 bracket = Bracket_Normal;
                 n++;                   // skip the bracket
@@ -348,13 +382,18 @@ wxString wxExpandEnvVars(const wxString& str)
 
           while ( m < str.length() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )
             m++;
-
+ 
           wxString strVarName(str.c_str() + n + 1, m - n - 1);
 
 #ifdef __WXWINCE__
           const wxChar *pszValue = NULL;
 #else
-          const wxChar *pszValue = wxGetenv(strVarName);
+          // NB: use wxGetEnv instead of wxGetenv as otherwise variables
+          //     set through wxSetEnv may not be read correctly!
+          const wxChar *pszValue = NULL;
+          wxString tmp;
+          if (wxGetEnv(strVarName, &tmp))
+              pszValue = tmp;
 #endif
           if ( pszValue != NULL ) {
             strResult += pszValue;
@@ -386,7 +425,7 @@ wxString wxExpandEnvVars(const wxString& str)
             else {
               // skip closing bracket unless the variables wasn't expanded
               if ( pszValue == NULL )
-                strResult << (char)bracket;
+                strResult << (wxChar)bracket;
               m++;
             }
           }
@@ -395,7 +434,7 @@ wxString wxExpandEnvVars(const wxString& str)
         }
         break;
 
-      case '\\':
+      case wxT('\\'):
         // backslash can be used to suppress special meaning of % and $
         if ( n != str.length() - 1 &&
                 (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) {