X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ecef04c293db3e3ebcdb12062fdc40b9b35c8c3e..93d2bf4406e5f850189f827275c66ef99bb64791:/src/common/config.cpp?ds=sidebyside diff --git a/src/common/config.cpp b/src/common/config.cpp index e3286e8aaa..05ca5af209 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -27,22 +27,21 @@ #define wxUSE_CONFIG_NATIVE 1 #endif -#if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)) +#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/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 // ---------------------------------------------------------------------------- // global and class static variables @@ -59,15 +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) +// 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; @@ -125,13 +131,12 @@ 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 = wxAtof(str); - return TRUE; + return str.ToDouble(val); } - else - return FALSE; + + return FALSE; } bool wxConfigBase::Read(const wxString& key, double* val, double defVal) const @@ -183,28 +188,29 @@ bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const { long l; bool ret = Read(key, &l, (long) defVal); - *pi = (int) l; + if (ret) + *pi = (int) l; return ret; } bool wxConfigBase::Write(const wxString& key, double val) { wxString str; - str.Printf(wxT("%f"), val); + str.Printf(wxT("%g"), val); return Write(key, str); } bool wxConfigBase::Write(const wxString& key, bool value) { - long l = (value ? 1 : 0); - return Write(key, l); + return Write(key, value ? 1l : 0l); } -bool wxConfigBase::Write( const wxString &key, const wxChar *text ) +bool wxConfigBase::Write(const wxString& key, const wxChar *value) { - wxString str( text ) ; - return Write( key, str ) ; + // 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++ @@ -239,7 +245,9 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer, m_bChanged = TRUE; 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 { @@ -257,6 +265,8 @@ wxConfigPathChanger::~wxConfigPathChanger() } } +#endif // wxUSE_CONFIG + // ---------------------------------------------------------------------------- // static & global functions // ---------------------------------------------------------------------------- @@ -285,13 +295,13 @@ wxString wxExpandEnvVars(const wxString& str) 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 @@ -300,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; @@ -317,7 +327,7 @@ 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); @@ -339,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 { @@ -357,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; @@ -373,6 +382,8 @@ wxString wxExpandEnvVars(const wxString& str) } // this function is used to properly interpret '..' in path +/// separates group and entry names (probably shouldn't be changed) + void wxSplitPath(wxArrayString& aParts, const wxChar *sz) { aParts.Empty(); @@ -401,7 +412,7 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz) // could log an error here, but we prefer to ignore extra '/' if ( *pc == wxT('\0') ) - return; + break; } else strCurrent += *pc; @@ -410,5 +421,4 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz) } } -#endif // wxUSE_CONFIG