vcl/unx/gtk3/gtkinst.cxx | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit a510a24a378df9f40b73c7acd079b525a07e7fa1
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Jul 21 15:57:17 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Jul 21 20:26:21 2025 +0200
gtk4: Unconditionally use function introduced in GTK 4.6
Handle the
// TODO after gtk 4.6 is released require that version and drop this
, given that GTK 4.10 is the minimum version since
commit 5bf58785ba2831de4efc2afe9df463b4a753ccb1
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Fri Jun 21 09:22:07 2024 +0200
gtk4: Require GTK >= 4.10
Change-Id: I14a54b2e6503f7439b20c91e1b72db64b88b0b05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188113
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 6a8914523854..82c6462699a7 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -12109,12 +12109,8 @@ private:
if (GTK_IS_BUTTON(pItem))
gtk_button_set_child(GTK_BUTTON(pItem), pImage);
else if (GTK_IS_MENU_BUTTON(pItem))
- {
- // TODO after gtk 4.6 is released require that version and drop
this
- static auto menu_button_set_child = reinterpret_cast<void (*)
(GtkMenuButton*, GtkWidget*)>(dlsym(nullptr, "gtk_menu_button_set_child"));
- if (menu_button_set_child)
- menu_button_set_child(GTK_MENU_BUTTON(pItem), pImage);
- }
+ gtk_menu_button_set_child(GTK_MENU_BUTTON(pItem), pImage);
+
// versions of gtk4 > 4.2.1 might do this on their own
gtk_widget_remove_css_class(pItem, "text-button");
}
