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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 641bfc7a09ea3b11cd9164a597ef52917d11e3a8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 3 16:21:45 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jun 3 21:09:30 2021 +0200

    gtk4: don't call gtk_widget_destroy on a GtkPopover
    
    Change-Id: Ia65218a231796cb128a95f7bfa1a04dfd769f55a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116675
    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 566e1d0aa53e..22cf2860adc3 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -22599,7 +22599,11 @@ public:
         GtkPopover* pPopover = GTK_POPOVER(gtk_builder_get_object(m_pBuilder, id.getStr()));
         if (!pPopover)
             return nullptr;
+#if GTK_CHECK_VERSION(4, 0, 0)
+        return std::make_unique<GtkInstancePopover>(pPopover, this, false);
+#else
         return std::make_unique<GtkInstancePopover>(pPopover, this, true);
+#endif
     }
 
     virtual std::unique_ptr<weld::Toolbar> weld_toolbar(const OString &id) override