fixed config incosistency

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/config.h b/include/wx/config.h
index 7eb80d3810cfe215f94f6bd5a687ebe73a745aeb..df24b8e873e40e45374f05dd6b38c23524ff8c20 100644 (file)
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -60,7 +60,7 @@
   $VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and
   '_' only. '$' must be escaped ('\$') in order to be taken literally.
  */
   $VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and
   '_' only. '$' must be escaped ('\$') in order to be taken literally.
  */

-extern wxString wxExpandEnvVars(const char *sz);
+extern wxString wxExpandEnvVars(const wxString &sz);

 
 /*
   Split path into parts removing '..' in progress
 
 /*
   Split path into parts removing '..' in progress

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 667d25e5fe854dea4885f14fb414ee26d31b0436..d2cc81d6c1e92d037d590781c531e13ddc3186ac 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -125,7 +125,7 @@ wxConfig::PathChanger::~PathChanger()
 // understands both Unix and Windows (but only under Windows) environment
 // variables expansion: i.e. $var, $(var) and ${var} are always understood
 // and in addition under Windows %var% is also.
 // understands both Unix and Windows (but only under Windows) environment
 // variables expansion: i.e. $var, $(var) and ${var} are always understood
 // and in addition under Windows %var% is also.

-wxString ExpandEnvVars(const wxString& str)
+wxString wxExpandEnvVars(const wxString& str)

 {
   wxString strResult;
   strResult.Alloc(str.Len());
 {
   wxString strResult;
   strResult.Alloc(str.Len());


@@ -224,7 +224,7 @@ wxString ExpandEnvVars(const wxString& str)
 }
 
 // this function is used to properly interpret '..' in path
 }
 
 // this function is used to properly interpret '..' in path

-void SplitPath(wxArrayString& aParts, const char *sz)
+void wxSplitPath(wxArrayString& aParts, const char *sz)

 {
   aParts.Empty();
 
 {
   aParts.Empty();