Added convenience form of wxEvtHandler::Connect, only one id; changed

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index ec03c728f62b21792a89b59ac4409e0d0aad47a8..1510e939a72c3c6fd3f1c00786ceca49c34cdfae 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;
@@ -178,6 +179,24 @@ bool wxConfigBase::Read(const wxString& key, bool* val, bool defVal) const
 }
 
 // Convenience functions
+
+bool wxConfigBase::Read(const wxString& key, int *pi) const
+{
+    long l;
+    bool ret = Read(key, &l);
+    if (ret)
+        *pi = (int) l;
+    return ret;
+}
+
+bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const
+{
+    long l;
+    bool ret = Read(key, &l, (long) defVal);
+    *pi = (int) l;
+    return ret;
+}
+
 bool wxConfigBase::Write(const wxString& key, double val)
 {
     wxString str;
@@ -191,6 +210,15 @@ bool wxConfigBase::Write(const wxString& key, bool value)
     return Write(key, l);
 }
 
+wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
+{
+    wxString tmp; // Required for BC++
+    if (IsExpandingEnvVars())
+        tmp = wxExpandEnvVars(str);
+    else
+        tmp = str;
+    return tmp;
+}
 
 // ----------------------------------------------------------------------------
 // wxConfigPathChanger
@@ -381,5 +409,3 @@ void wxSplitPath(wxArrayString& aParts, const char *sz)
     pc++;
   }
 }
-
-