From 4c815256abbceb704e3dbe363defc81f68167e71 Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Sat, 5 Feb 2011 10:05:42 +0000 Subject: [PATCH] Gtk3 compatibility: fix build with GSEAL_ENABLE --- src/Makefile.am | 2 +- src/display_cow.c | 5 +++-- src/floating_shape.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8748061..7c1ac7a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = xcowsay bin_SCRIPTS = xcowfortune xcowdream xcowthink GTK3_CHECK = -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_SINGLE_INCLUDES + -DGTK_DISABLE_SINGLE_INCLUDES -DGSEAL_ENABLE AM_CFLAGS = $(XCOWSAY_CFLAGS) -Wall $(GTK3_CHECK) LDADD = $(XCOWSAY_LIBS) diff --git a/src/display_cow.c b/src/display_cow.c index dbedcd1..8033efc 100644 --- a/src/display_cow.c +++ b/src/display_cow.c @@ -116,9 +116,10 @@ static gboolean cow_clicked(GtkWidget *widget, GdkEventButton *event, gpointer d */ static void close_when_clicked(float_shape_t *shape) { - GdkEventMask events = gdk_window_get_events(shape_window(shape)->window); + GdkWindow *w = gtk_widget_get_window(shape_window(shape)); + GdkEventMask events = gdk_window_get_events(w); events |= GDK_BUTTON_PRESS_MASK; - gdk_window_set_events(shape_window(shape)->window, events); + gdk_window_set_events(w, events); g_signal_connect(G_OBJECT(shape_window(shape)), "button-press-event", G_CALLBACK(cow_clicked), NULL); } diff --git a/src/floating_shape.c b/src/floating_shape.c index c4ef18a..a1ebdff 100644 --- a/src/floating_shape.c +++ b/src/floating_shape.c @@ -128,8 +128,8 @@ void show_shape(float_shape_t *shape) gtk_window_move(GTK_WINDOW(shape->window), shape->x, shape->y); gtk_window_resize(GTK_WINDOW(shape->window), shape->width, shape->height); gtk_widget_show_all(shape->window); - - gdk_window_set_back_pixmap(shape->window->window, NULL, TRUE); + + gdk_window_set_back_pixmap(gtk_widget_get_window(shape->window), NULL, TRUE); } void hide_shape(float_shape_t *shape) -- 2.39.2