* Bug fixes

[wxWidgets.git] / include / wx / config.h

diff --git a/include/wx/config.h b/include/wx/config.h
index 7eb80d3810cfe215f94f6bd5a687ebe73a745aeb..00aaf1f233caf74cc16558667602a8d96a21aef2 100644 (file)
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -60,7 +60,7 @@
   $VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and
   '_' only. '$' must be escaped ('\$') in order to be taken literally.
  */
   $VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and
   '_' only. '$' must be escaped ('\$') in order to be taken literally.
  */

-extern wxString wxExpandEnvVars(const char *sz);
+extern wxString wxExpandEnvVars(const wxString &sz);

 
 /*
   Split path into parts removing '..' in progress
 
 /*
   Split path into parts removing '..' in progress


@@ -161,7 +161,14 @@ public:
   void SetExpandEnvVars(bool bDoIt = TRUE) { m_bExpandEnvVars = bDoIt; }
     // does expansion only if needed
   wxString ExpandEnvVars(const wxString& str) const
   void SetExpandEnvVars(bool bDoIt = TRUE) { m_bExpandEnvVars = bDoIt; }
     // does expansion only if needed
   wxString ExpandEnvVars(const wxString& str) const

-    { return IsExpandingEnvVars() ? wxExpandEnvVars(str) : str; }
+    {
+        wxString tmp; // Required for BC++
+        if (IsExpandingEnvVars())
+            tmp = wxExpandEnvVars(str);
+        else
+            tmp = str;
+        return tmp;
+    }

 
 protected:
   static bool IsImmutable(const char *szKey) 
 
 protected:
   static bool IsImmutable(const char *szKey)