diff options
author | Tim Janik <timj@gtk.org> | 2001-06-28 17:12:40 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 2001-06-28 17:12:40 +0000 |
commit | 10f047cf4ce86b7ff32050279214faac3c294f11 (patch) | |
tree | 0ac0c649284a19fb3d6a4c32dd458ce42b4b6f62 /tests | |
parent | cd3ddf900fe4c392ba864bd6d12d914de211114a (diff) | |
download | gtk+-10f047cf4ce86b7ff32050279214faac3c294f11.tar.gz |
up version to 1.3.7, interface age 0, binary age 0. depend on glib 1.3.7.
Thu Jun 28 17:18:41 2001 Tim Janik <timj@gtk.org>
* configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
age 0, binary age 0. depend on glib 1.3.7.
* gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
* gtk/gtkmenubar.c: same here.
* gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
* gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
* gtk/gtkentry.c (gtk_entry_focus_in): same here.
* gtk/gtkmenubar.c (add_to_window): likewise.
* gtk/gtktextbtree.c: and here...
* gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
* gtk/gtktoolbar.c (gtk_toolbar_init): once more.
* gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
* gtk/gtktreeviewcolumn.c:
(_gtk_tree_view_column_set_tree_view): yet again.
* demos/gtk-demo/images.c (progressive_timeout): demonstrate
signal connections without g_signal_connect_data().
* demos/gtk-demo/stock_browser.c (do_stock_browser): second
demo of the matter.
* demos/testpixbuf.c (main): running out of equality phrases for the
ChangeLog, but had to adapt connections here as well.
* demos/testanimation.c (progressive_timeout): and for the fun of it,
tackled this the same way.
* tests/testtext.c (create_view): ok, it's becoming a pain at this
point, but had enough enery for one more fix.
* tests/testtreecolumns.c (main): stand up man, do your work!
* tests/testtreeview.c (set_columns_type): ok, this is the last file i
fix, either that's been all of it or CVS gtk is broken yet again.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.am | 1 | ||||
-rw-r--r-- | tests/prop-editor.c | 2 | ||||
-rw-r--r-- | tests/testtext.c | 16 | ||||
-rw-r--r-- | tests/testtreecolumns.c | 6 | ||||
-rw-r--r-- | tests/testtreefocus.c | 10 | ||||
-rw-r--r-- | tests/testtreeview.c | 21 |
6 files changed, 25 insertions, 31 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 3271380abb..061f07133e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -77,7 +77,6 @@ testtext_LDADD = $(LDADDS) treestoretest_LDADD = $(LDADDS) testgtk_SOURCES = \ - prop-editor.c \ testgtk.c testtreeview_SOURCES = \ diff --git a/tests/prop-editor.c b/tests/prop-editor.c index 701bde8030..353ac79c1a 100644 --- a/tests/prop-editor.c +++ b/tests/prop-editor.c @@ -124,7 +124,7 @@ connect_controller (GObject *controller, p->modified_id = g_signal_connect_data (controller, signal, func, p, (GClosureNotify)free_object_property, - FALSE, FALSE); + 0); g_object_set_data (controller, "object-property", p); } diff --git a/tests/testtext.c b/tests/testtext.c index c0b171454e..8a348be36d 100644 --- a/tests/testtext.c +++ b/tests/testtext.c @@ -390,10 +390,10 @@ tag_event_handler (GtkTextTag *tag, GtkWidget *widget, GdkEvent *event, static void setup_tag (GtkTextTag *tag) { - g_signal_connect_data (G_OBJECT (tag), - "event", - G_CALLBACK (tag_event_handler), - NULL, NULL, FALSE, FALSE); + g_signal_connect (G_OBJECT (tag), + "event", + G_CALLBACK (tag_event_handler), + NULL); } static const char *book_closed_xpm[] = { @@ -2187,10 +2187,10 @@ create_view (Buffer *buffer) GTK_SIGNAL_FUNC (tab_stops_expose), NULL); - g_signal_connect_data (G_OBJECT (view->buffer->buffer), - "mark_set", - GTK_SIGNAL_FUNC (cursor_set_callback), - view->text_view, NULL, FALSE, FALSE); + g_signal_connect (G_OBJECT (view->buffer->buffer), + "mark_set", + GTK_SIGNAL_FUNC (cursor_set_callback), + view->text_view); /* Draw line numbers in the side windows; we should really be * more scientific about what width we set them to. diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c index 57016124c5..10cdbb0ced 100644 --- a/tests/testtreecolumns.c +++ b/tests/testtreecolumns.c @@ -604,7 +604,7 @@ main (int argc, char *argv[]) gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (left_tree_view), -1, "Unattached Columns", cell, "text", 0, NULL); cell = gtk_cell_renderer_toggle_new (); - g_signal_connect_data (G_OBJECT (cell), "toggled", (GCallback) set_visible, left_tree_view, NULL, FALSE, FALSE); + g_signal_connect (G_OBJECT (cell), "toggled", (GCallback) set_visible, left_tree_view); column = gtk_tree_view_column_new_with_attributes ("Visible", cell, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (left_tree_view), column); g_object_unref (G_OBJECT (column)); @@ -665,7 +665,7 @@ main (int argc, char *argv[]) gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (top_right_tree_view), -1, NULL, cell, "text", 0, NULL); cell = gtk_cell_renderer_toggle_new (); - g_signal_connect_data (G_OBJECT (cell), "toggled", (GCallback) set_visible, top_right_tree_view, NULL, FALSE, FALSE); + g_signal_connect (G_OBJECT (cell), "toggled", (GCallback) set_visible, top_right_tree_view); column = gtk_tree_view_column_new_with_attributes (NULL, cell, NULL); gtk_tree_view_column_set_cell_data_func (column, cell, get_visible, NULL, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (top_right_tree_view), column); @@ -680,7 +680,7 @@ main (int argc, char *argv[]) gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (bottom_right_tree_view), -1, NULL, cell, "text", 0, NULL); cell = gtk_cell_renderer_toggle_new (); - g_signal_connect_data (G_OBJECT (cell), "toggled", (GCallback) set_visible, bottom_right_tree_view, NULL, FALSE, FALSE); + g_signal_connect (G_OBJECT (cell), "toggled", (GCallback) set_visible, bottom_right_tree_view); column = gtk_tree_view_column_new_with_attributes (NULL, cell, NULL); gtk_tree_view_column_set_cell_data_func (column, cell, get_visible, NULL, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (bottom_right_tree_view), column); diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c index 5d3bf49d84..854c3f84ad 100644 --- a/tests/testtreefocus.c +++ b/tests/testtreefocus.c @@ -342,7 +342,7 @@ main (int argc, char *argv[]) /* Alex Column */ renderer = gtk_cell_renderer_toggle_new (); - g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (alex_toggled), model, NULL, FALSE, FALSE); + g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (alex_toggled), model); g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL); col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), @@ -360,7 +360,7 @@ main (int argc, char *argv[]) /* Havoc Column */ renderer = gtk_cell_renderer_toggle_new (); - g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (havoc_toggled), model, NULL, FALSE, FALSE); + g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (havoc_toggled), model); g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL); col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), @@ -377,7 +377,7 @@ main (int argc, char *argv[]) /* Tim Column */ renderer = gtk_cell_renderer_toggle_new (); - g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (tim_toggled), model, NULL, FALSE, FALSE); + g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (tim_toggled), model); g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL); col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), @@ -395,7 +395,7 @@ main (int argc, char *argv[]) /* Owen Column */ renderer = gtk_cell_renderer_toggle_new (); - g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (owen_toggled), model, NULL, FALSE, FALSE); + g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (owen_toggled), model); g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL); col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), -1, "Owen", @@ -411,7 +411,7 @@ main (int argc, char *argv[]) /* Owen Column */ renderer = gtk_cell_renderer_toggle_new (); - g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (dave_toggled), model, NULL, FALSE, FALSE); + g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (dave_toggled), model); g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL); col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), -1, "Dave", diff --git a/tests/testtreeview.c b/tests/testtreeview.c index 204d4574b2..f26c462dbf 100644 --- a/tests/testtreeview.c +++ b/tests/testtreeview.c @@ -159,13 +159,10 @@ static void setup_column (GtkTreeViewColumn *col) { gtk_tree_view_column_set_clickable (col, TRUE); - g_signal_connect_data (G_OBJECT (col), - "clicked", - (GCallback) col_clicked_cb, - NULL, - NULL, - FALSE, - FALSE); + g_signal_connect (G_OBJECT (col), + "clicked", + (GCallback) col_clicked_cb, + NULL); } static void @@ -302,9 +299,8 @@ set_columns_type (GtkTreeView *tree_view, ColumnsType type) rend = gtk_cell_renderer_toggle_new (); - g_signal_connect_data (G_OBJECT (rend), "toggled", - GTK_SIGNAL_FUNC (toggled_callback), tree_view, - NULL, FALSE, FALSE); + g_signal_connect (G_OBJECT (rend), "toggled", + GTK_SIGNAL_FUNC (toggled_callback), tree_view); col = gtk_tree_view_column_new_with_attributes ("Column 3", rend, @@ -335,9 +331,8 @@ set_columns_type (GtkTreeView *tree_view, ColumnsType type) */ g_object_set (G_OBJECT (rend), "radio", TRUE, NULL); - g_signal_connect_data (G_OBJECT (rend), "toggled", - G_CALLBACK (toggled_callback), tree_view, - NULL, FALSE, FALSE); + g_signal_connect (G_OBJECT (rend), "toggled", + G_CALLBACK (toggled_callback), tree_view); col = gtk_tree_view_column_new_with_attributes ("Column 4", rend, |