// first of all, find the window which currently has the focus
wxNode *node = GetChildren()->First();
wxWindow *winFocus = event.GetCurrentFocus();
- if ( winFocus == NULL )
- winFocus = wxWindow::FindFocus();
+
+ // @@@ no FindFocus() in wxGTK
+ #ifndef __WXGTK__
+ if ( winFocus == NULL )
+ winFocus = wxWindow::FindFocus();
+ #endif
+
while ( node != NULL ) {
if ( node->Data() == winFocus )
break;
bFound = WIN(node)->AcceptsFocus();
}
+#if 0 // to restore when it will really work (now it's triggered all the time)
else {
// just to be sure it's the right one
wxASSERT( WIN(node)->AcceptsFocus() );
}
+#endif // 0
// find the next child which accepts focus
+ bool bParentWantsIt = TRUE;
while ( !bFound ) {
node = bForward ? node->Next() : node->Previous();
if ( node == NULL ) {
+ if ( !bParentWantsIt ) {
+ // we've already been here which means that we've done a whole
+ // cycle without success - get out from the infinite loop
+ return FALSE;
+ }
+
// ask parent if he doesn't want to advance focus to the next panel
if ( GetParent() != NULL ) {
wxNavigationKeyEvent event;
return TRUE;
}
+ // a sentinel to avoid infinite loops
+ bParentWantsIt = FALSE;
+
// wrap around
node = bForward ? children->First() : children->Last();
}
#undef WIN
return TRUE;
-}
\ No newline at end of file
+}