X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2df7be7f2cca699a02ee0c9ce69de9bfe6b0922f..f1df09276caf8575eed4e9bf2689c69903a749a9:/src/common/config.cpp?ds=sidebyside

diff --git a/src/common/config.cpp b/src/common/config.cpp
index fc96bb57f6..6ad9263693 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -23,7 +23,11 @@
   #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
+
+#if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
 
 #include "wx/app.h"
 #include "wx/file.h"
@@ -75,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
@@ -186,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(_T("%f"), val);
+    str.Printf(wxT("%f"), val);
     return Write(key, str);
 }
 
@@ -196,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++
@@ -371,11 +380,11 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
   wxString strCurrent;
   const wxChar *pc = sz;
   for ( ;; ) {
-    if ( *pc == _T('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) {
-      if ( strCurrent == _T(".") ) {
+    if ( *pc == wxT('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) {
+      if ( strCurrent == wxT(".") ) {
         // ignore
       }
-      else if ( strCurrent == _T("..") ) {
+      else if ( strCurrent == wxT("..") ) {
         // go up one level
         if ( aParts.IsEmpty() )
           wxLogWarning(_("'%s' has extra '..', ignored."), sz);
@@ -391,7 +400,7 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
       //else:
         // could log an error here, but we prefer to ignore extra '/'
 
-      if ( *pc == _T('\0') )
+      if ( *pc == wxT('\0') )
         return;
     }
     else