From f7a1f5db7d84ead159ef31bf2d7bd38a61a3a4ca Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 25 May 2021 17:04:43 +0300 Subject: [PATCH 50/50] gtk3x: Replace gtk_label_set_line_wrap() call with gtk_label_set_wrap() Function has been renamed in gtk-3.98 See osdn #42390 Signed-off-by: Marko Lindqvist --- client/gui-gtk-4.0/gotodlg.c | 2 +- client/gui-gtk-4.0/gtkcompat.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/client/gui-gtk-4.0/gotodlg.c b/client/gui-gtk-4.0/gotodlg.c index 5ebbe22dcc..fab18e3205 100644 --- a/client/gui-gtk-4.0/gotodlg.c +++ b/client/gui-gtk-4.0/gotodlg.c @@ -155,7 +155,7 @@ static void create_goto_dialog(void) G_CALLBACK(goto_cmd_callback), NULL); source = gtk_label_new("" /* filled in later */); - gtk_label_set_line_wrap(GTK_LABEL(source), TRUE); + gtk_label_set_wrap(GTK_LABEL(source), TRUE); gtk_label_set_justify(GTK_LABEL(source), GTK_JUSTIFY_CENTER); gtk_box_insert_child_after(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dshell))), source, NULL); diff --git a/client/gui-gtk-4.0/gtkcompat.h b/client/gui-gtk-4.0/gtkcompat.h index cfab3f996f..b269e8cc7a 100644 --- a/client/gui-gtk-4.0/gtkcompat.h +++ b/client/gui-gtk-4.0/gtkcompat.h @@ -36,6 +36,8 @@ guint gdk_button_event_get_button(GdkEvent *ev); #define gtk_widget_get_native(_wdg_) (_wdg_) #define gtk_native_get_surface(_nat_) gtk_widget_get_surface(_nat_) +#define gtk_label_set_wrap(_wdg_, _wrap_) gtk_label_set_line_wrap(_wdg_, _wrap_) + #endif /* GTK version < 3.98 */ #endif /* FC__GTKCOMPAT_H */ -- 2.30.2