Use gtk_box_new() instead gtk_[v|h]box_new()

diff --git a/demos/gtk-demo/assistant.c b/demos/gtk-demo/assistant.c
index a00c595370232f84107e630b07d014a4968aa0ce..c753d9068f1704474b1df24f1208c9b3dc9558e5 100644 (file)
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -94,7 +94,7 @@ create_page1 (GtkWidget *assistant)
   GtkWidget *box, *label, *entry;
   GdkPixbuf *pixbuf;
 
-  box = gtk_hbox_new (FALSE, 12);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (box), 12);
 
   label = gtk_label_new ("You must fill out this entry to continue:");
@@ -121,7 +121,7 @@ create_page2 (GtkWidget *assistant)
   GtkWidget *box, *checkbutton;
   GdkPixbuf *pixbuf;
 
-  box = gtk_vbox_new (12, FALSE);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12, FALSE);
   gtk_container_set_border_width (GTK_CONTAINER (box), 12);
 
   checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "

diff --git a/demos/gtk-demo/button_box.c b/demos/gtk-demo/button_box.c
index 8b53d33f95518e428a0e9118a728cf004f7716a3..71f6ced9129ef923e99a7cba5fd5f3364f824faa 100644 (file)
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -63,13 +63,13 @@ do_button_box (GtkWidget *do_widget)
     
     gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-    main_vbox = gtk_vbox_new (FALSE, 0);
+    main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_add (GTK_CONTAINER (window), main_vbox);
     
     frame_horz = gtk_frame_new ("Horizontal Button Boxes");
     gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10);
     
-    vbox = gtk_vbox_new (FALSE, 0);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
     gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
 
@@ -92,7 +92,7 @@ do_button_box (GtkWidget *do_widget)
     frame_vert = gtk_frame_new ("Vertical Button Boxes");
     gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
     
-    hbox = gtk_hbox_new (FALSE, 0);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
     gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
 

diff --git a/demos/gtk-demo/changedisplay.c b/demos/gtk-demo/changedisplay.c
index 17d8448178ca0a0d3efa1d255fa65a3a08386247..a3b523c987e81ecb3ad259dbb899338232e65c46 100644 (file)
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -357,7 +357,7 @@ create_frame (ChangeDisplayInfo *info,
 
   *frame = gtk_frame_new (title);
 
-  hbox = gtk_hbox_new (FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
   gtk_container_add (GTK_CONTAINER (*frame), hbox);
 
@@ -375,7 +375,7 @@ create_frame (ChangeDisplayInfo *info,
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (*tree_view));
   gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
 
-  *button_vbox = gtk_vbox_new (FALSE, 5);
+  *button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
   gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE, FALSE, 0);
 
   if (!info->size_group)
@@ -624,7 +624,7 @@ do_changedisplay (GtkWidget *do_widget)
 
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
 

diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c
index 6ec1517bc50b75a0623bbd7d30b96b421f788471..8525320475ed8f0a0ebe3bce8a50b57f0cf39ce2 100644 (file)
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -210,7 +210,7 @@ do_clipboard (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
 
       gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -219,7 +219,7 @@ do_clipboard (GtkWidget *do_widget)
 
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 4);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 4);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
@@ -236,7 +236,7 @@ do_clipboard (GtkWidget *do_widget)
       label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 4);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 4);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
@@ -253,7 +253,7 @@ do_clipboard (GtkWidget *do_widget)
       label = gtk_label_new ("Images can be transferred via the clipboard, too");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 4);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 4);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 

diff --git a/demos/gtk-demo/colorsel.c b/demos/gtk-demo/colorsel.c
index d1fbe327e1c48277478d3a2e181556eeadcd9bde..3d5d55a2a877df449349d21a2807709729c03167 100644 (file)
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -85,7 +85,7 @@ do_colorsel (GtkWidget *do_widget)
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 

diff --git a/demos/gtk-demo/combobox.c b/demos/gtk-demo/combobox.c
index 79fa323669191891e6b8e8e589e4adc482cf511c..a238a626190124adf65000ded09ba16110e6df1c 100644 (file)
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -345,7 +345,7 @@ do_combobox (GtkWidget *do_widget)
     
     gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-    vbox = gtk_vbox_new (FALSE, 2);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 2);
     gtk_container_add (GTK_CONTAINER (window), vbox);
 
     /* A combobox demonstrating cell renderers, separators and
@@ -354,7 +354,7 @@ do_combobox (GtkWidget *do_widget)
     frame = gtk_frame_new ("Some stock icons");
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
     
-    box = gtk_vbox_new (FALSE, 0);
+    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (box), 5);
     gtk_container_add (GTK_CONTAINER (frame), box);
     
@@ -395,7 +395,7 @@ do_combobox (GtkWidget *do_widget)
     frame = gtk_frame_new ("Where are we ?");
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
-    box = gtk_vbox_new (FALSE, 0);
+    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (box), 5);
     gtk_container_add (GTK_CONTAINER (frame), box);
     
@@ -424,7 +424,7 @@ do_combobox (GtkWidget *do_widget)
     frame = gtk_frame_new ("Editable");
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
     
-    box = gtk_vbox_new (FALSE, 0);
+    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (box), 5);
     gtk_container_add (GTK_CONTAINER (frame), box);
     

diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c
index ad9f259f968c4d9479613e89ab92932888040e95..741f9bf93dd8ce4a368f23bdf43403342f2ffb9e 100644 (file)
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -54,7 +54,7 @@ interactive_dialog_clicked (GtkButton *button,
 
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
-  hbox = gtk_hbox_new (FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
   gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
 
@@ -120,12 +120,12 @@ do_dialog (GtkWidget *do_widget)
       frame = gtk_frame_new ("Dialogs");
       gtk_container_add (GTK_CONTAINER (window), frame);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (frame), vbox);
 
       /* Standard message dialog */
-      hbox = gtk_hbox_new (FALSE, 8);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
       button = gtk_button_new_with_mnemonic ("_Message Dialog");
       g_signal_connect (button, "clicked",
@@ -136,9 +136,9 @@ do_dialog (GtkWidget *do_widget)
                           FALSE, FALSE, 0);
 
       /* Interactive dialog*/
-      hbox = gtk_hbox_new (FALSE, 8);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-      vbox2 = gtk_vbox_new (FALSE, 0);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
 
       button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
       g_signal_connect (button, "clicked",

diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c
index 4af4cae1d24c44ab1ff686db3ca458eeaa621465..db5a62d97f4f7e144150d593f0297a6db22160fb 100644 (file)
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -216,7 +216,7 @@ do_drawingarea (GtkWidget *do_widget)
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 

diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c
index 638d13fcdbe14047797c577551edd46150b08f73..1975e06b2ebd8ba91d5ccd641eb1be338eb76575 100644 (file)
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -332,7 +332,7 @@ do_editable_cells (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       gtk_box_pack_start (GTK_BOX (vbox),
@@ -365,7 +365,7 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (sw), treeview);
 
       /* some buttons */
-      hbox = gtk_hbox_new (TRUE, 4);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 4);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
       button = gtk_button_new_with_label ("Add item");

diff --git a/demos/gtk-demo/entry_buffer.c b/demos/gtk-demo/entry_buffer.c
index 6c4d34d6f66487827bb491963313375db20593fa..a9e775e31bc792e429ec1f9bb20a5c6dea5f8b2c 100644 (file)
--- a/demos/gtk-demo/entry_buffer.c
+++ b/demos/gtk-demo/entry_buffer.c
@@ -34,7 +34,7 @@ do_entry_buffer (GtkWidget *do_widget)
 
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
     gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 

diff --git a/demos/gtk-demo/entry_completion.c b/demos/gtk-demo/entry_completion.c
index e9a3e2435cd0f4c8c59c7ee08c8e45da2d3eee94..da2e844abbed5bac80ccf0953ad261f36b66b0ed 100644 (file)
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -61,7 +61,7 @@ do_entry_completion (GtkWidget *do_widget)
 
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
     gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 

diff --git a/demos/gtk-demo/expander.c b/demos/gtk-demo/expander.c
index 9b384fbefe7afa75d07367b287410ac26a5b6cc8..700caee74a034c1533261cddbcd085ea22751aec 100644 (file)
--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -35,7 +35,7 @@ do_expander (GtkWidget *do_widget)
 
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
     gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 

diff --git a/demos/gtk-demo/iconview.c b/demos/gtk-demo/iconview.c
index 1cfac12c955618f6799d853364a3ae9e2b7ba19c..49985ee30709b99cc4df916f924245bbf3d47882 100644 (file)
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -300,7 +300,7 @@ do_iconview (GtkWidget *do_widget)
          GtkWidget *tool_bar;
          GtkToolItem *home_button;
 
-         vbox = gtk_vbox_new (FALSE, 0);
+         vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
          gtk_container_add (GTK_CONTAINER (window), vbox);
 
          tool_bar = gtk_toolbar_new ();

diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c
index e58d9c5d48dfa21dec0769874fd126daeb5208a6..acd382f75795e8f88cccfa1b75fcb9d937d68e46 100644 (file)
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -335,7 +335,7 @@ do_images (GtkWidget *do_widget)
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 

diff --git a/demos/gtk-demo/infobar.c b/demos/gtk-demo/infobar.c
index e5d460254b782238a3800a6424eefc00e3cdff51..11a5cd04b7480d372ed26d97894e31c29bb167b2 100644 (file)
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -44,7 +44,7 @@ do_infobar (GtkWidget *do_widget)
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       bar = gtk_info_bar_new ();
@@ -81,7 +81,7 @@ do_infobar (GtkWidget *do_widget)
       frame = gtk_frame_new ("Info bars");
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 8);
 
-      vbox2 = gtk_vbox_new (FALSE, 8);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
       gtk_container_add (GTK_CONTAINER (frame), vbox2);
 

diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c
index e5c72bab67a4b5562ffef6fb8904d70e22dec693..716fb8d0750084f41751809c276f45c4e9c5d93f 100644 (file)
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -266,7 +266,7 @@ do_list_store (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");

diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index b7ead0a03a7a2415e43e0aa10761b3200458c372..68b45874cc98179f0940528aface7092847f426c 100644 (file)
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -954,7 +954,7 @@ main (int argc, char **argv)
   g_signal_connect_after (window, "destroy",
                    G_CALLBACK (gtk_main_quit), NULL);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), hbox);
 
   tree = create_tree ();

diff --git a/demos/gtk-demo/menus.c b/demos/gtk-demo/menus.c
index 78f63bfd5533fbbd4e56dec4e6a7a731fc96654f..f8af4f974d13a8a9ad49a6a3e53c40d36fe1e60c 100644 (file)
--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -146,11 +146,11 @@ do_menus (GtkWidget *do_widget)
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      box = gtk_hbox_new (FALSE, 0);
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box);
       gtk_widget_show (box);
 
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (box), box1);
       gtk_widget_show (box1);
 
@@ -176,7 +176,7 @@ do_menus (GtkWidget *do_widget)
       gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
       gtk_widget_show (box2);

diff --git a/demos/gtk-demo/offscreen_window.c b/demos/gtk-demo/offscreen_window.c
index fda8d83e9bfed5a3d5d96cf8c0efe126ef5574c3..6a11786b8598b72f58f02f0df4e3f84140b01b21 100644 (file)
--- a/demos/gtk-demo/offscreen_window.c
+++ b/demos/gtk-demo/offscreen_window.c
@@ -560,7 +560,7 @@ do_offscreen_window (GtkWidget *do_widget)
       gtk_widget_modify_bg (window, GTK_STATE_NORMAL, &black);
       gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-      vbox = gtk_vbox_new (0, FALSE);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0, FALSE);
       scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
                                         0, G_PI/2, 0.01);
       gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);

diff --git a/demos/gtk-demo/offscreen_window2.c b/demos/gtk-demo/offscreen_window2.c
index c03d8c0c38f6ddc0b95d61d279c25d21fdbee173..4255870f4af6e78b6ca036973c50acbe5f21a47f 100644 (file)
--- a/demos/gtk-demo/offscreen_window2.c
+++ b/demos/gtk-demo/offscreen_window2.c
@@ -461,13 +461,13 @@ do_offscreen_window2 (GtkWidget *do_widget)
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-      vbox = gtk_vbox_new (0, FALSE);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0, FALSE);
 
       bin = gtk_mirror_bin_new ();
 
       group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
 
-      hbox = gtk_hbox_new (FALSE, 6);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
       backbutton = gtk_button_new ();
       gtk_container_add (GTK_CONTAINER (backbutton),
                          gtk_image_new_from_stock (GTK_STOCK_GO_BACK, 4));

diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c
index fd0822f17a0ca5da3984c5e5a0a6877e976fe6d9..52a1a5ea185eece3f082cfb856aff361e32db148 100644 (file)
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -153,7 +153,7 @@ do_panes (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Panes");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), vbox);
       
       vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);

diff --git a/demos/gtk-demo/rotated_text.c b/demos/gtk-demo/rotated_text.c
index bab7046b987d239ea341cabc94faa3ff13abe01f..97704e774086e70d3a03dbdb498820fca9fbf0fd 100644 (file)
--- a/demos/gtk-demo/rotated_text.c
+++ b/demos/gtk-demo/rotated_text.c
@@ -190,7 +190,7 @@ do_rotated_text (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 4 * RADIUS, 2 * RADIUS);
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
 
-      box = gtk_hbox_new (TRUE, 0);
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);
       gtk_container_add (GTK_CONTAINER (window), box);
 
       /* Add a drawing area */

diff --git a/demos/gtk-demo/search_entry.c b/demos/gtk-demo/search_entry.c
index 1e5c747e84af91681cf546eaed87f1002a633bb6..56cfc1b51632b9fc1466a52e89cd2cbf97b85493 100644 (file)
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -266,7 +266,7 @@ do_search_entry (GtkWidget *do_widget)
 
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
@@ -274,7 +274,7 @@ do_search_entry (GtkWidget *do_widget)
       gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 10);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
 

diff --git a/demos/gtk-demo/sizegroup.c b/demos/gtk-demo/sizegroup.c
index d53003960ea687cee8d4420cee67b069bf164ea1..db38f653b643a0a7128f9dc25356da5c4f282e1f 100644 (file)
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -118,7 +118,7 @@ do_sizegroup (GtkWidget *do_widget)
 
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 

diff --git a/demos/gtk-demo/spinner.c b/demos/gtk-demo/spinner.c
index 53938f9df56c7cca36a442e8fb3c484693374950..878cbd7e8a5557b85cfae2887318f9c1a54290a0 100644 (file)
--- a/demos/gtk-demo/spinner.c
+++ b/demos/gtk-demo/spinner.c
@@ -50,12 +50,12 @@ do_spinner (GtkWidget *do_widget)
 
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
     gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     /* Sensitive */
-    hbox = gtk_hbox_new (FALSE, 5);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
     spinner = gtk_spinner_new ();
     gtk_container_add (GTK_CONTAINER (hbox), spinner);
     gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ());
@@ -63,7 +63,7 @@ do_spinner (GtkWidget *do_widget)
     spinner_sensitive = spinner;
 
     /* Disabled */
-    hbox = gtk_hbox_new (FALSE, 5);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
     spinner = gtk_spinner_new ();
     gtk_container_add (GTK_CONTAINER (hbox), spinner);
     gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ());

diff --git a/demos/gtk-demo/stock_browser.c b/demos/gtk-demo/stock_browser.c
index 3dc71dded1f1a661b77c286766945e81e118c0c0..583fa915557b147c64ac64339d82240c6a8e83bf 100644 (file)
--- a/demos/gtk-demo/stock_browser.c
+++ b/demos/gtk-demo/stock_browser.c
@@ -417,7 +417,7 @@ do_stock_browser (GtkWidget *do_widget)
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-      hbox = gtk_hbox_new (FALSE, 8);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
       gtk_container_add (GTK_CONTAINER (window), hbox);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
@@ -486,7 +486,7 @@ do_stock_browser (GtkWidget *do_widget)
       frame = gtk_frame_new ("Selected Item");
       gtk_container_add (GTK_CONTAINER (align), frame);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
       gtk_container_add (GTK_CONTAINER (frame), vbox);
 

diff --git a/demos/gtk-demo/textscroll.c b/demos/gtk-demo/textscroll.c
index 27330329520525e3e6b6786ce7ec11e1dff26c6a..244a7f33e1577581ff1faf282d8ff3c6369e15c4 100644 (file)
--- a/demos/gtk-demo/textscroll.c
+++ b/demos/gtk-demo/textscroll.c
@@ -184,7 +184,7 @@ do_textscroll (GtkWidget *do_widget)
                        G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
       
-      hbox = gtk_hbox_new (TRUE, 6);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 6);
       gtk_container_add (GTK_CONTAINER (window), hbox);
 
       create_text_view (hbox, TRUE);

diff --git a/demos/gtk-demo/toolpalette.c b/demos/gtk-demo/toolpalette.c
index 49efd57f333f7d510bb676ba6a7f23b3c1c75c16..f7ed51ea59a92a7fbbbcd68a1a59505fb64f694d 100644 (file)
--- a/demos/gtk-demo/toolpalette.c
+++ b/demos/gtk-demo/toolpalette.c
@@ -438,7 +438,7 @@ do_toolpalette (GtkWidget *do_widget)
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
       /* Add widgets to control the ToolPalette appearance: */
-      box = gtk_vbox_new (FALSE, 6);
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
       gtk_container_add (GTK_CONTAINER (window), box);
 
       /* Orientation combo box: */
@@ -507,7 +507,7 @@ do_toolpalette (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE, FALSE, 0);
 
       /* Add hbox */
-      hbox = gtk_hbox_new (FALSE, 5);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
       gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE, 0);
 
       /* Add and fill the ToolPalette: */

diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c
index e0b208ab7904057aea3dbb03e45cf39e842797e2..c3dfe14909839687860fd237d31126ba6551a502 100644 (file)
--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -402,7 +402,7 @@ do_tree_store (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 

diff --git a/demos/gtk-demo/ui_manager.c b/demos/gtk-demo/ui_manager.c
index 15005592df3635ff06f96a998b180ac916af64d8..f131a4469c098d95c8c532d6aaa7298847e31e47 100644 (file)
--- a/demos/gtk-demo/ui_manager.c
+++ b/demos/gtk-demo/ui_manager.c
@@ -196,7 +196,7 @@ do_ui_manager (GtkWidget *do_widget)
          g_error_free (error);
        }
 
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
       
       gtk_box_pack_start (GTK_BOX (box1),
@@ -213,7 +213,7 @@ do_ui_manager (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 

diff --git a/demos/testanimation.c b/demos/testanimation.c
index fa29585079220351c797927528215f72999e6167..3cdc0112673d737018633d722c6d0af0cd8bd305 100644 (file)
--- a/demos/testanimation.c
+++ b/demos/testanimation.c
@@ -323,7 +323,7 @@ do_image (const char *filename)
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
@@ -384,7 +384,7 @@ do_nonprogressive (const gchar *filename)
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 

diff --git a/demos/testgtk/main.c b/demos/testgtk/main.c
index bf43ca34ea5e4faf815d26ea2031d12614ec9fce..f772a6f0e114498ca557b6aaee093a99188f253e 100644 (file)
--- a/demos/testgtk/main.c
+++ b/demos/testgtk/main.c
@@ -350,7 +350,7 @@ main (int argc, char **argv)
   g_signal_connect (window, "destroy",
                     G_CALLBACK (gtk_main_quit), NULL);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), hbox);
 
   tree = create_tree ();

diff --git a/demos/testpixbuf-save.c b/demos/testpixbuf-save.c
index 5277c89a6fdaca6a2c55f5092111bf279dde2868..cf1e4f4ac2b9a70d18ca476a4c86378a859bc305 100644 (file)
--- a/demos/testpixbuf-save.c
+++ b/demos/testpixbuf-save.c
@@ -365,7 +365,7 @@ main (int argc, char **argv)
         g_signal_connect (window, "destroy",   
                          G_CALLBACK (close_app), NULL);
    
-        vbox = gtk_vbox_new (FALSE, 0);
+        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
         gtk_container_add (GTK_CONTAINER (window), vbox);  
    
         drawing_area = gtk_drawing_area_new ();

diff --git a/demos/testpixbuf-scale.c b/demos/testpixbuf-scale.c
index 5bca987bde0f636776e88cfbc19b8f7e9a59f649..5a977bbe4bd870087fbba9bf5d5bc19e0bc56b22 100644 (file)
--- a/demos/testpixbuf-scale.c
+++ b/demos/testpixbuf-scale.c
@@ -98,7 +98,7 @@ main(int argc, char **argv)
        g_signal_connect (window, "destroy",
                          G_CALLBACK (gtk_main_quit), NULL);
        
-       vbox = gtk_vbox_new (FALSE, 0);
+       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
        gtk_container_add (GTK_CONTAINER (window), vbox);
 
         combo_box = gtk_combo_box_text_new ();
@@ -117,7 +117,7 @@ main(int argc, char **argv)
        alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.5);
        gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
 
-       hbox = gtk_hbox_new (FALSE, 4);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 4);
        gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
        label = gtk_label_new ("Overall Alpha:");

diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 3227eb48cabe4b37d0388c135281c0b27e912a93..fb50138e53dbf2449baca710e623fa66cba42161 100644 (file)
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -222,7 +222,7 @@ create_radio (void)
   GtkWidget *radio;
   GtkWidget *align;
 
-  widget = gtk_vbox_new (FALSE, 3);
+  widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
   radio = gtk_radio_button_new_with_mnemonic (NULL, "Radio Button _One");
   gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE, 0);
   radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (radio), "Radio Button _Two");
@@ -261,7 +261,7 @@ create_accel_label (void)
   gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (widget), button);
   gtk_widget_set_no_show_all (button, TRUE);
 
-  box = gtk_vbox_new (FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (box), widget);
   gtk_container_add (GTK_CONTAINER (box), button);
 
@@ -424,7 +424,7 @@ create_icon_view (void)
 
   gtk_container_add (GTK_CONTAINER (widget), icon_view);
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
   align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
   gtk_container_add (GTK_CONTAINER (align), widget);
   gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
@@ -446,7 +446,7 @@ create_color_button (void)
   GtkWidget *align;
   GdkColor color;
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   color.red = 0x1e<<8;  /* Go Gagne! */
   color.green = 0x90<<8;
@@ -468,7 +468,7 @@ create_font_button (void)
   GtkWidget *picker;
   GtkWidget *align;
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   picker = gtk_font_button_new_with_font ("Sans Serif 10");
   gtk_container_add (GTK_CONTAINER (align), picker);
@@ -488,8 +488,8 @@ create_file_button (void)
   GtkWidget *picker;
   GtkWidget *align;
 
-  vbox = gtk_vbox_new (FALSE, 12);
-  vbox2 = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 12);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   picker = gtk_file_chooser_button_new ("File Chooser Button",
                                        GTK_FILE_CHOOSER_ACTION_OPEN);
@@ -507,7 +507,7 @@ create_file_button (void)
                      gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
                      FALSE, FALSE, 0);
 
-  vbox2 = gtk_vbox_new (FALSE, 3);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   picker = gtk_file_chooser_button_new ("File Chooser Button",
                                        GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
@@ -530,8 +530,8 @@ create_separator (void)
   GtkWidget *hbox;
   GtkWidget *vbox;
 
-  vbox = gtk_vbox_new (FALSE, 3);
-  hbox = gtk_hbox_new (TRUE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (hbox),
                      gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
                      TRUE, TRUE, 0);
@@ -555,8 +555,8 @@ create_panes (void)
   GtkWidget *vbox;
   GtkWidget *pane;
 
-  vbox = gtk_vbox_new (FALSE, 3);
-  hbox = gtk_hbox_new (TRUE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 12);
   pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_paned_pack1 (GTK_PANED (pane),
                   g_object_new (GTK_TYPE_FRAME,
@@ -788,7 +788,7 @@ create_menubar (void)
   item = gtk_menu_item_new_with_mnemonic ("_Help");
   gtk_menu_shell_append (GTK_MENU_SHELL (widget), item);
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), widget);
   gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
@@ -868,7 +868,7 @@ create_progressbar (void)
   widget = gtk_progress_bar_new ();
   gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (widget), 0.5);
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), widget);
   gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
@@ -901,7 +901,7 @@ create_spinbutton (void)
 
   widget = gtk_spin_button_new_with_range (0.0, 100.0, 1.0);
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), widget);
   gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
@@ -919,7 +919,7 @@ create_statusbar (void)
   GtkWidget *widget;
   GtkWidget *vbox, *align;
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), gtk_label_new ("Status Bar"));
   gtk_box_pack_start (GTK_BOX (vbox),
@@ -944,8 +944,8 @@ create_scales (void)
   GtkWidget *hbox;
   GtkWidget *vbox;
 
-  vbox = gtk_vbox_new (FALSE, 3);
-  hbox = gtk_hbox_new (TRUE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (hbox),
                      gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
                                                 0.0, 100.0, 1.0),
@@ -972,7 +972,7 @@ create_image (void)
   widget = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, 
                                     GTK_ICON_SIZE_DND);
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), widget);
   gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
@@ -992,7 +992,7 @@ create_spinner (void)
   widget = gtk_spinner_new ();
   gtk_widget_set_size_request (widget, 24, 24);
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), widget);
   gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);

diff --git a/examples/arrow/arrow.c b/examples/arrow/arrow.c
index 9d66e6ec9f7d00332377e84e1b33ffb03d2cd803..149af8098bbd1c3d2339f0b6e7ee54d84e605fcc 100644 (file)
--- a/examples/arrow/arrow.c
+++ b/examples/arrow/arrow.c
@@ -44,7 +44,7 @@ int main( int   argc,
   gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
   /* Create a box to hold the arrows/buttons */
-  box = gtk_hbox_new (FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (box), 2);
   gtk_container_add (GTK_CONTAINER (window), box);
 

diff --git a/examples/buttonbox/buttonbox.c b/examples/buttonbox/buttonbox.c
index 72df6e8599b8e6b88e4ca99780e446206dd9c384..8643974d72b3415e7b54f31bf396b3f395ebc9c9 100644 (file)
--- a/examples/buttonbox/buttonbox.c
+++ b/examples/buttonbox/buttonbox.c
@@ -61,13 +61,13 @@ int main( int   argc,
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-  main_vbox = gtk_vbox_new (FALSE, 0);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), main_vbox);
 
   frame_horz = gtk_frame_new ("Horizontal Button Boxes");
   gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
   gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
 
@@ -90,7 +90,7 @@ int main( int   argc,
   frame_vert = gtk_frame_new ("Vertical Button Boxes");
   gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
   gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
 

diff --git a/examples/buttons/buttons.c b/examples/buttons/buttons.c
index d78ce834cd34a31732fda54a66b78a02ead81ee5..df68fcb42f8342b3f57c68613dbc6aaebb1712ba 100644 (file)
--- a/examples/buttons/buttons.c
+++ b/examples/buttons/buttons.c
@@ -13,7 +13,7 @@ static GtkWidget *xpm_label_box( gchar     *xpm_filename,
     GtkWidget *image;
 
     /* Create box for image and label */
-    box = gtk_hbox_new (FALSE, 0);
+    box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (box), 2);
 
     /* Now on to the image stuff */

diff --git a/examples/calendar/calendar.c b/examples/calendar/calendar.c
index 06312063c53948c2880340263ff0280f3a0b66f7..4e65660d1735230a8e49805ef65126e6361a4bf9 100644 (file)
--- a/examples/calendar/calendar.c
+++ b/examples/calendar/calendar.c
@@ -277,14 +277,14 @@ static void create_calendar( void )
                    NULL);
   gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
-  vbox = gtk_vbox_new (FALSE, DEF_PAD);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, DEF_PAD);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   /*
    * The top part of the window, Calendar, flags and fontsel.
    */
 
-  hbox = gtk_hbox_new (FALSE, DEF_PAD);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, DEF_PAD);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, DEF_PAD);
   hbbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (hbox), hbbox, FALSE, FALSE, DEF_PAD);
@@ -325,14 +325,14 @@ static void create_calendar( void )
   separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
   gtk_box_pack_start (GTK_BOX (hbox), separator, FALSE, TRUE, 0);
 
-  vbox2 = gtk_vbox_new (FALSE, DEF_PAD);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, DEF_PAD);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, DEF_PAD);
 
   /* Build the Right frame with the flags in */
 
   frame = gtk_frame_new ("Flags");
   gtk_box_pack_start (GTK_BOX (vbox2), frame, TRUE, TRUE, DEF_PAD);
-  vbox3 = gtk_vbox_new (TRUE, DEF_PAD_SMALL);
+  vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE, DEF_PAD_SMALL);
   gtk_container_add (GTK_CONTAINER (frame), vbox3);
 
   for (i = 0; i < 5; i++)
@@ -360,24 +360,24 @@ static void create_calendar( void )
   frame = gtk_frame_new ("Signal events");
   gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, DEF_PAD);
 
-  vbox2 = gtk_vbox_new (TRUE, DEF_PAD_SMALL);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE, DEF_PAD_SMALL);
   gtk_container_add (GTK_CONTAINER (frame), vbox2);
 
-  hbox = gtk_hbox_new (FALSE, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 3);
   gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
   label = gtk_label_new ("Signal:");
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
   calendar_data.last_sig = gtk_label_new ("");
   gtk_box_pack_start (GTK_BOX (hbox), calendar_data.last_sig, FALSE, TRUE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 3);
   gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
   label = gtk_label_new ("Previous signal:");
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
   calendar_data.prev_sig = gtk_label_new ("");
   gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev_sig, FALSE, TRUE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 3);
   gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
   label = gtk_label_new ("Second previous signal:");
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);

diff --git a/examples/entry/entry.c b/examples/entry/entry.c
index 2d06f7192de640748539902c4105fcdfb781b119..f7c577210d68ec75f045760b099f0b02a8b6825c 100644 (file)
--- a/examples/entry/entry.c
+++ b/examples/entry/entry.c
@@ -48,7 +48,7 @@ int main( int   argc,
                               G_CALLBACK (gtk_widget_destroy),
                               window);
 
-    vbox = gtk_vbox_new (FALSE, 0);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_add (GTK_CONTAINER (window), vbox);
     gtk_widget_show (vbox);
 
@@ -65,7 +65,7 @@ int main( int   argc,
     gtk_box_pack_start (GTK_BOX (vbox), entry, TRUE, TRUE, 0);
     gtk_widget_show (entry);
 
-    hbox = gtk_hbox_new (FALSE, 0);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
     gtk_container_add (GTK_CONTAINER (vbox), hbox);
     gtk_widget_show (hbox);
 

diff --git a/examples/gtkdial/dial_test.c b/examples/gtkdial/dial_test.c
index 1afb41b15245969973532354779e44c7b34d8de4..b82c921becbf167c938117484e6faa037925485e 100644 (file)
--- a/examples/gtkdial/dial_test.c
+++ b/examples/gtkdial/dial_test.c
@@ -34,7 +34,7 @@ int main( int   argc,
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-  vbox = gtk_vbox_new (FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
   gtk_container_add (GTK_CONTAINER (window), vbox);
   gtk_widget_show (vbox);
 

diff --git a/examples/helloworld2/helloworld2.c b/examples/helloworld2/helloworld2.c
index d661d164a2c2dcff4a745bb5db6e7c1f4f1a6463..93fde5bcefffade51cdd6980107eb9deab44f1d9 100644 (file)
--- a/examples/helloworld2/helloworld2.c
+++ b/examples/helloworld2/helloworld2.c
@@ -48,7 +48,7 @@ int main (int   argc,
     /* We create a box to pack widgets into.  This is described in detail
      * in the "packing" section. The box is not really visible, it
      * is just used as a tool to arrange widgets. */
-    box1 = gtk_hbox_new (FALSE, 0);
+    box1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
 
     /* Put the box into the main window. */
     gtk_container_add (GTK_CONTAINER (window), box1);

diff --git a/examples/label/label.c b/examples/label/label.c
index 84281be27e0bbc3f3405d46335868f2427f988bc..48ca40caad88f09c3b8f00411334a85d33fb5438 100644 (file)
--- a/examples/label/label.c
+++ b/examples/label/label.c
@@ -19,8 +19,8 @@ int main( int   argc,
                    NULL);
 
   gtk_window_set_title (GTK_WINDOW (window), "Label");
-  vbox = gtk_vbox_new (FALSE, 5);
-  hbox = gtk_hbox_new (FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
   gtk_container_add (GTK_CONTAINER (window), hbox);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (window), 5);
@@ -50,7 +50,7 @@ int main( int   argc,
   gtk_container_add (GTK_CONTAINER (frame), label);
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   frame = gtk_frame_new ("Line wrapped label");
   label = gtk_label_new ("This is an example of a line-wrapped label.  It " \

diff --git a/examples/menu/itemfactory.c b/examples/menu/itemfactory.c
index 937a665752530b10d52820d0a6d3602741216215..26fa257a43cfd4a23bdee9f264fe999a4065f088 100644 (file)
--- a/examples/menu/itemfactory.c
+++ b/examples/menu/itemfactory.c
@@ -150,7 +150,7 @@ int main( int argc,
   gtk_widget_set_size_request (GTK_WIDGET(window), 300, 200);
  
   /* Make a vbox to put the three menus in */
-  main_vbox = gtk_vbox_new (FALSE, 1);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 1);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 1);
   gtk_container_add (GTK_CONTAINER (window), main_vbox);
  

diff --git a/examples/menu/menu.c b/examples/menu/menu.c
index a52ce693990cb2e28646fb3e8fa13e8fbbd7cae1..f37e4e3e488688ffbdf247cfb74060f9f2716c99 100644 (file)
--- a/examples/menu/menu.c
+++ b/examples/menu/menu.c
@@ -72,7 +72,7 @@ int main( int   argc,
     gtk_menu_item_set_submenu (GTK_MENU_ITEM (root_menu), menu);
 
     /* A vbox to put a menu and a button in: */
-    vbox = gtk_vbox_new (FALSE, 0);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_add (GTK_CONTAINER (window), vbox);
     gtk_widget_show (vbox);
 

diff --git a/examples/packbox/packbox.c b/examples/packbox/packbox.c
index 381fa2b2e4f9380a8ad2ecb65d81388e762548db..d5dd98abbe4f162b4f7d28e8914fb92d3f6fc572 100644 (file)
--- a/examples/packbox/packbox.c
+++ b/examples/packbox/packbox.c
@@ -26,7 +26,7 @@ static GtkWidget *make_box( gboolean homogeneous,
 
     /* Create a new hbox with the appropriate homogeneous
      * and spacing settings */
-    box = gtk_hbox_new (homogeneous, spacing);
+    box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, homogeneous, spacing);
 
     /* Create a series of buttons with the appropriate settings */
     button = gtk_button_new_with_label ("gtk_box_pack");
@@ -102,13 +102,13 @@ int main( int   argc,
     /* We create a vertical box (vbox) to pack the horizontal boxes into.
      * This allows us to stack the horizontal boxes filled with buttons one
      * on top of the other in this vbox. */
-    box1 = gtk_vbox_new (FALSE, 0);
+    box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
 
     /* which example to show. These correspond to the pictures above. */
     switch (which) {
     case 1:
        /* create a new label. */
-       label = gtk_label_new ("gtk_hbox_new (FALSE, 0);");
+       label = gtk_label_new ("gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);");
 
        /* Align the label to the left side.  We'll discuss this function and
         * others in the section on Widget Attributes. */
@@ -150,7 +150,7 @@ int main( int   argc,
        gtk_widget_show (separator);
 
        /* Create another new label, and show it. */
-       label = gtk_label_new ("gtk_hbox_new (TRUE, 0);");
+       label = gtk_label_new ("gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);");
        gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
        gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0);
        gtk_widget_show (label);
@@ -178,7 +178,7 @@ int main( int   argc,
 
        /* Create a new label, remember box1 is a vbox as created
         * near the beginning of main() */
-       label = gtk_label_new ("gtk_hbox_new (FALSE, 10);");
+       label = gtk_label_new ("gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);");
        gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
        gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0);
        gtk_widget_show (label);
@@ -199,7 +199,7 @@ int main( int   argc,
        gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
        gtk_widget_show (separator);
 
-       label = gtk_label_new ("gtk_hbox_new (FALSE, 0);");
+       label = gtk_label_new ("gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);");
        gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
        gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0);
        gtk_widget_show (label);
@@ -253,7 +253,7 @@ int main( int   argc,
     }
 
     /* Create another new hbox.. remember we can use as many as we need! */
-    quitbox = gtk_hbox_new (FALSE, 0);
+    quitbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
 
     /* Our quit button. */
     button = gtk_button_new_with_label ("Quit");

diff --git a/examples/progressbar/progressbar.c b/examples/progressbar/progressbar.c
index 790e97dff85ae70792c88c310e7330a471d8ca6a..37342ddec6b31c09b9a12dd77452f8b9ce134bac 100644 (file)
--- a/examples/progressbar/progressbar.c
+++ b/examples/progressbar/progressbar.c
@@ -116,7 +116,7 @@ int main( int   argc,
     gtk_window_set_title (GTK_WINDOW (pdata->window), "GtkProgressBar");
     gtk_container_set_border_width (GTK_CONTAINER (pdata->window), 0);
 
-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
     gtk_container_add (GTK_CONTAINER (pdata->window), vbox);
     gtk_widget_show (vbox);

diff --git a/examples/radiobuttons/radiobuttons.c b/examples/radiobuttons/radiobuttons.c
index 8f783016a1aa51cad838923734b0c203a8fdedad..2869df9c4439195c2a9961a78e7a93e1afaf288a 100644 (file)
--- a/examples/radiobuttons/radiobuttons.c
+++ b/examples/radiobuttons/radiobuttons.c
@@ -31,11 +31,11 @@ int main( int   argc,
     gtk_window_set_title (GTK_WINDOW (window), "radio buttons");
     gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-    box1 = gtk_vbox_new (FALSE, 0);
+    box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_add (GTK_CONTAINER (window), box1);
     gtk_widget_show (box1);
 
-    box2 = gtk_vbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
     gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
     gtk_widget_show (box2);
@@ -59,7 +59,7 @@ int main( int   argc,
     gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
     gtk_widget_show (separator);
 
-    box2 = gtk_vbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
     gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
     gtk_widget_show (box2);

diff --git a/examples/rangewidgets/rangewidgets.c b/examples/rangewidgets/rangewidgets.c
index fe274a3aae213777ca0721b5a17f3a6826704895..b59dc85d26724196785ba2394704fe2bdf7de3fd 100644 (file)
--- a/examples/rangewidgets/rangewidgets.c
+++ b/examples/rangewidgets/rangewidgets.c
@@ -96,11 +96,11 @@ static void create_range_controls( void )
                       NULL);
     gtk_window_set_title (GTK_WINDOW (window), "range controls");
 
-    box1 = gtk_vbox_new (FALSE, 0);
+    box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_add (GTK_CONTAINER (window), box1);
     gtk_widget_show (box1);
 
-    box2 = gtk_hbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
     gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
     gtk_widget_show (box2);
@@ -116,7 +116,7 @@ static void create_range_controls( void )
     gtk_box_pack_start (GTK_BOX (box2), vscale, TRUE, TRUE, 0);
     gtk_widget_show (vscale);
 
-    box3 = gtk_vbox_new (FALSE, 10);
+    box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
     gtk_box_pack_start (GTK_BOX (box2), box3, TRUE, TRUE, 0);
     gtk_widget_show (box3);
 
@@ -136,7 +136,7 @@ static void create_range_controls( void )
     gtk_box_pack_start (GTK_BOX (box3), scrollbar, TRUE, TRUE, 0);
     gtk_widget_show (scrollbar);
 
-    box2 = gtk_hbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
     gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
     gtk_widget_show (box2);
@@ -149,7 +149,7 @@ static void create_range_controls( void )
     gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
     gtk_widget_show (button);
 
-    box2 = gtk_hbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
 
     /* An option menu to change the position of the value */
@@ -184,7 +184,7 @@ static void create_range_controls( void )
     gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
     gtk_widget_show (box2);
 
-    box2 = gtk_hbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
 
     /* Yet another option menu, this time for the update policy of the
@@ -218,7 +218,7 @@ static void create_range_controls( void )
     gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
     gtk_widget_show (box2);
 
-    box2 = gtk_hbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
 
     /* An HScale widget for adjusting the number of digits on the
@@ -238,7 +238,7 @@ static void create_range_controls( void )
     gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
     gtk_widget_show (box2);
 
-    box2 = gtk_hbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
 
     /* And, one last HScale widget for adjusting the page size of the
@@ -262,7 +262,7 @@ static void create_range_controls( void )
     gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
     gtk_widget_show (separator);
 
-    box2 = gtk_vbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
     gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
     gtk_widget_show (box2);

diff --git a/examples/scribble-simple/scribble-simple.c b/examples/scribble-simple/scribble-simple.c
index a0cfc210ef7787987dd42711d6739b4caeff0e6e..0689752d85d90362e4676870e4b55277394bf047 100644 (file)
--- a/examples/scribble-simple/scribble-simple.c
+++ b/examples/scribble-simple/scribble-simple.c
@@ -129,7 +129,7 @@ int main( int   argc,
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_name (window, "Test Input");
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
   gtk_widget_show (vbox);
 

diff --git a/examples/scribble-xinput/scribble-xinput.c b/examples/scribble-xinput/scribble-xinput.c
index 469ee31ba993807832f44d2f8afbb72051abee0b..2ca3717ef1a1a894f0fc67f1ff717292e0c16c48 100644 (file)
--- a/examples/scribble-xinput/scribble-xinput.c
+++ b/examples/scribble-xinput/scribble-xinput.c
@@ -190,7 +190,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_name (window, "Test Input");
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
   gtk_widget_show (vbox);
 

diff --git a/examples/spinbutton/spinbutton.c b/examples/spinbutton/spinbutton.c
index a27e7e357de53eb51dea5e947b57fad1cd46857c..ccde95d6a0baf64ddcb0c9dbb5c8584f81293618 100644 (file)
--- a/examples/spinbutton/spinbutton.c
+++ b/examples/spinbutton/spinbutton.c
@@ -69,23 +69,23 @@ int main( int   argc,
 
   gtk_window_set_title (GTK_WINDOW (window), "Spin Button");
 
-  main_vbox = gtk_vbox_new (FALSE, 5);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 10);
   gtk_container_add (GTK_CONTAINER (window), main_vbox);
 
   frame = gtk_frame_new ("Not accelerated");
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
 
   /* Day, month, year spinners */
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
 
   label = gtk_label_new ("Day :");
@@ -97,7 +97,7 @@ int main( int   argc,
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
 
   label = gtk_label_new ("Month :");
@@ -109,7 +109,7 @@ int main( int   argc,
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
 
   label = gtk_label_new ("Year :");
@@ -125,14 +125,14 @@ int main( int   argc,
   frame = gtk_frame_new ("Accelerated");
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
 
   label = gtk_label_new ("Value :");
@@ -145,7 +145,7 @@ int main( int   argc,
   gtk_widget_set_size_request (spinner1, 100, -1);
   gtk_box_pack_start (GTK_BOX (vbox2), spinner1, FALSE, TRUE, 0);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
 
   label = gtk_label_new ("Digits :");
@@ -160,7 +160,7 @@ int main( int   argc,
                    spinner2);
   gtk_box_pack_start (GTK_BOX (vbox2), spinner2, FALSE, TRUE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
 
   button = gtk_check_button_new_with_label ("Snap to 0.5-ticks");
@@ -179,7 +179,7 @@ int main( int   argc,
 
   val_label = gtk_label_new ("");
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
   button = gtk_button_new_with_label ("Value as Int");
   g_object_set_data (G_OBJECT (button), "user_data", val_label);
@@ -198,7 +198,7 @@ int main( int   argc,
   gtk_box_pack_start (GTK_BOX (vbox), val_label, TRUE, TRUE, 0);
   gtk_label_set_text (GTK_LABEL (val_label), "0");
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
 
   button = gtk_button_new_with_label ("Close");

diff --git a/examples/statusbar/statusbar.c b/examples/statusbar/statusbar.c
index 6e06abb08dc3a3f443dd505f6df8f8429ccfe9d7..bd8d8e2a0b8d63b4bdadec6e9f9b7a1062224490 100644 (file)
--- a/examples/statusbar/statusbar.c
+++ b/examples/statusbar/statusbar.c
@@ -41,7 +41,7 @@ int main( int   argc,
     g_signal_connect (window, "delete-event",
                       G_CALLBACK (exit), NULL);
 
-    vbox = gtk_vbox_new (FALSE, 1);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 1);
     gtk_container_add (GTK_CONTAINER (window), vbox);
     gtk_widget_show (vbox);
 

diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index a47a247fb75d4cdf0a660e7cb3b3a57b2d1f3647..ac09e5cf2000d423ddfab8c1a4984e897233560a 100644 (file)
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -574,7 +574,7 @@ gtk_about_dialog_init (GtkAboutDialog *about)
   /* Widgets */
   gtk_widget_push_composite_child ();
 
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
   gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
 
@@ -597,7 +597,7 @@ gtk_about_dialog_init (GtkAboutDialog *about)
   gtk_label_set_justify (GTK_LABEL (priv->copyright_label), GTK_JUSTIFY_CENTER);
   gtk_box_pack_start (GTK_BOX (vbox), priv->copyright_label, FALSE, FALSE, 0);
 
-  hbox = gtk_hbox_new (TRUE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, FALSE, 0);
 
   priv->website_label = button = gtk_label_new ("");

diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 7f5803d09eba5f6a5393b840fce58f2f33b0634f..3fc0616bb0279044ecef4b269890c66978af1c8d 100644 (file)
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -805,7 +805,7 @@ gtk_assistant_init (GtkAssistant *assistant)
   gtk_widget_show (priv->sidebar_image);
 
   /* Action area  */
-  priv->action_area  = gtk_hbox_new (FALSE, 6);
+  priv->action_area  = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
   
   priv->close   = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
   priv->apply   = gtk_button_new_from_stock (GTK_STOCK_APPLY);

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index ab3fe77f023b75ee6862c016348eb48c61a2a7e9..3c81cbfca09b81786a6baa09542d12a47b12dbd8 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1025,9 +1025,9 @@ gtk_button_construct_child (GtkButton *button)
 
       if (priv->image_position == GTK_POS_LEFT ||
          priv->image_position == GTK_POS_RIGHT)
-       box = gtk_hbox_new (FALSE, image_spacing);
+       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, image_spacing);
       else
-       box = gtk_vbox_new (FALSE, image_spacing);
+       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, image_spacing);
 
       if (priv->align_set)
        align = gtk_alignment_new (priv->xalign, priv->yalign, 0.0, 0.0);

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index ef18b34813d8ea92607d8495ff348b6229926ad8..4bd1e50412643ec810b3cb19d1679c8fddce6b9b 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -381,10 +381,10 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
   priv->default_set = FALSE;
   priv->default_alpha_set = FALSE;
   
-  top_hbox = gtk_hbox_new (FALSE, 12);
+  top_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
   gtk_box_pack_start (GTK_BOX (colorsel), top_hbox, FALSE, FALSE, 0);
   
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
   priv->triangle_colorsel = gtk_hsv_new ();
   g_signal_connect (priv->triangle_colorsel, "changed",
                     G_CALLBACK (hsv_changed), colorsel);
@@ -394,7 +394,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
   gtk_widget_set_tooltip_text (priv->triangle_colorsel,
                         _("Select the color you want from the outer ring. Select the darkness or lightness of that color using the inner triangle."));
   
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
   gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   
   frame = gtk_frame_new (NULL);
@@ -418,7 +418,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
   gtk_widget_set_tooltip_text (button,
                         _("Click the eyedropper, then click a color anywhere on your screen to select that color."));
   
-  top_right_vbox = gtk_vbox_new (FALSE, 6);
+  top_right_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
   gtk_box_pack_start (GTK_BOX (top_hbox), top_right_vbox, FALSE, FALSE, 0);
   table = gtk_table_new (8, 6, FALSE);
   gtk_box_pack_start (GTK_BOX (top_right_vbox), table, FALSE, FALSE, 0);
@@ -507,7 +507,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
        }
     }
   set_selected_palette (colorsel, 0, 0);
-  priv->palette_frame = gtk_vbox_new (FALSE, 6);
+  priv->palette_frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
   label = gtk_label_new_with_mnemonic (_("_Palette:"));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_box_pack_start (GTK_BOX (priv->palette_frame), label, FALSE, FALSE, 0);
@@ -1029,7 +1029,7 @@ color_sample_new (GtkColorSelection *colorsel)
   
   priv = colorsel->private_data;
   
-  priv->sample_area = gtk_hbox_new (FALSE, 0);
+  priv->sample_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   priv->old_sample = gtk_drawing_area_new ();
   priv->cur_sample = gtk_drawing_area_new ();
 

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index e2ec211c632242de03207abdd7ad4edfa65c77f3..d36990ea8b38e280e08eff85f72dd336f27c33d4 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3030,7 +3030,7 @@ gtk_combo_box_menu_setup (GtkComboBox *combo_box,
       gtk_widget_set_parent (priv->button,
                              gtk_widget_get_parent (child));
 
-      priv->box = gtk_hbox_new (FALSE, 0);
+      priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (priv->button), priv->box);
 
       priv->separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);

diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index 79bc61086d5d366b2a5eebb423243fa2bcb7eeb3..b64987a5c9f7cf0e24dacea13d286952b82a0eda 100644 (file)
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -514,7 +514,7 @@ new_unit_widget (GtkCustomPaperUnixDialog *dialog,
   data = g_new0 (UnitWidget, 1);
   data->display_unit = unit;
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
 
   button = gtk_spin_button_new_with_range (0.0, 9999.0, 1);
   if (unit == GTK_UNIT_INCH)
@@ -943,7 +943,7 @@ wrap_in_frame (const gchar *label,
   gtk_label_set_markup (GTK_LABEL (label_widget), bold_text);
   g_free (bold_text);
 
-  frame = gtk_vbox_new (FALSE, 6);
+  frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
   gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE, 0);
 
   alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
@@ -981,12 +981,12 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
   gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
   gtk_box_set_spacing (GTK_BOX (action_area), 6);
 
-  hbox = gtk_hbox_new (FALSE, 18);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 18);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
   gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
@@ -1022,7 +1022,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
   gtk_container_add (GTK_CONTAINER (scrolled), treeview);
   gtk_widget_show (treeview);
 
-  button_box = gtk_hbox_new (FALSE, 6);
+  button_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
   gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, FALSE, 0);
   gtk_widget_show (button_box);
 
@@ -1046,7 +1046,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
 
   user_units = _gtk_print_get_default_user_units ();
 
-  vbox = gtk_vbox_new (FALSE, 18);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 18);
   priv->values_box = vbox;
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
@@ -1137,7 +1137,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
                    1, 2, 3, 4, GTK_FILL, 0, 0, 0);
   gtk_widget_show (widget);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_table_attach (GTK_TABLE (table), hbox,
                    0, 2, 4, 5, GTK_FILL | GTK_EXPAND, 0, 0, 0);
   gtk_widget_show (hbox);

diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 681899389f038fc810a7ed2e7cd761052cf1af0c..0b627c16e2f70b6cd506911f37d3371ba4895b3e 100644 (file)
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -257,7 +257,7 @@ gtk_dialog_init (GtkDialog *dialog)
                     G_CALLBACK (gtk_dialog_delete_event_handler),
                     NULL);
 
-  priv->vbox = gtk_vbox_new (FALSE, 0);
+  priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
 
   gtk_container_add (GTK_CONTAINER (dialog), priv->vbox);
   gtk_widget_show (priv->vbox);

diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 2516f3dc4f5dd0b6ed1f20894600704a836b6a40..df83aaec52d02fe05b4f5883a609d95c456998f7 100644 (file)
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -528,7 +528,7 @@ gtk_entry_completion_init (GtkEntryCompletion *completion)
   gtk_widget_show (popup_frame);
   gtk_container_add (GTK_CONTAINER (priv->popup_window), popup_frame);
   
-  priv->vbox = gtk_vbox_new (FALSE, 0);
+  priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (popup_frame), priv->vbox);
 
   gtk_container_add (GTK_CONTAINER (priv->scrolled_window), priv->tree_view);

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 3b2acc3397ead2de6702faecb28f7713d16ae8c8..4f08f76cb4dcbcbec95695fe8007a5328ce90f0c 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -441,7 +441,7 @@ gtk_file_chooser_button_init (GtkFileChooserButton *button)
   gtk_container_add (GTK_CONTAINER (button), priv->button);
   gtk_widget_show (priv->button);
 
-  box = gtk_hbox_new (FALSE, 4);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 4);
   gtk_container_add (GTK_CONTAINER (priv->button), box);
   gtk_widget_show (box);
 

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 5abcd27a0d99906a618d49a9a8778dbb9bbebba0..3aac30a15b0f6886d8eeedd0e603192b52c88819 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -3706,7 +3706,7 @@ shortcuts_pane_create (GtkFileChooserDefault *impl,
   GtkWidget *hbox;
   GtkWidget *widget;
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
   gtk_widget_show (vbox);
 
   /* Shortcuts tree */
@@ -3716,7 +3716,7 @@ shortcuts_pane_create (GtkFileChooserDefault *impl,
 
   /* Box for buttons */
 
-  hbox = gtk_hbox_new (TRUE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 6);
   gtk_size_group_add_widget (size_group, hbox);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
@@ -4422,12 +4422,13 @@ file_pane_create (GtkFileChooserDefault *impl,
   GtkWidget *hbox;
   GtkWidget *widget;
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
   gtk_widget_show (vbox);
 
   /* Box for lists and preview */
 
-  hbox = gtk_hbox_new (FALSE, PREVIEW_HBOX_SPACING);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,
+                      FALSE, PREVIEW_HBOX_SPACING);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
   gtk_widget_show (hbox);
 
@@ -4438,13 +4439,13 @@ file_pane_create (GtkFileChooserDefault *impl,
 
   /* Preview */
 
-  impl->preview_box = gtk_vbox_new (FALSE, 12);
+  impl->preview_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 12);
   gtk_box_pack_start (GTK_BOX (hbox), impl->preview_box, FALSE, FALSE, 0);
   /* Don't show preview box initially */
 
   /* Filter combo */
 
-  impl->filter_combo_hbox = gtk_hbox_new (FALSE, 12);
+  impl->filter_combo_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
 
   widget = filter_create (impl);
 
@@ -4632,7 +4633,7 @@ save_widgets_create (GtkFileChooserDefault *impl)
 
   location_switch_to_path_bar (impl);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 12);
 
   table = gtk_table_new (2, 2, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
@@ -4972,10 +4973,10 @@ browse_widgets_create (GtkFileChooserDefault *impl)
 
   /* size group is used by the [+][-] buttons and the filter combo */
   size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 12);
 
   /* Location widgets */
-  impl->browse_path_bar_hbox = gtk_hbox_new (FALSE, 12);
+  impl->browse_path_bar_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
   gtk_box_pack_start (GTK_BOX (vbox), impl->browse_path_bar_hbox, FALSE, FALSE, 0);
   gtk_widget_show (impl->browse_path_bar_hbox);
 
@@ -5005,7 +5006,7 @@ browse_widgets_create (GtkFileChooserDefault *impl)
 
   /* Box for the location label and entry */
 
-  impl->location_entry_box = gtk_hbox_new (FALSE, 12);
+  impl->location_entry_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
   gtk_box_pack_start (GTK_BOX (vbox), impl->location_entry_box, FALSE, FALSE, 0);
 
   impl->location_label = gtk_label_new_with_mnemonic (_("_Location:"));
@@ -8941,7 +8942,7 @@ search_setup_widgets (GtkFileChooserDefault *impl)
   GtkWidget *image;
   gchar *tmp;
 
-  impl->search_hbox = gtk_hbox_new (FALSE, 12);
+  impl->search_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
   
   /* Image */
 
@@ -9371,7 +9372,7 @@ recent_hide_entry (GtkFileChooserDefault *impl)
   GtkWidget *image;
   gchar *tmp;
 
-  impl->recent_hbox = gtk_hbox_new (FALSE, 12);
+  impl->recent_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
 
   /* Image */
   image = gtk_image_new_from_icon_name ("document-open-recent", GTK_ICON_SIZE_BUTTON);

diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index fb19688db3cbcb0507a272476450572935ebc7b9..e3458ff3cb59dff33b6279b2eee2aba863766f9d 100644 (file)
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -780,7 +780,7 @@ gtk_font_button_create_inside (GtkFontButton *font_button)
   
   gtk_widget_push_composite_child ();
 
-  widget = gtk_hbox_new (FALSE, 0);
+  widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   
   font_button->priv->font_label = gtk_label_new (_("Font"));
   

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 394ff4559fc10df1bdafd2445ccd9f24387186bd..7dfcfbdb2a96a57a675fab7fe1024e827af2d6b2 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -551,7 +551,7 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
     }    
       
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
   gtk_widget_show (vbox);
   gtk_box_pack_start (GTK_BOX (fontsel), vbox, FALSE, TRUE, 0);
   
@@ -561,7 +561,7 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
   gtk_widget_show (label);
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
   
-  text_box = gtk_hbox_new (FALSE, 0);
+  text_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_widget_show (text_box);
   gtk_box_pack_start (GTK_BOX (vbox), text_box, FALSE, TRUE, 0);
   

diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index 273be407a1db599e5a33cf1b2c7239b8f7b56ca4..f3855de95664899d7057207d5905efcb96202345 100644 (file)
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -612,7 +612,7 @@ gtk_info_bar_init (GtkInfoBar *info_bar)
                                                 GTK_TYPE_INFO_BAR,
                                                 GtkInfoBarPrivate);
 
-  content_area = gtk_hbox_new (FALSE, 0);
+  content_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_widget_show (content_area);
   gtk_box_pack_start (GTK_BOX (info_bar), content_area, TRUE, TRUE, 0);
 

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 4240325d3b01131e34e2e0fb0bf7e52780559ca9..f36a9d5548c25b90cad7f3f5a9bd26238aa7f136 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2158,8 +2158,8 @@ gtk_menu_set_tearoff_state (GtkMenu  *menu,
              if (toplevel != NULL)
                gtk_window_set_transient_for (GTK_WINDOW (menu->tearoff_window),
                                              GTK_WINDOW (toplevel));
-             
-             menu->tearoff_hbox = gtk_hbox_new (FALSE, FALSE);
+
+             menu->tearoff_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
              gtk_container_add (GTK_CONTAINER (menu->tearoff_window), menu->tearoff_hbox);
 
               height = gdk_window_get_height (gtk_widget_get_window (GTK_WIDGET (menu)));

diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 940b4f20a0a4ddfdcf6e6b792a4c5944b33e6365..4d1e02620addf2dc813bb05e9527a91e831c495d 100644 (file)
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -77,12 +77,12 @@ gtk_menu_tool_button_construct_contents (GtkMenuToolButton *button)
 
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
     {
-      box = gtk_hbox_new (FALSE, 0);
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_arrow_set (GTK_ARROW (priv->arrow), GTK_ARROW_DOWN, GTK_SHADOW_NONE);
     }
   else
     {
-      box = gtk_vbox_new (FALSE, 0);
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_arrow_set (GTK_ARROW (priv->arrow), GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
     }
 
@@ -398,7 +398,7 @@ gtk_menu_tool_button_init (GtkMenuToolButton *button)
 
   gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (button), FALSE);
 
-  box = gtk_hbox_new (FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
 
   real_button = gtk_bin_get_child (GTK_BIN (button));
   g_object_ref (real_button);

diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index d8fa79a28cb68980469a310871670a81a96a7269..652b5a6815fe62d1f7e38ab7370ac51947d0a6fe 100644 (file)
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -347,8 +347,8 @@ gtk_message_dialog_init (GtkMessageDialog *dialog)
   gtk_label_set_selectable (GTK_LABEL (priv->secondary_label), TRUE);
   gtk_misc_set_alignment   (GTK_MISC  (priv->secondary_label), 0.0, 0.0);
 
-  hbox = gtk_hbox_new (FALSE, 12);
-  priv->message_area = gtk_vbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
+  priv->message_area = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 12);
 
   gtk_box_pack_start (GTK_BOX (priv->message_area), priv->label,
                       FALSE, FALSE, 0);

diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 8023dbfaf98757f5a3b5aef8a7b6ecaa9a3f7351..130090f2f1ff8bea4613bcbebb1c4f67abf14361 100644 (file)
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -498,7 +498,7 @@ gtk_mount_operation_ask_password (GMountOperation   *mount_op,
                                            -1);
 
   /* Build contents */
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
   gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
 
@@ -508,7 +508,7 @@ gtk_mount_operation_ask_password (GMountOperation   *mount_op,
   gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0.0);
   gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
 
-  main_vbox = gtk_vbox_new (FALSE, 18);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 18);
   gtk_box_pack_start (GTK_BOX (hbox), main_vbox, TRUE, TRUE, 0);
 
   secondary = strstr (message, "\n");
@@ -539,7 +539,7 @@ gtk_mount_operation_ask_password (GMountOperation   *mount_op,
                           FALSE, FALSE, 0);
     }
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
   gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
 
   can_anonymous = flags & G_ASK_PASSWORD_ANONYMOUS_SUPPORTED;
@@ -551,7 +551,7 @@ gtk_mount_operation_ask_password (GMountOperation   *mount_op,
       GtkWidget *choice;
       GSList    *group;
 
-      anon_box = gtk_vbox_new (FALSE, 6);
+      anon_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
       gtk_box_pack_start (GTK_BOX (vbox), anon_box,
                           FALSE, FALSE, 0);
 
@@ -625,7 +625,7 @@ gtk_mount_operation_ask_password (GMountOperation   *mount_op,
       GSList       *group;
       GPasswordSave password_save;
 
-      remember_box = gtk_vbox_new (FALSE, 6);
+      remember_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
       gtk_box_pack_start (GTK_BOX (vbox), remember_box,
                           FALSE, FALSE, 0);
 
@@ -1218,7 +1218,7 @@ create_show_processes_dialog (GMountOperation *op,
   gtk_window_set_title (GTK_WINDOW (dialog), "");
 
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
 

diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c
index 3036f5ceab98c7d4a2a66e5e0616b0c0f8a668f8..93eecbabf672e4e3fda2a8a612e4986b617e5163 100644 (file)
--- a/gtk/gtkpagesetupunixdialog.c
+++ b/gtk/gtkpagesetupunixdialog.c
@@ -870,7 +870,7 @@ create_radio_button (GSList      *group,
   image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_LARGE_TOOLBAR);
   gtk_stock_lookup (stock_id, &item);
   label = gtk_label_new (item.label);
-  hbox = gtk_hbox_new (0, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0, 6);
   gtk_container_add (GTK_CONTAINER (radio_button), hbox);
   gtk_container_add (GTK_CONTAINER (hbox), image);
   gtk_container_add (GTK_CONTAINER (hbox), label);

diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index d5447e8cd068171ac07f396830a2f4fbf0d8800f..60af22f31c94e7c87ad38e525c19ddbde55f8b26 100644 (file)
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -1528,7 +1528,7 @@ make_directory_button (GtkPathBar  *path_bar,
       button_data->label = gtk_label_new (NULL);
       label_alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
       gtk_container_add (GTK_CONTAINER (label_alignment), button_data->label);
-      child = gtk_hbox_new (FALSE, 2);
+      child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 2);
       gtk_box_pack_start (GTK_BOX (child), button_data->image, FALSE, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (child), label_alignment, FALSE, FALSE, 0);
       break;

diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index 60c12b73024fd932529a5dd8a4ff0b521982e274..ce35f1c654417bc4cdc1c558438220757327e492 100644 (file)
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -753,7 +753,7 @@ request_password (GtkPrintBackend  *backend,
 
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
-  main_box = gtk_hbox_new (FALSE, 0);
+  main_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
 
   /* Left */
   icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG);
@@ -762,7 +762,7 @@ request_password (GtkPrintBackend  *backend,
 
 
   /* Right */
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_widget_set_size_request (GTK_WIDGET (vbox), 320, -1);
 
   /* Right - 1. */
@@ -789,7 +789,7 @@ request_password (GtkPrintBackend  *backend,
       priv->auth_info[i] = g_strdup (ai_default[i]);
       if (ai_display[i] != NULL)
         {
-          box = gtk_hbox_new (TRUE, 0);
+          box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);
 
           label = gtk_label_new (ai_display[i]);
           gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);

diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c
index 28cc5bfba8a6e74f9a966ea4b6c4b586ac496788..12301d8829f17fd1262f1cbd1f1ff431d9af7435 100644 (file)
--- a/gtk/gtkprinteroptionwidget.c
+++ b/gtk/gtkprinteroptionwidget.c
@@ -739,7 +739,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
 
     case GTK_PRINTER_OPTION_TYPE_ALTERNATIVE:
       group = NULL;
-      priv->box = gtk_hbox_new (FALSE, 12);
+      priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
       gtk_widget_show (priv->box);
       gtk_box_pack_start (GTK_BOX (widget), priv->box, TRUE, TRUE, 0);
       for (i = 0; i < source->num_choices; i++)

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 032e1c2e877a6ee7a2b6df907256dfa1c53b3e6b..90c76a2ce7a721239b65213b93b881e34f0566e4 100644 (file)
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -1140,7 +1140,7 @@ wrap_in_frame (const gchar *label,
   gtk_label_set_markup (GTK_LABEL (label_widget), bold_text);
   g_free (bold_text);
 
-  frame = gtk_vbox_new (FALSE, 6);
+  frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
   gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE, 0);
 
   alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
@@ -1189,7 +1189,7 @@ add_option_to_extension_point (GtkPrinterOption *option,
       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
       gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
 
-      hbox = gtk_hbox_new (FALSE, 12);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
       gtk_widget_show (hbox);
@@ -2100,11 +2100,11 @@ create_main_page (GtkPrintUnixDialog *dialog)
   GtkWidget *custom_input;
   const gchar *range_tooltip;
 
-  main_vbox = gtk_vbox_new (FALSE, 18);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 18);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_widget_show (main_vbox);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
   gtk_box_pack_start (GTK_BOX (main_vbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
@@ -2170,12 +2170,12 @@ create_main_page (GtkPrintUnixDialog *dialog)
   gtk_widget_show (treeview);
   gtk_container_add (GTK_CONTAINER (scrolled), treeview);
 
-  custom_input = gtk_hbox_new (FALSE, 18);
+  custom_input = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 18);
   gtk_widget_show (custom_input);
   gtk_box_pack_start (GTK_BOX (vbox), custom_input, FALSE, FALSE, 0);
   priv->extension_point = custom_input;
 
-  hbox = gtk_hbox_new (FALSE, 18);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 18);
   gtk_widget_show (hbox);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
 
@@ -3300,11 +3300,11 @@ create_page_setup_page (GtkPrintUnixDialog *dialog)
   GtkWidget *combo, *spinbutton, *draw;
   GtkCellRenderer *cell;
 
-  main_vbox = gtk_vbox_new (FALSE, 18);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 18);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_widget_show (main_vbox);
 
-  hbox = gtk_hbox_new (FALSE, 18);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 18);
   gtk_widget_show (hbox);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
 
@@ -3390,7 +3390,7 @@ create_page_setup_page (GtkPrintUnixDialog *dialog)
                     0, 1, 4, 5,  GTK_FILL, 0,
                     0, 0);
 
-  hbox2 = gtk_hbox_new (FALSE, 6);
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
   gtk_widget_show (hbox2);
   gtk_table_attach (GTK_TABLE (table), hbox2,
                     1, 2, 4, 5,  GTK_FILL, 0,
@@ -3509,7 +3509,7 @@ create_page_setup_page (GtkPrintUnixDialog *dialog)
 
 
   /* Add the page layout preview */
-  hbox2 = gtk_hbox_new (FALSE, 0);
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_widget_show (hbox2);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox2, TRUE, TRUE, 0);
 
@@ -3759,7 +3759,7 @@ create_advanced_page (GtkPrintUnixDialog *dialog)
                                   GTK_POLICY_NEVER,
                                   GTK_POLICY_AUTOMATIC);
 
-  main_vbox = gtk_vbox_new (FALSE, 18);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 18);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_widget_show (main_vbox);
 
@@ -3793,7 +3793,7 @@ populate_dialog (GtkPrintUnixDialog *print_dialog)
   gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
   gtk_box_set_spacing (GTK_BOX (action_area), 6);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
   gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
@@ -3822,7 +3822,7 @@ populate_dialog (GtkPrintUnixDialog *print_dialog)
                         &priv->finishing_page);
   create_advanced_page (print_dialog);
 
-  priv->conflicts_widget = conflict_hbox = gtk_hbox_new (FALSE, 12);
+  priv->conflicts_widget = conflict_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
   gtk_box_pack_end (GTK_BOX (vbox), conflict_hbox, FALSE, FALSE, 0);
   image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU);
   gtk_widget_show (image);

diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 7a51b9525de291491354241bd43c90844b1c3a25..b412044eb225e5f8fa0b7d44b058f5a0d05c4743 100644 (file)
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -73,7 +73,7 @@
  *
  *    GtkWidget *window, *radio1, *radio2, *box, *entry;
  *    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- *    box = gtk_vbox_new (TRUE, 2);
+ *    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE, 2);
  *
  *    /* Create a radio button with a GtkEntry widget */
  *    radio1 = gtk_radio_button_new (NULL);

diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index 5445c65a086f96d5552823019b38721dad065fc9..41b7dd1ea84524674d0843e675e5231e971655c3 100644 (file)
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -473,7 +473,7 @@ gtk_recent_chooser_default_constructor (GType                  type,
                       GDK_ACTION_COPY);
   gtk_drag_source_add_uri_targets (impl->recent_view);
 
-  impl->filter_combo_hbox = gtk_hbox_new (FALSE, 12);
+  impl->filter_combo_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
   
   impl->filter_combo = gtk_combo_box_text_new ();
   gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE);

diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index 243873b4c40f15986b6334dea0a669fb5bdda92f..924f657e106cdfed9ca5545c2524de0d0e5953e7 100644 (file)
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -390,7 +390,7 @@ gtk_scale_button_init (GtkScaleButton *button)
   gtk_container_add (GTK_CONTAINER (priv->dock), frame);
 
   /* box for scale and +/- buttons */
-  priv->box = gtk_vbox_new (FALSE, 0);
+  priv->box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (frame), priv->box);
 
   /* + */

diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index cee01436174a86a93d43e105b79f244fc28f1a49..8ead97d5f12f5ee2a3ccc23cbb3b6d09254c7b48 100644 (file)
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -211,7 +211,7 @@ gtk_statusbar_init (GtkStatusbar *statusbar)
   gtk_box_pack_start (box, priv->frame, TRUE, TRUE, 0);
   gtk_widget_show (priv->frame);
 
-  message_area = gtk_hbox_new (FALSE, 4);
+  message_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 4);
   gtk_container_add (GTK_CONTAINER (priv->frame), message_area);
   gtk_widget_show (message_area);
 

diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index 1b94b23bfe17e41cfed0aa26a14cfe8f2c6251b7..e2876d8fb5800af16f306d97880b4c56e93f0b4f 100644 (file)
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -510,9 +510,9 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
 
     case GTK_TOOLBAR_BOTH:
       if (text_orientation == GTK_ORIENTATION_HORIZONTAL)
-       box = gtk_vbox_new (FALSE, icon_spacing);
+       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, icon_spacing);
       else
-       box = gtk_hbox_new (FALSE, icon_spacing);
+       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, icon_spacing);
       if (icon)
        gtk_box_pack_start (GTK_BOX (box), icon, TRUE, TRUE, 0);
       gtk_box_pack_end (GTK_BOX (box), label, FALSE, TRUE, 0);
@@ -522,7 +522,7 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
     case GTK_TOOLBAR_BOTH_HORIZ:
       if (text_orientation == GTK_ORIENTATION_HORIZONTAL)
        {
-         box = gtk_hbox_new (FALSE, icon_spacing);
+         box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, icon_spacing);
          if (icon)
            gtk_box_pack_start (GTK_BOX (box), icon, label? FALSE : TRUE, TRUE, 0);
          if (label)
@@ -530,7 +530,7 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
        }
       else
        {
-         box = gtk_vbox_new (FALSE, icon_spacing);
+         box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, icon_spacing);
          if (icon)
            gtk_box_pack_end (GTK_BOX (box), icon, label ? FALSE : TRUE, TRUE, 0);
          if (label)

diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 8ef7754ddee20a44fc647c3447a0e3a43efa12cf..f9658df988fca409d7194043704cbaed6b78121d 100644 (file)
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -221,7 +221,8 @@ gtk_tooltip_init (GtkTooltip *tooltip)
   g_signal_connect_swapped (tooltip->window, "draw",
                            G_CALLBACK (gtk_tooltip_paint_window), tooltip);
 
-  tooltip->box = gtk_hbox_new (FALSE, style->xthickness);
+  tooltip->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,
+                              FALSE, style->xthickness);
   gtk_container_add (GTK_CONTAINER (tooltip->alignment), tooltip->box);
   gtk_widget_show (tooltip->box);
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 619e75ea015c0a84ff959da6fd9f9eeb8ae13c1d..4a48d3c48c8e9070001d6bb8dfe1be7b928a1d63 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -10368,7 +10368,7 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view)
   gtk_widget_show (frame);
   gtk_container_add (GTK_CONTAINER (tree_view->priv->search_window), frame);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_widget_show (vbox);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 161eb6d315532b54f451007ffb2751c77160d33f..3ea185af29013f3bb4a5b78d78b9c1ac1271cdba 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -874,7 +874,7 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column)
 
   tree_column->alignment = gtk_alignment_new (tree_column->xalign, 0.5, 0.0, 0.0);
 
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 2);
   tree_column->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_IN);
 
   if (tree_column->child)

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 216054cbcd3659ec2fa431a2d5098d9b6785752a..2073f17dc1dba78e9155f4169fa52250ff0af90c 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -9066,7 +9066,7 @@ gtk_XParseGeometry (const char   *string,
  *   gtk_init (&argc, &argv);
  *   
  *   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- *   vbox = gtk_vbox_new (FALSE, 0);
+ *   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
  *   
  *   gtk_container_add (GTK_CONTAINER (window), vbox);
  *   fill_with_content (vbox);

diff --git a/gtk/tests/crossingevents.c b/gtk/tests/crossingevents.c
index 55eaaf3ce2059cf47239b05def77e8ae0f0d9a8a..30d7dd6819e26b49c5280f116aa909cf0a0f4d68 100644 (file)
--- a/gtk/tests/crossingevents.c
+++ b/gtk/tests/crossingevents.c
@@ -144,7 +144,7 @@ sensitivity_setup (CrossingTest *test,
   test->eventbox = gtk_event_box_new ();
   gtk_widget_set_name (test->eventbox, "E");
 
-  GtkWidget *vbox = gtk_vbox_new (FALSE, 10);
+  GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
   gtk_container_add (GTK_CONTAINER (test->window), frame);
   gtk_container_add (GTK_CONTAINER (frame), test->eventbox);
   gtk_container_add (GTK_CONTAINER (test->eventbox), vbox);

diff --git a/modules/other/gail/tests/ferret.c b/modules/other/gail/tests/ferret.c
index df93fd4f603943b525b0bd001aa4c3985cda2f1a..a59e728ae9d9e5fabd3e02d960b7982cc0b510b1 100644 (file)
--- a/modules/other/gail/tests/ferret.c
+++ b/modules/other/gail/tests/ferret.c
@@ -1610,49 +1610,49 @@ _init_data(void)
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 20);
   the_tab->name = "Object";
   nbook_tabs[OBJECT] = the_tab;
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 20);
   the_tab->name = "Action";
   nbook_tabs[ACTION] = the_tab;
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 20);
   the_tab->name = "Component";
   nbook_tabs[COMPONENT] = the_tab;
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 20);
   the_tab->name = "Image";
   nbook_tabs[IMAGE] = the_tab;
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 20);
   the_tab->name = "Selection";
   nbook_tabs[SELECTION] = the_tab;
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 20);
   the_tab->name = "Table";
   nbook_tabs[TABLE] = the_tab;
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 20);
   the_tab->name = "Text";
   nbook_tabs[TEXT] = the_tab;
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 20);
   the_tab->name = "Value";
   nbook_tabs[VALUE] = the_tab;
 }
@@ -1675,7 +1675,7 @@ _create_window (void)
         gtk_window_set_default_size (GTK_WINDOW (window), 333, 550);
         gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-        vbox1 = gtk_vbox_new (FALSE, 0);
+        vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
         gtk_container_add (GTK_CONTAINER (window), vbox1);
         gtk_widget_show (vbox1);
 
@@ -1875,7 +1875,7 @@ _get_group(TabInfo *tab, GroupId group_id, const gchar *groupname)
        gtk_container_set_border_width(GTK_CONTAINER(group->frame), 10);
 
        group->name = g_strdup(groupname);
-       group->group_vbox = GTK_VBOX(gtk_vbox_new(FALSE, 10));
+       group->group_vbox = GTK_VBOX(gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10));
 
        if (group->is_scrolled)
          {
@@ -1971,9 +1971,9 @@ _get_name_value(GroupInfo *group, const gchar *label,
     if (!found)
       {
         name_value = (NameValue *)g_new0(NameValue, 1);
-        name_value->column1 = GTK_HBOX(gtk_hbox_new(FALSE, 10));
-        name_value->column2 = GTK_HBOX(gtk_hbox_new(FALSE, 10));
-        name_value->hbox = GTK_HBOX(gtk_hbox_new(FALSE, 5));
+        name_value->column1 = GTK_HBOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10));
+        name_value->column2 = GTK_HBOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10));
+        name_value->hbox = GTK_HBOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5));
         name_value->label = GTK_LABEL(gtk_label_new(label));
         name_value->string = gtk_label_new (NULL);
         name_value->boolean = gtk_check_button_new ();

diff --git a/modules/other/gail/tests/testlib.c b/modules/other/gail/tests/testlib.c
index 87a17c60cf14cb81255cc5f9e57080b49ac64d21..59fb37c9c61fc9606197e501d2982e0996c89b3f 100644 (file)
--- a/modules/other/gail/tests/testlib.c
+++ b/modules/other/gail/tests/testlib.c
@@ -586,7 +586,7 @@ _create_select_tests_window (AtkObject    *obj,
                          scrolledWindow);
       
       /* Setup Layout */
-      md[window_no]->vbox = gtk_vbox_new (TRUE, 0);
+      md[window_no]->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE, 0);
       md[window_no]->button = gtk_button_new_with_mnemonic ("_Run Tests");
       hbuttonbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox),
@@ -645,7 +645,7 @@ add_test (gint   window,
     return FALSE;
   else
     {
-      md[window]->hbox = gtk_hbox_new (FALSE, 0);
+      md[window]->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_box_set_spacing (GTK_BOX (md[window]->hbox), 10);
       gtk_container_set_border_width (GTK_CONTAINER (md[window]->hbox), 10);
       gtk_container_add (GTK_CONTAINER (md[window]->vbox), md[window]->hbox);

diff --git a/modules/other/gail/tests/testtable.c b/modules/other/gail/tests/testtable.c
index eb7e0744de68844b015063964c5ba689aa854799..877f07727beddcb90384302b97c10d54bc3d9ffa 100644 (file)
--- a/modules/other/gail/tests/testtable.c
+++ b/modules/other/gail/tests/testtable.c
@@ -763,11 +763,11 @@ void test_choice_gui(AtkObject **obj)
   g_signal_connect(window, "destroy",
                    G_CALLBACK (destroy), &window);
 
-  vbox = gtk_vbox_new(TRUE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE, 0);
   gtk_box_set_spacing(GTK_BOX(vbox), 10);
 
 
-  hbox = gtk_hbox_new(FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_set_spacing(GTK_BOX(hbox), 10);
   tc->tb_ref_selection = gtk_toggle_button_new_with_label("ref_selection");
   gtk_box_pack_start (GTK_BOX (hbox), tc->tb_ref_selection, TRUE, TRUE, 0);
@@ -778,7 +778,7 @@ void test_choice_gui(AtkObject **obj)
   gtk_box_pack_start (GTK_BOX (hbox), tc->index_entry, TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); 
 
-  hbox = gtk_hbox_new(FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_set_spacing(GTK_BOX(hbox), 10);
   tc->tb_ref_at = gtk_toggle_button_new_with_label("ref_at");
   gtk_box_pack_start (GTK_BOX (hbox), tc->tb_ref_at, TRUE, TRUE, 0);
@@ -794,7 +794,7 @@ void test_choice_gui(AtkObject **obj)
   gtk_box_pack_start (GTK_BOX (hbox), tc->col_entry, TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); 
 
-  hbox = gtk_hbox_new(FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_set_spacing(GTK_BOX(hbox), 10);
   tc->tb_ref_accessible_child = gtk_toggle_button_new_with_label("ref_accessible_child");
   gtk_box_pack_start (GTK_BOX (hbox), tc->tb_ref_accessible_child, TRUE, TRUE, 0);

diff --git a/perf/appwindow.c b/perf/appwindow.c
index cb239abc94746251617fe72fc06b507ac49080e0..f31ed8501703be8a2a4fc3c4672908a1f7a04a72 100644 (file)
--- a/perf/appwindow.c
+++ b/perf/appwindow.c
@@ -214,7 +214,7 @@ appwindow_new (void)
   g_signal_connect_swapped (window, "destroy",
                            G_CALLBACK (g_object_unref), ui);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   widget = menubar_new (ui);

diff --git a/tests/flicker.c b/tests/flicker.c
index 1c0f81cf920728ab7be7daaf3ef336cb12b6666b..376c248e6987baec2bd257b818f8fbf8332d9f46 100644 (file)
--- a/tests/flicker.c
+++ b/tests/flicker.c
@@ -68,7 +68,7 @@ create_flicker (void)
   gtk_paned_pack1 (GTK_PANED (hpaned1), vpaned2, FALSE, TRUE);
   gtk_paned_set_position (GTK_PANED (vpaned2), 100);
 
-  hbox2 = gtk_hbox_new (FALSE, 0);
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_widget_show (hbox2);
   gtk_paned_pack1 (GTK_PANED (vpaned2), hbox2, FALSE, TRUE);
 
@@ -82,7 +82,7 @@ create_flicker (void)
   gtk_widget_show (spinbutton8);
   gtk_box_pack_start (GTK_BOX (hbox2), spinbutton8, TRUE, TRUE, 0);
 
-  vbox1 = gtk_vbox_new (FALSE, 0);
+  vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_widget_show (vbox1);
   gtk_paned_pack2 (GTK_PANED (vpaned2), vbox1, TRUE, TRUE);
 
@@ -131,7 +131,7 @@ create_flicker (void)
   gtk_paned_pack2 (GTK_PANED (hpaned1), vpaned1, TRUE, TRUE);
   gtk_paned_set_position (GTK_PANED (vpaned1), 0);
 
-  hbox1 = gtk_hbox_new (FALSE, 0);
+  hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_widget_show (hbox1);
   gtk_paned_pack1 (GTK_PANED (vpaned1), hbox1, FALSE, TRUE);
 
@@ -150,7 +150,7 @@ create_flicker (void)
   gtk_widget_show (spinbutton19);
   gtk_box_pack_start (GTK_BOX (hbox1), spinbutton19, TRUE, TRUE, 0);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_widget_show (vbox2);
   gtk_paned_pack2 (GTK_PANED (vpaned1), vbox2, FALSE, FALSE);
 

diff --git a/tests/print-editor.c b/tests/print-editor.c
index c4de8b7efa19266b2b05263e62edaa19b4a53dfd..228c19582b4100a88c21e4a7a1cad0f514416f02 100644 (file)
--- a/tests/print-editor.c
+++ b/tests/print-editor.c
@@ -399,10 +399,10 @@ create_custom_widget (GtkPrintOperation *operation,
   GtkWidget *vbox, *hbox, *font, *label;
 
   gtk_print_operation_set_custom_tab_label (operation, "Other");
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 
-  hbox = gtk_hbox_new (FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -566,9 +566,9 @@ preview_cb (GtkPrintOperation        *op,
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_transient_for (GTK_WINDOW (window), 
                                GTK_WINDOW (main_window));
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox,
                      FALSE, FALSE, 0);
   page = gtk_spin_button_new_with_range (1, 100, 1);

diff --git a/tests/prop-editor.c b/tests/prop-editor.c
index db28bbed086d7ae03f86e11b730d0b773268c6c2..be99e827ee9ff7dac00ec900d8c061dd9372e192 100644 (file)
--- a/tests/prop-editor.c
+++ b/tests/prop-editor.c
@@ -849,7 +849,7 @@ property_widget (GObject    *object,
        GFlagsClass *fclass;
        gint j;
        
-       prop_edit = gtk_vbox_new (FALSE, 0);
+       prop_edit = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
        
        fclass = G_FLAGS_CLASS (g_type_class_ref (spec->value_type));
        
@@ -898,7 +898,7 @@ property_widget (GObject    *object,
     {
       GtkWidget *label, *button;
 
-      prop_edit = gtk_hbox_new (FALSE, 5);
+      prop_edit = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
 
       label = gtk_label_new ("");
       button = gtk_button_new_with_label ("Properties");
@@ -1020,7 +1020,7 @@ properties_from_type (GObject *object,
     }
 
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
@@ -1102,7 +1102,7 @@ child_properties_from_object (GObject *object)
       ++i;
     }
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
@@ -1148,7 +1148,7 @@ children_from_object (GObject *object)
       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
       gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, i, i + 1);
 
-      prop_edit = gtk_hbox_new (FALSE, 5);
+      prop_edit = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
 
       str = object_label (object, NULL);
       label = gtk_label_new (str);
@@ -1164,7 +1164,7 @@ children_from_object (GObject *object)
       gtk_table_attach_defaults (GTK_TABLE (table), prop_edit, 1, 2, i, i + 1);
     }
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
@@ -1203,7 +1203,7 @@ cells_from_object (GObject *object)
       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
       gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, i, i + 1);
 
-      prop_edit = gtk_hbox_new (FALSE, 5);
+      prop_edit = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
 
       str = object_label (object, NULL);
       label = gtk_label_new (str);
@@ -1219,7 +1219,7 @@ cells_from_object (GObject *object)
       gtk_table_attach_defaults (GTK_TABLE (table), prop_edit, 1, 2, i, i + 1);
     }
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
 
   sw = gtk_scrolled_window_new (NULL, NULL);

diff --git a/tests/testactions.c b/tests/testactions.c
index 9bae26e7ecb68fb93ca03b1a074d6351de15c8ee..cbd1c2ecb381df05372240d12a2e15cd317fa9b7 100644 (file)
--- a/tests/testactions.c
+++ b/tests/testactions.c
@@ -360,7 +360,7 @@ create_window (GtkActionGroup *action_group)
   g_signal_connect_swapped (window, "destroy", G_CALLBACK (g_object_unref), merge);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
-  box = gtk_vbox_new (FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), box);
   gtk_widget_show (box);
 
@@ -376,7 +376,7 @@ create_window (GtkActionGroup *action_group)
       g_error_free (error);
     }
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_end (GTK_BOX (box), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
   

diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c
index 13ec9449869640066181cc1372ca73db90e206ae..75e09d155fb9c34817dfc989e895ecd57c6137ae 100644 (file)
--- a/tests/testadjustsize.c
+++ b/tests/testadjustsize.c
@@ -404,7 +404,7 @@ open_valigned_label_window (void)
   g_signal_connect (test_window, "delete-event",
                     G_CALLBACK (gtk_main_quit), test_window);
 
-  box = gtk_vbox_new (FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_widget_show (box);
   gtk_container_add (GTK_CONTAINER (window), box);
 

diff --git a/tests/testassistant.c b/tests/testassistant.c
index b618796a8aa1b5b32627018b60d8f482483def57..e936d02877d0d98c8157d0c3a366a575c8274cbc 100644 (file)
--- a/tests/testassistant.c
+++ b/tests/testassistant.c
@@ -60,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, FALSE);
   check = gtk_check_button_new_with_label ("Complete");
 
   gtk_container_add (GTK_CONTAINER (page), gtk_label_new (text));
@@ -337,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, FALSE, 6);
 
       button = gtk_radio_button_new_with_label (NULL, "branch A");
       gtk_box_pack_start (GTK_BOX (page), button, FALSE, FALSE, 0);
@@ -574,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, FALSE, 6);
   gtk_container_add (GTK_CONTAINER (window), box);
 
   for (i = 0; i < G_N_ELEMENTS (buttons); i++)

diff --git a/tests/testbbox.c b/tests/testbbox.c
index 404836e8653ad7e68353d5b1fb86bd0addc36422..39a61f03b2510154a93bead0b8e001f9f4159714 100644 (file)
--- a/tests/testbbox.c
+++ b/tests/testbbox.c
@@ -132,7 +132,7 @@ main (int    argc,
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   g_signal_connect (G_OBJECT (window), "delete-event", G_CALLBACK (gtk_main_quit), NULL);
   
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
   
   /* GtkHButtonBox */
@@ -153,7 +153,7 @@ main (int    argc,
   
   /* Options */
   
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   
   combo_types = gtk_combo_box_text_new ();

diff --git a/tests/testbuttons.c b/tests/testbuttons.c
index fe19534ac1379d0eacc69b17b940a8d45e567354..a60e5e92fc8872c36081ac2a2898e2e4fe9e58da 100644 (file)
--- a/tests/testbuttons.c
+++ b/tests/testbuttons.c
@@ -32,11 +32,11 @@ int main (int argc, char *argv[])
 
        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-       box = gtk_vbox_new (0, FALSE);
+       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0, FALSE);
 
        gtk_container_add (GTK_CONTAINER (window), box);
 
-       hbox = gtk_hbox_new (0, FALSE);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
        gtk_container_add (GTK_CONTAINER (box), hbox);
        button = gtk_button_new_from_stock (GTK_STOCK_SAVE);
        gtk_container_add (GTK_CONTAINER (hbox), button);
@@ -52,7 +52,7 @@ int main (int argc, char *argv[])
        g_free (text);
        gtk_container_add (GTK_CONTAINER (hbox), label);
 
-       hbox = gtk_hbox_new (0, FALSE);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
        gtk_container_add (GTK_CONTAINER (box), hbox);
        button = g_object_new (GTK_TYPE_BUTTON,
                                "label", "document-save",
@@ -71,7 +71,7 @@ int main (int argc, char *argv[])
        g_free (text);
        gtk_container_add (GTK_CONTAINER (hbox), label);
 
-       hbox = gtk_hbox_new (0, FALSE);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
        gtk_container_add (GTK_CONTAINER (box), hbox);
        button = gtk_button_new_with_label ("_Save");
        gtk_container_add (GTK_CONTAINER (hbox), button);
@@ -87,7 +87,7 @@ int main (int argc, char *argv[])
        g_free (text);
        gtk_container_add (GTK_CONTAINER (hbox), label);
 
-       hbox = gtk_hbox_new (0, FALSE);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
        gtk_container_add (GTK_CONTAINER (box), hbox);
        button = gtk_button_new_with_mnemonic ("_Save");
        gtk_container_add (GTK_CONTAINER (hbox), button);
@@ -103,7 +103,7 @@ int main (int argc, char *argv[])
        g_free (text);
        gtk_container_add (GTK_CONTAINER (hbox), label);
 
-       hbox = gtk_hbox_new (0, FALSE);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
        gtk_container_add (GTK_CONTAINER (box), hbox);
        button = gtk_button_new_with_label ("_Save");
        gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_stock (GTK_STOCK_ABOUT, GTK_ICON_SIZE_BUTTON));
@@ -120,7 +120,7 @@ int main (int argc, char *argv[])
        g_free (text);
        gtk_container_add (GTK_CONTAINER (hbox), label);
 
-       hbox = gtk_hbox_new (0, FALSE);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
        gtk_container_add (GTK_CONTAINER (box), hbox);
        button = gtk_button_new_with_mnemonic ("_Save");
        gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_stock (GTK_STOCK_ABOUT, GTK_ICON_SIZE_BUTTON));

diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index 575ce510a79a3c317a2c5ee5cc662b541d780973..86b087aeb1745b4149bb0905f1c1dd5207cf16f8 100644 (file)
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -468,12 +468,12 @@ create_calendar(void)
                    G_CALLBACK (calendar_next_year),
                    &calendar_data);
 
-  rpane = gtk_vbox_new (FALSE, DEF_PAD_SMALL);
+  rpane = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, DEF_PAD_SMALL);
   gtk_paned_pack2 (GTK_PANED (hpaned), rpane, FALSE, FALSE);
 
   /* Build the right font-button */
 
-  vbox = gtk_vbox_new(FALSE, DEF_PAD_SMALL);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, DEF_PAD_SMALL);
   frame = create_frame ("<b>Options</b>", vbox, 1, 0);
   gtk_box_pack_start (GTK_BOX (rpane), frame, FALSE, TRUE, 0);
   size = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -493,7 +493,7 @@ create_calendar(void)
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_size_group_add_widget (size, label);
 
-  hbox = gtk_hbox_new (FALSE, DEF_PAD_SMALL);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, DEF_PAD_SMALL);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
@@ -513,7 +513,7 @@ create_calendar(void)
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_size_group_add_widget (size, label);
 
-  hbox = gtk_hbox_new (FALSE, DEF_PAD_SMALL);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, DEF_PAD_SMALL);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
@@ -533,14 +533,14 @@ create_calendar(void)
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_size_group_add_widget (size, label);
 
-  hbox = gtk_hbox_new (FALSE, DEF_PAD_SMALL);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, DEF_PAD_SMALL);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
   /* Build the right details frame */
 
-  vbox = gtk_vbox_new(FALSE, DEF_PAD_SMALL);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, DEF_PAD_SMALL);
   frame = create_frame ("<b>Details</b>", vbox, 1, 1);
   gtk_box_pack_start (GTK_BOX (rpane), frame, FALSE, TRUE, 0);
 
@@ -562,7 +562,7 @@ create_calendar(void)
 
   gtk_box_pack_start (GTK_BOX (vbox), scroller, FALSE, TRUE, 0);
 
-  hbox = gtk_hbox_new (FALSE, DEF_PAD_SMALL);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, DEF_PAD_SMALL);
   align = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), hbox);
   gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, TRUE, 0);
@@ -593,7 +593,7 @@ create_calendar(void)
   
   /* Build the Right frame with the flags in */ 
 
-  vbox = gtk_vbox_new(FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   frame = create_expander ("<b>Flags</b>", vbox, 1, 0);
   gtk_box_pack_start (GTK_BOX (rpane), frame, TRUE, TRUE, 0);
 
@@ -614,24 +614,24 @@ create_calendar(void)
    *  Build the Signal-event part.
    */
 
-  vbox = gtk_vbox_new (TRUE, DEF_PAD_SMALL);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE, DEF_PAD_SMALL);
   frame = create_frame ("<b>Signal Events</b>", vbox, 1, 0);
   
-  hbox = gtk_hbox_new (FALSE, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 3);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
   label = gtk_label_new ("Signal:");
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
   calendar_data.last_sig = gtk_label_new ("");
   gtk_box_pack_start (GTK_BOX (hbox), calendar_data.last_sig, FALSE, TRUE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 3);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
   label = gtk_label_new ("Previous signal:");
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
   calendar_data.prev_sig = gtk_label_new ("");
   gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev_sig, FALSE, TRUE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 3);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
   label = gtk_label_new ("Second previous signal:");
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
@@ -649,7 +649,7 @@ create_calendar(void)
   g_signal_connect (button, "clicked", G_CALLBACK (gtk_main_quit), NULL);
   gtk_container_add (GTK_CONTAINER (bbox), button);
 
-  vbox = gtk_vbox_new (FALSE, DEF_PAD_SMALL);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, DEF_PAD_SMALL);
 
   gtk_box_pack_start (GTK_BOX (vbox), hpaned,
                       TRUE,  TRUE, 0);

diff --git a/tests/testcellrenderertext.c b/tests/testcellrenderertext.c
index ab51243c195cff5f1462da66d52f8ea98a42847c..ebdb04ccacd076e0408dc03c3c5183c8a9791bfe 100644 (file)
--- a/tests/testcellrenderertext.c
+++ b/tests/testcellrenderertext.c
@@ -263,7 +263,7 @@ main (int argc, char **argv)
                    G_CALLBACK (gtk_main_quit), NULL);
   gtk_container_set_border_width (GTK_CONTAINER (window), 12);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 12);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   /* LTR */

diff --git a/tests/testcombo.c b/tests/testcombo.c
index 5afe202f464f90564590395a4f02259e78ad1506..88179df2945a13f82d07a9e5e483c31654312427 100644 (file)
--- a/tests/testcombo.c
+++ b/tests/testcombo.c
@@ -1064,14 +1064,14 @@ main (int argc, char **argv)
         gtk_container_set_border_width (GTK_CONTAINER (window), 5);
         g_signal_connect (window, "destroy", gtk_main_quit, NULL);
 
-        mainbox = gtk_vbox_new (FALSE, 2);
+        mainbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 2);
         gtk_container_add (GTK_CONTAINER (window), mainbox);
 
         /* GtkCellView */
         tmp = gtk_frame_new ("GtkCellView");
         gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
 
-        boom = gtk_vbox_new (FALSE, 0);
+        boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
         gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
 
@@ -1096,7 +1096,7 @@ main (int argc, char **argv)
         tmp = gtk_frame_new ("GtkComboBox (list)");
         gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
 
-        boom = gtk_vbox_new (FALSE, 0);
+        boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
         gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
 
@@ -1138,7 +1138,7 @@ main (int argc, char **argv)
         tmp = gtk_frame_new ("GtkComboBox (dynamic list)");
         gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
 
-        boom = gtk_vbox_new (FALSE, 0);
+        boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
         gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
 
@@ -1184,7 +1184,7 @@ main (int argc, char **argv)
         tmp = gtk_frame_new ("GtkComboBox (custom)");
         gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
 
-        boom = gtk_vbox_new (FALSE, 0);
+        boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
         gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
 
@@ -1244,7 +1244,7 @@ main (int argc, char **argv)
         tmp = gtk_frame_new ("GtkComboBox (tree)");
         gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
 
-        boom = gtk_vbox_new (FALSE, 0);
+        boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
         gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
 
@@ -1289,7 +1289,7 @@ main (int argc, char **argv)
         tmp = gtk_frame_new ("GtkComboBox (grid mode)");
         gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
 
-        boom = gtk_vbox_new (FALSE, 0);
+        boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
         gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
 
@@ -1301,7 +1301,7 @@ main (int argc, char **argv)
         tmp = gtk_frame_new ("GtkComboBox with entry");
         gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
 
-        boom = gtk_vbox_new (FALSE, 0);
+        boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
         gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
 
@@ -1314,7 +1314,7 @@ main (int argc, char **argv)
         tmp = gtk_frame_new ("What are you ?");
         gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
 
-        boom = gtk_vbox_new (FALSE, 0);
+        boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
         gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
 
@@ -1339,7 +1339,7 @@ main (int argc, char **argv)
         tmp = gtk_frame_new ("Where are you ?");
         gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
 
-        boom = gtk_vbox_new (FALSE, 0);
+        boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
         gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
 
@@ -1372,7 +1372,7 @@ main (int argc, char **argv)
         tmp = gtk_frame_new ("Unconstrained Menu");
         gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
 
-        boom = gtk_vbox_new (FALSE, 0);
+        boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
         gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
 

diff --git a/tests/testcombochange.c b/tests/testcombochange.c
index d15b57e7877b7ce8300fe318a064f57127de8eaa..54b0d94d6bf1c9fd47e5ec3e529b1ceb4b2a43b2 100644 (file)
--- a/tests/testcombochange.c
+++ b/tests/testcombochange.c
@@ -260,11 +260,11 @@ main (int argc, char **argv)
 
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
 
-  combo_vbox = gtk_vbox_new (FALSE, 8);
+  combo_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_box_pack_start (GTK_BOX (hbox), combo_vbox, FALSE, FALSE, 0);
 
   label = gtk_label_new (NULL);
@@ -300,7 +300,7 @@ main (int argc, char **argv)
 
   gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
 
-  button_vbox = gtk_vbox_new (FALSE, 8);
+  button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_box_pack_start (GTK_BOX (hbox), button_vbox, FALSE, FALSE, 0);
   
   gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 300);

diff --git a/tests/testellipsise.c b/tests/testellipsise.c
index b9a92c21ec44b348334c988d1004f48e94d52ac1..b3a69993b6d4f884cf9911b9bd2eae8177edbcfe 100644 (file)
--- a/tests/testellipsise.c
+++ b/tests/testellipsise.c
@@ -133,7 +133,7 @@ main (int argc, char *argv[])
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   combo = gtk_combo_box_text_new ();

diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
index 36c41f78a42fb92801365253be31d516b623cbc8..23789ea582defe04222cab3e53600e76338cb2f7 100644 (file)
--- a/tests/testentrycompletion.c
+++ b/tests/testentrycompletion.c
@@ -301,7 +301,7 @@ add_with_prop_edit_button (GtkWidget *vbox, GtkWidget *entry, GtkEntryCompletion
 {
        GtkWidget *hbox, *button;
 
-       hbox = gtk_hbox_new (FALSE, 12);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
        gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
        gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
@@ -327,7 +327,7 @@ main (int argc, char *argv[])
   gtk_container_set_border_width (GTK_CONTAINER (window), 5);
   g_signal_connect (window, "delete_event", gtk_main_quit, NULL);
   
-  vbox = gtk_vbox_new (FALSE, 2);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 2);
   gtk_container_add (GTK_CONTAINER (window), vbox);
     
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

diff --git a/tests/testfilechooser.c b/tests/testfilechooser.c
index 4e6da60f442ed39a7ceb19d578e7046083330a4f..289562a34f258ba8dd13a67685cd839fd32eef95 100644 (file)
--- a/tests/testfilechooser.c
+++ b/tests/testfilechooser.c
@@ -600,7 +600,7 @@ main (int argc, char **argv)
   /* Preview widget */
   /* THIS IS A TERRIBLE PREVIEW WIDGET, AND SHOULD NOT BE COPIED AT ALL.
    */
-  preview_vbox = gtk_vbox_new (0, FALSE);
+  preview_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0, FALSE);
   /*gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER (dialog), preview_vbox);*/
 
   preview_label = gtk_label_new (NULL);

diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c
index 9606079bdfe23d53a426792c045f26b043f643fd..3f13bd93c31c1f4b7b8e57f230ba28c4011ac716 100644 (file)
--- a/tests/testfilechooserbutton.c
+++ b/tests/testfilechooserbutton.c
@@ -169,7 +169,7 @@ tests_button_clicked_cb (GtkButton *real_button,
       gtk_window_set_transient_for (GTK_WINDOW (tests),
                                    GTK_WINDOW (gtk_widget_get_toplevel (user_data)));
 
-      box = gtk_vbox_new (FALSE, 0);
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (tests), box);
       gtk_widget_show (box);
 
@@ -291,7 +291,7 @@ main (int   argc,
   g_signal_connect (win, "style-set", G_CALLBACK (win_style_set_cb), NULL);
   g_signal_connect (win, "response", G_CALLBACK (gtk_main_quit), NULL);
 
-  vbox = gtk_vbox_new (FALSE, 18);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 18);
   gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (win))), vbox);
 
   frame = gtk_frame_new ("<b>GtkFileChooserButton</b>");
@@ -305,11 +305,11 @@ main (int   argc,
   
   label_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
   
-  group_box = gtk_vbox_new (FALSE, 6);
+  group_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
   gtk_container_add (GTK_CONTAINER (alignment), group_box);
 
   /* OPEN */
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
   gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE, FALSE, 0);
 
   label = gtk_label_new_with_mnemonic ("_Open:");
@@ -338,7 +338,7 @@ main (int   argc,
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
 
   /* SELECT_FOLDER */
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12);
   gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE, FALSE, 0);
 
   label = gtk_label_new_with_mnemonic ("Select _Folder:");

diff --git a/tests/testframe.c b/tests/testframe.c
index 401457ef2d25005fb797011be15d36ff0f0e708b..cf79473402ad762c4e0e05b4b7f5ce5f7d2d7ef0 100644 (file)
--- a/tests/testframe.c
+++ b/tests/testframe.c
@@ -101,7 +101,7 @@ int main (int argc, char **argv)
 
   g_signal_connect (G_OBJECT (window), "delete-event", gtk_main_quit, NULL);
 
-  vbox = gtk_vbox_new (FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   frame = gtk_frame_new ("Testing");

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 81b7a0cfa8344ffab951802bf35b444b9125d9a9..9a2229899a15d4af653aa964402a5f37e8e87702 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -228,7 +228,7 @@ build_alpha_widgets (void)
                    GTK_EXPAND | GTK_FILL, 0,
                    0,                     0);
   
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   label = gtk_label_new (NULL);
   gtk_label_set_markup (GTK_LABEL (label), "<i>Entry: </i>");
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -298,7 +298,7 @@ create_alpha_window (GtkWidget *widget)
 
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
       
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
       gtk_box_pack_start (GTK_BOX (content_area), vbox,
                          TRUE, TRUE, 0);
@@ -687,7 +687,7 @@ create_buttons (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "GtkButton");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
 
       table = gtk_table_new (3, 3, FALSE);
@@ -765,7 +765,7 @@ create_buttons (GtkWidget *widget)
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 
@@ -810,10 +810,10 @@ create_toggle_buttons (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "GtkToggleButton");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
 
@@ -833,7 +833,7 @@ create_toggle_buttons (GtkWidget *widget)
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 
@@ -942,7 +942,7 @@ create_check_buttons (GtkWidget *widget)
 
       box1 = gtk_dialog_get_content_area (GTK_DIALOG (window));
       
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
 
@@ -1007,7 +1007,7 @@ create_radio_buttons (GtkWidget *widget)
 
       box1 = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
 
@@ -1034,7 +1034,7 @@ create_radio_buttons (GtkWidget *widget)
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
 
@@ -1132,13 +1132,13 @@ create_button_box (GtkWidget *widget)
 
     gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-    main_vbox = gtk_vbox_new (FALSE, 0);
+    main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_add (GTK_CONTAINER (window), main_vbox);
     
     frame_horz = gtk_frame_new ("Horizontal Button Boxes");
     gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10);
     
-    vbox = gtk_vbox_new (FALSE, 0);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
     gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
     
@@ -1165,7 +1165,7 @@ create_button_box (GtkWidget *widget)
     frame_vert = gtk_frame_new ("Vertical Button Boxes");
     gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
     
-    hbox = gtk_hbox_new (FALSE, 0);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
     gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
 
@@ -1567,10 +1567,10 @@ create_statusbar (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "statusbar");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
 
@@ -1625,7 +1625,7 @@ create_statusbar (GtkWidget *widget)
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 
@@ -1688,7 +1688,7 @@ create_handle_box (GtkWidget *widget)
     
     gtk_container_set_border_width (GTK_CONTAINER (window), 20);
 
-    vbox = gtk_vbox_new (FALSE, 0);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_add (GTK_CONTAINER (window), vbox);
     gtk_widget_show (vbox);
 
@@ -1700,7 +1700,7 @@ create_handle_box (GtkWidget *widget)
     gtk_container_add (GTK_CONTAINER (vbox), separator);
     gtk_widget_show (separator);
     
-    hbox = gtk_hbox_new (FALSE, 10);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
     gtk_container_add (GTK_CONTAINER (vbox), hbox);
     gtk_widget_show (hbox);
 
@@ -1911,9 +1911,9 @@ void create_labels (GtkWidget *widget)
 
       gtk_window_set_title (GTK_WINDOW (window), "Label");
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       
-      hbox = gtk_hbox_new (FALSE, 5);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
@@ -1926,7 +1926,7 @@ void create_labels (GtkWidget *widget)
 
       gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
       
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       
       gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (window), 5);
@@ -1985,7 +1985,7 @@ void create_labels (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
       g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL);
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
       frame = gtk_frame_new ("Line wrapped label");
       label = gtk_label_new ("This is an example of a line-wrapped label.  It should not be taking "\
@@ -2092,7 +2092,7 @@ create_rotated_label (GtkWidget *widget)
 
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
 
@@ -2100,7 +2100,7 @@ create_rotated_label (GtkWidget *widget)
       gtk_label_set_markup (GTK_LABEL (label), "Hello World\n<i>Rotate</i> <span underline='single' foreground='blue'>me</span>");
       gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
 
-      scale_hbox = gtk_hbox_new (FALSE, 0);
+      scale_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (vbox), scale_hbox, FALSE, FALSE, 0);
       
       scale_label = gtk_label_new (NULL);
@@ -2306,10 +2306,10 @@ create_reparent (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "reparent");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
 
-      box2 = gtk_hbox_new (FALSE, 5);
+      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
 
@@ -2318,7 +2318,7 @@ create_reparent (GtkWidget *widget)
       frame = gtk_frame_new ("Frame 1");
       gtk_box_pack_start (GTK_BOX (box2), frame, TRUE, TRUE, 0);
 
-      box3 = gtk_vbox_new (FALSE, 5);
+      box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (box3), 5);
       gtk_container_add (GTK_CONTAINER (frame), box3);
 
@@ -2341,7 +2341,7 @@ create_reparent (GtkWidget *widget)
       frame = gtk_frame_new ("Frame 2");
       gtk_box_pack_start (GTK_BOX (box2), frame, TRUE, TRUE, 0);
 
-      box3 = gtk_vbox_new (FALSE, 5);
+      box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (box3), 5);
       gtk_container_add (GTK_CONTAINER (frame), box3);
 
@@ -2359,7 +2359,7 @@ create_reparent (GtkWidget *widget)
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 
@@ -2432,10 +2432,10 @@ create_resize_grips (GtkWidget *widget)
                        G_CALLBACK (gtk_widget_destroyed),
                        &window);
 
-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), vbox);
       
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
 
       /* North west */
@@ -2465,7 +2465,7 @@ create_resize_grips (GtkWidget *widget)
       g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
                        GINT_TO_POINTER (GDK_WINDOW_EDGE_NORTH_EAST));
 
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
 
       /* West */
@@ -2491,7 +2491,7 @@ create_resize_grips (GtkWidget *widget)
                        GINT_TO_POINTER (GDK_WINDOW_EDGE_EAST));
 
 
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
 
       /* South west */
@@ -2596,7 +2596,7 @@ create_saved_position (GtkWidget *widget)
                        G_CALLBACK (gtk_widget_destroyed),
                        &window);
 
-      main_vbox = gtk_vbox_new (FALSE, 5);
+      main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 0);
       gtk_container_add (GTK_CONTAINER (window), main_vbox);
 
@@ -2616,7 +2616,7 @@ create_saved_position (GtkWidget *widget)
                                                   NULL),
                        NULL);
 
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
@@ -2628,7 +2628,7 @@ create_saved_position (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (hbox), x_label, TRUE, TRUE, 0);
       g_object_set_data (G_OBJECT (window), "x", x_label);
 
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
@@ -2646,7 +2646,7 @@ create_saved_position (GtkWidget *widget)
                        NULL);
       gtk_box_pack_start (GTK_BOX (main_vbox), any, FALSE, TRUE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
       gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
 
@@ -2696,10 +2696,10 @@ create_pixbuf (GtkWidget *widget)
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
       gtk_widget_realize(window);
 
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
 
@@ -2711,7 +2711,7 @@ create_pixbuf (GtkWidget *widget)
       pixbufwid = new_pixbuf ("test.xpm", gdk_window, NULL);
 
       label = gtk_label_new ("Pixbuf\ntest");
-      box3 = gtk_hbox_new (FALSE, 0);
+      box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (box3), 2);
       gtk_container_add (GTK_CONTAINER (box3), pixbufwid);
       gtk_container_add (GTK_CONTAINER (box3), label);
@@ -2723,7 +2723,7 @@ create_pixbuf (GtkWidget *widget)
       pixbufwid = new_pixbuf ("test.xpm", gdk_window, NULL);
 
       label = gtk_label_new ("Pixbuf\ntest");
-      box3 = gtk_hbox_new (FALSE, 0);
+      box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (box3), 2);
       gtk_container_add (GTK_CONTAINER (box3), pixbufwid);
       gtk_container_add (GTK_CONTAINER (box3), label);
@@ -2734,7 +2734,7 @@ create_pixbuf (GtkWidget *widget)
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 
@@ -2778,10 +2778,10 @@ create_tooltips (GtkWidget *widget)
       gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (widget));
 
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
 
@@ -2833,7 +2833,7 @@ create_tooltips (GtkWidget *widget)
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 
@@ -2896,7 +2896,7 @@ create_image (GtkWidget *widget)
                        G_CALLBACK (gtk_widget_destroyed),
                        &window);
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
 
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
@@ -3205,7 +3205,7 @@ create_menus (GtkWidget *widget)
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
       
       
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
       gtk_widget_show (box1);
       
@@ -3253,7 +3253,7 @@ create_menus (GtkWidget *widget)
       gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
       
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
       gtk_widget_show (box2);
@@ -3308,7 +3308,7 @@ create_menus (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
       gtk_widget_show (separator);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
       gtk_widget_show (box2);
@@ -3615,9 +3615,9 @@ create_modal_window (GtkWidget *widget)
   gtk_window_set_modal (GTK_WINDOW(window),TRUE);
 
   /* Create widgets */
-  box1 = gtk_vbox_new (FALSE,5);
+  box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE,5);
   frame1 = gtk_frame_new ("Standard dialogs in modal form");
-  box2 = gtk_vbox_new (TRUE,5);
+  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE,5);
   btnColor = gtk_button_new_with_label ("Color");
   btnFile = gtk_button_new_with_label ("File Selection");
   btnClose = gtk_button_new_with_label ("Close");
@@ -3973,15 +3973,15 @@ create_entry (GtkWidget *widget)
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
 
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
 
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 5);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
       gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE, TRUE, 0);
       
       entry = gtk_entry_new ();
@@ -4039,7 +4039,7 @@ create_entry (GtkWidget *widget)
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 
@@ -4079,7 +4079,7 @@ create_expander (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "expander");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
       
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
       
       expander = gtk_expander_new ("The Hidden");
@@ -4166,17 +4166,17 @@ create_event_box (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "event box");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
       gtk_widget_modify_bg (window, GTK_STATE_NORMAL, &color);
 
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (box1), hbox, TRUE, FALSE, 0);
       
       event_box = gtk_event_box_new ();
       gtk_box_pack_start (GTK_BOX (hbox), event_box, TRUE, FALSE, 0);
 
-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (event_box), vbox);
       g_signal_connect (event_box, "button_press_event",
                        G_CALLBACK (event_box_label_pressed),
@@ -4207,7 +4207,7 @@ create_event_box (GtkWidget *widget)
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 
@@ -4338,7 +4338,7 @@ create_size_group_window (GdkScreen    *screen,
   g_object_unref (vgroup1);
   g_object_unref (vgroup2);
   
-  hbox = gtk_hbox_new (FALSE, 5);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
   gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
   
   spin_button = gtk_spin_button_new_with_range (1, 100, 1);
@@ -4596,23 +4596,23 @@ create_spins (GtkWidget *widget)
       
       gtk_window_set_title (GTK_WINDOW (window), "GtkSpinButton");
       
-      main_vbox = gtk_vbox_new (FALSE, 5);
+      main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 10);
       gtk_container_add (GTK_CONTAINER (window), main_vbox);
       
       frame = gtk_frame_new ("Not accelerated");
       gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
       
-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
       gtk_container_add (GTK_CONTAINER (frame), vbox);
       
       /* Time, month, hex spinners */
       
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
       
-      vbox2 = gtk_vbox_new (FALSE, 0);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
       
       label = gtk_label_new ("Time :");
@@ -4630,7 +4630,7 @@ create_spins (GtkWidget *widget)
       gtk_entry_set_width_chars (GTK_ENTRY (spinner), 5);
       gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
 
-      vbox2 = gtk_vbox_new (FALSE, 0);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
       
       label = gtk_label_new ("Month :");
@@ -4654,7 +4654,7 @@ create_spins (GtkWidget *widget)
       gtk_entry_set_width_chars (GTK_ENTRY (spinner), 9);
       gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
       
-      vbox2 = gtk_vbox_new (FALSE, 0);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
 
       label = gtk_label_new ("Hex :");
@@ -4679,14 +4679,14 @@ create_spins (GtkWidget *widget)
       frame = gtk_frame_new ("Accelerated");
       gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
   
-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
       gtk_container_add (GTK_CONTAINER (frame), vbox);
       
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
       
-      vbox2 = gtk_vbox_new (FALSE, 0);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 5);
       
       label = gtk_label_new ("Value :");
@@ -4699,7 +4699,7 @@ create_spins (GtkWidget *widget)
       gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
       gtk_box_pack_start (GTK_BOX (vbox2), spinner1, FALSE, TRUE, 0);
 
-      vbox2 = gtk_vbox_new (FALSE, 0);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 5);
 
       label = gtk_label_new ("Digits :");
@@ -4713,7 +4713,7 @@ create_spins (GtkWidget *widget)
                        spinner2);
       gtk_box_pack_start (GTK_BOX (vbox2), spinner2, FALSE, TRUE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 5);
 
       button = gtk_check_button_new_with_label ("Snap to 0.5-ticks");
@@ -4732,7 +4732,7 @@ create_spins (GtkWidget *widget)
 
       val_label = gtk_label_new ("");
 
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
 
       button = gtk_button_new_with_label ("Value as Int");
@@ -4755,7 +4755,7 @@ create_spins (GtkWidget *widget)
       frame = gtk_frame_new ("Using Convenience Constructor");
       gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
   
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
       gtk_container_add (GTK_CONTAINER (frame), hbox);
       
@@ -4768,7 +4768,7 @@ create_spins (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (hbox), spinner, TRUE, TRUE, 5);
       gtk_box_pack_start (GTK_BOX (hbox), val_label, TRUE, TRUE, 5);
 
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
   
       button = gtk_button_new_with_label ("Close");
@@ -4917,7 +4917,7 @@ create_cursors (GtkWidget *widget)
       
       gtk_window_set_title (GTK_WINDOW (window), "Cursors");
       
-      main_vbox = gtk_vbox_new (FALSE, 5);
+      main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 0);
       gtk_container_add (GTK_CONTAINER (window), main_vbox);
 
@@ -4931,7 +4931,7 @@ create_cursors (GtkWidget *widget)
                        NULL);
 
 #ifdef GDK_WINDOWING_X11
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
@@ -4953,7 +4953,7 @@ create_cursors (GtkWidget *widget)
                        G_CALLBACK (change_cursor_theme), hbox);
 #endif
 
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
@@ -5011,7 +5011,7 @@ create_cursors (GtkWidget *widget)
                        NULL);
       gtk_box_pack_start (GTK_BOX (main_vbox), any, FALSE, TRUE, 0);
   
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
       gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
 
@@ -5105,7 +5105,7 @@ create_color_selection (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "GtkColorButton");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      hbox = gtk_hbox_new (FALSE, 8);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
       gtk_container_add (GTK_CONTAINER (window), hbox);
       
@@ -5423,7 +5423,7 @@ create_font_selection (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "GtkFontButton");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      hbox = gtk_hbox_new (FALSE, 8);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
       gtk_container_add (GTK_CONTAINER (window), hbox);
       
@@ -5621,7 +5621,7 @@ create_display_screen (GtkWidget *widget)
   g_signal_connect (window, "destroy", 
                    G_CALLBACK (gtk_widget_destroy), NULL);
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
   gtk_container_add (GTK_CONTAINER (window), vbox);
   
   frame = gtk_frame_new ("Select screen or display");
@@ -5816,12 +5816,12 @@ create_range_controls (GtkWidget *widget)
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
 
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
       gtk_widget_show (box1);
 
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
       gtk_widget_show (box2);
@@ -5852,7 +5852,7 @@ create_range_controls (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE, 0);
       gtk_widget_show (scale);
       
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
 
       scale = gtk_scale_new (GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT (adjustment));
       gtk_widget_set_size_request (scale, -1, 200);
@@ -5887,7 +5887,7 @@ create_range_controls (GtkWidget *widget)
       gtk_widget_show (separator);
 
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
       gtk_widget_show (box2);
@@ -6118,11 +6118,11 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
       child = gtk_frame_new (buffer);
       gtk_container_set_border_width (GTK_CONTAINER (child), 10);
 
-      vbox = gtk_vbox_new (TRUE,0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE,0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
       gtk_container_add (GTK_CONTAINER (child), vbox);
 
-      hbox = gtk_hbox_new (TRUE,0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE,0);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
 
       button = gtk_check_button_new_with_label ("Fill Tab");
@@ -6144,7 +6144,7 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
 
       gtk_widget_show_all (child);
 
-      label_box = gtk_hbox_new (FALSE, 0);
+      label_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       pixwid = gtk_image_new_from_pixbuf (book_closed);
       g_object_set_data (G_OBJECT (child), "tab_pixmap", pixwid);
                           
@@ -6155,7 +6155,7 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
       gtk_widget_show_all (label_box);
       
                                       
-      menu_box = gtk_hbox_new (FALSE, 0);
+      menu_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       pixwid = gtk_image_new_from_pixbuf (book_closed);
       g_object_set_data (G_OBJECT (child), "menu_pixmap", pixwid);
       
@@ -6282,7 +6282,7 @@ create_notebook (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "notebook");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
 
       sample_notebook = gtk_notebook_new ();
@@ -6305,7 +6305,7 @@ create_notebook (GtkWidget *widget)
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 10);
       
-      box2 = gtk_hbox_new (FALSE, 5);
+      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 
@@ -6315,7 +6315,7 @@ create_notebook (GtkWidget *widget)
                        G_CALLBACK (notebook_popup),
                        sample_notebook);
 
-      box2 = gtk_hbox_new (FALSE, 5);
+      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 
@@ -6332,7 +6332,7 @@ create_notebook (GtkWidget *widget)
       g_signal_connect (button, "clicked",
                        G_CALLBACK (show_all_pages), sample_notebook);
 
-      box2 = gtk_hbox_new (TRUE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 
@@ -6505,7 +6505,7 @@ create_panes (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "Panes");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), vbox);
       
       vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
@@ -6598,7 +6598,7 @@ paned_keyboard_window1 (GtkWidget *widget)
   gtk_paned_pack1 (GTK_PANED (hpaned1), frame1, FALSE, TRUE);
   gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_IN);
 
-  vbox1 = gtk_vbox_new (FALSE, 0);
+  vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (frame1), vbox1);
 
   button7 = gtk_button_new_with_label ("button7");
@@ -6620,7 +6620,7 @@ paned_keyboard_window1 (GtkWidget *widget)
   frame5 = gtk_frame_new (NULL);
   gtk_container_add (GTK_CONTAINER (frame2), frame5);
 
-  hbox1 = gtk_hbox_new (FALSE, 0);
+  hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (frame5), hbox1);
 
   button5 = gtk_button_new_with_label ("button5");
@@ -6695,7 +6695,7 @@ paned_keyboard_window2 (GtkWidget *widget)
   button13 = gtk_button_new_with_label ("button13");
   gtk_container_add (GTK_CONTAINER (frame6), button13);
 
-  hbox2 = gtk_hbox_new (FALSE, 0);
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_paned_pack2 (GTK_PANED (hpaned2), hbox2, TRUE, TRUE);
 
   vpaned2 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
@@ -6747,7 +6747,7 @@ paned_keyboard_window3 (GtkWidget *widget)
                         gtk_widget_get_screen (widget));
   
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window3), vbox2);
 
   label1 = gtk_label_new ("Three panes nested inside each other");
@@ -6821,7 +6821,7 @@ paned_keyboard_window4 (GtkWidget *widget)
   gtk_window_set_screen (GTK_WINDOW (window4), 
                         gtk_widget_get_screen (widget));
 
-  vbox3 = gtk_vbox_new (FALSE, 0);
+  vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window4), vbox3);
 
   label2 = gtk_label_new ("Widget tree:\n\nhpaned \n - vpaned\n - hbox\n    - vpaned\n    - vpaned\n    - vpaned\n");
@@ -6840,7 +6840,7 @@ paned_keyboard_window4 (GtkWidget *widget)
   button18 = gtk_button_new_with_label ("button18");
   gtk_paned_pack2 (GTK_PANED (vpaned3), button18, TRUE, TRUE);
 
-  hbox3 = gtk_hbox_new (FALSE, 0);
+  hbox3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_paned_pack2 (GTK_PANED (hpaned6), hbox3, TRUE, TRUE);
 
   vpaned4 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
@@ -7221,7 +7221,7 @@ create_wmhints (GtkWidget *widget)
       gdk_window_set_decorations (gdk_window, GDK_DECOR_ALL | GDK_DECOR_MENU);
       gdk_window_set_functions (gdk_window, GDK_FUNC_ALL | GDK_FUNC_RESIZE);
       
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
       gtk_widget_show (box1);
 
@@ -7236,7 +7236,7 @@ create_wmhints (GtkWidget *widget)
       gtk_widget_show (separator);
 
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
       gtk_widget_show (box2);
@@ -7304,7 +7304,7 @@ tracking_label (GtkWidget *window)
   GtkWidget *hbox;
   GtkWidget *button;
 
-  hbox = gtk_hbox_new (FALSE, 5);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
 
   g_signal_connect_object (hbox,
                           "destroy",
@@ -7407,7 +7407,7 @@ get_state_controls (GtkWidget *window)
   GtkWidget *button_above;
   GtkWidget *button_below;
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   
   button = gtk_button_new_with_label ("Stick");
   g_signal_connect_object (button,
@@ -7517,7 +7517,7 @@ create_window_states (GtkWidget *widget)
 
       gtk_window_set_title (GTK_WINDOW (window), "Window states");
       
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
 
       iconified = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -7838,7 +7838,7 @@ make_gravity_window (GtkWidget   *destroy_with,
   gtk_window_set_screen (GTK_WINDOW (window),
                         gtk_widget_get_screen (destroy_with));
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_widget_show (vbox);
   
   gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -7972,7 +7972,7 @@ window_controls (GtkWidget *window)
                            window,
                           G_CONNECT_SWAPPED);
 
-  vbox = gtk_vbox_new (FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
   
   gtk_container_add (GTK_CONTAINER (control_window), vbox);
   
@@ -8377,14 +8377,14 @@ create_progress_bar (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (pdata->window), "GtkProgressBar");
       gtk_container_set_border_width (GTK_CONTAINER (pdata->window), 0);
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
       gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, TRUE, 0);
 
       frame = gtk_frame_new ("Progress");
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
 
-      vbox2 = gtk_vbox_new (FALSE, 5);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_container_add (GTK_CONTAINER (frame), vbox2);
 
       align = gtk_alignment_new (0.5, 0.5, 0, 0);
@@ -8400,7 +8400,7 @@ create_progress_bar (GtkWidget *widget)
       align = gtk_alignment_new (0.5, 0.5, 0, 0);
       gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE, 5);
 
-      hbox = gtk_hbox_new (FALSE, 5);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
       gtk_container_add (GTK_CONTAINER (align), hbox);
       label = gtk_label_new ("Label updated by user :"); 
       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
@@ -8410,7 +8410,7 @@ create_progress_bar (GtkWidget *widget)
       frame = gtk_frame_new ("Options");
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
 
-      vbox2 = gtk_vbox_new (FALSE, 5);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_container_add (GTK_CONTAINER (frame), vbox2);
 
       tab = gtk_table_new (7, 2, FALSE);
@@ -8425,7 +8425,7 @@ create_progress_bar (GtkWidget *widget)
       pdata->omenu1 = build_option_menu (items1, 4, 0,
                                         progressbar_toggle_orientation,
                                         pdata);
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_table_attach (GTK_TABLE (tab), hbox, 1, 2, 0, 1,
                        GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
                        5, 5);
@@ -8439,7 +8439,7 @@ create_progress_bar (GtkWidget *widget)
                        GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
                        5, 5);
 
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_table_attach (GTK_TABLE (tab), hbox, 1, 2, 1, 2,
                        GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
                        5, 5);
@@ -8464,7 +8464,7 @@ create_progress_bar (GtkWidget *widget)
                                          2, // PANGO_ELLIPSIZE_MIDDLE
                                         progressbar_toggle_ellipsize,
                                         pdata);
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_table_attach (GTK_TABLE (tab), hbox, 1, 2, 10, 11,
                        GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
                        5, 5);
@@ -8754,7 +8754,7 @@ create_properties (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "test properties");
       gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-      vbox = gtk_vbox_new (FALSE, 1);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 1);
       gtk_container_add (GTK_CONTAINER (window), vbox);
             
       label = gtk_label_new ("This is just a dumb test to test properties.\nIf you need a generic module, get GLE.");
@@ -8916,7 +8916,7 @@ create_snapshot (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "test snapshot");
       gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-      vbox = gtk_vbox_new (FALSE, 1);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 1);
       gtk_container_add (GTK_CONTAINER (window), vbox);
             
       button = gtk_button_new_with_label ("Snapshot widget");
@@ -9038,7 +9038,7 @@ create_selection_test (GtkWidget *widget)
 
       /* Create the list */
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
       gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
 
@@ -9192,7 +9192,7 @@ create_scroll_test (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "Scroll Test");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
       gtk_widget_show (hbox);
 
@@ -9591,7 +9591,7 @@ create_rc_file (GtkWidget *widget)
       frame = gtk_aspect_frame_new ("Testing RC file prioritization", 0.5, 0.5, 0.0, TRUE);
       gtk_box_pack_start (GTK_BOX (content_area), frame, FALSE, FALSE, 0);
 
-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_container_add (GTK_CONTAINER (frame), vbox);
       
       label = gtk_label_new ("This label should be red");
@@ -9863,7 +9863,7 @@ create_styles (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
       gtk_widget_show (button);
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
       gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, FALSE, 0);
       
@@ -10069,7 +10069,7 @@ create_main_window (void)
                    G_CALLBACK (gtk_false),
                    NULL);
 
-  box1 = gtk_vbox_new (FALSE, 0);
+  box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), box1);
 
   if (gtk_micro_version > 0)
@@ -10095,7 +10095,7 @@ create_main_window (void)
                                   GTK_POLICY_AUTOMATIC);
   gtk_box_pack_start (GTK_BOX (box1), scrolled_window, TRUE, TRUE, 0);
 
-  box2 = gtk_vbox_new (FALSE, 0);
+  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
   gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), box2);
   gtk_container_set_focus_vadjustment (GTK_CONTAINER (box2),
@@ -10118,7 +10118,7 @@ create_main_window (void)
   separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
-  box2 = gtk_vbox_new (FALSE, 10);
+  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
   gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
   gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 

diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index 5bac79fcfd4397013c72aa84417231454d3dd0a5..b105344f37d4a7ddabe8dac5e4c692c2eaf75961 100644 (file)
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -942,7 +942,7 @@ create_window (void)
   gint i;
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  vbox   = gtk_vbox_new (FALSE, 6);
+  vbox   = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 

diff --git a/tests/testiconview.c b/tests/testiconview.c
index 6dd169b6a4891fb443cf2748c2faee1eb730adde..3657e96ebb2e648e5314318388058654b9486731 100644 (file)
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -433,7 +433,7 @@ main (gint argc, gchar **argv)
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 700, 400);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   paned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);

diff --git a/tests/testinput.c b/tests/testinput.c
index c7149a83866746132a2f4aa0fec60f2362d815f8..a7e51af581216e0031b34309c213a158dcc54bfa 100644 (file)
--- a/tests/testinput.c
+++ b/tests/testinput.c
@@ -303,7 +303,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_name (window, "Test Input");
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
   gtk_widget_show (vbox);
 

diff --git a/tests/testmenubars.c b/tests/testmenubars.c
index 5df095f084b284ccd0ae9bd36f7d995768a5b803..5012259e9d1c671be43518de93ec660226ef962e 100644 (file)
--- a/tests/testmenubars.c
+++ b/tests/testmenubars.c
@@ -127,9 +127,9 @@ main (int argc, char **argv)
       gtk_window_set_title (GTK_WINDOW (window), "menus");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
       
-      box1 = gtk_vbox_new (FALSE, 0);
-      box2 = gtk_hbox_new (FALSE, 0);
-      box3 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
+      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
+      box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       
       /* Rotation by 0 and 180 degrees is broken in Pango, #166832 */
       menubar1 = create_menubar (GTK_PACK_DIRECTION_LTR, GTK_PACK_DIRECTION_LTR, 0.01);
@@ -155,7 +155,7 @@ main (int argc, char **argv)
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
       gtk_widget_show (separator);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
       gtk_widget_show (box2);

diff --git a/tests/testmerge.c b/tests/testmerge.c
index b1ca1e4072580085890efa735ba00b4a2ea36ecf..fdd9932bbdd15d24132643a42c74b242e7c540d6 100644 (file)
--- a/tests/testmerge.c
+++ b/tests/testmerge.c
@@ -626,7 +626,7 @@ main (int argc, char **argv)
   gtk_table_attach (GTK_TABLE (table), frame, 0,2, 1,2,
                    GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
   
-  menu_box = gtk_vbox_new (FALSE, 0);
+  menu_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (menu_box), 2);
   gtk_container_add (GTK_CONTAINER (frame), menu_box);
 
@@ -667,7 +667,7 @@ main (int argc, char **argv)
   gtk_table_attach (GTK_TABLE (table), frame, 0,1, 0,1,
                    GTK_FILL, GTK_FILL|GTK_EXPAND, 0, 0);
 
-  vbox = gtk_vbox_new (FALSE, 2);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 2);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
 

diff --git a/tests/testmultiscreen.c b/tests/testmultiscreen.c
index e47c60fb543dd095f9e4ba22553d2ed3dc3c1378..52a05dbed4f106d96ec9d7a7fb0666a501e22be0 100644 (file)
--- a/tests/testmultiscreen.c
+++ b/tests/testmultiscreen.c
@@ -122,7 +122,7 @@ main (int argc, char *argv[])
       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, TRUE, 0);
       gtk_container_add (GTK_CONTAINER (window[i]), vbox[i]);
 
       button = g_object_new (GTK_TYPE_BUTTON,
@@ -151,7 +151,7 @@ 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, TRUE, 0);
   
   gtk_container_add (GTK_CONTAINER (moving_window), moving_vbox);
   moving_button = g_object_new (GTK_TYPE_BUTTON,

diff --git a/tests/testoffscreen.c b/tests/testoffscreen.c
index 60f8ee18b7c8b3e7a8e3019bd3d3546bbff47510..a10f8fa82af879212504e3dc7fe64b570b835d19 100644 (file)
--- a/tests/testoffscreen.c
+++ b/tests/testoffscreen.c
@@ -197,15 +197,15 @@ create_widgets (void)
   GtkWidget *vbox, *hbox, *label, *combo, *entry, *button, *cb;
   GtkWidget *sw, *text_view;
 
-  main_vbox = gtk_vbox_new (0, FALSE);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0, FALSE);
 
-  main_hbox = gtk_hbox_new (0, FALSE);
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
   gtk_box_pack_start (GTK_BOX (main_vbox), main_hbox, TRUE, TRUE, 0);
 
-  vbox = gtk_vbox_new (0, FALSE);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0, FALSE);
   gtk_box_pack_start (GTK_BOX (main_hbox), vbox, TRUE, TRUE, 0);
 
-  hbox = gtk_hbox_new (0, FALSE);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
   label = gtk_label_new ("This label may be ellipsized\nto make it fit.");
@@ -307,7 +307,7 @@ main (int   argc,
                     G_CALLBACK (gtk_main_quit),
                     NULL);
 
-  vbox = gtk_vbox_new (0, FALSE);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0, FALSE);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
@@ -351,7 +351,7 @@ main (int   argc,
                         G_CALLBACK (scale_changed),
                         offscreen2);
 
-      box2 = gtk_vbox_new (FALSE, 0);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
       gtk_offscreen_box_add2 (GTK_OFFSCREEN_BOX (offscreen2), box2);
 
       widget2 = gtk_button_new_with_label ("Offscreen in offscreen");

diff --git a/tests/testorientable.c b/tests/testorientable.c
index 38bb879f395b416cf20dfd4d15e6dd3da2e8d709..11e2ef59b5f3c8f14710d12b4de3e7c0ad13d8ef 100644 (file)
--- a/tests/testorientable.c
+++ b/tests/testorientable.c
@@ -61,7 +61,7 @@ main (int argc, char **argv)
   gtk_table_set_col_spacings (GTK_TABLE (table), 12);
 
   /* GtkBox */
-  box = gtk_hbox_new (6, FALSE);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6, FALSE);
   orientables = g_list_prepend (orientables, box);
   gtk_table_attach_defaults (GTK_TABLE (table), box, 0, 1, 1, 2);
   gtk_box_pack_start (GTK_BOX (box),

diff --git a/tests/testrecentchoosermenu.c b/tests/testrecentchoosermenu.c
index 73cfafbb7d519f33aabb0a513d985e3ae1b797cf..1bcde3307a2c005594af9f4e12852195deb77390 100644 (file)
--- a/tests/testrecentchoosermenu.c
+++ b/tests/testrecentchoosermenu.c
@@ -164,7 +164,7 @@ main (int argc, char *argv[])
   accel_group = gtk_accel_group_new ();
   gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
   
-  box = gtk_vbox_new (FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), box);
   gtk_widget_show (box);
 

diff --git a/tests/testscale.c b/tests/testscale.c
index 3ed22b2469335b757cfbac17db6bf03bcc1e8d26..0ee26749c9b8c25df9c5d54d8c4a600c4348a7ff 100755 (executable)
--- a/tests/testscale.c
+++ b/tests/testscale.c
@@ -46,7 +46,7 @@ int main (int argc, char *argv[])
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Ranges with marks");
-  box = gtk_vbox_new (FALSE, 5);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
 
   frame = gtk_frame_new ("No marks");
   scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
@@ -96,7 +96,7 @@ int main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (frame), scale);
   gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE, 0);
 
-  box2 = gtk_hbox_new (FALSE, 5);
+  box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
   gtk_box_pack_start (GTK_BOX (box), box2, TRUE, TRUE, 0);
 
   frame = gtk_frame_new ("No marks");

diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c
index cb8d3be1a8bf698c3b3d51d494039731890337bd..0b00f2566c39b285b4f8909fdb8b456e4feb991e 100644 (file)
--- a/tests/testscrolledwindow.c
+++ b/tests/testscrolledwindow.c
@@ -39,8 +39,8 @@ scrollable_policy (void)
   GtkWidget *viewport, *label, *expander, *widget;
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  hbox   = gtk_hbox_new (FALSE, 2);
-  vbox   = gtk_vbox_new (FALSE, 6);
+  hbox   = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 2);
+  vbox   = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6);
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
@@ -81,14 +81,14 @@ scrollable_policy (void)
   /* Add controls here */
   expander = gtk_expander_new ("Controls");
   gtk_expander_set_expanded (GTK_EXPANDER (expander), TRUE);
-  cntl = gtk_vbox_new (FALSE, 2);
+  cntl = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 2);
   gtk_widget_show (cntl);
   gtk_widget_show (expander);
   gtk_container_add (GTK_CONTAINER (expander), cntl);
   gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
 
   /* Add Horizontal policy control here */
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 2);
   gtk_widget_show (hbox);
 
   widget = gtk_label_new ("hscroll-policy");
@@ -108,7 +108,7 @@ scrollable_policy (void)
                     G_CALLBACK (horizontal_policy_changed), viewport);
 
   /* Add Vertical policy control here */
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 2);
   gtk_widget_show (hbox);
 
   widget = gtk_label_new ("vscroll-policy");
@@ -129,7 +129,7 @@ scrollable_policy (void)
 
 
   /* Add Label orientation control here */
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 2);
   gtk_widget_show (hbox);
 
   widget = gtk_label_new ("label-flip");

diff --git a/tests/testselection.c b/tests/testselection.c
index 088225e84573deb777e350779e46140ce081efb0..dfe2ed118de46b910fd4a48b53eb3c2856341b50 100644 (file)
--- a/tests/testselection.c
+++ b/tests/testselection.c
@@ -442,7 +442,7 @@ main (int argc, char *argv[])
   gtk_table_attach_defaults (GTK_TABLE (table), scrolled, 0, 1, 1, 2);
   gtk_widget_show (selection_text);
 
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 2);
   gtk_table_attach (GTK_TABLE (table), hbox, 0, 2, 3, 4,
                    GTK_EXPAND | GTK_FILL, 0, 0, 0);
   gtk_widget_show (hbox);

diff --git a/tests/testsocket.c b/tests/testsocket.c
index b8310fce644781cfe8b0d44aef1c8add9613e2fe..3b44fd0bb8206c1ce2d6524b72246ae2b38083a0 100644 (file)
--- a/tests/testsocket.c
+++ b/tests/testsocket.c
@@ -97,7 +97,7 @@ create_socket (void)
   
   Socket *socket = g_new (Socket, 1);
   
-  socket->box = gtk_vbox_new (FALSE, 0);
+  socket->box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
 
   socket->socket = gtk_socket_new ();
   
@@ -321,7 +321,7 @@ main (int argc, char *argv[])
   gtk_window_set_title (GTK_WINDOW (window), "Socket Test");
   gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   menubar = gtk_menu_bar_new ();
@@ -375,13 +375,13 @@ main (int argc, char *argv[])
                    G_CALLBACK (grab_window_toggled),
                    window);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
   entry = gtk_entry_new ();
   gtk_box_pack_start (GTK_BOX(hbox), entry, FALSE, FALSE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
   box = hbox;

diff --git a/tests/testsocket_common.c b/tests/testsocket_common.c
index 0023909f841c02bca4a10a52e938a503d3fa2288..7d147f32a6e5c9cb324c040b127c526d292564b2 100644 (file)
--- a/tests/testsocket_common.c
+++ b/tests/testsocket_common.c
@@ -217,7 +217,7 @@ create_content (GtkWindow *window, gboolean local)
 
   frame = gtk_frame_new (local? "Local" : "Remote");
   gtk_container_set_border_width (GTK_CONTAINER (frame), 3);
-  vbox = gtk_vbox_new (TRUE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
 
   gtk_container_add (GTK_CONTAINER (frame), vbox);

diff --git a/tests/testspinbutton.c b/tests/testspinbutton.c
index d77c69542c058e95d3499929d5283b77f109d90a..535a35cb2cb52a91d19e3a0cd94be85b01670a82 100644 (file)
--- a/tests/testspinbutton.c
+++ b/tests/testspinbutton.c
@@ -31,7 +31,7 @@ main (int argc, char **argv)
         window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
         g_signal_connect (window, "delete_event", gtk_main_quit, NULL);
 
-        mainbox = gtk_vbox_new (FALSE, 2);
+        mainbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 2);
         gtk_container_add (GTK_CONTAINER (window), mainbox);
 
        for (max = 9; max <= 999999999; max = max * 10 + 9) {
@@ -42,7 +42,7 @@ main (int argc, char **argv)
                                                          0.0);
 
                GtkWidget *spin = gtk_spin_button_new (adj, 1.0, 0);
-               GtkWidget *hbox = gtk_hbox_new (FALSE, 2);
+               GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 2);
                
                gtk_box_pack_start (GTK_BOX (hbox),
                                    spin,

diff --git a/tests/testtext.c b/tests/testtext.c
index 7bd911a8ce2238f144ce522be1c5b3f25164fa8e..84159822ca1a92c7c131b936df7584836e32ad51 100644 (file)
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -261,7 +261,7 @@ msgbox_run (GtkWindow  *parent,
 
   /* Fill in the contents of the widget
    */
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (dialog), vbox);
   
   label = gtk_label_new (message);
@@ -1534,7 +1534,7 @@ do_rich_text (gpointer callback_data,
 
   gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), tv);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox,
                       FALSE, FALSE, 0);
 
@@ -2928,7 +2928,7 @@ create_view (Buffer *buffer)
 
   gtk_window_add_accel_group (GTK_WINDOW (view->window), view->accel_group);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (view->window), vbox);
 
   gtk_box_pack_start (GTK_BOX (vbox),

diff --git a/tests/testthreads.c b/tests/testthreads.c
index 8c81da61e782808fb1a0d9115acacb34ce2274bf..e630a5f1e633a83878fcc8b3705a01b852ecace7 100644 (file)
--- a/tests/testthreads.c
+++ b/tests/testthreads.c
@@ -67,7 +67,7 @@ counter (void *data)
   gtk_window_set_title (GTK_WINDOW (window), name);
   gtk_widget_set_size_request (window, 100, 50);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
 
   g_signal_connect (window, "delete-event",
                     G_CALLBACK (delete_cb), &flag);

diff --git a/tests/testtoolbar.c b/tests/testtoolbar.c
index 888a52fb7370c1585fe041ac47d36e0c3c89a8a4..cd55b032bd4beb5673dfb2524bc77c21893165e5 100644 (file)
--- a/tests/testtoolbar.c
+++ b/tests/testtoolbar.c
@@ -530,12 +530,12 @@ main (gint argc, gchar **argv)
   gtk_table_attach (GTK_TABLE (table), toolbar,
                    0,2, 0,1, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
 
-  hbox1 = gtk_hbox_new (FALSE, 3);
+  hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 3);
   gtk_container_set_border_width (GTK_CONTAINER (hbox1), 5);
   gtk_table_attach (GTK_TABLE (table), hbox1,
                    1,2, 1,2, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
 
-  hbox2 = gtk_hbox_new (FALSE, 2);
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 2);
   gtk_container_set_border_width (GTK_CONTAINER (hbox2), 5);
   gtk_table_attach (GTK_TABLE (table), hbox2,
                    1,2, 2,3, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
@@ -706,7 +706,7 @@ main (gint argc, gchar **argv)
   add_item_to_list (store, item, "Terminal");
   gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
 
-  hbox = gtk_hbox_new (FALSE, 5);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
   gtk_table_attach (GTK_TABLE (table), hbox,
                    1,2, 4,5, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);

diff --git a/tests/testtooltips.c b/tests/testtooltips.c
index 4c178467977d7703656ea04f34d46d5b6ba48fbc..5ec25abfcd44eb9dd6a420dfcca6319bddb1f868 100644 (file)
--- a/tests/testtooltips.c
+++ b/tests/testtooltips.c
@@ -275,7 +275,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "delete_event",
                    G_CALLBACK (gtk_main_quit), NULL);
 
-  box = gtk_vbox_new (FALSE, 3);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 3);
   gtk_container_add (GTK_CONTAINER (window), box);
 
   /* A check button using the tooltip-markup property */

diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index da2363c8d740121881038aa419261eef255269df..a0f6841b7a5d8a7cf9a353323279916549bdc7b5 100644 (file)
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -812,11 +812,11 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); 
   gtk_window_set_default_size (GTK_WINDOW (window), 500, 300);
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
-  hbox = gtk_hbox_new (FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
 
   /* Left Pane */
@@ -837,7 +837,7 @@ main (int argc, char *argv[])
   gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE, 0);
 
   /* Middle Pane */
-  vbox2 = gtk_vbox_new (FALSE, 8);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
   
   bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
@@ -878,7 +878,7 @@ main (int argc, char *argv[])
 
   
   /* Right Pane */
-  vbox2 = gtk_vbox_new (FALSE, 8);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
 
   swindow = gtk_scrolled_window_new (NULL, NULL);
@@ -946,7 +946,7 @@ main (int argc, char *argv[])
   gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
                       FALSE, FALSE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   button = gtk_button_new_with_mnemonic ("_Add new Column");
   g_signal_connect (button, "clicked", G_CALLBACK (add_clicked), left_tree_model);

diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c
index 93130fa8a8a3c6d2efbc735bfb820a8abe6c6c24..68aa9a7e6092f7497f088bd827a919a4d1f8ac2a 100644 (file)
--- a/tests/testtreecolumnsizing.c
+++ b/tests/testtreecolumnsizing.c
@@ -178,7 +178,7 @@ main (int argc, char **argv)
   g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL);
   gtk_container_set_border_width (GTK_CONTAINER (window), 5);
 
-  vbox = gtk_vbox_new (FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   /* Option menu contents */

diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c
index dec350a4cbd5a16e2e881e61a349fec9aab56ae1..aab10518644114bf41e4e8c99e8a641b5e55c483 100644 (file)
--- a/tests/testtreeflow.c
+++ b/tests/testtreeflow.c
@@ -135,7 +135,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Reflow test");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Incremental Reflow Test"), FALSE, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -159,7 +159,7 @@ main (int argc, char *argv[])
                                               "text", TEXT_COLUMN,
                                               NULL);
   gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
-  hbox = gtk_hbox_new (FALSE, FALSE);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   button = gtk_button_new_with_mnemonic ("<b>_Futz!!</b>");
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);

diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c
index 8baf12b3bdb44317b8d875f1a25509715bcb82e1..43c1407dcbefbb7aba2cd22562530e13fc52c17b 100644 (file)
--- a/tests/testtreefocus.c
+++ b/tests/testtreefocus.c
@@ -353,7 +353,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet"), FALSE, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -469,7 +469,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Model");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("The model revealed"), FALSE, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);

diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index a23b367ddde982d1e28367555b726a8b7dac820b..0d90c55269cc59d442e29f79de58ed6b03bd5b3d 100644 (file)
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -125,7 +125,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Words, words, words - Window 1");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan and Kristian's list of cool words. (And Anders' cool list of numbers) \n\nThis is just a GtkTreeStore"), FALSE, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -255,7 +255,7 @@ main (int argc, char *argv[])
       gtk_window_set_title (GTK_WINDOW (window2), 
                            "Words, words, words - window 2");
       g_signal_connect (window2, "destroy", gtk_main_quit, NULL);
-      vbox2 = gtk_vbox_new (FALSE, 8);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
       gtk_box_pack_start (GTK_BOX (vbox2), 
                          gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeStore of window 1"),
@@ -327,7 +327,7 @@ main (int argc, char *argv[])
       gtk_window_set_title (GTK_WINDOW (window3), 
                            "Words, words, words - Window 3");
       g_signal_connect (window3, "destroy", gtk_main_quit, NULL);
-      vbox3 = gtk_vbox_new (FALSE, 8);
+      vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
       gtk_box_pack_start (GTK_BOX (vbox3), 
                          gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeModelSort of window 2"),

diff --git a/tests/testvolumebutton.c b/tests/testvolumebutton.c
index ee1d2bd7e5e1926794fbac4fff552e3b61f8ccff..29bf4891ad38ab0a8e7adcb14b12b035091f0441 100644 (file)
--- a/tests/testvolumebutton.c
+++ b/tests/testvolumebutton.c
@@ -88,7 +88,7 @@ main (int    argc,
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   button = gtk_volume_button_new ();
   button2 = gtk_volume_button_new ();
-  box = gtk_hbox_new (FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
 
   g_signal_connect (G_OBJECT (button), "value-changed",
                     G_CALLBACK (value_changed),

diff --git a/tests/testwindows.c b/tests/testwindows.c
index 653370bb118beedb72365269e3a3ca02485a558f..09e2960751336d8938acc0c883cf6db41d896df0 100644 (file)
--- a/tests/testwindows.c
+++ b/tests/testwindows.c
@@ -798,7 +798,7 @@ main (int argc, char **argv)
 
   g_signal_connect (G_OBJECT (window), "delete-event", gtk_main_quit, NULL);
 
-  hbox = gtk_hbox_new (FALSE, 5);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
   gtk_container_add (GTK_CONTAINER (window), hbox);
   gtk_widget_show (hbox);
 
@@ -825,7 +825,7 @@ main (int argc, char **argv)
                        &black);
                        
   
-  vbox = gtk_vbox_new (FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
   gtk_box_pack_start (GTK_BOX (hbox),
                      vbox,
                      FALSE, FALSE,

diff --git a/tests/testxinerama.c b/tests/testxinerama.c
index e41752aabf85aee6aea1823e764645dbf554b83c..8ecca105fd61a6710f6158de23b3654fa6e3b26e 100644 (file)
--- a/tests/testxinerama.c
+++ b/tests/testxinerama.c
@@ -109,7 +109,7 @@ main (int argc, char *argv[])
                              primary_monitor);
       gtk_label_set_markup (GTK_LABEL (label), str);
       g_free (str);
-      vbox = gtk_vbox_new (TRUE, 1);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE, 1);
       gtk_container_add (GTK_CONTAINER (window), vbox);
       gtk_container_add (GTK_CONTAINER (vbox), label);
       button = gtk_button_new_with_label ("Query current monitor");

diff --git a/tests/treestoretest.c b/tests/treestoretest.c
index 080bc410498b07629462035ebad5345822e911a6..5b4c72a0010c8b77c329f98cf3afb7091126c6cd 100644 (file)
--- a/tests/treestoretest.c
+++ b/tests/treestoretest.c
@@ -303,7 +303,7 @@ make_window (gint view_type)
       break;
     }
 
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 350);
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
@@ -351,7 +351,7 @@ make_window (gint view_type)
   gtk_widget_set_sensitive (button, FALSE);
 
   button = gtk_button_new_with_label ("gtk_tree_store_insert");
-  hbox = gtk_hbox_new (FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
   entry = gtk_entry_new ();
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
@@ -362,7 +362,7 @@ make_window (gint view_type)
                     tree_view);
   
   button = gtk_button_new_with_label ("gtk_tree_store_set");
-  hbox = gtk_hbox_new (FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
   entry = gtk_entry_new ();
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
@@ -373,7 +373,7 @@ make_window (gint view_type)
                    tree_view);
 
   button = gtk_button_new_with_label ("gtk_tree_store_insert_with_values");
-  hbox = gtk_hbox_new (FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
   entry = gtk_entry_new ();
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);