Added _GSOCKET_STANDALONE_ symbol

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index c2b371f88c0f81e9ed84c77173b73539edab2aed..c4cfa87538e48ebcaca6ecfaca186c783641364a 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -56,25 +56,10 @@
 enum
 {
     wxCONFIG_USE_LOCAL_FILE = 1,
 enum
 {
     wxCONFIG_USE_LOCAL_FILE = 1,

-    wxCONFIG_USE_GLOBAL_FILE = 2
+    wxCONFIG_USE_GLOBAL_FILE = 2,
+    wxCONFIG_USE_RELATIVE_PATH = 4

 };
 
 };
 

-// ----------------------------------------------------------------------------
-// various helper global functions
-// ----------------------------------------------------------------------------
-
-/*
-  Replace environment variables ($SOMETHING) with their values. The format is
-  $VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and
-  '_' only. '$' must be escaped ('\$') in order to be taken literally.
- */
-extern wxString wxExpandEnvVars(const wxString &sz);
-
-/*
-  Split path into parts removing '..' in progress
- */
-extern void wxSplitPath(wxArrayString& aParts, const char *sz);
-

 // ----------------------------------------------------------------------------
 // abstract base class wxConfigBase which defines the interface for derived
 // classes
 // ----------------------------------------------------------------------------
 // abstract base class wxConfigBase which defines the interface for derived
 // classes


@@ -245,11 +230,11 @@ public:
 
 protected:
   static bool IsImmutable(const wxString& key)
 
 protected:
   static bool IsImmutable(const wxString& key)

-  #ifndef __WXMAC__
+#if !defined(__WXMAC__) && !defined(__EMX__)

     { return !key.IsEmpty() && key[0u] == wxCONFIG_IMMUTABLE_PREFIX; }
     { return !key.IsEmpty() && key[0u] == wxCONFIG_IMMUTABLE_PREFIX; }

-  #else
+#else

     { return !key.IsEmpty() && key[0ul] == wxCONFIG_IMMUTABLE_PREFIX; }
     { return !key.IsEmpty() && key[0ul] == wxCONFIG_IMMUTABLE_PREFIX; }

-  #endif
+#endif

 
 private:
   // are we doing automatic environment variable expansion?
 
 private:
   // are we doing automatic environment variable expansion?


@@ -310,9 +295,23 @@ private:
   #define sm_classwxConfig sm_classwxFileConfig
 #endif
 
   #define sm_classwxConfig sm_classwxFileConfig
 #endif
 

-#endif
+#endif // wxUSE_CONFIG
+
+// ----------------------------------------------------------------------------
+// various helper global functions (defined even if !wxUSE_CONFIG)
+// ----------------------------------------------------------------------------

 
 

-  // wxUSE_CONFIG
+/*
+  Replace environment variables ($SOMETHING) with their values. The format is
+  $VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and
+  '_' only. '$' must be escaped ('\$') in order to be taken literally.
+ */
+extern wxString wxExpandEnvVars(const wxString &sz);
+
+/*
+  Split path into parts removing '..' in progress
+ */
+extern void wxSplitPath(wxArrayString& aParts, const wxChar *sz);

 
 #endif
   // _WX_CONFIG_H_
 
 #endif
   // _WX_CONFIG_H_