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

[Caolán McNamara (via logerrit)]

 vcl/inc/unx/gtk/gtkframe.hxx |    2 +-
 vcl/unx/gtk3/gtkframe.cxx    |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 0038386cdecc3856da5f1d9696cc13713f0e206d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon May 10 11:49:27 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon May 10 14:31:10 2021 +0200

    gtk4: enable signalDestroy
    
    Change-Id: Idd15db9c8666887818a6a119ee796db86fd1482f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115320
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 25fd37386e97..9c3753fa003b 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -285,8 +285,8 @@ class GtkSalFrame final : public SalFrame
     static gboolean     signalWindowState( GtkWidget*, GdkEvent*, gpointer );
     static gboolean     signalScroll( GtkWidget*, GdkEvent*, gpointer );
     static gboolean     signalCrossing( GtkWidget*, GdkEventCrossing*, gpointer );
-    static void         signalDestroy( GtkWidget*, gpointer );
 #endif
+    static void         signalDestroy( GtkWidget*, gpointer );
 
     void            Center();
     void            SetDefaultSize();
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index c4f1dd3c58db..8e95d4ed1227 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -988,9 +988,8 @@ void GtkSalFrame::InitCommon()
     g_signal_connect( G_OBJECT(m_pWindow), "key-release-event", G_CALLBACK(signalKey), this );
     g_signal_connect( G_OBJECT(m_pWindow), "delete-event", G_CALLBACK(signalDelete), this );
     g_signal_connect( G_OBJECT(m_pWindow), "window-state-event", G_CALLBACK(signalWindowState), this );
-    g_signal_connect( G_OBJECT(m_pWindow), "destroy", G_CALLBACK(signalDestroy), this );
-
 #endif
+    g_signal_connect( G_OBJECT(m_pWindow), "destroy", G_CALLBACK(signalDestroy), this );
 
     // init members
     m_nKeyModifiers     = ModKeyFlags::NONE;
@@ -4192,6 +4191,7 @@ void GtkInstDropTarget::signalDragLeave(GtkWidget* pWidget, GdkDragContext* /*co
     // exit handling to an idle.
     g_idle_add(lcl_deferred_dragExit, this);
 }
+#endif
 
 void GtkSalFrame::signalDestroy( GtkWidget* pObj, gpointer frame )
 {
@@ -4204,13 +4204,14 @@ void GtkSalFrame::signalDestroy( GtkWidget* pObj, gpointer frame )
     if (pThis->m_pSurface)
         cairo_surface_set_user_data(pThis->m_pSurface, SvpSalGraphics::getDamageKey(), nullptr, nullptr);
     pThis->m_pFixedContainer = nullptr;
+#if !GTK_CHECK_VERSION(4, 0, 0)
     pThis->m_pEventBox = nullptr;
+#endif
     pThis->m_pTopLevelGrid = nullptr;
     pThis->m_pWindow = nullptr;
     pThis->m_xFrameWeld.reset();
     pThis->InvalidateGraphics();
 }
-#endif
 
 // GtkSalFrame::IMHandler