Committing in .

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index da8e5b0901a0cbfa5d7a66088d7d2c5bf8858ec5..05ca5af209b99fccdf4516182e5c91e6a0894ca3 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -27,18 +27,17 @@
     #define wxUSE_CONFIG_NATIVE 1
 #endif
 
     #define wxUSE_CONFIG_NATIVE 1
 #endif
 

+#include "wx/config.h"
+#include "wx/intl.h"
+#include "wx/log.h"
+

 #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
 
 #include "wx/app.h"
 #include "wx/file.h"
 #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
 
 #include "wx/app.h"
 #include "wx/file.h"

-#include "wx/log.h"

 #include "wx/textfile.h"
 #include "wx/utils.h"
 #include "wx/textfile.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 #include "wx/utils.h"
 #include "wx/utils.h"

-#include "wx/intl.h"
-
-#include "wx/config.h"

 
 #include <stdlib.h>
 #include <math.h>
 
 #include <stdlib.h>
 #include <math.h>


@@ -132,9 +131,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,13 +202,13 @@ 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, text);
+    // explicit cast needed, otherwise value would have been converted to bool
+    return Write(key, wxString(value));

 }
 
 wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
 }
 
 wxString wxConfigBase::ExpandEnvVars(const wxString& str) const


@@ -266,6 +265,8 @@ wxConfigPathChanger::~wxConfigPathChanger()
   }
 }
 
   }
 }
 

+#endif // wxUSE_CONFIG
+

 // ----------------------------------------------------------------------------
 // static & global functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static & global functions
 // ----------------------------------------------------------------------------


@@ -381,6 +382,8 @@ wxString wxExpandEnvVars(const wxString& str)
 }
 
 // this function is used to properly interpret '..' in path
 }
 
 // this function is used to properly interpret '..' in path

+/// separates group and entry names (probably shouldn't be changed)
+

 void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
 {
   aParts.Empty();
 void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
 {
   aParts.Empty();


@@ -418,5 +421,4 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
   }
 }
 
   }
 }
 

-#endif // wxUSE_CONFIG