]> Pileus Git - ~andy/gtk/blobdiff - tests/testgtk.c
Some cleanups after the module cache file change
[~andy/gtk] / tests / testgtk.c
index 5b8b7247658638d86248be3b48a6e7f8d9192539..86ad601173f1ce1c2299503bebc745cf5ca232a9 100644 (file)
@@ -24,7 +24,6 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#undef GTK_DISABLE_DEPRECATED
 
 #include "config.h"
 
@@ -110,43 +109,20 @@ build_option_menu (gchar           *items[],
                   gpointer         data)
 {
   GtkWidget *omenu;
-  GtkWidget *menu;
-  GtkWidget *menu_item;
-  GSList *group;
   gint i;
 
-  omenu = gtk_option_menu_new ();
+  omenu = gtk_combo_box_new_text ();
   g_signal_connect (omenu, "changed",
                    G_CALLBACK (func), data);
       
-  menu = gtk_menu_new ();
-  group = NULL;
-  
   for (i = 0; i < num_items; i++)
-    {
-      menu_item = gtk_radio_menu_item_new_with_label (group, items[i]);
-      group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_item));
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-      if (i == history)
-       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE);
-      gtk_widget_show (menu_item);
-    }
+      gtk_combo_box_append_text (GTK_COMBO_BOX (omenu), items[i]);
 
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-  gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), history);
+  gtk_combo_box_set_active (GTK_COMBO_BOX (omenu), history);
   
   return omenu;
 }
 
-static void
-destroy_tooltips (GtkWidget *widget, GtkWindow **window)
-{
-  GtkTooltips *tt = g_object_get_data (G_OBJECT (*window), "tooltips");
-  g_object_unref (tt);
-  *window = NULL;
-}
-
-
 /*
  * Windows with an alpha channel
  */
@@ -1232,10 +1208,6 @@ create_bbox (gint  horizontal,
 
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
   gtk_box_set_spacing (GTK_BOX (bbox), spacing);
-  g_object_set (bbox,
-                "child-min-width", child_w,
-                "child-min-height", child_h,
-                NULL);
   
   button = gtk_button_new_with_label ("OK");
   gtk_container_add (GTK_CONTAINER (bbox), button);
@@ -1384,14 +1356,14 @@ static void
 set_toolbar_horizontal (GtkWidget *widget,
                        gpointer   data)
 {
-  gtk_toolbar_set_orientation (GTK_TOOLBAR (data), GTK_ORIENTATION_HORIZONTAL);
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (data), GTK_ORIENTATION_HORIZONTAL);
 }
 
 static void
 set_toolbar_vertical (GtkWidget *widget,
                      gpointer   data)
 {
-  gtk_toolbar_set_orientation (GTK_TOOLBAR (data), GTK_ORIENTATION_VERTICAL);
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (data), GTK_ORIENTATION_VERTICAL);
 }
 
 static void
@@ -1426,25 +1398,67 @@ static void
 set_toolbar_enable (GtkWidget *widget,
                    gpointer   data)
 {
-  gtk_toolbar_set_tooltips (GTK_TOOLBAR (data), TRUE);
+  GtkSettings *settings = gtk_widget_get_settings (widget);
+  g_object_set (settings, "gtk-enable-tooltips", TRUE, NULL);
 }
 
 static void
 set_toolbar_disable (GtkWidget *widget,
                     gpointer   data)
 {
-  gtk_toolbar_set_tooltips (GTK_TOOLBAR (data), FALSE);
-}
+  GtkSettings *settings = gtk_widget_get_settings (widget);
+  g_object_set (settings, "gtk-enable-tooltips", FALSE, NULL);
+}
+
+static GtkActionEntry create_toolbar_items[] = {
+    { NULL, GTK_STOCK_NEW, NULL, NULL, "Stock icon: New",
+      G_CALLBACK (set_toolbar_small_stock) },
+    { NULL, GTK_STOCK_OPEN, NULL, NULL, "Stock icon: Open",
+      G_CALLBACK (set_toolbar_large_stock) },
+    { NULL, NULL, "Horizontal", NULL, "Horizontal toolbar layout",
+      G_CALLBACK (set_toolbar_horizontal) },
+    { NULL, NULL, "Vertical", NULL, "Vertical toolbar layout",
+      G_CALLBACK (set_toolbar_vertical) },
+    { NULL },
+    { NULL, NULL, "Icons", NULL, "Only show toolbar icons",
+      G_CALLBACK (set_toolbar_icons) },
+    { NULL, NULL, "Text", NULL, "Only show toolbar text",
+      G_CALLBACK (set_toolbar_text) },
+    { NULL, NULL, "Both", NULL, "Show toolbar icons and text",
+      G_CALLBACK (set_toolbar_both) },
+    { NULL, NULL, "Both (horizontal)", NULL, "Show toolbar icons and text in a horizontal fashion",
+      G_CALLBACK (set_toolbar_both_horiz) },
+    { NULL },
+    { "entry", NULL, NULL, "This is an unusable GtkEntry ;)",
+      NULL },
+    { NULL },
+    { NULL },
+    { NULL, NULL, "Enable", NULL, "Enable tooltips",
+      G_CALLBACK (set_toolbar_enable) },
+    { NULL, NULL, "Disable", NULL, "Disable tooltips",
+      G_CALLBACK (set_toolbar_disable) },
+    { NULL },
+    { NULL, NULL, "Frobate", NULL, "Frobate tooltip",
+      NULL },
+    { NULL, NULL, "Baz", NULL, "Baz tooltip",
+      NULL },
+    { NULL },
+    { NULL, NULL, "Blah", NULL, "Blash tooltip",
+      NULL },
+    { NULL, NULL, "Bar", NULL, "Bar tooltip",
+      NULL },
+};
 
 static void
 create_toolbar (GtkWidget *widget)
 {
   static GtkWidget *window = NULL;
   GtkWidget *toolbar;
-  GtkWidget *entry;
 
   if (!window)
     {
+      guint i;
+
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (widget));
@@ -1459,88 +1473,36 @@ create_toolbar (GtkWidget *widget)
       gtk_widget_realize (window);
 
       toolbar = gtk_toolbar_new ();
+      for (i = 0; i < G_N_ELEMENTS (create_toolbar_items); i++)
+        {
+          GtkToolItem *toolitem;
 
-      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
-                               GTK_STOCK_NEW,
-                               "Stock icon: New", "Toolbar/New",
-                               G_CALLBACK (set_toolbar_small_stock), toolbar, -1);
-      
-      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
-                               GTK_STOCK_OPEN,
-                               "Stock icon: Open", "Toolbar/Open",
-                               G_CALLBACK (set_toolbar_large_stock), toolbar, -1);
-      
-      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Horizontal", "Horizontal toolbar layout", "Toolbar/Horizontal",
-                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              G_CALLBACK (set_toolbar_horizontal), toolbar);
-      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Vertical", "Vertical toolbar layout", "Toolbar/Vertical",
-                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              G_CALLBACK (set_toolbar_vertical), toolbar);
-
-      gtk_toolbar_append_space (GTK_TOOLBAR(toolbar));
-
-      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Icons", "Only show toolbar icons", "Toolbar/IconsOnly",
-                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              G_CALLBACK (set_toolbar_icons), toolbar);
-      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Text", "Only show toolbar text", "Toolbar/TextOnly",
-                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              G_CALLBACK (set_toolbar_text), toolbar);
-      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Both", "Show toolbar icons and text", "Toolbar/Both",
-                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              G_CALLBACK (set_toolbar_both), toolbar);
-      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Both (horizontal)",
-                              "Show toolbar icons and text in a horizontal fashion",
-                              "Toolbar/BothHoriz",
-                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              G_CALLBACK (set_toolbar_both_horiz), toolbar);
-                              
-      gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
-
-      entry = gtk_entry_new ();
-
-      gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), entry, "This is an unusable GtkEntry ;)", "Hey don't click me!!!");
-
-      gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
-
-
-      gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
-
-      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Enable", "Enable tooltips", NULL,
-                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              G_CALLBACK (set_toolbar_enable), toolbar);
-      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Disable", "Disable tooltips", NULL,
-                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              G_CALLBACK (set_toolbar_disable), toolbar);
-
-      gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
+          if (create_toolbar_items[i].tooltip == NULL)
+            toolitem = gtk_separator_tool_item_new ();
+          else if (g_strcmp0 (create_toolbar_items[i].name, "entry") == 0)
+            {
+              GtkWidget *entry;
 
-      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Frobate", "Frobate tooltip", NULL,
-                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              NULL, toolbar);
-      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Baz", "Baz tooltip", NULL,
-                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              NULL, toolbar);
+              toolitem = gtk_tool_item_new ();
+              entry = gtk_entry_new ();
+              gtk_container_add (GTK_CONTAINER (toolitem), entry);
+            }
+          else if (create_toolbar_items[i].stock_id)
+            toolitem = gtk_tool_button_new_from_stock (create_toolbar_items[i].stock_id);
+          else
+            {
+              GtkWidget *icon;
 
-      gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
-      
-      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Blah", "Blah tooltip", NULL,
-                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              NULL, toolbar);
-      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Bar", "Bar tooltip", NULL,
-                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              NULL, toolbar);
+              icon = new_pixmap ("test.xpm", window->window,
+                                 &window->style->bg[GTK_STATE_NORMAL]);
+              toolitem = gtk_tool_button_new (icon, create_toolbar_items[i].label);
+            }
+          if (create_toolbar_items[i].callback)
+            g_signal_connect (toolitem, "clicked",
+                              create_toolbar_items[i].callback, toolbar);
+          gtk_tool_item_set_tooltip_text (toolitem, create_toolbar_items[i].tooltip);
+          gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
+        }
 
       gtk_container_add (GTK_CONTAINER (window), toolbar);
 
@@ -1553,72 +1515,63 @@ create_toolbar (GtkWidget *widget)
     gtk_widget_destroy (window);
 }
 
+static GtkActionEntry make_toolbar_items[] = {
+    { NULL, NULL, "Horizontal", NULL, "Horizontal toolbar layout",
+      G_CALLBACK (set_toolbar_horizontal) },
+    { NULL, NULL, "Vertical", NULL, "Vertical toolbar layout",
+      G_CALLBACK (set_toolbar_vertical) },
+    { NULL },
+    { NULL, NULL, "Icons", NULL, "Only show toolbar icons",
+      G_CALLBACK (set_toolbar_icons) },
+    { NULL, NULL, "Text", NULL, "Only show toolbar text",
+      G_CALLBACK (set_toolbar_text) },
+    { NULL, NULL, "Both", NULL, "Show toolbar icons and text",
+      G_CALLBACK (set_toolbar_both) },
+    { NULL },
+    { NULL, NULL, "Woot", NULL, "Woot woot woot",
+      NULL },
+    { NULL, NULL, "Blah", NULL, "Blah blah blah",
+      NULL },
+    { NULL },
+    { NULL, NULL, "Enable", NULL, "Enable tooltips",
+      G_CALLBACK (set_toolbar_enable) },
+    { NULL, NULL, "Disable", NULL, "Disable tooltips",
+      G_CALLBACK (set_toolbar_disable) },
+    { NULL },
+    { NULL, NULL, "Hoo", NULL, "Hoo tooltip",
+      NULL },
+    { NULL, NULL, "Woo", NULL, "Woo tooltip",
+      NULL }
+};
+
 static GtkWidget*
 make_toolbar (GtkWidget *window)
 {
   GtkWidget *toolbar;
+  guint i;
 
   if (!gtk_widget_get_realized (window))
     gtk_widget_realize (window);
 
   toolbar = gtk_toolbar_new ();
+  for (i = 0; i < G_N_ELEMENTS (make_toolbar_items); i++)
+    {
+      GtkWidget *icon;
+      GtkToolItem *toolitem;
 
-  gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Horizontal", "Horizontal toolbar layout", NULL,
-                          new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          G_CALLBACK (set_toolbar_horizontal), toolbar);
-  gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Vertical", "Vertical toolbar layout", NULL,
-                          new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          G_CALLBACK (set_toolbar_vertical), toolbar);
-
-  gtk_toolbar_append_space (GTK_TOOLBAR(toolbar));
-
-  gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Icons", "Only show toolbar icons", NULL,
-                          new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          G_CALLBACK (set_toolbar_icons), toolbar);
-  gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Text", "Only show toolbar text", NULL,
-                          new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          G_CALLBACK (set_toolbar_text), toolbar);
-  gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Both", "Show toolbar icons and text", NULL,
-                          new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          G_CALLBACK (set_toolbar_both), toolbar);
-
-  gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
-
-  gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Woot", "Woot woot woot", NULL,
-                          new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          NULL, toolbar);
-  gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Blah", "Blah blah blah", "Toolbar/Big",
-                          new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          NULL, toolbar);
-
-  gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
-
-  gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Enable", "Enable tooltips", NULL,
-                          new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          G_CALLBACK (set_toolbar_enable), toolbar);
-  gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Disable", "Disable tooltips", NULL,
-                          new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          G_CALLBACK (set_toolbar_disable), toolbar);
-
-  gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
-  
-  gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Hoo", "Hoo tooltip", NULL,
-                          new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          NULL, toolbar);
-  gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Woo", "Woo tooltip", NULL,
-                          new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          NULL, toolbar);
+      if (make_toolbar_items[i].label == NULL)
+        {
+          toolitem = gtk_separator_tool_item_new ();
+          continue;
+        }
+      icon  = new_pixmap ("test.xpm", window->window,
+                          &window->style->bg[GTK_STATE_NORMAL]);
+      toolitem = gtk_tool_button_new (icon, make_toolbar_items[i].label);
+      gtk_tool_item_set_tooltip_text (toolitem, make_toolbar_items[i].tooltip);
+      if (make_toolbar_items[i].callback != NULL)
+        g_signal_connect (toolitem, "clicked",  make_toolbar_items[i].callback, toolbar);
+      gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
+    }
 
   return toolbar;
 }
@@ -1805,486 +1758,6 @@ create_statusbar (GtkWidget *widget)
     gtk_widget_destroy (window);
 }
 
-/*
- * GtkTree
- */
-
-static void
-cb_tree_destroy_event(GtkWidget* w)
-{
-  sTreeButtons* tree_buttons;
-
-  /* free buttons structure associate at this tree */
-  tree_buttons = g_object_get_data (G_OBJECT (w), "user_data");
-  g_free (tree_buttons);
-}
-
-static void
-cb_add_new_item(GtkWidget* w, GtkTree* tree)
-{
-  sTreeButtons* tree_buttons;
-  GList* selected_list;
-  GtkWidget* selected_item;
-  GtkWidget* subtree;
-  GtkWidget* item_new;
-  char buffer[255];
-
-  tree_buttons = g_object_get_data (G_OBJECT (tree), "user_data");
-
-  selected_list = GTK_TREE_SELECTION_OLD(tree);
-
-  if(selected_list == NULL)
-    {
-      /* there is no item in tree */
-      subtree = GTK_WIDGET(tree);
-    }
-  else
-    {
-      /* list can have only one element */
-      selected_item = GTK_WIDGET(selected_list->data);
-      
-      subtree = GTK_TREE_ITEM_SUBTREE(selected_item);
-
-      if(subtree == NULL)
-       {
-         /* current selected item have not subtree ... create it */
-         subtree = gtk_tree_new();
-         gtk_tree_item_set_subtree(GTK_TREE_ITEM(selected_item), 
-                                   subtree);
-       }
-    }
-
-  /* at this point, we know which subtree will be used to add new item */
-  /* create a new item */
-  sprintf(buffer, "item add %d", tree_buttons->nb_item_add);
-  item_new = gtk_tree_item_new_with_label(buffer);
-  gtk_tree_append(GTK_TREE(subtree), item_new);
-  gtk_widget_show(item_new);
-
-  tree_buttons->nb_item_add++;
-}
-
-static void
-cb_remove_item(GtkWidget*w, GtkTree* tree)
-{
-  GList* selected_list;
-  GList* clear_list;
-  
-  selected_list = GTK_TREE_SELECTION_OLD(tree);
-
-  clear_list = NULL;
-    
-  while (selected_list) 
-    {
-      clear_list = g_list_prepend (clear_list, selected_list->data);
-      selected_list = selected_list->next;
-    }
-  
-  clear_list = g_list_reverse (clear_list);
-  gtk_tree_remove_items(tree, clear_list);
-
-  g_list_free (clear_list);
-}
-
-static void
-cb_remove_subtree(GtkWidget*w, GtkTree* tree)
-{
-  GList* selected_list;
-  GtkTreeItem *item;
-  
-  selected_list = GTK_TREE_SELECTION_OLD(tree);
-
-  if (selected_list)
-    {
-      item = GTK_TREE_ITEM (selected_list->data);
-      if (item->subtree)
-       gtk_tree_item_remove_subtree (item);
-    }
-}
-
-static void
-cb_tree_changed(GtkTree* tree)
-{
-  sTreeButtons* tree_buttons;
-  GList* selected_list;
-  guint nb_selected;
-
-  tree_buttons = g_object_get_data (G_OBJECT (tree), "user_data");
-
-  selected_list = GTK_TREE_SELECTION_OLD(tree);
-  nb_selected = g_list_length(selected_list);
-
-  if(nb_selected == 0) 
-    {
-      if(tree->children == NULL)
-       gtk_widget_set_sensitive(tree_buttons->add_button, TRUE);
-      else
-       gtk_widget_set_sensitive(tree_buttons->add_button, FALSE);
-      gtk_widget_set_sensitive(tree_buttons->remove_button, FALSE);
-      gtk_widget_set_sensitive(tree_buttons->subtree_button, FALSE);
-    } 
-  else 
-    {
-      gtk_widget_set_sensitive(tree_buttons->remove_button, TRUE);
-      gtk_widget_set_sensitive(tree_buttons->add_button, (nb_selected == 1));
-      gtk_widget_set_sensitive(tree_buttons->subtree_button, (nb_selected == 1));
-    }  
-}
-
-static void 
-create_subtree(GtkWidget* item, guint level, guint nb_item_max, guint recursion_level_max)
-{
-  GtkWidget* item_subtree;
-  GtkWidget* item_new;
-  guint nb_item;
-  char buffer[255];
-  int no_root_item;
-
-  if(level == recursion_level_max) return;
-
-  if(level == -1)
-    {
-      /* query with no root item */
-      level = 0;
-      item_subtree = item;
-      no_root_item = 1;
-    }
-  else
-    {
-      /* query with no root item */
-      /* create subtree and associate it with current item */
-      item_subtree = gtk_tree_new();
-      no_root_item = 0;
-    }
-  
-  for(nb_item = 0; nb_item < nb_item_max; nb_item++)
-    {
-      sprintf(buffer, "item %d-%d", level, nb_item);
-      item_new = gtk_tree_item_new_with_label(buffer);
-      gtk_tree_append(GTK_TREE(item_subtree), item_new);
-      create_subtree(item_new, level+1, nb_item_max, recursion_level_max);
-      gtk_widget_show(item_new);
-    }
-
-  if(!no_root_item)
-    gtk_tree_item_set_subtree(GTK_TREE_ITEM(item), item_subtree);
-}
-
-static void
-create_tree_sample(GdkScreen *screen, guint selection_mode, 
-                  guint draw_line, guint view_line, guint no_root_item,
-                  guint nb_item_max, guint recursion_level_max) 
-{
-  GtkWidget* window;
-  GtkWidget* box1;
-  GtkWidget* box2;
-  GtkWidget* separator;
-  GtkWidget* button;
-  GtkWidget* scrolled_win;
-  GtkWidget* root_tree;
-  GtkWidget* root_item;
-  sTreeButtons* tree_buttons;
-
-  /* create tree buttons struct */
-  if ((tree_buttons = g_malloc (sizeof (sTreeButtons))) == NULL)
-    {
-      g_error("can't allocate memory for tree structure !\n");
-      return;
-    }
-  tree_buttons->nb_item_add = 0;
-
-  /* create top level window */
-  window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_screen (GTK_WINDOW (window), screen);
-  gtk_window_set_title(GTK_WINDOW(window), "Tree Sample");
-  g_signal_connect (window, "destroy",
-                   G_CALLBACK (cb_tree_destroy_event), NULL);
-  g_object_set_data (G_OBJECT (window), "user_data", tree_buttons);
-
-  box1 = gtk_vbox_new(FALSE, 0);
-  gtk_container_add(GTK_CONTAINER(window), box1);
-  gtk_widget_show(box1);
-
-  /* create tree box */
-  box2 = gtk_vbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(box1), box2, TRUE, TRUE, 0);
-  gtk_container_set_border_width(GTK_CONTAINER(box2), 5);
-  gtk_widget_show(box2);
-
-  /* create scrolled window */
-  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
-                                 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-  gtk_box_pack_start (GTK_BOX (box2), scrolled_win, TRUE, TRUE, 0);
-  gtk_widget_set_size_request (scrolled_win, 200, 200);
-  gtk_widget_show (scrolled_win);
-  
-  /* create root tree widget */
-  root_tree = gtk_tree_new();
-  g_signal_connect (root_tree, "selection_changed",
-                   G_CALLBACK (cb_tree_changed),
-                   NULL);
-  g_object_set_data (G_OBJECT (root_tree), "user_data", tree_buttons);
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win), root_tree);
-  gtk_tree_set_selection_mode(GTK_TREE(root_tree), selection_mode);
-  gtk_tree_set_view_lines(GTK_TREE(root_tree), draw_line);
-  gtk_tree_set_view_mode(GTK_TREE(root_tree), !view_line);
-  gtk_widget_show(root_tree);
-
-  if ( no_root_item )
-    {
-      /* set root tree to subtree function with root item variable */
-      root_item = GTK_WIDGET(root_tree);
-    }
-  else
-    {
-      /* create root tree item widget */
-      root_item = gtk_tree_item_new_with_label("root item");
-      gtk_tree_append(GTK_TREE(root_tree), root_item);
-      gtk_widget_show(root_item);
-     }
-  create_subtree(root_item, -no_root_item, nb_item_max, recursion_level_max);
-
-  box2 = gtk_vbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(box1), box2, FALSE, FALSE, 0);
-  gtk_container_set_border_width(GTK_CONTAINER(box2), 5);
-  gtk_widget_show(box2);
-
-  button = gtk_button_new_with_label("Add Item");
-  gtk_widget_set_sensitive(button, FALSE);
-  g_signal_connect (button, "clicked",
-                   G_CALLBACK (cb_add_new_item),
-                   root_tree);
-  gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0);
-  gtk_widget_show(button);
-  tree_buttons->add_button = button;
-
-  button = gtk_button_new_with_label("Remove Item(s)");
-  gtk_widget_set_sensitive(button, FALSE);
-  g_signal_connect (button, "clicked",
-                   G_CALLBACK (cb_remove_item),
-                   root_tree);
-  gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0);
-  gtk_widget_show(button);
-  tree_buttons->remove_button = button;
-
-  button = gtk_button_new_with_label("Remove Subtree");
-  gtk_widget_set_sensitive(button, FALSE);
-  g_signal_connect (button, "clicked",
-                   G_CALLBACK (cb_remove_subtree),
-                   root_tree);
-  gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0);
-  gtk_widget_show(button);
-  tree_buttons->subtree_button = button;
-
-  /* create separator */
-  separator = gtk_hseparator_new();
-  gtk_box_pack_start(GTK_BOX(box1), separator, FALSE, FALSE, 0);
-  gtk_widget_show(separator);
-
-  /* create button box */
-  box2 = gtk_vbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(box1), box2, FALSE, FALSE, 0);
-  gtk_container_set_border_width(GTK_CONTAINER(box2), 5);
-  gtk_widget_show(box2);
-
-  button = gtk_button_new_with_label("Close");
-  gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0);
-  g_signal_connect_swapped (button, "clicked",
-                           G_CALLBACK (gtk_widget_destroy),
-                           window);
-  gtk_widget_show(button);
-
-  gtk_widget_show(window);
-}
-
-static void
-cb_create_tree(GtkWidget* w)
-{
-  guint selection_mode = GTK_SELECTION_SINGLE;
-  guint view_line;
-  guint draw_line;
-  guint no_root_item;
-  guint nb_item;
-  guint recursion_level;
-
-  /* get selection mode choice */
-  if(GTK_TOGGLE_BUTTON(sTreeSampleSelection.single_button)->active)
-    selection_mode = GTK_SELECTION_SINGLE;
-  else
-    if(GTK_TOGGLE_BUTTON(sTreeSampleSelection.browse_button)->active)
-      selection_mode = GTK_SELECTION_BROWSE;
-    else
-      selection_mode = GTK_SELECTION_MULTIPLE;
-
-  /* get options choice */
-  draw_line = GTK_TOGGLE_BUTTON(sTreeSampleSelection.draw_line_button)->active;
-  view_line = GTK_TOGGLE_BUTTON(sTreeSampleSelection.view_line_button)->active;
-  no_root_item = GTK_TOGGLE_BUTTON(sTreeSampleSelection.no_root_item_button)->active;
-    
-  /* get levels */
-  nb_item = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(sTreeSampleSelection.nb_item_spinner));
-  recursion_level = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(sTreeSampleSelection.recursion_spinner));
-
-  if (pow (nb_item, recursion_level) > 10000)
-    {
-      g_print ("%g total items? That will take a very long time. Try less\n",
-              pow (nb_item, recursion_level));
-      return;
-    }
-
-  create_tree_sample(gtk_widget_get_screen (w),
-                    selection_mode, draw_line, 
-                    view_line, no_root_item, nb_item, recursion_level);
-}
-
-void 
-create_tree_mode_window(GtkWidget *widget)
-{
-  static GtkWidget* window;
-  GtkWidget* box1;
-  GtkWidget* box2;
-  GtkWidget* box3;
-  GtkWidget* box4;
-  GtkWidget* box5;
-  GtkWidget* button;
-  GtkWidget* frame;
-  GtkWidget* separator;
-  GtkWidget* label;
-  GtkWidget* spinner;
-  GtkAdjustment *adj;
-
-  if (!window)
-    {
-      /* create toplevel window  */
-      window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                            gtk_widget_get_screen (widget));
-      gtk_window_set_title(GTK_WINDOW(window), "Set Tree Parameters");
-      g_signal_connect (window, "destroy",
-                       G_CALLBACK (gtk_widget_destroyed),
-                       &window);
-      box1 = gtk_vbox_new(FALSE, 0);
-      gtk_container_add(GTK_CONTAINER(window), box1);
-
-      /* create upper box - selection box */
-      box2 = gtk_vbox_new(FALSE, 5);
-      gtk_box_pack_start(GTK_BOX(box1), box2, TRUE, TRUE, 0);
-      gtk_container_set_border_width(GTK_CONTAINER(box2), 5);
-
-      box3 = gtk_hbox_new(FALSE, 5);
-      gtk_box_pack_start(GTK_BOX(box2), box3, TRUE, TRUE, 0);
-
-      /* create selection mode frame */
-      frame = gtk_frame_new("Selection Mode");
-      gtk_box_pack_start(GTK_BOX(box3), frame, TRUE, TRUE, 0);
-
-      box4 = gtk_vbox_new(FALSE, 0);
-      gtk_container_add(GTK_CONTAINER(frame), box4);
-      gtk_container_set_border_width(GTK_CONTAINER(box4), 5);
-
-      /* create radio button */  
-      button = gtk_radio_button_new_with_label(NULL, "SINGLE");
-      gtk_box_pack_start(GTK_BOX(box4), button, TRUE, TRUE, 0);
-      sTreeSampleSelection.single_button = button;
-
-      button = gtk_radio_button_new_with_label(gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)),
-                                              "BROWSE");
-      gtk_box_pack_start(GTK_BOX(box4), button, TRUE, TRUE, 0);
-      sTreeSampleSelection.browse_button = button;
-
-      button = gtk_radio_button_new_with_label(gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)),
-                                              "MULTIPLE");
-      gtk_box_pack_start(GTK_BOX(box4), button, TRUE, TRUE, 0);
-      sTreeSampleSelection.multiple_button = button;
-
-      sTreeSampleSelection.selection_mode_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
-
-      /* create option mode frame */
-      frame = gtk_frame_new("Options");
-      gtk_box_pack_start(GTK_BOX(box3), frame, TRUE, TRUE, 0);
-
-      box4 = gtk_vbox_new(FALSE, 0);
-      gtk_container_add(GTK_CONTAINER(frame), box4);
-      gtk_container_set_border_width(GTK_CONTAINER(box4), 5);
-
-      /* create check button */
-      button = gtk_check_button_new_with_label("Draw line");
-      gtk_box_pack_start(GTK_BOX(box4), button, TRUE, TRUE, 0);
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
-      sTreeSampleSelection.draw_line_button = button;
-  
-      button = gtk_check_button_new_with_label("View Line mode");
-      gtk_box_pack_start(GTK_BOX(box4), button, TRUE, TRUE, 0);
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
-      sTreeSampleSelection.view_line_button = button;
-  
-      button = gtk_check_button_new_with_label("Without Root item");
-      gtk_box_pack_start(GTK_BOX(box4), button, TRUE, TRUE, 0);
-      sTreeSampleSelection.no_root_item_button = button;
-
-      /* create recursion parameter */
-      frame = gtk_frame_new("Size Parameters");
-      gtk_box_pack_start(GTK_BOX(box2), frame, TRUE, TRUE, 0);
-
-      box4 = gtk_hbox_new(FALSE, 5);
-      gtk_container_add(GTK_CONTAINER(frame), box4);
-      gtk_container_set_border_width(GTK_CONTAINER(box4), 5);
-
-      /* create number of item spin button */
-      box5 = gtk_hbox_new(FALSE, 5);
-      gtk_box_pack_start(GTK_BOX(box4), box5, FALSE, FALSE, 0);
-
-      label = gtk_label_new("Number of items : ");
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-      gtk_box_pack_start (GTK_BOX (box5), label, FALSE, TRUE, 0);
-
-      adj = (GtkAdjustment *) gtk_adjustment_new (DEFAULT_NUMBER_OF_ITEM, 1.0, 255.0, 1.0,
-                                                 5.0, 0.0);
-      spinner = gtk_spin_button_new (adj, 0, 0);
-      gtk_box_pack_start (GTK_BOX (box5), spinner, FALSE, TRUE, 0);
-      sTreeSampleSelection.nb_item_spinner = spinner;
-  
-      /* create recursion level spin button */
-      box5 = gtk_hbox_new(FALSE, 5);
-      gtk_box_pack_start(GTK_BOX(box4), box5, FALSE, FALSE, 0);
-
-      label = gtk_label_new("Depth : ");
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-      gtk_box_pack_start (GTK_BOX (box5), label, FALSE, TRUE, 0);
-
-      adj = (GtkAdjustment *) gtk_adjustment_new (DEFAULT_RECURSION_LEVEL, 0.0, 255.0, 1.0,
-                                                 5.0, 0.0);
-      spinner = gtk_spin_button_new (adj, 0, 0);
-      gtk_box_pack_start (GTK_BOX (box5), spinner, FALSE, TRUE, 0);
-      sTreeSampleSelection.recursion_spinner = spinner;
-  
-      /* create horizontal separator */
-      separator = gtk_hseparator_new();
-      gtk_box_pack_start(GTK_BOX(box1), separator, FALSE, FALSE, 0);
-
-      /* create bottom button box */
-      box2 = gtk_hbox_new(TRUE, 10);
-      gtk_box_pack_start(GTK_BOX(box1), box2, FALSE, FALSE, 0);
-      gtk_container_set_border_width(GTK_CONTAINER(box2), 5);
-
-      button = gtk_button_new_with_label("Create Tree");
-      gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0);
-      g_signal_connect (button, "clicked",
-                       G_CALLBACK (cb_create_tree), NULL);
-
-      button = gtk_button_new_with_label("Close");
-      gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0);
-      g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_widget_destroy),
-                               window);
-    }
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-}
-
 /*
  * Gridded geometry
  */
@@ -3223,7 +2696,7 @@ create_rotated_label (GtkWidget *widget)
                        G_CALLBACK (on_angle_scale_changed), label);
       
       gtk_range_set_value (GTK_RANGE (hscale), 45);
-      gtk_widget_set_usize (hscale, 200, -1);
+      gtk_widget_set_size_request (hscale, 200, -1);
       gtk_box_pack_start (GTK_BOX (scale_hbox), hscale, TRUE, TRUE, 0);
     }
   
@@ -3880,36 +3353,6 @@ create_pixmap (GtkWidget *widget)
     gtk_widget_destroy (window);
 }
 
-static void
-tips_query_widget_entered (GtkTipsQuery   *tips_query,
-                          GtkWidget      *widget,
-                          const gchar    *tip_text,
-                          const gchar    *tip_private,
-                          GtkWidget      *toggle)
-{
-  if (GTK_TOGGLE_BUTTON (toggle)->active)
-    {
-      gtk_label_set_text (GTK_LABEL (tips_query), tip_text ? "There is a Tip!" : "There is no Tip!");
-      /* don't let GtkTipsQuery reset its label */
-      g_signal_stop_emission_by_name (tips_query, "widget_entered");
-    }
-}
-
-static gint
-tips_query_widget_selected (GtkWidget      *tips_query,
-                           GtkWidget      *widget,
-                           const gchar    *tip_text,
-                           const gchar    *tip_private,
-                           GdkEventButton *event,
-                           gpointer        func_data)
-{
-  if (widget)
-    g_print ("Help \"%s\" requested for <%s>\n",
-            tip_private ? tip_private : "None",
-            g_type_name (G_OBJECT_TYPE (widget)));
-  return TRUE;
-}
-
 static void
 create_tooltips (GtkWidget *widget)
 {
@@ -3920,9 +3363,7 @@ create_tooltips (GtkWidget *widget)
   GtkWidget *button;
   GtkWidget *toggle;
   GtkWidget *frame;
-  GtkWidget *tips_query;
   GtkWidget *separator;
-  GtkTooltips *tooltips;
 
   if (!window)
     {
@@ -3938,15 +3379,6 @@ create_tooltips (GtkWidget *widget)
       gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (widget));
 
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (destroy_tooltips),
-                        &window);
-
-      tooltips=gtk_tooltips_new();
-      g_object_ref (tooltips);
-      gtk_object_sink (GTK_OBJECT (tooltips));
-      g_object_set_data (G_OBJECT (window), "tooltips", tooltips);
-      
       box1 = gtk_vbox_new (FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
 
@@ -3957,26 +3389,20 @@ create_tooltips (GtkWidget *widget)
       button = gtk_toggle_button_new_with_label ("button1");
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
 
-      gtk_tooltips_set_tip (tooltips,
-                           button,
-                           "This is button 1",
-                           "ContextHelp/buttons/1");
+      gtk_widget_set_tooltip_text (button, "This is button 1");
 
       button = gtk_toggle_button_new_with_label ("button2");
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
 
-      gtk_tooltips_set_tip (tooltips,
-                           button,
-                           "This is button 2. This is also a really long tooltip which probably won't fit on a single line and will therefore need to be wrapped. Hopefully the wrapping will work correctly.",
-                           "ContextHelp/buttons/2_long");
+      gtk_widget_set_tooltip_text (button,
+        "This is button 2. This is also a really long tooltip which probably "
+        "won't fit on a single line and will therefore need to be wrapped. "
+        "Hopefully the wrapping will work correctly.");
 
       toggle = gtk_toggle_button_new_with_label ("Override TipsQuery Label");
       gtk_box_pack_start (GTK_BOX (box2), toggle, TRUE, TRUE, 0);
 
-      gtk_tooltips_set_tip (tooltips,
-                           toggle,
-                           "Toggle TipsQuery view.",
-                           "Hi msw! ;)");
+      gtk_widget_set_tooltip_text (toggle, "Toggle TipsQuery view.");
 
       box3 =
        g_object_new (gtk_vbox_get_type (),
@@ -3986,32 +3412,14 @@ create_tooltips (GtkWidget *widget)
                        "visible", TRUE,
                        NULL);
 
-      tips_query = gtk_tips_query_new ();
-
       button =
        g_object_new (gtk_button_get_type (),
                        "label", "[?]",
                        "visible", TRUE,
                        "parent", box3,
                        NULL);
-      g_object_connect (button,
-                       "swapped_signal::clicked", gtk_tips_query_start_query, tips_query,
-                       NULL);
       gtk_box_set_child_packing (GTK_BOX (box3), button, FALSE, FALSE, 0, GTK_PACK_START);
-      gtk_tooltips_set_tip (tooltips,
-                           button,
-                           "Start the Tooltips Inspector",
-                           "ContextHelp/buttons/?");
-      
-      
-      g_object_set (g_object_connect (tips_query,
-                                     "signal::widget_entered", tips_query_widget_entered, toggle,
-                                     "signal::widget_selected", tips_query_widget_selected, NULL,
-                                     NULL),
-                   "visible", TRUE,
-                   "parent", box3,
-                   "caller", button,
-                   NULL);
+      gtk_widget_set_tooltip_text (button, "Start the Tooltips Inspector");
       
       frame = g_object_new (gtk_frame_get_type (),
                              "label", "ToolTips Inspector",
@@ -4038,7 +3446,7 @@ create_tooltips (GtkWidget *widget)
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
 
-      gtk_tooltips_set_tip (tooltips, button, "Push this button to close window", "ContextHelp/buttons/Close");
+      gtk_widget_set_tooltip_text (button, "Push this button to close window");
     }
 
   if (!gtk_widget_get_visible (window))
@@ -4495,9 +3903,8 @@ create_menus (GtkWidget *widget)
                                  0,
                                  GTK_ACCEL_VISIBLE);
       
-      optionmenu = gtk_option_menu_new ();
-      gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
-      gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), 3);
+      optionmenu = gtk_combo_box_new_text ();
+      gtk_combo_box_set_active (GTK_COMBO_BOX (optionmenu), 3);
       gtk_box_pack_start (GTK_BOX (box2), optionmenu, TRUE, TRUE, 0);
       gtk_widget_show (optionmenu);
 
@@ -4526,14 +3933,6 @@ create_menus (GtkWidget *widget)
     gtk_widget_destroy (window);
 }
 
-static void
-gtk_ifactory_cb (gpointer             callback_data,
-                guint                callback_action,
-                GtkWidget           *widget)
-{
-  g_message ("ItemFactory: activated \"%s\"", gtk_item_factory_path_from_widget (widget));
-}
-
 /* GdkPixbuf RGBA C-Source image dump */
 
 static const guint8 apple[] = 
@@ -4632,220 +4031,55 @@ static const guint8 apple[] =
   "\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
 
 
-static void
-dump_accels (gpointer             callback_data,
-            guint                callback_action,
-            GtkWidget           *widget)
+static GtkWidget *
+accel_button_new (GtkAccelGroup *accel_group,
+                 const gchar   *text,
+                 const gchar   *accel)
 {
-  gtk_accel_map_save_fd (1 /* stdout */);
-}
-    
-static GtkItemFactoryEntry menu_items[] =
-{
-  { "/_File",                  NULL,         NULL,                  0, "<Branch>" },
-  { "/File/tearoff1",          NULL,         gtk_ifactory_cb,       0, "<Tearoff>" },
-  { "/File/_New",              NULL,         gtk_ifactory_cb,       0, "<StockItem>", GTK_STOCK_NEW },
-  { "/File/_Open",             NULL,         gtk_ifactory_cb,       0, "<StockItem>", GTK_STOCK_OPEN },
-  { "/File/_Save",             NULL,         gtk_ifactory_cb,       0, "<StockItem>", GTK_STOCK_SAVE },
-  { "/File/Save _As...",       "<control>A", gtk_ifactory_cb,       0, "<StockItem>", GTK_STOCK_SAVE },
-  { "/File/_Dump \"_Accels\"",  NULL,        dump_accels,           0 },
-  { "/File/\\/Test__Escaping/And\\/\n\tWei\\\\rdly",
-                                NULL,        gtk_ifactory_cb,       0 },
-  { "/File/sep1",        NULL,               gtk_ifactory_cb,       0, "<Separator>" },
-  { "/File/_Quit",       NULL,               gtk_ifactory_cb,       0, "<StockItem>", GTK_STOCK_QUIT },
-
-  { "/_Preferences",                   NULL, 0,               0, "<Branch>" },
-  { "/_Preferences/_Color",            NULL, 0,               0, "<Branch>" },
-  { "/_Preferences/Color/_Red",        NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
-  { "/_Preferences/Color/_Green",      NULL, gtk_ifactory_cb, 0, "/Preferences/Color/Red" },
-  { "/_Preferences/Color/_Blue",        NULL, gtk_ifactory_cb, 0, "/Preferences/Color/Red" },
-  { "/_Preferences/_Shape",            NULL, 0,               0, "<Branch>" },
-  { "/_Preferences/Shape/_Square",      NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
-  { "/_Preferences/Shape/_Rectangle",   NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Square" },
-  { "/_Preferences/Shape/_Oval",        NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Rectangle" },
-  { "/_Preferences/Shape/_Rectangle",   NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Square" },
-  { "/_Preferences/Shape/_Oval",        NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Rectangle" },
-  { "/_Preferences/Shape/_Image",       NULL, gtk_ifactory_cb, 0, "<ImageItem>", apple },
-  { "/_Preferences/Coffee",                  NULL, gtk_ifactory_cb, 0, "<CheckItem>" },
-  { "/_Preferences/Toast",                   NULL, gtk_ifactory_cb, 0, "<CheckItem>" },
-  { "/_Preferences/Marshmallow Froot Loops", NULL, gtk_ifactory_cb, 0, "<CheckItem>" },
-
-  /* For testing deletion of menus */
-  { "/_Preferences/Should_NotAppear",          NULL, 0,               0, "<Branch>" },
-  { "/Preferences/ShouldNotAppear/SubItem1",   NULL, gtk_ifactory_cb, 0 },
-  { "/Preferences/ShouldNotAppear/SubItem2",   NULL, gtk_ifactory_cb, 0 },
-
-  { "/_Help",            NULL,         0,                     0, "<LastBranch>" },
-  { "/Help/_Help",       NULL,         gtk_ifactory_cb,       0, "<StockItem>", GTK_STOCK_HELP},
-  { "/Help/_About",      NULL,         gtk_ifactory_cb,       0 },
-};
+  guint keyval;
+  GdkModifierType modifiers;
+  GtkWidget *button;
+  GtkWidget *label;
+
+  gtk_accelerator_parse (accel, &keyval, &modifiers);
+  g_assert (keyval);
+
+  button = gtk_button_new ();
+  gtk_widget_add_accelerator (button, "activate", accel_group,
+                             keyval, modifiers, GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED);
 
+  label = gtk_accel_label_new (text);
+  gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), button);
+  gtk_widget_show (label);
+  
+  gtk_container_add (GTK_CONTAINER (button), label);
 
-static int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
+  return button;
+}
 
 static void
-create_item_factory (GtkWidget *widget)
+create_key_lookup (GtkWidget *widget)
 {
   static GtkWidget *window = NULL;
-  
+  gpointer window_ptr;
+
   if (!window)
     {
-      GtkWidget *box1;
-      GtkWidget *box2;
-      GtkWidget *separator;
-      GtkWidget *label;
+      GtkAccelGroup *accel_group = gtk_accel_group_new ();
       GtkWidget *button;
-      GtkAccelGroup *accel_group;
-      GtkItemFactory *item_factory;
-      GtkTooltips *tooltips;
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       
+      window = gtk_dialog_new_with_buttons ("Key Lookup", NULL, 0,
+                                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                                           NULL);
+
       gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (widget));
+
+      /* We have to expand it so the accel labels will draw their labels
+       */
+      gtk_window_set_default_size (GTK_WINDOW (window), 300, -1);
       
-      g_signal_connect (window, "destroy",
-                       G_CALLBACK(gtk_widget_destroyed),
-                       &window);
-      g_signal_connect (window, "delete-event",
-                       G_CALLBACK (gtk_true),
-                       NULL);
-      
-      accel_group = gtk_accel_group_new ();
-      item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
-      g_object_set_data_full (G_OBJECT (window),
-                             "<main>",
-                             item_factory,
-                             g_object_unref);
-      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-      gtk_window_set_title (GTK_WINDOW (window), "Item Factory");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-      gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, NULL);
-
-      /* preselect /Preferences/Shape/Oval over the other radios
-       */
-      gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory,
-                                                                                     "/Preferences/Shape/Oval")),
-                                     TRUE);
-
-      /* preselect /Preferences/Coffee
-       */
-      gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory,
-                                                                                     "/Preferences/Coffee")),
-                                     TRUE);
-
-      /* preselect /Preferences/Marshmallow Froot Loops and set it insensitive
-       */
-      gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory,
-                                                                                     "/Preferences/Marshmallow Froot Loops")),
-                                     TRUE);
-      gtk_widget_set_sensitive (GTK_WIDGET (gtk_item_factory_get_item (item_factory,
-                                                                      "/Preferences/Marshmallow Froot Loops")),
-                               FALSE);
-       
-      /* Test how tooltips (ugh) work on menu items
-       */
-      tooltips = gtk_tooltips_new ();
-      g_object_ref (tooltips);
-      gtk_object_sink (GTK_OBJECT (tooltips));
-      g_object_set_data_full (G_OBJECT (window), "testgtk-tooltips",
-                             tooltips, (GDestroyNotify)g_object_unref);
-      
-      gtk_tooltips_set_tip (tooltips, gtk_item_factory_get_item (item_factory, "/File/New"),
-                           "Create a new file", NULL);
-      gtk_tooltips_set_tip (tooltips, gtk_item_factory_get_item (item_factory, "/File/Open"),
-                           "Open a file", NULL);
-      gtk_tooltips_set_tip (tooltips, gtk_item_factory_get_item (item_factory, "/File/Save"),
-                           "Safe file", NULL);
-      gtk_tooltips_set_tip (tooltips, gtk_item_factory_get_item (item_factory, "/Preferences/Color"),
-                           "Modify color", NULL);
-
-      box1 = gtk_vbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
-      
-      gtk_box_pack_start (GTK_BOX (box1),
-                         gtk_item_factory_get_widget (item_factory, "<main>"),
-                         FALSE, FALSE, 0);
-
-      label = gtk_label_new ("Type\n<alt>\nto start");
-      gtk_widget_set_size_request (label, 200, 200);
-      gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
-      gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);
-
-
-      separator = gtk_hseparator_new ();
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
-
-
-      box2 = gtk_vbox_new (FALSE, 10);
-      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
-
-      button = gtk_button_new_with_label ("close");
-      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_can_default (button, TRUE);
-      gtk_widget_grab_default (button);
-
-      gtk_item_factory_delete_item (item_factory, "/Preferences/ShouldNotAppear");
-      
-      gtk_widget_show_all (window);
-    }
-  else
-    gtk_widget_destroy (window);
-}
-
-static GtkWidget *
-accel_button_new (GtkAccelGroup *accel_group,
-                 const gchar   *text,
-                 const gchar   *accel)
-{
-  guint keyval;
-  GdkModifierType modifiers;
-  GtkWidget *button;
-  GtkWidget *label;
-
-  gtk_accelerator_parse (accel, &keyval, &modifiers);
-  g_assert (keyval);
-
-  button = gtk_button_new ();
-  gtk_widget_add_accelerator (button, "activate", accel_group,
-                             keyval, modifiers, GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED);
-
-  label = gtk_accel_label_new (text);
-  gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), button);
-  gtk_widget_show (label);
-  
-  gtk_container_add (GTK_CONTAINER (button), label);
-
-  return button;
-}
-
-static void
-create_key_lookup (GtkWidget *widget)
-{
-  static GtkWidget *window = NULL;
-  gpointer window_ptr;
-
-  if (!window)
-    {
-      GtkAccelGroup *accel_group = gtk_accel_group_new ();
-      GtkWidget *button;
-      
-      window = gtk_dialog_new_with_buttons ("Key Lookup", NULL, 0,
-                                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-                                           NULL);
-
-      gtk_window_set_screen (GTK_WINDOW (window),
-                            gtk_widget_get_screen (widget));
-
-      /* We have to expand it so the accel labels will draw their labels
-       */
-      gtk_window_set_default_size (GTK_WINDOW (window), 300, -1);
-      
-      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
       
       button = gtk_button_new_with_mnemonic ("Button 1 (_a)");
       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
@@ -4936,27 +4170,21 @@ cmw_file (GtkWidget *widget, GtkWidget *parent)
 {
     GtkWidget *fs;
 
-    fs = gtk_file_selection_new("This is a modal file selection dialog");
-
+    fs = gtk_file_chooser_dialog_new ("This is a modal file selection dialog",
+      GTK_WINDOW (parent), GTK_FILE_CHOOSER_ACTION_OPEN,
+      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+      NULL);
     gtk_window_set_screen (GTK_WINDOW (fs), gtk_widget_get_screen (parent));
-
-    /* Set as modal */
-    gtk_window_set_modal (GTK_WINDOW(fs),TRUE);
-
-    /* And mark it as a transient dialog */
-    gtk_window_set_transient_for (GTK_WINDOW (fs), GTK_WINDOW (parent));
+    gtk_window_set_modal (GTK_WINDOW (fs), TRUE);
 
     g_signal_connect (fs, "destroy",
                       G_CALLBACK (cmw_destroy_cb), NULL);
+    g_signal_connect_swapped (fs, "response",
+                      G_CALLBACK (gtk_widget_destroy), fs);
 
-    g_signal_connect_swapped (GTK_FILE_SELECTION (fs)->ok_button,
-                             "clicked", G_CALLBACK (gtk_widget_destroy), fs);
-    g_signal_connect_swapped (GTK_FILE_SELECTION (fs)->cancel_button,
-                             "clicked", G_CALLBACK (gtk_widget_destroy), fs);
-    
     /* wait until destroy calls gtk_main_quit */
     gtk_widget_show (fs);
-    
     gtk_main();
 }
 
@@ -5317,24 +4545,14 @@ create_entry (GtkWidget *widget)
   GtkWidget *has_frame_check;
   GtkWidget *sensitive_check;
   GtkWidget *progress_check;
-  GtkWidget *entry, *cb;
+  GtkWidget *entry;
+  GtkComboBox *cb;
+  GtkWidget *cb_entry;
   GtkWidget *button;
   GtkWidget *separator;
-  GList *cbitems = NULL;
 
   if (!window)
     {
-      cbitems = g_list_append(cbitems, "item0");
-      cbitems = g_list_append(cbitems, "item1 item1");
-      cbitems = g_list_append(cbitems, "item2 item2 item2");
-      cbitems = g_list_append(cbitems, "item3 item3 item3 item3");
-      cbitems = g_list_append(cbitems, "item4 item4 item4 item4 item4");
-      cbitems = g_list_append(cbitems, "item5 item5 item5 item5 item5 item5");
-      cbitems = g_list_append(cbitems, "item6 item6 item6 item6 item6");
-      cbitems = g_list_append(cbitems, "item7 item7 item7 item7");
-      cbitems = g_list_append(cbitems, "item8 item8 item8");
-      cbitems = g_list_append(cbitems, "item9 item9");
-
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (widget));
@@ -5369,12 +4587,23 @@ create_entry (GtkWidget *widget)
                        G_CALLBACK (props_clicked),
                        entry);
 
-      cb = gtk_combo_new ();
-      gtk_combo_set_popdown_strings (GTK_COMBO (cb), cbitems);
-      gtk_entry_set_text (GTK_ENTRY (GTK_COMBO(cb)->entry), "hello world \n\n\n foo");
-      gtk_editable_select_region (GTK_EDITABLE (GTK_COMBO(cb)->entry),
-                                 0, -1);
-      gtk_box_pack_start (GTK_BOX (box2), cb, TRUE, TRUE, 0);
+      cb = GTK_COMBO_BOX (gtk_combo_box_entry_new_text ());
+      gtk_combo_box_append_text (cb, "item0");
+      gtk_combo_box_append_text (cb, "item0");
+      gtk_combo_box_append_text (cb, "item1 item1");
+      gtk_combo_box_append_text (cb, "item2 item2 item2");
+      gtk_combo_box_append_text (cb, "item3 item3 item3 item3");
+      gtk_combo_box_append_text (cb, "item4 item4 item4 item4 item4");
+      gtk_combo_box_append_text (cb, "item5 item5 item5 item5 item5 item5");
+      gtk_combo_box_append_text (cb, "item6 item6 item6 item6 item6");
+      gtk_combo_box_append_text (cb, "item7 item7 item7 item7");
+      gtk_combo_box_append_text (cb, "item8 item8 item8");
+      gtk_combo_box_append_text (cb, "item9 item9");
+
+      cb_entry = gtk_bin_get_child (GTK_BIN (cb));
+      gtk_entry_set_text (GTK_ENTRY (cb_entry), "hello world \n\n\n foo");
+      gtk_editable_select_region (GTK_EDITABLE (cb_entry), 0, -1);
+      gtk_box_pack_start (GTK_BOX (box2), GTK_WIDGET (cb), TRUE, TRUE, 0);
 
       sensitive_check = gtk_check_button_new_with_label("Sensitive");
       gtk_box_pack_start (GTK_BOX (box2), sensitive_check, FALSE, TRUE, 0);
@@ -6405,24 +5634,25 @@ void
 color_selection_ok (GtkWidget               *w,
                     GtkColorSelectionDialog *cs)
 {
-  GtkColorSelection *colorsel;
-  gdouble color[4];
+  GtkWidget *colorsel;
+  GdkColor color;
 
-  colorsel=GTK_COLOR_SELECTION(cs->colorsel);
+  colorsel = gtk_color_selection_dialog_get_color_selection (cs);
 
-  gtk_color_selection_get_color(colorsel,color);
-  gtk_color_selection_set_color(colorsel,color);
+  gtk_color_selection_get_current_color (GTK_COLOR_SELECTION (colorsel), &color);
+  gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (colorsel), &color);
 }
 
 void
 color_selection_changed (GtkWidget *w,
                          GtkColorSelectionDialog *cs)
 {
-  GtkColorSelection *colorsel;
-  gdouble color[4];
+  GtkWidget *colorsel;
+  GdkColor color;
 
-  colorsel=GTK_COLOR_SELECTION(cs->colorsel);
-  gtk_color_selection_get_color(colorsel,color);
+  colorsel = gtk_color_selection_dialog_get_color_selection (cs);
+  gtk_color_selection_get_current_color (GTK_COLOR_SELECTION (colorsel), &color);
+  gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (colorsel), &color);
 }
 
 #if 0 /* unused */
@@ -6909,26 +6139,19 @@ create_dialog (GtkWidget *widget)
 /* Display & Screen test 
  */
 
-typedef struct 
-{ 
-  GtkEntry *entry;
+typedef struct
+{
+  GtkWidget *combo;
+  GtkWidget *entry;
   GtkWidget *radio_dpy;
-  GtkWidget *toplevel; 
+  GtkWidget *toplevel;
   GtkWidget *dialog_window;
-  GList *valid_display_list;
 } ScreenDisplaySelection;
 
-static gint
-display_name_cmp (gconstpointer a,
-                 gconstpointer b)
-{
-  return g_ascii_strcasecmp (a,b);
-}
-
 static void
 screen_display_check (GtkWidget *widget, ScreenDisplaySelection *data)
 {
-  char *display_name;
+  const gchar *display_name;
   GdkDisplay *display = gtk_widget_get_display (widget);
   GtkWidget *dialog;
   GdkScreen *new_screen = NULL;
@@ -6936,7 +6159,7 @@ screen_display_check (GtkWidget *widget, ScreenDisplaySelection *data)
   
   if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->radio_dpy)))
     {
-      display_name = g_strdup (gtk_entry_get_text (data->entry));
+      display_name = gtk_entry_get_text (GTK_ENTRY (data->entry));
       display = gdk_display_open (display_name);
       
       if (!display)
@@ -6954,15 +6177,25 @@ screen_display_check (GtkWidget *widget, ScreenDisplaySelection *data)
                            NULL);
        }
       else
-       {
-         if (!g_list_find_custom (data->valid_display_list, 
-                                  display_name,
-                                  display_name_cmp))
-           data->valid_display_list = g_list_append (data->valid_display_list,
-                                                     display_name);
-         
-         new_screen = gdk_display_get_default_screen (display);
-       }
+        {
+          GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (data->combo));
+          gint i = 0;
+          GtkTreeIter iter;
+          gboolean found = FALSE;
+          while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i++))
+            {
+              gchar *name;
+              gtk_tree_model_get (model, &iter, 0, &name, -1);
+              found = !g_ascii_strcasecmp (display_name, name);
+              g_free (name);
+
+              if (found)
+                break;
+            }
+          if (!found)
+            gtk_combo_box_append_text (GTK_COMBO_BOX (data->combo), display_name);
+          new_screen = gdk_display_get_default_screen (display);
+        }
     }
   else
     {
@@ -6995,8 +6228,6 @@ create_display_screen (GtkWidget *widget)
   GtkWidget *bbox;
   ScreenDisplaySelection *scr_dpy_data;
   GdkScreen *screen = gtk_widget_get_screen (widget);
-  static GList *valid_display_list = NULL;
-  
   GdkDisplay *display = gdk_screen_get_display (screen);
 
   window = g_object_new (gtk_window_get_type (),
@@ -7032,14 +6263,10 @@ create_display_screen (GtkWidget *widget)
         "only one screen on the current display");
       gtk_widget_set_sensitive (radio_scr, FALSE);
     }
-  combo_dpy = gtk_combo_new ();
-  if (!valid_display_list)
-    valid_display_list = g_list_append (valid_display_list, "diabolo:0.0");
-    
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo_dpy), valid_display_list);
-    
-  gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo_dpy)->entry), 
-                     "<hostname>:<X Server Num>.<Screen Num>");
+  combo_dpy = gtk_combo_box_new_text ();
+  gtk_combo_box_append_text (GTK_COMBO_BOX (combo_dpy), "diabolo:0.0");
+  gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo_dpy))),
+                      "<hostname>:<X Server Num>.<Screen Num>");
 
   gtk_table_attach_defaults (GTK_TABLE (table), radio_dpy, 0, 1, 0, 1);
   gtk_table_attach_defaults (GTK_TABLE (table), radio_scr, 0, 1, 1, 2);
@@ -7056,11 +6283,10 @@ create_display_screen (GtkWidget *widget)
 
   scr_dpy_data = g_new0 (ScreenDisplaySelection, 1);
 
-  scr_dpy_data->entry = GTK_ENTRY (GTK_COMBO (combo_dpy)->entry);
+  scr_dpy_data->entry = gtk_bin_get_child (GTK_BIN (combo_dpy));
   scr_dpy_data->radio_dpy = radio_dpy;
   scr_dpy_data->toplevel = gtk_widget_get_toplevel (widget);
   scr_dpy_data->dialog_window = window;
-  scr_dpy_data->valid_display_list = valid_display_list;
 
   g_signal_connect (cancelb, "clicked", 
                    G_CALLBACK (screen_display_destroy_diag), window);
@@ -7368,22 +6594,6 @@ create_rulers (GtkWidget *widget)
     gtk_widget_destroy (window);
 }
 
-static void
-text_toggle_editable (GtkWidget *checkbutton,
-                      GtkWidget *text)
-{
-   gtk_text_set_editable(GTK_TEXT(text),
-                         GTK_TOGGLE_BUTTON(checkbutton)->active);
-}
-
-static void
-text_toggle_word_wrap (GtkWidget *checkbutton,
-                      GtkWidget *text)
-{
-   gtk_text_set_word_wrap(GTK_TEXT(text),
-                         GTK_TOGGLE_BUTTON(checkbutton)->active);
-}
-
 struct {
   GdkColor color;
   gchar *name;
@@ -7400,187 +6610,58 @@ struct {
 
 int ntext_colors = sizeof(text_colors) / sizeof(text_colors[0]);
 
-/*
- * GtkText
- */
-void
-text_insert_random (GtkWidget *w, GtkText *text)
-{
-  int i;
-  char c;
-   for (i=0; i<10; i++)
-    {
-      c = 'A' + rand() % ('Z' - 'A');
-      gtk_text_set_point (text, rand() % gtk_text_get_length (text));
-      gtk_text_insert (text, NULL, NULL, NULL, &c, 1);
-    }
-}
-
-void
-create_text (GtkWidget *widget)
-{
-  int i, j;
-
-  static GtkWidget *window = NULL;
-  GtkWidget *box1;
-  GtkWidget *box2;
-  GtkWidget *hbox;
-  GtkWidget *button;
-  GtkWidget *check;
-  GtkWidget *separator;
-  GtkWidget *scrolled_window;
-  GtkWidget *text;
-
-  FILE *infile;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                            gtk_widget_get_screen (widget));
-
-      gtk_widget_set_name (window, "text window");
-      g_object_set (window, "allow_shrink", TRUE, "allow_grow", TRUE, NULL);
-      gtk_widget_set_size_request (window, 500, 500);
-
-      g_signal_connect (window, "destroy",
-                       G_CALLBACK (gtk_widget_destroyed),
-                       &window);
-
-      gtk_window_set_title (GTK_WINDOW (window), "test");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
-
-      box1 = gtk_vbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
-      gtk_widget_show (box1);
-
-
-      box2 = gtk_vbox_new (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);
-
-
-      scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-      gtk_box_pack_start (GTK_BOX (box2), scrolled_window, TRUE, TRUE, 0);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-                                     GTK_POLICY_NEVER,
-                                     GTK_POLICY_ALWAYS);
-      gtk_widget_show (scrolled_window);
-
-      text = gtk_text_new (NULL, NULL);
-      gtk_text_set_editable (GTK_TEXT (text), TRUE);
-      gtk_container_add (GTK_CONTAINER (scrolled_window), text);
-      gtk_widget_grab_focus (text);
-      gtk_widget_show (text);
-
-
-      gtk_text_freeze (GTK_TEXT (text));
-
-      for (i=0; i<ntext_colors; i++)
-       {
-         gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, 
-                          text_colors[i].name, -1);
-         gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, "\t", -1);
-
-         for (j=0; j<ntext_colors; j++)
-           {
-             gtk_text_insert (GTK_TEXT (text), NULL,
-                              &text_colors[j].color, &text_colors[i].color,
-                              "XYZ", -1);
-           }
-         gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, "\n", -1);
-       }
-
-      infile = fopen("testgtk.c", "r");
-      
-      if (infile)
-       {
-         char *buffer;
-         int nbytes_read, nbytes_alloc;
-         
-         nbytes_read = 0;
-         nbytes_alloc = 1024;
-         buffer = g_new (char, nbytes_alloc);
-         while (1)
-           {
-             int len;
-             if (nbytes_alloc < nbytes_read + 1024)
-               {
-                 nbytes_alloc *= 2;
-                 buffer = g_realloc (buffer, nbytes_alloc);
-               }
-             len = fread (buffer + nbytes_read, 1, 1024, infile);
-             nbytes_read += len;
-             if (len < 1024)
-               break;
-           }
-         
-         gtk_text_insert (GTK_TEXT (text), NULL, NULL,
-                          NULL, buffer, nbytes_read);
-         g_free(buffer);
-         fclose (infile);
-       }
-      
-      gtk_text_thaw (GTK_TEXT (text));
-
-      hbox = gtk_hbutton_box_new ();
-      gtk_box_pack_start (GTK_BOX (box2), hbox, FALSE, FALSE, 0);
-      gtk_widget_show (hbox);
-
-      check = gtk_check_button_new_with_label("Editable");
-      gtk_box_pack_start (GTK_BOX (hbox), check, FALSE, FALSE, 0);
-      g_signal_connect (check, "toggled",
-                       G_CALLBACK (text_toggle_editable), text);
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), TRUE);
-      gtk_widget_show (check);
-
-      check = gtk_check_button_new_with_label("Wrap Words");
-      gtk_box_pack_start (GTK_BOX (hbox), check, FALSE, TRUE, 0);
-      g_signal_connect (check, "toggled",
-                       G_CALLBACK (text_toggle_word_wrap), text);
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), FALSE);
-      gtk_widget_show (check);
-
-      separator = gtk_hseparator_new ();
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
-      gtk_widget_show (separator);
-
-
-      box2 = gtk_vbox_new (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);
-
-
-      button = gtk_button_new_with_label ("insert random");
-      g_signal_connect (button, "clicked",
-                       G_CALLBACK (text_insert_random),
-                       text);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      gtk_widget_show (button);
-
-      button = gtk_button_new_with_label ("close");
-      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_can_default (button, TRUE);
-      gtk_widget_grab_default (button);
-      gtk_widget_show (button);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-}
-
 /*
  * GtkNotebook
  */
 
+static char * book_open_xpm[] = {
+"16 16 4 1",
+"       c None s None",
+".      c black",
+"X      c #808080",
+"o      c white",
+"                ",
+"  ..            ",
+" .Xo.    ...    ",
+" .Xoo. ..oo.    ",
+" .Xooo.Xooo...  ",
+" .Xooo.oooo.X.  ",
+" .Xooo.Xooo.X.  ",
+" .Xooo.oooo.X.  ",
+" .Xooo.Xooo.X.  ",
+" .Xooo.oooo.X.  ",
+"  .Xoo.Xoo..X.  ",
+"   .Xo.o..ooX.  ",
+"    .X..XXXXX.  ",
+"    ..X.......  ",
+"     ..         ",
+"                "};
+
+static char * book_closed_xpm[] = {
+"16 16 6 1",
+"       c None s None",
+".      c black",
+"X      c red",
+"o      c yellow",
+"O      c #808080",
+"#      c white",
+"                ",
+"       ..       ",
+"     ..XX.      ",
+"   ..XXXXX.     ",
+" ..XXXXXXXX.    ",
+".ooXXXXXXXXX.   ",
+"..ooXXXXXXXXX.  ",
+".X.ooXXXXXXXXX. ",
+".XX.ooXXXXXX..  ",
+" .XX.ooXXX..#O  ",
+"  .XX.oo..##OO. ",
+"   .XX..##OO..  ",
+"    .X.#OO..    ",
+"     ..O..      ",
+"      ..        ",
+"                "};
+
 GdkPixbuf *book_open;
 GdkPixbuf *book_closed;
 GtkWidget *sample_notebook;
@@ -7618,38 +6699,17 @@ page_switch (GtkWidget *widget, GtkNotebookPage *page, gint page_num)
 static void
 tab_fill (GtkToggleButton *button, GtkWidget *child)
 {
-  gboolean expand;
-  GtkPackType pack_type;
-
-  gtk_notebook_query_tab_label_packing (GTK_NOTEBOOK (sample_notebook), child,
-                                       &expand, NULL, &pack_type);
-  gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK (sample_notebook), child,
-                                     expand, button->active, pack_type);
+  gtk_container_child_set (GTK_CONTAINER (sample_notebook), child,
+                           "tab-fill", gtk_toggle_button_get_active (button),
+                           NULL);
 }
 
 static void
 tab_expand (GtkToggleButton *button, GtkWidget *child)
 {
-  gboolean fill;
-  GtkPackType pack_type;
-
-  gtk_notebook_query_tab_label_packing (GTK_NOTEBOOK (sample_notebook), child,
-                                       NULL, &fill, &pack_type);
-  gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK (sample_notebook), child,
-                                     button->active, fill, pack_type);
-}
-
-static void
-tab_pack (GtkToggleButton *button, GtkWidget *child)
-         
-{ 
-  gboolean expand;
-  gboolean fill;
-
-  gtk_notebook_query_tab_label_packing (GTK_NOTEBOOK (sample_notebook), child,
-                                       &expand, &fill, NULL);
-  gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK (sample_notebook), child,
-                                     expand, fill, button->active);
+  gtk_container_child_set (GTK_CONTAINER (sample_notebook), child,
+                           "tab-expand", gtk_toggle_button_get_active (button),
+                           NULL);
 }
 
 static void
@@ -7693,11 +6753,6 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
       g_signal_connect (button, "toggled",
                        G_CALLBACK (tab_expand), child);
 
-      button = gtk_check_button_new_with_label ("Pack end");
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 5);
-      g_signal_connect (button, "toggled",
-                       G_CALLBACK (tab_pack), child);
-
       button = gtk_button_new_with_label ("Hide Page");
       gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 5);
       g_signal_connect_swapped (button, "clicked",
@@ -7762,7 +6817,7 @@ notebook_type_changed (GtkWidget *optionmenu,
 
   notebook = GTK_NOTEBOOK (data);
 
-  c = gtk_option_menu_get_history (GTK_OPTION_MENU (optionmenu));
+  c = gtk_combo_box_get_active (GTK_COMBO_BOX (optionmenu));
 
   switch (c)
     {
@@ -7812,13 +6867,6 @@ notebook_popup (GtkToggleButton *button,
     gtk_notebook_popup_disable (notebook);
 }
 
-static void
-notebook_homogeneous (GtkToggleButton *button,
-                     GtkNotebook     *notebook)
-{
-  g_object_set (notebook, "homogeneous", button->active, NULL);
-}
-
 static void
 create_notebook (GtkWidget *widget)
 {
@@ -7884,12 +6932,6 @@ create_notebook (GtkWidget *widget)
                        G_CALLBACK (notebook_popup),
                        sample_notebook);
 
-      button = gtk_check_button_new_with_label ("homogeneous tabs");
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, FALSE, 0);
-      g_signal_connect (button, "clicked",
-                       G_CALLBACK (notebook_homogeneous),
-                       sample_notebook);
-
       box2 = gtk_hbox_new (FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
@@ -8565,7 +7607,7 @@ shape_motion (GtkWidget      *widget,
    * because I need absolute coordinates.
    */
   gdk_window_get_pointer (NULL, &xp, &yp, &mask);
-  gtk_widget_set_uposition (widget, xp  - p->x, yp  - p->y);
+  gtk_window_move (GTK_WINDOW (widget), xp  - p->x, yp  - p->y);
 }
 
 GtkWidget *
@@ -8630,7 +7672,7 @@ shape_create_icon (GdkScreen *screen,
   icon_pos = g_new (CursorOffset, 1);
   g_object_set_data (G_OBJECT (window), "cursor_offset", icon_pos);
 
-  gtk_widget_set_uposition (window, x, y);
+  gtk_window_move (GTK_WINDOW (window), x, y);
   gtk_widget_show (window);
   
   return window;
@@ -9282,7 +8324,7 @@ gravity_selected (GtkWidget *widget,
                   gpointer   data)
 {
   gtk_window_set_gravity (GTK_WINDOW (g_object_get_data (data, "target")),
-                          gtk_option_menu_get_history (GTK_OPTION_MENU (widget)) + GDK_GRAVITY_NORTH_WEST);
+                          gtk_combo_box_get_active (GTK_COMBO_BOX (widget)) + GDK_GRAVITY_NORTH_WEST);
 }
 
 static void
@@ -9290,7 +8332,7 @@ pos_selected (GtkWidget *widget,
               gpointer   data)
 {
   gtk_window_set_position (GTK_WINDOW (g_object_get_data (data, "target")),
-                           gtk_option_menu_get_history (GTK_OPTION_MENU (widget)) + GTK_WIN_POS_NONE);
+                           gtk_combo_box_get_active (GTK_COMBO_BOX (widget)) + GTK_WIN_POS_NONE);
 }
 
 static void
@@ -9521,7 +8563,6 @@ window_controls (GtkWidget *window)
   GtkAdjustment *adj;
   GtkWidget *entry;
   GtkWidget *om;
-  GtkWidget *menu;
   gint i;
   
   control_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -9680,12 +8721,10 @@ window_controls (GtkWidget *window)
                           G_CONNECT_SWAPPED);
   gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   
-  menu = gtk_menu_new ();
-  
+  om = gtk_combo_box_new_text ();
   i = 0;
   while (i < 10)
     {
-      GtkWidget *mi;
       static gchar *names[] = {
         "GDK_GRAVITY_NORTH_WEST",
         "GDK_GRAVITY_NORTH",
@@ -9701,20 +8740,11 @@ window_controls (GtkWidget *window)
       };
 
       g_assert (names[i]);
-      
-      mi = gtk_menu_item_new_with_label (names[i]);
-
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+      gtk_combo_box_append_text (GTK_COMBO_BOX (om), names[i]);
 
       ++i;
     }
   
-  gtk_widget_show_all (menu);
-  
-  om = gtk_option_menu_new ();
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (om), menu);
-  
-
   g_signal_connect (om,
                    "changed",
                    G_CALLBACK (gravity_selected),
@@ -9723,12 +8753,10 @@ window_controls (GtkWidget *window)
   gtk_box_pack_end (GTK_BOX (vbox), om, FALSE, FALSE, 0);
 
 
-  menu = gtk_menu_new ();
-  
+  om = gtk_combo_box_new_text ();
   i = 0;
   while (i < 5)
     {
-      GtkWidget *mi;
       static gchar *names[] = {
         "GTK_WIN_POS_NONE",
         "GTK_WIN_POS_CENTER",
@@ -9739,19 +8767,10 @@ window_controls (GtkWidget *window)
       };
 
       g_assert (names[i]);
-      
-      mi = gtk_menu_item_new_with_label (names[i]);
-
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+      gtk_combo_box_append_text (GTK_COMBO_BOX (om), names[i]);
 
       ++i;
     }
-  
-  gtk_widget_show_all (menu);
-  
-  om = gtk_option_menu_new ();
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (om), menu);
-  
 
   g_signal_connect (om,
                    "changed",
@@ -9824,21 +8843,34 @@ typedef struct _ProgressData {
   GtkWidget *omenu2;
   GtkWidget *entry;
   int timer;
+  gboolean activity;
 } ProgressData;
 
-gint
+gboolean
 progress_timeout (gpointer data)
 {
+  ProgressData *pdata = data;
   gdouble new_val;
-  GtkAdjustment *adj;
+  gchar *text;
 
-  adj = GTK_PROGRESS (data)->adjustment;
+  if (pdata->activity)
+    {
+      gtk_progress_bar_pulse (GTK_PROGRESS_BAR (pdata->pbar));
 
-  new_val = adj->value + 1;
-  if (new_val > adj->upper)
-    new_val = adj->lower;
+      text = g_strdup_printf ("%s", "???");
+    }
+  else
+    {
+      new_val = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (pdata->pbar)) + 0.01;
+      if (new_val > 1.00)
+        new_val = 0.00;
+      gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (pdata->pbar), new_val);
 
-  gtk_progress_set_value (GTK_PROGRESS (data), new_val);
+      text = g_strdup_printf ("%.0f%%", 100 * new_val);
+    }
+
+  gtk_label_set_text (GTK_LABEL (pdata->label), text);
+  g_free (text);
 
   return TRUE;
 }
@@ -9865,7 +8897,7 @@ progressbar_toggle_orientation (GtkWidget *widget, gpointer data)
   if (!gtk_widget_get_mapped (widget))
     return;
 
-  i = gtk_option_menu_get_history (GTK_OPTION_MENU (widget));
+  i = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
 
   gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (pdata->pbar),
                                    (GtkProgressBarOrientation) i);
@@ -9874,13 +8906,13 @@ progressbar_toggle_orientation (GtkWidget *widget, gpointer data)
 static void
 toggle_show_text (GtkWidget *widget, ProgressData *pdata)
 {
-  gtk_progress_set_show_text (GTK_PROGRESS (pdata->pbar),
-                             GTK_TOGGLE_BUTTON (widget)->active);
-  gtk_widget_set_sensitive (pdata->entry, GTK_TOGGLE_BUTTON (widget)->active);
-  gtk_widget_set_sensitive (pdata->x_align_spin,
-                           GTK_TOGGLE_BUTTON (widget)->active);
-  gtk_widget_set_sensitive (pdata->y_align_spin,
-                           GTK_TOGGLE_BUTTON (widget)->active);
+  gboolean active;
+
+  active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+  gtk_progress_bar_set_text (GTK_PROGRESS_BAR (pdata->pbar),
+                             active ? gtk_entry_get_text (GTK_ENTRY (pdata->entry)) : NULL);
+
+  gtk_widget_set_sensitive (pdata->entry, active);
 }
 
 static void
@@ -9890,92 +8922,21 @@ progressbar_toggle_ellipsize (GtkWidget *widget,
   ProgressData *pdata = data;
   if (gtk_widget_is_drawable (widget))
     {
-      gint i = gtk_option_menu_get_history (GTK_OPTION_MENU (widget));
+      gint i = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
       gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (pdata->pbar), i);
     }
 }
 
-static void
-progressbar_toggle_bar_style (GtkWidget *widget, gpointer data)
-{
-  ProgressData *pdata;
-  gint i;
-
-  pdata = (ProgressData *) data;
-
-  if (!gtk_widget_get_mapped (widget))
-    return;
-
-  i = gtk_option_menu_get_history (GTK_OPTION_MENU (widget));
-
-  if (i == 1)
-    gtk_widget_set_sensitive (pdata->block_spin, TRUE);
-  else
-    gtk_widget_set_sensitive (pdata->block_spin, FALSE);
-  
-  gtk_progress_bar_set_bar_style (GTK_PROGRESS_BAR (pdata->pbar),
-                                 (GtkProgressBarStyle) i);
-}
-
-static void
-progress_value_changed (GtkAdjustment *adj, ProgressData *pdata)
-{
-  char buf[20];
-
-  if (GTK_PROGRESS (pdata->pbar)->activity_mode)
-    sprintf (buf, "???");
-  else
-    sprintf (buf, "%.0f%%", 100 *
-            gtk_progress_get_current_percentage (GTK_PROGRESS (pdata->pbar)));
-  gtk_label_set_text (GTK_LABEL (pdata->label), buf);
-}
-
-static void
-adjust_blocks (GtkAdjustment *adj, ProgressData *pdata)
-{
-  gtk_progress_set_percentage (GTK_PROGRESS (pdata->pbar), 0);
-  gtk_progress_bar_set_discrete_blocks (GTK_PROGRESS_BAR (pdata->pbar),
-     gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (pdata->block_spin)));
-}
-
-static void
-adjust_step (GtkAdjustment *adj, ProgressData *pdata)
-{
-  gtk_progress_bar_set_activity_step (GTK_PROGRESS_BAR (pdata->pbar),
-     gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (pdata->step_spin)));
-}
-
-static void
-adjust_act_blocks (GtkAdjustment *adj, ProgressData *pdata)
-{
-  gtk_progress_bar_set_activity_blocks (GTK_PROGRESS_BAR (pdata->pbar),
-               gtk_spin_button_get_value_as_int 
-                     (GTK_SPIN_BUTTON (pdata->act_blocks_spin)));
-}
-
-static void
-adjust_align (GtkAdjustment *adj, ProgressData *pdata)
-{
-  gtk_progress_set_text_alignment (GTK_PROGRESS (pdata->pbar),
-        gtk_spin_button_get_value (GTK_SPIN_BUTTON (pdata->x_align_spin)),
-        gtk_spin_button_get_value (GTK_SPIN_BUTTON (pdata->y_align_spin)));
-}
-
 static void
 toggle_activity_mode (GtkWidget *widget, ProgressData *pdata)
 {
-  gtk_progress_set_activity_mode (GTK_PROGRESS (pdata->pbar),
-                                 GTK_TOGGLE_BUTTON (widget)->active);
-  gtk_widget_set_sensitive (pdata->step_spin, 
-                           GTK_TOGGLE_BUTTON (widget)->active);
-  gtk_widget_set_sensitive (pdata->act_blocks_spin, 
-                           GTK_TOGGLE_BUTTON (widget)->active);
+  pdata->activity = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
 }
 
 static void
 entry_changed (GtkWidget *widget, ProgressData *pdata)
 {
-  gtk_progress_set_format_string (GTK_PROGRESS (pdata->pbar),
+  gtk_progress_bar_set_text (GTK_PROGRESS_BAR (pdata->pbar),
                          gtk_entry_get_text (GTK_ENTRY (pdata->entry)));
 }
 
@@ -9991,7 +8952,6 @@ create_progress_bar (GtkWidget *widget)
   GtkWidget *tab;
   GtkWidget *label;
   GtkWidget *align;
-  GtkAdjustment *adj;
   static ProgressData *pdata = NULL;
 
   static gchar *items1[] =
@@ -10002,13 +8962,7 @@ create_progress_bar (GtkWidget *widget)
     "Top-Bottom"
   };
 
-  static gchar *items2[] =
-  {
-    "Continuous",
-    "Discrete"
-  };
-
-  static char *ellipsize_items[] = {
+    static char *ellipsize_items[] = {
     "None",     // PANGO_ELLIPSIZE_NONE,
     "Start",    // PANGO_ELLIPSIZE_START,
     "Middle",   // PANGO_ELLIPSIZE_MIDDLE,
@@ -10050,18 +9004,12 @@ 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);
 
-      adj = (GtkAdjustment *) gtk_adjustment_new (0, 1, 300, 0, 0, 0);
-      g_signal_connect (adj, "value_changed",
-                       G_CALLBACK (progress_value_changed), pdata);
-
-      pdata->pbar = g_object_new (GTK_TYPE_PROGRESS_BAR,
-                                   "adjustment", adj,
-                                   "ellipsize", PANGO_ELLIPSIZE_MIDDLE,
-                                   NULL);
-      gtk_progress_set_format_string (GTK_PROGRESS (pdata->pbar),
-                                     "%v from [%l,%u] (=%p%%)");
+      pdata->pbar = gtk_progress_bar_new ();
+      gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (pdata->pbar),
+                                      PANGO_ELLIPSIZE_MIDDLE);
+
       gtk_container_add (GTK_CONTAINER (align), pdata->pbar);
-      pdata->timer = g_timeout_add (100, (GSourceFunc)progress_timeout, pdata->pbar);
+      pdata->timer = g_timeout_add (100, (GSourceFunc)progress_timeout, pdata);
 
       align = gtk_alignment_new (0.5, 0.5, 0, 0);
       gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE, 5);
@@ -10110,49 +9058,18 @@ create_progress_bar (GtkWidget *widget)
                        GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
                        5, 5);
 
-      label = gtk_label_new ("Format : ");
+      label = gtk_label_new ("Text: ");
       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
 
       pdata->entry = gtk_entry_new ();
+      gtk_entry_set_text (GTK_ENTRY (pdata->entry), "Installing ...");
       g_signal_connect (pdata->entry, "changed",
                        G_CALLBACK (entry_changed),
                        pdata);
       gtk_box_pack_start (GTK_BOX (hbox), pdata->entry, TRUE, TRUE, 0);
-      gtk_entry_set_text (GTK_ENTRY (pdata->entry), "%v from [%l,%u] (=%p%%)");
       gtk_widget_set_size_request (pdata->entry, 100, -1);
       gtk_widget_set_sensitive (pdata->entry, FALSE);
 
-      label = gtk_label_new ("Text align :");
-      gtk_table_attach (GTK_TABLE (tab), label, 0, 1, 2, 3,
-                       GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
-                       5, 5);
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-
-      hbox = gtk_hbox_new (FALSE, 0);
-      gtk_table_attach (GTK_TABLE (tab), hbox, 1, 2, 2, 3,
-                       GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
-                       5, 5);
-
-      label = gtk_label_new ("x :");
-      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 5);
-      
-      adj = (GtkAdjustment *) gtk_adjustment_new (0.5, 0, 1, 0.1, 0.1, 0);
-      pdata->x_align_spin = gtk_spin_button_new (adj, 0, 1);
-      g_signal_connect (adj, "value_changed",
-                       G_CALLBACK (adjust_align), pdata);
-      gtk_box_pack_start (GTK_BOX (hbox), pdata->x_align_spin, FALSE, TRUE, 0);
-      gtk_widget_set_sensitive (pdata->x_align_spin, FALSE);
-
-      label = gtk_label_new ("y :");
-      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 5);
-
-      adj = (GtkAdjustment *) gtk_adjustment_new (0.5, 0, 1, 0.1, 0.1, 0);
-      pdata->y_align_spin = gtk_spin_button_new (adj, 0, 1);
-      g_signal_connect (adj, "value_changed",
-                       G_CALLBACK (adjust_align), pdata);
-      gtk_box_pack_start (GTK_BOX (hbox), pdata->y_align_spin, FALSE, TRUE, 0);
-      gtk_widget_set_sensitive (pdata->y_align_spin, FALSE);
-
       label = gtk_label_new ("Ellipsize text :");
       gtk_table_attach (GTK_TABLE (tab), label, 0, 1, 10, 11,
                        GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
@@ -10169,38 +9086,6 @@ create_progress_bar (GtkWidget *widget)
                        5, 5);
       gtk_box_pack_start (GTK_BOX (hbox), pdata->elmenu, TRUE, TRUE, 0);
 
-      label = gtk_label_new ("Bar Style :");
-      gtk_table_attach (GTK_TABLE (tab), label, 0, 1, 13, 14,
-                       GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
-                       5, 5);
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-
-      pdata->omenu2 = build_option_menu        (items2, 2, 0,
-                                        progressbar_toggle_bar_style,
-                                        pdata);
-      hbox = gtk_hbox_new (FALSE, 0);
-      gtk_table_attach (GTK_TABLE (tab), hbox, 1, 2, 13, 14,
-                       GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
-                       5, 5);
-      gtk_box_pack_start (GTK_BOX (hbox), pdata->omenu2, TRUE, TRUE, 0);
-
-      label = gtk_label_new ("Block count :");
-      gtk_table_attach (GTK_TABLE (tab), label, 0, 1, 14, 15,
-                       GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
-                       5, 5);
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-
-      hbox = gtk_hbox_new (FALSE, 0);
-      gtk_table_attach (GTK_TABLE (tab), hbox, 1, 2, 14, 15,
-                       GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
-                       5, 5);
-      adj = (GtkAdjustment *) gtk_adjustment_new (10, 2, 20, 1, 5, 0);
-      pdata->block_spin = gtk_spin_button_new (adj, 0, 0);
-      g_signal_connect (adj, "value_changed",
-                       G_CALLBACK (adjust_blocks), pdata);
-      gtk_box_pack_start (GTK_BOX (hbox), pdata->block_spin, FALSE, TRUE, 0);
-      gtk_widget_set_sensitive (pdata->block_spin, FALSE);
-
       check = gtk_check_button_new_with_label ("Activity mode");
       g_signal_connect (check, "clicked",
                        G_CALLBACK (toggle_activity_mode), pdata);
@@ -10208,33 +9093,6 @@ create_progress_bar (GtkWidget *widget)
                        GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
                        5, 5);
 
-      hbox = gtk_hbox_new (FALSE, 0);
-      gtk_table_attach (GTK_TABLE (tab), hbox, 1, 2, 15, 16,
-                       GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
-                       5, 5);
-      label = gtk_label_new ("Step size : ");
-      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-      adj = (GtkAdjustment *) gtk_adjustment_new (3, 1, 20, 1, 5, 0);
-      pdata->step_spin = gtk_spin_button_new (adj, 0, 0);
-      g_signal_connect (adj, "value_changed",
-                       G_CALLBACK (adjust_step), pdata);
-      gtk_box_pack_start (GTK_BOX (hbox), pdata->step_spin, FALSE, TRUE, 0);
-      gtk_widget_set_sensitive (pdata->step_spin, FALSE);
-
-      hbox = gtk_hbox_new (FALSE, 0);
-      gtk_table_attach (GTK_TABLE (tab), hbox, 1, 2, 16, 17,
-                       GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
-                       5, 5);
-      label = gtk_label_new ("Blocks :     ");
-      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-      adj = (GtkAdjustment *) gtk_adjustment_new (5, 2, 10, 1, 5, 0);
-      pdata->act_blocks_spin = gtk_spin_button_new (adj, 0, 0);
-      g_signal_connect (adj, "value_changed",
-                       G_CALLBACK (adjust_act_blocks), pdata);
-      gtk_box_pack_start (GTK_BOX (hbox), pdata->act_blocks_spin, FALSE, TRUE,
-                         0);
-      gtk_widget_set_sensitive (pdata->act_blocks_spin, FALSE);
-
       button = gtk_button_new_with_label ("close");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_destroy),
@@ -10699,11 +9557,12 @@ create_snapshot (GtkWidget *widget)
  */
 
 void
-selection_test_received (GtkWidget *list, GtkSelectionData *data)
+selection_test_received (GtkWidget        *tree_view,
+                         GtkSelectionData *data)
 {
+  GtkTreeModel *model;
+  GtkListStore *store;
   GdkAtom *atoms;
-  GtkWidget *list_item;
-  GList *item_list;
   int i, l;
 
   if (data->length < 0)
@@ -10719,44 +9578,42 @@ selection_test_received (GtkWidget *list, GtkSelectionData *data)
 
   /* Clear out any current list items */
 
-  gtk_list_clear_items (GTK_LIST(list), 0, -1);
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view));
+  store = GTK_LIST_STORE (model);
+  gtk_list_store_clear (store);
 
   /* Add new items to list */
 
   atoms = (GdkAtom *)data->data;
 
-  item_list = NULL;
   l = data->length / sizeof (GdkAtom);
   for (i = 0; i < l; i++)
     {
       char *name;
+      GtkTreeIter iter;
+
       name = gdk_atom_name (atoms[i]);
       if (name != NULL)
-       {
-         list_item = gtk_list_item_new_with_label (name);
-         g_free (name);
-       }
+        {
+          gtk_list_store_insert_with_values (store, &iter, i, 0, name, -1);
+          g_free (name);
+        }
       else
-       list_item = gtk_list_item_new_with_label ("(bad atom)");
-
-      gtk_widget_show (list_item);
-      item_list = g_list_append (item_list, list_item);
+       gtk_list_store_insert_with_values (store, &iter, i, 0,  "(bad atom)", -1);
     }
 
-  gtk_list_append_items (GTK_LIST (list), item_list);
-
   return;
 }
 
 void
-selection_test_get_targets (GtkWidget *widget, GtkWidget *list)
+selection_test_get_targets (GtkWidget *widget, GtkWidget *tree_view)
 {
   static GdkAtom targets_atom = GDK_NONE;
 
   if (targets_atom == GDK_NONE)
     targets_atom = gdk_atom_intern ("TARGETS", FALSE);
 
-  gtk_selection_convert (list, GDK_SELECTION_PRIMARY, targets_atom,
+  gtk_selection_convert (tree_view, GDK_SELECTION_PRIMARY, targets_atom,
                         GDK_CURRENT_TIME);
 }
 
@@ -10767,7 +9624,10 @@ create_selection_test (GtkWidget *widget)
   GtkWidget *button;
   GtkWidget *vbox;
   GtkWidget *scrolled_win;
-  GtkWidget *list;
+  GtkListStore* store;
+  GtkWidget *tree_view;
+  GtkTreeViewColumn *column;
+  GtkCellRenderer *renderer;
   GtkWidget *label;
 
   if (!window)
@@ -10801,10 +9661,16 @@ create_selection_test (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (vbox), scrolled_win, TRUE, TRUE, 0);
       gtk_widget_set_size_request (scrolled_win, 100, 200);
 
-      list = gtk_list_new ();
-      gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win), list);
+      store = gtk_list_store_new (1, G_TYPE_STRING);
+      tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
+      gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win), tree_view);
+
+      renderer = gtk_cell_renderer_text_new ();
+      column = gtk_tree_view_column_new_with_attributes ("Target", renderer,
+                                                         "text", 0, NULL);
+      gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
 
-      g_signal_connect (list, "selection_received",
+      g_signal_connect (tree_view, "selection_received",
                        G_CALLBACK (selection_test_received), NULL);
 
       /* .. And create some buttons */
@@ -10813,7 +9679,7 @@ create_selection_test (GtkWidget *widget)
                          button, TRUE, TRUE, 0);
 
       g_signal_connect (button, "clicked",
-                       G_CALLBACK (selection_test_get_targets), list);
+                       G_CALLBACK (selection_test_get_targets), tree_view);
 
       button = gtk_button_new_with_label ("Quit");
       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
@@ -10830,56 +9696,6 @@ create_selection_test (GtkWidget *widget)
     gtk_widget_destroy (window);
 }
 
-/*
- * Gamma Curve
- */
-
-void
-create_gamma_curve (GtkWidget *widget)
-{
-  static GtkWidget *window = NULL, *curve;
-  static int count = 0;
-  gfloat vec[256];
-  gint max;
-  gint i;
-  
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                            gtk_widget_get_screen (widget));
-
-      gtk_window_set_title (GTK_WINDOW (window), "test");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-      g_signal_connect (window, "destroy",
-                       G_CALLBACK(gtk_widget_destroyed),
-                       &window);
-
-      curve = gtk_gamma_curve_new ();
-      gtk_container_add (GTK_CONTAINER (window), curve);
-      gtk_widget_show (curve);
-    }
-
-  max = 127 + (count % 2)*128;
-  gtk_curve_set_range (GTK_CURVE (GTK_GAMMA_CURVE (curve)->curve),
-                      0, max, 0, max);
-  for (i = 0; i < max; ++i)
-    vec[i] = (127 / sqrt (max)) * sqrt (i);
-  gtk_curve_set_vector (GTK_CURVE (GTK_GAMMA_CURVE (curve)->curve),
-                       max, vec);
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else if (count % 4 == 3)
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  ++count;
-}
-
 /*
  * Test scrolling
  */
@@ -11761,16 +10577,13 @@ struct {
   { "flipping", create_flipping },
   { "focus", create_focus },
   { "font selection", create_font_selection },
-  { "gamma curve", create_gamma_curve, TRUE },
   { "gridded geometry", create_gridded_geometry },
   { "handle box", create_handle_box },
   { "image from drawable", create_get_image },
   { "image", create_image },
-  { "item factory", create_item_factory },
   { "key lookup", create_key_lookup },
   { "labels", create_labels },
   { "layout", create_layout },
-  { "list", create_list },
   { "menus", create_menus },
   { "message dialog", create_message_dialog },
   { "modal window", create_modal_window, TRUE },
@@ -11801,11 +10614,9 @@ struct {
   { "test scrolling", create_scroll_test },
   { "test selection", create_selection_test },
   { "test timeout", create_timeout_test },
-  { "text", create_text },
   { "toggle buttons", create_toggle_buttons },
   { "toolbar", create_toolbar },
   { "tooltips", create_tooltips },
-  { "tree", create_tree_mode_window},
   { "WM hints", create_wmhints },
   { "window sizing", create_window_sizing },
   { "window states", create_window_states }
@@ -11828,7 +10639,7 @@ create_main_window (void)
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_name (window, "main window");
-  gtk_widget_set_uposition (window, 50, 20);
+  gtk_window_move (GTK_WINDOW (window), 50, 20);
   gtk_window_set_default_size (GTK_WINDOW (window), -1, 400);
 
   geometry.min_width = -1;
@@ -11916,8 +10727,8 @@ test_init (void)
   if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la",
                   G_FILE_TEST_EXISTS))
     {
-      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
-      g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/gtk.immodules", TRUE);
+      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/loaders.cache", TRUE);
+      g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE);
     }
 }