X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fe256deb746d1a5b9151867ac48c3ad393c1a97..520e470fdd0daef09c77938db642e4583933c90d:/src/common/config.cpp diff --git a/src/common/config.cpp b/src/common/config.cpp index 4447719209..5aac22351b 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -18,7 +18,7 @@ // headers // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "config.h" + #pragma implementation "confbase.h" #endif #include "wx/wxprec.h" @@ -36,10 +36,11 @@ #include #include #include -#include +#include +#include // we must include (one of) these files for wxConfigBase::Create -#if defined(__MSWIN__) && defined(wxCONFIG_WIN32_NATIVE) +#if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE) #ifdef __WIN32__ #include #else //WIN16 @@ -50,13 +51,15 @@ #endif #include +#include #include // for isalnum() // ---------------------------------------------------------------------------- // global and class static variables // ---------------------------------------------------------------------------- -wxConfigBase *wxConfigBase::ms_pConfig = NULL; +wxConfigBase *wxConfigBase::ms_pConfig = NULL; +bool wxConfigBase::ms_bAutoCreate = TRUE; // ============================================================================ // implementation @@ -66,6 +69,15 @@ wxConfigBase *wxConfigBase::ms_pConfig = NULL; // 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::Set(wxConfigBase *pConfig) { wxConfigBase *pOld = ms_pConfig; @@ -75,41 +87,142 @@ wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig) wxConfigBase *wxConfigBase::Create() { - return ms_pConfig = - #if defined(__MSWIN__) && defined(wxCONFIG_WIN32_NATIVE) - #ifdef __WIN32__ - new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); - #else //WIN16 - #error "Sorry, no wxIniConfig yet..." - //new wxIniConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); + if ( ms_bAutoCreate && ms_pConfig == NULL ) { + ms_pConfig = + #if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE) + #ifdef __WIN32__ + new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); + #else //WIN16 + new wxIniConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); + #endif + #else // either we're under Unix or wish to use files even under Windows + new wxFileConfig(wxTheApp->GetAppName()); #endif - #else // either we're under Unix or wish to use files even under Windows - new wxFileConfig(wxTheApp->GetAppName()); - #endif + } + + 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; +} - return s_szBuf; +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)) + { + *val = atof(str); + return TRUE; + } + else + 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); + *pi = (int) l; + return ret; +} + +bool wxConfigBase::Write(const wxString& key, double val) +{ + wxString str; + str.Printf("%f", val); + return Write(key, str); +} + +bool wxConfigBase::Write(const wxString& key, bool value) +{ + long l = (value ? 1 : 0); + return Write(key, l); +} + + // ---------------------------------------------------------------------------- -// 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 ) + if ( strPath.IsEmpty() && ((!strEntry.IsEmpty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR )) strPath = wxCONFIG_PATH_SEPARATOR; if ( !strPath.IsEmpty() ) { @@ -127,7 +240,7 @@ wxConfigBase::PathChanger::PathChanger(const wxConfigBase *pContainer, } } -wxConfigBase::PathChanger::~PathChanger() +wxConfigPathChanger::~wxConfigPathChanger() { // only restore path if it was changed if ( m_bChanged ) { @@ -159,8 +272,8 @@ wxString wxExpandEnvVars(const wxString& str) #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 '%': @@ -217,11 +330,12 @@ wxString wxExpandEnvVars(const wxString& str) // check the closing bracket if ( bracket != Bracket_None ) { if ( m == str.Len() || str[m] != (char)bracket ) { - wxLogWarning(_("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 { - // skip closing bracket + // skip closing bracket unless the variables wasn't expanded if ( pszValue == NULL ) strResult << (char)bracket; m++; @@ -232,6 +346,15 @@ wxString wxExpandEnvVars(const wxString& str) } break; + case '\\': + // backslash can be used to suppress special meaning of % and $ + if ( n != str.Len() && (str[n + 1] == '%' || str[n + 1] == '$') ) { + strResult += str[++n]; + + break; + } + //else: fall through + default: strResult += str[n]; } @@ -278,3 +401,4 @@ void wxSplitPath(wxArrayString& aParts, const char *sz) } } +