diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-22 19:44:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-22 22:09:22 +0200 |
| commit | 7f9d4ad337ca988545f96cc75bd925a5d0aa8a75 (patch) | |
| tree | ab46e8e9342123b7b56e9fb098ff829a82e6f903 | |
| parent | 978765903973fe4dcd0c711eceef5bd0eac9f0e3 (diff) | |
gtk4: reenable Frame
Change-Id: Ic9ce49da26c6ca673ac0980ab32895d8eda8da54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116001
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 9 |
1 files changed, 0 insertions, 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 |