From f40ccee99b037cbb58bc3b34e577088738ab5ced Mon Sep 17 00:00:00 2001 From: =?utf8?q?Karsten=20Ball=C3=BCder?= Date: Mon, 20 Jul 1998 12:20:06 +0000 Subject: [PATCH] fixed config incosistency git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/config.h | 2 +- src/common/config.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/config.h b/include/wx/config.h index 7eb80d3810..df24b8e873 100644 --- 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. */ -extern wxString wxExpandEnvVars(const char *sz); +extern wxString wxExpandEnvVars(const wxString &sz); /* Split path into parts removing '..' in progress diff --git a/src/common/config.cpp b/src/common/config.cpp index 667d25e5fe..d2cc81d6c1 100644 --- 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. -wxString ExpandEnvVars(const wxString& str) +wxString wxExpandEnvVars(const wxString& str) { wxString strResult; strResult.Alloc(str.Len()); @@ -224,7 +224,7 @@ wxString ExpandEnvVars(const wxString& str) } // 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(); -- 2.45.2