From efcc00ffefa34b2c4048e560099814c19a064ba5 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Tue, 24 Oct 2017 19:39:11 +0100 Subject: [PATCH] Build fixes for GTK2. I had left one mention of the new GTK3-only variable 'awaiting_resize_ack' unprotected by #ifdefs. Also, the GTK2 version of message_box() was missing some consts in its prototype, presumably because when I had that #ifdeffed out the compiler didn't warn me about those ones. --- gtk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk.c b/gtk.c index 37ba807..3078e51 100644 --- a/gtk.c +++ b/gtk.c @@ -1397,7 +1397,9 @@ static gint configure_area(GtkWidget *widget, { frontend *fe = (frontend *)data; resize_puzzle_to_area(fe, event->width, event->height); +#if GTK_CHECK_VERSION(3,0,0) fe->awaiting_resize_ack = FALSE; +#endif return TRUE; } @@ -1522,8 +1524,8 @@ static void msgbox_button_clicked(GtkButton *button, gpointer data) gtk_widget_destroy(GTK_WIDGET(data)); } -int message_box(GtkWidget *parent, char *title, char *msg, int centre, - int type) +int message_box(GtkWidget *parent, const char *title, const char *msg, + int centre, int type) { GtkWidget *window, *hbox, *text, *button; char *titles; -- 2.30.2