Tex2RTF: underscores now only checked for if syntax checking is on.

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index be417c42432ca4d1b22db32f62627db51e1b5997..1b614016b2750f3951157b227aff3b60d4e37490 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -132,10 +132,9 @@ bool wxConfigBase::Read(const wxString& key, long *pl, long defVal) const
 bool wxConfigBase::Read(const wxString& key, double* val) const
 {
     wxString str;
 bool wxConfigBase::Read(const wxString& key, double* val) const
 {
     wxString str;

-    if (Read(key, & str))
+    if ( Read(key, &str) )

     {
     {

-        *val = wxAtof(str);
-        return TRUE;
+        return str.ToDouble(val);

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -190,28 +189,29 @@ bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const
 {
     long l;
     bool ret = Read(key, &l, (long) defVal);
 {
     long l;
     bool ret = Read(key, &l, (long) defVal);

-    *pi = (int) l;
+    if (ret)
+        *pi = (int) l;

     return ret;
 }
 
 bool wxConfigBase::Write(const wxString& key, double val)
 {
     wxString str;
     return ret;
 }
 
 bool wxConfigBase::Write(const wxString& key, double val)
 {
     wxString str;

-    str.Printf(wxT("%f"), val);
+    str.Printf(wxT("%g"), val);

     return Write(key, str);
 }
 
 bool wxConfigBase::Write(const wxString& key, bool value)
 {
     return Write(key, str);
 }
 
 bool wxConfigBase::Write(const wxString& key, bool value)
 {

-    long l = (value ? 1 : 0);
-    return Write(key, l);
+    return Write(key, value ? 1l : 0l);

 }
 
 }
 

-bool wxConfigBase::Write( const wxString &key, const wxChar *text )
+bool wxConfigBase::Write(const wxString& key, const wxChar *value)

 {
 {

-       wxString str( text ) ;
-       return Write( key, str ) ;
+    // explicit cast needed, otherwise value would have been converted to bool
+    return Write(key, wxString(value));

 }
 }

+

 wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
 {
     wxString tmp; // Required for BC++
 wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
 {
     wxString tmp; // Required for BC++