X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cb172b4f12fae80b06d5936108a1bc7f2521674..c5c04fabb02c27bcc8115bff024d74ddd48f8175:/src/common/config.cpp diff --git a/src/common/config.cpp b/src/common/config.cpp index 05ca5af209..031b7e9fbb 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -7,7 +7,7 @@ // RCS-ID: $Id$ // Copyright: (c) 1997 Karsten Ballüder Ballueder@usa.net // Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ---------------------------------------------------------------------------- @@ -42,6 +42,7 @@ #include #include #include +#include // for INT_MAX // ---------------------------------------------------------------------------- // global and class static variables @@ -67,7 +68,8 @@ wxConfigBase::wxConfigBase(const wxString& appName, long style) : m_appName(appName), m_vendorName(vendorName), m_style(style) { - m_bExpandEnvVars = TRUE; m_bRecordDefaults = FALSE; + m_bExpandEnvVars = TRUE; + m_bRecordDefaults = FALSE; } wxConfigBase::~wxConfigBase() @@ -99,118 +101,99 @@ wxConfigBase *wxConfigBase::Create() return ms_pConfig; } -wxString wxConfigBase::Read(const wxString& key, const wxString& defVal) const -{ - wxString s; - Read(key, &s, defVal); - return s; -} +// ---------------------------------------------------------------------------- +// wxConfigBase reading entries +// ---------------------------------------------------------------------------- -bool wxConfigBase::Read(const wxString& key, wxString *str, const wxString& defVal) const -{ - if (!Read(key, str)) - { - *str = ExpandEnvVars(defVal); - return FALSE; +// implement both Read() overloads for the given type in terms of DoRead() +#define IMPLEMENT_READ_FOR_TYPE(name, type, deftype, extra) \ + bool wxConfigBase::Read(const wxString& key, type *val) const \ + { \ + wxCHECK_MSG( val, FALSE, _T("wxConfig::Read(): NULL parameter") ); \ + \ + if ( !DoRead##name(key, val) ) \ + return FALSE; \ + \ + *val = extra(*val); \ + \ + return TRUE; \ + } \ + \ + bool wxConfigBase::Read(const wxString& key, \ + type *val, \ + deftype defVal) const \ + { \ + wxCHECK_MSG( val, FALSE, _T("wxConfig::Read(): NULL parameter") ); \ + \ + bool read = DoRead##name(key, val); \ + if ( !read ) \ + { \ + if ( IsRecordingDefaults() ) \ + { \ + ((wxConfigBase *)this)->DoWrite##name(key, defVal); \ + } \ + \ + *val = defVal; \ + } \ + \ + *val = extra(*val); \ + \ + return read; \ } - 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); - } +IMPLEMENT_READ_FOR_TYPE(String, wxString, const wxString&, ExpandEnvVars) +IMPLEMENT_READ_FOR_TYPE(Long, long, long, long) +IMPLEMENT_READ_FOR_TYPE(Int, int, int, int) +IMPLEMENT_READ_FOR_TYPE(Double, double, double, double) +IMPLEMENT_READ_FOR_TYPE(Bool, bool, bool, bool) - return FALSE; -} +#undef IMPLEMENT_READ_FOR_TYPE -bool wxConfigBase::Read(const wxString& key, double* val, double defVal) const +// the DoReadXXX() for the other types have implementation in the base class +// but can be overridden in the derived ones +bool wxConfigBase::DoReadInt(const wxString& key, int *pi) const { - if (!Read(key, val)) - { - *val = defVal; - return FALSE; - } - else - return TRUE; -} + wxCHECK_MSG( pi, FALSE, _T("wxConfig::Read(): NULL parameter") ); -bool wxConfigBase::Read(const wxString& key, bool* val) const -{ long l; - if (Read(key, & l)) - { - *val = (l != 0); - return TRUE; - } - else + if ( !DoReadLong(key, &l) ) return FALSE; -} -bool wxConfigBase::Read(const wxString& key, bool* val, bool defVal) const -{ - if (!Read(key, val)) - { - *val = defVal; - return FALSE; - } - else - return TRUE; -} + wxASSERT_MSG( l < INT_MAX, _T("overflow in wxConfig::DoReadInt") ); -// Convenience functions + *pi = (int)l; -bool wxConfigBase::Read(const wxString& key, int *pi) const -{ - long l; - bool ret = Read(key, &l); - if (ret) - *pi = (int) l; - return ret; + return TRUE; } -bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const +bool wxConfigBase::DoReadBool(const wxString& key, bool* val) const { + wxCHECK_MSG( val, FALSE, _T("wxConfig::Read(): NULL parameter") ); + long l; - bool ret = Read(key, &l, (long) defVal); - if (ret) - *pi = (int) l; - return ret; -} + if ( !DoReadLong(key, &l) ) + return FALSE; -bool wxConfigBase::Write(const wxString& key, double val) -{ - wxString str; - str.Printf(wxT("%g"), val); - return Write(key, str); -} + wxASSERT_MSG( l == 0 || l == 1, _T("bad bool value in wxConfig::DoReadInt") ); -bool wxConfigBase::Write(const wxString& key, bool value) -{ - return Write(key, value ? 1l : 0l); + *val = l != 0; + + return TRUE; } -bool wxConfigBase::Write(const wxString& key, const wxChar *value) +bool wxConfigBase::DoReadDouble(const wxString& key, double* val) const { - // explicit cast needed, otherwise value would have been converted to bool - return Write(key, wxString(value)); + wxString str; + if ( Read(key, &str) ) + { + return str.ToDouble(val); + } + + return FALSE; } +// string reading helper wxString wxConfigBase::ExpandEnvVars(const wxString& str) const { wxString tmp; // Required for BC++ @@ -221,6 +204,25 @@ wxString wxConfigBase::ExpandEnvVars(const wxString& str) const return tmp; } +// ---------------------------------------------------------------------------- +// wxConfigBase writing +// ---------------------------------------------------------------------------- + +bool wxConfigBase::DoWriteDouble(const wxString& key, double val) +{ + return DoWriteString(key, wxString::Format(_T("%g"), val)); +} + +bool wxConfigBase::DoWriteInt(const wxString& key, int value) +{ + return DoWriteLong(key, (long)value); +} + +bool wxConfigBase::DoWriteBool(const wxString& key, bool value) +{ + return DoWriteLong(key, value ? 1l : 0l); +} + // ---------------------------------------------------------------------------- // wxConfigPathChanger // ---------------------------------------------------------------------------- @@ -285,10 +287,11 @@ 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 + Bracket_Max }; size_t m; @@ -349,8 +352,16 @@ 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'."), - (char)bracket, m + 1, str.c_str()); + // 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 + // + // 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()); + #endif // __WXMSW__ } else { // skip closing bracket unless the variables wasn't expanded @@ -382,8 +393,6 @@ 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();