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

Applied [ 1208344 ] wxNotebook::OnSelChange fix for focus issue

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2005-05-30 11:23:27 +00:00
parent 10dd0cfa58
commit 306302e12a
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/msw/notebook.cpp
View File

@ -967,18 +967,14 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event)
{
wxNotebookPage *pPage = m_pages[sel];
pPage->Show(true);
pPage->SetFocus();
// If the newly focused window is not a child of the new page,
// SetFocus was not successful and the notebook itself should be
// focused
wxWindow *currentFocus = FindFocus();
wxWindow *startFocus = currentFocus;
while ( currentFocus && currentFocus != pPage && currentFocus != this )
currentFocus = currentFocus->GetParent();
if ( startFocus == pPage || currentFocus != pPage )
SetFocus();
// As per bug report:
// http://sourceforge.net/tracker/index.php?func=detail&aid=1150659&group_id=9863&atid=109863,
// we should not set the page focus (and thereby the focus for
// a child window) since it erroneously selects radio button controls and also
// breaks keyboard handling for a notebook's scroll buttons. So
// we always focus the notebook and not the page.
SetFocus();
}
else // no pages in the notebook, give the focus to itself