///////////////////////////////////////////////////////////////////////////////
// Name: config.cpp
-// Purpose: implementation of wxConfig class
+// Purpose: implementation of wxConfigBase class
// Author: Vadim Zeitlin
// Modified by:
// Created: 07.04.98
// headers
// ----------------------------------------------------------------------------
#ifdef __GNUG__
- #pragma implementation "config.h"
+ #pragma implementation "confbase.h"
#endif
#include "wx/wxprec.h"
#include <wx/file.h>
#include <wx/log.h>
#include <wx/textfile.h>
-#include <wx/config.h>
-#include <wx/fileconf.h>
-#include <stdlib.h>
+#include <wx/confbase.h>
+#include <wx/utils.h>
+
+// we must include (one of) these files for wxConfigBase::Create
+#if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE)
+ #ifdef __WIN32__
+ #include <wx/msw/regconf.h>
+ #else //WIN16
+ #include <wx/msw/iniconf.h>
+ #endif
+#else // either we're under Unix or wish to use files even under Windows
+ #include <wx/fileconf.h>
+#endif
+#include <stdlib.h>
+#include <math.h>
#include <ctype.h> // for isalnum()
// ----------------------------------------------------------------------------
// global and class static variables
// ----------------------------------------------------------------------------
-wxConfig *wxConfig::ms_pConfig = NULL;
+wxConfigBase *wxConfigBase::ms_pConfig = NULL;
+bool wxConfigBase::ms_bAutoCreate = TRUE;
// ============================================================================
// implementation
// ============================================================================
// ----------------------------------------------------------------------------
-// wxConfig
+// wxConfigBase
// ----------------------------------------------------------------------------
-wxConfig::~wxConfig()
+
+// 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;
}
-wxConfig *wxConfig::Set(wxConfig *pConfig)
+wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig)
{
- wxConfig *pOld = ms_pConfig;
+ wxConfigBase *pOld = ms_pConfig;
ms_pConfig = pConfig;
return pOld;
}
-void wxConfig::Create()
+wxConfigBase *wxConfigBase::Create()
{
- ms_pConfig = wxTheApp->CreateConfig();
+ if ( ms_bAutoCreate && ms_pConfig == NULL ) {
+ ms_pConfig =
+ #if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE)
+ #ifdef __WIN32__
+ 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;
}
-const char *wxConfig::Read(const char *szKey, const char *szDefault) const
+wxString wxConfigBase::Read(const wxString& key, const wxString& defVal) const
{
- static char s_szBuf[1024];
wxString s;
- Read(&s, szKey, szDefault);
- strncpy(s_szBuf, s, WXSIZEOF(s_szBuf));
+ Read(key, &s, defVal);
+ return s;
+}
+
+bool wxConfigBase::Read(const wxString& key, wxString *str, const wxString& defVal) const
+{
+ if (!Read(key, str))
+ {
+ *str = ExpandEnvVars(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;
+}
- return s_szBuf;
+bool wxConfigBase::Read(const wxString& key, double* val) const
+{
+ wxString str;
+ if (Read(key, & str))
+ {
+ *val = atof(str);
+ return TRUE;
+ }
+ else
+ return FALSE;
}
+bool wxConfigBase::Read(const wxString& key, double* val, double defVal) const
+{
+ if (!Read(key, val))
+ {
+ *val = defVal;
+ return FALSE;
+ }
+ else
+ return TRUE;
+}
+
+bool wxConfigBase::Read(const wxString& key, bool* val) const
+{
+ long l;
+ if (Read(key, & l))
+ {
+ *val = (l != 0);
+ return TRUE;
+ }
+ else
+ return FALSE;
+}
+
+bool wxConfigBase::Read(const wxString& key, bool* val, bool defVal) const
+{
+ if (!Read(key, val))
+ {
+ *val = defVal;
+ return FALSE;
+ }
+ else
+ return TRUE;
+}
+
+// Convenience functions
+
+bool wxConfigBase::Read(const wxString& key, int *pi) const
+{
+ long l;
+ bool ret = Read(key, &l);
+ if (ret)
+ *pi = (int) l;
+ return ret;
+}
+
+bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const
+{
+ long l;
+ bool ret = Read(key, &l, (long) defVal);
+ *pi = (int) l;
+ return ret;
+}
+
+bool wxConfigBase::Write(const wxString& key, double val)
+{
+ wxString str;
+ str.Printf("%f", val);
+ return Write(key, str);
+}
+
+bool wxConfigBase::Write(const wxString& key, bool value)
+{
+ long l = (value ? 1 : 0);
+ return Write(key, l);
+}
+
+
// ----------------------------------------------------------------------------
-// Config::PathChanger
+// wxConfigPathChanger
// ----------------------------------------------------------------------------
-wxConfig::PathChanger::PathChanger(const wxConfig *pContainer,
+wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
const wxString& strEntry)
{
- m_pContainer = (wxConfig *)pContainer;
- wxString strPath = strEntry.Before(APPCONF_PATH_SEPARATOR);
+ m_pContainer = (wxConfigBase *)pContainer;
+ wxString strPath = strEntry.Before(wxCONFIG_PATH_SEPARATOR);
// special case of "/keyname" when there is nothing before "/"
- if ( strPath.IsEmpty() && strEntry[0] == APPCONF_PATH_SEPARATOR )
- strPath = APPCONF_PATH_SEPARATOR;
+ if ( strPath.IsEmpty() && ((!strEntry.IsEmpty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR ))
+ strPath = wxCONFIG_PATH_SEPARATOR;
if ( !strPath.IsEmpty() ) {
// do change the path
m_bChanged = TRUE;
- m_strName = strEntry.Right(APPCONF_PATH_SEPARATOR);
+ m_strName = strEntry.Right(wxCONFIG_PATH_SEPARATOR);
m_strOldPath = m_pContainer->GetPath();
- m_strOldPath += APPCONF_PATH_SEPARATOR;
+ m_strOldPath += wxCONFIG_PATH_SEPARATOR;
m_pContainer->SetPath(strPath);
}
else {
}
}
-wxConfig::PathChanger::~PathChanger()
+wxConfigPathChanger::~wxConfigPathChanger()
{
// only restore path if it was changed
if ( m_bChanged ) {
// understands both Unix and Windows (but only under Windows) environment
// variables expansion: i.e. $var, $(var) and ${var} are always understood
// and in addition under Windows %var% is also.
-wxString ExpandEnvVars(const wxString& str)
+wxString wxExpandEnvVars(const wxString& str)
{
wxString strResult;
strResult.Alloc(str.Len());
#endif
};
- uint m;
- for ( uint n = 0; n < str.Len(); n++ ) {
+ size_t m;
+ for ( size_t n = 0; n < str.Len(); n++ ) {
switch ( str[n] ) {
#ifdef __WXMSW__
case '%':
// check the closing bracket
if ( bracket != Bracket_None ) {
if ( m == str.Len() || str[m] != (char)bracket ) {
- wxLogWarning("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 {
- // skip closing bracket
+ // skip closing bracket unless the variables wasn't expanded
if ( pszValue == NULL )
strResult << (char)bracket;
m++;
}
break;
+ case '\\':
+ // backslash can be used to suppress special meaning of % and $
+ if ( n != str.Len() && (str[n + 1] == '%' || str[n + 1] == '$') ) {
+ strResult += str[++n];
+
+ break;
+ }
+ //else: fall through
+
default:
strResult += str[n];
}
}
// this function is used to properly interpret '..' in path
-void SplitPath(wxArrayString& aParts, const char *sz)
+void wxSplitPath(wxArrayString& aParts, const char *sz)
{
aParts.Empty();
wxString strCurrent;
const char *pc = sz;
for ( ;; ) {
- if ( *pc == '\0' || *pc == APPCONF_PATH_SEPARATOR ) {
+ if ( *pc == '\0' || *pc == wxCONFIG_PATH_SEPARATOR ) {
if ( strCurrent == "." ) {
// ignore
}
else if ( strCurrent == ".." ) {
// go up one level
if ( aParts.IsEmpty() )
- wxLogWarning("'%s' has extra '..', ignored.", sz);
+ wxLogWarning(_("'%s' has extra '..', ignored."), sz);
else
aParts.Remove(aParts.Count() - 1);
}
}
+
projects / wxWidgets.git / blobdiff