File goocanvas-g_signal.patch of Package goocanvas

Overview Repositories Revisions Requests Users Attributes Meta

File goocanvas-g_signal.patch of Package goocanvas (Revision 58d78e4be9a163918262fe52879aee26)

Currently displaying revision 58d78e4be9a163918262fe52879aee26 , Show latest

Index: goocanvas-0.10/demo/demo-animation.c
===================================================================
--- goocanvas-0.10.orig/demo/demo-animation.c
+++ goocanvas-0.10/demo/demo-animation.c
@@ -107,13 +107,13 @@ create_animation_page (void)
   w = gtk_button_new_with_label("Start Animation");
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
-  g_signal_connect (w, "clicked", (GtkSignalFunc) start_animation_clicked,
+  g_signal_connect (w, "clicked", G_CALLBACK (start_animation_clicked),
 		    NULL);
 
   w = gtk_button_new_with_label("Stop Animation");
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
-  g_signal_connect (w, "clicked", (GtkSignalFunc) stop_animation_clicked,
+  g_signal_connect (w, "clicked", G_CALLBACK (stop_animation_clicked),
 		    NULL);
 
 
Index: goocanvas-0.10/demo/demo-arrowhead.c
===================================================================
--- goocanvas-0.10.orig/demo/demo-arrowhead.c
+++ goocanvas-0.10/demo/demo-arrowhead.c
@@ -385,19 +385,19 @@ create_drag_box (GtkWidget *canvas,
   g_object_set_data (G_OBJECT (canvas), box_name, item);
 
   g_signal_connect (item, "enter_notify_event",
-		    (GtkSignalFunc) on_enter_notify,
+		    G_CALLBACK (on_enter_notify),
 		    NULL);
   g_signal_connect (item, "leave_notify_event",
-		    (GtkSignalFunc) on_leave_notify,
+		    G_CALLBACK (on_leave_notify),
 		    NULL);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press,
+		    G_CALLBACK (on_button_press),
 		    NULL);
   g_signal_connect (item, "button_release_event",
-		    (GtkSignalFunc) on_button_release,
+		    G_CALLBACK (on_button_release),
 		    NULL);
   g_signal_connect (item, "motion_notify_event",
-		    (GtkSignalFunc) on_motion,
+		    G_CALLBACK (on_motion),
 		    NULL);
 }
 
Index: goocanvas-0.10/demo/demo-clipping.c
===================================================================
--- goocanvas-0.10.orig/demo/demo-clipping.c
+++ goocanvas-0.10/demo/demo-clipping.c
@@ -31,25 +31,25 @@ setup_canvas (GtkWidget *canvas)
   goo_canvas_item_translate (item, 100, 100);
   goo_canvas_item_rotate (item, 30, 0, 0);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Blue ellipse (unclipped)");
+		    G_CALLBACK (on_button_press), "Blue ellipse (unclipped)");
 
   item = goo_canvas_rect_new (root, 200, 50, 100, 100,
 			      "fill-color", "red",
 			      "clip-fill-rule", CAIRO_FILL_RULE_EVEN_ODD,
 			      NULL);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Red rectangle (unclipped)");
+		    G_CALLBACK (on_button_press), "Red rectangle (unclipped)");
 
   item = goo_canvas_rect_new (root, 380, 50, 100, 100,
 			      "fill-color", "yellow",
 			      NULL);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Yellow rectangle (unclipped)");
+		    G_CALLBACK (on_button_press), "Yellow rectangle (unclipped)");
 
   item = goo_canvas_text_new (root, "Sample Text", 520, 100, -1, GTK_ANCHOR_NW,
 			      NULL);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Text (unclipped)");
+		    G_CALLBACK (on_button_press), "Text (unclipped)");
 
 
 
@@ -61,7 +61,7 @@ setup_canvas (GtkWidget *canvas)
   goo_canvas_item_translate (item, 100, 300);
   goo_canvas_item_rotate (item, 30, 0, 0);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Blue ellipse");
+		    G_CALLBACK (on_button_press), "Blue ellipse");
 
   item = goo_canvas_rect_new (root, 200, 250, 100, 100,
 			      "fill-color", "red",
@@ -69,20 +69,20 @@ setup_canvas (GtkWidget *canvas)
 			      "clip-fill-rule", CAIRO_FILL_RULE_EVEN_ODD,
 			      NULL);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Red rectangle");
+		    G_CALLBACK (on_button_press), "Red rectangle");
 
   item = goo_canvas_rect_new (root, 380, 250, 100, 100,
 			      "fill-color", "yellow",
 			      "clip-path", "M480,230 l40,100 l-80 0 z",
 			      NULL);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Yellow rectangle");
+		    G_CALLBACK (on_button_press), "Yellow rectangle");
 
   item = goo_canvas_text_new (root, "Sample Text", 520, 300, -1, GTK_ANCHOR_NW,
 			      "clip-path", "M535,300 h75 v40 h-75 z",
 			      NULL);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Text");
+		    G_CALLBACK (on_button_press), "Text");
 
 
   /* Table with clipped items. */
@@ -97,7 +97,7 @@ setup_canvas (GtkWidget *canvas)
   goo_canvas_item_translate (item, 100, 300);
   goo_canvas_item_rotate (item, 30, 0, 0);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Blue ellipse");
+		    G_CALLBACK (on_button_press), "Blue ellipse");
 
   item = goo_canvas_rect_new (table, 200, 250, 100, 100,
 			      "fill-color", "red",
@@ -108,7 +108,7 @@ setup_canvas (GtkWidget *canvas)
 					"column", 1,
 					NULL);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Red rectangle");
+		    G_CALLBACK (on_button_press), "Red rectangle");
 
   item = goo_canvas_rect_new (table, 380, 250, 100, 100,
 			      "fill-color", "yellow",
@@ -118,7 +118,7 @@ setup_canvas (GtkWidget *canvas)
 					"column", 2,
 					NULL);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Yellow rectangle");
+		    G_CALLBACK (on_button_press), "Yellow rectangle");
 
   item = goo_canvas_text_new (table, "Sample Text", 520, 300, -1,
 			      GTK_ANCHOR_NW,
@@ -128,7 +128,7 @@ setup_canvas (GtkWidget *canvas)
 					"column", 3,
 					NULL);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Text");
+		    G_CALLBACK (on_button_press), "Text");
 }
 
 
Index: goocanvas-0.10/demo/demo-events.c
===================================================================
--- goocanvas-0.10.orig/demo/demo-events.c
+++ goocanvas-0.10/demo/demo-events.c
@@ -26,7 +26,7 @@ static void
 setup_item_signals (GooCanvasItem *item)
 {
   g_signal_connect (item, "motion_notify_event",
-		    (GtkSignalFunc) on_motion_notify, NULL);
+		    G_CALLBACK (on_motion_notify), NULL);
 }
 
 
Index: goocanvas-0.10/demo/demo-features.c
===================================================================
--- goocanvas-0.10.orig/demo/demo-features.c
+++ goocanvas-0.10/demo/demo-features.c
@@ -108,7 +108,7 @@ create_canvas_features (void)
 	g_object_set_data (G_OBJECT (item), "parent1", parent1);
 	g_object_set_data (G_OBJECT (item), "parent2", parent2);
 	g_signal_connect (item, "button_press_event",
-			  (GtkSignalFunc) on_button_press, NULL);
+			  G_CALLBACK (on_button_press), NULL);
 
 	/* A group to be reparented */
 
@@ -127,7 +127,7 @@ create_canvas_features (void)
 	g_object_set_data (G_OBJECT (group), "parent1", parent1);
 	g_object_set_data (G_OBJECT (group), "parent2", parent2);
 	g_signal_connect (group, "button_press_event",
-			  (GtkSignalFunc) on_button_press, NULL);
+			  G_CALLBACK (on_button_press), NULL);
 
 	return vbox;
 }
Index: goocanvas-0.10/demo/demo-fifteen.c
===================================================================
--- goocanvas-0.10.orig/demo/demo-fifteen.c
+++ goocanvas-0.10/demo/demo-fifteen.c
@@ -166,13 +166,13 @@ static void
 setup_item_signals (GooCanvasItem     *item)
 {
   g_signal_connect (item, "enter_notify_event",
-		    (GtkSignalFunc) piece_enter_notify,
+		    G_CALLBACK (piece_enter_notify),
 		    NULL);
   g_signal_connect (item, "leave_notify_event",
-		    (GtkSignalFunc) piece_leave_notify,
+		    G_CALLBACK (piece_leave_notify),
 		    NULL);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) piece_button_press,
+		    G_CALLBACK (piece_button_press),
 		    NULL);
 }
 
@@ -277,7 +277,7 @@ create_canvas_fifteen (void)
 	board = g_new (GooCanvasItem *, 16);
 	g_object_set_data (G_OBJECT (canvas), "board", board);
 	g_signal_connect (canvas, "destroy",
-			  (GtkSignalFunc) free_stuff,
+			  G_CALLBACK (free_stuff),
 			  board);
 
 	for (i = 0; i < 15; i++) {
@@ -320,7 +320,7 @@ create_canvas_fifteen (void)
 	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 	g_object_set_data (G_OBJECT (button), "board", board);
 	g_signal_connect (button, "clicked",
-			  (GtkSignalFunc) scramble,
+			  G_CALLBACK (scramble),
 			  canvas);
 	gtk_widget_show (button);
 
Index: goocanvas-0.10/demo/demo-focus.c
===================================================================
--- goocanvas-0.10.orig/demo/demo-focus.c
+++ goocanvas-0.10/demo/demo-focus.c
@@ -100,15 +100,15 @@ create_focus_box (GtkWidget     *canvas,
   g_object_set_data (G_OBJECT (item), "id", color);
 
   g_signal_connect (item, "focus_in_event",
-		    (GtkSignalFunc) on_focus_in, NULL);
+		    G_CALLBACK (on_focus_in), NULL);
   g_signal_connect (item, "focus_out_event",
-		    (GtkSignalFunc) on_focus_out, NULL);
+		    G_CALLBACK (on_focus_out), NULL);
 
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, NULL);
+		    G_CALLBACK (on_button_press), NULL);
 
   g_signal_connect (item, "key_press_event",
-		    (GtkSignalFunc) on_key_press, NULL);
+		    G_CALLBACK (on_key_press), NULL);
 }
 
 
Index: goocanvas-0.10/demo/demo-grabs.c
===================================================================
--- goocanvas-0.10.orig/demo/demo-grabs.c
+++ goocanvas-0.10/demo/demo-grabs.c
@@ -231,18 +231,18 @@ create_fixed (GtkTable *table, gint row,
 
   view_id = g_strdup_printf ("%s-background", id);
   g_signal_connect (fixed, "expose_event",
-		    (GtkSignalFunc) on_widget_expose, view_id);
+		    G_CALLBACK (on_widget_expose), view_id);
 
   g_signal_connect (fixed, "enter_notify_event",
-		    (GtkSignalFunc) on_widget_enter_notify, view_id);
+		    G_CALLBACK (on_widget_enter_notify), view_id);
   g_signal_connect (fixed, "leave_notify_event",
-		    (GtkSignalFunc) on_widget_leave_notify, view_id);
+		    G_CALLBACK (on_widget_leave_notify), view_id);
   g_signal_connect (fixed, "motion_notify_event",
-		    (GtkSignalFunc) on_widget_motion_notify, view_id);
+		    G_CALLBACK (on_widget_motion_notify), view_id);
   g_signal_connect (fixed, "button_press_event",
-		    (GtkSignalFunc) on_widget_button_press, view_id);
+		    G_CALLBACK (on_widget_button_press), view_id);
   g_signal_connect (fixed, "button_release_event",
-		    (GtkSignalFunc) on_widget_button_release, view_id);
+		    G_CALLBACK (on_widget_button_release), view_id);
 
 
   drawing_area = gtk_drawing_area_new ();
@@ -264,18 +264,18 @@ create_fixed (GtkTable *table, gint row,
 
   view_id = g_strdup_printf ("%s-left", id);
   g_signal_connect (drawing_area, "expose_event",
-		    (GtkSignalFunc) on_widget_expose, view_id);
+		    G_CALLBACK (on_widget_expose), view_id);
 
   g_signal_connect (drawing_area, "enter_notify_event",
-		    (GtkSignalFunc) on_widget_enter_notify, view_id);
+		    G_CALLBACK (on_widget_enter_notify), view_id);
   g_signal_connect (drawing_area, "leave_notify_event",
-		    (GtkSignalFunc) on_widget_leave_notify, view_id);
+		    G_CALLBACK (on_widget_leave_notify), view_id);
   g_signal_connect (drawing_area, "motion_notify_event",
-		    (GtkSignalFunc) on_widget_motion_notify, view_id);
+		    G_CALLBACK (on_widget_motion_notify), view_id);
   g_signal_connect (drawing_area, "button_press_event",
-		    (GtkSignalFunc) on_widget_button_press, view_id);
+		    G_CALLBACK (on_widget_button_press), view_id);
   g_signal_connect (drawing_area, "button_release_event",
-		    (GtkSignalFunc) on_widget_button_release, view_id);
+		    G_CALLBACK (on_widget_button_release), view_id);
 
 
   drawing_area = gtk_drawing_area_new ();
@@ -297,18 +297,18 @@ create_fixed (GtkTable *table, gint row,
 
   view_id = g_strdup_printf ("%s-right", id);
   g_signal_connect (drawing_area, "expose_event",
-		    (GtkSignalFunc) on_widget_expose, view_id);
+		    G_CALLBACK (on_widget_expose), view_id);
 
   g_signal_connect (drawing_area, "enter_notify_event",
-		    (GtkSignalFunc) on_widget_enter_notify, view_id);
+		    G_CALLBACK (on_widget_enter_notify), view_id);
   g_signal_connect (drawing_area, "leave_notify_event",
-		    (GtkSignalFunc) on_widget_leave_notify, view_id);
+		    G_CALLBACK (on_widget_leave_notify), view_id);
   g_signal_connect (drawing_area, "motion_notify_event",
-		    (GtkSignalFunc) on_widget_motion_notify, view_id);
+		    G_CALLBACK (on_widget_motion_notify), view_id);
   g_signal_connect (drawing_area, "button_press_event",
-		    (GtkSignalFunc) on_widget_button_press, view_id);
+		    G_CALLBACK (on_widget_button_press), view_id);
   g_signal_connect (drawing_area, "button_release_event",
-		    (GtkSignalFunc) on_widget_button_release, view_id);
+		    G_CALLBACK (on_widget_button_release), view_id);
 }
 
 
@@ -316,15 +316,15 @@ static void
 setup_item_signals (GooCanvasItem *item)
 {
   g_signal_connect (item, "enter_notify_event",
-		    (GtkSignalFunc) on_enter_notify, NULL);
+		    G_CALLBACK (on_enter_notify), NULL);
   g_signal_connect (item, "leave_notify_event",
-		    (GtkSignalFunc) on_leave_notify, NULL);
+		    G_CALLBACK (on_leave_notify), NULL);
   g_signal_connect (item, "motion_notify_event",
-		    (GtkSignalFunc) on_motion_notify, NULL);
+		    G_CALLBACK (on_motion_notify), NULL);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, NULL);
+		    G_CALLBACK (on_button_press), NULL);
   g_signal_connect (item, "button_release_event",
-		    (GtkSignalFunc) on_button_release, NULL);
+		    G_CALLBACK (on_button_release), NULL);
 }
 
 
Index: goocanvas-0.10/demo/demo-large-items.c
===================================================================
--- goocanvas-0.10.orig/demo/demo-large-items.c
+++ goocanvas-0.10/demo/demo-large-items.c
@@ -96,7 +96,7 @@ create_large_items_page (void)
   root = goo_canvas_get_root_item (GOO_CANVAS (canvas));
 
   g_signal_connect (root, "motion_notify_event",
-		    (GtkSignalFunc) on_motion_notify, NULL);
+		    G_CALLBACK (on_motion_notify), NULL);
 
 #if 1
   item = goo_demo_large_rect_new (root, CANVAS_LEFT + 10, CANVAS_TOP + 10,
@@ -146,7 +146,7 @@ create_large_items_page (void)
   adj = GTK_ADJUSTMENT (gtk_adjustment_new (1.00, 0.05, 10.00, 0.05, 0.50, 0.50));
   w = gtk_spin_button_new (adj, 0.0, 2);
   g_signal_connect (adj, "value_changed",
-		    (GtkSignalFunc) zoom_changed,
+		    G_CALLBACK (zoom_changed),
 		    canvas);
   gtk_widget_set_size_request (w, 50, -1);
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
Index: goocanvas-0.10/demo/demo-paths.c
===================================================================
--- goocanvas-0.10.orig/demo/demo-paths.c
+++ goocanvas-0.10/demo/demo-paths.c
@@ -151,7 +151,7 @@ create_paths_page (void)
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
   g_signal_connect (w, "clicked",
-		    (GtkSignalFunc) move_path_clicked, canvas);
+		    G_CALLBACK (move_path_clicked), canvas);
 
   return vbox;
 }
Index: goocanvas-0.10/demo/demo-table.c
===================================================================
--- goocanvas-0.10.orig/demo/demo-table.c
+++ goocanvas-0.10/demo/demo-table.c
@@ -81,7 +81,7 @@ create_demo_item (GooCanvasItem *table,
 
   g_object_set_data (G_OBJECT (item), "id", text);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, NULL);
+		    G_CALLBACK (on_button_press), NULL);
 }
 
 
@@ -182,7 +182,7 @@ create_demo_table (GooCanvasItem *root,
 					NULL);
   g_object_set_data (G_OBJECT (square), "id", "Red square");
   g_signal_connect (square, "button_press_event",
-		    (GtkSignalFunc) on_button_press, NULL);
+		    G_CALLBACK (on_button_press), NULL);
 
   circle = goo_canvas_ellipse_new (table, 0.0, 0.0, 25.0, 25.0,
 				   "fill-color", "blue",
@@ -194,7 +194,7 @@ create_demo_table (GooCanvasItem *root,
 					NULL);
   g_object_set_data (G_OBJECT (circle), "id", "Blue circle");
   g_signal_connect (circle, "button_press_event",
-		    (GtkSignalFunc) on_button_press, NULL);
+		    G_CALLBACK (on_button_press), NULL);
 
   triangle = goo_canvas_polyline_new (table, TRUE, 3,
 				      25.0, 0.0, 0.0, 50.0, 50.0, 50.0,
@@ -207,7 +207,7 @@ create_demo_table (GooCanvasItem *root,
 					NULL);
   g_object_set_data (G_OBJECT (triangle), "id", "Yellow triangle");
   g_signal_connect (triangle, "button_press_event",
-		    (GtkSignalFunc) on_button_press, NULL);
+		    G_CALLBACK (on_button_press), NULL);
 }
 
 
@@ -253,7 +253,7 @@ create_width_for_height_table (GooCanvas
 					NULL);
   g_object_set_data (G_OBJECT (item), "id", "Text Item");
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, NULL);
+		    G_CALLBACK (on_button_press), NULL);
 #endif
 
   item = goo_canvas_rect_new (table, 0.0, 0.0, width - 2, 10.0,
Index: goocanvas-0.10/demo/demo.c
===================================================================
--- goocanvas-0.10.orig/demo/demo.c
+++ goocanvas-0.10/demo/demo.c
@@ -428,11 +428,11 @@ static void
 setup_item_signals (GooCanvasItem *item)
 {
   g_signal_connect (item, "motion_notify_event",
-		    (GtkSignalFunc) on_motion_notify, NULL);
+		    G_CALLBACK (on_motion_notify), NULL);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, NULL);
+		    G_CALLBACK (on_button_press), NULL);
   g_signal_connect (item, "button_release_event",
-		    (GtkSignalFunc) on_button_release, NULL);
+		    G_CALLBACK (on_button_release), NULL);
 }
 
 
@@ -478,7 +478,7 @@ create_canvas_primitives ()
 	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1.00, 0.05, 50.00, 0.05, 0.50, 0.50));
 	w = gtk_spin_button_new (adj, 0.0, 2);
 	g_signal_connect (adj, "value_changed",
-			  (GtkSignalFunc) zoom_changed,
+			  G_CALLBACK (zoom_changed),
 			  canvas);
 	gtk_widget_set_size_request (w, 50, -1);
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
@@ -492,7 +492,7 @@ create_canvas_primitives ()
 	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1.00, 0.05, 50.00, 0.05, 0.50, 0.50));
 	w = gtk_spin_button_new (adj, 0.0, 2);
 	g_signal_connect (adj, "value_changed",
-			  (GtkSignalFunc) zoom_x_changed,
+			  G_CALLBACK (zoom_x_changed),
 			  canvas);
 	gtk_widget_set_size_request (w, 50, -1);
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
@@ -506,7 +506,7 @@ create_canvas_primitives ()
 	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1.00, 0.05, 50.00, 0.05, 0.50, 0.50));
 	w = gtk_spin_button_new (adj, 0.0, 2);
 	g_signal_connect (adj, "value_changed",
-			  (GtkSignalFunc) zoom_y_changed,
+			  G_CALLBACK (zoom_y_changed),
 			  canvas);
 	gtk_widget_set_size_request (w, 50, -1);
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
@@ -523,7 +523,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	/*gtk_widget_show (w);*/
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) center_toggled,
+			  G_CALLBACK (center_toggled),
 			  canvas);
 
 	/* Move Ellipse */
@@ -532,7 +532,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) move_ellipse_clicked,
+			  G_CALLBACK (move_ellipse_clicked),
 			  canvas);
 
 	/* Animate Ellipse */
@@ -541,7 +541,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) animate_ellipse_clicked,
+			  G_CALLBACK (animate_ellipse_clicked),
 			  canvas);
 	
 	/* Stop Animation */
@@ -550,7 +550,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) stop_animation_clicked,
+			  G_CALLBACK (stop_animation_clicked),
 			  canvas);
 	
 
@@ -561,7 +561,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) write_pdf_clicked,
+			  G_CALLBACK (write_pdf_clicked),
 			  canvas);
 #endif
 
@@ -569,7 +569,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) change_bounds_clicked,
+			  G_CALLBACK (change_bounds_clicked),
 			  canvas);
 
 	hbox = gtk_hbox_new (FALSE, 4);
@@ -586,21 +586,21 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) scroll_to_50_50_clicked,
+			  G_CALLBACK (scroll_to_50_50_clicked),
 			  canvas);
 
 	w = gtk_button_new_with_label("250,250");
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) scroll_to_250_250_clicked,
+			  G_CALLBACK (scroll_to_250_250_clicked),
 			  canvas);
 
 	w = gtk_button_new_with_label("500,500");
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) scroll_to_500_500_clicked,
+			  G_CALLBACK (scroll_to_500_500_clicked),
 			  canvas);
 
 	/* Scroll anchor */
@@ -614,7 +614,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_NW));
@@ -624,7 +624,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_N));
@@ -634,7 +634,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_NE));
@@ -644,7 +644,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_W));
@@ -654,7 +654,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_CENTER));
@@ -664,7 +664,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_E));
@@ -674,7 +674,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_SW));
@@ -684,7 +684,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_S));
@@ -694,7 +694,7 @@ create_canvas_primitives ()
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_SE));
@@ -714,7 +714,7 @@ create_canvas_primitives ()
 
 #if 0
 	g_signal_connect_after (canvas, "key_press_event",
-				(GtkSignalFunc) key_press,
+				G_CALLBACK (key_press),
 				NULL);
 
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
@@ -1404,7 +1404,7 @@ setup_canvas (GooCanvas *canvas)
 
   root = goo_canvas_get_root_item (canvas);
   g_signal_connect (root, "button_press_event",
-		    (GtkSignalFunc) on_background_button_press, NULL);
+		    G_CALLBACK (on_background_button_press), NULL);
 
   /* Setup canvas items */
 #if 1
@@ -1441,7 +1441,7 @@ create_window ()
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 600);
   gtk_widget_show (window);
-  g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event,
+  g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
 		    NULL);
 
   notebook = gtk_notebook_new ();
Index: goocanvas-0.10/demo/mv-demo-animation.c
===================================================================
--- goocanvas-0.10.orig/demo/mv-demo-animation.c
+++ goocanvas-0.10/demo/mv-demo-animation.c
@@ -112,13 +112,13 @@ create_animation_page (void)
   w = gtk_button_new_with_label("Start Animation");
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
-  g_signal_connect (w, "clicked", (GtkSignalFunc) start_animation_clicked,
+  g_signal_connect (w, "clicked", G_CALLBACK (start_animation_clicked),
 		    NULL);
 
   w = gtk_button_new_with_label("Stop Animation");
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
-  g_signal_connect (w, "clicked", (GtkSignalFunc) stop_animation_clicked,
+  g_signal_connect (w, "clicked", G_CALLBACK (stop_animation_clicked),
 		    NULL);
 
 
Index: goocanvas-0.10/demo/mv-demo-arrowhead.c
===================================================================
--- goocanvas-0.10.orig/demo/mv-demo-arrowhead.c
+++ goocanvas-0.10/demo/mv-demo-arrowhead.c
@@ -399,19 +399,19 @@ on_item_created (GooCanvas          *can
   if (GOO_IS_CANVAS_RECT_MODEL (model))
     {
       g_signal_connect (item, "enter_notify_event",
-			(GtkSignalFunc) on_enter_notify,
+			G_CALLBACK (on_enter_notify),
 			NULL);
       g_signal_connect (item, "leave_notify_event",
-			(GtkSignalFunc) on_leave_notify,
+			G_CALLBACK (on_leave_notify),
 			NULL);
       g_signal_connect (item, "button_press_event",
-			(GtkSignalFunc) on_button_press,
+			G_CALLBACK (on_button_press),
 			NULL);
       g_signal_connect (item, "button_release_event",
-			(GtkSignalFunc) on_button_release,
+			G_CALLBACK (on_button_release),
 			NULL);
       g_signal_connect (item, "motion_notify_event",
-			(GtkSignalFunc) on_motion,
+			G_CALLBACK (on_motion),
 			NULL);
     }
 }
@@ -448,7 +448,7 @@ create_canvas_arrowhead (void)
 	canvas = goo_canvas_new ();
 
 	g_signal_connect (canvas, "item_created",
-			  (GtkSignalFunc) on_item_created, NULL);
+			  G_CALLBACK (on_item_created), NULL);
 
 	root = goo_canvas_group_model_new (NULL, NULL);
 	goo_canvas_set_root_item_model (GOO_CANVAS (canvas), root);
Index: goocanvas-0.10/demo/mv-demo-clipping.c
===================================================================
--- goocanvas-0.10.orig/demo/mv-demo-clipping.c
+++ goocanvas-0.10/demo/mv-demo-clipping.c
@@ -35,7 +35,7 @@ setup_canvas (GooCanvas *canvas)
   goo_canvas_item_model_rotate (model, 30, 0, 0);
   item = goo_canvas_get_item (canvas, model);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Blue ellipse (unclipped)");
+		    G_CALLBACK (on_button_press), "Blue ellipse (unclipped)");
 
   model = goo_canvas_rect_model_new (root, 200, 50, 100, 100,
 				     "fill-color", "red",
@@ -43,20 +43,20 @@ setup_canvas (GooCanvas *canvas)
 				     NULL);
   item = goo_canvas_get_item (canvas, model);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Red rectangle (unclipped)");
+		    G_CALLBACK (on_button_press), "Red rectangle (unclipped)");
 
   model = goo_canvas_rect_model_new (root, 380, 50, 100, 100,
 				     "fill-color", "yellow",
 				     NULL);
   item = goo_canvas_get_item (canvas, model);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Yellow rectangle (unclipped)");
+		    G_CALLBACK (on_button_press), "Yellow rectangle (unclipped)");
 
   model = goo_canvas_text_model_new (root, "Sample Text", 520, 100, -1, GTK_ANCHOR_NW,
 				     NULL);
   item = goo_canvas_get_item (canvas, model);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Text (unclipped)");
+		    G_CALLBACK (on_button_press), "Text (unclipped)");
 
 
   /* Clipped items. */
@@ -68,7 +68,7 @@ setup_canvas (GooCanvas *canvas)
   goo_canvas_item_model_rotate (model, 30, 0, 0);
   item = goo_canvas_get_item (canvas, model);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Blue ellipse");
+		    G_CALLBACK (on_button_press), "Blue ellipse");
 
   model = goo_canvas_rect_model_new (root, 200, 250, 100, 100,
 				     "fill-color", "red",
@@ -77,7 +77,7 @@ setup_canvas (GooCanvas *canvas)
 				     NULL);
   item = goo_canvas_get_item (canvas, model);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Red rectangle");
+		    G_CALLBACK (on_button_press), "Red rectangle");
 
   model = goo_canvas_rect_model_new (root, 380, 250, 100, 100,
 				     "fill-color", "yellow",
@@ -85,14 +85,14 @@ setup_canvas (GooCanvas *canvas)
 				     NULL);
   item = goo_canvas_get_item (canvas, model);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Yellow rectangle");
+		    G_CALLBACK (on_button_press), "Yellow rectangle");
 
   model = goo_canvas_text_model_new (root, "Sample Text", 520, 300, -1, GTK_ANCHOR_NW,
 				     "clip-path", "M535,300 h75 v40 h-75 z",
 				     NULL);
   item = goo_canvas_get_item (canvas, model);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Text (unclipped)");
+		    G_CALLBACK (on_button_press), "Text (unclipped)");
 
 
   /* Table with clipped items. */
@@ -109,7 +109,7 @@ setup_canvas (GooCanvas *canvas)
   goo_canvas_item_model_rotate (model, 30, 0, 0);
   item = goo_canvas_get_item (canvas, model);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Blue ellipse");
+		    G_CALLBACK (on_button_press), "Blue ellipse");
 
   model = goo_canvas_rect_model_new (table, 200, 250, 100, 100,
 				     "fill-color", "red",
@@ -121,7 +121,7 @@ setup_canvas (GooCanvas *canvas)
 					      NULL);
   item = goo_canvas_get_item (canvas, model);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Red rectangle");
+		    G_CALLBACK (on_button_press), "Red rectangle");
 
   model = goo_canvas_rect_model_new (table, 380, 250, 100, 100,
 				     "fill-color", "yellow",
@@ -132,7 +132,7 @@ setup_canvas (GooCanvas *canvas)
 					      NULL);
   item = goo_canvas_get_item (canvas, model);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Yellow rectangle");
+		    G_CALLBACK (on_button_press), "Yellow rectangle");
 
   model = goo_canvas_text_model_new (table, "Sample Text", 520, 300, -1, GTK_ANCHOR_NW,
 				     "clip-path", "M535,300 h75 v40 h-75 z",
@@ -142,7 +142,7 @@ setup_canvas (GooCanvas *canvas)
 					      NULL);
   item = goo_canvas_get_item (canvas, model);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, "Text (unclipped)");
+		    G_CALLBACK (on_button_press), "Text (unclipped)");
 }
 
 
Index: goocanvas-0.10/demo/mv-demo-events.c
===================================================================
--- goocanvas-0.10.orig/demo/mv-demo-events.c
+++ goocanvas-0.10/demo/mv-demo-events.c
@@ -33,7 +33,7 @@ on_item_created (GooCanvas          *vie
 		 gpointer            data)
 {
   g_signal_connect (item, "motion_notify_event",
-		    (GtkSignalFunc) on_motion_notify, NULL);
+		    G_CALLBACK (on_motion_notify), NULL);
 }
 
 
@@ -155,7 +155,7 @@ create_events_page (void)
   canvas = goo_canvas_new ();
 
   g_signal_connect (canvas, "item_created",
-		    (GtkSignalFunc) on_item_created, NULL);
+		    G_CALLBACK (on_item_created), NULL);
 
   root = goo_canvas_group_model_new (NULL, NULL);
 
Index: goocanvas-0.10/demo/mv-demo-features.c
===================================================================
--- goocanvas-0.10.orig/demo/mv-demo-features.c
+++ goocanvas-0.10/demo/mv-demo-features.c
@@ -41,7 +41,7 @@ on_item_created (GooCanvas          *can
   if (g_object_get_data (G_OBJECT (model), "parent1"))
     {
       g_signal_connect (item, "button_press_event",
-			(GtkSignalFunc) on_button_press, NULL);
+			G_CALLBACK (on_button_press), NULL);
     }
 }
 
@@ -83,7 +83,7 @@ create_canvas_features (void)
 	canvas = goo_canvas_new ();
 
 	g_signal_connect (canvas, "item_created",
-			  (GtkSignalFunc) on_item_created, NULL);
+			  G_CALLBACK (on_item_created), NULL);
 
 	root = goo_canvas_group_model_new (NULL, NULL);
 
@@ -120,7 +120,7 @@ create_canvas_features (void)
 	g_object_set_data (G_OBJECT (item), "parent2", parent2);
 #if 0
 	g_signal_connect (G_OBJECT (item), "event",
-			  (GtkSignalFunc) item_event,
+			  G_CALLBACK (item_event),
 			  NULL);
 #endif
 
@@ -142,7 +142,7 @@ create_canvas_features (void)
 	g_object_set_data (G_OBJECT (group), "parent2", parent2);
 #if 0
 	g_signal_connect (G_OBJECT (group), "event",
-			    (GtkSignalFunc) item_event,
+			  G_CALLBACK (item_event),
 			    NULL);
 #endif
 
Index: goocanvas-0.10/demo/mv-demo-fifteen.c
===================================================================
--- goocanvas-0.10.orig/demo/mv-demo-fifteen.c
+++ goocanvas-0.10/demo/mv-demo-fifteen.c
@@ -175,13 +175,13 @@ on_item_created (GooCanvas          *can
       && GOO_IS_CANVAS_GROUP_MODEL (model))
     {
       g_signal_connect (item, "enter_notify_event",
-			(GtkSignalFunc) piece_enter_notify,
+			G_CALLBACK (piece_enter_notify),
 			NULL);
       g_signal_connect (item, "leave_notify_event",
-			(GtkSignalFunc) piece_leave_notify,
+			G_CALLBACK (piece_leave_notify),
 			NULL);
       g_signal_connect (item, "button_press_event",
-			(GtkSignalFunc) piece_button_press,
+			G_CALLBACK (piece_button_press),
 			NULL);
     }
 }
@@ -272,7 +272,7 @@ create_canvas_fifteen (void)
 	canvas = goo_canvas_new ();
 
 	g_signal_connect (canvas, "item_created",
-			  (GtkSignalFunc) on_item_created, NULL);
+			  G_CALLBACK (on_item_created), NULL);
 
 	root = goo_canvas_group_model_new (NULL, NULL);
 	goo_canvas_set_root_item_model (GOO_CANVAS (canvas), root);
@@ -288,7 +288,7 @@ create_canvas_fifteen (void)
 	board = g_new (GooCanvasItemModel *, 16);
 	g_object_set_data (G_OBJECT (canvas), "board", board);
 	g_signal_connect (canvas, "destroy",
-			  (GtkSignalFunc) free_stuff, board);
+			  G_CALLBACK (free_stuff), board);
 
 	for (i = 0; i < 15; i++) {
 		y = i / 4;
@@ -329,7 +329,7 @@ create_canvas_fifteen (void)
 	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 	g_object_set_data (G_OBJECT (button), "board", board);
 	g_signal_connect (button, "clicked",
-			  (GtkSignalFunc) scramble,
+			  G_CALLBACK (scramble),
 			  canvas);
 	gtk_widget_show (button);
 
Index: goocanvas-0.10/demo/mv-demo-focus.c
===================================================================
--- goocanvas-0.10.orig/demo/mv-demo-focus.c
+++ goocanvas-0.10/demo/mv-demo-focus.c
@@ -87,15 +87,15 @@ on_item_created (GooCanvas          *vie
       g_object_set (model, "can-focus", TRUE, NULL);
 
       g_signal_connect (item, "focus_in_event",
-			(GtkSignalFunc) on_focus_in, NULL);
+			G_CALLBACK (on_focus_in), NULL);
       g_signal_connect (item, "focus_out_event",
-			(GtkSignalFunc) on_focus_out, NULL);
+			G_CALLBACK (on_focus_out), NULL);
 
       g_signal_connect (item, "button_press_event",
-			(GtkSignalFunc) on_button_press, NULL);
+			G_CALLBACK (on_button_press), NULL);
 
       g_signal_connect (item, "key_press_event",
-			(GtkSignalFunc) on_key_press, NULL);
+			G_CALLBACK (on_key_press), NULL);
     }
 }
 
@@ -175,7 +175,7 @@ create_focus_page (void)
   gtk_container_add (GTK_CONTAINER (scrolled_win), canvas);
 
   g_signal_connect (canvas, "item_created",
-		    (GtkSignalFunc) on_item_created, NULL);
+		    G_CALLBACK (on_item_created), NULL);
 
   setup_canvas (canvas);
 
Index: goocanvas-0.10/demo/mv-demo-grabs.c
===================================================================
--- goocanvas-0.10.orig/demo/mv-demo-grabs.c
+++ goocanvas-0.10/demo/mv-demo-grabs.c
@@ -236,18 +236,18 @@ create_fixed (GtkTable *table, gint row,
 
   view_id = g_strdup_printf ("%s-background", id);
   g_signal_connect (fixed, "expose_event",
-		    (GtkSignalFunc) on_widget_expose, view_id);
+		    G_CALLBACK (on_widget_expose), view_id);
 
   g_signal_connect (fixed, "enter_notify_event",
-		    (GtkSignalFunc) on_widget_enter_notify, view_id);
+		    G_CALLBACK (on_widget_enter_notify), view_id);
   g_signal_connect (fixed, "leave_notify_event",
-		    (GtkSignalFunc) on_widget_leave_notify, view_id);
+		    G_CALLBACK (on_widget_leave_notify), view_id);
   g_signal_connect (fixed, "motion_notify_event",
-		    (GtkSignalFunc) on_widget_motion_notify, view_id);
+		    G_CALLBACK (on_widget_motion_notify), view_id);
   g_signal_connect (fixed, "button_press_event",
-		    (GtkSignalFunc) on_widget_button_press, view_id);
+		    G_CALLBACK (on_widget_button_press), view_id);
   g_signal_connect (fixed, "button_release_event",
-		    (GtkSignalFunc) on_widget_button_release, view_id);
+		    G_CALLBACK (on_widget_button_release), view_id);
 
 
   drawing_area = gtk_drawing_area_new ();
@@ -269,18 +269,18 @@ create_fixed (GtkTable *table, gint row,
 
   view_id = g_strdup_printf ("%s-left", id);
   g_signal_connect (drawing_area, "expose_event",
-		    (GtkSignalFunc) on_widget_expose, view_id);
+		    G_CALLBACK (on_widget_expose), view_id);
 
   g_signal_connect (drawing_area, "enter_notify_event",
-		    (GtkSignalFunc) on_widget_enter_notify, view_id);
+		    G_CALLBACK (on_widget_enter_notify), view_id);
   g_signal_connect (drawing_area, "leave_notify_event",
-		    (GtkSignalFunc) on_widget_leave_notify, view_id);
+		    G_CALLBACK (on_widget_leave_notify), view_id);
   g_signal_connect (drawing_area, "motion_notify_event",
-		    (GtkSignalFunc) on_widget_motion_notify, view_id);
+		    G_CALLBACK (on_widget_motion_notify), view_id);
   g_signal_connect (drawing_area, "button_press_event",
-		    (GtkSignalFunc) on_widget_button_press, view_id);
+		    G_CALLBACK (on_widget_button_press), view_id);
   g_signal_connect (drawing_area, "button_release_event",
-		    (GtkSignalFunc) on_widget_button_release, view_id);
+		    G_CALLBACK (on_widget_button_release), view_id);
 
 
   drawing_area = gtk_drawing_area_new ();
@@ -302,18 +302,18 @@ create_fixed (GtkTable *table, gint row,
 
   view_id = g_strdup_printf ("%s-right", id);
   g_signal_connect (drawing_area, "expose_event",
-		    (GtkSignalFunc) on_widget_expose, view_id);
+		    G_CALLBACK (on_widget_expose), view_id);
 
   g_signal_connect (drawing_area, "enter_notify_event",
-		    (GtkSignalFunc) on_widget_enter_notify, view_id);
+		    G_CALLBACK (on_widget_enter_notify), view_id);
   g_signal_connect (drawing_area, "leave_notify_event",
-		    (GtkSignalFunc) on_widget_leave_notify, view_id);
+		    G_CALLBACK (on_widget_leave_notify), view_id);
   g_signal_connect (drawing_area, "motion_notify_event",
-		    (GtkSignalFunc) on_widget_motion_notify, view_id);
+		    G_CALLBACK (on_widget_motion_notify), view_id);
   g_signal_connect (drawing_area, "button_press_event",
-		    (GtkSignalFunc) on_widget_button_press, view_id);
+		    G_CALLBACK (on_widget_button_press), view_id);
   g_signal_connect (drawing_area, "button_release_event",
-		    (GtkSignalFunc) on_widget_button_release, view_id);
+		    G_CALLBACK (on_widget_button_release), view_id);
 }
 
 
@@ -326,15 +326,15 @@ on_item_created (GooCanvas          *can
   if (GOO_IS_CANVAS_RECT (model))
     {
       g_signal_connect (item, "enter_notify_event",
-			(GtkSignalFunc) on_enter_notify, NULL);
+			G_CALLBACK (on_enter_notify), NULL);
       g_signal_connect (item, "leave_notify_event",
-			(GtkSignalFunc) on_leave_notify, NULL);
+			G_CALLBACK (on_leave_notify), NULL);
       g_signal_connect (item, "motion_notify_event",
-			(GtkSignalFunc) on_motion_notify, NULL);
+			G_CALLBACK (on_motion_notify), NULL);
       g_signal_connect (item, "button_press_event",
-			(GtkSignalFunc) on_button_press, NULL);
+			G_CALLBACK (on_button_press), NULL);
       g_signal_connect (item, "button_release_event",
-			(GtkSignalFunc) on_button_release, NULL);
+			G_CALLBACK (on_button_release), NULL);
     }
 }
 
@@ -354,7 +354,7 @@ create_canvas (GtkTable *table, gint row
   canvas = goo_canvas_new ();
 
   g_signal_connect (canvas, "item_created",
-		    (GtkSignalFunc) on_item_created, NULL);
+		    G_CALLBACK (on_item_created), NULL);
 
   gtk_widget_set_size_request (canvas, 200, 100);
   goo_canvas_set_bounds (GOO_CANVAS (canvas), 0, 0, 200, 100);
Index: goocanvas-0.10/demo/mv-demo-paths.c
===================================================================
--- goocanvas-0.10.orig/demo/mv-demo-paths.c
+++ goocanvas-0.10/demo/mv-demo-paths.c
@@ -156,7 +156,7 @@ create_paths_page (void)
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
   g_signal_connect (w, "clicked",
-		    (GtkSignalFunc) move_path_clicked, canvas);
+		    G_CALLBACK (move_path_clicked), canvas);
 
   return vbox;
 }
Index: goocanvas-0.10/demo/mv-demo-table.c
===================================================================
--- goocanvas-0.10.orig/demo/mv-demo-table.c
+++ goocanvas-0.10/demo/mv-demo-table.c
@@ -79,7 +79,7 @@ create_demo_item (GooCanvasItemModel *ta
   item = goo_canvas_get_item (canvas, model);
   g_object_set_data (G_OBJECT (item), "id", text);
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, NULL);
+		    G_CALLBACK (on_button_press), NULL);
 }
 
 
@@ -182,7 +182,7 @@ create_demo_table (GooCanvasItemModel *r
   item = goo_canvas_get_item (canvas, square);
   g_object_set_data (G_OBJECT (item), "id", "Red square");
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, NULL);
+		    G_CALLBACK (on_button_press), NULL);
 
   circle = goo_canvas_ellipse_model_new (table, 0.0, 0.0, 25.0, 25.0,
 					 "fill-color", "blue",
@@ -195,7 +195,7 @@ create_demo_table (GooCanvasItemModel *r
   item = goo_canvas_get_item (canvas, circle);
   g_object_set_data (G_OBJECT (item), "id", "Blue circle");
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, NULL);
+		    G_CALLBACK (on_button_press), NULL);
 
   triangle = goo_canvas_polyline_model_new (table, TRUE, 3,
 					    25.0, 0.0, 0.0, 50.0, 50.0, 50.0,
@@ -209,7 +209,7 @@ create_demo_table (GooCanvasItemModel *r
   item = goo_canvas_get_item (canvas, triangle);
   g_object_set_data (G_OBJECT (item), "id", "Yellow triangle");
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, NULL);
+		    G_CALLBACK (on_button_press), NULL);
 }
 
 
@@ -257,7 +257,7 @@ create_width_for_height_table (GooCanvas
   item = goo_canvas_get_item (canvas, model);
   g_object_set_data (G_OBJECT (item), "id", "Text Item");
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, NULL);
+		    G_CALLBACK (on_button_press), NULL);
 #endif
 
   model = goo_canvas_rect_model_new (table, 0.0, 0.0, width - 2, 10.0,
Index: goocanvas-0.10/demo/mv-demo.c
===================================================================
--- goocanvas-0.10.orig/demo/mv-demo.c
+++ goocanvas-0.10/demo/mv-demo.c
@@ -370,16 +370,16 @@ on_item_created (GooCanvas          *can
   if (!goo_canvas_item_model_get_parent (model))
     {
       g_signal_connect (item, "button_press_event",
-			(GtkSignalFunc) on_background_button_press, NULL);
+			G_CALLBACK (on_background_button_press), NULL);
     }
   else if (!g_object_get_data (G_OBJECT (model), "skip-signal-connection"))
     {
       g_signal_connect (item, "motion_notify_event",
-			(GtkSignalFunc) on_motion_notify, NULL);
+			G_CALLBACK (on_motion_notify), NULL);
       g_signal_connect (item, "button_press_event",
-			(GtkSignalFunc) on_button_press, NULL);
+			G_CALLBACK (on_button_press), NULL);
       g_signal_connect (item, "button_release_event",
-			(GtkSignalFunc) on_button_release, NULL);
+			G_CALLBACK (on_button_release), NULL);
     }
 }
 
@@ -418,7 +418,7 @@ create_canvas_primitives (GooCanvasItemM
 	goo_canvas_set_bounds (GOO_CANVAS (canvas), 0, 0, 604, 454);
 
 	g_signal_connect (canvas, "item_created",
-			  (GtkSignalFunc) on_item_created, NULL);
+			  G_CALLBACK (on_item_created), NULL);
 
 	/* Zoom */
 
@@ -429,7 +429,7 @@ create_canvas_primitives (GooCanvasItemM
 	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1.00, 0.05, 50.00, 0.05, 0.50, 0.50));
 	w = gtk_spin_button_new (adj, 0.0, 2);
 	g_signal_connect (adj, "value_changed",
-			  (GtkSignalFunc) zoom_changed,
+			  G_CALLBACK (zoom_changed),
 			  canvas);
 	gtk_widget_set_size_request (w, 50, -1);
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
@@ -441,7 +441,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	/*gtk_widget_show (w);*/
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) center_toggled,
+			  G_CALLBACK (center_toggled),
 			  canvas);
 
 	/* Move Ellipse */
@@ -450,7 +450,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) move_ellipse_clicked,
+			  G_CALLBACK  (move_ellipse_clicked),
 			  canvas);
 
 	/* Animate Ellipse */
@@ -459,7 +459,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) animate_ellipse_clicked,
+			  G_CALLBACK (animate_ellipse_clicked),
 			  canvas);
 	
 	/* Stop Animation */
@@ -468,7 +468,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) stop_animation_clicked,
+			  G_CALLBACK (stop_animation_clicked),
 			  canvas);
 	
 
@@ -479,7 +479,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) write_pdf_clicked,
+			  G_CALLBACK (write_pdf_clicked),
 			  canvas);
 #endif
 
@@ -487,7 +487,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) change_bounds_clicked,
+			  G_CALLBACK (change_bounds_clicked),
 			  canvas);
 
 	hbox = gtk_hbox_new (FALSE, 4);
@@ -504,21 +504,21 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) scroll_to_50_50_clicked,
+			  G_CALLBACK (scroll_to_50_50_clicked),
 			  canvas);
 
 	w = gtk_button_new_with_label("250,250");
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) scroll_to_250_250_clicked,
+			  G_CALLBACK (scroll_to_250_250_clicked),
 			  canvas);
 
 	w = gtk_button_new_with_label("500,500");
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "clicked",
-			  (GtkSignalFunc) scroll_to_500_500_clicked,
+			  G_CALLBACK (scroll_to_500_500_clicked),
 			  canvas);
 
 	/* Scroll anchor */
@@ -532,7 +532,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_NW));
@@ -542,7 +542,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_N));
@@ -552,7 +552,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_NE));
@@ -562,7 +562,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_W));
@@ -572,7 +572,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_CENTER));
@@ -582,7 +582,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_E));
@@ -592,7 +592,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_SW));
@@ -602,7 +602,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_S));
@@ -612,7 +612,7 @@ create_canvas_primitives (GooCanvasItemM
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 	gtk_widget_show (w);
 	g_signal_connect (w, "toggled",
-			  (GtkSignalFunc) anchor_toggled,
+			  G_CALLBACK (anchor_toggled),
 			  canvas);
 	g_object_set_data (G_OBJECT (w), "anchor",
 			   GINT_TO_POINTER (GTK_ANCHOR_SE));
@@ -633,7 +633,7 @@ create_canvas_primitives (GooCanvasItemM
 
 #if 0
 	g_signal_connect_after (canvas, "key_press_event",
-				(GtkSignalFunc) key_press,
+				G_CALLBACK (key_press),
 				NULL);
 
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
@@ -1302,7 +1302,7 @@ create_window (GooCanvasItemModel *model
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 600);
   gtk_widget_show (window);
-  g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event,
+  g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
 		    NULL);
 
   notebook = gtk_notebook_new ();
Index: goocanvas-0.10/demo/mv-scalability-demo.c
===================================================================
--- goocanvas-0.10.orig/demo/mv-scalability-demo.c
+++ goocanvas-0.10/demo/mv-scalability-demo.c
@@ -94,7 +94,7 @@ setup_canvas (GtkWidget *canvas)
 
   item = goo_canvas_get_item (GOO_CANVAS (canvas), root);
   g_signal_connect (item, "motion_notify_event",
-		    (GtkSignalFunc) on_motion_notify, NULL);
+		    G_CALLBACK (on_motion_notify), NULL);
 
 #ifdef USE_PIXMAP
   pixbuf = gdk_pixbuf_new_from_file("toroid.png", NULL);
@@ -191,7 +191,7 @@ setup_canvas (GtkWidget *canvas)
 
 #if 0
 		  g_signal_connect (item, "motion_notify_event",
-				    (GtkSignalFunc) on_motion_notify, NULL);
+				    G_CALLBACK (on_motion_notify), NULL);
 #endif
 
 #ifdef USE_TEXT
@@ -279,7 +279,7 @@ create_canvas (void)
   gtk_widget_show (canvas);
 
   g_signal_connect (canvas, "expose_event",
-		    (GtkSignalFunc) on_expose_event, NULL);
+		    G_CALLBACK (on_expose_event), NULL);
 
   return canvas;
 }
@@ -306,7 +306,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 600);
   gtk_widget_show (window);
-  g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event,
+  g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
 		    NULL);
 
   scrolled_win = gtk_scrolled_window_new (NULL, NULL);
Index: goocanvas-0.10/demo/mv-simple-demo.c
===================================================================
--- goocanvas-0.10.orig/demo/mv-simple-demo.c
+++ goocanvas-0.10/demo/mv-simple-demo.c
@@ -27,7 +27,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 600);
   gtk_widget_show (window);
-  g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event,
+  g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
 		    NULL);
 
   scrolled_win = gtk_scrolled_window_new (NULL, NULL);
@@ -64,7 +64,7 @@ main (int argc, char *argv[])
   /* Connect a signal handler for the rectangle item. */
   rect_item = goo_canvas_get_item (GOO_CANVAS (canvas), rect_model);
   g_signal_connect (rect_item, "button_press_event",
-		    (GtkSignalFunc) on_rect_button_press, NULL);
+		    G_CALLBACK (on_rect_button_press), NULL);
 
   /* Pass control to the GTK+ main event loop. */
   gtk_main ();
Index: goocanvas-0.10/demo/mv-table-demo.c
===================================================================
--- goocanvas-0.10.orig/demo/mv-table-demo.c
+++ goocanvas-0.10/demo/mv-table-demo.c
@@ -227,7 +227,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 600);
   gtk_widget_show (window);
-  g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event,
+  g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
 		    NULL);
 
   vbox = gtk_vbox_new (FALSE, 4);
Index: goocanvas-0.10/demo/scalability-demo.c
===================================================================
--- goocanvas-0.10.orig/demo/scalability-demo.c
+++ goocanvas-0.10/demo/scalability-demo.c
@@ -92,7 +92,7 @@ setup_canvas (GtkWidget *canvas)
   root = goo_canvas_get_root_item (GOO_CANVAS (canvas));
 
   g_signal_connect (root, "motion_notify_event",
-		    (GtkSignalFunc) on_motion_notify, NULL);
+		    G_CALLBACK (on_motion_notify), NULL);
 
   g_object_set (G_OBJECT (root),
 		"font", "Sans 8",
@@ -190,7 +190,7 @@ setup_canvas (GtkWidget *canvas)
 
 #if 0
 		  g_signal_connect (item, "motion_notify_event",
-				    (GtkSignalFunc) on_motion_notify, NULL);
+				    G_CALLBACK (on_motion_notify), NULL);
 #endif
 
 #ifdef USE_TEXT
@@ -274,7 +274,7 @@ create_canvas (void)
   gtk_widget_show (canvas);
 
   g_signal_connect (canvas, "expose_event",
-		    (GtkSignalFunc) on_expose_event, NULL);
+		    G_CALLBACK (on_expose_event), NULL);
 
   return canvas;
 }
@@ -301,7 +301,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 600);
   gtk_widget_show (window);
-  g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event,
+  g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
 		    NULL);
 
   scrolled_win = gtk_scrolled_window_new (NULL, NULL);
Index: goocanvas-0.10/demo/simple-demo.c
===================================================================
--- goocanvas-0.10.orig/demo/simple-demo.c
+++ goocanvas-0.10/demo/simple-demo.c
@@ -26,7 +26,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 600);
   gtk_widget_show (window);
-  g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event,
+  g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
 		    NULL);
 
   scrolled_win = gtk_scrolled_window_new (NULL, NULL);
@@ -60,7 +60,7 @@ main (int argc, char *argv[])
 
   /* Connect a signal handler for the rectangle item. */
   g_signal_connect (rect_item, "button_press_event",
-		    (GtkSignalFunc) on_rect_button_press, NULL);
+		    G_CALLBACK (on_rect_button_press), NULL);
 
   /* Pass control to the GTK+ main event loop. */
   gtk_main ();
Index: goocanvas-0.10/demo/table-demo.c
===================================================================
--- goocanvas-0.10.orig/demo/table-demo.c
+++ goocanvas-0.10/demo/table-demo.c
@@ -219,7 +219,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 600);
   gtk_widget_show (window);
-  g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event,
+  g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
 		    NULL);
 
   vbox = gtk_vbox_new (FALSE, 4);
Index: goocanvas-0.10/demo/units-demo.c
===================================================================
--- goocanvas-0.10.orig/demo/units-demo.c
+++ goocanvas-0.10/demo/units-demo.c
@@ -49,7 +49,7 @@ setup_canvas (GtkWidget *canvas,
   item = goo_canvas_rect_new (root, d[0], d[1], d[2], d[3],
 			      NULL);
   g_signal_connect (item, "motion_notify_event",
-		    (GtkSignalFunc) on_motion_notify, NULL);
+		    G_CALLBACK (on_motion_notify), NULL);
 
   sprintf (buffer, "This box is %gx%g %s", d[2], d[3], units_name);
   sprintf (font_desc, "Sans %gpx", d[4]);
@@ -99,7 +99,7 @@ create_canvas (GtkUnit         units,
   adj = GTK_ADJUSTMENT (gtk_adjustment_new (1.00, 0.05, 100.00, 0.05, 0.50, 0.50));
   w = gtk_spin_button_new (adj, 0.0, 2);
   g_signal_connect (adj, "value_changed",
-		    (GtkSignalFunc) zoom_changed,
+		    G_CALLBACK (zoom_changed),
 		    canvas);
   gtk_widget_set_size_request (w, 50, -1);
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
@@ -147,7 +147,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 600);
   gtk_widget_show (window);
-  g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event,
+  g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
 		    NULL);
 
   notebook = gtk_notebook_new ();
Index: goocanvas-0.10/demo/widgets-demo.c
===================================================================
--- goocanvas-0.10.orig/demo/widgets-demo.c
+++ goocanvas-0.10/demo/widgets-demo.c
@@ -253,15 +253,15 @@ create_focus_box (GtkWidget     *canvas,
   g_object_set_data (G_OBJECT (item), "id", color);
 
   g_signal_connect (item, "focus_in_event",
-		    (GtkSignalFunc) on_focus_in, NULL);
+		    G_CALLBACK (on_focus_in), NULL);
   g_signal_connect (item, "focus_out_event",
-		    (GtkSignalFunc) on_focus_out, NULL);
+		    G_CALLBACK (on_focus_out), NULL);
 
   g_signal_connect (item, "button_press_event",
-		    (GtkSignalFunc) on_button_press, NULL);
+		    G_CALLBACK (on_button_press), NULL);
 
   g_signal_connect (item, "key_press_event",
-		    (GtkSignalFunc) on_key_press, NULL);
+		    G_CALLBACK (on_key_press), NULL);
 }
 
 
@@ -281,7 +281,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 600);
   gtk_widget_show (window);
-  g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event,
+  g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
 		    NULL);
 
   vbox = gtk_vbox_new (FALSE, 4);
@@ -296,27 +296,27 @@ main (int argc, char *argv[])
   w = gtk_button_new_with_label ("Add Widget");
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
-  g_signal_connect (w, "clicked", (GtkSignalFunc) add_widget_clicked, NULL);
+  g_signal_connect (w, "clicked", G_CALLBACK (add_widget_clicked), NULL);
 
   w = gtk_button_new_with_label ("Remove Widget");
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
-  g_signal_connect (w, "clicked", (GtkSignalFunc) remove_widget_clicked, NULL);
+  g_signal_connect (w, "clicked", G_CALLBACK (remove_widget_clicked), NULL);
 
   w = gtk_button_new_with_label ("Move Widget");
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
-  g_signal_connect (w, "clicked", (GtkSignalFunc) move_widget_clicked, NULL);
+  g_signal_connect (w, "clicked", G_CALLBACK (move_widget_clicked), NULL);
 
   w = gtk_button_new_with_label ("Change Anchor");
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
-  g_signal_connect (w, "clicked", (GtkSignalFunc) change_anchor_clicked, NULL);
+  g_signal_connect (w, "clicked", G_CALLBACK (change_anchor_clicked), NULL);
 
   w = gtk_button_new_with_label ("Change Widget");
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
-  g_signal_connect (w, "clicked", (GtkSignalFunc) change_widget_clicked, NULL);
+  g_signal_connect (w, "clicked", G_CALLBACK (change_widget_clicked), NULL);
 
   hbox = gtk_hbox_new (FALSE, 4);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
@@ -325,27 +325,27 @@ main (int argc, char *argv[])
   w = gtk_button_new_with_label ("Hide Canvas");
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
-  g_signal_connect (w, "clicked", (GtkSignalFunc) hide_canvas_clicked, NULL);
+  g_signal_connect (w, "clicked", G_CALLBACK (hide_canvas_clicked), NULL);
 
   w = gtk_button_new_with_label ("Show Canvas");
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
-  g_signal_connect (w, "clicked", (GtkSignalFunc) show_canvas_clicked, NULL);
+  g_signal_connect (w, "clicked", G_CALLBACK (show_canvas_clicked), NULL);
 
   w = gtk_button_new_with_label ("Hide Item");
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
-  g_signal_connect (w, "clicked", (GtkSignalFunc) hide_item_clicked, NULL);
+  g_signal_connect (w, "clicked", G_CALLBACK (hide_item_clicked), NULL);
 
   w = gtk_button_new_with_label ("Show Item");
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
-  g_signal_connect (w, "clicked", (GtkSignalFunc) show_item_clicked, NULL);
+  g_signal_connect (w, "clicked", G_CALLBACK (show_item_clicked), NULL);
 
   w = gtk_button_new_with_label ("Change Transform");
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
-  g_signal_connect (w, "clicked", (GtkSignalFunc) change_transform_clicked, NULL);
+  g_signal_connect (w, "clicked", G_CALLBACK (change_transform_clicked), NULL);
 
   scrolled_win = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win),

Places

File goocanvas-g_signal.patch of Package goocanvas (Revision 58d78e4be9a163918262fe52879aee26)

Places