summaryrefslogtreecommitdiff
path: root/examples/helloworld
diff options
context:
space:
mode:
authorSven Neumann <sven@gimp.org>2008-08-11 18:36:07 +0000
committerSven Neumann <neo@src.gnome.org>2008-08-11 18:36:07 +0000
commit82f6ccd79cc9c6c1d032a620649c1a0b500943eb (patch)
treea7fe470d84196b53139ee2d9d8f4bef6c352edcc /examples/helloworld
parente3e126ae9eb9f860f2b99157d18cb3d6428add78 (diff)
downloadgtk+-82f6ccd79cc9c6c1d032a620649c1a0b500943eb.tar.gz
updated the (quite outdated) examples to use canonical signal names as
2008-08-11 Sven Neumann <sven@gimp.org> * examples/*: updated the (quite outdated) examples to use canonical signal names as well. Removed some unneeded casts and trailing whitespace while I was on it... svn path=/trunk/; revision=21071
Diffstat (limited to 'examples/helloworld')
-rw-r--r--examples/helloworld/helloworld.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/examples/helloworld/helloworld.c b/examples/helloworld/helloworld.c
index ffc19cb31b..8a9b0cb3b2 100644
--- a/examples/helloworld/helloworld.c
+++ b/examples/helloworld/helloworld.c
@@ -40,60 +40,60 @@ int main( int argc,
/* GtkWidget is the storage type for widgets */
GtkWidget *window;
GtkWidget *button;
-
+
/* This is called in all GTK applications. Arguments are parsed
* from the command line and are returned to the application. */
gtk_init (&argc, &argv);
-
+
/* create a new window */
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
- /* When the window is given the "delete_event" signal (this is given
+
+ /* When the window is given the "delete-event" signal (this is given
* by the window manager, usually by the "close" option, or on the
* titlebar), we ask it to call the delete_event () function
* as defined above. The data passed to the callback
* function is NULL and is ignored in the callback function. */
- g_signal_connect (G_OBJECT (window), "delete_event",
+ g_signal_connect (window, "delete-event",
G_CALLBACK (delete_event), NULL);
-
- /* Here we connect the "destroy" event to a signal handler.
+
+ /* Here we connect the "destroy" event to a signal handler.
* This event occurs when we call gtk_widget_destroy() on the window,
* or if we return FALSE in the "delete_event" callback. */
- g_signal_connect (G_OBJECT (window), "destroy",
+ g_signal_connect (window, "destroy",
G_CALLBACK (destroy), NULL);
-
+
/* Sets the border width of the window. */
gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
+
/* Creates a new button with the label "Hello World". */
button = gtk_button_new_with_label ("Hello World");
-
+
/* When the button receives the "clicked" signal, it will call the
* function hello() passing it NULL as its argument. The hello()
* function is defined above. */
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
G_CALLBACK (hello), NULL);
-
+
/* This will cause the window to be destroyed by calling
* gtk_widget_destroy(window) when "clicked". Again, the destroy
* signal could come from here, or the window manager. */
- g_signal_connect_swapped (G_OBJECT (button), "clicked",
+ g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
- G_OBJECT (window));
-
+ window);
+
/* This packs the button into the window (a gtk container). */
gtk_container_add (GTK_CONTAINER (window), button);
-
+
/* The final step is to display this newly created widget. */
gtk_widget_show (button);
-
+
/* and the window */
gtk_widget_show (window);
-
+
/* All GTK applications must have a gtk_main(). Control ends here
* and waits for an event to occur (like a key press or
* mouse event). */
gtk_main ();
-
+
return 0;
}