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;
{
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;
- str.Printf(wxT("%f"), val);
+ str.Printf(wxT("%g"), val);
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++