foocanvas r59 - in trunk: . libfoocanvas



Author: jody
Date: Sat Jun 21 15:57:11 2008
New Revision: 59
URL: http://svn.gnome.org/viewvc/foocanvas?rev=59&view=rev

Log:
2008-06-21  Jody Goldberg <jody gnome org>

	* libfoocanvas/foo-canvas.c (foo_canvas_item_reparent) : don't clear
	  the canvas nothing was resetting it.  Fixes the demo.

	* */*.c : Replace the deprecated GTK_CHECK_* casts with G_TYPE.
	 Move from GtkType -> GType
	 Use G_DEFINE_TYPE.


Modified:
   trunk/ChangeLog
   trunk/libfoocanvas/foo-canvas-line.c
   trunk/libfoocanvas/foo-canvas-line.h
   trunk/libfoocanvas/foo-canvas-pixbuf.c
   trunk/libfoocanvas/foo-canvas-pixbuf.h
   trunk/libfoocanvas/foo-canvas-polygon.c
   trunk/libfoocanvas/foo-canvas-polygon.h
   trunk/libfoocanvas/foo-canvas-rect-ellipse.c
   trunk/libfoocanvas/foo-canvas-text.c
   trunk/libfoocanvas/foo-canvas-text.h
   trunk/libfoocanvas/foo-canvas-widget.c
   trunk/libfoocanvas/foo-canvas-widget.h
   trunk/libfoocanvas/foo-canvas.c

Modified: trunk/libfoocanvas/foo-canvas-line.c
==============================================================================
--- trunk/libfoocanvas/foo-canvas-line.c	(original)
+++ trunk/libfoocanvas/foo-canvas-line.c	Sat Jun 21 15:57:11 2008
@@ -81,7 +81,7 @@
 };
 
 
-static void foo_canvas_line_class_init   (FooCanvasLineClass *class);
+static void foo_canvas_line_class_init   (FooCanvasLineClass *klass);
 static void foo_canvas_line_init         (FooCanvasLine      *line);
 static void foo_canvas_line_destroy      (GtkObject            *object);
 static void foo_canvas_line_set_property (GObject              *object,
@@ -108,43 +108,20 @@
 
 static FooCanvasItemClass *parent_class;
 
-
-GtkType
-foo_canvas_line_get_type (void)
-{
-	static GtkType line_type = 0;
-
-	if (!line_type) {
-		/* FIXME: Convert to gobject style.  */
-		static const GtkTypeInfo line_info = {
-			(char *)"FooCanvasLine",
-			sizeof (FooCanvasLine),
-			sizeof (FooCanvasLineClass),
-			(GtkClassInitFunc) foo_canvas_line_class_init,
-			(GtkObjectInitFunc) foo_canvas_line_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		line_type = gtk_type_unique (foo_canvas_item_get_type (), &line_info);
-	}
-
-	return line_type;
-}
+G_DEFINE_TYPE (FooCanvasLine, foo_canvas_line, FOO_TYPE_CANVAS_ITEM)
 
 static void
-foo_canvas_line_class_init (FooCanvasLineClass *class)
+foo_canvas_line_class_init (FooCanvasLineClass *klass)
 {
 	GObjectClass *gobject_class;
 	GtkObjectClass *object_class;
 	FooCanvasItemClass *item_class;
 
-	gobject_class = (GObjectClass *) class;
-	object_class = (GtkObjectClass *) class;
-	item_class = (FooCanvasItemClass *) class;
+	gobject_class = (GObjectClass *) klass;
+	object_class = (GtkObjectClass *) klass;
+	item_class = (FooCanvasItemClass *) klass;
 
-	parent_class = gtk_type_class (foo_canvas_item_get_type ());
+	parent_class = g_type_class_peek_parent (klass);
 
 	gobject_class->set_property = foo_canvas_line_set_property;
 	gobject_class->get_property = foo_canvas_line_get_property;

Modified: trunk/libfoocanvas/foo-canvas-line.h
==============================================================================
--- trunk/libfoocanvas/foo-canvas-line.h	(original)
+++ trunk/libfoocanvas/foo-canvas-line.h	Sat Jun 21 15:57:11 2008
@@ -142,7 +142,7 @@
 
 
 /* Standard Gtk function */
-GtkType foo_canvas_line_get_type (void) G_GNUC_CONST;
+GType foo_canvas_line_get_type (void) G_GNUC_CONST;
 
 
 G_END_DECLS

Modified: trunk/libfoocanvas/foo-canvas-pixbuf.c
==============================================================================
--- trunk/libfoocanvas/foo-canvas-pixbuf.c	(original)
+++ trunk/libfoocanvas/foo-canvas-pixbuf.c	Sat Jun 21 15:57:11 2008
@@ -88,7 +88,7 @@
 	PROP_POINT_IGNORES_ALPHA
 };
 
-static void foo_canvas_pixbuf_class_init (FooCanvasPixbufClass *class);
+static void foo_canvas_pixbuf_class_init (FooCanvasPixbufClass *klass);
 static void foo_canvas_pixbuf_init (FooCanvasPixbuf *cpb);
 static void foo_canvas_pixbuf_destroy (GtkObject *object);
 static void foo_canvas_pixbuf_set_property (GObject *object,
@@ -113,53 +113,19 @@
 
 static FooCanvasItemClass *parent_class;
 
-
-
-/**
- * foo_canvas_pixbuf_get_type:
- * @void:
- *
- * Registers the #FooCanvasPixbuf class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #FooCanvasPixbuf class.
- **/
-GtkType
-foo_canvas_pixbuf_get_type (void)
-{
-	static GtkType canvas_pixbuf_type = 0;
-
-	if (!canvas_pixbuf_type) {
-		/* FIXME: Convert to gobject style.  */
-		static const GtkTypeInfo canvas_pixbuf_info = {
-			(char *)"FooCanvasPixbuf",
-			sizeof (FooCanvasPixbuf),
-			sizeof (FooCanvasPixbufClass),
-			(GtkClassInitFunc) foo_canvas_pixbuf_class_init,
-			(GtkObjectInitFunc) foo_canvas_pixbuf_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		canvas_pixbuf_type = gtk_type_unique (foo_canvas_item_get_type (),
-						      &canvas_pixbuf_info);
-	}
-
-	return canvas_pixbuf_type;
-}
+G_DEFINE_TYPE (FooCanvasPixbuf, foo_canvas_pixbuf, FOO_TYPE_CANVAS_ITEM)
 
 /* Class initialization function for the pixbuf canvas item */
 static void
-foo_canvas_pixbuf_class_init (FooCanvasPixbufClass *class)
+foo_canvas_pixbuf_class_init (FooCanvasPixbufClass *klass)
 {
         GObjectClass *gobject_class;
 	GtkObjectClass *object_class;
 	FooCanvasItemClass *item_class;
 
-        gobject_class = (GObjectClass *) class;
-	object_class = (GtkObjectClass *) class;
-	item_class = (FooCanvasItemClass *) class;
+        gobject_class = (GObjectClass *) klass;
+	object_class = (GtkObjectClass *) klass;
+	item_class = (FooCanvasItemClass *) klass;
 
 	parent_class = gtk_type_class (foo_canvas_item_get_type ());
 

Modified: trunk/libfoocanvas/foo-canvas-pixbuf.h
==============================================================================
--- trunk/libfoocanvas/foo-canvas-pixbuf.h	(original)
+++ trunk/libfoocanvas/foo-canvas-pixbuf.h	Sat Jun 21 15:57:11 2008
@@ -53,7 +53,7 @@
 };
 
 
-GtkType foo_canvas_pixbuf_get_type (void) G_GNUC_CONST;
+GType foo_canvas_pixbuf_get_type (void) G_GNUC_CONST;
 
 
 

Modified: trunk/libfoocanvas/foo-canvas-polygon.c
==============================================================================
--- trunk/libfoocanvas/foo-canvas-polygon.c	(original)
+++ trunk/libfoocanvas/foo-canvas-polygon.c	Sat Jun 21 15:57:11 2008
@@ -70,7 +70,7 @@
 };
 
 
-static void foo_canvas_polygon_class_init (FooCanvasPolygonClass *class);
+static void foo_canvas_polygon_class_init (FooCanvasPolygonClass *klass);
 static void foo_canvas_polygon_init       (FooCanvasPolygon      *poly);
 static void foo_canvas_polygon_destroy    (GtkObject               *object);
 static void foo_canvas_polygon_set_property (GObject              *object,
@@ -97,43 +97,20 @@
 
 static FooCanvasItemClass *parent_class;
 
-
-GtkType
-foo_canvas_polygon_get_type (void)
-{
-	static GtkType polygon_type = 0;
-
-	if (!polygon_type) {
-		/* FIXME: Convert to gobject style.  */
-		static const GtkTypeInfo polygon_info = {
-			(char *)"FooCanvasPolygon",
-			sizeof (FooCanvasPolygon),
-			sizeof (FooCanvasPolygonClass),
-			(GtkClassInitFunc) foo_canvas_polygon_class_init,
-			(GtkObjectInitFunc) foo_canvas_polygon_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		polygon_type = gtk_type_unique (foo_canvas_item_get_type (), &polygon_info);
-	}
-
-	return polygon_type;
-}
+G_DEFINE_TYPE (FooCanvasPolygon, foo_canvas_polygon, FOO_TYPE_CANVAS_ITEM)
 
 static void
-foo_canvas_polygon_class_init (FooCanvasPolygonClass *class)
+foo_canvas_polygon_class_init (FooCanvasPolygonClass *klass)
 {
 	GObjectClass *gobject_class;
 	GtkObjectClass *object_class;
 	FooCanvasItemClass *item_class;
 
-	gobject_class = (GObjectClass *) class;
-	object_class = (GtkObjectClass *) class;
-	item_class = (FooCanvasItemClass *) class;
+	gobject_class = (GObjectClass *) klass;
+	object_class = (GtkObjectClass *) klass;
+	item_class = (FooCanvasItemClass *) klass;
 
-	parent_class = gtk_type_class (foo_canvas_item_get_type ());
+	parent_class = g_type_class_peek_parent (klass);
 
 	gobject_class->set_property = foo_canvas_polygon_set_property;
 	gobject_class->get_property = foo_canvas_polygon_get_property;

Modified: trunk/libfoocanvas/foo-canvas-polygon.h
==============================================================================
--- trunk/libfoocanvas/foo-canvas-polygon.h	(original)
+++ trunk/libfoocanvas/foo-canvas-polygon.h	Sat Jun 21 15:57:11 2008
@@ -113,7 +113,7 @@
 
 
 /* Standard Gtk function */
-GtkType foo_canvas_polygon_get_type (void) G_GNUC_CONST;
+GType foo_canvas_polygon_get_type (void) G_GNUC_CONST;
 
 
 G_END_DECLS

Modified: trunk/libfoocanvas/foo-canvas-rect-ellipse.c
==============================================================================
--- trunk/libfoocanvas/foo-canvas-rect-ellipse.c	(original)
+++ trunk/libfoocanvas/foo-canvas-rect-ellipse.c	Sat Jun 21 15:57:11 2008
@@ -65,7 +65,7 @@
 };
 
 
-static void foo_canvas_re_class_init (FooCanvasREClass *class);
+static void foo_canvas_re_class_init (FooCanvasREClass *klass);
 static void foo_canvas_re_init       (FooCanvasRE      *re);
 static void foo_canvas_re_destroy    (GtkObject          *object);
 static void foo_canvas_re_set_property (GObject              *object,
@@ -126,17 +126,17 @@
 }
 
 static void
-foo_canvas_re_class_init (FooCanvasREClass *class)
+foo_canvas_re_class_init (FooCanvasREClass *klass)
 {
 	GObjectClass *gobject_class;
 	GtkObjectClass *object_class;
 	FooCanvasItemClass *item_class;
 
-	gobject_class = (GObjectClass *) class;
-	object_class = (GtkObjectClass *) class;
-	item_class = (FooCanvasItemClass *) class;
+	gobject_class = (GObjectClass *) klass;
+	object_class = (GtkObjectClass *) klass;
+	item_class = (FooCanvasItemClass *) klass;
 
-	re_parent_class = g_type_class_peek_parent (class);
+	re_parent_class = g_type_class_peek_parent (klass);
 
 	gobject_class->set_property = foo_canvas_re_set_property;
 	gobject_class->get_property = foo_canvas_re_get_property;
@@ -747,7 +747,7 @@
 /* Rectangle item */
 
 
-static void foo_canvas_rect_class_init (FooCanvasRectClass *class);
+static void foo_canvas_rect_class_init (FooCanvasRectClass *klass);
 static void foo_canvas_rect_init (FooCanvasRect *rect);
 static void foo_canvas_rect_finalize (GObject *object);
 static void foo_canvas_rect_realize  (FooCanvasItem *item);
@@ -795,20 +795,20 @@
 }
 
 static void
-foo_canvas_rect_class_init (FooCanvasRectClass *class)
+foo_canvas_rect_class_init (FooCanvasRectClass *klass)
 {
 	FooCanvasItemClass *item_class;
 
-	rect_parent_class = g_type_class_peek_parent (class);
+	rect_parent_class = g_type_class_peek_parent (klass);
 
-	item_class = (FooCanvasItemClass *) class;
+	item_class = (FooCanvasItemClass *) klass;
 
 	item_class->draw = foo_canvas_rect_draw;
 	item_class->point = foo_canvas_rect_point;
 	item_class->update = foo_canvas_rect_update;
 	item_class->realize = foo_canvas_rect_realize;
 
-	G_OBJECT_CLASS (class)->finalize = foo_canvas_rect_finalize;
+	G_OBJECT_CLASS (klass)->finalize = foo_canvas_rect_finalize;
 	
 }
 
@@ -1224,7 +1224,7 @@
 /* Ellipse item */
 
 
-static void foo_canvas_ellipse_class_init (FooCanvasEllipseClass *class);
+static void foo_canvas_ellipse_class_init (FooCanvasEllipseClass *klass);
 
 static void   foo_canvas_ellipse_draw   (FooCanvasItem *item, GdkDrawable *drawable, GdkEventExpose *expose);
 static double foo_canvas_ellipse_point  (FooCanvasItem *item, double x, double y, int cx, int cy,
@@ -1260,11 +1260,11 @@
 }
 
 static void
-foo_canvas_ellipse_class_init (FooCanvasEllipseClass *class)
+foo_canvas_ellipse_class_init (FooCanvasEllipseClass *klass)
 {
 	FooCanvasItemClass *item_class;
 
-	item_class = (FooCanvasItemClass *) class;
+	item_class = (FooCanvasItemClass *) klass;
 
 	item_class->draw = foo_canvas_ellipse_draw;
 	item_class->point = foo_canvas_ellipse_point;

Modified: trunk/libfoocanvas/foo-canvas-text.c
==============================================================================
--- trunk/libfoocanvas/foo-canvas-text.c	(original)
+++ trunk/libfoocanvas/foo-canvas-text.c	Sat Jun 21 15:57:11 2008
@@ -100,7 +100,7 @@
 	gint placeholder;
 };
 
-static void foo_canvas_text_class_init (FooCanvasTextClass *class);
+static void foo_canvas_text_class_init (FooCanvasTextClass *klass);
 static void foo_canvas_text_init (FooCanvasText *text);
 static void foo_canvas_text_destroy (GtkObject *object);
 static void foo_canvas_text_set_property (GObject            *object,
@@ -150,54 +150,21 @@
 
 static FooCanvasItemClass *parent_class;
 
-
-
-/**
- * foo_canvas_text_get_type:
- * @void:
- *
- * Registers the &FooCanvasText class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the &FooCanvasText class.
- **/
-GtkType
-foo_canvas_text_get_type (void)
-{
-	static GtkType text_type = 0;
-
-	if (!text_type) {
-		/* FIXME: Convert to gobject style.  */
-		static const GtkTypeInfo text_info = {
-			(char *)"FooCanvasText",
-			sizeof (FooCanvasText),
-			sizeof (FooCanvasTextClass),
-			(GtkClassInitFunc) foo_canvas_text_class_init,
-			(GtkObjectInitFunc) foo_canvas_text_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		text_type = gtk_type_unique (foo_canvas_item_get_type (), &text_info);
-	}
-
-	return text_type;
-}
+G_DEFINE_TYPE (FooCanvasText, foo_canvas_text, FOO_TYPE_CANVAS_ITEM)
 
 /* Class initialization function for the text item */
 static void
-foo_canvas_text_class_init (FooCanvasTextClass *class)
+foo_canvas_text_class_init (FooCanvasTextClass *klass)
 {
 	GObjectClass *gobject_class;
 	GtkObjectClass *object_class;
 	FooCanvasItemClass *item_class;
 
-	gobject_class = (GObjectClass *) class;
-	object_class = (GtkObjectClass *) class;
-	item_class = (FooCanvasItemClass *) class;
+	gobject_class = (GObjectClass *) klass;
+	object_class = (GtkObjectClass *) klass;
+	item_class = (FooCanvasItemClass *) klass;
 
-	parent_class = gtk_type_class (foo_canvas_item_get_type ());
+	parent_class = g_type_class_peek_parent (klass);
 
 	gobject_class->set_property = foo_canvas_text_set_property;
 	gobject_class->get_property = foo_canvas_text_get_property;

Modified: trunk/libfoocanvas/foo-canvas-text.h
==============================================================================
--- trunk/libfoocanvas/foo-canvas-text.h	(original)
+++ trunk/libfoocanvas/foo-canvas-text.h	Sat Jun 21 15:57:11 2008
@@ -160,7 +160,7 @@
 
 
 /* Standard Gtk function */
-GtkType foo_canvas_text_get_type (void) G_GNUC_CONST;
+GType foo_canvas_text_get_type (void) G_GNUC_CONST;
 
 
 G_END_DECLS

Modified: trunk/libfoocanvas/foo-canvas-widget.c
==============================================================================
--- trunk/libfoocanvas/foo-canvas-widget.c	(original)
+++ trunk/libfoocanvas/foo-canvas-widget.c	Sat Jun 21 15:57:11 2008
@@ -33,7 +33,7 @@
 
 #include <config.h>
 #include <math.h>
-#include <gtk/gtksignal.h>
+#include <glib-object.h>
 #include "foo-canvas-widget.h"
 
 enum {
@@ -48,7 +48,7 @@
 };
 
 
-static void foo_canvas_widget_class_init (FooCanvasWidgetClass *class);
+static void foo_canvas_widget_class_init (FooCanvasWidgetClass *klass);
 static void foo_canvas_widget_init       (FooCanvasWidget      *witem);
 static void foo_canvas_widget_destroy    (GtkObject              *object);
 static void foo_canvas_widget_get_property (GObject            *object,
@@ -74,43 +74,20 @@
 
 static FooCanvasItemClass *parent_class;
 
-
-GtkType
-foo_canvas_widget_get_type (void)
-{
-	static GtkType witem_type = 0;
-
-	if (!witem_type) {
-		/* FIXME: Convert to gobject style.  */
-		static const GtkTypeInfo witem_info = {
-			(char *)"FooCanvasWidget",
-			sizeof (FooCanvasWidget),
-			sizeof (FooCanvasWidgetClass),
-			(GtkClassInitFunc) foo_canvas_widget_class_init,
-			(GtkObjectInitFunc) foo_canvas_widget_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		witem_type = gtk_type_unique (foo_canvas_item_get_type (), &witem_info);
-	}
-
-	return witem_type;
-}
+G_DEFINE_TYPE (FooCanvasWidget, foo_canvas_widget, FOO_TYPE_CANVAS_ITEM)
 
 static void
-foo_canvas_widget_class_init (FooCanvasWidgetClass *class)
+foo_canvas_widget_class_init (FooCanvasWidgetClass *klass)
 {
 	GObjectClass *gobject_class;
 	GtkObjectClass *object_class;
 	FooCanvasItemClass *item_class;
 
-	gobject_class = (GObjectClass *) class;
-	object_class = (GtkObjectClass *) class;
-	item_class = (FooCanvasItemClass *) class;
+	gobject_class = (GObjectClass *) klass;
+	object_class = (GtkObjectClass *) klass;
+	item_class = (FooCanvasItemClass *) klass;
 
-	parent_class = gtk_type_class (foo_canvas_item_get_type ());
+	parent_class = g_type_class_peek_parent (klass);
 
 	gobject_class->set_property = foo_canvas_widget_set_property;
 	gobject_class->get_property = foo_canvas_widget_get_property;

Modified: trunk/libfoocanvas/foo-canvas-widget.h
==============================================================================
--- trunk/libfoocanvas/foo-canvas-widget.h	(original)
+++ trunk/libfoocanvas/foo-canvas-widget.h	Sat Jun 21 15:57:11 2008
@@ -95,7 +95,7 @@
 
 
 /* Standard Gtk function */
-GtkType foo_canvas_widget_get_type (void) G_GNUC_CONST;
+GType foo_canvas_widget_get_type (void) G_GNUC_CONST;
 
 
 G_END_DECLS

Modified: trunk/libfoocanvas/foo-canvas.c
==============================================================================
--- trunk/libfoocanvas/foo-canvas.c	(original)
+++ trunk/libfoocanvas/foo-canvas.c	Sat Jun 21 15:57:11 2008
@@ -97,7 +97,7 @@
 	ITEM_LAST_SIGNAL
 };
 
-static void foo_canvas_item_class_init     (FooCanvasItemClass *class);
+static void foo_canvas_item_class_init     (FooCanvasItemClass *klass);
 static void foo_canvas_item_init           (FooCanvasItem      *item);
 static int  emit_event                       (FooCanvas *canvas, GdkEvent *event);
 
@@ -1134,7 +1134,7 @@
 };
 
 
-static void foo_canvas_group_class_init  (FooCanvasGroupClass *class);
+static void foo_canvas_group_class_init  (FooCanvasGroupClass *klass);
 static void foo_canvas_group_init        (FooCanvasGroup      *group);
 static void foo_canvas_group_set_property(GObject               *object, 
 					    guint                  param_id,
@@ -1206,17 +1206,17 @@
 
 /* Class initialization function for FooCanvasGroupClass */
 static void
-foo_canvas_group_class_init (FooCanvasGroupClass *class)
+foo_canvas_group_class_init (FooCanvasGroupClass *klass)
 {
 	GObjectClass *gobject_class;
 	GtkObjectClass *object_class;
 	FooCanvasItemClass *item_class;
 
-	gobject_class = (GObjectClass *) class;
-	object_class = (GtkObjectClass *) class;
-	item_class = (FooCanvasItemClass *) class;
+	gobject_class = (GObjectClass *) klass;
+	object_class = (GtkObjectClass *) klass;
+	item_class = (FooCanvasItemClass *) klass;
 
-	group_parent_class = gtk_type_class (foo_canvas_item_get_type ());
+	group_parent_class = g_type_class_peek_parent (klass);
 
 	gobject_class->set_property = foo_canvas_group_set_property;
 	gobject_class->get_property = foo_canvas_group_get_property;
@@ -1683,7 +1683,7 @@
 			/* Unparent the child */
 
 			item->parent = NULL;
-			item->canvas = NULL;
+			/* item->canvas = NULL; */
 			g_object_unref (G_OBJECT (item));
 
 			/* Remove it from the list */
@@ -1706,7 +1706,7 @@
 	LAST_SIGNAL
 };
 
-static void foo_canvas_class_init          (FooCanvasClass *class);
+static void foo_canvas_class_init          (FooCanvasClass *klass);
 static void foo_canvas_init                (FooCanvas      *canvas);
 static void foo_canvas_destroy             (GtkObject        *object);
 static void foo_canvas_map                 (GtkWidget        *widget);
@@ -2017,7 +2017,7 @@
 	object_class  = (GtkObjectClass *) klass;
 	widget_class  = (GtkWidgetClass *) klass;
 
-	canvas_parent_class = gtk_type_class (gtk_layout_get_type ());
+	canvas_parent_class = g_type_class_peek_parent (klass);
 
 	gobject_class->set_property = foo_canvas_set_property;
 	gobject_class->get_property = foo_canvas_get_property;
@@ -3955,11 +3955,11 @@
 
 /* Class initialization function for FooCanvasItemClass */
 static void
-foo_canvas_item_class_init (FooCanvasItemClass *class)
+foo_canvas_item_class_init (FooCanvasItemClass *klass)
 {
-	GObjectClass *gobject_class = (GObjectClass *) class;
+	GObjectClass *gobject_class = (GObjectClass *) klass;
 
-	item_parent_class = gtk_type_class (gtk_object_get_type ());
+	item_parent_class = g_type_class_peek_parent (klass);
 
 	gobject_class->set_property = foo_canvas_item_set_property;
 	gobject_class->get_property = foo_canvas_item_get_property;
@@ -3979,7 +3979,7 @@
 
 	item_signals[ITEM_EVENT] =
 		g_signal_new ("event",
-			      G_TYPE_FROM_CLASS (class),
+			      G_TYPE_FROM_CLASS (klass),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (FooCanvasItemClass, event),
 			      boolean_handled_accumulator, NULL,
@@ -3987,11 +3987,11 @@
 			      G_TYPE_BOOLEAN, 1,
 			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
-	class->realize = foo_canvas_item_realize;
-	class->unrealize = foo_canvas_item_unrealize;
-	class->map = foo_canvas_item_map;
-	class->unmap = foo_canvas_item_unmap;
-	class->update = foo_canvas_item_update;
+	klass->realize = foo_canvas_item_realize;
+	klass->unrealize = foo_canvas_item_unrealize;
+	klass->map = foo_canvas_item_map;
+	klass->unmap = foo_canvas_item_unmap;
+	klass->update = foo_canvas_item_update;
 
 	atk_registry_set_factory_type (atk_get_default_registry (),
                                        FOO_TYPE_CANVAS_ITEM,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]