From e716ca3d3b9263686847168755af557b90e8aef5 Mon Sep 17 00:00:00 2001
From: "J. Russell Smyth" <drfish@cox.net>
Date: Wed, 5 May 1999 05:01:08 +0000
Subject: [PATCH] Added wxCONFIG_USE_RELATIVE_PATH option to allow relative
 paths for config files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/fileconf.cpp | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 83e3659140..5e9762390c 100644
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -226,18 +226,21 @@ wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
     SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE);
 
   // if the path is not absolute, prepend the standard directory to it
-  if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) )
-  {
-    wxString strLocal = m_strLocalFile;
-    m_strLocalFile = GetLocalDir();
-    m_strLocalFile << strLocal;
-  }
+  // UNLESS wxCONFIG_USE_RELATIVE_PATH style is set
+  if ( !(style & wxCONFIG_USE_RELATIVE_PATH) ){
+	  if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) )
+	  {
+		  wxString strLocal = m_strLocalFile;
+		  m_strLocalFile = GetLocalDir();
+		  m_strLocalFile << strLocal;
+	  }
 
-  if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) )
-  {
-    wxString strGlobal = m_strGlobalFile;
-    m_strGlobalFile = GetGlobalDir();
-    m_strGlobalFile << strGlobal;
+	  if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) )
+	  {
+		  wxString strGlobal = m_strGlobalFile;
+		  m_strGlobalFile = GetGlobalDir();
+		  m_strGlobalFile << strGlobal;
+	  }
   }
 
   Init();