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

don't give env var expansion warning under Windows

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-11-04 19:09:27 +00:00
parent fa1837fe14
commit c79c41ca66
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/config.cpp
View File

@@ -68,7 +68,8 @@ wxConfigBase::wxConfigBase(const wxString& appName,
long style) long style)
: m_appName(appName), m_vendorName(vendorName), m_style(style) : m_appName(appName), m_vendorName(vendorName), m_style(style)
{ {
m_bExpandEnvVars = TRUE; m_bRecordDefaults = FALSE; m_bExpandEnvVars = TRUE;
m_bRecordDefaults = FALSE;
} }
wxConfigBase::~wxConfigBase() wxConfigBase::~wxConfigBase()
@@ -286,10 +287,11 @@ wxString wxExpandEnvVars(const wxString& str)
{ {
Bracket_None, Bracket_None,
Bracket_Normal = ')', Bracket_Normal = ')',
Bracket_Curly = '}' Bracket_Curly = '}',
#ifdef __WXMSW__ #ifdef __WXMSW__
,Bracket_Windows = '%' // yeah, Windows people are a bit strange ;-) Bracket_Windows = '%', // yeah, Windows people are a bit strange ;-)
#endif #endif
Bracket_Max
}; };
size_t m; size_t m;
@@ -350,8 +352,16 @@ wxString wxExpandEnvVars(const wxString& str)
// check the closing bracket // check the closing bracket
if ( bracket != Bracket_None ) { if ( bracket != Bracket_None ) {
if ( m == str.Len() || str[m] != (char)bracket ) { if ( m == str.Len() || str[m] != (char)bracket ) {
wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %d in '%s'."), // under MSW it's common to have '%' characters in the registry
(char)bracket, m + 1, str.c_str()); // and it's annoying to have warnings about them each time, so
// ignroe them silently if they are not used for env vars
//
// under Unix, OTOH, this warning could be useful for the user to
// understand why isn't the variable expanded as intended
#ifndef __WXMSW__
wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %d in '%s'."),
(char)bracket, m + 1, str.c_str());
#endif // __WXMSW__
} }
else { else {
// skip closing bracket unless the variables wasn't expanded // skip closing bracket unless the variables wasn't expanded
@@ -383,8 +393,6 @@ wxString wxExpandEnvVars(const wxString& str)
} }
// this function is used to properly interpret '..' in path // this function is used to properly interpret '..' in path
/// separates group and entry names (probably shouldn't be changed)
void wxSplitPath(wxArrayString& aParts, const wxChar *sz) void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
{ {
aParts.Empty(); aParts.Empty();