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

Don't call SetFocus() for popups not using wxPU_CONTAINS_CONTROLS

Browse Source 
Under MSW only popup windows with wxPU_CONTAINS_CONTROLS can have focus,
attempting to set it to a [child of a] popup without it will just result
in a debug error message from wxWindow::SetFocus() and nothing else, so
just avoid doing it entirely.
This commit is contained in:
Vadim Zeitlin
2020-07-09 19:55:03 +02:00
parent 03e79fce63
commit 2ac90f9d38
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/popupwin.cpp
View File

@@ -180,10 +180,10 @@ void wxPopupTransientWindow::Popup(wxWindow* focus)
{ {
Show(); Show();
// We can only set focus to one of our children as setting it to another // We can only set focus when using wxPU_CONTAINS_CONTROLS and then only to
// window would result in an immediate loss of activation and popup // one of our children as setting it to another window would result in an
// disappearance. // immediate loss of activation and popup disappearance.
if ( focus && IsDescendant(focus) ) if ( HasFlag(wxPU_CONTAINS_CONTROLS) && focus && IsDescendant(focus) )
focus->SetFocus(); focus->SetFocus();
} }