Now uses proper wxUSE_xxx flags

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 4a0935b93ca1a2c012d9d87c6a556ffa92ea3a54..fc96bb57f6e5a423ea7296503739cc86f46dc621 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -19,21 +19,20 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#ifndef WX_PRECOMP
-    #include  "wx/wx.h"
-#endif
-
-#if wxUSE_CONFIG
-

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

+#if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || defined(wxCONFIG_WIN32_NATIVE))
+

 #include "wx/app.h"
 #include "wx/file.h"
 #include "wx/log.h"
 #include "wx/textfile.h"
 #include "wx/utils.h"
 #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 "wx/config.h"
 


@@ -124,7 +123,7 @@ bool wxConfigBase::Read(const wxString& key, double* val) const
     wxString str;
     if (Read(key, & str))
     {
     wxString str;
     if (Read(key, & str))
     {

-        *val = atof(str);
+        *val = wxAtof(str);

         return TRUE;
     }
     else
         return TRUE;
     }
     else


@@ -187,7 +186,7 @@ bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const
 bool wxConfigBase::Write(const wxString& key, double val)
 {
     wxString str;
 bool wxConfigBase::Write(const wxString& key, double val)
 {
     wxString str;

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

     return Write(key, str);
 }
 
     return Write(key, str);
 }
 


@@ -314,7 +313,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
           wxString strVarName(str.c_str() + n + 1, m - n - 1);
 
 
           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;
           }


@@ -332,7 +331,7 @@ wxString wxExpandEnvVars(const wxString& str)
           if ( bracket != Bracket_None ) {
             if ( m == str.Len() || str[m] != (char)bracket ) {
               wxLogWarning(_("Environment variables expansion failed: "
           if ( bracket != Bracket_None ) {
             if ( m == str.Len() || str[m] != (char)bracket ) {
               wxLogWarning(_("Environment variables expansion failed: "

-                             "missing '%c' at position %d in '%s'."),
+                            "missing '%c' at position %d in '%s'."),

                            (char)bracket, m + 1, str.c_str());
             }
             else {
                            (char)bracket, m + 1, str.c_str());
             }
             else {


@@ -365,18 +364,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 == _T('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) {
+      if ( strCurrent == _T(".") ) {

         // ignore
       }
         // ignore
       }

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

         // 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);


@@ -392,7 +391,7 @@ 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' )
+      if ( *pc == _T('\0') )

         return;
     }
     else
         return;
     }
     else