diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-05-23 20:42:47 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-05-23 21:32:51 -0400 |
| commit | 38cbd87cac0db2f61bfe056f9296ba036f522283 (patch) | |
| tree | d0a87fa5b4809b5821f1dcc88b84116327bca088 /tests/testassistant.c | |
| parent | 1af417a82d9df10c58921569c428112457ae7ad6 (diff) | |
| download | gtk+-38cbd87cac0db2f61bfe056f9296ba036f522283.tar.gz | |
tests: Stop using GtkAlignment
Fix up all other tests to not use GtkAlignment anymore.
Diffstat (limited to 'tests/testassistant.c')
| -rw-r--r-- | tests/testassistant.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/tests/testassistant.c b/tests/testassistant.c index f55cfcde42..0a475c927f 100644 --- a/tests/testassistant.c +++ b/tests/testassistant.c @@ -108,13 +108,12 @@ apply_callback (GtkWidget *widget) static gboolean progress_timeout (GtkWidget *assistant) { - GtkWidget *page, *progress; + GtkWidget *progress; gint current_page; gdouble value; current_page = gtk_assistant_get_current_page (GTK_ASSISTANT (assistant)); - page = gtk_assistant_get_nth_page (GTK_ASSISTANT (assistant), current_page); - progress = gtk_bin_get_child (GTK_BIN (page)); + progress = gtk_assistant_get_nth_page (GTK_ASSISTANT (assistant), current_page); value = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (progress)); value += 0.1; @@ -122,7 +121,7 @@ progress_timeout (GtkWidget *assistant) if (value >= 1.0) { - gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE); + gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), progress, TRUE); return FALSE; } @@ -136,11 +135,8 @@ prepare_callback (GtkWidget *widget, GtkWidget *page) g_print ("prepare: %s\n", gtk_label_get_text (GTK_LABEL (page))); else if (gtk_assistant_get_page_type (GTK_ASSISTANT (widget), page) == GTK_ASSISTANT_PAGE_PROGRESS) { - GtkWidget *progress; - - progress = gtk_bin_get_child (GTK_BIN (page)); gtk_assistant_set_page_complete (GTK_ASSISTANT (widget), page, FALSE); - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), 0.0); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (page), 0.0); gdk_threads_add_timeout (300, (GSourceFunc) progress_timeout, widget); } else @@ -293,8 +289,11 @@ create_generous_assistant (GtkWidget *widget) gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_CONFIRM); gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE); - page = gtk_alignment_new (0.5, 0.5, 0.9, 0.0); - gtk_container_add (GTK_CONTAINER (page), gtk_progress_bar_new ()); + page = gtk_progress_bar_new (); + gtk_widget_set_halign (page, GTK_ALIGN_FILL); + gtk_widget_set_valign (page, GTK_ALIGN_CENTER); + gtk_widget_set_margin_start (page, 20); + gtk_widget_set_margin_end (page, 20); gtk_widget_show_all (page); gtk_assistant_append_page (GTK_ASSISTANT (assistant), page); gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Progress"); |