summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-06-10 12:12:33 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-06-10 12:14:16 +0100
commit9b49e1817d4d045b724aed6267f8f00c6bf295cc (patch)
tree1ff14de04c7fa022c7aa296510edf944e9940ceb /vcl
parenta411e3c9a3058bf1432782deeac1daa9a8d18910 (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
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk3/gtk3gtkframe.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 5a12fa66c0ac..35522dd8283b 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1440,8 +1440,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);