diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-07-04 18:38:36 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-07-04 18:38:36 +0000 |
| commit | 05a6983f6236089351f3ac095b45b465cef2e436 (patch) | |
| tree | c07e3716a1be9cd99f85b0035b2a7fbe32f37a3a /gtk/gtklist.c | |
| parent | a63ba82b648894ef68d3bbd99751378b00a692c0 (diff) | |
| download | gtk+-05a6983f6236089351f3ac095b45b465cef2e436.tar.gz | |
Fix make check:
2008-07-04 Michael Natterer <mitch@imendio.com>
Fix make check:
* gtk/Makefile.am: remove GTK_DISABLE_DEPRECATED from INCLUDES
again :-(
* gtk/gtkclist.c
* gtk/gtkcombo.c
* gtk/gtkctree.c
* gtk/gtklist.c
* gtk/gtklistitem.c
* gtk/gtknotebook.c
* gtk/gtkobject.c
* gtk/gtkoldeditable.c
* gtk/gtkpixmap.c
* gtk/gtktext.c
* gtk/gtktree.c
* gtk/gtktreeitem.c: don't #define it again before including
gtkalias.h after it has been #undef'ed before.
svn path=/trunk/; revision=20763
Diffstat (limited to 'gtk/gtklist.c')
| -rw-r--r-- | gtk/gtklist.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gtk/gtklist.c b/gtk/gtklist.c index 1d8a804bb6..839da5e3c0 100644 --- a/gtk/gtklist.c +++ b/gtk/gtklist.c @@ -24,8 +24,6 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#undef GTK_DISABLE_DEPRECATED - #include "config.h" #include <string.h> /* memset */ @@ -37,7 +35,6 @@ #include "gtkmarshalers.h" #include "gtkintl.h" -#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" enum { @@ -872,7 +869,7 @@ gtk_list_set_focus_child (GtkContainer *container, if (container->focus_child) { list->last_focus_child = container->focus_child; - gtk_widget_unref (container->focus_child); + g_object_unref (container->focus_child); } container->focus_child = child; if (container->focus_child) @@ -1184,7 +1181,7 @@ gtk_list_clear_items (GtkList *list, if (widget == list->last_focus_child) list->last_focus_child = NULL; - gtk_widget_unref (widget); + g_object_unref (widget); } g_list_free (start_list); @@ -1320,7 +1317,7 @@ gtk_list_remove_items_internal (GtkList *list, if (widget == list->last_focus_child) list->last_focus_child = NULL; - gtk_widget_unref (widget); + g_object_unref (widget); } if (new_focus_child && new_focus_child != old_focus_child) @@ -2505,7 +2502,7 @@ gtk_list_signal_item_deselect (GtkListItem *list_item, { list->selection = g_list_remove_link (list->selection, node); g_list_free_1 (node); - gtk_widget_unref (GTK_WIDGET (list_item)); + g_object_unref (list_item); gtk_signal_emit (GTK_OBJECT (list), list_signals[SELECTION_CHANGED]); } } |