[ 1585253 ] Various important bugfixes to wxFileName::Normalize

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-26 21:08:21 +00:00
parent 30be036c6d
commit bf7f7793e9
5 changed files with 143 additions and 32 deletions
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -369,7 +369,12 @@ wxString wxExpandEnvVars(const wxString& str)
 #ifdef __WXWINCE__
          const wxChar *pszValue = NULL;
 #else
-          const wxChar *pszValue = wxGetenv(strVarName);
+          // NB: use wxGetEnv instead of wxGetenv as otherwise variables
+          //     set through wxSetEnv may not be read correctly!
+          const wxChar *pszValue = NULL;
+          wxString tmp;
+          if (wxGetEnv(strVarName, &tmp))
+              pszValue = tmp;
 #endif
          if ( pszValue != NULL ) {
            strResult += pszValue;