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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkobject.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit dda21ca52433e3899e0990d852e20af6d8a2e72f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 27 15:05:59 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 27 18:04:10 2021 +0200

    gtk4: use gtk_widget_unparent to drop ref count to 0 and destroy
    
    so now gtk4 slideshow mouse input works after an opengl slide has finished
    
    Change-Id: I156d584417d12ab30551445f93e876cca8453e70
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122715
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkobject.cxx b/vcl/unx/gtk3/gtkobject.cxx
index 3b9757650e53..d5fb4119a98b 100644
--- a/vcl/unx/gtk3/gtkobject.cxx
+++ b/vcl/unx/gtk3/gtkobject.cxx
@@ -110,9 +110,11 @@ GtkSalObjectBase::~GtkSalObjectBase()
 
 GtkSalObject::~GtkSalObject()
 {
-#if !GTK_CHECK_VERSION(4, 0, 0)
     if( m_pSocket )
     {
+#if GTK_CHECK_VERSION(4, 0, 0)
+        gtk_widget_unparent(m_pSocket);
+#else
         // remove socket from parent frame's fixed container
         gtk_container_remove( GTK_CONTAINER(gtk_widget_get_parent(m_pSocket)),
                               m_pSocket );
@@ -122,8 +124,8 @@ GtkSalObject::~GtkSalObject()
         // this is just a sanity check
         if( m_pSocket )
             gtk_widget_destroy( m_pSocket );
-    }
 #endif
+    }
 }
 
 void GtkSalObject::ResetClipRegion()