From 2afbcdcc3c6d59aa03280df65ce6c690baa4273f Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sun, 4 Oct 2015 19:30:08 +0100 Subject: [PATCH] GTK 3.16 deprecation: stop using gtk_misc_set_alignment. The new equivalent is gtk_label_set_{x,y}align. But we can't use that in all GTK 3 builds, because it's very new. --- gtk.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gtk.c b/gtk.c index 559ff82..659d581 100644 --- a/gtk.c +++ b/gtk.c @@ -1401,6 +1401,16 @@ static int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) enum { MB_OK, MB_YESNO }; +static void align_label(GtkLabel *label, double x, double y) +{ +#if GTK_CHECK_VERSION(3,16,0) + gtk_label_set_xalign(label, x); + gtk_label_set_yalign(label, y); +#else + gtk_misc_set_alignment(GTK_MISC(label), x, y); +#endif +} + int message_box(GtkWidget *parent, char *title, char *msg, int centre, int type) { @@ -1410,7 +1420,7 @@ int message_box(GtkWidget *parent, char *title, char *msg, int centre, window = gtk_dialog_new(); text = gtk_label_new(msg); - gtk_misc_set_alignment(GTK_MISC(text), 0.0, 0.0); + align_label(GTK_LABEL(text), 0.0, 0.0); hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), text, FALSE, FALSE, 20); gtk_box_pack_start @@ -1594,7 +1604,7 @@ static int get_config(frontend *fe, int which) */ w = gtk_label_new(i->name); - gtk_misc_set_alignment(GTK_MISC(w), 0.0, 0.5); + align_label(GTK_LABEL(w), 0.0, 0.5); #if GTK_CHECK_VERSION(3,0,0) gtk_grid_attach(GTK_GRID(table), w, 0, y, 1, 1); #else @@ -1650,7 +1660,7 @@ static int get_config(frontend *fe, int which) */ w = gtk_label_new(i->name); - gtk_misc_set_alignment(GTK_MISC(w), 0.0, 0.5); + align_label(GTK_LABEL(w), 0.0, 0.5); #if GTK_CHECK_VERSION(3,0,0) gtk_grid_attach(GTK_GRID(table), w, 0, y, 1, 1); #else -- 2.30.2