Renameing funktions to prevent name clashes

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 483c9d0a80c149f6b083508ba15d4e8c5f713dd5..c4cfa87538e48ebcaca6ecfaca186c783641364a 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -60,22 +60,6 @@ enum
     wxCONFIG_USE_RELATIVE_PATH = 4
 };
 
     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 wxChar *sz);
-

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


@@ -311,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_