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

fixed infinite recursion in TAB handling with panels inside panels

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-03-14 16:35:03 +00:00
parent 110b5d83a6
commit 624d1a4f31
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/generic/panelg.cpp
View File

@@ -121,14 +121,20 @@ void wxPanel::OnSize(wxSizeEvent& WXUNUSED(event))
void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event ) void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
{ {
// the event is propagated downwards if the event emitter was our parent
bool goingDown = event.GetEventObject() == GetParent();
const wxWindowList& children = GetChildren(); const wxWindowList& children = GetChildren();
// there is not much to do if we don't have children and we're not // there is not much to do if we don't have children and we're not
// interested in "notebook page change" events here // interested in "notebook page change" events here
if ( !children.GetCount() || event.IsWindowChange() ) if ( !children.GetCount() || event.IsWindowChange() )
{ {
// let the parent process it unless it already comes from our parent
// of we don't have any
wxWindow *parent = GetParent(); wxWindow *parent = GetParent();
if ( !parent || !parent->GetEventHandler()->ProcessEvent(event) ) if ( goingDown ||
!parent || !parent->GetEventHandler()->ProcessEvent(event) )
{ {
event.Skip(); event.Skip();
} }
@@ -143,9 +149,6 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
// next acceptable child // next acceptable child
wxWindowList::Node *node, *start_node; wxWindowList::Node *node, *start_node;
// the event is propagated downwards if the event emitter was our parent
bool goingDown = event.GetEventObject() == GetParent();
// we should start from the first/last control and not from the one which // we should start from the first/last control and not from the one which
// had focus the last time if we're propagating the event downwards because // had focus the last time if we're propagating the event downwards because
// for our parent we look like a single control // for our parent we look like a single control