From 5bf58785ba2831de4efc2afe9df463b4a753ccb1 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Fri, 21 Jun 2024 09:22:07 +0200 Subject: gtk4: Require GTK >= 4.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the gtk4 VCL plugin, require GTK version >= 4.10 and drop code for older versions. This simplifies maintenance, in particular since requiring 4.10 ensures that the basic GtkAccessible API is available. GTK 4.10 was released on 2023-03-04 [1], so it will be almost 2 years by the time that LO 25.2 will be released. Given that the gtk4 VCL plugin is still experimental, providing support for older GTK 4 releases shouldn't have to be a concern. [1] https://gitlab.gnome.org/GNOME/gtk/-/blob/4.10.0/NEWS?ref_type=tags Change-Id: I6f361b533391225d0e74c174e0479b767b9d827a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169324 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara Tested-by: Jenkins --- avmedia/source/gtk/gtkplayer.cxx | 4 ---- 1 file changed, 4 deletions(-) (limited to 'avmedia/source/gtk') diff --git a/avmedia/source/gtk/gtkplayer.cxx b/avmedia/source/gtk/gtkplayer.cxx index 4dca3e202a24..617991fecce2 100644 --- a/avmedia/source/gtk/gtkplayer.cxx +++ b/avmedia/source/gtk/gtkplayer.cxx @@ -343,11 +343,7 @@ uno::Reference<::media::XPlayerWindow> return nullptr; m_pVideo = gtk_picture_new_for_paintable(GDK_PAINTABLE(m_pStream)); -#if GTK_CHECK_VERSION(4, 7, 2) gtk_picture_set_content_fit(GTK_PICTURE(m_pVideo), GTK_CONTENT_FIT_FILL); -#else - gtk_picture_set_keep_aspect_ratio(GTK_PICTURE(m_pVideo), false); -#endif gtk_widget_set_can_target(m_pVideo, false); gtk_widget_set_vexpand(m_pVideo, true); gtk_widget_set_hexpand(m_pVideo, true); -- cgit