X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1824493628261b2cb7ceceb431d85c427f1c976b..76784eecd960198bc54429a6e16d5bd7af458fce:/src/common/config.cpp?ds=sidebyside diff --git a/src/common/config.cpp b/src/common/config.cpp index ec03c728f6..fc96bb57f6 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -10,48 +10,35 @@ // Licence: wxWindows license /////////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "confbase.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 -#endif +#if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || defined(wxCONFIG_WIN32_NATIVE)) + +#include "wx/app.h" +#include "wx/file.h" +#include "wx/log.h" +#include "wx/textfile.h" +#include "wx/utils.h" +#include "wx/log.h" +#include "wx/utils.h" +#include "wx/intl.h" + +#include "wx/config.h" -#include -#include -#include // for isalnum() +#include +#include +#include // for isalnum() // ---------------------------------------------------------------------------- // global and class static variables @@ -71,7 +58,7 @@ bool wxConfigBase::ms_bAutoCreate = TRUE; // 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& localFilename, const wxString& globalFilename, long style): + 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; @@ -134,9 +121,9 @@ bool wxConfigBase::Read(const wxString& key, long *pl, long defVal) const bool wxConfigBase::Read(const wxString& key, double* val) const { wxString str; - if (Read(key, str)) + if (Read(key, & str)) { - *val = atof(str); + *val = wxAtof(str); return TRUE; } else @@ -178,10 +165,28 @@ bool wxConfigBase::Read(const wxString& key, bool* val, bool defVal) const } // 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); + str.Printf(_T("%f"), val); return Write(key, str); } @@ -191,6 +196,15 @@ bool wxConfigBase::Write(const wxString& key, bool value) return Write(key, l); } +wxString wxConfigBase::ExpandEnvVars(const wxString& str) const +{ + wxString tmp; // Required for BC++ + if (IsExpandingEnvVars()) + tmp = wxExpandEnvVars(str); + else + tmp = str; + return tmp; +} // ---------------------------------------------------------------------------- // wxConfigPathChanger @@ -200,16 +214,21 @@ 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.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; m_pContainer->SetPath(strPath); @@ -247,9 +266,9 @@ 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 }; @@ -294,7 +313,7 @@ wxString wxExpandEnvVars(const wxString& str) 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; } @@ -312,7 +331,7 @@ wxString wxExpandEnvVars(const wxString& str) if ( bracket != Bracket_None ) { if ( m == str.Len() || str[m] != (char)bracket ) { wxLogWarning(_("Environment variables expansion failed: " - "missing '%c' at position %d in '%s'."), + "missing '%c' at position %d in '%s'."), (char)bracket, m + 1, str.c_str()); } else { @@ -345,18 +364,18 @@ wxString wxExpandEnvVars(const wxString& str) } // this function is used to properly interpret '..' in path -void wxSplitPath(wxArrayString& aParts, const char *sz) +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 == _T('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) { + if ( strCurrent == _T(".") ) { // ignore } - else if ( strCurrent == ".." ) { + else if ( strCurrent == _T("..") ) { // go up one level if ( aParts.IsEmpty() ) wxLogWarning(_("'%s' has extra '..', ignored."), sz); @@ -372,7 +391,7 @@ void wxSplitPath(wxArrayString& aParts, const char *sz) //else: // could log an error here, but we prefer to ignore extra '/' - if ( *pc == '\0' ) + if ( *pc == _T('\0') ) return; } else @@ -382,4 +401,5 @@ void wxSplitPath(wxArrayString& aParts, const char *sz) } } +#endif // wxUSE_CONFIG