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

fixed bug which prevented the env vars in wxConfig values from being expanded

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-10-25 21:10:38 +00:00
parent f1c2a09edf
commit ed0fb5f1dc
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

@@ -110,7 +110,12 @@ wxConfigBase *wxConfigBase::Create()
{ \
wxCHECK_MSG( val, FALSE, _T("wxConfig::Read(): NULL parameter") ); \
\
return DoRead##name(key, val); \
if ( !DoRead##name(key, val) ) \
return FALSE; \
\
*val = extra(*val); \
\
return TRUE; \
} \
\
bool wxConfigBase::Read(const wxString& key, \
@@ -119,15 +124,18 @@ wxConfigBase *wxConfigBase::Create()
{ \
wxCHECK_MSG( val, FALSE, _T("wxConfig::Read(): NULL parameter") ); \
\
if ( DoRead##name(key, val) ) \
return TRUE; \
\
if ( IsRecordingDefaults() ) \
bool read = DoRead##name(key, val); \
if ( !read ) \
{ \
((wxConfigBase *)this)->DoWrite##name(key, defVal); \
if ( IsRecordingDefaults() ) \
{ \
((wxConfigBase *)this)->DoWrite##name(key, defVal); \
} \
\
*val = defVal; \
} \
\
*val = extra(defVal); \
*val = extra(*val); \
\
return FALSE; \
}