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

2nd part of wxRegConfig fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-12-20 17:37:55 +00:00
parent 5873607e5c
commit 50f7d0a393
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/regconf.cpp
View File

@@ -248,13 +248,15 @@ bool wxRegConfig::GetNextEntry(wxString& str, long& lIndex) const
// are we already enumerating local entries? // are we already enumerating local entries?
if ( m_keyGlobal.IsOpened() && !IS_LOCAL_INDEX(lIndex) ) { if ( m_keyGlobal.IsOpened() && !IS_LOCAL_INDEX(lIndex) ) {
// try to find a global entry which doesn't appear locally // try to find a global entry which doesn't appear locally
do { while ( m_keyGlobal.GetNextValue(str, lIndex) ) {
if ( !m_keyGlobal.GetNextValue(str, lIndex) ) { if ( !m_keyLocal.HasValue(str) ) {
// no more global entries // ok, found one - return it
lIndex |= LOCAL_MASK; return TRUE;
break;
} }
} while( m_keyLocal.HasValue(str) ); }
// no more global entries
lIndex |= LOCAL_MASK;
} }
// much easier with local entries: get the next one we find // much easier with local entries: get the next one we find