From f3f6b68629656d488550fb82898e40fcad61c271 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 26 May 2021 16:12:59 +0100 Subject: gtk4: restore Container MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ide82777fadbee2c644c3a19d418c3683f6ff2c11 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116201 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- vcl/unx/gtk3/gtkinst.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index d4e9465b8248..948e22c044dd 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -19422,14 +19422,13 @@ public: { #if !GTK_CHECK_VERSION(4, 0, 0) GtkContainer* pContainer = GTK_CONTAINER(gtk_builder_get_object(m_pBuilder, id.getStr())); +#else + GtkWidget* pContainer = GTK_WIDGET(gtk_builder_get_object(m_pBuilder, id.getStr())); +#endif if (!pContainer) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pContainer)); return std::make_unique(pContainer, this, false); -#else - (void)id; - return nullptr; -#endif } virtual std::unique_ptr weld_box(const OString &id) override -- cgit