linking fixes

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 5ec9090807dc12ae52ada0ad3369aae79552a542..1b614016b2750f3951157b227aff3b60d4e37490 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -132,9 +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) )

     {
     {

-        return wxSscanf(str, _T("%g"), val) == 1;
+        return str.ToDouble(val);

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -203,14 +203,15 @@ bool wxConfigBase::Write(const wxString& key, double val)
 
 bool wxConfigBase::Write(const wxString& key, bool value)
 {
 
 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)

 {
 {

-    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++