diff --git a/docs/changes.txt b/docs/changes.txt index 481e70a57c..824dda5a7f 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -274,6 +274,7 @@ wxMSW - Fix regression in wxTreeCtrl indent size in high DPI (Maarten Bent, #25282). - Fix using wxNO_IMPLICIT_WXSTRING_ENCODING with PCH (#25568). - Fix crash when copying wxBitmaps if GDI resources are exhausted (#24703). +- Fix TAB behaviour in a panel with notebook as only active child (#25443). wxOSX: diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 6eb6f4726b..977249068f 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -1070,8 +1070,14 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) else if ( parent ) { event.SetCurrentFocus(this); - parent->HandleWindowEvent(event); - } + if ( !parent->HandleWindowEvent(event) ) + { + // if the parent didn't handle this event, the notebook + // must be its only child accepting focus, so take it + event.Skip(false); + SetFocus(); + } + } } } }