summaryrefslogtreecommitdiff
path: root/examples/selection
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/selection
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/selection')
-rw-r--r--examples/selection/.cvsignore2
-rw-r--r--examples/selection/gettargets.c12
-rw-r--r--examples/selection/setselection.c16
3 files changed, 16 insertions, 14 deletions
diff --git a/examples/selection/.cvsignore b/examples/selection/.cvsignore
index 8be36ee44a..b700786a08 100644
--- a/examples/selection/.cvsignore
+++ b/examples/selection/.cvsignore
@@ -1 +1,3 @@
selection
+setselection
+gettargets
diff --git a/examples/selection/gettargets.c b/examples/selection/gettargets.c
index 7dee64ca04..7c0cc276fd 100644
--- a/examples/selection/gettargets.c
+++ b/examples/selection/gettargets.c
@@ -74,18 +74,18 @@ int main( int argc,
gtk_window_set_title (GTK_WINDOW (window), "Event Box");
gtk_container_set_border_width (GTK_CONTAINER (window), 10);
- g_signal_connect (GTK_OBJECT (window), "destroy",
- GTK_SIGNAL_FUNC (exit), NULL);
+ g_signal_connect (G_OBJECT (window), "destroy",
+ G_CALLBACK (exit), NULL);
/* Create a button the user can click to get targets */
button = gtk_button_new_with_label ("Get Targets");
gtk_container_add (GTK_CONTAINER (window), button);
- g_signal_connect (GTK_OBJECT(button), "clicked",
- GTK_SIGNAL_FUNC (get_targets), NULL);
- g_signal_connect (GTK_OBJECT(button), "selection_received",
- GTK_SIGNAL_FUNC (selection_received), NULL);
+ g_signal_connect (G_OBJECT(button), "clicked",
+ G_CALLBACK (get_targets), NULL);
+ g_signal_connect (G_OBJECT(button), "selection_received",
+ G_CALLBACK (selection_received), NULL);
gtk_widget_show (button);
gtk_widget_show (window);
diff --git a/examples/selection/setselection.c b/examples/selection/setselection.c
index 105545bf28..e79a09131b 100644
--- a/examples/selection/setselection.c
+++ b/examples/selection/setselection.c
@@ -77,8 +77,8 @@ int main( int argc,
gtk_window_set_title (GTK_WINDOW (window), "Event Box");
gtk_container_set_border_width (GTK_CONTAINER (window), 10);
- g_signal_connect (GTK_OBJECT (window), "destroy",
- GTK_SIGNAL_FUNC (exit), NULL);
+ g_signal_connect (G_OBJECT (window), "destroy",
+ G_CALLBACK (exit), NULL);
/* Create a toggle button to act as the selection */
@@ -86,17 +86,17 @@ int main( int argc,
gtk_container_add (GTK_CONTAINER (window), selection_button);
gtk_widget_show (selection_button);
- g_signal_connect (GTK_OBJECT (selection_button), "toggled",
- GTK_SIGNAL_FUNC (selection_toggled), &have_selection);
- g_signal_connect (GTK_OBJECT (selection_button), "selection_clear_event",
- GTK_SIGNAL_FUNC (selection_clear), &have_selection);
+ g_signal_connect (G_OBJECT (selection_button), "toggled",
+ G_CALLBACK (selection_toggled), &have_selection);
+ g_signal_connect (G_OBJECT (selection_button), "selection_clear_event",
+ G_CALLBACK (selection_clear), &have_selection);
gtk_selection_add_target (selection_button,
GDK_SELECTION_PRIMARY,
GDK_SELECTION_TYPE_STRING,
1);
- g_signal_connect (GTK_OBJECT (selection_button), "selection_get",
- GTK_SIGNAL_FUNC (selection_handle), &have_selection);
+ g_signal_connect (G_OBJECT (selection_button), "selection_get",
+ G_CALLBACK (selection_handle), &have_selection);
gtk_widget_show (selection_button);
gtk_widget_show (window);