From d06e97e8d97511b05481e88e5b45deefeb1539ff Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 8 Jul 2020 08:52:12 -0700 Subject: [PATCH] Make sure toplevel is active in SetFocus() See #18783 --- src/gtk/window.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 412702ef29..b8f0fd9f0f 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -4583,6 +4583,10 @@ void wxWindowGTK::SetFocus() if (gs_currentFocus != this) gs_pendingFocus = this; + wxWindow* tlw = wxGetTopLevelParent(static_cast(this)); + if (tlw && tlw->m_widget && !gtk_window_is_active(GTK_WINDOW(tlw->m_widget))) + tlw->Raise(); + GtkWidget *widget = m_wxwindow ? m_wxwindow : m_focusWidget; if ( GTK_IS_CONTAINER(widget) &&