finish conversion to g_signal_* functions by using G_OBJECT and G_CALLBACK

2002-02-19  Sven Neumann  <sven@gimp.org>

	* examples/*/*.c: finish conversion to g_signal_* functions by
	using G_OBJECT and G_CALLBACK and other assorted changes.

1 files changed, 32 insertions, 32 deletions

diff --git a/examples/tree/tree.c b/examples/tree/tree.c
index 5eb57c53c1..c17165cd58 100644
--- a/examples/tree/tree.c
+++ b/examples/tree/tree.c
@@ -72,8 +72,8 @@ int main( int   argc,
 
   /* a generic toplevel window */
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_signal_connect (GTK_OBJECT (window), "delete_event",
-		      GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+  g_signal_connect (G_OBJECT (window), "delete_event",
+                    G_CALLBACK (gtk_main_quit), NULL);
   gtk_container_set_border_width (GTK_CONTAINER (window), 5);
 
   /* A generic scrolled window */
@@ -89,12 +89,12 @@ int main( int   argc,
   tree = gtk_tree_new ();
   g_print ("root tree is %p\n", tree);
   /* connect all GtkTree:: signals */
-  gtk_signal_connect (GTK_OBJECT (tree), "select_child",
-		      GTK_SIGNAL_FUNC (cb_select_child), tree);
-  gtk_signal_connect (GTK_OBJECT (tree), "unselect_child",
-		      GTK_SIGNAL_FUNC (cb_unselect_child), tree);
-  gtk_signal_connect (GTK_OBJECT(tree), "selection_changed",
-		      GTK_SIGNAL_FUNC(cb_selection_changed), tree);
+  g_signal_connect (G_OBJECT (tree), "select_child",
+                    G_CALLBACK (cb_select_child), tree);
+  g_signal_connect (G_OBJECT (tree), "unselect_child",
+                    G_CALLBACK (cb_unselect_child), tree);
+  g_signal_connect (G_OBJECT(tree), "selection_changed",
+                    G_CALLBACK(cb_selection_changed), tree);
   /* Add it to the scrolled window */
   gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win),
                                          tree);
@@ -111,16 +111,16 @@ int main( int   argc,
     /* Create a tree item */
     item = gtk_tree_item_new_with_label (itemnames[i]);
     /* Connect all GtkItem:: and GtkTreeItem:: signals */
-    gtk_signal_connect (GTK_OBJECT (item), "select",
-			GTK_SIGNAL_FUNC (cb_itemsignal), "select");
-    gtk_signal_connect (GTK_OBJECT (item), "deselect",
-			GTK_SIGNAL_FUNC (cb_itemsignal), "deselect");
-    gtk_signal_connect (GTK_OBJECT (item), "toggle",
-			GTK_SIGNAL_FUNC (cb_itemsignal), "toggle");
-    gtk_signal_connect (GTK_OBJECT (item), "expand",
-			GTK_SIGNAL_FUNC (cb_itemsignal), "expand");
-    gtk_signal_connect (GTK_OBJECT (item), "collapse",
-			GTK_SIGNAL_FUNC (cb_itemsignal), "collapse");
+    g_signal_connect (G_OBJECT (item), "select",
+                      G_CALLBACK (cb_itemsignal), "select");
+    g_signal_connect (G_OBJECT (item), "deselect",
+                      G_CALLBACK (cb_itemsignal), "deselect");
+    g_signal_connect (G_OBJECT (item), "toggle",
+                      G_CALLBACK (cb_itemsignal), "toggle");
+    g_signal_connect (G_OBJECT (item), "expand",
+                      G_CALLBACK (cb_itemsignal), "expand");
+    g_signal_connect (G_OBJECT (item), "collapse",
+                      G_CALLBACK (cb_itemsignal), "collapse");
     /* Add it to the parent tree */
     gtk_tree_append (GTK_TREE (tree), item);
     /* Show it - this can be done at any time */
@@ -133,10 +133,10 @@ int main( int   argc,
     /* This is still necessary if you want these signals to be called
        for the subtree's children.  Note that selection_change will be 
        signalled for the root tree regardless. */
-    gtk_signal_connect (GTK_OBJECT (subtree), "select_child",
-			GTK_SIGNAL_FUNC (cb_select_child), subtree);
-    gtk_signal_connect (GTK_OBJECT (subtree), "unselect_child",
-			GTK_SIGNAL_FUNC (cb_unselect_child), subtree);
+    g_signal_connect (G_OBJECT (subtree), "select_child",
+			G_CALLBACK (cb_select_child), subtree);
+    g_signal_connect (G_OBJECT (subtree), "unselect_child",
+			G_CALLBACK (cb_unselect_child), subtree);
     /* This has absolutely no effect, because it is completely ignored 
        in subtrees */
     gtk_tree_set_selection_mode (GTK_TREE (subtree),
@@ -156,16 +156,16 @@ int main( int   argc,
       /* Create a subtree item, in much the same way */
       subitem = gtk_tree_item_new_with_label (itemnames[j]);
       /* Connect all GtkItem:: and GtkTreeItem:: signals */
-      gtk_signal_connect (GTK_OBJECT (subitem), "select",
-			  GTK_SIGNAL_FUNC (cb_itemsignal), "select");
-      gtk_signal_connect (GTK_OBJECT (subitem), "deselect",
-			  GTK_SIGNAL_FUNC (cb_itemsignal), "deselect");
-      gtk_signal_connect (GTK_OBJECT (subitem), "toggle",
-			  GTK_SIGNAL_FUNC (cb_itemsignal), "toggle");
-      gtk_signal_connect (GTK_OBJECT (subitem), "expand",
-			  GTK_SIGNAL_FUNC (cb_itemsignal), "expand");
-      gtk_signal_connect (GTK_OBJECT (subitem), "collapse",
-			  GTK_SIGNAL_FUNC (cb_itemsignal), "collapse");
+      g_signal_connect (G_OBJECT (subitem), "select",
+			  G_CALLBACK (cb_itemsignal), "select");
+      g_signal_connect (G_OBJECT (subitem), "deselect",
+			  G_CALLBACK (cb_itemsignal), "deselect");
+      g_signal_connect (G_OBJECT (subitem), "toggle",
+			  G_CALLBACK (cb_itemsignal), "toggle");
+      g_signal_connect (G_OBJECT (subitem), "expand",
+			  G_CALLBACK (cb_itemsignal), "expand");
+      g_signal_connect (G_OBJECT (subitem), "collapse",
+			  G_CALLBACK (cb_itemsignal), "collapse");
       g_print ("-> -> item %s->%p\n", itemnames[j], subitem);
       /* Add it to its parent tree */
       gtk_tree_append (GTK_TREE (subtree), subitem);