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

testgtk: Rename pixmap => pixbuf in various places

Browse Source 
Now that we use Pixbufs for the tests instead of Pixmaps, we should name
the tests like that.
This commit is contained in:
Benjamin Otte 2010-08-06 22:12:24 +02:00
parent 6b19815f87
commit 2513636877
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/testgtk.c
View File

@ -2881,7 +2881,7 @@ create_saved_position (GtkWidget *widget)
*/ */
static void static void
create_pixmap (GtkWidget *widget) create_pixbuf (GtkWidget *widget)
{ {
static GtkWidget *window = NULL; static GtkWidget *window = NULL;
GtkWidget *box1; GtkWidget *box1;
@ -2890,7 +2890,7 @@ create_pixmap (GtkWidget *widget)
GtkWidget *button; GtkWidget *button;
GtkWidget *label; GtkWidget *label;
GtkWidget *separator; GtkWidget *separator;
GtkWidget *pixmapwid; GtkWidget *pixbufwid;
if (!window) if (!window)
{ {
@ -2917,24 +2917,24 @@ create_pixmap (GtkWidget *widget)
button = gtk_button_new (); button = gtk_button_new ();
gtk_box_pack_start (GTK_BOX (box2), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (box2), button, FALSE, FALSE, 0);
pixmapwid = new_pixbuf ("test.xpm", window->window, NULL); pixbufwid = new_pixbuf ("test.xpm", window->window, NULL);
label = gtk_label_new ("Pixmap\ntest"); label = gtk_label_new ("Pixbuf\ntest");
box3 = gtk_hbox_new (FALSE, 0); box3 = gtk_hbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (box3), 2); gtk_container_set_border_width (GTK_CONTAINER (box3), 2);
gtk_container_add (GTK_CONTAINER (box3), pixmapwid); gtk_container_add (GTK_CONTAINER (box3), pixbufwid);
gtk_container_add (GTK_CONTAINER (box3), label); gtk_container_add (GTK_CONTAINER (box3), label);
gtk_container_add (GTK_CONTAINER (button), box3); gtk_container_add (GTK_CONTAINER (button), box3);
button = gtk_button_new (); button = gtk_button_new ();
gtk_box_pack_start (GTK_BOX (box2), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (box2), button, FALSE, FALSE, 0);
pixmapwid = new_pixbuf ("test.xpm", window->window, NULL); pixbufwid = new_pixbuf ("test.xpm", window->window, NULL);
label = gtk_label_new ("Pixmap\ntest"); label = gtk_label_new ("Pixbuf\ntest");
box3 = gtk_hbox_new (FALSE, 0); box3 = gtk_hbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (box3), 2); gtk_container_set_border_width (GTK_CONTAINER (box3), 2);
gtk_container_add (GTK_CONTAINER (box3), pixmapwid); gtk_container_add (GTK_CONTAINER (box3), pixbufwid);
gtk_container_add (GTK_CONTAINER (box3), label); gtk_container_add (GTK_CONTAINER (box3), label);
gtk_container_add (GTK_CONTAINER (button), box3); gtk_container_add (GTK_CONTAINER (button), box3);
@ -10225,7 +10225,7 @@ struct {
{ "notebook", create_notebook }, { "notebook", create_notebook },
{ "panes", create_panes }, { "panes", create_panes },
{ "paned keyboard", create_paned_keyboard_navigation }, { "paned keyboard", create_paned_keyboard_navigation },
{ "pixmap", create_pixmap }, { "pixbuf", create_pixbuf },
{ "progress bar", create_progress_bar }, { "progress bar", create_progress_bar },
{ "properties", create_properties }, { "properties", create_properties },
{ "radio buttons", create_radio_buttons }, { "radio buttons", create_radio_buttons },