Blob support fixes - still does not work, but getting there

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 6ad92636937cde58d335a207b72c2859d7a4375d..feccd99ab00c66508a97aac4ce8a70e376d6098a 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -42,7 +42,7 @@
 
 #include <stdlib.h>
 #include <math.h>
-#include <ctype.h>    // for isalnum()
+#include <ctype.h>
 
 // ----------------------------------------------------------------------------
 // global and class static variables
@@ -59,15 +59,22 @@ bool          wxConfigBase::ms_bAutoCreate = TRUE;
 // wxConfigBase
 // ----------------------------------------------------------------------------
 
-// Not all args will always be used by derived classes, but
-// including them all in each class ensures compatibility.
-wxConfigBase::wxConfigBase(const wxString& appName, const wxString& vendorName,
-    const wxString& WXUNUSED(localFilename), const wxString& WXUNUSED(globalFilename), long style):
-        m_appName(appName), m_vendorName(vendorName), m_style(style)
+// Not all args will always be used by derived classes, but including them all
+// in each class ensures compatibility.
+wxConfigBase::wxConfigBase(const wxString& appName,
+                           const wxString& vendorName,
+                           const wxString& WXUNUSED(localFilename),
+                           const wxString& WXUNUSED(globalFilename),
+                           long style)
+            : m_appName(appName), m_vendorName(vendorName), m_style(style)
 {
     m_bExpandEnvVars = TRUE; m_bRecordDefaults = FALSE;
 }
 
+wxConfigBase::~wxConfigBase()
+{
+}
+
 wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig)
 {
   wxConfigBase *pOld = ms_pConfig;
@@ -130,8 +137,8 @@ bool wxConfigBase::Read(const wxString& key, double* val) const
         *val = wxAtof(str);
         return TRUE;
     }
-    else
-        return FALSE;
+
+    return FALSE;
 }
 
 bool wxConfigBase::Read(const wxString& key, double* val, double defVal) const
@@ -285,13 +292,13 @@ wxString wxExpandEnvVars(const wxString& str)
   for ( size_t n = 0; n < str.Len(); n++ ) {
     switch ( str[n] ) {
 #ifdef  __WXMSW__
-      case '%':
+      case wxT('%'):
 #endif  //WINDOWS
-      case '$':
+      case wxT('$'):
         {
           Bracket bracket;
           #ifdef  __WXMSW__
-            if ( str[n] == '%' )
+            if ( str[n] == wxT('%') )
               bracket = Bracket_Windows;
             else
           #endif  //WINDOWS
@@ -300,12 +307,12 @@ wxString wxExpandEnvVars(const wxString& str)
           }
           else {
             switch ( str[n + 1] ) {
-              case '(':
+              case wxT('('):
                 bracket = Bracket_Normal;
                 n++;                   // skip the bracket
                 break;
 
-              case '{':
+              case wxT('{'):
                 bracket = Bracket_Curly;
                 n++;                   // skip the bracket
                 break;
@@ -317,7 +324,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
           m = n + 1;
 
-          while ( m < str.Len() && (isalnum(str[m]) || str[m] == '_') )
+          while ( m < str.Len() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )
             m++;
 
           wxString strVarName(str.c_str() + n + 1, m - n - 1);
@@ -339,8 +346,7 @@ wxString wxExpandEnvVars(const wxString& str)
           // check the closing bracket
           if ( bracket != Bracket_None ) {
             if ( m == str.Len() || str[m] != (char)bracket ) {
-              wxLogWarning(_("Environment variables expansion failed: "
-                            "missing '%c' at position %d in '%s'."),
+              wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %d in '%s'."),
                            (char)bracket, m + 1, str.c_str());
             }
             else {
@@ -357,7 +363,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
       case '\\':
         // backslash can be used to suppress special meaning of % and $
-        if ( n != str.Len() && (str[n + 1] == '%' || str[n + 1] == '$') ) {
+        if ( n != str.Len() && (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) {
           strResult += str[++n];
 
           break;
@@ -401,7 +407,7 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
         // could log an error here, but we prefer to ignore extra '/'
 
       if ( *pc == wxT('\0') )
-        return;
+        break;
     }
     else
       strCurrent += *pc;