Compilation fix for r74440 and STL builds.

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 7ecc5d5778db1cafaa76532f8ff70a45fd58b500..1ca75fa2cfb983e1d69935457fcda7a3a6d65c17 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -63,10 +63,8 @@ bool          wxConfigBase::ms_bAutoCreate = true;
 wxConfigBase *wxAppTraitsBase::CreateConfig()
 {
     return new
 wxConfigBase *wxAppTraitsBase::CreateConfig()
 {
     return new

-    #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
+    #if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE

         wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
         wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());

-    #elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE
-        wxPrefConfig(wxTheApp->GetAppName());

     #else // either we're under Unix or wish to use files even under Windows
         wxFileConfig(wxTheApp->GetAppName());
     #endif
     #else // either we're under Unix or wish to use files even under Windows
         wxFileConfig(wxTheApp->GetAppName());
     #endif


@@ -221,7 +219,15 @@ bool wxConfigBase::DoReadBool(const wxString& key, bool* val) const
     if ( !DoReadLong(key, &l) )
         return false;
 
     if ( !DoReadLong(key, &l) )
         return false;
 

-    wxASSERT_MSG( l == 0 || l == 1, wxT("bad bool value in wxConfig::DoReadInt") );
+    if ( l != 0 && l != 1 )
+    {
+        // Don't assert here as this could happen in the result of user editing
+        // the file directly and this not indicate a bug in the program but
+        // still complain that something is wrong.
+        wxLogWarning(_("Invalid value %ld for a boolean key \"%s\" in "
+                       "config file."),
+                     l, key);
+    }

 
     *val = l != 0;
 
 
     *val = l != 0;
 


@@ -233,7 +239,14 @@ bool wxConfigBase::DoReadDouble(const wxString& key, double* val) const
     wxString str;
     if ( Read(key, &str) )
     {
     wxString str;
     if ( Read(key, &str) )
     {

-        return str.ToDouble(val);
+        if ( str.ToCDouble(val) )
+            return true;
+
+        // Previous versions of wxFileConfig wrote the numbers out using the
+        // current locale and not the C one as now, so attempt to parse the
+        // string as a number in the current locale too, for compatibility.
+        if ( str.ToDouble(val) )
+            return true;

     }
 
     return false;
     }
 
     return false;


@@ -256,7 +269,10 @@ wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
 
 bool wxConfigBase::DoWriteDouble(const wxString& key, double val)
 {
 
 bool wxConfigBase::DoWriteDouble(const wxString& key, double val)
 {

-    return DoWriteString(key, wxString::Format(wxT("%g"), val));
+    // Notice that we always write out the numbers in C locale and not the
+    // current one. This makes the config files portable between machines using
+    // different locales.
+    return DoWriteString(key, wxString::FromCDouble(val));

 }
 
 bool wxConfigBase::DoWriteBool(const wxString& key, bool value)
 }
 
 bool wxConfigBase::DoWriteBool(const wxString& key, bool value)


@@ -272,10 +288,11 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
                                          const wxString& strEntry)
 {
   m_bChanged = false;
                                          const wxString& strEntry)
 {
   m_bChanged = false;

-  m_pContainer = (wxConfigBase *)pContainer;
+  m_pContainer = const_cast<wxConfigBase *>(pContainer);

 
 

-  // the path is everything which precedes the last slash
-  wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR);
+  // the path is everything which precedes the last slash and the name is
+  // everything after it -- and this works correctly if there is no slash too
+  wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR, &m_strName);

 
   // except in the special case of "/keyname" when there is nothing before "/"
   if ( strPath.empty() &&
 
   // except in the special case of "/keyname" when there is nothing before "/"
   if ( strPath.empty() &&


@@ -307,13 +324,6 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
           m_strOldPath += wxCONFIG_PATH_SEPARATOR;
         m_pContainer->SetPath(strPath);
     }
           m_strOldPath += wxCONFIG_PATH_SEPARATOR;
         m_pContainer->SetPath(strPath);
     }

-
-    // in any case, use the just the name, not full path
-    m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR);
-  }
-  else {
-    // it's a name only, without path - nothing to do
-    m_strName = strEntry;

   }
 }
 
   }
 }
 


@@ -375,7 +385,7 @@ enum Bracket
   Bracket_None,
   Bracket_Normal  = ')',
   Bracket_Curly   = '}',
   Bracket_None,
   Bracket_Normal  = ')',
   Bracket_Curly   = '}',

-#ifdef  __WXMSW__
+#ifdef  __WINDOWS__

   Bracket_Windows = '%',    // yeah, Windows people are a bit strange ;-)
 #endif
   Bracket_Max
   Bracket_Windows = '%',    // yeah, Windows people are a bit strange ;-)
 #endif
   Bracket_Max


@@ -389,17 +399,17 @@ wxString wxExpandEnvVars(const wxString& str)
   size_t m;
   for ( size_t n = 0; n < str.length(); n++ ) {
     switch ( str[n].GetValue() ) {
   size_t m;
   for ( size_t n = 0; n < str.length(); n++ ) {
     switch ( str[n].GetValue() ) {

-#ifdef  __WXMSW__
+#ifdef __WINDOWS__

       case wxT('%'):
       case wxT('%'):

-#endif  //WINDOWS
+#endif // __WINDOWS__

       case wxT('$'):
         {
           Bracket bracket;
       case wxT('$'):
         {
           Bracket bracket;

-          #ifdef  __WXMSW__
+          #ifdef __WINDOWS__

             if ( str[n] == wxT('%') )
               bracket = Bracket_Windows;
             else
             if ( str[n] == wxT('%') )
               bracket = Bracket_Windows;
             else

-          #endif  //WINDOWS
+          #endif // __WINDOWS__

           if ( n == str.length() - 1 ) {
             bracket = Bracket_None;
           }
           if ( n == str.length() - 1 ) {
             bracket = Bracket_None;
           }


@@ -443,7 +453,7 @@ wxString wxExpandEnvVars(const wxString& str)
 #endif
           {
             // variable doesn't exist => don't change anything
 #endif
           {
             // variable doesn't exist => don't change anything

-            #ifdef  __WXMSW__
+            #ifdef  __WINDOWS__

               if ( bracket != Bracket_Windows )
             #endif
                 if ( bracket != Bracket_None )
               if ( bracket != Bracket_Windows )
             #endif
                 if ( bracket != Bracket_None )


@@ -460,10 +470,10 @@ wxString wxExpandEnvVars(const wxString& str)
               //
               // under Unix, OTOH, this warning could be useful for the user to
               // understand why isn't the variable expanded as intended
               //
               // under Unix, OTOH, this warning could be useful for the user to
               // understand why isn't the variable expanded as intended

-              #ifndef __WXMSW__
+              #ifndef __WINDOWS__

                 wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %u in '%s'."),
                              (char)bracket, (unsigned int) (m + 1), str.c_str());
                 wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %u in '%s'."),
                              (char)bracket, (unsigned int) (m + 1), str.c_str());

-              #endif // __WXMSW__
+              #endif // __WINDOWS__

             }
             else {
               // skip closing bracket unless the variables wasn't expanded
             }
             else {
               // skip closing bracket unless the variables wasn't expanded