From ac3ce1ceac8fc0434f4b5b855534acaa84fc5063 Mon Sep 17 00:00:00 2001 From: deepend Date: Sun, 25 Jan 2026 11:37:04 -0700 Subject: [PATCH] Updated gtkutil_apply_palette declarations to use GTK-specific Gdk color types for GTK3 vs GTK2 builds. Adjusted the gtkutil_apply_palette definition to match GTK3/GTK2 Gdk color signatures while preserving existing behavior. --- src/fe-gtk/gtkutil.c | 8 +++++++- src/fe-gtk/gtkutil.h | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c index b79ccf7e..87c04892 100644 --- a/src/fe-gtk/gtkutil.c +++ b/src/fe-gtk/gtkutil.c @@ -128,9 +128,15 @@ gtkutil_image_new_from_stock (const char *stock, GtkIconSize size) } #endif +#if HAVE_GTK3 void -gtkutil_apply_palette (GtkWidget *widget, const PaletteColor *bg, const PaletteColor *fg, +gtkutil_apply_palette (GtkWidget *widget, const GdkRGBA *bg, const GdkRGBA *fg, const PangoFontDescription *font_desc) +#else +void +gtkutil_apply_palette (GtkWidget *widget, const GdkColor *bg, const GdkColor *fg, + const PangoFontDescription *font_desc) +#endif { if (!widget) return; diff --git a/src/fe-gtk/gtkutil.h b/src/fe-gtk/gtkutil.h index c3301138..98c941f8 100644 --- a/src/fe-gtk/gtkutil.h +++ b/src/fe-gtk/gtkutil.h @@ -48,8 +48,13 @@ gboolean gtkutil_treemodel_string_to_iter (GtkTreeModel *model, gchar *pathstr, gboolean gtkutil_treeview_get_selected_iter (GtkTreeView *view, GtkTreeIter *iter_ret); gboolean gtkutil_treeview_get_selected (GtkTreeView *view, GtkTreeIter *iter_ret, ...); gboolean gtkutil_tray_icon_supported (GtkWindow *window); -void gtkutil_apply_palette (GtkWidget *widget, const PaletteColor *bg, const PaletteColor *fg, +#if HAVE_GTK3 +void gtkutil_apply_palette (GtkWidget *widget, const GdkRGBA *bg, const GdkRGBA *fg, const PangoFontDescription *font_desc); +#else +void gtkutil_apply_palette (GtkWidget *widget, const GdkColor *bg, const GdkColor *fg, + const PangoFontDescription *font_desc); +#endif #if defined (WIN32) || defined (__APPLE__) gboolean gtkutil_find_font (const char *fontname);