mac methodname fixed, so all use the same now

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 0e176f4f89de5da6022b59192778963d252aea84..4b509a7fc0d8a41eaf22e3538e171d801b7ad8fc 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -29,16 +29,15 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/arrstr.h"
+    #include "wx/math.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/arrstr.h"
-

 #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
 
 #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
 

-#include "wx/app.h"

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

-#include "wx/utils.h"
-#include "wx/math.h"

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


@@ -275,6 +274,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
 wxConfigPathChanger::~wxConfigPathChanger()
 {
   // only restore path if it was changed


@@ -309,10 +323,10 @@ enum Bracket
 wxString wxExpandEnvVars(const wxString& str)
 {
   wxString strResult;
 wxString wxExpandEnvVars(const wxString& str)
 {
   wxString strResult;

-  strResult.Alloc(str.Len());
+  strResult.Alloc(str.length());

 
   size_t m;
 
   size_t m;

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

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


@@ -325,7 +339,7 @@ wxString wxExpandEnvVars(const wxString& str)
               bracket = Bracket_Windows;
             else
           #endif  //WINDOWS
               bracket = Bracket_Windows;
             else
           #endif  //WINDOWS

-          if ( n == str.Len() - 1 ) {
+          if ( n == str.length() - 1 ) {

             bracket = Bracket_None;
           }
           else {
             bracket = Bracket_None;
           }
           else {


@@ -347,7 +361,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
           m = n + 1;
 
 
           m = n + 1;
 

-          while ( m < str.Len() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )
+          while ( m < str.length() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )

             m++;
 
           wxString strVarName(str.c_str() + n + 1, m - n - 1);
             m++;
 
           wxString strVarName(str.c_str() + n + 1, m - n - 1);


@@ -372,7 +386,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
           // check the closing bracket
           if ( bracket != Bracket_None ) {
 
           // check the closing bracket
           if ( bracket != Bracket_None ) {

-            if ( m == str.Len() || str[m] != (wxChar)bracket ) {
+            if ( m == str.length() || str[m] != (wxChar)bracket ) {

               // under MSW it's common to have '%' characters in the registry
               // and it's annoying to have warnings about them each time, so
               // ignroe them silently if they are not used for env vars
               // under MSW it's common to have '%' characters in the registry
               // and it's annoying to have warnings about them each time, so
               // ignroe them silently if they are not used for env vars


@@ -398,7 +412,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
       case '\\':
         // backslash can be used to suppress special meaning of % and $
 
       case '\\':
         // backslash can be used to suppress special meaning of % and $

-        if ( n != str.Len() - 1 &&
+        if ( n != str.length() - 1 &&

                 (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) {
           strResult += str[++n];
 
                 (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) {
           strResult += str[++n];