1. libtool 1.2d => 1.3 (should speed up configure checks for it because it

[wxWidgets.git] / include / wx / confbase.h

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index c2b371f88c0f81e9ed84c77173b73539edab2aed..483c9d0a80c149f6b083508ba15d4e8c5f713dd5 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -56,7 +56,8 @@
 enum
 {
     wxCONFIG_USE_LOCAL_FILE = 1,
-    wxCONFIG_USE_GLOBAL_FILE = 2
+    wxCONFIG_USE_GLOBAL_FILE = 2,
+    wxCONFIG_USE_RELATIVE_PATH = 4
 };
 
 // ----------------------------------------------------------------------------
@@ -73,7 +74,7 @@ extern wxString wxExpandEnvVars(const wxString &sz);
 /*
   Split path into parts removing '..' in progress
  */
-extern void wxSplitPath(wxArrayString& aParts, const char *sz);
+extern void wxSplitPath(wxArrayString& aParts, const wxChar *sz);
 
 // ----------------------------------------------------------------------------
 // abstract base class wxConfigBase which defines the interface for derived
@@ -245,11 +246,11 @@ public:
 
 protected:
   static bool IsImmutable(const wxString& key)
-  #ifndef __WXMAC__
+#if !defined(__WXMAC__) && !defined(__EMX__)
     { return !key.IsEmpty() && key[0u] == wxCONFIG_IMMUTABLE_PREFIX; }
-  #else
+#else
     { return !key.IsEmpty() && key[0ul] == wxCONFIG_IMMUTABLE_PREFIX; }
-  #endif
+#endif
 
 private:
   // are we doing automatic environment variable expansion?