diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-10 12:12:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-10 12:14:51 +0100 |
| commit | ec0adaa492fdc1b07c876cc5618420df9b50eb84 (patch) | |
| tree | 1544f40c9277cd00be5b373ac2b9cf88398278bf /vcl | |
| parent | bfef572871441a8cdc9509e26afbef208e4f6243 (diff) | |
gtk3: use gtk_window_group_get_current_grab instead of gtk_grab_get_current
now that we are using window groups, otherwise the problem of tdf#99604
comes back
Change-Id: I7a940ea72bfd7fd4a7f68f1e60395d5014ce155c
(cherry picked from commit 9b49e1817d4d045b724aed6267f8f00c6bf295cc)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index a31a2aeb3c68..8e72d6a54b79 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1432,8 +1432,9 @@ void GtkSalFrame::Show( bool bVisible, bool bNoActivate ) m_nFloats++; if( ! getDisplay()->GetCaptureFrame() && m_nFloats == 1 ) { + GtkWindowGroup *pWindowGroup = gtk_window_get_group(GTK_WINDOW(m_pWindow)); GtkWidget* pGrabWidgetBeforeShowFloat; - while ((pGrabWidgetBeforeShowFloat = gtk_grab_get_current())) + while ((pGrabWidgetBeforeShowFloat = gtk_window_group_get_current_grab(pWindowGroup))) { m_aGrabWidgetsBeforeShowFloat.push_back(pGrabWidgetBeforeShowFloat); gtk_grab_remove(pGrabWidgetBeforeShowFloat); |