Version 0.4 of wxPython for MSW.

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index ec03c728f62b21792a89b59ac4409e0d0aad47a8..9707475ac918ca0d9dc4afee91c474cbc9376c66 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -37,6 +37,7 @@
 #include  <wx/log.h>
 #include  <wx/textfile.h>
 #include  <wx/confbase.h>
+#include  <wx/utils.h>
 
 // we must include (one of) these files for wxConfigBase::Create
 #if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE)
@@ -71,7 +72,7 @@ bool          wxConfigBase::ms_bAutoCreate = TRUE;
 // Not all args will always be used by derived classes, but
 // including them all in each class ensures compatibility.
 wxConfigBase::wxConfigBase(const wxString& appName, const wxString& vendorName,
-    const wxString& localFilename, const wxString& globalFilename, long style):
+    const wxString& WXUNUSED(localFilename), const wxString& WXUNUSED(globalFilename), long style):
         m_appName(appName), m_vendorName(vendorName), m_style(style)
 {
     m_bExpandEnvVars = TRUE; m_bRecordDefaults = FALSE;
@@ -134,7 +135,7 @@ bool wxConfigBase::Read(const wxString& key, long *pl, long defVal) const
 bool wxConfigBase::Read(const wxString& key, double* val) const
 {
     wxString str;
-    if (Read(key, str))
+    if (Read(key, & str))
     {
         *val = atof(str);
         return TRUE;