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

fix crash after radio button fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-09-27 13:01:12 +00:00
parent 9f4ccdd739
commit 944e8709b7
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/containr.cpp
View File

@@ -292,24 +292,24 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
wxWindow *child = node->GetData();
#ifdef __WXMSW__
bool is_not_msw_rb = ! wxIsKindOf(m_winLastFocused,wxRadioButton);
bool is_not_msw_rb = !m_winLastFocused ||
!wxIsKindOf(m_winLastFocused,wxRadioButton);
#else
bool is_not_msw_rb = true;
static const bool is_not_msw_rb = true;
#endif
if ( child->AcceptsFocusFromKeyboard() && is_not_msw_rb)
if ( child->AcceptsFocusFromKeyboard() && is_not_msw_rb )
{
// if we're setting the focus to a child panel we should prevent it
// from giving it to the child which had the focus the last time
// and instead give it to the first/last child depending from which
// direction we're coming
event.SetEventObject(m_winParent);
#ifdef __WXMSW__
// we need to hop to the next activated
// radio button, not just the next radio
// button under MSW
// button under MSW
if (wxIsKindOf(child,wxRadioButton))
{
wxRadioButton *rb = (wxRadioButton*) child;
@@ -318,19 +318,23 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
for (;;)
{
wxWindowList::compatibility_iterator node = children.Find( child );
if (forward)
if (forward)
node = node->GetNext();
else
node = node->GetPrevious();
if (!node) return; // this would probably an error
if (!node)
return; // this would probably an error
child = node->GetData();
if (!wxIsKindOf(child,wxRadioButton)) continue;
if (!wxIsKindOf(child,wxRadioButton))
continue;
rb = (wxRadioButton*) child;
if (rb->GetValue()) break;
if (rb->GetValue())
break;
}
}
}
#endif
#endif // __WXMSW__
// disable propagation for this call as otherwise the event might
// bounce back to us.
wxPropagationDisabler disableProp(event);