X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/509201463dbd3bce8aff762c664b111a8f2c3412..5e84fc5a820a15a1ce2d32d2ae71f0bf92abda3d:/src/common/config.cpp

diff --git a/src/common/config.cpp b/src/common/config.cpp
index b9aefd7202..f93307ed0f 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -19,21 +19,20 @@
 
 #include "wx/wxprec.h"
 
-#ifndef WX_PRECOMP
-    #include  "wx/wx.h"
-#endif
-
-#if wxUSE_CONFIG
-
 #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/log.h"
+#include "wx/utils.h"
+#include "wx/intl.h"
 
 #include "wx/config.h"
 
@@ -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;
-    str.Printf(_T("%f"), val);
+    str.Printf(wxT("%f"), val);
     return Write(key, str);
 }
 
@@ -365,18 +364,18 @@ wxString wxExpandEnvVars(const wxString& str)
 }
 
 // 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);
@@ -392,7 +391,7 @@ void wxSplitPath(wxArrayString& aParts, const char *sz)
       //else:
         // could log an error here, but we prefer to ignore extra '/'
 
-      if ( *pc == '\0' )
+      if ( *pc == wxT('\0') )
         return;
     }
     else