OS/2 updates for easier VA debugging

[wxWidgets.git] / src / common / config.cpp

diff --git a/src/common/config.cpp b/src/common/config.cpp
index b7c4a11854e14cb6d1c52de4422b6869f7f91a9f..feccd99ab00c66508a97aac4ce8a70e376d6098a 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -10,47 +10,39 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 #ifdef __GNUG__

-  #pragma implementation "config.h"
+    #pragma implementation "confbase.h"

 #endif
 
 #endif
 

-#include  "wx/wxprec.h"
+#include "wx/wxprec.h"

 
 #ifdef    __BORLANDC__
   #pragma hdrstop
 #endif  //__BORLANDC__
 
 
 #ifdef    __BORLANDC__
   #pragma hdrstop
 #endif  //__BORLANDC__
 

-#ifndef WX_PRECOMP
-  #include  <wx/string.h>
-  #include  <wx/intl.h>
-#endif //WX_PRECOMP
-
-#include  <wx/app.h>
-#include  <wx/file.h>
-#include  <wx/log.h>
-#include  <wx/textfile.h>
-#include  <wx/config.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
 
 #endif
 

-#include  <stdlib.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
 
 // ----------------------------------------------------------------------------
 // global and class static variables


@@ -67,6 +59,22 @@ bool          wxConfigBase::ms_bAutoCreate = TRUE;
 // wxConfigBase
 // ----------------------------------------------------------------------------
 
 // 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)
+{
+    m_bExpandEnvVars = TRUE; m_bRecordDefaults = FALSE;
+}
+
+wxConfigBase::~wxConfigBase()
+{
+}
+

 wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig)
 {
   wxConfigBase *pOld = ms_pConfig;
 wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig)
 {
   wxConfigBase *pOld = ms_pConfig;


@@ -78,10 +86,9 @@ wxConfigBase *wxConfigBase::Create()
 {
   if ( ms_bAutoCreate && ms_pConfig == NULL ) {
     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__
       #ifdef __WIN32__

-        new wxRegConfig(wxTheApp->GetVendorName() + '\\' 
-                        + wxTheApp->GetAppName());
+        new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());

       #else  //WIN16
         new wxIniConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
       #endif
       #else  //WIN16
         new wxIniConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
       #endif


@@ -93,34 +100,151 @@ wxConfigBase *wxConfigBase::Create()
   return ms_pConfig;
 }
 
   return ms_pConfig;
 }
 

-const char *wxConfigBase::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;
   wxString s;

-  Read(&s, szKey, szDefault);
-  strncpy(s_szBuf, s, WXSIZEOF(s_szBuf));
+  Read(key, &s, defVal);
+  return s;
+}

 
 

-  return s_szBuf;
+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;
+}
+
+bool wxConfigBase::Read(const wxString& key, double* val) const
+{
+    wxString str;
+    if (Read(key, & str))
+    {
+        *val = wxAtof(str);
+        return TRUE;
+    }
+
+    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(wxT("%f"), val);
+    return Write(key, str);
+}
+
+bool wxConfigBase::Write(const wxString& key, bool value)
+{
+    long l = (value ? 1 : 0);
+    return Write(key, l);
+}
+
+bool wxConfigBase::Write( const wxString &key, const wxChar *text )
+{
+       wxString str( text ) ;
+       return Write( key, str ) ;
+}
+wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
+{
+    wxString tmp; // Required for BC++
+    if (IsExpandingEnvVars())
+        tmp = wxExpandEnvVars(str);
+    else
+        tmp = str;
+    return tmp;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// Config::PathChanger
+// wxConfigPathChanger

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-wxConfigBase::PathChanger::PathChanger(const wxConfigBase *pContainer,
+wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,

                                  const wxString& strEntry)
 {
   m_pContainer = (wxConfigBase *)pContainer;
                                  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[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;
     strPath = wxCONFIG_PATH_SEPARATOR;

+  }

 
   if ( !strPath.IsEmpty() ) {
     // do change the path
     m_bChanged = TRUE;
 
   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;
     m_pContainer->SetPath(strPath);
     m_strOldPath = m_pContainer->GetPath();
     m_strOldPath += wxCONFIG_PATH_SEPARATOR;
     m_pContainer->SetPath(strPath);


@@ -132,7 +256,7 @@ wxConfigBase::PathChanger::PathChanger(const wxConfigBase *pContainer,
   }
 }
 
   }
 }
 

-wxConfigBase::PathChanger::~PathChanger()
+wxConfigPathChanger::~wxConfigPathChanger()

 {
   // only restore path if it was changed
   if ( m_bChanged ) {
 {
   // only restore path if it was changed
   if ( m_bChanged ) {


@@ -158,23 +282,23 @@ wxString wxExpandEnvVars(const wxString& str)
   {
     Bracket_None,
     Bracket_Normal  = ')',
   {
     Bracket_None,
     Bracket_Normal  = ')',

-    Bracket_Curly   = '}',
+    Bracket_Curly   = '}'

 #ifdef  __WXMSW__
 #ifdef  __WXMSW__

-    Bracket_Windows = '%'     // yeah, Windows people are a bit strange ;-)
+    ,Bracket_Windows = '%'     // yeah, Windows people are a bit strange ;-)

 #endif
   };
 
 #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__
     switch ( str[n] ) {
 #ifdef  __WXMSW__

-      case '%':
+      case wxT('%'):

 #endif  //WINDOWS
 #endif  //WINDOWS

-      case '$':
+      case wxT('$'):

         {
           Bracket bracket;
           #ifdef  __WXMSW__
         {
           Bracket bracket;
           #ifdef  __WXMSW__

-            if ( str[n] == '%' )
+            if ( str[n] == wxT('%') )

               bracket = Bracket_Windows;
             else
           #endif  //WINDOWS
               bracket = Bracket_Windows;
             else
           #endif  //WINDOWS


@@ -183,12 +307,12 @@ wxString wxExpandEnvVars(const wxString& str)
           }
           else {
             switch ( str[n + 1] ) {
           }
           else {
             switch ( str[n + 1] ) {

-              case '(':
+              case wxT('('):

                 bracket = Bracket_Normal;
                 n++;                   // skip the bracket
                 break;
 
                 bracket = Bracket_Normal;
                 n++;                   // skip the bracket
                 break;
 

-              case '{':
+              case wxT('{'):

                 bracket = Bracket_Curly;
                 n++;                   // skip the bracket
                 break;
                 bracket = Bracket_Curly;
                 n++;                   // skip the bracket
                 break;


@@ -200,12 +324,12 @@ wxString wxExpandEnvVars(const wxString& str)
 
           m = n + 1;
 
 
           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);
 
             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;
           }
           if ( pszValue != NULL ) {
             strResult += pszValue;
           }


@@ -222,8 +346,7 @@ wxString wxExpandEnvVars(const wxString& str)
           // check the closing bracket
           if ( bracket != Bracket_None ) {
             if ( m == str.Len() || str[m] != (char)bracket ) {
           // 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 {
                            (char)bracket, m + 1, str.c_str());
             }
             else {


@@ -240,7 +363,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
       case '\\':
         // backslash can be used to suppress special meaning of % and $
 
       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;
           strResult += str[++n];
 
           break;


@@ -256,18 +379,18 @@ wxString wxExpandEnvVars(const wxString& str)
 }
 
 // this function is used to properly interpret '..' in path
 }
 
 // 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;
 {
   aParts.Empty();
 
   wxString strCurrent;

-  const char *pc = sz;
+  const wxChar *pc = sz;

   for ( ;; ) {
   for ( ;; ) {

-    if ( *pc == '\0' || *pc == wxCONFIG_PATH_SEPARATOR ) {
-      if ( strCurrent == "." ) {
+    if ( *pc == wxT('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) {
+      if ( strCurrent == wxT(".") ) {

         // ignore
       }
         // ignore
       }

-      else if ( strCurrent == ".." ) {
+      else if ( strCurrent == wxT("..") ) {

         // go up one level
         if ( aParts.IsEmpty() )
           wxLogWarning(_("'%s' has extra '..', ignored."), sz);
         // go up one level
         if ( aParts.IsEmpty() )
           wxLogWarning(_("'%s' has extra '..', ignored."), sz);


@@ -283,8 +406,8 @@ void wxSplitPath(wxArrayString& aParts, const char *sz)
       //else:
         // could log an error here, but we prefer to ignore extra '/'
 
       //else:
         // could log an error here, but we prefer to ignore extra '/'
 

-      if ( *pc == '\0' )
-        return;
+      if ( *pc == wxT('\0') )
+        break;

     }
     else
       strCurrent += *pc;
     }
     else
       strCurrent += *pc;


@@ -293,3 +416,5 @@ void wxSplitPath(wxArrayString& aParts, const char *sz)
   }
 }
 
   }
 }
 

+#endif // wxUSE_CONFIG
+