summaryrefslogtreecommitdiff
path: root/examples/clist/clist.c
diff options
context:
space:
mode:
authorSven Neumann <sven@gimp.org>2002-02-19 19:47:16 +0000
committerSven Neumann <neo@src.gnome.org>2002-02-19 19:47:16 +0000
commit6dea3cae13ddf8a5e882fe8296678bb7be2a94d8 (patch)
treea40a07c80c406c91894e38064e6ec1ea559ef178 /examples/clist/clist.c
parent601302c7a308664c09bc5ee2e23621b34747a252 (diff)
downloadgtk+-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/clist/clist.c')
-rw-r--r--examples/clist/clist.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/examples/clist/clist.c b/examples/clist/clist.c
index 1dd49658fe..4b087606ca 100644
--- a/examples/clist/clist.c
+++ b/examples/clist/clist.c
@@ -92,10 +92,9 @@ int main( int argc,
gtk_widget_set_size_request (GTK_WIDGET (window), 300, 150);
gtk_window_set_title (GTK_WINDOW (window), "GtkCList Example");
- gtk_signal_connect (GTK_OBJECT (window),
- "destroy",
- GTK_SIGNAL_FUNC (gtk_main_quit),
- NULL);
+ g_signal_connect (G_OBJECT (window), "destroy",
+ G_CALLBACK (gtk_main_quit),
+ NULL);
vbox=gtk_vbox_new (FALSE, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
@@ -115,9 +114,9 @@ int main( int argc,
/* When a selection is made, we want to know about it. The callback
* used is selection_made, and its code can be found further down */
- gtk_signal_connect(GTK_OBJECT (clist), "select_row",
- GTK_SIGNAL_FUNC (selection_made),
- NULL);
+ g_signal_connect (G_OBJECT (clist), "select_row",
+ G_CALLBACK (selection_made),
+ NULL);
/* It isn't necessary to shadow the border, but it looks nice :) */
gtk_clist_set_shadow_type (GTK_CLIST (clist), GTK_SHADOW_OUT);
@@ -148,15 +147,15 @@ int main( int argc,
gtk_box_pack_start (GTK_BOX (hbox), button_hide_show, TRUE, TRUE, 0);
/* Connect our callbacks to the three buttons */
- gtk_signal_connect_object (GTK_OBJECT (button_add), "clicked",
- GTK_SIGNAL_FUNC (button_add_clicked),
- (gpointer) clist);
- gtk_signal_connect_object (GTK_OBJECT (button_clear), "clicked",
- GTK_SIGNAL_FUNC (button_clear_clicked),
- (gpointer) clist);
- gtk_signal_connect_object (GTK_OBJECT (button_hide_show), "clicked",
- GTK_SIGNAL_FUNC (button_hide_show_clicked),
- (gpointer) clist);
+ g_signal_connect_swapped (G_OBJECT (button_add), "clicked",
+ G_CALLBACK (button_add_clicked),
+ clist);
+ g_signal_connect_swapped (G_OBJECT (button_clear), "clicked",
+ G_CALLBACK (button_clear_clicked),
+ clist);
+ g_signal_connect_swapped (G_OBJECT (button_hide_show), "clicked",
+ G_CALLBACK (button_hide_show_clicked),
+ clist);
gtk_widget_show (button_add);
gtk_widget_show (button_clear);