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
This commit is contained in:
committed by
Michael Natterer
parent
a63ba82b64
commit
05a6983f62
@ -39,7 +39,6 @@
|
||||
#include "gtktreeitem.h"
|
||||
#include "gtkintl.h"
|
||||
|
||||
#define GTK_DISABLE_DEPRECATED
|
||||
#include "gtkalias.h"
|
||||
|
||||
#include "tree_plus.xpm"
|
||||
@ -851,7 +850,7 @@ gtk_tree_item_destroy (GtkObject *object)
|
||||
gtk_widget_ref (child);
|
||||
gtk_widget_unparent (child);
|
||||
gtk_widget_destroy (child);
|
||||
gtk_widget_unref (child);
|
||||
g_object_unref (child);
|
||||
item->subtree = NULL;
|
||||
}
|
||||
|
||||
@ -862,7 +861,7 @@ gtk_tree_item_destroy (GtkObject *object)
|
||||
gtk_widget_ref (child);
|
||||
gtk_widget_unparent (child);
|
||||
gtk_widget_destroy (child);
|
||||
gtk_widget_unref (child);
|
||||
g_object_unref (child);
|
||||
item->pixmaps_box = NULL;
|
||||
}
|
||||
|
||||
@ -871,7 +870,7 @@ gtk_tree_item_destroy (GtkObject *object)
|
||||
if (item->plus_pix_widget)
|
||||
{
|
||||
gtk_widget_destroy (item->plus_pix_widget);
|
||||
gtk_widget_unref (item->plus_pix_widget);
|
||||
g_object_unref (item->plus_pix_widget);
|
||||
item->plus_pix_widget = NULL;
|
||||
}
|
||||
|
||||
@ -879,7 +878,7 @@ gtk_tree_item_destroy (GtkObject *object)
|
||||
if (item->minus_pix_widget)
|
||||
{
|
||||
gtk_widget_destroy (item->minus_pix_widget);
|
||||
gtk_widget_unref (item->minus_pix_widget);
|
||||
g_object_unref (item->minus_pix_widget);
|
||||
item->minus_pix_widget = NULL;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user