Change FSF Address

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

diff --git a/tests/testmenubars.c b/tests/testmenubars.c
index 853d822a9b6a792583399370d88de5708e59aa31..b210a801e80c84224cd49de3b31f8147ce481ed0 100644 (file)
--- a/tests/testmenubars.c
+++ b/tests/testmenubars.c
@@ -13,9 +13,7 @@
  * 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gtk/gtk.h>
@@ -57,6 +55,7 @@ create_menubar (GtkPackDirection pack_dir,
                GtkPackDirection child_pack_dir,
                gdouble          angle)
 {
+  GtkWidget *child;
   GtkWidget *menubar;
   GtkWidget *menuitem;
   GtkWidget *menu;
@@ -69,19 +68,25 @@ 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);
+  child = gtk_bin_get_child (GTK_BIN (menuitem));
+  gtk_label_set_angle (GTK_LABEL (child), angle);
+  gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_START);
   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);
+  child = gtk_bin_get_child (GTK_BIN (menuitem));
+  gtk_label_set_angle (GTK_LABEL (child), angle);
+  gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_MIDDLE);
   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);
+  child = gtk_bin_get_child (GTK_BIN (menuitem));
+  gtk_label_set_angle (GTK_LABEL (child), angle);
+  gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_END);
   menu = create_menu (2);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
 
@@ -123,9 +128,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, 0);
+      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+      box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 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);
@@ -147,11 +152,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, 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);