diff options
author | Sven Neumann <sven@gimp.org> | 2008-08-11 18:36:07 +0000 |
---|---|---|
committer | Sven Neumann <neo@src.gnome.org> | 2008-08-11 18:36:07 +0000 |
commit | 82f6ccd79cc9c6c1d032a620649c1a0b500943eb (patch) | |
tree | a7fe470d84196b53139ee2d9d8f4bef6c352edcc /examples/helloworld2 | |
parent | e3e126ae9eb9f860f2b99157d18cb3d6428add78 (diff) | |
download | gdk-pixbuf-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/helloworld2')
-rw-r--r-- | examples/helloworld2/helloworld2.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/examples/helloworld2/helloworld2.c b/examples/helloworld2/helloworld2.c index a62c88210..d661d164a 100644 --- a/examples/helloworld2/helloworld2.c +++ b/examples/helloworld2/helloworld2.c @@ -3,23 +3,23 @@ /* Our new improved callback. The data passed to this function * is printed to stdout. */ -static void callback( GtkWidget *widget, - gpointer data ) +static void callback (GtkWidget *widget, + gpointer data) { g_print ("Hello again - %s was pressed\n", (gchar *) data); } /* another callback */ -static gboolean delete_event( GtkWidget *widget, +static gboolean delete_event (GtkWidget *widget, GdkEvent *event, - gpointer data ) + gpointer data) { gtk_main_quit (); return FALSE; } -int main( int argc, - char *argv[] ) +int main (int argc, + char *argv[]) { /* GtkWidget is the storage type for widgets */ GtkWidget *window; @@ -39,7 +39,7 @@ int main( int argc, /* Here we just set a handler for delete_event that immediately * exits GTK. */ - g_signal_connect (G_OBJECT (window), "delete_event", + g_signal_connect (window, "delete-event", G_CALLBACK (delete_event), NULL); /* Sets the border width of the window. */ @@ -55,15 +55,15 @@ int main( int argc, /* Creates a new button with the label "Button 1". */ button = gtk_button_new_with_label ("Button 1"); - + /* Now when the button is clicked, we call the "callback" function * with a pointer to "button 1" as its argument */ - g_signal_connect (G_OBJECT (button), "clicked", - G_CALLBACK (callback), (gpointer) "button 1"); + g_signal_connect (button, "clicked", + G_CALLBACK (callback), "button 1"); /* Instead of gtk_container_add, we pack this button into the invisible * box, which has been packed into the window. */ - gtk_box_pack_start (GTK_BOX(box1), button, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box1), button, TRUE, TRUE, 0); /* Always remember this step, this tells GTK that our preparation for * this button is complete, and it can now be displayed. */ @@ -74,10 +74,10 @@ int main( int argc, /* Call the same callback function with a different argument, * passing a pointer to "button 2" instead. */ - g_signal_connect (G_OBJECT (button), "clicked", - G_CALLBACK (callback), (gpointer) "button 2"); + g_signal_connect (button, "clicked", + G_CALLBACK (callback), "button 2"); - gtk_box_pack_start(GTK_BOX (box1), button, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box1), button, TRUE, TRUE, 0); /* The order in which we show the buttons is not really important, but I * recommend showing the window last, so it all pops up at once. */ @@ -86,7 +86,7 @@ int main( int argc, gtk_widget_show (box1); gtk_widget_show (window); - + /* Rest in gtk_main and wait for the fun to begin! */ gtk_main (); |