From d3a60802ac0f663c7857d78e4136353ffb31c481 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 25 Feb 2012 23:55:42 +0100 Subject: [PATCH] Consider GTK_DISABLE_DEPRECATED in gtk3-compat.h --- katze/gtk3-compat.h | 2 +- tests/properties.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/katze/gtk3-compat.h b/katze/gtk3-compat.h index 70bc5c3f..71a1ef19 100644 --- a/katze/gtk3-compat.h +++ b/katze/gtk3-compat.h @@ -6,7 +6,7 @@ G_BEGIN_DECLS -#if GTK_CHECK_VERSION (3, 2, 0) +#if GTK_CHECK_VERSION (3, 2, 0) && defined (GTK_DISABLE_DEPRECATED) #define GTK_TYPE_VBOX GTK_TYPE_BOX #define GtkVBox GtkBox #define GtkVBoxClass GtkBoxClass diff --git a/tests/properties.c b/tests/properties.c index 05c1358e..3f4f0403 100644 --- a/tests/properties.c +++ b/tests/properties.c @@ -154,13 +154,13 @@ properties_object_get_set (GObject* object) static void properties_object_test (gconstpointer object) { - if (GTK_IS_OBJECT (object)) + if (GTK_IS_WIDGET (object)) g_object_ref_sink ((GObject*)object); properties_object_get_set ((GObject*)object); - if (GTK_IS_OBJECT (object)) - gtk_object_destroy (GTK_OBJECT (object)); + if (GTK_IS_WIDGET (object)) + gtk_widget_destroy (GTK_WIDGET (object)); g_object_unref ((GObject*)object); } -- 2.39.5