muine r1185 - in trunk: . libmuine

[wbolster svn gnome org]

Author: wbolster
Date: Fri Jul  4 15:05:49 2008
New Revision: 1185
URL: http://svn.gnome.org/viewvc/muine?rev=1185&view=rev

Log:
2008-07-04  Wouter Bolsterlee  <wbolster svn gnome org>

	* libmuine/rb-cell-renderer-pixbuf.c
	* libmuine/rb-cell-renderer-pixbuf.h:

	Allow building against recent GTK+ with
	-DGTK_DISABLE_DEPRECATED, i.e. use GType instead of
	GtkType and replace GTK_CHECK_* macros with
	G_TYPE_CHECK_* counterparts.



Modified:
   trunk/ChangeLog
   trunk/libmuine/rb-cell-renderer-pixbuf.c
   trunk/libmuine/rb-cell-renderer-pixbuf.h

Modified: trunk/libmuine/rb-cell-renderer-pixbuf.c
==============================================================================
--- trunk/libmuine/rb-cell-renderer-pixbuf.c	(original)
+++ trunk/libmuine/rb-cell-renderer-pixbuf.c	Fri Jul  4 15:05:49 2008
@@ -59,10 +59,10 @@
 };
 
 
-GtkType
+GType
 rb_cell_renderer_pixbuf_get_type (void)
 {
-	static GtkType cell_pixbuf_type = 0;
+	static GType cell_pixbuf_type = 0;
 
 	if (!cell_pixbuf_type)
 	{

Modified: trunk/libmuine/rb-cell-renderer-pixbuf.h
==============================================================================
--- trunk/libmuine/rb-cell-renderer-pixbuf.h	(original)
+++ trunk/libmuine/rb-cell-renderer-pixbuf.h	Fri Jul  4 15:05:49 2008
@@ -31,11 +31,11 @@
 #endif /* __cplusplus */
 
 #define RB_TYPE_CELL_RENDERER_PIXBUF		(rb_cell_renderer_pixbuf_get_type ())
-#define RB_CELL_RENDERER_PIXBUF(obj)		(GTK_CHECK_CAST ((obj), RB_TYPE_CELL_RENDERER_PIXBUF, RBCellRendererPixbuf))
-#define RB_CELL_RENDERER_PIXBUF_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), RB_TYPE_CELL_RENDERER_PIXBUF, RBCellRendererPixbufClass))
-#define RB_IS_CELL_RENDERER_PIXBUF(obj)		(GTK_CHECK_TYPE ((obj), RB_TYPE_CELL_RENDERER_PIXBUF))
-#define RB_IS_CELL_RENDERER_PIXBUF_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), RB_TYPE_CELL_RENDERER_PIXBUF))
-#define RB_CELL_RENDERER_PIXBUF_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), RB_TYPE_CELL_RENDERER_PIXBUF, RBCellRendererPixbufClass))
+#define RB_CELL_RENDERER_PIXBUF(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), RB_TYPE_CELL_RENDERER_PIXBUF, RBCellRendererPixbuf))
+#define RB_CELL_RENDERER_PIXBUF_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), RB_TYPE_CELL_RENDERER_PIXBUF, RBCellRendererPixbufClass))
+#define RB_IS_CELL_RENDERER_PIXBUF(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), RB_TYPE_CELL_RENDERER_PIXBUF))
+#define RB_IS_CELL_RENDERER_PIXBUF_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), RB_TYPE_CELL_RENDERER_PIXBUF))
+#define RB_CELL_RENDERER_PIXBUF_GET_CLASS(obj)  (G_TYPE_CHECK_GET_CLASS ((obj), RB_TYPE_CELL_RENDERER_PIXBUF, RBCellRendererPixbufClass))
 
 typedef struct _RBCellRendererPixbuf RBCellRendererPixbuf;
 typedef struct _RBCellRendererPixbufClass RBCellRendererPixbufClass;
@@ -52,7 +52,7 @@
   GtkCellRendererClass parent_class;
 };
 
-GtkType          rb_cell_renderer_pixbuf_get_type (void);
+GType            rb_cell_renderer_pixbuf_get_type (void);
 GtkCellRenderer *rb_cell_renderer_pixbuf_new      (void);
 
 #ifdef __cplusplus