Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv7317/src/classes
Modified Files:
Profile.cpp ConfigSource.cpp
Log Message:
fixed env variables expansion problems
Index: Profile.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Profile.cpp,v
retrieving revision 1.153
retrieving revision 1.154
diff -b -u -2 -r1.153 -r1.154
--- Profile.cpp 7 Oct 2003 23:30:40 -0000 1.153
+++ Profile.cpp 7 Oct 2003 23:43:13 -0000 1.154
@@ -1297,4 +1297,7 @@
ProfileImpl::ProfileImpl(const String & iName, Profile const *Parent)
{
+ // expand env vars in string values by default
+ SetExpandEnvVars(true);
+
m_ProfileName = ( Parent && Parent->GetName().Length())
? ( Parent->GetName() + '/' )
Index: ConfigSource.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/ConfigSource.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -2 -r1.10 -r1.11
--- ConfigSource.cpp 4 Oct 2003 14:52:37 -0000 1.10
+++ ConfigSource.cpp 7 Oct 2003 23:43:13 -0000 1.11
@@ -543,4 +543,8 @@
fileconf->SetUmask(0077);
+ // disable wxConfig built-in environment variables expansion as we do it
+ // ourselves at Profile level and want to control it from there
+ fileconf->SetExpandEnvVars(false);
+
return fileconf;
}
@@ -555,5 +559,5 @@
// don't give explicit name, but rather use the default logic (it's
// perfectly ok, for the registry case our keys are under vendor\appname)
- return new wxRegConfig
+ wxRegConfig *regconf = new wxRegConfig
(
M_APPLICATIONNAME,
@@ -561,6 +565,12 @@
_T(""),
_T(""),
- wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE
+ wxCONFIG_USE_LOCAL_FILE |
+ wxCONFIG_USE_GLOBAL_FILE
);
+
+ // see comment in CreateFileConfig()
+ regconf->SetExpandEnvVars(false);
+
+ return regconf;
}
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
