AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added wxCONFIG_USE_RELATIVE_PATH option to allow relative paths for config files

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
J. Russell Smyth 1999-05-05 05:01:08 +00:00
parent 944ac90330
commit e716ca3d3b
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/fileconf.cpp
View File

@ -226,18 +226,21 @@ wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE); SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE);
// if the path is not absolute, prepend the standard directory to it // if the path is not absolute, prepend the standard directory to it
if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) ) // UNLESS wxCONFIG_USE_RELATIVE_PATH style is set
{ if ( !(style & wxCONFIG_USE_RELATIVE_PATH) ){
wxString strLocal = m_strLocalFile; if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) )
m_strLocalFile = GetLocalDir(); {
m_strLocalFile << strLocal; wxString strLocal = m_strLocalFile;
} m_strLocalFile = GetLocalDir();
m_strLocalFile << strLocal;
}
if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) ) if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) )
{ {
wxString strGlobal = m_strGlobalFile; wxString strGlobal = m_strGlobalFile;
m_strGlobalFile = GetGlobalDir(); m_strGlobalFile = GetGlobalDir();
m_strGlobalFile << strGlobal; m_strGlobalFile << strGlobal;
}
} }
Init(); Init();