[patch] GTK has a new object system in GLib which is independent from GTK+, definitions changed

pornview-0.2.0_pre1-new-gtk-object-system.diff (text/plain), 2.27 KB, created by tbartdev on 2009-03-22 22:41:46 UTC

--- pornview-0.2pre1.orig/src/support/widgets/gtkcellrendererpixmap.c
+++ pornview-0.2pre1/src/support/widgets/gtkcellrendererpixmap.c
@@ -59,10 +59,10 @@
     PROP_MASK_EXPANDER_CLOSED
 };

-GtkType
+GType
 gtk_cell_renderer_pixmap_get_type (void)
 {
-    static GtkType cell_pixmap_type = 0;
+    static GType cell_pixmap_type = 0;

     if (!cell_pixmap_type)
     {
--- pornview-0.2pre1.orig/src/support/widgets/gtkcellrendererpixmap.h
+++ pornview-0.2pre1/src/support/widgets/gtkcellrendererpixmap.h
@@ -32,11 +32,11 @@
 
 
 #define GTK_TYPE_CELL_RENDERER_PIXMAP			    (gtk_cell_renderer_pixmap_get_type ())
-#define GTK_CELL_RENDERER_PIXMAP(obj)			    (GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmap))
-#define GTK_CELL_RENDERER_PIXMAP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
-#define GTK_IS_CELL_RENDERER_PIXMAP(obj)		    (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP))
-#define GTK_IS_CELL_RENDERER_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP))
-#define GTK_CELL_RENDERER_PIXMAP_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
+#define GTK_CELL_RENDERER_PIXMAP(obj)			    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmap))
+#define GTK_CELL_RENDERER_PIXMAP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
+#define GTK_IS_CELL_RENDERER_PIXMAP(obj)		    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP))
+#define GTK_IS_CELL_RENDERER_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP))
+#define GTK_CELL_RENDERER_PIXMAP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
 
     typedef struct GtkCellRendererPixmap_Tag GtkCellRendererPixmap;
     typedef struct GtkCellRendererPixmapClass_Tag GtkCellRendererPixmapClass;
@@ -66,7 +66,7 @@
 	void            (*_gtk_reserved4) (void);
     };
 
-    GtkType         gtk_cell_renderer_pixmap_get_type (void);
+    GType         gtk_cell_renderer_pixmap_get_type (void);
     GtkCellRenderer *gtk_cell_renderer_pixmap_new (void);
 
 #ifdef __cplusplus