Now it's a GObject instead of a GtkObject. The

Thu Jun  7 18:25:42 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeselection.c: Now it's a GObject instead of a
	GtkObject.  The GtkTreeSelection::selection_changed signal is now
	the GtkTreeSelection::changed signal.

	* gtk/gtktreeview.c: Modified to deal with new GtkTreeSelection
	object.

	* tests/gtktree*.c: Modified to deal with new GtkTreeSelection
	object.

6 files changed, 20 insertions, 24 deletions

diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
index e868ac7041..34effbf1e5 100644
--- a/gtk/gtktreeselection.c
+++ b/gtk/gtktreeselection.c
@@ -35,11 +35,11 @@ static gint gtk_tree_selection_real_select_node  (GtkTreeSelection      *selecti
 
 enum
 {
-  SELECTION_CHANGED,
+  CHANGED,
   LAST_SIGNAL
 };
 
-static GtkObjectClass *parent_class = NULL;
+static GObjectClass *parent_class = NULL;
 static guint tree_selection_signals[LAST_SIGNAL] = { 0 };
 
 GtkType
@@ -62,7 +62,7 @@ gtk_tree_selection_get_type (void)
         (GInstanceInitFunc) gtk_tree_selection_init
       };
 
-      selection_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkTreeSelection", &selection_info, 0);
+      selection_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeSelection", &selection_info, 0);
     }
 
   return selection_type;
@@ -77,13 +77,13 @@ gtk_tree_selection_class_init (GtkTreeSelectionClass *class)
   parent_class = g_type_class_peek_parent (class);
 
   object_class->finalize = gtk_tree_selection_finalize;
-  class->selection_changed = NULL;
+  class->changed = NULL;
 
-  tree_selection_signals[SELECTION_CHANGED] =
-    gtk_signal_new ("selection_changed",
+  tree_selection_signals[CHANGED] =
+    gtk_signal_new ("changed",
 		    GTK_RUN_FIRST,
 		    GTK_CLASS_TYPE (object_class),
-		    GTK_SIGNAL_OFFSET (GtkTreeSelectionClass, selection_changed),
+		    GTK_SIGNAL_OFFSET (GtkTreeSelectionClass, changed),
 		    gtk_marshal_VOID__VOID,
 		    GTK_TYPE_NONE, 0);
 }
@@ -114,7 +114,7 @@ _gtk_tree_selection_new (void)
 {
   GtkTreeSelection *selection;
 
-  selection = GTK_TREE_SELECTION (gtk_type_new (GTK_TYPE_TREE_SELECTION));
+  selection = GTK_TREE_SELECTION (g_object_new (GTK_TYPE_TREE_SELECTION, NULL));
 
   return selection;
 }
@@ -649,7 +649,7 @@ gtk_tree_selection_select_all (GtkTreeSelection *selection)
   g_return_if_fail (selection->type != GTK_TREE_SELECTION_MULTI);
 
   if (gtk_tree_selection_real_select_all (selection))
-    gtk_signal_emit (GTK_OBJECT (selection), tree_selection_signals[SELECTION_CHANGED]);
+    g_signal_emit (G_OBJECT (selection), tree_selection_signals[CHANGED], 0);
 }
 
 static void
@@ -750,7 +750,7 @@ gtk_tree_selection_unselect_all (GtkTreeSelection *selection)
     return;
 
   if (gtk_tree_selection_real_unselect_all (selection))
-    gtk_signal_emit (GTK_OBJECT (selection), tree_selection_signals[SELECTION_CHANGED]);
+    g_signal_emit (G_OBJECT (selection), tree_selection_signals[CHANGED], 0);
 }
 
 static gint
@@ -861,7 +861,7 @@ gtk_tree_selection_select_range (GtkTreeSelection *selection,
   g_return_if_fail (selection->tree_view != NULL);
 
   if (gtk_tree_selection_real_select_range (selection, start_path, end_path))
-    gtk_signal_emit (GTK_OBJECT (selection), tree_selection_signals[SELECTION_CHANGED]);
+    gtk_signal_emit (G_OBJECT (selection), tree_selection_signals[CHANGED], 0);
 }
 
 /* Called internally by gtktreeview.c It handles actually selecting the tree.
@@ -977,7 +977,7 @@ _gtk_tree_selection_internal_select_node (GtkTreeSelection *selection,
     gtk_tree_path_free (anchor_path);
 
   if (dirty)
-    gtk_signal_emit (GTK_OBJECT (selection), tree_selection_signals[SELECTION_CHANGED]);
+    g_signal_emit (G_OBJECT (selection), tree_selection_signals[CHANGED], 0);
 }
 
 /* NOTE: Any {un,}selection ever done _MUST_ be done through this function!
diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index 104cb73dfa..f89f96948d 100644
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -50,7 +50,7 @@ typedef void (* GtkTreeSelectionForeachFunc) (GtkTreeModel      *model,
 
 struct _GtkTreeSelection
 {
-  GtkObject parent;
+  GObject parent;
 
   /*< private >*/
   
@@ -63,9 +63,9 @@ struct _GtkTreeSelection
 
 struct _GtkTreeSelectionClass
 {
-  GtkObjectClass parent_class;
+  GObjectClass parent_class;
 
-  void (* selection_changed) (GtkTreeView *tree_view);
+  void (* changed) (GtkTreeView *tree_view);
 };
 
 
diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index cc7c17835b..e7753b1277 100644
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -234,7 +234,7 @@ gtk_tree_store_init (GtkTreeStore *tree_store)
 GtkTreeStore *
 gtk_tree_store_new (void)
 {
-  return GTK_TREE_STORE (g_object_new (gtk_tree_store_get_type (), NULL));
+  return GTK_TREE_STORE (g_object_new (GTK_TYPE_TREE_STORE, NULL));
 }
 
 GtkTreeStore *
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 69b689dde7..c17b6f93b0 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -4343,8 +4343,7 @@ gtk_tree_view_deleted (GtkTreeModel *model,
 	{
 	  if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED) &&
               tree_view->priv->selection)
-	    gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->selection),
-				     "selection_changed");
+	    g_signal_emit_by_name (G_OBJECT (tree_view->priv->selection), "changed");
 	}
 
       if (anchor_path)
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 572d8949a9..aebac87811 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -202,9 +202,6 @@ gboolean                gtk_tree_view_column_cell_event          (GtkTreeViewCol
 								  guint                    flags);
 
 
-
-
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/gtk/treestoretest.c b/gtk/treestoretest.c
index 710954ba5a..f7b9827bc4 100644
--- a/gtk/treestoretest.c
+++ b/gtk/treestoretest.c
@@ -274,7 +274,7 @@ make_window (gint view_type)
   button = gtk_button_new_with_label ("gtk_tree_store_remove");
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   g_signal_connectc (G_OBJECT (selection),
-		     "selection_changed",
+		     "changed",
 		     selection_changed,
 		     button, FALSE);
   gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_remove, tree_view);
@@ -294,7 +294,7 @@ make_window (gint view_type)
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_insert_before, tree_view);
   g_signal_connectc (G_OBJECT (selection),
-		     "selection_changed",
+		     "changed",
 		     selection_changed,
 		     button, FALSE);
   gtk_widget_set_sensitive (button, FALSE);
@@ -303,7 +303,7 @@ make_window (gint view_type)
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_insert_after, tree_view);
   g_signal_connectc (GTK_OBJECT (selection),
-		     "selection_changed",
+		     "changed",
 		     selection_changed,
 		     button, FALSE);
   gtk_widget_set_sensitive (button, FALSE);