diff --git a/ChangeLog b/ChangeLog index 605d71f6ce..bfbdb0659c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-08-19 Sven Neumann + + * gtk/gtktooltips.c + * tests/testtreesort.c + * tests/treestoretest.c: inserted some casts to get rid of compiler + warnings. + Sun Aug 19 01:44:44 2001 Jonathan Blandford > * gtk/gtktreeviewcolumn.c diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 605d71f6ce..bfbdb0659c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2001-08-19 Sven Neumann + + * gtk/gtktooltips.c + * tests/testtreesort.c + * tests/treestoretest.c: inserted some casts to get rid of compiler + warnings. + Sun Aug 19 01:44:44 2001 Jonathan Blandford > * gtk/gtktreeviewcolumn.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 605d71f6ce..bfbdb0659c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2001-08-19 Sven Neumann + + * gtk/gtktooltips.c + * tests/testtreesort.c + * tests/treestoretest.c: inserted some casts to get rid of compiler + warnings. + Sun Aug 19 01:44:44 2001 Jonathan Blandford > * gtk/gtktreeviewcolumn.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 605d71f6ce..bfbdb0659c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2001-08-19 Sven Neumann + + * gtk/gtktooltips.c + * tests/testtreesort.c + * tests/treestoretest.c: inserted some casts to get rid of compiler + warnings. + Sun Aug 19 01:44:44 2001 Jonathan Blandford > * gtk/gtktreeviewcolumn.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 605d71f6ce..bfbdb0659c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2001-08-19 Sven Neumann + + * gtk/gtktooltips.c + * tests/testtreesort.c + * tests/treestoretest.c: inserted some casts to get rid of compiler + warnings. + Sun Aug 19 01:44:44 2001 Jonathan Blandford > * gtk/gtktreeviewcolumn.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 605d71f6ce..bfbdb0659c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2001-08-19 Sven Neumann + + * gtk/gtktooltips.c + * tests/testtreesort.c + * tests/treestoretest.c: inserted some casts to get rid of compiler + warnings. + Sun Aug 19 01:44:44 2001 Jonathan Blandford > * gtk/gtktreeviewcolumn.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 605d71f6ce..bfbdb0659c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2001-08-19 Sven Neumann + + * gtk/gtktooltips.c + * tests/testtreesort.c + * tests/treestoretest.c: inserted some casts to get rid of compiler + warnings. + Sun Aug 19 01:44:44 2001 Jonathan Blandford > * gtk/gtktreeviewcolumn.c diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c index e7263bc63f..7ba764cbc9 100644 --- a/gtk/gtktooltips.c +++ b/gtk/gtktooltips.c @@ -359,7 +359,7 @@ gtk_tooltips_draw_tips (GtkTooltips * tooltips) else y = y + widget->allocation.height + 4; - gtk_window_move (tooltips->tip_window, x, y); + gtk_window_move (GTK_WINDOW (tooltips->tip_window), x, y); gtk_widget_show (tooltips->tip_window); } diff --git a/tests/testtreesort.c b/tests/testtreesort.c index 0e164996ce..41e9decc76 100644 --- a/tests/testtreesort.c +++ b/tests/testtreesort.c @@ -65,7 +65,7 @@ main (int argc, char *argv[]) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0); - model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + model = GTK_TREE_MODEL (gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING)); // gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model), 0, GTK_TREE_SORT_ASCENDING); g_print ("start model\n"); tree_view = gtk_tree_view_new_with_model (model); diff --git a/tests/treestoretest.c b/tests/treestoretest.c index 5f3b63ba06..700669aaad 100644 --- a/tests/treestoretest.c +++ b/tests/treestoretest.c @@ -59,21 +59,21 @@ iter_insert (GtkWidget *button, GtkTreeView *tree_view) GtkWidget *entry; GtkTreeIter iter; GtkTreeIter selected; - GtkTreeStore *model = gtk_tree_view_get_model (tree_view); + GtkTreeModel *model = gtk_tree_view_get_model (tree_view); entry = gtk_object_get_user_data (GTK_OBJECT (button)); if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)), NULL, &selected)) { - gtk_tree_store_insert (model, + gtk_tree_store_insert (GTK_TREE_STORE (model), &iter, &selected, atoi (gtk_entry_get_text (GTK_ENTRY (entry)))); } else { - gtk_tree_store_insert (model, + gtk_tree_store_insert (GTK_TREE_STORE (model), &iter, NULL, atoi (gtk_entry_get_text (GTK_ENTRY (entry)))); @@ -87,20 +87,20 @@ iter_insert_before (GtkWidget *button, GtkTreeView *tree_view) { GtkTreeIter iter; GtkTreeIter selected; - GtkTreeStore *model = gtk_tree_view_get_model (tree_view); + GtkTreeModel *model = gtk_tree_view_get_model (tree_view); if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)), NULL, &selected)) { - gtk_tree_store_insert_before (model, + gtk_tree_store_insert_before (GTK_TREE_STORE (model), &iter, NULL, &selected); } else { - gtk_tree_store_insert_before (model, + gtk_tree_store_insert_before (GTK_TREE_STORE (model), &iter, NULL, NULL); @@ -114,7 +114,7 @@ iter_insert_after (GtkWidget *button, GtkTreeView *tree_view) { GtkTreeIter iter; GtkTreeIter selected; - GtkTreeStore *model = gtk_tree_view_get_model (tree_view); + GtkTreeModel *model = gtk_tree_view_get_model (tree_view); if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)), NULL, @@ -122,7 +122,7 @@ iter_insert_after (GtkWidget *button, GtkTreeView *tree_view) { if (GTK_IS_TREE_STORE (model)) { - gtk_tree_store_insert_after (model, + gtk_tree_store_insert_after (GTK_TREE_STORE (model), &iter, NULL, &selected); @@ -133,7 +133,7 @@ iter_insert_after (GtkWidget *button, GtkTreeView *tree_view) { if (GTK_IS_TREE_STORE (model)) { - gtk_tree_store_insert_after (model, + gtk_tree_store_insert_after (GTK_TREE_STORE (model), &iter, NULL, NULL); @@ -177,7 +177,7 @@ iter_append (GtkWidget *button, GtkTreeView *tree_view) { GtkTreeIter iter; GtkTreeIter selected; - GtkTreeStore *model = gtk_tree_view_get_model (tree_view); + GtkTreeModel *model = gtk_tree_view_get_model (tree_view); if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)), NULL, @@ -185,7 +185,7 @@ iter_append (GtkWidget *button, GtkTreeView *tree_view) { if (GTK_IS_TREE_STORE (model)) { - gtk_tree_store_append (model, &iter, &selected); + gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &selected); node_set (&iter); } } @@ -193,7 +193,7 @@ iter_append (GtkWidget *button, GtkTreeView *tree_view) { if (GTK_IS_TREE_STORE (model)) { - gtk_tree_store_append (model, &iter, NULL); + gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL); node_set (&iter); } } @@ -263,11 +263,12 @@ make_window (gint view_type) /* buttons */ button = gtk_button_new_with_label ("gtk_tree_store_remove"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (selection), - "changed", - selection_changed, + g_signal_connect (G_OBJECT (selection), "changed", + G_CALLBACK (selection_changed), button); - gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_remove, tree_view); + gtk_signal_connect (GTK_OBJECT (button), "clicked", + GTK_SIGNAL_FUNC (iter_remove), + tree_view); gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_with_label ("gtk_tree_store_insert"); @@ -277,34 +278,42 @@ make_window (gint view_type) gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); gtk_object_set_user_data (GTK_OBJECT (button), entry); - gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_insert, tree_view); + gtk_signal_connect (GTK_OBJECT (button), "clicked", + GTK_SIGNAL_FUNC (iter_insert), + tree_view); button = gtk_button_new_with_label ("gtk_tree_store_insert_before"); 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_connect (G_OBJECT (selection), - "changed", - selection_changed, + gtk_signal_connect (GTK_OBJECT (button), "clicked", + GTK_SIGNAL_FUNC (iter_insert_before), + tree_view); + g_signal_connect (G_OBJECT (selection), "changed", + G_CALLBACK (selection_changed), button); gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_with_label ("gtk_tree_store_insert_after"); 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_connect (G_OBJECT (selection), - "changed", - selection_changed, + gtk_signal_connect (GTK_OBJECT (button), "clicked", + GTK_SIGNAL_FUNC (iter_insert_after), + tree_view); + g_signal_connect (G_OBJECT (selection), "changed", + G_CALLBACK (selection_changed), button); gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_with_label ("gtk_tree_store_prepend"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_prepend, tree_view); + gtk_signal_connect (GTK_OBJECT (button), "clicked", + GTK_SIGNAL_FUNC (iter_prepend), + tree_view); button = gtk_button_new_with_label ("gtk_tree_store_append"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_append, tree_view); + gtk_signal_connect (GTK_OBJECT (button), "clicked", + GTK_SIGNAL_FUNC (iter_append), + tree_view); /* The selected column */ cell = gtk_cell_renderer_text_new ();