From 829b5923f90cd554deba14eb49d499a3a1f5237f Mon Sep 17 00:00:00 2001 From: Sean Middleditch Date: Sat, 5 Mar 2011 16:58:04 -0800 Subject: [PATCH 6/6] Require GTK 2.24 and always set GSEAL Also set the *_DISABLE_DEPRECATED macros. Fix up wrapper for GSEAL --- configure.ac.in | 10 ++++++++++ wrapper/wrapper-plug.c | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 40e3245..f7b0b9c 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -215,6 +215,16 @@ if test x"$have_gnuc_visibility" = x"yes"; then fi AM_CONDITIONAL([HAVE_GNUC_VISIBILITY], [test x"$have_gnuc_visibility" = x"yes"]) +dnl ************************************** +dnl *** GTKSEAL and disable deprecated *** +dnl ************************************** +CPPFLAGS="$CPPFLAGS -DGSEAL_ENABLE=1" +CPPFLAGS="$CPPFLAGS -DGTK_DISABLED_DEPRECATED=1" +CPPFLAGS="$CPPFLAGS -DGDK_DISABLE_DEPRECATED=1" +CPPFLAGS="$CPPFLAGS -DGDK_PIXBUF_DISABLE_DEPRECATED=1" +CPPFLAGS="$CPPFLAGS -DG_DISABLE_DEPRECATED=1" +CPPFLAGS="$CPPFLAGS -DPANGO_DISABLE_DEPRECATED=1" + dnl ************************************* dnl *** Compensate for broken gtk-doc *** dnl ************************************* diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c index 29cced3..b602474 100644 --- a/wrapper/wrapper-plug.c +++ b/wrapper/wrapper-plug.c @@ -131,11 +131,11 @@ wrapper_plug_expose_event (GtkWidget *widget, GdkPixbuf *pixbuf; GError *error = NULL; - if (GTK_WIDGET_DRAWABLE (widget)) + if (gtk_widget_is_drawable (widget)) { if (G_UNLIKELY (plug->background_image != NULL)) { - cr = gdk_cairo_create (widget->window); + cr = gdk_cairo_create (gtk_widget_get_window (widget)); cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); gdk_cairo_rectangle (cr, &event->area); cairo_clip (cr); @@ -184,10 +184,10 @@ wrapper_plug_expose_event (GtkWidget *widget, if (plug->background_color != NULL) color = plug->background_color; else - color = &(widget->style->bg[GTK_STATE_NORMAL]); + color = &(gtk_widget_get_style (widget)->bg[GTK_STATE_NORMAL]); /* draw the background color */ - cr = gdk_cairo_create (widget->window); + cr = gdk_cairo_create (gtk_widget_get_window (widget)); cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); cairo_set_source_rgba (cr, PANEL_GDKCOLOR_TO_DOUBLE (color), alpha); gdk_cairo_rectangle (cr, &event->area); -- 1.7.4.1