X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23a59c2cbe8489445b9c26dee4a77e2d20a999c2..c6a6bbbf637a5a580b7ab182483d27522f5e3189:/src/common/config.cpp diff --git a/src/common/config.cpp b/src/common/config.cpp index a0c3a75738..660932e469 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: config.cpp +// Name: src/common/config.cpp // Purpose: implementation of wxConfigBase class // Author: Vadim Zeitlin // Modified by: @@ -13,14 +13,11 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "confbase.h" -#endif #include "wx/wxprec.h" -#ifdef __BORLANDC__ - #pragma hdrstop +#ifdef __BORLANDC__ + #pragma hdrstop #endif //__BORLANDC__ #ifndef wxUSE_CONFIG_NATIVE @@ -28,18 +25,19 @@ #endif #include "wx/config.h" -#include "wx/intl.h" -#include "wx/log.h" -#include "wx/arrstr.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 #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE) -#include "wx/app.h" #include "wx/file.h" -#include "wx/textfile.h" -#include "wx/utils.h" -#include "wx/utils.h" -#include "wx/math.h" #include #include @@ -59,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. @@ -228,8 +227,9 @@ bool wxConfigBase::DoWriteBool(const wxString& key, bool value) // ---------------------------------------------------------------------------- wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer, - const wxString& strEntry) + const wxString& strEntry) { + m_bChanged = false; m_pContainer = (wxConfigBase *)pContainer; // the path is everything which precedes the last slash @@ -246,7 +246,7 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer, { if ( m_pContainer->GetPath() != strPath ) { - // do change the path + // we do change the path so restore it later m_bChanged = true; /* JACS: work around a memory bug that causes an assert @@ -271,11 +271,25 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer, } else { // it's a name only, without path - nothing to do - m_bChanged = false; m_strName = strEntry; } } +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 @@ -284,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 // ---------------------------------------------------------------------------- @@ -293,27 +325,28 @@ wxConfigPathChanger::~wxConfigPathChanger() // understands both Unix and Windows (but only under Windows) environment // variables expansion: i.e. $var, $(var) and ${var} are always understood // and in addition under Windows %var% is also. -wxString wxExpandEnvVars(const wxString& str) -{ - wxString strResult; - strResult.Alloc(str.Len()); - // don't change the values the enum elements: they must be equal - // to the matching [closing] delimiter. - enum Bracket - { - Bracket_None, - Bracket_Normal = ')', - Bracket_Curly = '}', +// don't change the values the enum elements: they must be equal +// to the matching [closing] delimiter. +enum Bracket +{ + Bracket_None, + Bracket_Normal = ')', + Bracket_Curly = '}', #ifdef __WXMSW__ - Bracket_Windows = '%', // yeah, Windows people are a bit strange ;-) + Bracket_Windows = '%', // yeah, Windows people are a bit strange ;-) #endif - Bracket_Max - }; + Bracket_Max +}; + +wxString wxExpandEnvVars(const wxString& str) +{ + wxString strResult; + strResult.Alloc(str.length()); size_t m; - for ( size_t n = 0; n < str.Len(); n++ ) { - switch ( str[n] ) { + for ( size_t n = 0; n < str.length(); n++ ) { + switch ( str[n].GetValue() ) { #ifdef __WXMSW__ case wxT('%'): #endif //WINDOWS @@ -325,11 +358,11 @@ wxString wxExpandEnvVars(const wxString& str) bracket = Bracket_Windows; else #endif //WINDOWS - if ( n == str.Len() - 1 ) { + if ( n == str.length() - 1 ) { bracket = Bracket_None; } else { - switch ( str[n + 1] ) { + switch ( str[n + 1].GetValue() ) { case wxT('('): bracket = Bracket_Normal; n++; // skip the bracket @@ -347,7 +380,7 @@ wxString wxExpandEnvVars(const wxString& str) 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); @@ -355,7 +388,12 @@ wxString wxExpandEnvVars(const wxString& str) #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; @@ -372,7 +410,7 @@ wxString wxExpandEnvVars(const wxString& str) // 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 @@ -380,14 +418,14 @@ wxString wxExpandEnvVars(const wxString& str) // under Unix, OTOH, this warning could be useful for the user to // understand why isn't the variable expanded as intended #ifndef __WXMSW__ - wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %d in '%s'."), - (char)bracket, m + 1, str.c_str()); + wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %u in '%s'."), + (char)bracket, (unsigned int) (m + 1), str.c_str()); #endif // __WXMSW__ } else { // skip closing bracket unless the variables wasn't expanded if ( pszValue == NULL ) - strResult << (char)bracket; + strResult << (wxChar)bracket; m++; } } @@ -396,9 +434,9 @@ wxString wxExpandEnvVars(const wxString& str) } break; - case '\\': + case wxT('\\'): // 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]; @@ -451,5 +489,3 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz) pc++; } } - -