]> Pileus Git - ~andy/gtk/blobdiff - tests/testgtk.c
Some cleanups after the module cache file change
[~andy/gtk] / tests / testgtk.c
index 18b0f08f5fb4e82fea90675e1fa19b7efe1d04a5..86ad601173f1ce1c2299503bebc745cf5ca232a9 100644 (file)
@@ -24,7 +24,6 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#undef GTK_DISABLE_DEPRECATED
 
 #include "config.h"
 
@@ -1209,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);
@@ -2701,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);
     }
   
@@ -3358,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)
 {
@@ -3398,7 +3363,6 @@ create_tooltips (GtkWidget *widget)
   GtkWidget *button;
   GtkWidget *toggle;
   GtkWidget *frame;
-  GtkWidget *tips_query;
   GtkWidget *separator;
 
   if (!window)
@@ -3448,28 +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_widget_set_tooltip_text (button "Start the Tooltips Inspector");
-      
-      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",
@@ -3983,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[] = 
@@ -4089,164 +4031,6 @@ 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)
-{
-  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 },
-};
-
-
-static int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
-
-static void
-create_item_factory (GtkWidget *widget)
-{
-  static GtkWidget *window = NULL;
-  
-  if (!window)
-    {
-      GtkWidget *box1;
-      GtkWidget *box2;
-      GtkWidget *separator;
-      GtkWidget *label;
-      GtkWidget *button;
-      GtkAccelGroup *accel_group;
-      GtkItemFactory *item_factory;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      
-      gtk_window_set_screen (GTK_WINDOW (window),
-                            gtk_widget_get_screen (widget));
-      
-      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
-       */
-      gtk_widget_set_tooltip_text (gtk_item_factory_get_item (item_factory, "/File/New"),
-                                   "Create a new file");
-      gtk_widget_set_tooltip_text (gtk_item_factory_get_item (item_factory, "/File/Open"),
-                                   "Open a file");
-      gtk_widget_set_tooltip_text (gtk_item_factory_get_item (item_factory, "/File/Save"),
-                                   "Safe file");
-      gtk_widget_set_tooltip_text (gtk_item_factory_get_item (item_factory, "/Preferences/Color"),
-                                   "Modify color");
-
-      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,
@@ -4386,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();
 }
 
@@ -4767,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));
@@ -4819,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);
@@ -5855,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 */
@@ -6359,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;
@@ -6386,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)
@@ -6404,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
     {
@@ -6445,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 (),
@@ -6482,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);
@@ -6506,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);
@@ -6818,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;
@@ -6854,6 +6614,54 @@ int ntext_colors = sizeof(text_colors) / sizeof(text_colors[0]);
  * 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;
@@ -6891,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
@@ -6966,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",
@@ -7085,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)
 {
@@ -7157,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);
@@ -7838,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 *
@@ -7903,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;
@@ -9082,18 +8851,26 @@ progress_timeout (gpointer data)
 {
   ProgressData *pdata = data;
   gdouble new_val;
+  gchar *text;
 
   if (pdata->activity)
     {
       gtk_progress_bar_pulse (GTK_PROGRESS_BAR (pdata->pbar));
-      return TRUE;
+
+      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);
 
-  new_val = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (pdata->pbar)) + 0.01;
-  if (new_val > 1.00)
-    new_val = 0.00;
+      text = g_strdup_printf ("%.0f%%", 100 * new_val);
+    }
 
-  gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (pdata->pbar), new_val);
+  gtk_label_set_text (GTK_LABEL (pdata->label), text);
+  g_free (text);
 
   return TRUE;
 }
@@ -9129,9 +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);
+  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
@@ -9146,27 +8927,6 @@ progressbar_toggle_ellipsize (GtkWidget *widget,
     }
 }
 
-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_bar_get_fraction (GTK_PROGRESS_BAR (pdata->pbar)));
-  gtk_label_set_text (GTK_LABEL (pdata->label), buf);
-}
-
-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)
 {
@@ -9192,7 +8952,6 @@ create_progress_bar (GtkWidget *widget)
   GtkWidget *tab;
   GtkWidget *label;
   GtkWidget *align;
-  GtkAdjustment *adj;
   static ProgressData *pdata = NULL;
 
   static gchar *items1[] =
@@ -9245,16 +9004,10 @@ 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_bar_set_text (GTK_PROGRESS_BAR (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);
 
@@ -9305,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,
@@ -10859,7 +10581,6 @@ struct {
   { "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 },
@@ -10918,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;
@@ -11006,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);
     }
 }