Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed config incosistency

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1998-07-20 12:20:06 +00:00
parent 3d6a5e3c5b
commit f40ccee99b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/config.h
View File

@@ -60,7 +60,7 @@
$VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and $VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and
'_' only. '$' must be escaped ('\$') in order to be taken literally. '_' 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

4
src/common/config.cpp
View File

@@ -125,7 +125,7 @@ wxConfig::PathChanger::~PathChanger()
// understands both Unix and Windows (but only under Windows) environment // understands both Unix and Windows (but only under Windows) environment
// variables expansion: i.e. $var, $(var) and ${var} are always understood // variables expansion: i.e. $var, $(var) and ${var} are always understood
// and in addition under Windows %var% is also. // and in addition under Windows %var% is also.
wxString ExpandEnvVars(const wxString& str) wxString wxExpandEnvVars(const wxString& str)
{ {
wxString strResult; wxString strResult;
strResult.Alloc(str.Len()); 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();