gtk: remove "gboolean homogeneous" from gtk_box_new()

[~andy/gtk] / tests / testassistant.c

diff --git a/tests/testassistant.c b/tests/testassistant.c
index c6340e68d487a1acf149db0cae689ae137361338..a6b4ef5e67eb87bb66dd4cb5285451b5d6c7ef9c 100644 (file)
--- a/tests/testassistant.c
+++ b/tests/testassistant.c
@@ -49,9 +49,8 @@ complete_cb (GtkWidget *check,
                                   pdata->page,
                                   complete);
 }
-
             
-static void
+static GtkWidget *
 add_completion_test_page (GtkWidget   *assistant,
                          const gchar *text, 
                          gboolean     visible,
@@ -61,7 +60,7 @@ add_completion_test_page (GtkWidget   *assistant,
   GtkWidget *check;
   PageData *pdata;
 
-  page = gtk_vbox_new (0, FALSE);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   check = gtk_check_button_new_with_label ("Complete");
 
   gtk_container_add (GTK_CONTAINER (page), gtk_label_new (text));
@@ -82,6 +81,8 @@ add_completion_test_page (GtkWidget   *assistant,
   gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, text);
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, complete);
+
+  return page;
 }
 
 static void
@@ -115,7 +116,7 @@ progress_timeout (GtkWidget *assistant)
 
   current_page = gtk_assistant_get_current_page (GTK_ASSISTANT (assistant));
   page = gtk_assistant_get_nth_page (GTK_ASSISTANT (assistant), current_page);
-  progress = GTK_BIN (page)->child;
+  progress = gtk_bin_get_child (GTK_BIN (page));
 
   value  = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (progress));
   value += 0.1;
@@ -139,10 +140,10 @@ prepare_callback (GtkWidget *widget, GtkWidget *page)
     {
       GtkWidget *progress;
 
-      progress = GTK_BIN (page)->child;
+      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);
-      g_timeout_add (300, (GSourceFunc) progress_timeout, widget);
+      gdk_threads_add_timeout (300, (GSourceFunc) progress_timeout, widget);
     }
   else
     g_print ("prepare: %d\n", gtk_assistant_get_current_page (GTK_ASSISTANT (widget)));
@@ -183,7 +184,7 @@ create_simple_assistant (GtkWidget *widget)
       gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
     }
 
-  if (!GTK_WIDGET_VISIBLE (assistant))
+  if (!gtk_widget_get_visible (assistant))
     gtk_widget_show (assistant);
   else
     {
@@ -192,6 +193,18 @@ create_simple_assistant (GtkWidget *widget)
     }
 }
 
+static void
+visible_cb (GtkWidget *check, 
+           gpointer   data)
+{
+  GtkWidget *page = data;
+  gboolean visible;
+
+  visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
+
+  g_object_set (G_OBJECT (page), "visible", visible, NULL);
+}
+
 static void
 create_generous_assistant (GtkWidget *widget)
 {
@@ -199,7 +212,8 @@ create_generous_assistant (GtkWidget *widget)
 
   if (!assistant)
     {
-      GtkWidget *page;
+      GtkWidget *page, *next, *check;
+      PageData  *pdata;
 
       assistant = gtk_assistant_new ();
       gtk_window_set_default_size (GTK_WINDOW (assistant), 400, 300);
@@ -220,8 +234,16 @@ create_generous_assistant (GtkWidget *widget)
       gtk_assistant_set_page_type  (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_INTRO);
       gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
 
-      add_completion_test_page (assistant, "Content", TRUE, FALSE);
-      add_completion_test_page (assistant, "More Content", TRUE, TRUE);
+      page = add_completion_test_page (assistant, "Content", TRUE, FALSE);
+      next = add_completion_test_page (assistant, "More Content", TRUE, TRUE);
+
+      check = gtk_check_button_new_with_label ("Next page visible");
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
+      g_signal_connect (G_OBJECT (check), "toggled", 
+                       G_CALLBACK (visible_cb), next);
+      gtk_widget_show (check);
+      gtk_container_add (GTK_CONTAINER (page), check);
+      
       add_completion_test_page (assistant, "Even More Content", TRUE, TRUE);
 
       page = get_test_page ("Confirmation");
@@ -238,15 +260,24 @@ create_generous_assistant (GtkWidget *widget)
       gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Progress");
       gtk_assistant_set_page_type  (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_PROGRESS);
 
-      page = get_test_page ("Summary");
+      page = gtk_check_button_new_with_label ("Summary complete");
       gtk_widget_show (page);
       gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
       gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Summary");
       gtk_assistant_set_page_type  (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_SUMMARY);
-      gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
+
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page),
+                                    gtk_assistant_get_page_complete (GTK_ASSISTANT (assistant),
+                                                                     page));
+
+      pdata = g_new (PageData, 1);
+      pdata->assistant = GTK_ASSISTANT (assistant);
+      pdata->page = page;
+      g_signal_connect (page, "toggled",
+                      G_CALLBACK (complete_cb), pdata);
     }
 
-  if (!GTK_WIDGET_VISIBLE (assistant))
+  if (!gtk_widget_get_visible (assistant))
     gtk_widget_show (assistant);
   else
     {
@@ -306,7 +337,7 @@ create_nonlinear_assistant (GtkWidget *widget)
                                           nonlinear_assistant_forward_page,
                                           NULL, NULL);
 
-      page = gtk_vbox_new (FALSE, 6);
+      page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
       button = gtk_radio_button_new_with_label (NULL, "branch A");
       gtk_box_pack_start (GTK_BOX (page), button, FALSE, FALSE, 0);
@@ -343,7 +374,7 @@ create_nonlinear_assistant (GtkWidget *widget)
       gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
     }
 
-  if (!GTK_WIDGET_VISIBLE (assistant))
+  if (!gtk_widget_get_visible (assistant))
     gtk_widget_show (assistant);
   else
     {
@@ -440,7 +471,7 @@ create_looping_assistant (GtkWidget *widget)
       gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
     }
 
-  if (!GTK_WIDGET_VISIBLE (assistant))
+  if (!gtk_widget_get_visible (assistant))
     gtk_widget_show (assistant);
   else
     {
@@ -504,7 +535,7 @@ create_full_featured_assistant (GtkWidget *widget)
         gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), page, pixbuf);
     }
 
-  if (!GTK_WIDGET_VISIBLE (assistant))
+  if (!gtk_widget_get_visible (assistant))
     gtk_widget_show (assistant);
   else
     {
@@ -543,7 +574,7 @@ main (int argc, gchar *argv[])
   g_signal_connect (G_OBJECT (window), "delete-event",
                    G_CALLBACK (gtk_false), NULL);
 
-  box = gtk_vbox_new (FALSE, 6);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (window), box);
 
   for (i = 0; i < G_N_ELEMENTS (buttons); i++)