callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix make check:

Browse Source 
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:
Michael Natterer
2008-07-04 18:38:36 +00:00
committed by Michael Natterer
parent a63ba82b64
commit 05a6983f62
14 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkclist.c
View File

@ -34,8 +34,6 @@
#include <gdk/gdkkeysyms.h>
#undef GTK_DISABLE_DEPRECATED
#include "gtkmain.h"
#include "gtkobject.h"
#include "gtkctree.h"
@ -45,7 +43,6 @@
#include "gtkmarshalers.h"
#include "gtkintl.h"
#define GTK_DISABLE_DEPRECATED
#include "gtkalias.h"
/* length of button_actions array */
@ -1162,7 +1159,7 @@ gtk_clist_set_hadjustment (GtkCList *clist,
if (clist->hadjustment)
{
gtk_signal_disconnect_by_data (GTK_OBJECT (clist->hadjustment), clist);
gtk_object_unref (GTK_OBJECT (clist->hadjustment));
g_object_unref (clist->hadjustment);
}
clist->hadjustment = adjustment;
@ -1209,7 +1206,7 @@ gtk_clist_set_vadjustment (GtkCList *clist,
if (clist->vadjustment)
{
gtk_signal_disconnect_by_data (GTK_OBJECT (clist->vadjustment), clist);
gtk_object_unref (GTK_OBJECT (clist->vadjustment));
g_object_unref (clist->vadjustment);
}
clist->vadjustment = adjustment;
@ -2598,7 +2595,7 @@ cell_size_request (GtkCList *clist,
requisition->width = logical_rect.width;
requisition->height = logical_rect.height;
g_object_unref (G_OBJECT (layout));
g_object_unref (layout);
}
else
{
@ -4384,13 +4381,13 @@ gtk_clist_destroy (GtkObject *object)
if (clist->hadjustment)
{
gtk_signal_disconnect_by_data (GTK_OBJECT (clist->hadjustment), clist);
gtk_object_unref (GTK_OBJECT (clist->hadjustment));
g_object_unref (clist->hadjustment);
clist->hadjustment = NULL;
}
if (clist->vadjustment)
{
gtk_signal_disconnect_by_data (GTK_OBJECT (clist->vadjustment), clist);
gtk_object_unref (GTK_OBJECT (clist->vadjustment));
g_object_unref (clist->vadjustment);
clist->vadjustment = NULL;
}
@ -5852,7 +5849,7 @@ draw_row (GtkCList *clist,
offset,
row_rectangle.y + row_center_offset + clist_row->cell[i].vertical,
layout);
g_object_unref (G_OBJECT (layout));
g_object_unref (layout);
gdk_gc_set_clip_rectangle (fg_gc, NULL);
}
break;