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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit 43110924e78bd18ec4fce89036a0174b8dec8a83
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat May 22 19:45:52 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat May 22 22:16:48 2021 +0200

    gtk4: reenable paned
    
    Change-Id: Iccda840da791b38b9a8287492f02348b9036de9d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116002
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index e2fb757024b9..e284f06f5277 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -18969,16 +18969,11 @@ public:
 
     virtual std::unique_ptr<weld::Paned> weld_paned(const OString &id) override
     {
-#if !GTK_CHECK_VERSION(4, 0, 0)
         GtkPaned* pPaned = GTK_PANED(gtk_builder_get_object(m_pBuilder, id.getStr()));
         if (!pPaned)
             return nullptr;
         auto_add_parentless_widgets_to_container(GTK_WIDGET(pPaned));
         return std::make_unique<GtkInstancePaned>(pPaned, this, false);
-#else
-        (void)id;
-        return nullptr;
-#endif
     }
 
     virtual std::unique_ptr<weld::Frame> weld_frame(const OString &id) override