diff options
| author | Sven Neumann <sven@gimp.org> | 2002-02-19 19:47:16 +0000 |
|---|---|---|
| committer | Sven Neumann <neo@src.gnome.org> | 2002-02-19 19:47:16 +0000 |
| commit | 6dea3cae13ddf8a5e882fe8296678bb7be2a94d8 (patch) | |
| tree | a40a07c80c406c91894e38064e6ec1ea559ef178 /examples/entry | |
| parent | 601302c7a308664c09bc5ee2e23621b34747a252 (diff) | |
| download | gdk-pixbuf-6dea3cae13ddf8a5e882fe8296678bb7be2a94d8.tar.gz | |
finish conversion to g_signal_* functions by using G_OBJECT and G_CALLBACK
2002-02-19 Sven Neumann <sven@gimp.org>
* examples/*/*.c: finish conversion to g_signal_* functions by
using G_OBJECT and G_CALLBACK and other assorted changes.
Diffstat (limited to 'examples/entry')
| -rw-r--r-- | examples/entry/entry.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/examples/entry/entry.c b/examples/entry/entry.c index b0b323039..34022ec73 100644 --- a/examples/entry/entry.c +++ b/examples/entry/entry.c @@ -42,8 +42,11 @@ int main( int argc, window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_widget_set_size_request (GTK_WIDGET (window), 200, 100); gtk_window_set_title (GTK_WINDOW (window), "GTK Entry"); - g_signal_connect (GTK_OBJECT (window), "delete_event", - GTK_SIGNAL_FUNC (exit), NULL); + g_signal_connect (G_OBJECT (window), "destroy", + G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect_swapped (G_OBJECT (window), "delete_event", + G_CALLBACK (gtk_widget_destroy), + window); vbox = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), vbox); @@ -51,8 +54,8 @@ int main( int argc, entry = gtk_entry_new (); gtk_entry_set_max_length (GTK_ENTRY (entry), 50); - g_signal_connect (GTK_OBJECT (entry), "activate", - GTK_SIGNAL_FUNC (enter_callback), + g_signal_connect (G_OBJECT (entry), "activate", + G_CALLBACK (enter_callback), entry); gtk_entry_set_text (GTK_ENTRY (entry), "hello"); tmp_pos = GTK_ENTRY (entry)->text_length; @@ -68,22 +71,22 @@ int main( int argc, check = gtk_check_button_new_with_label ("Editable"); gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0); - g_signal_connect (GTK_OBJECT (check), "toggled", - GTK_SIGNAL_FUNC (entry_toggle_editable), entry); + g_signal_connect (G_OBJECT (check), "toggled", + G_CALLBACK (entry_toggle_editable), entry); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); gtk_widget_show (check); check = gtk_check_button_new_with_label ("Visible"); gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0); - g_signal_connect (GTK_OBJECT (check), "toggled", - GTK_SIGNAL_FUNC (entry_toggle_visibility), entry); + g_signal_connect (G_OBJECT (check), "toggled", + G_CALLBACK (entry_toggle_visibility), entry); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); gtk_widget_show (check); - button = gtk_button_new_with_label ("Close"); - g_signal_connect_swapped (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (exit), - GTK_OBJECT (window)); + button = gtk_button_new_from_stock (GTK_STOCK_CLOSE); + g_signal_connect_swapped (G_OBJECT (button), "clicked", + G_CALLBACK (gtk_widget_destroy), + window); gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_widget_grab_default (button); |