fix for wxRegConfig::GetNextGroup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -217,13 +217,15 @@ bool wxRegConfig::GetNextGroup(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.GetNextKey(str, lIndex) ) {
|
||||||
if ( !m_keyGlobal.GetNextKey(str, lIndex) ) {
|
if ( !m_keyLocal.HasSubKey(str) ) {
|
||||||
// no more global entries
|
// ok, found one - return it
|
||||||
lIndex |= LOCAL_MASK;
|
return TRUE;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
} while( m_keyLocal.HasSubKey(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
|
||||||
|
Reference in New Issue
Block a user