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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 8eb1aeac694d3b85ca22de7fc9e14c6827063bb7
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 6 11:40:54 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 6 15:20:02 2021 +0200

    gtk4: get toolbar item clicking working
    
    Change-Id: I5e60a48a5e2ffeb06785ed81a8a3767cff752b1d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118477
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index c8bb28a7a7a2..7dd7a2a22e29 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -10892,7 +10892,13 @@ public:
 #endif
         , m_pMenuButtonProvider(nullptr)
     {
-#if !GTK_CHECK_VERSION(4, 0, 0)
+#if GTK_CHECK_VERSION(4, 0, 0)
+        for (GtkWidget* pChild = gtk_widget_get_first_child(GTK_WIDGET(pToolbar));
+             pChild; pChild = gtk_widget_get_next_sibling(pChild))
+        {
+            collect(pChild, this);
+        }
+#else
         gtk_container_foreach(GTK_CONTAINER(pToolbar), collect, this);
 #endif
     }