From 7f9d4ad337ca988545f96cc75bd925a5d0aa8a75 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sat, 22 May 2021 19:44:18 +0100
Subject: gtk4: reenable Frame
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: Ic9ce49da26c6ca673ac0980ab32895d8eda8da54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116001
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
vcl/unx/gtk3/gtkinst.cxx | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 760384cba800..e2fb757024b9 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -14621,14 +14621,10 @@ public:
std::unique_ptr<weld::Label> GtkInstanceFrame::weld_label_widget() const
{
-#if !GTK_CHECK_VERSION(4, 0, 0)
GtkWidget* pLabel = gtk_frame_get_label_widget(m_pFrame);
if (!pLabel || !GTK_IS_LABEL(pLabel))
return nullptr;
return std::make_unique<GtkInstanceLabel>(GTK_LABEL(pLabel), m_pBuilder, false);
-#else
- return nullptr;
-#endif
}
#if !GTK_CHECK_VERSION(4, 0, 0)
@@ -18987,16 +18983,11 @@ public:
virtual std::unique_ptr<weld::Frame> weld_frame(const OString &id) override
{
-#if !GTK_CHECK_VERSION(4, 0, 0)
GtkFrame* pFrame = GTK_FRAME(gtk_builder_get_object(m_pBuilder, id.getStr()));
if (!pFrame)
return nullptr;
auto_add_parentless_widgets_to_container(GTK_WIDGET(pFrame));
return std::make_unique<GtkInstanceFrame>(pFrame, this, false);
-#else
- (void)id;
- return nullptr;
-#endif
}
virtual std::unique_ptr<weld::ScrolledWindow> weld_scrolled_window(const OString &id, bool bUserManagedScrolling = false) override
--
cgit