GNOME.org
 

foocanvas r58 - in trunk: . libfoocanvas

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

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

	* */*.c : Replace the deprecated GTK_CHECK_* casts with G_TYPE.


Added:
   trunk/MAINTAINERS
Modified:
   trunk/ChangeLog
   trunk/configure.in
   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.h
   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
   trunk/libfoocanvas/foo-canvas.h

Added: trunk/MAINTAINERS
==============================================================================
--- (empty file)
+++ trunk/MAINTAINERS	Sat Jun 21 11:59:12 2008
@@ -0,0 +1,15 @@
+Jody Goldberg
+E-mail: jody gnome.org
+Userid: jody
+
+Morten Welinder
+E-mail: terra gnome.org
+Userid: mortenw
+
+Emmanuel Pacaud
+E-mail: emmanuel.pacaud lapp.in2p3.fr
+Userid: emmanuel
+
+Jean Brefort
+E-mail: jean.brefort normalesup.org
+Userid: jbrefort

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Jun 21 11:59:12 2008
@@ -3,7 +3,7 @@
 AC_CONFIG_SRCDIR([libfoocanvas/foo-canvas.c])
 
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([dist-bz2])
+AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
 

Modified: trunk/libfoocanvas/foo-canvas-line.c
==============================================================================
--- trunk/libfoocanvas/foo-canvas-line.c	(original)
+++ trunk/libfoocanvas/foo-canvas-line.c	Sat Jun 21 11:59:12 2008
@@ -978,7 +978,7 @@
 		(* parent_class->realize) (item);
 
 	line->gc = gdk_gc_new (item->canvas->layout.bin_window);
-#warning "FIXME: Need to recalc pixel values, set colours, etc."
+/* FIXME FIXME FIXME Need to recalc pixel values, set colours, etc. */
 
 #if 0
 	(* FOO_CANVAS_ITEM_CLASS (item->object.klass)->update) (item, NULL, NULL, 0);

Modified: trunk/libfoocanvas/foo-canvas-line.h
==============================================================================
--- trunk/libfoocanvas/foo-canvas-line.h	(original)
+++ trunk/libfoocanvas/foo-canvas-line.h	Sat Jun 21 11:59:12 2008
@@ -83,11 +83,11 @@
 
 
 #define FOO_TYPE_CANVAS_LINE            (foo_canvas_line_get_type ())
-#define FOO_CANVAS_LINE(obj)            (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_LINE, FooCanvasLine))
-#define FOO_CANVAS_LINE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_LINE, FooCanvasLineClass))
-#define FOO_IS_CANVAS_LINE(obj)         (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_LINE))
-#define FOO_IS_CANVAS_LINE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_LINE))
-#define FOO_CANVAS_LINE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_LINE, FooCanvasLineClass))
+#define FOO_CANVAS_LINE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_LINE, FooCanvasLine))
+#define FOO_CANVAS_LINE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_LINE, FooCanvasLineClass))
+#define FOO_IS_CANVAS_LINE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_LINE))
+#define FOO_IS_CANVAS_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_LINE))
+#define FOO_CANVAS_LINE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_LINE, FooCanvasLineClass))
 
 
 typedef struct _FooCanvasLine FooCanvasLine;

Modified: trunk/libfoocanvas/foo-canvas-pixbuf.c
==============================================================================
--- trunk/libfoocanvas/foo-canvas-pixbuf.c	(original)
+++ trunk/libfoocanvas/foo-canvas-pixbuf.c	Sat Jun 21 11:59:12 2008
@@ -685,10 +685,10 @@
 				    bbox_x1, bbox_y1,
 				    &item->x2, &item->y2);
 
-		item->x1 = floor (item->x1);
-		item->y1 = floor (item->y1);
-		item->x2 = ceil (item->x2);
-		item->y2 = ceil (item->y2);
+		item->x1 = floor (item->x1 + .5);
+		item->y1 = floor (item->y1 + .5);
+		item->x2 = floor (item->x2 + .5);
+		item->y2 = floor (item->y2 + .5);
 
 #ifdef FOO_CANVAS_PIXBUF_VERBOSE
 		g_print ("BBox is %g %g %g %g\n", item->x1, item->y1, item->x2, item->y2);

Modified: trunk/libfoocanvas/foo-canvas-pixbuf.h
==============================================================================
--- trunk/libfoocanvas/foo-canvas-pixbuf.h	(original)
+++ trunk/libfoocanvas/foo-canvas-pixbuf.h	Sat Jun 21 11:59:12 2008
@@ -31,11 +31,11 @@
 
 
 #define FOO_TYPE_CANVAS_PIXBUF            (foo_canvas_pixbuf_get_type ())
-#define FOO_CANVAS_PIXBUF(obj)            (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_PIXBUF, FooCanvasPixbuf))
-#define FOO_CANVAS_PIXBUF_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_PIXBUF, FooCanvasPixbufClass))
-#define FOO_IS_CANVAS_PIXBUF(obj)         (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_PIXBUF))
-#define FOO_IS_CANVAS_PIXBUF_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_PIXBUF))
-#define FOO_CANVAS_PIXBUF_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_PIXBUF, FooCanvasPixbufClass))
+#define FOO_CANVAS_PIXBUF(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_PIXBUF, FooCanvasPixbuf))
+#define FOO_CANVAS_PIXBUF_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_PIXBUF, FooCanvasPixbufClass))
+#define FOO_IS_CANVAS_PIXBUF(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_PIXBUF))
+#define FOO_IS_CANVAS_PIXBUF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_PIXBUF))
+#define FOO_CANVAS_PIXBUF_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_PIXBUF, FooCanvasPixbufClass))
 
 
 typedef struct _FooCanvasPixbuf FooCanvasPixbuf;

Modified: trunk/libfoocanvas/foo-canvas-polygon.c
==============================================================================
--- trunk/libfoocanvas/foo-canvas-polygon.c	(original)
+++ trunk/libfoocanvas/foo-canvas-polygon.c	Sat Jun 21 11:59:12 2008
@@ -695,7 +695,7 @@
 
 	poly->fill_gc = gdk_gc_new (item->canvas->layout.bin_window);
 	poly->outline_gc = gdk_gc_new (item->canvas->layout.bin_window);
-#warning "FIXME: Need to recalc pixel values, set colours, etc."
+/* FIXME FIXME FIXME Need to recalc pixel values, set colours, etc. */
 
 #ifdef OLD_XFORM
 	(* FOO_CANVAS_ITEM_CLASS (item->object.klass)->update) (item, NULL, NULL, 0);

Modified: trunk/libfoocanvas/foo-canvas-polygon.h
==============================================================================
--- trunk/libfoocanvas/foo-canvas-polygon.h	(original)
+++ trunk/libfoocanvas/foo-canvas-polygon.h	Sat Jun 21 11:59:12 2008
@@ -69,11 +69,11 @@
  */
 
 #define FOO_TYPE_CANVAS_POLYGON            (foo_canvas_polygon_get_type ())
-#define FOO_CANVAS_POLYGON(obj)            (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_POLYGON, FooCanvasPolygon))
-#define FOO_CANVAS_POLYGON_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_POLYGON, FooCanvasPolygonClass))
-#define FOO_IS_CANVAS_POLYGON(obj)         (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_POLYGON))
-#define FOO_IS_CANVAS_POLYGON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_POLYGON))
-#define FOO_CANVAS_POLYGON_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_POLYGON, FooCanvasPolygonClass))
+#define FOO_CANVAS_POLYGON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_POLYGON, FooCanvasPolygon))
+#define FOO_CANVAS_POLYGON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_POLYGON, FooCanvasPolygonClass))
+#define FOO_IS_CANVAS_POLYGON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_POLYGON))
+#define FOO_IS_CANVAS_POLYGON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_POLYGON))
+#define FOO_CANVAS_POLYGON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_POLYGON, FooCanvasPolygonClass))
 
 
 typedef struct _FooCanvasPolygon FooCanvasPolygon;

Modified: trunk/libfoocanvas/foo-canvas-rect-ellipse.h
==============================================================================
--- trunk/libfoocanvas/foo-canvas-rect-ellipse.h	(original)
+++ trunk/libfoocanvas/foo-canvas-rect-ellipse.h	Sat Jun 21 11:59:12 2008
@@ -65,11 +65,11 @@
 
 
 #define FOO_TYPE_CANVAS_RE            (foo_canvas_re_get_type ())
-#define FOO_CANVAS_RE(obj)            (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_RE, FooCanvasRE))
-#define FOO_CANVAS_RE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_RE, FooCanvasREClass))
-#define FOO_IS_CANVAS_RE(obj)         (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_RE))
-#define FOO_IS_CANVAS_RE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_RE))
-#define FOO_CANVAS_RE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_RE, FooCanvasREClass))
+#define FOO_CANVAS_RE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_RE, FooCanvasRE))
+#define FOO_CANVAS_RE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_RE, FooCanvasREClass))
+#define FOO_IS_CANVAS_RE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_RE))
+#define FOO_IS_CANVAS_RE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_RE))
+#define FOO_CANVAS_RE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_RE, FooCanvasREClass))
 
 
 typedef struct _FooCanvasRE      FooCanvasRE;
@@ -115,11 +115,11 @@
 
 
 #define FOO_TYPE_CANVAS_RECT            (foo_canvas_rect_get_type ())
-#define FOO_CANVAS_RECT(obj)            (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_RECT, FooCanvasRect))
-#define FOO_CANVAS_RECT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_RECT, FooCanvasRectClass))
-#define FOO_IS_CANVAS_RECT(obj)         (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_RECT))
-#define FOO_IS_CANVAS_RECT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_RECT))
-#define FOO_CANVAS_RECT_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_RECT, FooCanvasRectClass))
+#define FOO_CANVAS_RECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_RECT, FooCanvasRect))
+#define FOO_CANVAS_RECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_RECT, FooCanvasRectClass))
+#define FOO_IS_CANVAS_RECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_RECT))
+#define FOO_IS_CANVAS_RECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_RECT))
+#define FOO_CANVAS_RECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_RECT, FooCanvasRectClass))
 
 
 typedef struct _FooCanvasRect FooCanvasRect;
@@ -146,11 +146,11 @@
 
 
 #define FOO_TYPE_CANVAS_ELLIPSE            (foo_canvas_ellipse_get_type ())
-#define FOO_CANVAS_ELLIPSE(obj)            (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_ELLIPSE, FooCanvasEllipse))
-#define FOO_CANVAS_ELLIPSE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_ELLIPSE, FooCanvasEllipseClass))
-#define FOO_IS_CANVAS_ELLIPSE(obj)         (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_ELLIPSE))
-#define FOO_IS_CANVAS_ELLIPSE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_ELLIPSE))
-#define FOO_CANVAS_ELLIPSE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_ELLIPSE, FooCanvasEllipseClass))
+#define FOO_CANVAS_ELLIPSE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_ELLIPSE, FooCanvasEllipse))
+#define FOO_CANVAS_ELLIPSE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_ELLIPSE, FooCanvasEllipseClass))
+#define FOO_IS_CANVAS_ELLIPSE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_ELLIPSE))
+#define FOO_IS_CANVAS_ELLIPSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_ELLIPSE))
+#define FOO_CANVAS_ELLIPSE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_ELLIPSE, FooCanvasEllipseClass))
 
 
 typedef struct _FooCanvasEllipse FooCanvasEllipse;

Modified: trunk/libfoocanvas/foo-canvas-text.c
==============================================================================
--- trunk/libfoocanvas/foo-canvas-text.c	(original)
+++ trunk/libfoocanvas/foo-canvas-text.c	Sat Jun 21 11:59:12 2008
@@ -1386,8 +1386,8 @@
 	get_bounds (text, &x1, &y1, &x2, &y2);
 
 	foo_canvas_update_bbox (item,
-				  floor (x1), floor (y1),
-				  ceil (x2), ceil (y2));
+				floor (x1+.5), floor (y1+.5),
+				floor (x2+.5), floor (y2+.5));
 }
 
 /* Realize handler for the text item */

Modified: trunk/libfoocanvas/foo-canvas-text.h
==============================================================================
--- trunk/libfoocanvas/foo-canvas-text.h	(original)
+++ trunk/libfoocanvas/foo-canvas-text.h	Sat Jun 21 11:59:12 2008
@@ -96,11 +96,11 @@
  */
 
 #define FOO_TYPE_CANVAS_TEXT            (foo_canvas_text_get_type ())
-#define FOO_CANVAS_TEXT(obj)            (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_TEXT, FooCanvasText))
-#define FOO_CANVAS_TEXT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_TEXT, FooCanvasTextClass))
-#define FOO_IS_CANVAS_TEXT(obj)         (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_TEXT))
-#define FOO_IS_CANVAS_TEXT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_TEXT))
-#define FOO_CANVAS_TEXT_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_TEXT, FooCanvasTextClass))
+#define FOO_CANVAS_TEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_TEXT, FooCanvasText))
+#define FOO_CANVAS_TEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_TEXT, FooCanvasTextClass))
+#define FOO_IS_CANVAS_TEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_TEXT))
+#define FOO_IS_CANVAS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_TEXT))
+#define FOO_CANVAS_TEXT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_TEXT, FooCanvasTextClass))
 
 
 typedef struct _FooCanvasText FooCanvasText;

Modified: trunk/libfoocanvas/foo-canvas-widget.c
==============================================================================
--- trunk/libfoocanvas/foo-canvas-widget.c	(original)
+++ trunk/libfoocanvas/foo-canvas-widget.c	Sat Jun 21 11:59:12 2008
@@ -192,7 +192,7 @@
 	witem = FOO_CANVAS_WIDGET (object);
 
 	if (witem->widget && !witem->in_destroy) {
-		gtk_signal_disconnect (GTK_OBJECT (witem->widget), witem->destroy_id);
+		g_signal_handler_disconnect (G_OBJECT (witem->widget), witem->destroy_id);
 		gtk_widget_destroy (witem->widget);
 		witem->widget = NULL;
 	}
@@ -314,17 +314,15 @@
 	switch (param_id) {
 	case PROP_WIDGET:
 		if (witem->widget) {
-			gtk_signal_disconnect (GTK_OBJECT (witem->widget), witem->destroy_id);
+			g_signal_handler_disconnect (G_OBJECT (witem->widget), witem->destroy_id);
 			gtk_container_remove (GTK_CONTAINER (item->canvas), witem->widget);
 		}
 
 		obj = g_value_get_object (value);
 		if (obj) {
 			witem->widget = GTK_WIDGET (obj);
-			witem->destroy_id = gtk_signal_connect (GTK_OBJECT (obj),
-								"destroy",
-								(GtkSignalFunc) do_destroy,
-								witem);
+			witem->destroy_id = g_signal_connect (G_OBJECT (obj),
+				"destroy", G_CALLBACK (do_destroy), witem);
 			gtk_layout_put (GTK_LAYOUT (item->canvas), witem->widget,
 					witem->cx + item->canvas->zoom_xofs,
 					witem->cy + item->canvas->zoom_yofs);

Modified: trunk/libfoocanvas/foo-canvas-widget.h
==============================================================================
--- trunk/libfoocanvas/foo-canvas-widget.h	(original)
+++ trunk/libfoocanvas/foo-canvas-widget.h	Sat Jun 21 11:59:12 2008
@@ -61,11 +61,11 @@
 
 
 #define FOO_TYPE_CANVAS_WIDGET            (foo_canvas_widget_get_type ())
-#define FOO_CANVAS_WIDGET(obj)            (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_WIDGET, FooCanvasWidget))
-#define FOO_CANVAS_WIDGET_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_WIDGET, FooCanvasWidgetClass))
-#define FOO_IS_CANVAS_WIDGET(obj)         (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_WIDGET))
-#define FOO_IS_CANVAS_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_WIDGET))
-#define FOO_CANVAS_WIDGET_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_WIDGET, FooCanvasWidgetClass))
+#define FOO_CANVAS_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_WIDGET, FooCanvasWidget))
+#define FOO_CANVAS_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_WIDGET, FooCanvasWidgetClass))
+#define FOO_IS_CANVAS_WIDGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_WIDGET))
+#define FOO_IS_CANVAS_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_WIDGET))
+#define FOO_CANVAS_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_WIDGET, FooCanvasWidgetClass))
 
 
 typedef struct _FooCanvasWidget FooCanvasWidget;

Modified: trunk/libfoocanvas/foo-canvas.c
==============================================================================
--- trunk/libfoocanvas/foo-canvas.c	(original)
+++ trunk/libfoocanvas/foo-canvas.c	Sat Jun 21 11:59:12 2008
@@ -67,10 +67,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <gdk/gdkprivate.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkaccessible.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "foo-canvas.h"
 #include "foo-canvas-i18n.h"
 
@@ -196,10 +193,6 @@
 static void
 item_post_create_setup (FooCanvasItem *item)
 {
-	GtkObject *obj;
-
-	obj = GTK_OBJECT (item);
-
 	group_add (FOO_CANVAS_GROUP (item->parent), item);
 
 	redraw_and_repick_if_mapped (item);
@@ -295,9 +288,9 @@
 	}
 }
 
-/* Destroy handler for canvas items */
+/* Dispose handler for canvas items */
 static void
-foo_canvas_item_destroy (GtkObject *object)
+foo_canvas_item_dispose (GObject *object)
 {
 	FooCanvasItem *item;
 
@@ -343,7 +336,7 @@
 		item->canvas = NULL;
 	}
 
-	GTK_OBJECT_CLASS (item_parent_class)->destroy (object);
+	G_OBJECT_CLASS (item_parent_class)->dispose (object);
 }
 
 
@@ -985,7 +978,7 @@
 
 	/* Everything is ok, now actually reparent the item */
 
-	g_object_ref (GTK_OBJECT (item)); /* protect it from the unref in group_remove */
+	g_object_ref (G_OBJECT (item)); /* protect it from the unref in group_remove */
 
 	foo_canvas_item_request_redraw (item);
 
@@ -998,7 +991,7 @@
 
 	redraw_and_repick_if_mapped (item);
 
-	g_object_unref (GTK_OBJECT (item));
+	g_object_unref (G_OBJECT (item));
 }
 
 /**
@@ -1094,6 +1087,9 @@
 void
 foo_canvas_item_request_update (FooCanvasItem *item)
 {
+	if (NULL == item->canvas)
+		return;
+
 	g_return_if_fail (!item->canvas->doing_update);
 
 	if (item->object.flags & FOO_CANVAS_ITEM_NEED_UPDATE)
@@ -1553,7 +1549,7 @@
 	return best;
 }
 
-static void
+void
 foo_canvas_group_translate (FooCanvasItem *item, double dx, double dy)
 {
         FooCanvasGroup *group;
@@ -1644,8 +1640,12 @@
 static void
 group_add (FooCanvasGroup *group, FooCanvasItem *item)
 {
-	g_object_ref (GTK_OBJECT (item));
+#if GLIB_CHECK_VERSION(2,10,0) && GTK_CHECK_VERSION(2,8,14)
+	g_object_ref_sink (item);
+#else
+	g_object_ref (item);
 	gtk_object_sink (GTK_OBJECT (item));
+#endif
 
 	if (!group->item_list) {
 		group->item_list = g_list_append (group->item_list, item);
@@ -1684,7 +1684,7 @@
 
 			item->parent = NULL;
 			item->canvas = NULL;
-			g_object_unref (item);
+			g_object_unref (G_OBJECT (item));
 
 			/* Remove it from the list */
 
@@ -2094,12 +2094,15 @@
 	canvas->root = FOO_CANVAS_ITEM (g_object_new (foo_canvas_group_get_type (), NULL));
 	canvas->root->canvas = canvas;
 
-	g_object_ref (GTK_OBJECT (canvas->root));
+#if GLIB_CHECK_VERSION(2,10,0) && GTK_CHECK_VERSION(2,8,14)
+	g_object_ref_sink (canvas->root);
+#else
+	g_object_ref (canvas->root);
 	gtk_object_sink (GTK_OBJECT (canvas->root));
+#endif
 
-	canvas->root_destroy_id = g_signal_connect (GTK_OBJECT (canvas->root), "destroy",
-						    (GtkSignalFunc) panic_root_destroyed,
-						    canvas);
+	canvas->root_destroy_id = g_signal_connect (G_OBJECT (canvas->root),
+		"destroy", G_CALLBACK (panic_root_destroyed), canvas);
 
 	canvas->need_repick = TRUE;
 	canvas->doing_update = FALSE;
@@ -2151,7 +2154,7 @@
 	canvas = FOO_CANVAS (object);
 
 	if (canvas->root_destroy_id) {
-		g_signal_handler_disconnect (GTK_OBJECT (canvas->root), canvas->root_destroy_id);
+		g_signal_handler_disconnect (G_OBJECT (canvas->root), canvas->root_destroy_id);
 		canvas->root_destroy_id = 0;
 	}
 	if (canvas->root) {
@@ -2372,9 +2375,9 @@
 	
 	/* Signal GtkLayout that it should do a redraw. */
 	if (changed_x)
-		g_signal_emit_by_name (GTK_OBJECT (canvas->layout.hadjustment), "value_changed");
+		g_signal_emit_by_name (G_OBJECT (canvas->layout.hadjustment), "value_changed");
 	if (changed_y)
-		g_signal_emit_by_name (GTK_OBJECT (canvas->layout.vadjustment), "value_changed");
+		g_signal_emit_by_name (G_OBJECT (canvas->layout.vadjustment), "value_changed");
 }
 
 /* Size allocation handler for the canvas */
@@ -2403,8 +2406,8 @@
 		   canvas->layout.hadjustment->value,
 		   canvas->layout.vadjustment->value);
 
-	g_signal_emit_by_name (GTK_OBJECT (canvas->layout.hadjustment), "changed");
-	g_signal_emit_by_name (GTK_OBJECT (canvas->layout.vadjustment), "changed");
+	g_signal_emit_by_name (G_OBJECT (canvas->layout.hadjustment), "changed");
+	g_signal_emit_by_name (G_OBJECT (canvas->layout.vadjustment), "changed");
 }
 
 /* Emits an event for an item in the canvas, be it the current item, grabbed
@@ -2533,7 +2536,7 @@
 		g_object_ref (GTK_OBJECT (item));
 
 		g_signal_emit (
-		       GTK_OBJECT (item), item_signals[ITEM_EVENT], 0,
+		       G_OBJECT (item), item_signals[ITEM_EVENT], 0,
 			&ev, &finished);
 		
 		parent = item->parent;
@@ -3375,7 +3378,7 @@
  * @cy: Y pixel coordinate (return value).
  *
  * Converts world coordinates into canvas pixel coordinates.  This version
- * returns coordinates in floating point coordinates, for greater precision.
+ * produces coordinates in floating point coordinates, for greater precision.
  **/
 void
 foo_canvas_w2c_d (FooCanvas *canvas, double wx, double wy, double *cx, double *cy)
@@ -3614,10 +3617,10 @@
 	foo_canvas_item_get_bounds (item, &bx1, &by1, &bx2, &by2);
 	foo_canvas_w2c_rect_d (item->canvas, &bx1, &by1, &bx2, &by2);
 	foo_canvas_get_scroll_offsets (item->canvas, &scroll_x, &scroll_y);
-	x1 = floor (bx1);
-	y1 = floor (by1);
-	x2 = ceil (bx2);
-	y2 = ceil (by2);
+	x1 = floor (bx1 + .5);
+	y1 = floor (by1 + .5);
+	x2 = floor (bx2 + .5);
+	y2 = floor (by2 + .5);
 	rect->x = x1 - scroll_x;
 	rect->y = y1 - scroll_y;
 	rect->width = x2 - x1;
@@ -3954,16 +3957,13 @@
 static void
 foo_canvas_item_class_init (FooCanvasItemClass *class)
 {
-	GObjectClass *gobject_class;
-	GtkObjectClass *object_class;
-
-	gobject_class = (GObjectClass *) class;
-	object_class  = (GtkObjectClass *) class;
+	GObjectClass *gobject_class = (GObjectClass *) class;
 
 	item_parent_class = gtk_type_class (gtk_object_get_type ());
 
 	gobject_class->set_property = foo_canvas_item_set_property;
 	gobject_class->get_property = foo_canvas_item_get_property;
+	gobject_class->dispose = foo_canvas_item_dispose;
 
 	g_object_class_install_property
 		(gobject_class, ITEM_PROP_PARENT,
@@ -3987,8 +3987,6 @@
 			      G_TYPE_BOOLEAN, 1,
 			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
-	object_class->destroy = foo_canvas_item_destroy;
-
 	class->realize = foo_canvas_item_realize;
 	class->unrealize = foo_canvas_item_unrealize;
 	class->map = foo_canvas_item_map;

Modified: trunk/libfoocanvas/foo-canvas.h
==============================================================================
--- trunk/libfoocanvas/foo-canvas.h	(original)
+++ trunk/libfoocanvas/foo-canvas.h	Sat Jun 21 11:59:12 2008
@@ -102,11 +102,11 @@
 };
 
 #define FOO_TYPE_CANVAS_ITEM            (foo_canvas_item_get_type ())
-#define FOO_CANVAS_ITEM(obj)            (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_ITEM, FooCanvasItem))
-#define FOO_CANVAS_ITEM_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_ITEM, FooCanvasItemClass))
-#define FOO_IS_CANVAS_ITEM(obj)         (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_ITEM))
-#define FOO_IS_CANVAS_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_ITEM))
-#define FOO_CANVAS_ITEM_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_ITEM, FooCanvasItemClass))
+#define FOO_CANVAS_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_ITEM, FooCanvasItem))
+#define FOO_CANVAS_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_ITEM, FooCanvasItemClass))
+#define FOO_IS_CANVAS_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_ITEM))
+#define FOO_IS_CANVAS_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_ITEM))
+#define FOO_CANVAS_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_ITEM, FooCanvasItemClass))
 
 
 struct _FooCanvasItem {
@@ -305,11 +305,11 @@
 
 
 #define FOO_TYPE_CANVAS_GROUP            (foo_canvas_group_get_type ())
-#define FOO_CANVAS_GROUP(obj)            (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_GROUP, FooCanvasGroup))
-#define FOO_CANVAS_GROUP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_GROUP, FooCanvasGroupClass))
-#define FOO_IS_CANVAS_GROUP(obj)         (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_GROUP))
-#define FOO_IS_CANVAS_GROUP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_GROUP))
-#define FOO_CANVAS_GROUP_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_GROUP, FooCanvasGroupClass))
+#define FOO_CANVAS_GROUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_GROUP, FooCanvasGroup))
+#define FOO_CANVAS_GROUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_GROUP, FooCanvasGroupClass))
+#define FOO_IS_CANVAS_GROUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_GROUP))
+#define FOO_IS_CANVAS_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_GROUP))
+#define FOO_CANVAS_GROUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_GROUP, FooCanvasGroupClass))
 
 
 struct _FooCanvasGroup {
@@ -335,11 +335,11 @@
 
 
 #define FOO_TYPE_CANVAS            (foo_canvas_get_type ())
-#define FOO_CANVAS(obj)            (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS, FooCanvas))
-#define FOO_CANVAS_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS, FooCanvasClass))
-#define FOO_IS_CANVAS(obj)         (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS))
-#define FOO_IS_CANVAS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS))
-#define FOO_CANVAS_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS, FooCanvasClass))
+#define FOO_CANVAS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS, FooCanvas))
+#define FOO_CANVAS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS, FooCanvasClass))
+#define FOO_IS_CANVAS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS))
+#define FOO_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS))
+#define FOO_CANVAS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS, FooCanvasClass))
 
 
 struct _FooCanvas {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]