diff options
| author | Manish Singh <yosh@gimp.org> | 2002-10-07 19:10:39 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 2002-10-07 19:10:39 +0000 |
| commit | 55704fc7c1b5429bf8cc7e8100893b01898a9fe8 (patch) | |
| tree | 10a62005decc56928e7d5730c7f84691796b8a40 /gtk/gtktreeselection.c | |
| parent | c1fff202edabc843327c94d35ad5f2da977f9957 (diff) | |
| download | gtk+-55704fc7c1b5429bf8cc7e8100893b01898a9fe8.tar.gz | |
Deprecation cleanup
Mon Oct 7 11:59:33 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkliststore.[ch] gtk/gtktreedatalist.[ch] gtk/gtktreednd.c
gtk/gtktreemodel.[ch] gtk/gtktreemodelsort.[ch]
gtk/gtktreeselection.[ch] gtk/gtktreesortable.[ch]
gtk/gtktreestore.[ch]: Deprecation cleanup
Diffstat (limited to 'gtk/gtktreeselection.c')
| -rw-r--r-- | gtk/gtktreeselection.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c index 88df17bcba..40546838c5 100644 --- a/gtk/gtktreeselection.c +++ b/gtk/gtktreeselection.c @@ -21,7 +21,6 @@ #include "gtktreeprivate.h" #include "gtkrbtree.h" #include "gtkmarshalers.h" -#include "gtksignal.h" static void gtk_tree_selection_init (GtkTreeSelection *selection); static void gtk_tree_selection_class_init (GtkTreeSelectionClass *class); @@ -43,10 +42,10 @@ enum static GObjectClass *parent_class = NULL; static guint tree_selection_signals [LAST_SIGNAL] = { 0 }; -GtkType +GType gtk_tree_selection_get_type (void) { - static GtkType selection_type = 0; + static GType selection_type = 0; if (!selection_type) { @@ -63,7 +62,9 @@ gtk_tree_selection_get_type (void) (GInstanceInitFunc) gtk_tree_selection_init }; - selection_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeSelection", &selection_info, 0); + selection_type = + g_type_register_static (G_TYPE_OBJECT, "GtkTreeSelection", + &selection_info, 0); } return selection_type; @@ -81,12 +82,13 @@ gtk_tree_selection_class_init (GtkTreeSelectionClass *class) class->changed = NULL; tree_selection_signals[CHANGED] = - gtk_signal_new ("changed", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkTreeSelectionClass, changed), - _gtk_marshal_VOID__VOID, - GTK_TYPE_NONE, 0); + g_signal_new ("changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GtkTreeSelectionClass, changed), + NULL, NULL, + _gtk_marshal_VOID__VOID, + G_TYPE_NONE, 0); } static void @@ -125,7 +127,7 @@ _gtk_tree_selection_new (void) { GtkTreeSelection *selection; - selection = GTK_TREE_SELECTION (g_object_new (GTK_TYPE_TREE_SELECTION, NULL)); + selection = g_object_new (GTK_TYPE_TREE_SELECTION, NULL); return selection; } @@ -966,7 +968,7 @@ gtk_tree_selection_select_all (GtkTreeSelection *selection) g_return_if_fail (selection->type == GTK_SELECTION_MULTIPLE); if (gtk_tree_selection_real_select_all (selection)) - g_signal_emit (G_OBJECT (selection), tree_selection_signals[CHANGED], 0); + g_signal_emit (selection, tree_selection_signals[CHANGED], 0); } static void @@ -1069,7 +1071,7 @@ gtk_tree_selection_unselect_all (GtkTreeSelection *selection) return; if (gtk_tree_selection_real_unselect_all (selection)) - g_signal_emit (G_OBJECT (selection), tree_selection_signals[CHANGED], 0); + g_signal_emit (selection, tree_selection_signals[CHANGED], 0); } enum @@ -1170,7 +1172,7 @@ gtk_tree_selection_select_range (GtkTreeSelection *selection, g_return_if_fail (selection->tree_view != NULL); if (gtk_tree_selection_real_modify_range (selection, RANGE_SELECT, start_path, end_path)) - g_signal_emit (G_OBJECT (selection), tree_selection_signals[CHANGED], 0); + g_signal_emit (selection, tree_selection_signals[CHANGED], 0); } /** @@ -1191,7 +1193,7 @@ gtk_tree_selection_unselect_range (GtkTreeSelection *selection, g_return_if_fail (selection->tree_view != NULL); if (gtk_tree_selection_real_modify_range (selection, RANGE_UNSELECT, start_path, end_path)) - g_signal_emit (G_OBJECT (selection), tree_selection_signals[CHANGED], 0); + g_signal_emit (selection, tree_selection_signals[CHANGED], 0); } /* Called internally by gtktreeview.c It handles actually selecting the tree. @@ -1342,7 +1344,7 @@ _gtk_tree_selection_internal_select_node (GtkTreeSelection *selection, gtk_tree_path_free (anchor_path); if (dirty) - g_signal_emit (G_OBJECT (selection), tree_selection_signals[CHANGED], 0); + g_signal_emit (selection, tree_selection_signals[CHANGED], 0); } /* NOTE: Any {un,}selection ever done _MUST_ be done through this function! |