[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkframe.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9b49e1817d4d045b724aed6267f8f00c6bf295cc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 10 12:12:33 2016 +0100

    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

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 5a12fa6..35522dd 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);