X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/906373bf0177babd67d392a70964fde125b3d3a4..abfcca57dd0d805ceec9e19c4be207614d79252a:/src/common/config.cpp diff --git a/src/common/config.cpp b/src/common/config.cpp index b7c4a11854..05ca5af209 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -10,47 +10,38 @@ // Licence: wxWindows license /////////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "config.h" + #pragma implementation "confbase.h" #endif -#include "wx/wxprec.h" +#include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif //__BORLANDC__ -#ifndef WX_PRECOMP - #include - #include -#endif //WX_PRECOMP - -#include -#include -#include -#include -#include - -// we must include (one of) these files for wxConfigBase::Create -#if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE) - #ifdef __WIN32__ - #include - #else //WIN16 - #include - #endif -#else // either we're under Unix or wish to use files even under Windows - #include +#ifndef wxUSE_CONFIG_NATIVE + #define wxUSE_CONFIG_NATIVE 1 #endif -#include -#include // for isalnum() +#include "wx/config.h" +#include "wx/intl.h" +#include "wx/log.h" + +#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 +#include +#include // ---------------------------------------------------------------------------- // global and class static variables @@ -67,6 +58,22 @@ bool wxConfigBase::ms_bAutoCreate = TRUE; // wxConfigBase // ---------------------------------------------------------------------------- +// Not all args will always be used by derived classes, but including them all +// in each class ensures compatibility. +wxConfigBase::wxConfigBase(const wxString& appName, + const wxString& vendorName, + const wxString& WXUNUSED(localFilename), + const wxString& WXUNUSED(globalFilename), + long style) + : m_appName(appName), m_vendorName(vendorName), m_style(style) +{ + m_bExpandEnvVars = TRUE; m_bRecordDefaults = FALSE; +} + +wxConfigBase::~wxConfigBase() +{ +} + wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig) { wxConfigBase *pOld = ms_pConfig; @@ -78,10 +85,9 @@ wxConfigBase *wxConfigBase::Create() { if ( ms_bAutoCreate && ms_pConfig == NULL ) { ms_pConfig = - #if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE) + #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE #ifdef __WIN32__ - new wxRegConfig(wxTheApp->GetVendorName() + '\\' - + wxTheApp->GetAppName()); + new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); #else //WIN16 new wxIniConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); #endif @@ -93,36 +99,155 @@ wxConfigBase *wxConfigBase::Create() return ms_pConfig; } -const char *wxConfigBase::Read(const char *szKey, const char *szDefault) const +wxString wxConfigBase::Read(const wxString& key, const wxString& defVal) const { - static char s_szBuf[1024]; wxString s; - Read(&s, szKey, szDefault); - strncpy(s_szBuf, s, WXSIZEOF(s_szBuf)); + Read(key, &s, defVal); + return s; +} + +bool wxConfigBase::Read(const wxString& key, wxString *str, const wxString& defVal) const +{ + if (!Read(key, str)) + { + *str = ExpandEnvVars(defVal); + return FALSE; + } + else + return TRUE; +} + +bool wxConfigBase::Read(const wxString& key, long *pl, long defVal) const +{ + if (!Read(key, pl)) + { + *pl = defVal; + return FALSE; + } + else + return TRUE; +} + +bool wxConfigBase::Read(const wxString& key, double* val) const +{ + wxString str; + if ( Read(key, &str) ) + { + return str.ToDouble(val); + } + + return FALSE; +} + +bool wxConfigBase::Read(const wxString& key, double* val, double defVal) const +{ + if (!Read(key, val)) + { + *val = defVal; + return FALSE; + } + else + return TRUE; +} + +bool wxConfigBase::Read(const wxString& key, bool* val) const +{ + long l; + if (Read(key, & l)) + { + *val = (l != 0); + return TRUE; + } + else + return FALSE; +} + +bool wxConfigBase::Read(const wxString& key, bool* val, bool defVal) const +{ + if (!Read(key, val)) + { + *val = defVal; + return FALSE; + } + else + return TRUE; +} + +// Convenience functions + +bool wxConfigBase::Read(const wxString& key, int *pi) const +{ + long l; + bool ret = Read(key, &l); + if (ret) + *pi = (int) l; + return ret; +} + +bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const +{ + long l; + bool ret = Read(key, &l, (long) defVal); + if (ret) + *pi = (int) l; + return ret; +} + +bool wxConfigBase::Write(const wxString& key, double val) +{ + wxString str; + str.Printf(wxT("%g"), val); + return Write(key, str); +} - return s_szBuf; +bool wxConfigBase::Write(const wxString& key, bool value) +{ + return Write(key, value ? 1l : 0l); +} + +bool wxConfigBase::Write(const wxString& key, const wxChar *value) +{ + // explicit cast needed, otherwise value would have been converted to bool + return Write(key, wxString(value)); +} + +wxString wxConfigBase::ExpandEnvVars(const wxString& str) const +{ + wxString tmp; // Required for BC++ + if (IsExpandingEnvVars()) + tmp = wxExpandEnvVars(str); + else + tmp = str; + return tmp; } // ---------------------------------------------------------------------------- -// Config::PathChanger +// wxConfigPathChanger // ---------------------------------------------------------------------------- -wxConfigBase::PathChanger::PathChanger(const wxConfigBase *pContainer, +wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer, const wxString& strEntry) { m_pContainer = (wxConfigBase *)pContainer; - wxString strPath = strEntry.Before(wxCONFIG_PATH_SEPARATOR); - // special case of "/keyname" when there is nothing before "/" - if ( strPath.IsEmpty() && strEntry[0] == wxCONFIG_PATH_SEPARATOR ) + // the path is everything which precedes the last slash + wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR); + + // except in the special case of "/keyname" when there is nothing before "/" + if ( strPath.IsEmpty() && + ((!strEntry.IsEmpty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) ) + { strPath = wxCONFIG_PATH_SEPARATOR; + } if ( !strPath.IsEmpty() ) { // do change the path m_bChanged = TRUE; - m_strName = strEntry.Right(wxCONFIG_PATH_SEPARATOR); + m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR); m_strOldPath = m_pContainer->GetPath(); - m_strOldPath += wxCONFIG_PATH_SEPARATOR; + if ( m_strOldPath.Len() == 0 || + m_strOldPath.Last() != wxCONFIG_PATH_SEPARATOR ) + m_strOldPath += wxCONFIG_PATH_SEPARATOR; m_pContainer->SetPath(strPath); } else { @@ -132,7 +257,7 @@ wxConfigBase::PathChanger::PathChanger(const wxConfigBase *pContainer, } } -wxConfigBase::PathChanger::~PathChanger() +wxConfigPathChanger::~wxConfigPathChanger() { // only restore path if it was changed if ( m_bChanged ) { @@ -140,6 +265,8 @@ wxConfigBase::PathChanger::~PathChanger() } } +#endif // wxUSE_CONFIG + // ---------------------------------------------------------------------------- // static & global functions // ---------------------------------------------------------------------------- @@ -158,23 +285,23 @@ wxString wxExpandEnvVars(const wxString& str) { Bracket_None, Bracket_Normal = ')', - Bracket_Curly = '}', + Bracket_Curly = '}' #ifdef __WXMSW__ - Bracket_Windows = '%' // yeah, Windows people are a bit strange ;-) + ,Bracket_Windows = '%' // yeah, Windows people are a bit strange ;-) #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 '%': + case wxT('%'): #endif //WINDOWS - case '$': + case wxT('$'): { Bracket bracket; #ifdef __WXMSW__ - if ( str[n] == '%' ) + if ( str[n] == wxT('%') ) bracket = Bracket_Windows; else #endif //WINDOWS @@ -183,12 +310,12 @@ wxString wxExpandEnvVars(const wxString& str) } else { switch ( str[n + 1] ) { - case '(': + case wxT('('): bracket = Bracket_Normal; n++; // skip the bracket break; - case '{': + case wxT('{'): bracket = Bracket_Curly; n++; // skip the bracket break; @@ -200,12 +327,12 @@ wxString wxExpandEnvVars(const wxString& str) m = n + 1; - while ( m < str.Len() && (isalnum(str[m]) || str[m] == '_') ) + while ( m < str.Len() && (wxIsalnum(str[m]) || str[m] == wxT('_')) ) m++; wxString strVarName(str.c_str() + n + 1, m - n - 1); - const char *pszValue = getenv(strVarName); + const wxChar *pszValue = wxGetenv(strVarName); if ( pszValue != NULL ) { strResult += pszValue; } @@ -222,8 +349,7 @@ wxString wxExpandEnvVars(const wxString& str) // check the closing bracket if ( bracket != Bracket_None ) { if ( m == str.Len() || str[m] != (char)bracket ) { - wxLogWarning(_("Environment variables expansion failed: " - "missing '%c' at position %d in '%s'."), + wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %d in '%s'."), (char)bracket, m + 1, str.c_str()); } else { @@ -240,7 +366,7 @@ wxString wxExpandEnvVars(const wxString& str) case '\\': // backslash can be used to suppress special meaning of % and $ - if ( n != str.Len() && (str[n + 1] == '%' || str[n + 1] == '$') ) { + if ( n != str.Len() && (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) { strResult += str[++n]; break; @@ -256,18 +382,20 @@ wxString wxExpandEnvVars(const wxString& str) } // this function is used to properly interpret '..' in path -void wxSplitPath(wxArrayString& aParts, const char *sz) +/// separates group and entry names (probably shouldn't be changed) + +void wxSplitPath(wxArrayString& aParts, const wxChar *sz) { aParts.Empty(); wxString strCurrent; - const char *pc = sz; + const wxChar *pc = sz; for ( ;; ) { - if ( *pc == '\0' || *pc == wxCONFIG_PATH_SEPARATOR ) { - if ( strCurrent == "." ) { + if ( *pc == wxT('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) { + if ( strCurrent == wxT(".") ) { // ignore } - else if ( strCurrent == ".." ) { + else if ( strCurrent == wxT("..") ) { // go up one level if ( aParts.IsEmpty() ) wxLogWarning(_("'%s' has extra '..', ignored."), sz); @@ -283,8 +411,8 @@ void wxSplitPath(wxArrayString& aParts, const char *sz) //else: // could log an error here, but we prefer to ignore extra '/' - if ( *pc == '\0' ) - return; + if ( *pc == wxT('\0') ) + break; } else strCurrent += *pc; @@ -293,3 +421,4 @@ void wxSplitPath(wxArrayString& aParts, const char *sz) } } +