fixing osx_cocoa

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index c4ae2ed8d19bbcb831302b58d0699a21e717b728..12c8213002a893d41cd3d70c232dec5a4cc113dc 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     07.04.98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     07.04.98
 // RCS-ID:      $Id$

-// Copyright:   (c) 1997 Karsten Ballüder   Ballueder@usa.net
+// Copyright:   (c) 1997 Karsten Ballueder  Ballueder@usa.net

 //                       Vadim Zeitlin      <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 //                       Vadim Zeitlin      <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -43,6 +43,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <limits.h>     // for INT_MAX
 #include <stdlib.h>
 #include <ctype.h>
 #include <limits.h>     // for INT_MAX

+#include <float.h>      // for FLT_MAX

 
 // ----------------------------------------------------------------------------
 // global and class static variables
 
 // ----------------------------------------------------------------------------
 // global and class static variables


@@ -105,7 +106,7 @@ wxConfigBase *wxConfigBase::Create()
 {
   if ( ms_bAutoCreate && ms_pConfig == NULL ) {
     wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
 {
   if ( ms_bAutoCreate && ms_pConfig == NULL ) {
     wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;

-    wxCHECK_MSG( traits, NULL, _T("create wxApp before calling this") );
+    wxCHECK_MSG( traits, NULL, wxT("create wxApp before calling this") );

 
     ms_pConfig = traits->CreateConfig();
   }
 
     ms_pConfig = traits->CreateConfig();
   }


@@ -121,7 +122,7 @@ wxConfigBase *wxConfigBase::Create()
 #define IMPLEMENT_READ_FOR_TYPE(name, type, deftype, extra)                 \
     bool wxConfigBase::Read(const wxString& key, type *val) const           \
     {                                                                       \
 #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, wxT("wxConfig::Read(): NULL parameter") );  \

                                                                             \
         if ( !DoRead##name(key, val) )                                      \
             return false;                                                   \
                                                                             \
         if ( !DoRead##name(key, val) )                                      \
             return false;                                                   \


@@ -135,7 +136,7 @@ wxConfigBase *wxConfigBase::Create()
                             type *val,                                      \
                             deftype defVal) const                           \
     {                                                                       \
                             type *val,                                      \
                             deftype defVal) const                           \
     {                                                                       \

-        wxCHECK_MSG( val, false, _T("wxConfig::Read(): NULL parameter") );  \
+        wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") );  \

                                                                             \
         bool read = DoRead##name(key, val);                                 \
         if ( !read )                                                        \
                                                                             \
         bool read = DoRead##name(key, val);                                 \
         if ( !read )                                                        \


@@ -156,38 +157,79 @@ wxConfigBase *wxConfigBase::Create()
 
 IMPLEMENT_READ_FOR_TYPE(String, wxString, const wxString&, ExpandEnvVars)
 IMPLEMENT_READ_FOR_TYPE(Long, long, long, long)
 
 IMPLEMENT_READ_FOR_TYPE(String, wxString, const wxString&, ExpandEnvVars)
 IMPLEMENT_READ_FOR_TYPE(Long, long, long, long)

-IMPLEMENT_READ_FOR_TYPE(Int, int, int, int)

 IMPLEMENT_READ_FOR_TYPE(Double, double, double, double)
 IMPLEMENT_READ_FOR_TYPE(Bool, bool, bool, bool)
 
 #undef IMPLEMENT_READ_FOR_TYPE
 
 IMPLEMENT_READ_FOR_TYPE(Double, double, double, double)
 IMPLEMENT_READ_FOR_TYPE(Bool, bool, bool, bool)
 
 #undef IMPLEMENT_READ_FOR_TYPE
 

-// the DoReadXXX() for the other types have implementation in the base class
-// but can be overridden in the derived ones
-bool wxConfigBase::DoReadInt(const wxString& key, int *pi) const
+// int is stored as long
+bool wxConfigBase::Read(const wxString& key, int *pi) const

 {
 {

-    wxCHECK_MSG( pi, false, _T("wxConfig::Read(): NULL parameter") );
+    long l = *pi;
+    bool r = Read(key, &l);
+    wxASSERT_MSG( l < INT_MAX, wxT("int overflow in wxConfig::Read") );
+    *pi = (int)l;
+    return r;
+}

 
 

-    long l;
-    if ( !DoReadLong(key, &l) )
+bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const
+{
+    long l = *pi;
+    bool r = Read(key, &l, defVal);
+    wxASSERT_MSG( l < INT_MAX, wxT("int overflow in wxConfig::Read") );
+    *pi = (int)l;
+    return r;
+}
+
+// Read floats as doubles then just type cast it down.
+bool wxConfigBase::Read(const wxString& key, float* val) const
+{
+    wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") );
+
+    double temp;
+    if ( !Read(key, &temp) )

         return false;
 
         return false;
 

-    wxASSERT_MSG( l < INT_MAX, _T("overflow in wxConfig::DoReadInt") );
+    wxCHECK_MSG( fabs(temp) <= FLT_MAX, false,
+                     wxT("float overflow in wxConfig::Read") );
+    wxCHECK_MSG( (temp == 0.0) || (fabs(temp) >= FLT_MIN), false,
+                     wxT("float underflow in wxConfig::Read") );

 
 

-    *pi = (int)l;
+    *val = static_cast<float>(temp);

 
     return true;
 }
 
 
     return true;
 }
 

+bool wxConfigBase::Read(const wxString& key, float* val, float defVal) const
+{
+    wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") );
+
+    if ( Read(key, val) )
+        return true;
+
+    *val = defVal;
+    return false;
+}
+
+// the DoReadXXX() for the other types have implementation in the base class
+// but can be overridden in the derived ones

 bool wxConfigBase::DoReadBool(const wxString& key, bool* val) const
 {
 bool wxConfigBase::DoReadBool(const wxString& key, bool* val) const
 {

-    wxCHECK_MSG( val, false, _T("wxConfig::Read(): NULL parameter") );
+    wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") );

 
     long l;
     if ( !DoReadLong(key, &l) )
         return false;
 
 
     long l;
     if ( !DoReadLong(key, &l) )
         return false;
 

-    wxASSERT_MSG( l == 0 || l == 1, _T("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;
 


@@ -199,7 +241,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;


@@ -222,12 +271,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(_T("%g"), val));
-}
-
-bool wxConfigBase::DoWriteInt(const wxString& key, int value)
-{
-    return DoWriteLong(key, (long)value);
+    // 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)


@@ -243,10 +290,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() &&


@@ -271,20 +319,13 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
            pConfig->SetPath(wxT("MySettings"));
            pConfig->SetPath(wxT(".."));
            int value;
            pConfig->SetPath(wxT("MySettings"));
            pConfig->SetPath(wxT(".."));
            int value;

-           pConfig->Read(_T("MainWindowX"), & value);
+           pConfig->Read(wxT("MainWindowX"), & value);

         */
         m_strOldPath = m_pContainer->GetPath().wc_str();
         if ( *m_strOldPath.c_str() != wxCONFIG_PATH_SEPARATOR )
           m_strOldPath += wxCONFIG_PATH_SEPARATOR;
         m_pContainer->SetPath(strPath);
     }
         */
         m_strOldPath = m_pContainer->GetPath().wc_str();
         if ( *m_strOldPath.c_str() != wxCONFIG_PATH_SEPARATOR )
           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;

   }
 }
 
   }
 }
 


@@ -395,7 +436,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
           while ( m < str.length() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )
             m++;
 
           while ( m < str.length() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )
             m++;

- 
+

           wxString strVarName(str.c_str() + n + 1, m - n - 1);
 
 #ifdef __WXWINCE__
           wxString strVarName(str.c_str() + n + 1, m - n - 1);
 
 #ifdef __WXWINCE__


@@ -481,9 +522,13 @@ void wxSplitPath(wxArrayString& aParts, const wxString& path)
       else if ( strCurrent == wxT("..") ) {
         // go up one level
         if ( aParts.size() == 0 )
       else if ( strCurrent == wxT("..") ) {
         // go up one level
         if ( aParts.size() == 0 )

+        {

           wxLogWarning(_("'%s' has extra '..', ignored."), path);
           wxLogWarning(_("'%s' has extra '..', ignored."), path);

+        }

         else
         else

+        {

           aParts.erase(aParts.end() - 1);
           aParts.erase(aParts.end() - 1);

+        }

 
         strCurrent.Empty();
       }
 
         strCurrent.Empty();
       }