callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated the (quite outdated) examples to use canonical signal names as

Browse Source 
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
This commit is contained in:
Sven Neumann
2008-08-11 18:36:07 +00:00
committed by Sven Neumann
parent e3e126ae9e
commit 82f6ccd79c
23 changed files with 400 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
examples/helloworld2/helloworld2.c
View File

@ -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 ();