reverted the fix for Unicode compilation with VC++ as it breaks other ports (and...

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 19822e46912a335c1d6efe3e886a9e76118683b5..05ca5af209b99fccdf4516182e5c91e6a0894ca3 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -23,22 +23,25 @@
   #pragma hdrstop
 #endif  //__BORLANDC__
 
   #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"
+
+#if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)

 
 #include "wx/app.h"
 #include "wx/file.h"
 
 #include "wx/app.h"
 #include "wx/file.h"

-#include "wx/log.h"

 #include "wx/textfile.h"
 #include "wx/utils.h"
 #include "wx/textfile.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 #include "wx/utils.h"
 #include "wx/utils.h"

-#include "wx/intl.h"
-
-#include "wx/config.h"

 
 #include <stdlib.h>
 #include <math.h>
 
 #include <stdlib.h>
 #include <math.h>

-#include <ctype.h>    // for isalnum()
+#include <ctype.h>

 
 // ----------------------------------------------------------------------------
 // global and class static variables
 
 // ----------------------------------------------------------------------------
 // global and class static variables


@@ -55,15 +58,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)
+// 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;
 }
 
 {
     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;


@@ -75,7 +85,7 @@ 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__
         new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
       #else  //WIN16
       #ifdef __WIN32__
         new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
       #else  //WIN16


@@ -121,13 +131,12 @@ bool wxConfigBase::Read(const wxString& key, long *pl, long defVal) const
 bool wxConfigBase::Read(const wxString& key, double* val) const
 {
     wxString str;
 bool wxConfigBase::Read(const wxString& key, double* val) const
 {
     wxString str;

-    if (Read(key, & str))
+    if ( Read(key, &str) )

     {
     {

-        *val = wxAtof(str);
-        return TRUE;
+        return str.ToDouble(val);

     }
     }

-    else
-        return FALSE;
+
+    return FALSE;

 }
 
 bool wxConfigBase::Read(const wxString& key, double* val, double defVal) const
 }
 
 bool wxConfigBase::Read(const wxString& key, double* val, double defVal) const


@@ -179,28 +188,29 @@ bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const
 {
     long l;
     bool ret = Read(key, &l, (long) defVal);
 {
     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;
     return ret;
 }
 
 bool wxConfigBase::Write(const wxString& key, double val)
 {
     wxString str;

-    str.Printf(wxT("%f"), val);
+    str.Printf(wxT("%g"), val);

     return Write(key, str);
 }
 
 bool wxConfigBase::Write(const wxString& key, bool value)
 {
     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 *text )
+bool wxConfigBase::Write(const wxString& key, const wxChar *value)

 {
 {

-       wxString str( text ) ;
-       return Write( key, str ) ;
+    // explicit cast needed, otherwise value would have been converted to bool
+    return Write(key, wxString(value));

 }
 }

+

 wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
 {
     wxString tmp; // Required for BC++
 wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
 {
     wxString tmp; // Required for BC++


@@ -235,7 +245,9 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
     m_bChanged = TRUE;
     m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR);
     m_strOldPath = m_pContainer->GetPath();
     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 {
     m_pContainer->SetPath(strPath);
   }
   else {


@@ -253,6 +265,8 @@ wxConfigPathChanger::~wxConfigPathChanger()
   }
 }
 
   }
 }
 

+#endif // wxUSE_CONFIG
+

 // ----------------------------------------------------------------------------
 // static & global functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static & global functions
 // ----------------------------------------------------------------------------


@@ -281,13 +295,13 @@ wxString wxExpandEnvVars(const wxString& str)
   for ( size_t n = 0; n < str.Len(); n++ ) {
     switch ( str[n] ) {
 #ifdef  __WXMSW__
   for ( size_t n = 0; n < str.Len(); n++ ) {
     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


@@ -296,12 +310,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;


@@ -313,7 +327,7 @@ 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);


@@ -335,8 +349,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 {


@@ -353,7 +366,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;


@@ -369,6 +382,8 @@ wxString wxExpandEnvVars(const wxString& str)
 }
 
 // this function is used to properly interpret '..' in path
 }
 
 // this function is used to properly interpret '..' in path

+/// separates group and entry names (probably shouldn't be changed)
+

 void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
 {
   aParts.Empty();
 void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
 {
   aParts.Empty();


@@ -397,7 +412,7 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
         // could log an error here, but we prefer to ignore extra '/'
 
       if ( *pc == wxT('\0') )
         // could log an error here, but we prefer to ignore extra '/'
 
       if ( *pc == wxT('\0') )

-        return;
+        break;

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


@@ -406,5 +421,4 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
   }
 }
 
   }
 }
 

-#endif // wxUSE_CONFIG