aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2017-10-24 19:39:11 +0100
committerSimon Tatham <anakin@pobox.com>2017-10-24 19:39:11 +0100
commitefcc00ffefa34b2c4048e560099814c19a064ba5 (patch)
tree159a5e31ee7a40641735fd8d893efd72c8123dae
parent38ea1599fe0bf995f5c16b3d2995643976387e15 (diff)
downloadpuzzles-efcc00ffefa34b2c4048e560099814c19a064ba5.zip
puzzles-efcc00ffefa34b2c4048e560099814c19a064ba5.tar.gz
puzzles-efcc00ffefa34b2c4048e560099814c19a064ba5.tar.bz2
puzzles-efcc00ffefa34b2c4048e560099814c19a064ba5.tar.xz
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.
-rw-r--r--gtk.c6
1 files 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;