X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba8c1601448fa16d64c4e75a095f1cb037909c5b..8998887c224924d5f6f4601597c162d6429495e1:/src/common/config.cpp

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 664f34574c..7e4173e4e2 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -13,7 +13,7 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "confbase.h"
 #endif
 
@@ -30,6 +30,7 @@
 #include "wx/config.h"
 #include "wx/intl.h"
 #include "wx/log.h"
+#include "wx/arrstr.h"
 
 #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
 
@@ -49,7 +50,7 @@
 // ----------------------------------------------------------------------------
 
 wxConfigBase *wxConfigBase::ms_pConfig     = NULL;
-bool          wxConfigBase::ms_bAutoCreate = TRUE;
+bool          wxConfigBase::ms_bAutoCreate = true;
 
 // ============================================================================
 // implementation
@@ -68,8 +69,8 @@ wxConfigBase::wxConfigBase(const wxString& appName,
                            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()
@@ -88,11 +89,7 @@ wxConfigBase *wxConfigBase::Create()
   if ( ms_bAutoCreate && ms_pConfig == NULL ) {
     ms_pConfig =
     #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
-      #ifdef __WIN32__
         new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
-      #else  //WIN16
-        new wxIniConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
-      #endif
     #else // either we're under Unix or wish to use files even under Windows
       new wxFileConfig(wxTheApp->GetAppName());
     #endif
@@ -109,21 +106,21 @@ wxConfigBase *wxConfigBase::Create()
 #define IMPLEMENT_READ_FOR_TYPE(name, type, deftype, extra)                 \
     bool wxConfigBase::Read(const wxString& key, type *val) const           \
     {                                                                       \
-        wxCHECK_MSG( val, FALSE, _T("wxConfig::Read(): NULL parameter") );  \
+        wxCHECK_MSG( val, false, _T("wxConfig::Read(): NULL parameter") );  \
                                                                             \
         if ( !DoRead##name(key, val) )                                      \
-            return FALSE;                                                   \
+            return false;                                                   \
                                                                             \
         *val = extra(*val);                                                 \
                                                                             \
-        return TRUE;                                                        \
+        return true;                                                        \
     }                                                                       \
                                                                             \
     bool wxConfigBase::Read(const wxString& key,                            \
                             type *val,                                      \
                             deftype defVal) const                           \
     {                                                                       \
-        wxCHECK_MSG( val, FALSE, _T("wxConfig::Read(): NULL parameter") );  \
+        wxCHECK_MSG( val, false, _T("wxConfig::Read(): NULL parameter") );  \
                                                                             \
         bool read = DoRead##name(key, val);                                 \
         if ( !read )                                                        \
@@ -154,32 +151,32 @@ IMPLEMENT_READ_FOR_TYPE(Bool, bool, bool, bool)
 // but can be overridden in the derived ones
 bool wxConfigBase::DoReadInt(const wxString& key, int *pi) const
 {
-    wxCHECK_MSG( pi, FALSE, _T("wxConfig::Read(): NULL parameter") );
+    wxCHECK_MSG( pi, false, _T("wxConfig::Read(): NULL parameter") );
 
     long l;
     if ( !DoReadLong(key, &l) )
-        return FALSE;
+        return false;
 
     wxASSERT_MSG( l < INT_MAX, _T("overflow in wxConfig::DoReadInt") );
 
     *pi = (int)l;
 
-    return TRUE;
+    return true;
 }
 
 bool wxConfigBase::DoReadBool(const wxString& key, bool* val) const
 {
-    wxCHECK_MSG( val, FALSE, _T("wxConfig::Read(): NULL parameter") );
+    wxCHECK_MSG( val, false, _T("wxConfig::Read(): NULL parameter") );
 
     long l;
     if ( !DoReadLong(key, &l) )
-        return FALSE;
+        return false;
 
     wxASSERT_MSG( l == 0 || l == 1, _T("bad bool value in wxConfig::DoReadInt") );
 
     *val = l != 0;
 
-    return TRUE;
+    return true;
 }
 
 bool wxConfigBase::DoReadDouble(const wxString& key, double* val) const
@@ -190,7 +187,7 @@ bool wxConfigBase::DoReadDouble(const wxString& key, double* val) const
         return str.ToDouble(val);
     }
 
-    return FALSE;
+    return false;
 }
 
 // string reading helper
@@ -244,17 +241,17 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
 
   if ( !strPath.IsEmpty() ) {
     // do change the path
-    m_bChanged = TRUE;
+    m_bChanged = true;
     m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR);
     m_strOldPath = m_pContainer->GetPath();
-    if ( m_strOldPath.Len() == 0 || 
+    if ( m_strOldPath.Len() == 0 ||
          m_strOldPath.Last() != wxCONFIG_PATH_SEPARATOR )
         m_strOldPath += wxCONFIG_PATH_SEPARATOR;
     m_pContainer->SetPath(strPath);
   }
   else {
     // it's a name only, without path - nothing to do
-    m_bChanged = FALSE;
+    m_bChanged = false;
     m_strName = strEntry;
   }
 }
@@ -335,7 +332,11 @@ wxString wxExpandEnvVars(const wxString& str)
 
           wxString strVarName(str.c_str() + n + 1, m - n - 1);
 
+#ifdef __WXWINCE__
+          const wxChar *pszValue = NULL;
+#else
           const wxChar *pszValue = wxGetenv(strVarName);
+#endif
           if ( pszValue != NULL ) {
             strResult += pszValue;
           }
@@ -351,7 +352,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
           // check the closing bracket
           if ( bracket != Bracket_None ) {
-            if ( m == str.Len() || str[m] != (char)bracket ) {
+            if ( m == str.Len() || str[m] != (wxChar)bracket ) {
               // under MSW it's common to have '%' characters in the registry
               // and it's annoying to have warnings about them each time, so
               // ignroe them silently if they are not used for env vars
@@ -395,7 +396,7 @@ wxString wxExpandEnvVars(const wxString& str)
 // this function is used to properly interpret '..' in path
 void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
 {
-  aParts.Empty();
+  aParts.clear();
 
   wxString strCurrent;
   const wxChar *pc = sz;
@@ -406,15 +407,15 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
       }
       else if ( strCurrent == wxT("..") ) {
         // go up one level
-        if ( aParts.IsEmpty() )
+        if ( aParts.size() == 0 )
           wxLogWarning(_("'%s' has extra '..', ignored."), sz);
         else
-          aParts.RemoveAt(aParts.Count() - 1);
+          aParts.erase(aParts.end() - 1);
 
         strCurrent.Empty();
       }
       else if ( !strCurrent.IsEmpty() ) {
-        aParts.Add(strCurrent);
+        aParts.push_back(strCurrent);
         strCurrent.Empty();
       }
       //else: