X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0da25f69ba98bcc60629d873820edacc17686e92..757cc9def70e4685054f4a24238e2df111f6c9fd:/src/common/config.cpp?ds=sidebyside diff --git a/src/common/config.cpp b/src/common/config.cpp index 5ec9090807..286e2123aa 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -27,22 +27,22 @@ #define wxUSE_CONFIG_NATIVE 1 #endif +#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 +#include // for INT_MAX // ---------------------------------------------------------------------------- // global and class static variables @@ -100,117 +100,91 @@ 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") ); \ + \ + return DoRead##name(key, val); \ + } \ + \ + bool wxConfigBase::Read(const wxString& key, \ + type *val, \ + deftype defVal) const \ + { \ + wxCHECK_MSG( val, FALSE, _T("wxConfig::Read(): NULL parameter") ); \ + \ + if ( DoRead##name(key, val) ) \ + return TRUE; \ + \ + if ( IsRecordingDefaults() ) \ + { \ + ((wxConfigBase *)this)->DoWrite##name(key, defVal); \ + } \ + \ + *val = extra(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 wxSscanf(str, _T("%g"), val) == 1; - } +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; + + wxASSERT_MSG( l == 0 || l == 1, _T("bad bool value in wxConfig::DoReadInt") ); + + *val = l != 0; + + return TRUE; } -bool wxConfigBase::Write(const wxString& key, double val) +bool wxConfigBase::DoReadDouble(const wxString& key, double* val) const { wxString str; - str.Printf(wxT("%g"), val); - return Write(key, str); -} + if ( Read(key, &str) ) + { + return str.ToDouble(val); + } -bool wxConfigBase::Write(const wxString& key, bool value) -{ - long l = (value ? 1 : 0); - return Write(key, l); + return FALSE; } -bool wxConfigBase::Write( const wxString &key, const wxChar *text ) -{ - return Write(key, str) ; -} +// string reading helper wxString wxConfigBase::ExpandEnvVars(const wxString& str) const { wxString tmp; // Required for BC++ @@ -221,6 +195,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 // ---------------------------------------------------------------------------- @@ -265,6 +258,8 @@ wxConfigPathChanger::~wxConfigPathChanger() } } +#endif // wxUSE_CONFIG + // ---------------------------------------------------------------------------- // static & global functions // ---------------------------------------------------------------------------- @@ -380,6 +375,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(); @@ -417,5 +414,4 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz) } } -#endif // wxUSE_CONFIG