// headers
// ----------------------------------------------------------------------------
#ifdef __GNUG__
- #pragma implementation "confbase.h"
+ #pragma implementation "confbase.h"
#endif
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include <wx/confbase.h>
-
-#ifdef wxUSE_CONFIG
+#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif //__BORLANDC__
-#include <wx/app.h>
-#include <wx/file.h>
-#include <wx/log.h>
-#include <wx/textfile.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>
+#ifndef wxUSE_CONFIG_NATIVE
+ #define wxUSE_CONFIG_NATIVE 1
#endif
-#include <stdlib.h>
-#include <math.h>
-#include <ctype.h> // for isalnum()
+#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>
// ----------------------------------------------------------------------------
// 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()
+{
+}
+
wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig)
{
wxConfigBase *pOld = ms_pConfig;
{
if ( ms_bAutoCreate && ms_pConfig == NULL ) {
ms_pConfig =
- #if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE)
+ #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
#ifdef __WIN32__
new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
#else //WIN16
bool wxConfigBase::Read(const wxString& key, double* val) const
{
wxString str;
- if (Read(key, & str))
+ if ( Read(key, &str) )
{
- *val = atof(str);
- return TRUE;
+ return str.ToDouble(val);
}
- else
- return FALSE;
+
+ return FALSE;
}
bool wxConfigBase::Read(const wxString& key, double* val, double defVal) const
{
long l;
bool ret = Read(key, &l, (long) defVal);
- *pi = (int) l;
+ if (ret)
+ *pi = (int) l;
return ret;
}
bool wxConfigBase::Write(const wxString& key, double val)
{
wxString str;
- str.Printf("%f", val);
+ str.Printf(wxT("%g"), val);
return Write(key, str);
}
bool wxConfigBase::Write(const wxString& key, bool value)
{
- long l = (value ? 1 : 0);
- return Write(key, l);
+ return Write(key, value ? 1l : 0l);
+}
+
+bool wxConfigBase::Write(const wxString& key, const wxChar *value)
+{
+ // explicit cast needed, otherwise value would have been converted to bool
+ return Write(key, wxString(value));
}
wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
const wxString& strEntry)
{
m_pContainer = (wxConfigBase *)pContainer;
- wxString strPath = strEntry.Before(wxCONFIG_PATH_SEPARATOR);
- // special case of "/keyname" when there is nothing before "/"
- if ( strPath.IsEmpty() && ((!strEntry.IsEmpty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR ))
+ // the path is everything which precedes the last slash
+ wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR);
+
+ // except in the special case of "/keyname" when there is nothing before "/"
+ 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(wxCONFIG_PATH_SEPARATOR);
+ 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 {
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);
- const char *pszValue = getenv(strVarName);
+ const wxChar *pszValue = wxGetenv(strVarName);
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'."),
+ wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %d in '%s'."),
(char)bracket, m + 1, str.c_str());
}
else {
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 char *sz)
+void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
{
aParts.Empty();
wxString strCurrent;
- const char *pc = sz;
+ const wxChar *pc = sz;
for ( ;; ) {
- if ( *pc == '\0' || *pc == wxCONFIG_PATH_SEPARATOR ) {
- if ( strCurrent == "." ) {
+ if ( *pc == wxT('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) {
+ if ( strCurrent == wxT(".") ) {
// ignore
}
- else if ( strCurrent == ".." ) {
+ else if ( strCurrent == wxT("..") ) {
// go up one level
if ( aParts.IsEmpty() )
wxLogWarning(_("'%s' has extra '..', ignored."), sz);
//else:
// could log an error here, but we prefer to ignore extra '/'
- if ( *pc == '\0' )
- return;
+ if ( *pc == wxT('\0') )
+ break;
}
else
strCurrent += *pc;
}
}
-#endif
-
- // wxUSE_CONFIG
+#endif // wxUSE_CONFIG
projects / wxWidgets.git / blobdiff