// RCS-ID: $Id$
// Copyright: (c) 1997 Karsten Ballüder Ballueder@usa.net
// Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "confbase.h"
#endif
#pragma hdrstop
#endif //__BORLANDC__
-#if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || defined(wxCONFIG_WIN32_NATIVE))
+#ifndef wxUSE_CONFIG_NATIVE
+ #define wxUSE_CONFIG_NATIVE 1
+#endif
+
+#include "wx/config.h"
+#include "wx/intl.h"
+#include "wx/log.h"
+#include "wx/arrstr.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 <stdlib.h>
#include <math.h>
-#include <ctype.h> // for isalnum()
+#include <ctype.h>
+#include <limits.h> // for INT_MAX
// ----------------------------------------------------------------------------
// global and class static variables
// 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()
{
- m_bExpandEnvVars = TRUE; m_bRecordDefaults = FALSE;
}
wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig)
{
if ( ms_bAutoCreate && ms_pConfig == NULL ) {
ms_pConfig =
- #if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE)
- #ifdef __WIN32__
+ #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
- #else //WIN16
- new wxIniConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
- #endif
#else // either we're under Unix or wish to use files even under Windows
new wxFileConfig(wxTheApp->GetAppName());
#endif
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))
- {
- *val = wxAtof(str);
- return TRUE;
- }
- else
- return FALSE;
-}
+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)
-bool wxConfigBase::Read(const wxString& key, double* val, double defVal) const
-{
- if (!Read(key, val))
- {
- *val = defVal;
- return FALSE;
- }
- else
- return TRUE;
-}
+#undef IMPLEMENT_READ_FOR_TYPE
-bool wxConfigBase::Read(const wxString& key, bool* val) 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
{
+ wxCHECK_MSG( pi, FALSE, _T("wxConfig::Read(): NULL parameter") );
+
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);
- *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(T("%f"), 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;
}
+// string reading helper
wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
{
wxString tmp; // Required for BC++
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
// ----------------------------------------------------------------------------
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 {
}
}
+#endif // wxUSE_CONFIG
+
// ----------------------------------------------------------------------------
// static & global functions
// ----------------------------------------------------------------------------
{
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;
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
}
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;
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);
+#ifdef __WXWINCE__
+ const wxChar *pszValue = NULL;
+#else
const wxChar *pszValue = wxGetenv(strVarName);
+#endif
if ( pszValue != NULL ) {
strResult += pszValue;
}
// 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
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;
// this function is used to properly interpret '..' in path
void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
{
- aParts.Empty();
+ aParts.clear();
wxString strCurrent;
const wxChar *pc = sz;
for ( ;; ) {
- if ( *pc == T('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) {
- if ( strCurrent == T(".") ) {
+ if ( *pc == wxT('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) {
+ if ( strCurrent == wxT(".") ) {
// ignore
}
- else if ( strCurrent == T("..") ) {
+ else if ( strCurrent == wxT("..") ) {
// go up one level
- if ( aParts.IsEmpty() )
+ if ( aParts.size() == 0 )
wxLogWarning(_("'%s' has extra '..', ignored."), sz);
else
- aParts.Remove(aParts.Count() - 1);
+ aParts.erase(aParts.end() - 1);
strCurrent.Empty();
}
else if ( !strCurrent.IsEmpty() ) {
- aParts.Add(strCurrent);
+ aParts.push_back(strCurrent);
strCurrent.Empty();
}
//else:
// could log an error here, but we prefer to ignore extra '/'
- if ( *pc == T('\0') )
- return;
+ if ( *pc == wxT('\0') )
+ break;
}
else
strCurrent += *pc;
}
}
-#endif // wxUSE_CONFIG
projects / wxWidgets.git / blobdiff