X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c6c52fdefbee79857043cabd7e7e2f768bb09ad..5a5f305a0f1cdd740d7ca299764755a62108fbda:/src/common/config.cpp diff --git a/src/common/config.cpp b/src/common/config.cpp index 17db0fca5a..c139a2c832 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 07.04.98 // RCS-ID: $Id$ -// Copyright: (c) 1997 Karsten Ballüder Ballueder@usa.net +// Copyright: (c) 1997 Karsten Ballueder Ballueder@usa.net // Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -37,6 +37,7 @@ #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE) +#include "wx/apptrait.h" #include "wx/file.h" #include @@ -54,6 +55,22 @@ bool wxConfigBase::ms_bAutoCreate = true; // implementation // ============================================================================ +// ---------------------------------------------------------------------------- +// wxAppTraitsBase +// ---------------------------------------------------------------------------- + +wxConfigBase *wxAppTraitsBase::CreateConfig() +{ + return new + #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE + wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); + #elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE + wxPrefConfig(wxTheApp->GetAppName()); + #else // either we're under Unix or wish to use files even under Windows + wxFileConfig(wxTheApp->GetAppName()); + #endif +} + // ---------------------------------------------------------------------------- // wxConfigBase // ---------------------------------------------------------------------------- @@ -87,14 +104,10 @@ wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig) wxConfigBase *wxConfigBase::Create() { if ( ms_bAutoCreate && ms_pConfig == NULL ) { - ms_pConfig = - #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE - new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); - #elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE - new wxPrefConfig(wxTheApp->GetAppName()); - #else // either we're under Unix or wish to use files even under Windows - new wxFileConfig(wxTheApp->GetAppName()); - #endif + wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL; + wxCHECK_MSG( traits, NULL, _T("create wxApp before calling this") ); + + ms_pConfig = traits->CreateConfig(); } return ms_pConfig; @@ -143,29 +156,32 @@ wxConfigBase *wxConfigBase::Create() 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) #undef IMPLEMENT_READ_FOR_TYPE -// 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 +// int is stored as long +bool wxConfigBase::Read(const wxString& key, int *pi) const { - wxCHECK_MSG( pi, false, _T("wxConfig::Read(): NULL parameter") ); - - long l; - if ( !DoReadLong(key, &l) ) - return false; - - wxASSERT_MSG( l < INT_MAX, _T("overflow in wxConfig::DoReadInt") ); - + long l = *pi; + bool r = Read(key, &l); + wxASSERT_MSG( l < INT_MAX, _T("int overflow in wxConfig::Read") ); *pi = (int)l; + return r; +} - return true; +bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const +{ + long l = *pi; + bool r = Read(key, &l, defVal); + wxASSERT_MSG( l < INT_MAX, _T("int overflow in wxConfig::Read") ); + *pi = (int)l; + return r; } +// the DoReadXXX() for the other types have implementation in the base class +// but can be overridden in the derived ones bool wxConfigBase::DoReadBool(const wxString& key, bool* val) const { wxCHECK_MSG( val, false, _T("wxConfig::Read(): NULL parameter") ); @@ -212,11 +228,6 @@ 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); @@ -251,7 +262,7 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer, /* JACS: work around a memory bug that causes an assert when using wxRegConfig, related to reference-counting. - Can be reproduced by removing (const wxChar*) below and + Can be reproduced by removing .wc_str() below and adding the following code to the config sample OnInit under Windows: @@ -260,7 +271,7 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer, int value; pConfig->Read(_T("MainWindowX"), & value); */ - m_strOldPath = (const wxChar*) m_pContainer->GetPath(); + m_strOldPath = m_pContainer->GetPath().wc_str(); if ( *m_strOldPath.c_str() != wxCONFIG_PATH_SEPARATOR ) m_strOldPath += wxCONFIG_PATH_SEPARATOR; m_pContainer->SetPath(strPath); @@ -386,19 +397,20 @@ wxString wxExpandEnvVars(const wxString& str) wxString strVarName(str.c_str() + n + 1, m - n - 1); #ifdef __WXWINCE__ - const wxChar *pszValue = NULL; + const bool expanded = false; #else // NB: use wxGetEnv instead of wxGetenv as otherwise variables // set through wxSetEnv may not be read correctly! - const wxChar *pszValue = NULL; + bool expanded = false; wxString tmp; if (wxGetEnv(strVarName, &tmp)) - pszValue = tmp; -#endif - if ( pszValue != NULL ) { - strResult += pszValue; + { + strResult += tmp; + expanded = true; } - else { + else +#endif + { // variable doesn't exist => don't change anything #ifdef __WXMSW__ if ( bracket != Bracket_Windows ) @@ -424,7 +436,7 @@ wxString wxExpandEnvVars(const wxString& str) } else { // skip closing bracket unless the variables wasn't expanded - if ( pszValue == NULL ) + if ( !expanded ) strResult << (wxChar)bracket; m++; } @@ -453,21 +465,21 @@ wxString wxExpandEnvVars(const wxString& str) } // this function is used to properly interpret '..' in path -void wxSplitPath(wxArrayString& aParts, const wxChar *sz) +void wxSplitPath(wxArrayString& aParts, const wxString& path) { aParts.clear(); wxString strCurrent; - const wxChar *pc = sz; + wxString::const_iterator pc = path.begin(); for ( ;; ) { - if ( *pc == wxT('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) { + if ( pc == path.end() || *pc == wxCONFIG_PATH_SEPARATOR ) { if ( strCurrent == wxT(".") ) { // ignore } else if ( strCurrent == wxT("..") ) { // go up one level if ( aParts.size() == 0 ) - wxLogWarning(_("'%s' has extra '..', ignored."), sz); + wxLogWarning(_("'%s' has extra '..', ignored."), path); else aParts.erase(aParts.end() - 1); @@ -480,12 +492,12 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz) //else: // could log an error here, but we prefer to ignore extra '/' - if ( *pc == wxT('\0') ) + if ( pc == path.end() ) break; } else strCurrent += *pc; - pc++; + ++pc; } }