Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1095/src/classes
Modified Files:
ConfigSourcesAll.cpp
Log Message:
fixed wxConfigMultiplexer::SetPath() for relative paths
Index: ConfigSourcesAll.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/ConfigSourcesAll.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- ConfigSourcesAll.cpp 6 Jul 2005 12:41:23 -0000 1.7
+++ ConfigSourcesAll.cpp 9 Jul 2005 20:47:39 -0000 1.8
@@ -62,8 +62,10 @@
virtual void SetPath(const wxString& path)
{
- m_path = path;
wxConfigBase * const config = m_configSources.GetLocalConfig();
if ( config )
+ {
config->SetPath(path);
+ m_path = config->GetPath();
+ }
}
@@ -368,6 +370,10 @@
String fullpath;
if ( *key.c_str() != _T('/') )
- fullpath << path << _T('/');
- fullpath << key;
+ {
+ fullpath += path;
+ if ( fullpath.empty() || fullpath.Last() != _T('/') )
+ fullpath += _T('/');
+ }
+ fullpath += key;
ASSERT_MSG( *fullpath.c_str() == _T('/'), _T("config paths must be
absolute") );
-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP,
AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
