diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-26 16:12:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-26 18:39:49 +0200 |
| commit | f3f6b68629656d488550fb82898e40fcad61c271 (patch) | |
| tree | 479e6dee5fe920e0293aca1de3b04fa7f100c286 | |
| parent | gtk4: strip GtkLinkButton xalign (diff) | |
| download | core-f3f6b68629656d488550fb82898e40fcad61c271.tar.gz core-f3f6b68629656d488550fb82898e40fcad61c271.zip | |
gtk4: restore Container
Change-Id: Ide82777fadbee2c644c3a19d418c3683f6ff2c11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116201
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 7 |
1 files 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<GtkInstanceContainer>(pContainer, this, false); -#else - (void)id; - return nullptr; -#endif } virtual std::unique_ptr<weld::Box> weld_box(const OString &id) override |