diff options
| author | Owen Taylor <otaylor@src.gnome.org> | 2001-10-20 23:39:32 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-10-20 23:39:32 +0000 |
| commit | 58b5405bd23efa039d3f0879fa5521f3c6bd222f (patch) | |
| tree | a11783a7f05ea52a93c4590aa73eb6fb789b549f /demos/gtk-demo/menus.c | |
| parent | 88c9fe3815c4ea177e2aba24e4e0957b7107ff22 (diff) | |
| download | gtk+-58b5405bd23efa039d3f0879fa5521f3c6bd222f.tar.gz | |
at Oct 20 19:38:16 2001 Owen Taylor <otaylor@redhat.com>
* demos/*.c demos/gdk-pixbuf/*.c: Eliminate gtk_signal_*
in favor of g_signal_*, gtk_object_* in favor of
g_object_*.
Diffstat (limited to 'demos/gtk-demo/menus.c')
| -rw-r--r-- | demos/gtk-demo/menus.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/demos/gtk-demo/menus.c b/demos/gtk-demo/menus.c index 6dba405d78..99899a7d32 100644 --- a/demos/gtk-demo/menus.c +++ b/demos/gtk-demo/menus.c @@ -92,12 +92,10 @@ do_menus (void) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_signal_connect (GTK_OBJECT (window), "destroy", - GTK_SIGNAL_FUNC(gtk_widget_destroyed), - &window); - gtk_signal_connect (GTK_OBJECT (window), "delete-event", - GTK_SIGNAL_FUNC (gtk_true), - NULL); + g_signal_connect (window, "destroy", + G_CALLBACK(gtk_widget_destroyed), &window); + g_signal_connect (window, "delete-event", + G_CALLBACK (gtk_true), NULL); accel_group = gtk_accel_group_new (); gtk_accel_group_attach (accel_group, G_OBJECT (window)); @@ -195,9 +193,8 @@ do_menus (void) gtk_widget_show (box2); button = gtk_button_new_with_label ("close"); - gtk_signal_connect_object (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC(gtk_widget_destroy), - GTK_OBJECT (window)); + g_signal_connect_swapped (button, "clicked", + G_CALLBACK(gtk_widget_destroy), window); gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_widget_grab_default (button); |