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 9707475ac918ca0d9dc4afee91c474cbc9376c66..1510e939a72c3c6fd3f1c00786ceca49c34cdfae 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -179,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;
@@ -192,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
@@ -382,5 +409,3 @@ void wxSplitPath(wxArrayString& aParts, const char *sz)
     pc++;
   }
 }
-
-