X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/702ca7c0704ae15a0ae7aa68588004d6f8d469f4..5b7352027902bebecd06e2a124492fc0ee27f4e2:/src/common/config.cpp

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 47cf94f498..6ad9263693 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -14,43 +14,35 @@
 // 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>    // for isalnum()
 
 // ----------------------------------------------------------------------------
 // global and class static variables
@@ -87,7 +79,7 @@ wxConfigBase *wxConfigBase::Create()
 {
   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
@@ -135,7 +127,7 @@ bool wxConfigBase::Read(const wxString& key, double* val) const
     wxString str;
     if (Read(key, & str))
     {
-        *val = atof(str);
+        *val = wxAtof(str);
         return TRUE;
     }
     else
@@ -198,7 +190,7 @@ bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const
 bool wxConfigBase::Write(const wxString& key, double val)
 {
     wxString str;
-    str.Printf("%f", val);
+    str.Printf(wxT("%f"), val);
     return Write(key, str);
 }
 
@@ -208,6 +200,11 @@ bool wxConfigBase::Write(const wxString& key, bool value)
     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++
@@ -226,16 +223,21 @@ wxConfigPathChanger::wxConfigPathChanger(const 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.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;
     m_pContainer->SetPath(strPath);
@@ -320,7 +322,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
           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;
           }
@@ -338,7 +340,7 @@ wxString wxExpandEnvVars(const wxString& str)
           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 {
@@ -371,18 +373,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);
@@ -398,7 +400,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
@@ -408,7 +410,5 @@ void wxSplitPath(wxArrayString& aParts, const char *sz)
   }
 }
 
-#endif
-
-  // wxUSE_CONFIG
+#endif // wxUSE_CONFIG