AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make sure we don't have two associations pointing to the same control

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2005-03-10 15:46:31 +00:00
parent 6aafd4a27a
commit a86831340f
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mac/carbon/window.cpp
View File

@ -659,7 +659,9 @@ void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control)
void wxRemoveMacControlAssociation(wxWindow *control)
{
wxWinMacControlList.DeleteObject(control);
// remove all associations pointing to us
while ( wxWinMacControlList.DeleteObject(control) )
{}
}
#else
@ -686,13 +688,22 @@ void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control)
void wxRemoveMacControlAssociation(wxWindow *control)
{
// iterate over all the elements in the class
MacControlMap::iterator it;
for ( it = wxWinMacControlList.begin(); it != wxWinMacControlList.end(); ++it )
// is the iterator stable ? as we might have two associations pointing to the same wxWindow
// we should go on...
bool found = true ;
while( found )
{
if ( it->second == control )
found = false ;
MacControlMap::iterator it;
for ( it = wxWinMacControlList.begin(); it != wxWinMacControlList.end(); ++it )
{
wxWinMacControlList.erase(it);
break;
if ( it->second == control )
{
wxWinMacControlList.erase(it);
found = true ;
break;
}
}
}
}