Statusbar testcases

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

diff --git a/tests/testmultiscreen.c b/tests/testmultiscreen.c
index 1786545fb85b81bfdb7f3d83f06e2f211a87f0fc..446f67fa0d9e6c6038183791f08ea26c08fe939e 100644 (file)
--- a/tests/testmultiscreen.c
+++ b/tests/testmultiscreen.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <gtk/gtk.h>
 
 static GtkWidget **images;
@@ -51,7 +51,7 @@ show_hide (GtkWidget * button, gpointer data)
 }
 
 static void
-move (GtkWidget *button, GtkVBox *vbox)
+move (GtkWidget *button, GtkBox *vbox)
 {
   GdkScreen *screen = gtk_widget_get_screen (button);
   GtkWidget *toplevel = gtk_widget_get_toplevel (button);
@@ -111,22 +111,22 @@ main (int argc, char *argv[])
       
       screen_list[i] = gdk_display_get_screen (dpy, i);
 
-      window[i] = gtk_widget_new (GTK_TYPE_WINDOW,
+      window[i] = g_object_new (GTK_TYPE_WINDOW,
                                  "screen", screen_list[i],
                                  "user_data", NULL,
                                  "type", GTK_WINDOW_TOPLEVEL,
                                  "title", label,
-                                 "allow_grow", FALSE,
-                                 "allow_shrink", FALSE,
+                                  "resizable", FALSE,
                                  "border_width", 10, NULL,
                                  NULL);
       g_signal_connect (window[i], "destroy",
                        G_CALLBACK (gtk_main_quit), NULL);
 
-      vbox[i] = gtk_vbox_new (TRUE, 0);
+      vbox[i] = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      gtk_box_set_homogeneous (GTK_BOX (vbox[i]), TRUE);
       gtk_container_add (GTK_CONTAINER (window[i]), vbox[i]);
 
-      button = gtk_widget_new (GTK_TYPE_BUTTON,
+      button = g_object_new (GTK_TYPE_BUTTON,
                               "label", label,
                               "parent", vbox[i],
                               "visible", TRUE, NULL,
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
       
       gtk_container_add (GTK_CONTAINER (vbox[i]), images[i]);
 
-      button = gtk_widget_new (GTK_TYPE_BUTTON,
+      button = g_object_new (GTK_TYPE_BUTTON,
                               "label", "Hide Icon",
                               "parent", vbox[i],
                               "visible", TRUE, NULL,
@@ -152,10 +152,11 @@ main (int argc, char *argv[])
     gtk_widget_show_all (window[i]);
   
   moving_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  moving_vbox = gtk_vbox_new (TRUE, 0);
-  
+  moving_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (moving_vbox), TRUE);
+
   gtk_container_add (GTK_CONTAINER (moving_window), moving_vbox);
-  moving_button = gtk_widget_new (GTK_TYPE_BUTTON,
+  moving_button = g_object_new (GTK_TYPE_BUTTON,
                                  "label", "Move to Next Screen",
                                  "visible", TRUE,
                                  NULL);