mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk3: use gtk_window_group_get_current_grab instead of gtk_grab_get_current

Browse Source 
now that we are using window groups, otherwise the problem of tdf#99604
comes back

Change-Id: I7a940ea72bfd7fd4a7f68f1e60395d5014ce155c
This commit is contained in:
Caolán McNamara
2016-06-10 12:12:33 +01:00
parent a411e3c9a3
commit 9b49e1817d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vcl/unx/gtk3/gtk3gtkframe.cxx
View File

@@ -1440,8 +1440,9 @@ void GtkSalFrame::Show( bool bVisible, bool bNoActivate )
m_nFloats++; m_nFloats++;
if( ! getDisplay()->GetCaptureFrame() && m_nFloats == 1 ) if( ! getDisplay()->GetCaptureFrame() && m_nFloats == 1 )
{ {
GtkWindowGroup *pWindowGroup = gtk_window_get_group(GTK_WINDOW(m_pWindow));
GtkWidget* pGrabWidgetBeforeShowFloat; GtkWidget* pGrabWidgetBeforeShowFloat;
while ((pGrabWidgetBeforeShowFloat = gtk_grab_get_current())) while ((pGrabWidgetBeforeShowFloat = gtk_window_group_get_current_grab(pWindowGroup)))
{ {
m_aGrabWidgetsBeforeShowFloat.push_back(pGrabWidgetBeforeShowFloat); m_aGrabWidgetsBeforeShowFloat.push_back(pGrabWidgetBeforeShowFloat);
gtk_grab_remove(pGrabWidgetBeforeShowFloat); gtk_grab_remove(pGrabWidgetBeforeShowFloat);