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

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

diff --git a/tests/testmenubars.c b/tests/testmenubars.c
index 741bf4685dc46f8942a9e2fd72ed1cd223fc249a..5012259e9d1c671be43518de93ec660226ef962e 100644 (file)
--- a/tests/testmenubars.c
+++ b/tests/testmenubars.c
@@ -1,15 +1,27 @@
-/* Menubars
+/* testmenubars.c -- test different packing directions
+ * Copyright (C) 2005  Red Hat, Inc.
+ * Author: Matthias Clasen
  *
- * This program tests different packing directions
- * of menu bars.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
  *
- * Written by Matthias Clasen <mclasen@redhat.com>
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #include <gtk/gtk.h>
 
 static GtkWidget *
-create_menu (depth)
+create_menu (guint depth)
 {
     GtkWidget *menu;
     GtkWidget *menuitem;
@@ -45,6 +57,7 @@ create_menubar (GtkPackDirection pack_dir,
                GtkPackDirection child_pack_dir,
                gdouble          angle)
 {
+  GtkWidget *child;
   GtkWidget *menubar;
   GtkWidget *menuitem;
   GtkWidget *menu;
@@ -57,20 +70,23 @@ create_menubar (GtkPackDirection pack_dir,
   
   menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_HOME, NULL);
   gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
-  gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle);
-  menu = create_menu (2, TRUE);
+  child = gtk_bin_get_child (GTK_BIN (menuitem));
+  gtk_label_set_angle (GTK_LABEL (child), angle);
+  menu = create_menu (2);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
 
   menuitem = gtk_menu_item_new_with_label ("foo");
   gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
-  gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle);
-  menu = create_menu (2, TRUE);
+  child = gtk_bin_get_child (GTK_BIN (menuitem));
+  gtk_label_set_angle (GTK_LABEL (child), angle);
+  menu = create_menu (2);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
 
   menuitem = gtk_menu_item_new_with_label ("bar");
   gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
-  gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle);
-  menu = create_menu (2, TRUE);
+  child = gtk_bin_get_child (GTK_BIN (menuitem));
+  gtk_label_set_angle (GTK_LABEL (child), angle);
+  menu = create_menu (2);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
 
   return menubar;
@@ -111,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);
@@ -135,11 +151,11 @@ main (int argc, char **argv)
 
       gtk_widget_show_all (box1);
             
-      separator = gtk_hseparator_new ();
+      separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
       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);
@@ -148,12 +164,12 @@ main (int argc, char **argv)
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK(gtk_widget_destroy), window);
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+      gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
       gtk_widget_show (button);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }