]> Pileus Git - ~andy/gtk/blobdiff - tests/testgtk.c
Remove reallocate-redraws property. This is something that only a widget
[~andy/gtk] / tests / testgtk.c
index cf36663f286dc4835c4dbee5ddc0285e75c96744..a6502591826f1ea4ba26386d8fdd6d5b3e68c084 100644 (file)
@@ -38,7 +38,8 @@
 #include <unistd.h>
 #endif
 
-#include "gtk.h"
+#define GTK_ENABLE_BROKEN
+#include "gtk/gtk.h"
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"
 
@@ -46,6 +47,8 @@
 #define sleep(n) _sleep(n)
 #endif
 
+#include "prop-editor.h"
+
 #include "circles.xbm"
 #include "test.xpm"
 
@@ -110,18 +113,23 @@ build_option_menu (OptionMenuItem items[],
   GtkWidget *omenu;
   GtkWidget *menu;
   GtkWidget *menu_item;
+  GSList *group;
   gint i;
 
   omenu = gtk_option_menu_new ();
       
   menu = gtk_menu_new ();
+  group = NULL;
   
   for (i = 0; i < num_items; i++)
     {
-      menu_item = gtk_menu_item_new_with_label (items[i].name);
+      menu_item = gtk_radio_menu_item_new_with_label (group, items[i].name);
       gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
                          (GtkSignalFunc) items[i].func, data);
+      group = gtk_radio_menu_item_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);
     }
 
@@ -165,12 +173,8 @@ create_buttons (void)
 
   if (!window)
     {
-      GtkAccelGroup *accel_group;
-      
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-      accel_group = gtk_window_get_default_accel_group (GTK_WINDOW (window));
-      
       gtk_signal_connect (GTK_OBJECT (window), "destroy",
                          GTK_SIGNAL_FUNC (gtk_widget_destroyed),
                          &window);
@@ -188,13 +192,13 @@ create_buttons (void)
       gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE, 0);
 
       button[0] = gtk_button_new_with_label ("button1");
-      button[1] = gtk_button_new_accel ("_button2", accel_group);
-      button[2] = gtk_button_new_with_label ("button3");
-      button[3] = gtk_button_new_stock (GTK_STOCK_BUTTON_OK, NULL);
+      button[1] = gtk_button_new_with_mnemonic ("_button2");
+      button[2] = gtk_button_new_with_mnemonic ("_button3");
+      button[3] = gtk_button_new_from_stock (GTK_STOCK_BUTTON_OK);
       button[4] = gtk_button_new_with_label ("button5");
       button[5] = gtk_button_new_with_label ("button6");
       button[6] = gtk_button_new_with_label ("button7");
-      button[7] = gtk_button_new_stock (GTK_STOCK_BUTTON_CLOSE, accel_group);
+      button[7] = gtk_button_new_from_stock (GTK_STOCK_BUTTON_CLOSE);
       button[8] = gtk_button_new_with_label ("button9");
       
       gtk_signal_connect (GTK_OBJECT (button[0]), "clicked",
@@ -315,6 +319,10 @@ create_toggle_buttons (void)
       button = gtk_toggle_button_new_with_label ("button3");
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
 
+      button = gtk_toggle_button_new_with_label ("inconsistent");
+      gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (button), TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+      
       separator = gtk_hseparator_new ();
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
@@ -368,7 +376,7 @@ create_check_buttons (void)
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
 
-      button = gtk_check_button_new_with_label ("button1");
+      button = gtk_check_button_new_with_mnemonic ("_button1");
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
 
       button = gtk_check_button_new_with_label ("button2");
@@ -377,6 +385,10 @@ create_check_buttons (void)
       button = gtk_check_button_new_with_label ("button3");
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
 
+      button = gtk_check_button_new_with_label ("inconsistent");
+      gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (button), TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+      
       separator = gtk_hseparator_new ();
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
@@ -444,6 +456,12 @@ create_radio_buttons (void)
                 "button3");
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
 
+      button = gtk_radio_button_new_with_label (
+                 gtk_radio_button_group (GTK_RADIO_BUTTON (button)),
+                "inconsistent");
+      gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (button), TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+      
       separator = gtk_hseparator_new ();
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
@@ -493,7 +511,7 @@ create_bbox (gint  horizontal,
   gtk_container_add (GTK_CONTAINER (frame), bbox);
 
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
-  gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), spacing);
+  gtk_box_set_spacing (GTK_BOX (bbox), spacing);
   gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), child_w, child_h);
   
   button = gtk_button_new_with_label ("OK");
@@ -615,6 +633,21 @@ new_pixmap (char      *filename,
   return wpixmap;
 }
 
+
+static void
+set_toolbar_small_stock (GtkWidget *widget,
+                        gpointer   data)
+{
+  gtk_toolbar_set_icon_size (GTK_TOOLBAR (data), GTK_ICON_SIZE_SMALL_TOOLBAR);
+}
+
+static void
+set_toolbar_large_stock (GtkWidget *widget,
+                        gpointer   data)
+{
+  gtk_toolbar_set_icon_size (GTK_TOOLBAR (data), GTK_ICON_SIZE_LARGE_TOOLBAR);
+}
+
 static void
 set_toolbar_horizontal (GtkWidget *widget,
                        gpointer   data)
@@ -657,20 +690,6 @@ set_toolbar_both_horiz (GtkWidget *widget,
   gtk_toolbar_set_style (GTK_TOOLBAR (data), GTK_TOOLBAR_BOTH_HORIZ);
 }
 
-static void
-set_toolbar_small_space (GtkWidget *widget,
-                        gpointer   data)
-{
-  gtk_toolbar_set_space_size (GTK_TOOLBAR (data), 5);
-}
-
-static void
-set_toolbar_big_space (GtkWidget *widget,
-                      gpointer   data)
-{
-  gtk_toolbar_set_space_size (GTK_TOOLBAR (data), 10);
-}
-
 static void
 set_toolbar_enable (GtkWidget *widget,
                    gpointer   data)
@@ -685,34 +704,6 @@ set_toolbar_disable (GtkWidget *widget,
   gtk_toolbar_set_tooltips (GTK_TOOLBAR (data), FALSE);
 }
 
-static void
-set_toolbar_borders (GtkWidget *widget,
-                    gpointer   data)
-{
-  gtk_toolbar_set_button_relief (GTK_TOOLBAR (data), GTK_RELIEF_NORMAL);
-}
-
-static void
-set_toolbar_borderless (GtkWidget *widget,
-                       gpointer   data)
-{
-  gtk_toolbar_set_button_relief (GTK_TOOLBAR (data), GTK_RELIEF_NONE);
-}
-
-static void
-set_toolbar_space_style_empty (GtkWidget *widget,
-                              gpointer   data)
-{
-  gtk_toolbar_set_space_style (GTK_TOOLBAR (data), GTK_TOOLBAR_SPACE_EMPTY);
-}
-
-static void
-set_toolbar_space_style_line (GtkWidget *widget,
-                             gpointer   data)
-{
-  gtk_toolbar_set_space_style (GTK_TOOLBAR (data), GTK_TOOLBAR_SPACE_LINE);
-}
-
 static void
 create_toolbar (void)
 {
@@ -734,8 +725,17 @@ create_toolbar (void)
       gtk_widget_realize (window);
 
       toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
-      gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar), GTK_RELIEF_NONE);
 
+      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+                               GTK_STOCK_NEW,
+                               "Stock icon: New", "Toolbar/New",
+                               (GtkSignalFunc) set_toolbar_small_stock, toolbar, -1);
+      
+      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+                               GTK_STOCK_OPEN,
+                               "Stock icon: Open", "Toolbar/Open",
+                               (GtkSignalFunc) 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]),
@@ -774,14 +774,6 @@ create_toolbar (void)
 
       gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
 
-      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Small", "Use small spaces", "Toolbar/Small",
-                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              (GtkSignalFunc) set_toolbar_small_space, toolbar);
-      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Big", "Use big spaces", "Toolbar/Big",
-                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              (GtkSignalFunc) set_toolbar_big_space, toolbar);
 
       gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
 
@@ -797,24 +789,24 @@ create_toolbar (void)
       gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
 
       gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Borders", "Show Borders", NULL,
+                              "Frobate", "Frobate tooltip", NULL,
                               new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              (GtkSignalFunc) set_toolbar_borders, toolbar);
+                              (GtkSignalFunc) NULL, toolbar);
       gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Borderless", "Hide Borders", NULL,
+                              "Baz", "Baz tooltip", NULL,
                               new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              (GtkSignalFunc) set_toolbar_borderless, toolbar);
+                              (GtkSignalFunc) NULL, toolbar);
 
       gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
       
       gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Empty", "Empty spaces", NULL,
+                              "Blah", "Blah tooltip", NULL,
                               new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              (GtkSignalFunc) set_toolbar_space_style_empty, toolbar);
+                              (GtkSignalFunc) NULL, toolbar);
       gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                              "Lines", "Lines in spaces", NULL,
+                              "Bar", "Bar tooltip", NULL,
                               new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                              (GtkSignalFunc) set_toolbar_space_style_line, toolbar);
+                              (GtkSignalFunc) NULL, toolbar);
 
       gtk_container_add (GTK_CONTAINER (window), toolbar);
     }
@@ -834,7 +826,6 @@ make_toolbar (GtkWidget *window)
     gtk_widget_realize (window);
 
   toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
-  gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar), GTK_RELIEF_NONE);
 
   gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
                           "Horizontal", "Horizontal toolbar layout", NULL,
@@ -863,13 +854,13 @@ make_toolbar (GtkWidget *window)
   gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
 
   gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Small", "Use small spaces", NULL,
+                          "Woot", "Woot woot woot", NULL,
                           new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          (GtkSignalFunc) set_toolbar_small_space, toolbar);
+                          (GtkSignalFunc) NULL, toolbar);
   gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Big", "Use big spaces", "Toolbar/Big",
+                          "Blah", "Blah blah blah", "Toolbar/Big",
                           new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          (GtkSignalFunc) set_toolbar_big_space, toolbar);
+                          (GtkSignalFunc) NULL, toolbar);
 
   gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
 
@@ -885,13 +876,13 @@ make_toolbar (GtkWidget *window)
   gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
   
   gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Borders", "Show Borders", NULL,
+                          "Hoo", "Hoo tooltip", NULL,
                           new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          (GtkSignalFunc) set_toolbar_borders, toolbar);
+                          (GtkSignalFunc) NULL, toolbar);
   gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
-                          "Borderless", "Hide Borders", NULL,
+                          "Woo", "Woo tooltip", NULL,
                           new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
-                          (GtkSignalFunc) set_toolbar_borderless, toolbar);
+                          (GtkSignalFunc) NULL, toolbar);
 
   return toolbar;
 }
@@ -967,23 +958,6 @@ statusbar_contexts (GtkStatusbar *statusbar)
           gtk_statusbar_get_context_id (statusbar, string));
 }
 
-static void
-statusbar_dump_stack (GtkStatusbar *statusbar)
-{
-  GSList *list;
-
-  for (list = statusbar->messages; list; list = list->next)
-    {
-      GtkStatusbarMsg *msg;
-
-      msg = list->data;
-      g_print ("context_id: %d, message_id: %d, status_text: \"%s\"\n",
-               msg->context_id,
-               msg->message_id,
-               msg->text);
-    }
-}
-
 static void
 create_statusbar (void)
 {
@@ -1023,37 +997,35 @@ create_statusbar (void)
                               "label", "push something",
                               "visible", TRUE,
                               "parent", box2,
-                              "signal::clicked", statusbar_push, statusbar,
-                              NULL);
-
-      button = gtk_widget_new (gtk_button_get_type (),
-                              "label", "pop",
-                              "visible", TRUE,
-                              "parent", box2,
-                              "signal_after::clicked", statusbar_pop, statusbar,
-                              NULL);
-
-      button = gtk_widget_new (gtk_button_get_type (),
-                              "label", "steal #4",
-                              "visible", TRUE,
-                              "parent", box2,
-                              "signal_after::clicked", statusbar_steal, statusbar,
                               NULL);
+      g_object_connect (G_OBJECT (button),
+                       "signal::clicked", statusbar_push, statusbar,
+                       NULL);
 
-      button = gtk_widget_new (gtk_button_get_type (),
-                              "label", "dump stack",
-                              "visible", TRUE,
-                              "parent", box2,
-                              "object_signal::clicked", statusbar_dump_stack, statusbar,
-                              NULL);
+      button = g_object_connect (gtk_widget_new (gtk_button_get_type (),
+                                                "label", "pop",
+                                                "visible", TRUE,
+                                                "parent", box2,
+                                                NULL),
+                                "signal_after::clicked", statusbar_pop, statusbar,
+                                NULL);
 
-      button = gtk_widget_new (gtk_button_get_type (),
-                              "label", "test contexts",
-                              "visible", TRUE,
-                              "parent", box2,
-                              "object_signal_after::clicked", statusbar_contexts, statusbar,
-                              NULL);
+      button = g_object_connect (gtk_widget_new (gtk_button_get_type (),
+                                                "label", "steal #4",
+                                                "visible", TRUE,
+                                                "parent", box2,
+                                                NULL),
+                                "signal_after::clicked", statusbar_steal, statusbar,
+                                NULL);
 
+      button = g_object_connect (gtk_widget_new (gtk_button_get_type (),
+                                                "label", "test contexts",
+                                                "visible", TRUE,
+                                                "parent", box2,
+                                                NULL),
+                                "swapped_signal_after::clicked", statusbar_contexts, statusbar,
+                                NULL);
+      
       separator = gtk_hseparator_new ();
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
@@ -1505,7 +1477,7 @@ create_tree_mode_window(void)
       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 ((gfloat)DEFAULT_NUMBER_OF_ITEM, 1.0, 255.0, 1.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);
@@ -1519,7 +1491,7 @@ create_tree_mode_window(void)
       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 ((gfloat)DEFAULT_RECURSION_LEVEL, 0.0, 255.0, 1.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);
@@ -1631,7 +1603,7 @@ create_handle_box (void)
     gtk_widget_show (handle_box);
 
     toolbar = make_toolbar (window);
-    gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar), GTK_RELIEF_NORMAL);
+    
     gtk_container_add (GTK_CONTAINER (handle_box), toolbar);
     gtk_widget_show (toolbar);
 
@@ -1992,6 +1964,86 @@ create_get_image (void)
 /* 
  * Label Demo
  */
+static void
+sensitivity_toggled (GtkWidget *toggle,
+                     GtkWidget *widget)
+{
+  gtk_widget_set_sensitive (widget,  GTK_TOGGLE_BUTTON (toggle)->active);  
+}
+
+static GtkWidget*
+create_sensitivity_control (GtkWidget *widget)
+{
+  GtkWidget *button;
+
+  button = gtk_toggle_button_new_with_label ("Sensitive");  
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                GTK_WIDGET_IS_SENSITIVE (widget));
+  
+  gtk_signal_connect (GTK_OBJECT (button),
+                      "toggled",
+                      GTK_SIGNAL_FUNC (sensitivity_toggled),
+                      widget);
+  
+  gtk_widget_show_all (button);
+
+  return button;
+}
+
+static void
+set_selectable_recursive (GtkWidget *widget,
+                          gboolean   setting)
+{
+  if (GTK_IS_CONTAINER (widget))
+    {
+      GList *children;
+      GList *tmp;
+      
+      children = gtk_container_children (GTK_CONTAINER (widget));
+      tmp = children;
+      while (tmp)
+        {
+          set_selectable_recursive (tmp->data, setting);
+
+          tmp = tmp->next;
+        }
+      g_list_free (children);
+    }
+  else if (GTK_IS_LABEL (widget))
+    {
+      gtk_label_set_selectable (GTK_LABEL (widget), setting);
+    }
+}
+
+static void
+selectable_toggled (GtkWidget *toggle,
+                    GtkWidget *widget)
+{
+  set_selectable_recursive (widget,
+                            GTK_TOGGLE_BUTTON (toggle)->active);
+}
+
+static GtkWidget*
+create_selectable_control (GtkWidget *widget)
+{
+  GtkWidget *button;
+
+  button = gtk_toggle_button_new_with_label ("Selectable");  
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                FALSE);
+  
+  gtk_signal_connect (GTK_OBJECT (button),
+                      "toggled",
+                      GTK_SIGNAL_FUNC (selectable_toggled),
+                      widget);
+  
+  gtk_widget_show_all (button);
+
+  return button;
+}
+
 void create_labels (void)
 {
   static GtkWidget *window = NULL;
@@ -1999,20 +2051,34 @@ void create_labels (void)
   GtkWidget *vbox;
   GtkWidget *frame;
   GtkWidget *label;
-
+  GtkWidget *button;
+  
   if (!window)
     {
-      guint keyval;
-      
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_signal_connect (GTK_OBJECT (window), "destroy",
                          GTK_SIGNAL_FUNC(gtk_widget_destroyed),
                          &window);
 
       gtk_window_set_title (GTK_WINDOW (window), "Label");
+
       vbox = gtk_vbox_new (FALSE, 5);
+      
       hbox = gtk_hbox_new (FALSE, 5);
-      gtk_container_add (GTK_CONTAINER (window), hbox);
+      gtk_container_add (GTK_CONTAINER (window), vbox);
+
+      gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+
+      button = create_sensitivity_control (hbox);
+
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+      button = create_selectable_control (hbox);
+
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      
+      vbox = gtk_vbox_new (FALSE, 5);
+      
       gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (window), 5);
 
@@ -2047,8 +2113,8 @@ void create_labels (void)
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
       frame = gtk_frame_new ("Bidirection Label");
-      label = gtk_label_new ("Arabic  السلام عليكم\n"
-                            "Hebrew   שלום");
+      label = gtk_label_new ("Arabic   السلام عليكم\n"
+                            "Hebrew    שלום");
       gtk_widget_set_direction (label, GTK_TEXT_DIR_RTL);
       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
       gtk_container_add (GTK_CONTAINER (frame), label);
@@ -2096,29 +2162,28 @@ void create_labels (void)
       /* There's also a gtk_label_set_markup() without accel if you
        * don't have an accelerator key
        */
-      keyval =
-        gtk_label_set_markup_with_accel (GTK_LABEL (label),
-                                         "This <span foreground=\"blue\" background=\"orange\">label</span> has "
-                                         "<b>markup</b> _such as "
-                                         "<big><i>Big Italics</i></big>\n"
-                                         "<tt>Monospace font</tt>\n"
-                                         "<u>Underline!</u>\n"
-                                         "foo\n"
-                                         "<span foreground=\"green\" background=\"red\">Ugly colors</span>\n"
-                                         "and nothing on this line,\n"
-                                         "or this.\n"
-                                         "or this either\n"
-                                         "or even on this one\n"
-                                         "la <big>la <big>la <big>la <big>la</big></big></big></big>\n"
-                                         "but this _word is <span foreground=\"purple\"><big>purple</big></span>\n"
-                                         "We like <sup>superscript</sup> and <sub>subscript</sub> too");
-
-      g_return_if_fail (keyval == GDK_s);
+      gtk_label_set_markup_with_mnemonic (GTK_LABEL (label),
+                                         "This <span foreground=\"blue\" background=\"orange\">label</span> has "
+                                         "<b>markup</b> _such as "
+                                         "<big><i>Big Italics</i></big>\n"
+                                         "<tt>Monospace font</tt>\n"
+                                         "<u>Underline!</u>\n"
+                                         "foo\n"
+                                         "<span foreground=\"green\" background=\"red\">Ugly colors</span>\n"
+                                         "and nothing on this line,\n"
+                                         "or this.\n"
+                                         "or this either\n"
+                                         "or even on this one\n"
+                                         "la <big>la <big>la <big>la <big>la</big></big></big></big>\n"
+                                         "but this _word is <span foreground=\"purple\"><big>purple</big></span>\n"
+                                         "<span underline=\"double\">We like <sup>superscript</sup> and <sub>subscript</sub> too</span>");
+
+      g_assert (gtk_label_get_mnemonic_keyval (GTK_LABEL (label)) == GDK_s);
       
       gtk_container_add (GTK_CONTAINER (frame), label);
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-      
     }
+  
   if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
@@ -2270,9 +2335,9 @@ uposition_stop_configure (GtkToggleButton *toggle,
                          GtkObject       *window)
 {
   if (toggle->active)
-    gtk_signal_handler_block_by_func (window, uposition_configure, NULL);
+    gtk_signal_handler_block_by_func (window, GTK_SIGNAL_FUNC (uposition_configure), NULL);
   else
-    gtk_signal_handler_unblock_by_func (window, uposition_configure, NULL);
+    gtk_signal_handler_unblock_by_func (window, GTK_SIGNAL_FUNC (uposition_configure), NULL);
 }
 
 static void
@@ -2291,13 +2356,14 @@ create_saved_position (void)
       GtkWidget *label;
       GtkWidget *any;
 
-      window = gtk_widget_new (GTK_TYPE_WINDOW,
-                              "type", GTK_WINDOW_TOPLEVEL,
-                              "signal::configure_event", uposition_configure, NULL,
-                              "x", upositionx,
-                              "y", upositiony,
-                              "title", "Saved Position",
-                              NULL);
+      window = g_object_connect (gtk_widget_new (GTK_TYPE_WINDOW,
+                                                "type", GTK_WINDOW_TOPLEVEL,
+                                                "x", upositionx,
+                                                "y", upositiony,
+                                                "title", "Saved Position",
+                                                NULL),
+                                "signal::configure_event", uposition_configure, NULL,
+                                NULL);
 
       gtk_signal_connect (GTK_OBJECT (window), "destroy",
                          GTK_SIGNAL_FUNC (gtk_widget_destroyed),
@@ -2314,12 +2380,13 @@ create_saved_position (void)
                        "GtkContainer::border_width", 10,
                        "GtkWidget::parent", main_vbox,
                        "GtkWidget::visible", TRUE,
-                       "child", gtk_widget_new (GTK_TYPE_TOGGLE_BUTTON,
-                                                "label", "Stop Events",
-                                                "active", FALSE,
-                                                "signal::clicked", uposition_stop_configure, window,
-                                                "visible", TRUE,
-                                                NULL),
+                       "child", g_object_connect (gtk_widget_new (GTK_TYPE_TOGGLE_BUTTON,
+                                                                  "label", "Stop Events",
+                                                                  "active", FALSE,
+                                                                  "visible", TRUE,
+                                                                  NULL),
+                                                  "signal::clicked", uposition_stop_configure, window,
+                                                  NULL),
                        NULL);
 
       hbox = gtk_hbox_new (FALSE, 0);
@@ -2417,6 +2484,20 @@ create_pixmap (void)
       gtk_container_add (GTK_CONTAINER (box3), label);
       gtk_container_add (GTK_CONTAINER (button), box3);
 
+      button = gtk_button_new ();
+      gtk_box_pack_start (GTK_BOX (box2), button, FALSE, FALSE, 0);
+      
+      pixmapwid = new_pixmap ("test.xpm", window->window, NULL);
+
+      label = gtk_label_new ("Pixmap\ntest");
+      box3 = gtk_hbox_new (FALSE, 0);
+      gtk_container_set_border_width (GTK_CONTAINER (box3), 2);
+      gtk_container_add (GTK_CONTAINER (box3), pixmapwid);
+      gtk_container_add (GTK_CONTAINER (box3), label);
+      gtk_container_add (GTK_CONTAINER (button), box3);
+
+      gtk_widget_set_sensitive (button, FALSE);
+      
       separator = gtk_hseparator_new ();
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
@@ -2530,20 +2611,22 @@ create_tooltips (void)
 
       box3 =
        gtk_widget_new (gtk_vbox_get_type (),
-                       "GtkBox::homogeneous", FALSE,
-                       "GtkBox::spacing", 5,
-                       "GtkContainer::border_width", 5,
-                       "GtkWidget::visible", TRUE,
+                       "homogeneous", FALSE,
+                       "spacing", 5,
+                       "border_width", 5,
+                       "visible", TRUE,
                        NULL);
 
       tips_query = gtk_tips_query_new ();
 
       button =
        gtk_widget_new (gtk_button_get_type (),
-                       "GtkButton::label", "[?]",
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box3,
-                       "GtkObject::object_signal::clicked", gtk_tips_query_start_query, tips_query,
+                       "label", "[?]",
+                       "visible", TRUE,
+                       "parent", box3,
+                       NULL);
+      g_object_connect (G_OBJECT (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,
@@ -2552,23 +2635,23 @@ create_tooltips (void)
                            "ContextHelp/buttons/?");
       
       
-      gtk_widget_set (tips_query,
-                     "GtkWidget::visible", TRUE,
-                     "GtkWidget::parent", box3,
-                     "GtkTipsQuery::caller", button,
-                     "GtkObject::signal::widget_entered", tips_query_widget_entered, toggle,
-                     "GtkObject::signal::widget_selected", tips_query_widget_selected, NULL,
+      gtk_widget_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);
       
-      frame =
-       gtk_widget_new (gtk_frame_get_type (),
-                       "GtkFrame::label", "ToolTips Inspector",
-                       "GtkFrame::label_xalign", (double) 0.5,
-                       "GtkContainer::border_width", 0,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box2,
-                       "GtkContainer::child", box3,
-                       NULL);
+      frame = gtk_widget_new (gtk_frame_get_type (),
+                             "label", "ToolTips Inspector",
+                             "label_xalign", (double) 0.5,
+                             "border_width", 0,
+                             "visible", TRUE,
+                             "parent", box2,
+                             "child", box3,
+                             NULL);
       gtk_box_set_child_packing (GTK_BOX (box2), frame, TRUE, TRUE, 10, GTK_PACK_START);
 
       separator = gtk_hseparator_new ();
@@ -2625,6 +2708,10 @@ create_image (void)
       GdkBitmap *mask;
         
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      /* this is bogus for testing drawing when allocation < request,
+       * don't copy into real code
+       */
+      gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
       
       gtk_signal_connect (GTK_OBJECT (window), "destroy",
                          GTK_SIGNAL_FUNC(gtk_widget_destroyed),
@@ -2663,6 +2750,7 @@ create_menu (gint depth, gint length, gboolean tearoff)
 {
   GtkWidget *menu;
   GtkWidget *menuitem;
+  GtkWidget *image;
   GSList *group;
   char buf[32];
   int i, j;
@@ -2680,18 +2768,33 @@ create_menu (gint depth, gint length, gboolean tearoff)
       gtk_widget_show (menuitem);
     }
 
+  image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
+                                    GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image);
+  menuitem = gtk_image_menu_item_new_with_label ("Image item");
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+  gtk_widget_show (menuitem);
+  
   for (i = 0, j = 1; i < length; i++, j++)
     {
       sprintf (buf, "item %2d - %d", depth, j);
+
       menuitem = gtk_radio_menu_item_new_with_label (group, buf);
       group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
+
       if (depth % 2)
        gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (menuitem), TRUE);
+
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
       gtk_widget_show (menuitem);
       if (i == 3)
        gtk_widget_set_sensitive (menuitem, FALSE);
 
+      if (i == 5)
+        gtk_check_menu_item_set_inconsistent (GTK_CHECK_MENU_ITEM (menuitem),
+                                              TRUE);
+
       if (i < 5)
        gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (depth - 1, 5,  TRUE));
     }
@@ -2715,6 +2818,7 @@ create_menus (void)
       GtkWidget *menu;
       GtkWidget *menuitem;
       GtkAccelGroup *accel_group;
+      GtkWidget *image;
       
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       
@@ -2752,7 +2856,11 @@ create_menus (void)
       gtk_menu_bar_append (GTK_MENU_BAR (menubar), menuitem);
       gtk_widget_show (menuitem);
 
-      menuitem = gtk_menu_item_new_with_label ("bar");
+      image = gtk_image_new_from_stock (GTK_STOCK_HELP,
+                                        GTK_ICON_SIZE_MENU);
+      gtk_widget_show (image);
+      menuitem = gtk_image_menu_item_new_with_label ("Help");
+      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
       gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4, 5, TRUE));
       gtk_menu_item_right_justify (GTK_MENU_ITEM (menuitem));
       gtk_menu_bar_append (GTK_MENU_BAR (menubar), menuitem);
@@ -2766,6 +2874,10 @@ create_menus (void)
       menu = create_menu (1, 5, FALSE);
       gtk_menu_set_accel_group (GTK_MENU (menu), accel_group);
 
+      menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_NEW, accel_group);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+      gtk_widget_show (menuitem);
+      
       menuitem = gtk_check_menu_item_new_with_label ("Accelerate Me");
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
       gtk_widget_show (menuitem);
@@ -2840,16 +2952,140 @@ gtk_ifactory_cb (gpointer             callback_data,
   g_message ("ItemFactory: activated \"%s\"", gtk_item_factory_path_from_widget (widget));
 }
 
+/* This file was automatically generated by the make-inline-pixbuf program.
+ * It contains inline RGB image data.
+ */
+static const guchar apple[] =
+{
+  /* File magic (1197763408) */
+  0x47, 0x64, 0x6b, 0x50,
+  /* Format of following stuff (0) */
+  0x00, 0x00, 0x00, 0x00,
+  /* Rowstride (64) */
+  0x00, 0x00, 0x00, 0x40,
+  /* Width (16) */
+  0x00, 0x00, 0x00, 0x10,
+  /* Height (16) */
+  0x00, 0x00, 0x00, 0x10,
+  /* Has an alpha channel (TRUE) */
+  0x01,
+  /* Colorspace (0 == RGB, no other options implemented) (0) */
+  0x00, 0x00, 0x00, 0x00,
+  /* Number of channels (4) */
+  0x00, 0x00, 0x00, 0x04,
+  /* Bits per sample (8) */
+  0x00, 0x00, 0x00, 0x08,
+  /* Image data */
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x16, 0x14, 0x0f, 0x04,
+  0x00, 0x00, 0x00, 0x01,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x61, 0x6d, 0x5b, 0x2b,  0x6e, 0x7c, 0x61, 0xd9,
+  0x71, 0x80, 0x63, 0xd7,  0x5f, 0x6b, 0x5b, 0x35,  0x00, 0x00, 0x00, 0x00,
+  0x3a, 0x35, 0x28, 0x8f,  0x00, 0x00, 0x00, 0x32,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x60, 0x6c, 0x5c, 0x07,  0x6d, 0x7b, 0x61, 0xd8,
+  0x75, 0x84, 0x65, 0xf6,  0x76, 0x86, 0x66, 0xf7,  0x6a, 0x77, 0x60, 0xec,
+  0x5e, 0x6a, 0x58, 0x47,  0x1c, 0x1a, 0x13, 0xa2,  0x4b, 0x47, 0x30, 0x07,
+  0x55, 0x4e, 0x33, 0x21,  0x48, 0x3e, 0x2a, 0x08,  0xd0, 0xb8, 0x84, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x69, 0x76, 0x5f, 0x74,
+  0x75, 0x84, 0x65, 0xf3,  0x67, 0x75, 0x5e, 0xc4,  0x69, 0x62, 0x55, 0x75,
+  0x94, 0x50, 0x50, 0x69,  0x75, 0x5c, 0x52, 0xb2,  0x69, 0x38, 0x34, 0xa2,
+  0xa7, 0x5b, 0x53, 0xea,  0xa3, 0x52, 0x4f, 0xff,  0x90, 0x47, 0x42, 0xfa,
+  0x76, 0x44, 0x36, 0xb9,  0x59, 0x38, 0x29, 0x3c,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x5f, 0x6b, 0x5a, 0x09,
+  0x69, 0x76, 0x5e, 0xb0,  0x5f, 0x6b, 0x59, 0x57,  0x9a, 0x4b, 0x4d, 0x5b,
+  0xb8, 0x5f, 0x63, 0xfa,  0xcc, 0x7d, 0x7e, 0xff,  0xc5, 0x69, 0x68, 0xff,
+  0xc7, 0x6b, 0x67, 0xff,  0xc5, 0x6f, 0x67, 0xff,  0xba, 0x5e, 0x5a, 0xff,
+  0xb1, 0x4d, 0x4d, 0xff,  0x92, 0x4b, 0x42, 0xff,  0x6a, 0x3e, 0x30, 0xfc,
+  0x5c, 0x3b, 0x27, 0x6d,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x5d, 0x69, 0x57, 0x09,  0x5d, 0x69, 0x57, 0x09,  0x92, 0x47, 0x46, 0x1e,
+  0xba, 0x65, 0x64, 0xf4,  0xe7, 0xbf, 0xc0, 0xff,  0xdf, 0xa5, 0xa3, 0xff,
+  0xd4, 0x84, 0x81, 0xff,  0xd1, 0x7c, 0x76, 0xff,  0xc9, 0x78, 0x6d, 0xff,
+  0xbb, 0x6a, 0x5d, 0xff,  0xb3, 0x5a, 0x52, 0xff,  0x9f, 0x4b, 0x47, 0xff,
+  0x78, 0x45, 0x35, 0xff,  0x5f, 0x3c, 0x28, 0xfa,  0x53, 0x5a, 0x38, 0x24,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0xa1, 0x54, 0x4d, 0x8c,  0xcf, 0x8e, 0x89, 0xff,  0xe3, 0xb1, 0xae, 0xff,
+  0xd8, 0x94, 0x8e, 0xff,  0xd3, 0x8a, 0x82, 0xff,  0xcf, 0x80, 0x76, 0xff,
+  0xc4, 0x75, 0x67, 0xff,  0xb7, 0x6c, 0x5c, 0xff,  0xab, 0x5e, 0x51, 0xff,
+  0x9c, 0x4c, 0x46, 0xff,  0x7e, 0x4a, 0x3a, 0xff,  0x5c, 0x3c, 0x26, 0xff,
+  0x58, 0x3d, 0x28, 0x55,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0xa2, 0x59, 0x4f, 0xc3,  0xcd, 0x8e, 0x88, 0xff,
+  0xd3, 0x93, 0x8c, 0xff,  0xd0, 0x8c, 0x83, 0xff,  0xcc, 0x84, 0x79, 0xff,
+  0xc7, 0x7c, 0x6e, 0xff,  0xbc, 0x73, 0x61, 0xff,  0xb1, 0x6b, 0x59, 0xff,
+  0xa3, 0x5f, 0x4f, 0xff,  0x93, 0x50, 0x44, 0xff,  0x78, 0x48, 0x35, 0xff,
+  0x59, 0x3b, 0x25, 0xff,  0x4f, 0x3d, 0x28, 0x4f,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x9b, 0x5b, 0x4d, 0xbc,
+  0xbd, 0x7e, 0x72, 0xff,  0xc6, 0x86, 0x7a, 0xff,  0xc5, 0x7f, 0x72, 0xff,
+  0xc2, 0x7b, 0x6c, 0xff,  0xbf, 0x77, 0x63, 0xff,  0xb7, 0x72, 0x5b, 0xff,
+  0xa9, 0x6b, 0x53, 0xff,  0x9a, 0x60, 0x4b, 0xff,  0x8b, 0x56, 0x41, 0xff,
+  0x6a, 0x44, 0x2e, 0xff,  0x53, 0x38, 0x21, 0xfd,  0x42, 0x4b, 0x2e, 0x1a,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x8e, 0x57, 0x48, 0x6e,  0xa6, 0x6b, 0x5a, 0xff,  0xb3, 0x74, 0x62, 0xff,
+  0xb8, 0x75, 0x61, 0xff,  0xba, 0x76, 0x61, 0xff,  0xb7, 0x74, 0x5c, 0xff,
+  0xae, 0x6e, 0x54, 0xff,  0x9f, 0x67, 0x4c, 0xff,  0x90, 0x5d, 0x43, 0xff,
+  0x79, 0x4d, 0x38, 0xff,  0x5c, 0x3d, 0x25, 0xff,  0x50, 0x39, 0x23, 0xb8,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x78, 0x52, 0x43, 0x07,  0x92, 0x5c, 0x47, 0xdc,
+  0x9e, 0x64, 0x4e, 0xff,  0xa8, 0x6b, 0x52, 0xff,  0xaa, 0x6d, 0x53, 0xff,
+  0xa7, 0x6d, 0x50, 0xff,  0x9c, 0x67, 0x4a, 0xff,  0x8e, 0x5d, 0x41, 0xff,
+  0x7d, 0x54, 0x3a, 0xff,  0x6a, 0x4b, 0x32, 0xff,  0x51, 0x39, 0x23, 0xff,
+  0x28, 0x20, 0x12, 0x77,  0x00, 0x00, 0x00, 0x12,  0x00, 0x00, 0x00, 0x01,
+  0x00, 0x00, 0x00, 0x03,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x6f, 0x4a, 0x37, 0x2a,  0x81, 0x54, 0x3d, 0xec,  0x8b, 0x5a, 0x41, 0xff,
+  0x8b, 0x5a, 0x3f, 0xff,  0x85, 0x56, 0x3c, 0xff,  0x7d, 0x52, 0x38, 0xff,
+  0x77, 0x51, 0x33, 0xff,  0x6f, 0x4e, 0x34, 0xff,  0x5f, 0x45, 0x2c, 0xff,
+  0x2e, 0x21, 0x14, 0xff,  0x00, 0x00, 0x00, 0xf8,  0x00, 0x00, 0x00, 0x92,
+  0x00, 0x00, 0x00, 0x0e,  0x00, 0x00, 0x00, 0x04,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x14,  0x11, 0x0b, 0x08, 0xb4,
+  0x50, 0x37, 0x25, 0xfe,  0x6d, 0x49, 0x2f, 0xff,  0x52, 0x37, 0x22, 0xff,
+  0x50, 0x37, 0x21, 0xff,  0x66, 0x45, 0x2b, 0xff,  0x60, 0x46, 0x2c, 0xff,
+  0x2d, 0x22, 0x16, 0xff,  0x00, 0x00, 0x00, 0xfe,  0x00, 0x00, 0x00, 0xd2,
+  0x00, 0x00, 0x00, 0x63,  0x00, 0x00, 0x00, 0x07,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x02,
+  0x00, 0x00, 0x00, 0x22,  0x00, 0x00, 0x00, 0x64,  0x09, 0x0a, 0x07, 0xa4,
+  0x00, 0x00, 0x00, 0xbd,  0x00, 0x00, 0x00, 0xbe,  0x00, 0x00, 0x00, 0xc4,
+  0x00, 0x00, 0x00, 0xb8,  0x00, 0x00, 0x00, 0x9d,  0x00, 0x00, 0x00, 0x6c,
+  0x00, 0x00, 0x00, 0x2c,  0x00, 0x00, 0x00, 0x07,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x01,
+  0x00, 0x00, 0x00, 0x05,  0x00, 0x00, 0x00, 0x0b,  0x00, 0x00, 0x00, 0x0d,
+  0x00, 0x00, 0x00, 0x0b,  0x00, 0x00, 0x00, 0x08,  0x00, 0x00, 0x00, 0x06,
+  0x00, 0x00, 0x00, 0x02,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00
+};
+
+
+static void
+dump_accels (gpointer             callback_data,
+            guint                callback_action,
+            GtkWidget           *widget)
+{
+  gtk_item_factory_dump_items (NULL, FALSE, gtk_item_factory_print_func, stdout);
+}
+    
 static GtkItemFactoryEntry menu_items[] =
 {
-  { "/_File",            NULL,         0,                     0, "<Branch>" },
-  { "/File/tearoff1",    NULL,         gtk_ifactory_cb,       0, "<Tearoff>" },
-  { "/File/_New",        "<control>N", gtk_ifactory_cb,       0 },
-  { "/File/_Open",       "<control>O", gtk_ifactory_cb,       0 },
-  { "/File/_Save",       "<control>S", gtk_ifactory_cb,       0 },
-  { "/File/Save _As...", NULL,         gtk_ifactory_cb,       0 },
-  { "/File/sep1",        NULL,         gtk_ifactory_cb,       0, "<Separator>" },
-  { "/File/_Quit",       "<control>Q", gtk_ifactory_cb,       0 },
+  { "/_File",                  NULL,         0,                     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>" },
@@ -2860,11 +3096,21 @@ static GtkItemFactoryEntry menu_items[] =
   { "/_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>", (gchar**) apple, sizeof(apple) },
+
+  /* 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
@@ -2937,6 +3183,8 @@ create_item_factory (void)
       GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
       gtk_widget_grab_default (button);
 
+      gtk_item_factory_delete_item (item_factory, "/Preferences/ShouldNotAppear");
+      
       gtk_widget_show_all (window);
     }
   else
@@ -2963,6 +3211,9 @@ cmw_color (GtkWidget *widget, GtkWidget *parent)
 
     csd=gtk_color_selection_dialog_new ("This is a modal color selection dialog");
 
+    gtk_color_selection_set_has_palette (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (csd)->colorsel),
+                                         TRUE);
+    
     /* Set as modal */
     gtk_window_set_modal (GTK_WINDOW(csd),TRUE);
 
@@ -3263,11 +3514,11 @@ create_scrolled_windows (void)
  */
 
 static void
-entry_toggle_editable (GtkWidget *checkbutton,
-                      GtkWidget *entry)
+entry_toggle_frame (GtkWidget *checkbutton,
+                    GtkWidget *entry)
 {
-   gtk_entry_set_editable(GTK_ENTRY(entry),
-                         GTK_TOGGLE_BUTTON(checkbutton)->active);
+   gtk_entry_set_has_frame (GTK_ENTRY(entry),
+                            GTK_TOGGLE_BUTTON(checkbutton)->active);
 }
 
 static void
@@ -3278,11 +3529,12 @@ entry_toggle_sensitive (GtkWidget *checkbutton,
 }
 
 static void
-entry_toggle_visibility (GtkWidget *checkbutton,
-                       GtkWidget *entry)
+entry_props_clicked (GtkWidget *button,
+                    GObject   *entry)
 {
-   gtk_entry_set_visibility(GTK_ENTRY(entry),
-                        GTK_TOGGLE_BUTTON(checkbutton)->active);
+  GtkWidget *window = create_prop_editor (entry, 0);
+
+  gtk_window_set_title (GTK_WINDOW (window), "Entry Properties");
 }
 
 static void
@@ -3291,7 +3543,8 @@ create_entry (void)
   static GtkWidget *window = NULL;
   GtkWidget *box1;
   GtkWidget *box2;
-  GtkWidget *editable_check;
+  GtkWidget *hbox;
+  GtkWidget *has_frame_check;
   GtkWidget *sensitive_check;
   GtkWidget *entry, *cb;
   GtkWidget *button;
@@ -3323,59 +3576,51 @@ create_entry (void)
 
       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);
 
+      hbox = gtk_hbox_new (FALSE, 5);
+      gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE, TRUE, 0);
+      
       entry = gtk_entry_new ();
       gtk_entry_set_text (GTK_ENTRY (entry), "hello world السلام عليكم");
       gtk_editable_select_region (GTK_EDITABLE (entry), 0, 5);
-      gtk_box_pack_start (GTK_BOX (box2), entry, TRUE, TRUE, 0);
-      gtk_widget_show (entry);
+      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+
+      button = gtk_button_new_with_mnemonic ("_Props");
+      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+      gtk_signal_connect (GTK_OBJECT (button), "clicked",
+                         GTK_SIGNAL_FUNC (entry_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");
+      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);
-      gtk_widget_show (cb);
-
-      editable_check = gtk_check_button_new_with_label("Editable");
-      gtk_box_pack_start (GTK_BOX (box2), editable_check, FALSE, TRUE, 0);
-      gtk_signal_connect (GTK_OBJECT(editable_check), "toggled",
-                         GTK_SIGNAL_FUNC(entry_toggle_editable), entry);
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(editable_check), TRUE);
-      gtk_widget_show (editable_check);
-
-      editable_check = gtk_check_button_new_with_label("Visible");
-      gtk_box_pack_start (GTK_BOX (box2), editable_check, FALSE, TRUE, 0);
-      gtk_signal_connect (GTK_OBJECT(editable_check), "toggled",
-                         GTK_SIGNAL_FUNC(entry_toggle_visibility), entry);
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(editable_check), TRUE);
-      gtk_widget_show (editable_check);
 
       sensitive_check = gtk_check_button_new_with_label("Sensitive");
       gtk_box_pack_start (GTK_BOX (box2), sensitive_check, FALSE, TRUE, 0);
       gtk_signal_connect (GTK_OBJECT(sensitive_check), "toggled",
                          GTK_SIGNAL_FUNC(entry_toggle_sensitive), entry);
       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sensitive_check), TRUE);
-      gtk_widget_show (sensitive_check);
 
+      has_frame_check = gtk_check_button_new_with_label("Has Frame");
+      gtk_box_pack_start (GTK_BOX (box2), has_frame_check, FALSE, TRUE, 0);
+      gtk_signal_connect (GTK_OBJECT(has_frame_check), "toggled",
+                         GTK_SIGNAL_FUNC(entry_toggle_frame), entry);
+      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(has_frame_check), TRUE);
+      
       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 ("close");
       gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
@@ -3384,45 +3629,207 @@ create_entry (void)
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
       GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
       gtk_widget_grab_default (button);
-      gtk_widget_show (button);
     }
 
   if (!GTK_WIDGET_VISIBLE (window))
-    gtk_widget_show (window);
+    gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);
 }
 
 /*
- * GtkSpinButton
+ * GtkSizeGroup
  */
 
-static GtkWidget *spinner1;
+#define SIZE_GROUP_INITIAL_SIZE 50
 
 static void
-toggle_snap (GtkWidget *widget, GtkSpinButton *spin)
+size_group_hsize_changed (GtkSpinButton *spin_button,
+                         GtkWidget     *button)
 {
-  gtk_spin_button_set_snap_to_ticks (spin, GTK_TOGGLE_BUTTON (widget)->active);
+  gtk_widget_set_usize (GTK_BIN (button)->child,
+                       gtk_spin_button_get_value_as_int (spin_button),
+                       -2);
 }
 
 static void
-toggle_numeric (GtkWidget *widget, GtkSpinButton *spin)
+size_group_vsize_changed (GtkSpinButton *spin_button,
+                         GtkWidget     *button)
 {
-  gtk_spin_button_set_numeric (spin, GTK_TOGGLE_BUTTON (widget)->active);
+  gtk_widget_set_usize (GTK_BIN (button)->child,
+                       -2,
+                       gtk_spin_button_get_value_as_int (spin_button));
 }
 
-static void
-change_digits (GtkWidget *widget, GtkSpinButton *spin)
+static GtkWidget *
+create_size_group_window (GtkSizeGroup *master_size_group)
 {
-  gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinner1),
-                             gtk_spin_button_get_value_as_int (spin));
+  GtkWidget *window;
+  GtkWidget *table;
+  GtkWidget *main_button;
+  GtkWidget *button;
+  GtkWidget *spin_button;
+  GtkWidget *hbox;
+  GtkSizeGroup *hgroup1;
+  GtkSizeGroup *hgroup2;
+  GtkSizeGroup *vgroup1;
+  GtkSizeGroup *vgroup2;
+
+  window = gtk_dialog_new_with_buttons ("GtkSizeGroup",
+                                       NULL, 0,
+                                       GTK_STOCK_BUTTON_CLOSE,
+                                       GTK_RESPONSE_NONE,
+                                       NULL);
+
+  gtk_window_set_resizeable (GTK_WINDOW (window), FALSE);
+
+  gtk_signal_connect (GTK_OBJECT (window), "response",
+                     GTK_SIGNAL_FUNC (gtk_widget_destroy),
+                     NULL);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), table, TRUE, TRUE, 0);
+
+  gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 5);
+  gtk_widget_set_usize (table, 250, 250);
+
+  hgroup1 = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+  hgroup2 = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+  vgroup1 = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
+  vgroup2 = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
+
+  main_button = gtk_button_new_with_label ("X");
+  
+  gtk_table_attach (GTK_TABLE (table), main_button,
+                   0, 1,       0, 1,
+                   GTK_EXPAND, GTK_EXPAND,
+                   0,          0);
+  gtk_size_group_add_widget (master_size_group, main_button);
+  gtk_size_group_add_widget (hgroup1, main_button);
+  gtk_size_group_add_widget (vgroup1, main_button);
+  gtk_widget_set_usize (GTK_BIN (main_button)->child, SIZE_GROUP_INITIAL_SIZE, SIZE_GROUP_INITIAL_SIZE);
+
+  button = gtk_button_new ();
+  gtk_table_attach (GTK_TABLE (table), button,
+                   1, 2,       0, 1,
+                   GTK_EXPAND, GTK_EXPAND,
+                   0,          0);
+  gtk_size_group_add_widget (vgroup1, button);
+  gtk_size_group_add_widget (vgroup2, button);
+
+  button = gtk_button_new ();
+  gtk_table_attach (GTK_TABLE (table), button,
+                   0, 1,       1, 2,
+                   GTK_EXPAND, GTK_EXPAND,
+                   0,          0);
+  gtk_size_group_add_widget (hgroup1, button);
+  gtk_size_group_add_widget (hgroup2, button);
+
+  button = gtk_button_new ();
+  gtk_table_attach (GTK_TABLE (table), button,
+                   1, 2,       1, 2,
+                   GTK_EXPAND, GTK_EXPAND,
+                   0,          0);
+  gtk_size_group_add_widget (hgroup2, button);
+  gtk_size_group_add_widget (vgroup2, button);
+
+  g_object_unref (G_OBJECT (hgroup1));
+  g_object_unref (G_OBJECT (hgroup2));
+  g_object_unref (G_OBJECT (vgroup1));
+  g_object_unref (G_OBJECT (vgroup2));
+  
+  hbox = gtk_hbox_new (FALSE, 5);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), hbox, FALSE, FALSE, 0);
+  
+  spin_button = gtk_spin_button_new_with_range (1, 100, 1);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin_button), SIZE_GROUP_INITIAL_SIZE);
+  gtk_box_pack_start (GTK_BOX (hbox), spin_button, TRUE, TRUE, 0);
+  gtk_signal_connect (GTK_OBJECT (spin_button), "value_changed",
+                     GTK_SIGNAL_FUNC (size_group_hsize_changed), main_button);
+
+  spin_button = gtk_spin_button_new_with_range (1, 100, 1);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin_button), SIZE_GROUP_INITIAL_SIZE);
+  gtk_box_pack_start (GTK_BOX (hbox), spin_button, TRUE, TRUE, 0);
+  gtk_signal_connect (GTK_OBJECT (spin_button), "value_changed",
+                     GTK_SIGNAL_FUNC (size_group_vsize_changed), main_button);
+
+  return window;
 }
 
 static void
-get_value (GtkWidget *widget, gpointer data)
+create_size_groups (void)
 {
-  gchar buf[32];
-  GtkLabel *label;
+  static GtkWidget *window1 = NULL;
+  static GtkWidget *window2 = NULL;
+  static GtkSizeGroup *master_size_group;
+
+  if (!master_size_group)
+    master_size_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH);
+  
+  if (!window1)
+    {
+      window1 = create_size_group_window (master_size_group);
+
+      gtk_signal_connect (GTK_OBJECT (window1), "destroy",
+                         GTK_SIGNAL_FUNC (gtk_widget_destroyed),
+                         &window1);
+    }
+
+  if (!window2)
+    {
+      window2 = create_size_group_window (master_size_group);
+
+      gtk_signal_connect (GTK_OBJECT (window2), "destroy",
+                         GTK_SIGNAL_FUNC (gtk_widget_destroyed),
+                         &window2);
+    }
+
+  if (GTK_WIDGET_VISIBLE (window1) && GTK_WIDGET_VISIBLE (window2))
+    {
+      gtk_widget_destroy (window1);
+      gtk_widget_destroy (window2);
+    }
+  else
+    {
+      if (!GTK_WIDGET_VISIBLE (window1))
+       gtk_widget_show_all (window1);
+      if (!GTK_WIDGET_VISIBLE (window2))
+       gtk_widget_show_all (window2);
+    }
+}
+
+/*
+ * GtkSpinButton
+ */
+
+static GtkWidget *spinner1;
+
+static void
+toggle_snap (GtkWidget *widget, GtkSpinButton *spin)
+{
+  gtk_spin_button_set_snap_to_ticks (spin, GTK_TOGGLE_BUTTON (widget)->active);
+}
+
+static void
+toggle_numeric (GtkWidget *widget, GtkSpinButton *spin)
+{
+  gtk_spin_button_set_numeric (spin, GTK_TOGGLE_BUTTON (widget)->active);
+}
+
+static void
+change_digits (GtkWidget *widget, GtkSpinButton *spin)
+{
+  gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinner1),
+                             gtk_spin_button_get_value_as_int (spin));
+}
+
+static void
+get_value (GtkWidget *widget, gpointer data)
+{
+  gchar buf[32];
+  GtkLabel *label;
   GtkSpinButton *spin;
 
   spin = GTK_SPIN_BUTTON (spinner1);
@@ -3435,12 +3842,29 @@ get_value (GtkWidget *widget, gpointer data)
   gtk_label_set_text (label, buf);
 }
 
+static void
+get_spin_value (GtkWidget *widget, gpointer data)
+{
+  gchar *buffer;
+  GtkLabel *label;
+  GtkSpinButton *spin;
+
+  spin = GTK_SPIN_BUTTON (widget);
+  label = GTK_LABEL (data);
+
+  buffer = g_strdup_printf ("%0.*f", spin->digits,
+                           gtk_spin_button_get_value_as_float (spin));
+  gtk_label_set_text (label, buffer);
+
+  g_free (buffer);
+}
+
 static gint
 spin_button_time_output_func (GtkSpinButton *spin_button)
 {
   static gchar buf[6];
-  gfloat hours;
-  gfloat minutes;
+  gdouble hours;
+  gdouble minutes;
 
   hours = spin_button->adjustment->value / 60.0;
   minutes = (fabs(floor (hours) - hours) < 1e-5) ? 0.0 : 30;
@@ -3452,7 +3876,7 @@ spin_button_time_output_func (GtkSpinButton *spin_button)
 
 static gint
 spin_button_month_input_func (GtkSpinButton *spin_button,
-                             gfloat        *new_val)
+                             gdouble       *new_val)
 {
   gint i;
   static gchar *month[12] = { "January", "February", "March", "April",
@@ -3479,7 +3903,7 @@ spin_button_month_input_func (GtkSpinButton *spin_button,
       *new_val = 0.0;
       return GTK_INPUT_ERROR;
     }
-  *new_val = (gfloat) i;
+  *new_val = (gdouble) i;
   return TRUE;
 }
 
@@ -3502,14 +3926,14 @@ spin_button_month_output_func (GtkSpinButton *spin_button)
 
 static gint
 spin_button_hex_input_func (GtkSpinButton *spin_button,
-                           gfloat        *new_val)
+                           gdouble       *new_val)
 {
-  gchar *buf;
+  const gchar *buf;
   gchar *err;
-  gfloat res;
+  gdouble res;
 
   buf = gtk_entry_get_text (GTK_ENTRY (spin_button));
-  res = (gfloat)(strtol(buf, &err, 16));
+  res = strtol(buf, &err, 16);
   *new_val = res;
   if (*err)
     return GTK_INPUT_ERROR;
@@ -3650,7 +4074,7 @@ create_spins (void)
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
       
       vbox2 = gtk_vbox_new (FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 5);
       
       label = gtk_label_new ("Value :");
       gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -3660,11 +4084,10 @@ create_spins (void)
                                                  0.5, 100.0, 0.0);
       spinner1 = gtk_spin_button_new (adj, 1.0, 2);
       gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
-      gtk_widget_set_usize (spinner1, 100, 0);
       gtk_box_pack_start (GTK_BOX (vbox2), spinner1, FALSE, TRUE, 0);
 
       vbox2 = gtk_vbox_new (FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 5);
 
       label = gtk_label_new ("Digits :");
       gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -3678,7 +4101,7 @@ create_spins (void)
       gtk_box_pack_start (GTK_BOX (vbox2), spinner2, FALSE, TRUE, 0);
 
       hbox = gtk_hbox_new (FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 5);
 
       button = gtk_check_button_new_with_label ("Snap to 0.5-ticks");
       gtk_signal_connect (GTK_OBJECT (button), "clicked",
@@ -3716,6 +4139,22 @@ create_spins (void)
       gtk_box_pack_start (GTK_BOX (vbox), val_label, TRUE, TRUE, 0);
       gtk_label_set_text (GTK_LABEL (val_label), "0");
 
+      frame = gtk_frame_new ("Using Convenience Constructor");
+      gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
+  
+      hbox = gtk_hbox_new (FALSE, 0);
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+      gtk_container_add (GTK_CONTAINER (frame), hbox);
+      
+      val_label = gtk_label_new ("0.0");
+
+      spinner = gtk_spin_button_new_with_range (0.0, 10.0, 0.009);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (spinner), 0.0);
+      gtk_signal_connect (GTK_OBJECT (spinner), "value_changed",
+                         GTK_SIGNAL_FUNC (get_spin_value), val_label);
+      gtk_box_pack_start (GTK_BOX (hbox), spinner, TRUE, TRUE, 5);
+      gtk_box_pack_start (GTK_BOX (hbox), val_label, TRUE, TRUE, 5);
+
       hbox = gtk_hbox_new (FALSE, 0);
       gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
   
@@ -3798,7 +4237,7 @@ set_cursor (GtkWidget *spinner,
   c &= 0xfe;
 
   label = gtk_object_get_user_data (GTK_OBJECT (spinner));
-  vals = gtk_type_enum_get_values (GTK_TYPE_GDK_CURSOR_TYPE);
+  vals = gtk_type_enum_get_values (GDK_TYPE_CURSOR_TYPE);
   while (vals && vals->value != c)
     vals++;
   if (vals)
@@ -4048,10 +4487,10 @@ create_list (void)
 
   static OptionMenuItem items[] =
   {
-    { "Single",   list_toggle_sel_mode },
-    { "Browse",   list_toggle_sel_mode },
-    { "Multiple", list_toggle_sel_mode },
-    { "Extended", list_toggle_sel_mode }
+    { "Single",   GTK_SIGNAL_FUNC (list_toggle_sel_mode) },
+    { "Browse",   GTK_SIGNAL_FUNC (list_toggle_sel_mode) },
+    { "Multiple", GTK_SIGNAL_FUNC (list_toggle_sel_mode) },
+    { "Extended", GTK_SIGNAL_FUNC (list_toggle_sel_mode) }
   };
 
   if (!window)
@@ -4538,10 +4977,10 @@ create_clist (void)
 
   static OptionMenuItem items[] =
   {
-    { "Single",   clist_toggle_sel_mode },
-    { "Browse",   clist_toggle_sel_mode },
-    { "Multiple", clist_toggle_sel_mode },
-    { "Extended", clist_toggle_sel_mode }
+    { "Single",   GTK_SIGNAL_FUNC (clist_toggle_sel_mode) },
+    { "Browse",   GTK_SIGNAL_FUNC (clist_toggle_sel_mode) },
+    { "Multiple", GTK_SIGNAL_FUNC (clist_toggle_sel_mode) },
+    { "Extended", GTK_SIGNAL_FUNC (clist_toggle_sel_mode) }
   };
 
   char text[TESTGTK_CLIST_COLUMNS][50];
@@ -4718,6 +5157,8 @@ create_clist (void)
            }
        }
 
+      gtk_style_unref (style);
+      
       separator = gtk_hseparator_new ();
       gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, TRUE, 0);
 
@@ -5323,32 +5764,32 @@ void create_ctree (void)
 
   static OptionMenuItem items1[] =
   {
-    { "No lines", ctree_toggle_line_style },
-    { "Solid",    ctree_toggle_line_style },
-    { "Dotted",   ctree_toggle_line_style },
-    { "Tabbed",   ctree_toggle_line_style }
+    { "No lines", GTK_SIGNAL_FUNC (ctree_toggle_line_style) },
+    { "Solid",    GTK_SIGNAL_FUNC (ctree_toggle_line_style) },
+    { "Dotted",   GTK_SIGNAL_FUNC (ctree_toggle_line_style) },
+    { "Tabbed",   GTK_SIGNAL_FUNC (ctree_toggle_line_style) }
   };
 
   static OptionMenuItem items2[] =
   {
-    { "None",     ctree_toggle_expander_style },
-    { "Square",   ctree_toggle_expander_style },
-    { "Triangle", ctree_toggle_expander_style },
-    { "Circular", ctree_toggle_expander_style }
+    { "None",     GTK_SIGNAL_FUNC (ctree_toggle_expander_style) },
+    { "Square",   GTK_SIGNAL_FUNC (ctree_toggle_expander_style) },
+    { "Triangle", GTK_SIGNAL_FUNC (ctree_toggle_expander_style) },
+    { "Circular", GTK_SIGNAL_FUNC (ctree_toggle_expander_style) }
   };
 
   static OptionMenuItem items3[] =
   {
-    { "Left",  ctree_toggle_justify },
-    { "Right", ctree_toggle_justify }
+    { "Left",  GTK_SIGNAL_FUNC (ctree_toggle_justify) },
+    { "Right", GTK_SIGNAL_FUNC (ctree_toggle_justify) }
   };
 
   static OptionMenuItem items4[] =
   {
-    { "Single",   ctree_toggle_sel_mode },
-    { "Browse",   ctree_toggle_sel_mode },
-    { "Multiple", ctree_toggle_sel_mode },
-    { "Extended", ctree_toggle_sel_mode }
+    { "Single",   GTK_SIGNAL_FUNC (ctree_toggle_sel_mode) },
+    { "Browse",   GTK_SIGNAL_FUNC (ctree_toggle_sel_mode) },
+    { "Multiple", GTK_SIGNAL_FUNC (ctree_toggle_sel_mode) },
+    { "Extended", GTK_SIGNAL_FUNC (ctree_toggle_sel_mode) }
   };
 
   if (!window)
@@ -5688,8 +6129,8 @@ opacity_toggled_cb (GtkWidget *w,
   GtkColorSelection *colorsel;
 
   colorsel = GTK_COLOR_SELECTION (cs->colorsel);
-  gtk_color_selection_set_use_opacity (colorsel,
-                                      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)));
+  gtk_color_selection_set_has_opacity_control (colorsel,
+                                              gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)));
 }
 
 static void
@@ -5699,7 +6140,7 @@ palette_toggled_cb (GtkWidget *w,
   GtkColorSelection *colorsel;
 
   colorsel = GTK_COLOR_SELECTION (cs->colorsel);
-  gtk_color_selection_set_use_palette (colorsel,
+  gtk_color_selection_set_has_palette (colorsel,
                                       gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)));
 }
 
@@ -5862,7 +6303,7 @@ create_flipping (void)
        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
 
       gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
-                         flipping_toggled_cb, FALSE);
+                         GTK_SIGNAL_FUNC (flipping_toggled_cb), FALSE);
 
       gtk_container_set_border_width (GTK_CONTAINER (check_button), 10);
       
@@ -5879,6 +6320,114 @@ create_flipping (void)
     gtk_widget_destroy (window);
 }
 
+/*
+ * Focus test
+ */
+
+static GtkWidget*
+make_focus_table (GList **list)
+{
+  GtkWidget *table;
+  gint i, j;
+  
+  table = gtk_table_new (5, 5, FALSE);
+
+  i = 0;
+  j = 0;
+
+  while (i < 5)
+    {
+      j = 0;
+      while (j < 5)
+        {
+          GtkWidget *widget;
+          
+          if ((i + j) % 2)
+            widget = gtk_entry_new ();
+          else
+            widget = gtk_button_new_with_label ("Foo");
+
+          *list = g_list_prepend (*list, widget);
+          
+          gtk_table_attach (GTK_TABLE (table),
+                            widget,
+                            i, i + 1,
+                            j, j + 1,
+                            GTK_EXPAND | GTK_FILL,
+                            GTK_EXPAND | GTK_FILL,
+                            5, 5);
+          
+          ++j;
+        }
+
+      ++i;
+    }
+
+  *list = g_list_reverse (*list);
+  
+  return table;
+}
+
+static void
+create_focus (void)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkWidget *table;
+      GtkWidget *frame;
+      GList *list = NULL;
+      
+      window = gtk_dialog_new_with_buttons ("Keyboard focus navigation",
+                                            NULL, 0,
+                                            GTK_STOCK_BUTTON_CLOSE,
+                                            GTK_RESPONSE_NONE,
+                                            NULL);
+
+      gtk_signal_connect (GTK_OBJECT (window), "destroy",
+                         GTK_SIGNAL_FUNC (gtk_widget_destroyed),
+                         &window);
+
+      gtk_signal_connect (GTK_OBJECT (window), "response",
+                          GTK_SIGNAL_FUNC (gtk_widget_destroy),
+                          NULL);
+      
+      gtk_window_set_title (GTK_WINDOW (window), "Keyboard Focus Navigation");
+
+      frame = gtk_frame_new ("Weird tab focus chain");
+
+      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), 
+                         frame, TRUE, TRUE, 0);
+      
+      table = make_focus_table (&list);
+
+      gtk_container_add (GTK_CONTAINER (frame), table);
+
+      gtk_container_set_focus_chain (GTK_CONTAINER (table),
+                                     list);
+
+      g_list_free (list);
+      
+      frame = gtk_frame_new ("Default tab focus chain");
+
+      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), 
+                         frame, TRUE, TRUE, 0);
+
+      list = NULL;
+      table = make_focus_table (&list);
+
+      g_list_free (list);
+      
+      gtk_container_add (GTK_CONTAINER (frame), table);      
+    }
+  
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show_all (window);
+  else
+    gtk_widget_destroy (window);
+}
+
 /*
  * GtkFontSelection
  */
@@ -5949,6 +6498,22 @@ label_toggle (GtkWidget  *widget,
     gtk_widget_destroy (*label);
 }
 
+#define RESPONSE_TOGGLE_SEPARATOR 1
+
+static void
+print_response (GtkWidget *dialog,
+                gint       response_id,
+                gpointer   data)
+{
+  g_print ("response signal received (%d)\n", response_id);
+
+  if (response_id == RESPONSE_TOGGLE_SEPARATOR)
+    {
+      gtk_dialog_set_has_separator (GTK_DIALOG (dialog),
+                                    !gtk_dialog_get_has_separator (GTK_DIALOG (dialog)));
+    }
+}
+
 static void
 create_dialog (void)
 {
@@ -5957,15 +6522,24 @@ create_dialog (void)
 
   if (!dialog_window)
     {
+      /* This is a terrible example; it's much simpler to create
+       * dialogs than this. Don't use testgtk for example code,
+       * use gtk-demo ;-)
+       */
+      
       dialog_window = gtk_dialog_new ();
 
+      gtk_signal_connect (GTK_OBJECT (dialog_window),
+                          "response",
+                          GTK_SIGNAL_FUNC (print_response),
+                          NULL);
+      
       gtk_signal_connect (GTK_OBJECT (dialog_window), "destroy",
                          GTK_SIGNAL_FUNC(gtk_widget_destroyed),
                          &dialog_window);
 
       gtk_window_set_title (GTK_WINDOW (dialog_window), "GtkDialog");
       gtk_container_set_border_width (GTK_CONTAINER (dialog_window), 0);
-      gtk_widget_set_usize (dialog_window, 200, 110);
 
       button = gtk_button_new_with_label ("OK");
       GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
@@ -5984,6 +6558,15 @@ create_dialog (void)
       gtk_widget_show (button);
 
       label = NULL;
+      
+      button = gtk_button_new_with_label ("Separator");
+
+      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+
+      gtk_dialog_add_action_widget (GTK_DIALOG (dialog_window),
+                                    button,
+                                    RESPONSE_TOGGLE_SEPARATOR);
+      gtk_widget_show (button);
     }
 
   if (!GTK_WIDGET_VISIBLE (dialog_window))
@@ -5998,15 +6581,14 @@ static gboolean event_watcher_enter_id = 0;
 static gboolean event_watcher_leave_id = 0;
 
 static gboolean
-event_watcher (GtkObject      *object,
-              guint           signal_id,
-              guint           n_params,
-              GtkArg         *params,
-              gpointer        data)
+event_watcher (GSignalInvocationHint *ihint,
+              guint                  n_param_values,
+              const GValue          *param_values,
+              gpointer               data)
 {
   g_print ("Watch: \"%s\" emitted for %s\n",
-          gtk_signal_name (signal_id),
-          gtk_type_name (GTK_OBJECT_TYPE (object)));
+          gtk_signal_name (ihint->signal_id),
+          gtk_type_name (GTK_OBJECT_TYPE (g_value_get_object (param_values + 0))));
 
   return TRUE;
 }
@@ -6019,10 +6601,10 @@ event_watcher_down (void)
       guint signal_id;
 
       signal_id = gtk_signal_lookup ("enter_notify_event", GTK_TYPE_WIDGET);
-      gtk_signal_remove_emission_hook (signal_id, event_watcher_enter_id);
+      g_signal_remove_emission_hook (signal_id, event_watcher_enter_id);
       event_watcher_enter_id = 0;
       signal_id = gtk_signal_lookup ("leave_notify_event", GTK_TYPE_WIDGET);
-      gtk_signal_remove_emission_hook (signal_id, event_watcher_leave_id);
+      g_signal_remove_emission_hook (signal_id, event_watcher_leave_id);
       event_watcher_leave_id = 0;
     }
 }
@@ -6037,9 +6619,9 @@ event_watcher_toggle (void)
       guint signal_id;
 
       signal_id = gtk_signal_lookup ("enter_notify_event", GTK_TYPE_WIDGET);
-      event_watcher_enter_id = gtk_signal_add_emission_hook (signal_id, event_watcher, NULL);
+      event_watcher_enter_id = g_signal_add_emission_hook (signal_id, 0, event_watcher, NULL, NULL);
       signal_id = gtk_signal_lookup ("leave_notify_event", GTK_TYPE_WIDGET);
-      event_watcher_leave_id = gtk_signal_add_emission_hook (signal_id, event_watcher, NULL);
+      event_watcher_leave_id = g_signal_add_emission_hook (signal_id, 0, event_watcher, NULL, NULL);
     }
 }
 
@@ -6094,6 +6676,13 @@ create_event_watcher (void)
  * GtkRange
  */
 
+static gchar*
+reformat_value (GtkScale *scale,
+                gdouble   value)
+{
+  return g_strdup_printf ("-->%g<--", value);
+}
+
 static void
 create_range_controls (void)
 {
@@ -6105,6 +6694,7 @@ create_range_controls (void)
   GtkWidget *scale;
   GtkWidget *separator;
   GtkObject *adjustment;
+  GtkWidget *hbox;
 
   if (!window)
     {
@@ -6145,7 +6735,45 @@ create_range_controls (void)
       gtk_box_pack_start (GTK_BOX (box2), scrollbar, TRUE, TRUE, 0);
       gtk_widget_show (scrollbar);
 
+      scale = gtk_hscale_new (GTK_ADJUSTMENT (adjustment));
+      gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE);
+      gtk_signal_connect (GTK_OBJECT (scale),
+                          "format_value",
+                          GTK_SIGNAL_FUNC (reformat_value),
+                          NULL);
+      gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE, 0);
+      gtk_widget_show (scale);
+      
+      hbox = gtk_hbox_new (FALSE, 0);
+
+      scale = gtk_vscale_new (GTK_ADJUSTMENT (adjustment));
+      gtk_widget_set_usize (scale, -1, 200);
+      gtk_scale_set_digits (GTK_SCALE (scale), 2);
+      gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
+      gtk_widget_show (scale);
+
+      scale = gtk_vscale_new (GTK_ADJUSTMENT (adjustment));
+      gtk_widget_set_usize (scale, -1, 200);
+      gtk_scale_set_digits (GTK_SCALE (scale), 2);
+      gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE);
+      gtk_range_set_inverted (GTK_RANGE (scale), TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
+      gtk_widget_show (scale);
+
+      scale = gtk_vscale_new (GTK_ADJUSTMENT (adjustment));
+      gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE);
+      gtk_signal_connect (GTK_OBJECT (scale),
+                          "format_value",
+                          GTK_SIGNAL_FUNC (reformat_value),
+                          NULL);
+      gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
+      gtk_widget_show (scale);
 
+      
+      gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE, TRUE, 0);
+      gtk_widget_show (hbox);
+      
       separator = gtk_hseparator_new ();
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
       gtk_widget_show (separator);
@@ -6454,31 +7082,34 @@ GdkBitmap *book_closed_mask;
 GtkWidget *sample_notebook;
 
 static void
-page_switch (GtkWidget *widget, GtkNotebookPage *page, gint page_num)
+set_page_pixmaps (GtkNotebook *notebook, gint page_num,
+                 GdkPixmap *pixmap, GdkPixmap *mask)
 {
-  GtkNotebookPage *oldpage;
+  GtkWidget *page_widget;
   GtkWidget *pixwid;
 
-  oldpage = GTK_NOTEBOOK (widget)->cur_page;
+  page_widget = gtk_notebook_get_nth_page (notebook, page_num);
+
+  pixwid = gtk_object_get_data (GTK_OBJECT (page_widget), "tab_pixmap");
+  gtk_pixmap_set (GTK_PIXMAP (pixwid), pixmap, mask);
+  
+  pixwid = gtk_object_get_data (GTK_OBJECT (page_widget), "menu_pixmap");
+  gtk_pixmap_set (GTK_PIXMAP (pixwid), pixmap, mask);
+}
 
-  if (page == oldpage)
+static void
+page_switch (GtkWidget *widget, GtkNotebookPage *page, gint page_num)
+{
+  GtkNotebook *notebook = GTK_NOTEBOOK (widget);
+  gint old_page_num = gtk_notebook_get_current_page (notebook);
+  if (page_num == old_page_num)
     return;
-  pixwid = ((GtkBoxChild*)
-           (GTK_BOX (page->tab_label)->children->data))->widget;
-  gtk_pixmap_set (GTK_PIXMAP (pixwid), book_open, book_open_mask);
-  pixwid = ((GtkBoxChild*)
-           (GTK_BOX (page->menu_label)->children->data))->widget;
-  gtk_pixmap_set (GTK_PIXMAP (pixwid), book_open, book_open_mask);
 
-  if (oldpage)
-    {
-      pixwid = ((GtkBoxChild*)
-               (GTK_BOX (oldpage->tab_label)->children->data))->widget;
-      gtk_pixmap_set (GTK_PIXMAP (pixwid), book_closed, book_closed_mask);
-      pixwid = ((GtkBoxChild*)
-               (GTK_BOX (oldpage->menu_label)->children->data))->widget;
-      gtk_pixmap_set (GTK_PIXMAP (pixwid), book_closed, book_closed_mask);
-    }
+  set_page_pixmaps (notebook, page_num, book_open, book_open_mask);
+
+  if (old_page_num != -1)
+    set_page_pixmaps (notebook, old_page_num, book_closed, book_closed_mask);
 }
 
 static void
@@ -6531,10 +7162,12 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
   GtkWidget *pixwid;
   gint i;
   char buffer[32];
+  char accel_buffer[32];
 
   for (i = start; i <= end; i++)
     {
       sprintf (buffer, "Page %d", i);
+      sprintf (accel_buffer, "Page _%d", i);
 
       child = gtk_frame_new (buffer);
       gtk_container_set_border_width (GTK_CONTAINER (child), 10);
@@ -6572,19 +7205,25 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
 
       label_box = gtk_hbox_new (FALSE, 0);
       pixwid = gtk_pixmap_new (book_closed, book_closed_mask);
+      gtk_object_set_data (GTK_OBJECT (child), "tab_pixmap", pixwid);
+                          
       gtk_box_pack_start (GTK_BOX (label_box), pixwid, FALSE, TRUE, 0);
       gtk_misc_set_padding (GTK_MISC (pixwid), 3, 1);
-      label = gtk_label_new (buffer);
+      label = gtk_label_new_with_mnemonic (accel_buffer);
       gtk_box_pack_start (GTK_BOX (label_box), label, FALSE, TRUE, 0);
       gtk_widget_show_all (label_box);
-
+      
+                                      
       menu_box = gtk_hbox_new (FALSE, 0);
       pixwid = gtk_pixmap_new (book_closed, book_closed_mask);
+      gtk_object_set_data (GTK_OBJECT (child), "menu_pixmap", pixwid);
+      
       gtk_box_pack_start (GTK_BOX (menu_box), pixwid, FALSE, TRUE, 0);
       gtk_misc_set_padding (GTK_MISC (pixwid), 3, 1);
       label = gtk_label_new (buffer);
       gtk_box_pack_start (GTK_BOX (menu_box), label, FALSE, TRUE, 0);
       gtk_widget_show_all (menu_box);
+
       gtk_notebook_append_page_menu (notebook, child, label_box, menu_box);
     }
 }
@@ -6611,6 +7250,7 @@ standard_notebook (GtkButton   *button,
   gint i;
 
   gtk_notebook_set_show_tabs (notebook, TRUE);
+  gtk_notebook_set_show_border (notebook, TRUE);
   gtk_notebook_set_scrollable (notebook, FALSE);
   if (g_list_length (notebook->children) == 15)
     for (i = 0; i < 10; i++)
@@ -6624,6 +7264,20 @@ notabs_notebook (GtkButton   *button,
   gint i;
 
   gtk_notebook_set_show_tabs (notebook, FALSE);
+  gtk_notebook_set_show_border (notebook, TRUE);
+  if (g_list_length (notebook->children) == 15)
+    for (i = 0; i < 10; i++)
+      gtk_notebook_remove_page (notebook, 5);
+}
+
+static void
+borderless_notebook (GtkButton   *button,
+                    GtkNotebook *notebook)
+{
+  gint i;
+
+  gtk_notebook_set_show_tabs (notebook, FALSE);
+  gtk_notebook_set_show_border (notebook, FALSE);
   if (g_list_length (notebook->children) == 15)
     for (i = 0; i < 10; i++)
       gtk_notebook_remove_page (notebook, 5);
@@ -6634,6 +7288,7 @@ scrollable_notebook (GtkButton   *button,
                      GtkNotebook *notebook)
 {
   gtk_notebook_set_show_tabs (notebook, TRUE);
+  gtk_notebook_set_show_border (notebook, TRUE);
   gtk_notebook_set_scrollable (notebook, TRUE);
   if (g_list_length (notebook->children) == 5)
     create_pages (notebook, 6, 15);
@@ -6670,9 +7325,10 @@ create_notebook (void)
 
   static OptionMenuItem items[] =
   {
-    { "Standard",   standard_notebook },
-    { "No tabs",    notabs_notebook },
-    { "Scrollable", scrollable_notebook }
+    { "Standard",   GTK_SIGNAL_FUNC (standard_notebook) },
+    { "No tabs",    GTK_SIGNAL_FUNC (notabs_notebook) },
+    { "Borderless", GTK_SIGNAL_FUNC (borderless_notebook) },
+    { "Scrollable", GTK_SIGNAL_FUNC (scrollable_notebook) },
   };
 
   if (!window)
@@ -6736,7 +7392,7 @@ create_notebook (void)
       label = gtk_label_new ("Notebook Style :");
       gtk_box_pack_start (GTK_BOX (box2), label, FALSE, TRUE, 0);
 
-      omenu = build_option_menu (items, 3, 0, sample_notebook);
+      omenu = build_option_menu (items, G_N_ELEMENTS (items), 0, sample_notebook);
       gtk_box_pack_start (GTK_BOX (box2), omenu, FALSE, TRUE, 0);
 
       button = gtk_button_new_with_label ("Show all Pages");
@@ -6826,8 +7482,17 @@ toggle_shrink (GtkWidget *widget, GtkWidget *child)
   gtk_widget_unref (child);
 }
 
+static void
+paned_props_clicked (GtkWidget *button,
+                    GObject   *paned)
+{
+  GtkWidget *window = create_prop_editor (paned, GTK_TYPE_PANED);
+
+  gtk_window_set_title (GTK_WINDOW (window), "Paned Properties");
+}
+
 GtkWidget *
-create_pane_options (GtkPaned *paned,
+create_pane_options (GtkPaned    *paned,
                     const gchar *frame_label,
                     const gchar *label1,
                     const gchar *label2)
@@ -6835,12 +7500,13 @@ create_pane_options (GtkPaned *paned,
   GtkWidget *frame;
   GtkWidget *table;
   GtkWidget *label;
+  GtkWidget *button;
   GtkWidget *check_button;
   
   frame = gtk_frame_new (frame_label);
   gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
   
-  table = gtk_table_new (3, 2, 4);
+  table = gtk_table_new (4, 2, 4);
   gtk_container_add (GTK_CONTAINER (frame), table);
   
   label = gtk_label_new (label1);
@@ -6885,6 +7551,13 @@ create_pane_options (GtkPaned *paned,
                      GTK_SIGNAL_FUNC (toggle_shrink),
                      paned->child2);
 
+  button = gtk_button_new_with_mnemonic ("_Properties");
+  gtk_table_attach_defaults (GTK_TABLE (table), button,
+                            0, 2, 3, 4);
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+                     GTK_SIGNAL_FUNC (paned_props_clicked),
+                     paned);
+
   return frame;
 }
 
@@ -6993,7 +7666,7 @@ dnd_drop (GtkWidget *button, GdkEvent *event)
   if (window)
     return;
 
-  window = gtk_window_new(GTK_WINDOW_DIALOG);
+  window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_container_set_border_width (GTK_CONTAINER(window), 10);
 
   gtk_signal_connect (GTK_OBJECT (window), "destroy",
@@ -7318,7 +7991,8 @@ create_shapes (void)
   static GtkWidget *modeller = NULL;
   static GtkWidget *sheets = NULL;
   static GtkWidget *rings = NULL;
-
+  static GtkWidget *with_region = NULL;
+  
   if (!(file_exists ("Modeller.xpm") &&
        file_exists ("FilesQueue.xpm") &&
        file_exists ("3DRings.xpm")))
@@ -7361,6 +8035,50 @@ create_shapes (void)
     }
   else
     gtk_widget_destroy (rings);
+
+  if (!with_region)
+    {
+      GdkRegion *region;
+      gint x, y;
+      
+      with_region = shape_create_icon ("3DRings.xpm",
+                                       460, 270, 25,25, GTK_WINDOW_TOPLEVEL);
+
+      gtk_window_set_decorated (GTK_WINDOW (with_region), FALSE);
+      
+      gtk_signal_connect (GTK_OBJECT (with_region), "destroy",
+                         GTK_SIGNAL_FUNC(gtk_widget_destroyed),
+                         &with_region);
+
+      /* reset shape from mask to a region */
+      x = 0;
+      y = 0;
+      region = gdk_region_new ();
+
+      while (x < 460)
+        {
+          while (y < 270)
+            {
+              GdkRectangle rect;
+              rect.x = x;
+              rect.y = y;
+              rect.width = 10;
+              rect.height = 10;
+
+              gdk_region_union_with_rect (region, &rect);
+              
+              y += 20;
+            }
+          y = 0;
+          x += 20;
+        }
+
+      gdk_window_shape_combine_region (with_region->window,
+                                       region,
+                                       0, 0);
+    }
+  else
+    gtk_widget_destroy (with_region);
 }
 
 /*
@@ -7443,54 +8161,612 @@ create_wmhints (void)
     gtk_widget_destroy (window);
 }
 
+
 /*
- * GtkProgressBar
+ * Window state tracking
  */
 
-typedef struct _ProgressData {
-  GtkWidget *window;
-  GtkWidget *pbar;
-  GtkWidget *block_spin;
-  GtkWidget *x_align_spin;
-  GtkWidget *y_align_spin;
-  GtkWidget *step_spin;
-  GtkWidget *act_blocks_spin;
-  GtkWidget *label;
-  GtkWidget *omenu1;
-  GtkWidget *omenu2;
-  GtkWidget *entry;
-  int timer;
-} ProgressData;
-
-gint
-progress_timeout (gpointer data)
+static gint
+window_state_callback (GtkWidget *widget,
+                       GdkEventWindowState *event,
+                       gpointer data)
 {
-  gfloat new_val;
-  GtkAdjustment *adj;
-
-  adj = GTK_PROGRESS (data)->adjustment;
+  GtkWidget *label = data;
+  gchar *msg;
 
-  new_val = adj->value + 1;
-  if (new_val > adj->upper)
-    new_val = adj->lower;
+  msg = g_strconcat (GTK_WINDOW (widget)->title, ": ",
+                     (event->new_window_state & GDK_WINDOW_STATE_WITHDRAWN) ?
+                     "withdrawn" : "not withdrawn", ", ",
+                     (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) ?
+                     "iconified" : "not iconified", ", ",
+                     (event->new_window_state & GDK_WINDOW_STATE_STICKY) ?
+                     "sticky" : "not sticky", ", ",
+                     (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) ?
+                     "maximized" : "not maximized",
+                     NULL);
+  
+  gtk_label_set_text (GTK_LABEL (label), msg);
 
-  gtk_progress_set_value (GTK_PROGRESS (data), new_val);
+  g_free (msg);
 
-  return TRUE;
+  return FALSE;
 }
 
-static void
-destroy_progress (GtkWidget     *widget,
-                 ProgressData **pdata)
+static GtkWidget*
+tracking_label (GtkWidget *window)
 {
-  gtk_timeout_remove ((*pdata)->timer);
-  (*pdata)->timer = 0;
-  (*pdata)->window = NULL;
-  g_free (*pdata);
-  *pdata = NULL;
-}
-
-static void
+  GtkWidget *label;
+  GtkWidget *hbox;
+  GtkWidget *button;
+
+  hbox = gtk_hbox_new (FALSE, 5);
+  
+  gtk_signal_connect_object (GTK_OBJECT (hbox),
+                             "destroy",
+                             GTK_SIGNAL_FUNC (gtk_widget_destroy),
+                             GTK_OBJECT (window));
+
+  label = gtk_label_new ("<no window state events received>");
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  
+  gtk_signal_connect (GTK_OBJECT (window),
+                      "window_state_event",
+                      GTK_SIGNAL_FUNC (window_state_callback),
+                      label);
+
+  button = gtk_button_new_with_label ("Deiconify");
+  gtk_signal_connect_object (GTK_OBJECT (button),
+                             "clicked",
+                             GTK_SIGNAL_FUNC (gtk_window_deiconify),
+                             GTK_OBJECT (window));
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+
+  button = gtk_button_new_with_label ("Iconify");
+  gtk_signal_connect_object (GTK_OBJECT (button),
+                             "clicked",
+                             GTK_SIGNAL_FUNC (gtk_window_iconify),
+                             GTK_OBJECT (window));
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  
+  button = gtk_button_new_with_label ("Present");
+  gtk_signal_connect_object (GTK_OBJECT (button),
+                             "clicked",
+                             GTK_SIGNAL_FUNC (gtk_window_present),
+                             GTK_OBJECT (window));
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+
+  button = gtk_button_new_with_label ("Show");
+  gtk_signal_connect_object (GTK_OBJECT (button),
+                             "clicked",
+                             GTK_SIGNAL_FUNC (gtk_widget_show),
+                             GTK_OBJECT (window));
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  
+  gtk_widget_show_all (hbox);
+  
+  return hbox;
+}
+
+static GtkWidget*
+get_state_controls (GtkWidget *window)
+{
+  GtkWidget *vbox;
+  GtkWidget *button;
+
+  vbox = gtk_vbox_new (FALSE, 0);
+  
+  button = gtk_button_new_with_label ("Stick");
+  gtk_signal_connect_object (GTK_OBJECT (button),
+                             "clicked",
+                             GTK_SIGNAL_FUNC (gtk_window_stick),
+                             GTK_OBJECT (window));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  button = gtk_button_new_with_label ("Unstick");
+  gtk_signal_connect_object (GTK_OBJECT (button),
+                             "clicked",
+                             GTK_SIGNAL_FUNC (gtk_window_unstick),
+                             GTK_OBJECT (window));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  
+  button = gtk_button_new_with_label ("Maximize");
+  gtk_signal_connect_object (GTK_OBJECT (button),
+                             "clicked",
+                             GTK_SIGNAL_FUNC (gtk_window_maximize),
+                             GTK_OBJECT (window));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  button = gtk_button_new_with_label ("Unmaximize");
+  gtk_signal_connect_object (GTK_OBJECT (button),
+                             "clicked",
+                             GTK_SIGNAL_FUNC (gtk_window_unmaximize),
+                             GTK_OBJECT (window));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  button = gtk_button_new_with_label ("Iconify");
+  gtk_signal_connect_object (GTK_OBJECT (button),
+                             "clicked",
+                             GTK_SIGNAL_FUNC (gtk_window_iconify),
+                             GTK_OBJECT (window));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  button = gtk_button_new_with_label ("Hide (withdraw)");
+  gtk_signal_connect_object (GTK_OBJECT (button),
+                             "clicked",
+                             GTK_SIGNAL_FUNC (gtk_widget_hide),
+                             GTK_OBJECT (window));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  
+  gtk_widget_show_all (vbox);
+
+  return vbox;
+}
+
+void
+create_window_states (void)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *label;
+  GtkWidget *box1;
+  GtkWidget *iconified;
+  GtkWidget *normal;
+  GtkWidget *controls;
+  
+  if (!window)
+    {
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+      gtk_signal_connect (GTK_OBJECT (window), "destroy",
+                         GTK_SIGNAL_FUNC(gtk_widget_destroyed),
+                         &window);
+
+      gtk_window_set_title (GTK_WINDOW (window), "Window states");
+      
+      box1 = gtk_vbox_new (FALSE, 0);
+      gtk_container_add (GTK_CONTAINER (window), box1);
+
+      iconified = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_iconify (GTK_WINDOW (iconified));
+      gtk_window_set_title (GTK_WINDOW (iconified), "Iconified initially");
+      controls = get_state_controls (iconified);
+      gtk_container_add (GTK_CONTAINER (iconified), controls);
+      
+      normal = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_title (GTK_WINDOW (normal), "Deiconified initially");
+      controls = get_state_controls (normal);
+      gtk_container_add (GTK_CONTAINER (normal), controls);
+      
+      label = tracking_label (iconified);
+      gtk_container_add (GTK_CONTAINER (box1), label);
+
+      label = tracking_label (normal);
+      gtk_container_add (GTK_CONTAINER (box1), label);
+
+      gtk_widget_show_all (iconified);
+      gtk_widget_show_all (normal);
+      gtk_widget_show_all (box1);
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+}
+
+/*
+ * Window sizing
+ */
+
+static gint
+configure_event_callback (GtkWidget *widget,
+                          GdkEventConfigure *event,
+                          gpointer data)
+{
+  GtkWidget *label = data;
+  gchar *msg;
+  gint x, y;
+  
+#if 0
+  /* FIXME */
+  gtk_window_get_location (GTK_WINDOW (widget), &x, &y);
+#else  
+  x = 0;
+  y = 0;
+#endif
+  
+  msg = g_strdup_printf ("event: %d,%d  %d x %d\n"
+                         "location: %d, %d",
+                         event->x, event->y, event->width, event->height,
+                         x, y);
+  
+  gtk_label_set_text (GTK_LABEL (label), msg);
+
+  g_free (msg);
+
+  return FALSE;
+}
+
+static void
+get_ints (GtkWidget *window,
+          gint      *a,
+          gint      *b)
+{
+  GtkWidget *spin1;
+  GtkWidget *spin2;
+
+  spin1 = g_object_get_data (G_OBJECT (window), "spin1");
+  spin2 = g_object_get_data (G_OBJECT (window), "spin2");
+
+  *a = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin1));
+  *b = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin2));
+}
+
+static void
+set_size_callback (GtkWidget *widget,
+                   gpointer   data)
+{
+  gint w, h;
+  
+  get_ints (data, &w, &h);
+
+  gtk_window_set_default_size (GTK_WINDOW (g_object_get_data (data, "target")), w, h);
+}
+     
+static void
+set_default_size_callback (GtkWidget *widget,
+                           gpointer   data)
+{
+  gint w, h;
+  
+  get_ints (data, &w, &h);
+
+  gtk_window_set_default_size (g_object_get_data (data, "target"),
+                               w, h);
+}
+
+static void
+set_usize_callback (GtkWidget *widget,
+                    gpointer   data)
+{
+  gint w, h;
+  
+  get_ints (data, &w, &h);
+
+  gtk_widget_set_usize (g_object_get_data (data, "target"),
+                        w, h);
+}
+
+static void
+set_location_callback (GtkWidget *widget,
+                       gpointer   data)
+{
+  gint x, y;
+  
+  get_ints (data, &x, &y);
+
+  gtk_widget_set_uposition (g_object_get_data (data, "target"), x, y);
+}
+
+static void
+set_geometry_callback (GtkWidget *entry,
+                       gpointer   data)
+{
+  gchar *text;
+  GtkWindow *target;
+
+  target = GTK_WINDOW (g_object_get_data (G_OBJECT (data), "target"));
+  
+  text = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1);
+
+#if 0
+  /* FIXME */
+  if (!gtk_window_parse_geometry (target, text))
+    g_print ("Bad geometry string '%s'\n", text);
+#endif
+  
+  g_free (text);
+}
+
+static void
+allow_shrink_callback (GtkWidget *widget,
+                       gpointer   data)
+{
+  g_object_set (G_OBJECT (g_object_get_data (data, "target")),
+                "allow_shrink",
+                GTK_TOGGLE_BUTTON (widget)->active,
+                NULL);
+}
+
+static void
+allow_grow_callback (GtkWidget *widget,
+                     gpointer   data)
+{
+  g_object_set (G_OBJECT (g_object_get_data (data, "target")),
+                "allow_grow",
+                GTK_TOGGLE_BUTTON (widget)->active,
+                NULL);
+}
+
+static void
+auto_shrink_callback (GtkWidget *widget,
+                      gpointer   data)
+{
+  g_object_set (G_OBJECT (g_object_get_data (data, "target")),
+                "auto_shrink",
+                GTK_TOGGLE_BUTTON (widget)->active,
+                NULL);
+}
+
+static void
+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);
+}
+
+static GtkWidget*
+window_controls (GtkWidget *window)
+{
+  GtkWidget *control_window;
+  GtkWidget *label;
+  GtkWidget *vbox;
+  GtkWidget *button;
+  GtkWidget *spin;
+  GtkAdjustment *adj;
+  GtkWidget *entry;
+  GtkWidget *om;
+  GtkWidget *menu;
+  gint i;
+  
+  control_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+  gtk_window_set_title (GTK_WINDOW (control_window), "Size controls");
+  
+  g_object_set_data (G_OBJECT (control_window),
+                     "target",
+                     window);
+  
+  gtk_signal_connect_object (GTK_OBJECT (control_window),
+                             "destroy",
+                             GTK_SIGNAL_FUNC (gtk_widget_destroy),
+                             GTK_OBJECT (window));
+
+  vbox = gtk_vbox_new (FALSE, 5);
+  
+  gtk_container_add (GTK_CONTAINER (control_window), vbox);
+  
+  label = gtk_label_new ("<no configure events>");
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+  
+  gtk_signal_connect (GTK_OBJECT (window),
+                      "configure_event",
+                      GTK_SIGNAL_FUNC (configure_event_callback),
+                      label);
+
+  adj = (GtkAdjustment *) gtk_adjustment_new (10.0, -3.0, 800.0, 1.0,
+                                              5.0, 0.0);
+  spin = gtk_spin_button_new (adj, 0, 0);
+
+  gtk_box_pack_start (GTK_BOX (vbox), spin, FALSE, FALSE, 0);
+
+  g_object_set_data (G_OBJECT (control_window), "spin1", spin);
+
+  adj = (GtkAdjustment *) gtk_adjustment_new (10.0, -3.0, 800.0, 1.0,
+                                              5.0, 0.0);
+  spin = gtk_spin_button_new (adj, 0, 0);
+
+  gtk_box_pack_start (GTK_BOX (vbox), spin, FALSE, FALSE, 0);
+
+  g_object_set_data (G_OBJECT (control_window), "spin2", spin);
+
+  entry = gtk_entry_new ();
+  gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+
+  gtk_signal_connect (GTK_OBJECT (entry), "changed",
+                      GTK_SIGNAL_FUNC (set_geometry_callback),
+                      control_window);
+  
+  button = gtk_button_new_with_label ("Queue resize");
+  gtk_signal_connect_object (GTK_OBJECT (button),
+                             "clicked",
+                             GTK_SIGNAL_FUNC (gtk_widget_queue_resize),
+                             GTK_OBJECT (control_window));
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  
+  button = gtk_button_new_with_label ("Set size");
+  gtk_signal_connect (GTK_OBJECT (button),
+                      "clicked",
+                      GTK_SIGNAL_FUNC (set_size_callback),
+                      GTK_OBJECT (control_window));
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  button = gtk_button_new_with_label ("Set default size");
+  gtk_signal_connect (GTK_OBJECT (button),
+                      "clicked",
+                      GTK_SIGNAL_FUNC (set_default_size_callback),
+                      GTK_OBJECT (control_window));
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  button = gtk_button_new_with_label ("Set usize");
+  gtk_signal_connect (GTK_OBJECT (button),
+                      "clicked",
+                      GTK_SIGNAL_FUNC (set_usize_callback),
+                      GTK_OBJECT (control_window));
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  button = gtk_button_new_with_label ("Set location");
+  gtk_signal_connect (GTK_OBJECT (button),
+                      "clicked",
+                      GTK_SIGNAL_FUNC (set_location_callback),
+                      GTK_OBJECT (control_window));
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  button = gtk_check_button_new_with_label ("Allow shrink");
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE);
+  gtk_signal_connect (GTK_OBJECT (button),
+                      "toggled",
+                      GTK_SIGNAL_FUNC (allow_shrink_callback),
+                      GTK_OBJECT (control_window));
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  button = gtk_check_button_new_with_label ("Allow grow");
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
+  gtk_signal_connect (GTK_OBJECT (button),
+                      "toggled",
+                      GTK_SIGNAL_FUNC (allow_grow_callback),
+                      GTK_OBJECT (control_window));
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  
+  button = gtk_check_button_new_with_label ("Auto shrink");
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE);
+  gtk_signal_connect (GTK_OBJECT (button),
+                      "toggled",
+                      GTK_SIGNAL_FUNC (auto_shrink_callback),
+                      GTK_OBJECT (control_window));
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  button = gtk_button_new_with_mnemonic ("_Show");
+  gtk_signal_connect_object (GTK_OBJECT (button),
+                             "clicked",
+                             GTK_SIGNAL_FUNC (gtk_widget_show),
+                             GTK_OBJECT (window));
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  button = gtk_button_new_with_mnemonic ("_Hide");
+  gtk_signal_connect_object (GTK_OBJECT (button),
+                             "clicked",
+                             GTK_SIGNAL_FUNC (gtk_widget_hide),
+                             GTK_OBJECT (window));
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  
+  menu = gtk_menu_new ();
+  
+  i = 0;
+  while (i < 10)
+    {
+      GtkWidget *mi;
+      static gchar *names[] = {
+        "GDK_GRAVITY_NORTH_WEST",
+        "GDK_GRAVITY_NORTH",
+        "GDK_GRAVITY_NORTH_EAST",
+        "GDK_GRAVITY_WEST",
+        "GDK_GRAVITY_CENTER",
+        "GDK_GRAVITY_EAST",
+        "GDK_GRAVITY_SOUTH_WEST",
+        "GDK_GRAVITY_SOUTH",
+        "GDK_GRAVITY_SOUTH_EAST",
+        "GDK_GRAVITY_STATIC",
+        NULL
+      };
+
+      g_assert (names[i]);
+      
+      mi = gtk_menu_item_new_with_label (names[i]);
+
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+
+      ++i;
+    }
+  
+  gtk_widget_show_all (menu);
+  
+  om = gtk_option_menu_new ();
+  gtk_option_menu_set_menu (GTK_OPTION_MENU (om), menu);
+  
+
+  gtk_signal_connect (GTK_OBJECT (om),
+                      "changed",
+                      GTK_SIGNAL_FUNC (gravity_selected),
+                      control_window);
+
+  gtk_box_pack_end (GTK_BOX (vbox), om, FALSE, FALSE, 0);
+  
+  gtk_widget_show_all (vbox);
+  
+  return control_window;
+}
+
+void
+create_window_sizing (void)
+{
+  static GtkWidget *window = NULL;
+  
+  if (!window)
+    {
+      GtkWidget *label;
+      
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label), "<span foreground=\"purple\"><big>Window being resized</big></span>\nBlah blah blah blah\nblah blah blah\nblah blah blah blah blah");
+      gtk_container_add (GTK_CONTAINER (window), label);
+      gtk_widget_show (label);
+      
+      gtk_signal_connect (GTK_OBJECT (window), "destroy",
+                         GTK_SIGNAL_FUNC(gtk_widget_destroyed),
+                         &window);
+
+      gtk_window_set_title (GTK_WINDOW (window), "Window to size");
+
+      gtk_widget_show (window_controls (window));
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+}
+
+/*
+ * GtkProgressBar
+ */
+
+typedef struct _ProgressData {
+  GtkWidget *window;
+  GtkWidget *pbar;
+  GtkWidget *block_spin;
+  GtkWidget *x_align_spin;
+  GtkWidget *y_align_spin;
+  GtkWidget *step_spin;
+  GtkWidget *act_blocks_spin;
+  GtkWidget *label;
+  GtkWidget *omenu1;
+  GtkWidget *omenu2;
+  GtkWidget *entry;
+  int timer;
+} ProgressData;
+
+gint
+progress_timeout (gpointer data)
+{
+  gdouble new_val;
+  GtkAdjustment *adj;
+
+  adj = GTK_PROGRESS (data)->adjustment;
+
+  new_val = adj->value + 1;
+  if (new_val > adj->upper)
+    new_val = adj->lower;
+
+  gtk_progress_set_value (GTK_PROGRESS (data), new_val);
+
+  return TRUE;
+}
+
+static void
+destroy_progress (GtkWidget     *widget,
+                 ProgressData **pdata)
+{
+  gtk_timeout_remove ((*pdata)->timer);
+  (*pdata)->timer = 0;
+  (*pdata)->window = NULL;
+  g_free (*pdata);
+  *pdata = NULL;
+}
+
+static void
 progressbar_toggle_orientation (GtkWidget *widget, ProgressData *pdata)
 {
   gint i;
@@ -7620,16 +8896,16 @@ create_progress_bar (void)
 
   static OptionMenuItem items1[] =
   {
-    { "Left-Right", progressbar_toggle_orientation },
-    { "Right-Left", progressbar_toggle_orientation },
-    { "Bottom-Top", progressbar_toggle_orientation },
-    { "Top-Bottom", progressbar_toggle_orientation }
+    { "Left-Right", GTK_SIGNAL_FUNC (progressbar_toggle_orientation) },
+    { "Right-Left", GTK_SIGNAL_FUNC (progressbar_toggle_orientation) },
+    { "Bottom-Top", GTK_SIGNAL_FUNC (progressbar_toggle_orientation) },
+    { "Top-Bottom", GTK_SIGNAL_FUNC (progressbar_toggle_orientation) }
   };
 
   static OptionMenuItem items2[] =
   {
-    { "Continuous", progressbar_toggle_bar_style },
-    { "Discrete",   progressbar_toggle_bar_style }
+    { "Continuous", GTK_SIGNAL_FUNC (progressbar_toggle_bar_style) },
+    { "Discrete",   GTK_SIGNAL_FUNC (progressbar_toggle_bar_style) }
   };
 
   if (!pdata)
@@ -7843,6 +9119,255 @@ create_progress_bar (void)
     gtk_widget_destroy (pdata->window);
 }
 
+/*
+ * Properties
+ */
+
+typedef struct {
+  int x;
+  int y;
+  gboolean found;
+  gboolean first;
+  GtkWidget *res_widget;
+} FindWidgetData;
+
+static void
+find_widget (GtkWidget *widget, FindWidgetData *data)
+{
+  GtkAllocation new_allocation;
+  gint x_offset = 0;
+  gint y_offset = 0;
+
+  new_allocation = widget->allocation;
+
+  if (data->found || !GTK_WIDGET_MAPPED (widget))
+    return;
+
+  /* Note that in the following code, we only count the
+   * position as being inside a WINDOW widget if it is inside
+   * widget->window; points that are outside of widget->window
+   * but within the allocation are not counted. This is consistent
+   * with the way we highlight drag targets.
+   */
+  if (!GTK_WIDGET_NO_WINDOW (widget))
+    {
+      new_allocation.x = 0;
+      new_allocation.y = 0;
+    }
+  
+  if (widget->parent && !data->first)
+    {
+      GdkWindow *window = widget->window;
+      while (window != widget->parent->window)
+       {
+         gint tx, ty, twidth, theight;
+         gdk_window_get_size (window, &twidth, &theight);
+
+         if (new_allocation.x < 0)
+           {
+             new_allocation.width += new_allocation.x;
+             new_allocation.x = 0;
+           }
+         if (new_allocation.y < 0)
+           {
+             new_allocation.height += new_allocation.y;
+             new_allocation.y = 0;
+           }
+         if (new_allocation.x + new_allocation.width > twidth)
+           new_allocation.width = twidth - new_allocation.x;
+         if (new_allocation.y + new_allocation.height > theight)
+           new_allocation.height = theight - new_allocation.y;
+
+         gdk_window_get_position (window, &tx, &ty);
+         new_allocation.x += tx;
+         x_offset += tx;
+         new_allocation.y += ty;
+         y_offset += ty;
+         
+         window = gdk_window_get_parent (window);
+       }
+    }
+
+  if ((data->x >= new_allocation.x) && (data->y >= new_allocation.y) &&
+      (data->x < new_allocation.x + new_allocation.width) && 
+      (data->y < new_allocation.y + new_allocation.height))
+    {
+      /* First, check if the drag is in a valid drop site in
+       * one of our children 
+       */
+      if (GTK_IS_CONTAINER (widget))
+       {
+         FindWidgetData new_data = *data;
+         
+         new_data.x -= x_offset;
+         new_data.y -= y_offset;
+         new_data.found = FALSE;
+         new_data.first = FALSE;
+         
+         gtk_container_forall (GTK_CONTAINER (widget),
+                               (GtkCallback)find_widget,
+                               &new_data);
+         
+         data->found = new_data.found;
+         if (data->found)
+           data->res_widget = new_data.res_widget;
+       }
+
+      /* If not, and this widget is registered as a drop site, check to
+       * emit "drag_motion" to check if we are actually in
+       * a drop site.
+       */
+      if (!data->found)
+       {
+         data->found = TRUE;
+         data->res_widget = widget;
+       }
+    }
+}
+
+static GtkWidget *
+find_widget_at_pointer (void)
+{
+  GtkWidget *widget = NULL;
+  GdkWindow *pointer_window;
+  gint x, y;
+  FindWidgetData data;
+ pointer_window = gdk_window_at_pointer (NULL, NULL);
+ if (pointer_window)
+   gdk_window_get_user_data (pointer_window, (gpointer*) &widget);
+
+ if (widget)
+   {
+     gdk_window_get_pointer (widget->window,
+                            &x, &y, NULL);
+     
+     data.x = x;
+     data.y = y;
+     data.found = FALSE;
+     data.first = TRUE;
+
+     find_widget (widget, &data);
+     if (data.found)
+       return data.res_widget;
+     return widget;
+   }
+ return NULL;
+}
+
+struct PropertiesData {
+  GtkWidget **window;
+  GdkCursor *cursor;
+  gboolean in_query;
+  gint handler;
+};
+
+static void
+destroy_properties (GtkWidget  *widget,
+                   struct PropertiesData *data)
+{
+  *data->window = NULL;
+
+  if (data->cursor)
+    gdk_cursor_destroy (data->cursor);
+    
+  gtk_signal_disconnect (widget, data->handler);
+
+  g_free (data);
+}
+
+static gint
+property_query_event (GtkWidget               *widget,
+                     GdkEvent         *event,
+                     struct PropertiesData *data)
+{
+  GtkWidget *res_widget = NULL;
+
+  if (!data->in_query)
+    return FALSE;
+  
+  if (event->type == GDK_BUTTON_RELEASE)
+    {
+      gtk_grab_remove (widget);
+      gdk_pointer_ungrab (GDK_CURRENT_TIME);
+      
+      res_widget = find_widget_at_pointer ();
+      if (res_widget)
+       create_prop_editor (G_OBJECT (res_widget), 0);
+
+      data->in_query = FALSE;
+    }
+  return FALSE;
+}
+
+
+static void
+query_properties (GtkButton *button,
+                 struct PropertiesData *data)
+{
+  gint failure;
+
+  gtk_signal_connect (GTK_OBJECT (button), "event",
+                     (GtkSignalFunc) property_query_event, data);
+
+
+  if (!data->cursor)
+    data->cursor = gdk_cursor_new (GDK_TARGET);
+  
+  failure = gdk_pointer_grab (GTK_WIDGET (button)->window,
+                             TRUE,
+                             GDK_BUTTON_RELEASE_MASK,
+                             NULL,
+                             data->cursor,
+                             GDK_CURRENT_TIME);
+
+  gtk_grab_add (GTK_WIDGET (button));
+
+  data->in_query = TRUE;
+}
+
+static void
+create_properties (void)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *button;
+  struct PropertiesData *data;
+
+  data = g_new (struct PropertiesData, 1);
+  data->window = &window;
+  data->in_query = FALSE;
+  data->cursor = NULL;
+  data->handler = 0;
+
+  if (!window)
+    {
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+      data->handler = gtk_signal_connect_object (GTK_OBJECT (window), "destroy",
+                                                GTK_SIGNAL_FUNC(destroy_properties),
+                                                data);
+
+      gtk_window_set_title (GTK_WINDOW (window), "test properties");
+      gtk_container_set_border_width (GTK_CONTAINER (window), 10);
+
+      button = gtk_button_new_with_label ("Query properties");
+      gtk_signal_connect (GTK_OBJECT (button), "clicked",
+                         GTK_SIGNAL_FUNC(query_properties),
+                         data);
+
+      
+      gtk_container_add (GTK_CONTAINER (window), button);
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show_all (window);
+  else
+    gtk_widget_destroy (window);
+  
+}
+
+
 /*
  * Color Preview
  */
@@ -8197,7 +9722,6 @@ create_gamma_curve (void)
  */
 
 static int scroll_test_pos = 0.0;
-static GdkGC *scroll_test_gc = NULL;
 
 static gint
 scroll_test_expose (GtkWidget *widget, GdkEventExpose *event,
@@ -8231,9 +9755,9 @@ static gint
 scroll_test_scroll (GtkWidget *widget, GdkEventScroll *event,
                    GtkAdjustment *adj)
 {
-  gfloat new_value = adj->value + ((event->direction == GDK_SCROLL_UP) ?
-                                  -adj->page_increment / 2:
-                                  adj->page_increment / 2);
+  gdouble new_value = adj->value + ((event->direction == GDK_SCROLL_UP) ?
+                                   -adj->page_increment / 2:
+                                   adj->page_increment / 2);
   new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
   gtk_adjustment_set_value (adj, new_value);  
   
@@ -8254,75 +9778,15 @@ static void
 scroll_test_adjustment_changed (GtkAdjustment *adj, GtkWidget *widget)
 {
   gint source_min = (int)adj->value - scroll_test_pos;
-  gint source_max = source_min + widget->allocation.height;
-  gint dest_min = 0;
-  gint dest_max = widget->allocation.height;
-  GdkRectangle rect;
-  GdkEvent *event;
+  gint dy;
 
+  dy = scroll_test_pos - (int)adj->value;
   scroll_test_pos = adj->value;
 
   if (!GTK_WIDGET_DRAWABLE (widget))
     return;
-
-  if (source_min < 0)
-    {
-      rect.x = 0; 
-      rect.y = 0;
-      rect.width = widget->allocation.width;
-      rect.height = -source_min;
-      if (rect.height > widget->allocation.height)
-       rect.height = widget->allocation.height;
-
-      source_min = 0;
-      dest_min = rect.height;
-    }
-  else
-    {
-      rect.x = 0;
-      rect.y = 2*widget->allocation.height - source_max;
-      if (rect.y < 0)
-       rect.y = 0;
-      rect.width = widget->allocation.width;
-      rect.height = widget->allocation.height - rect.y;
-
-      source_max = widget->allocation.height;
-      dest_max = rect.y;
-    }
-
-  if (source_min != source_max)
-    {
-      if (scroll_test_gc == NULL)
-       {
-         scroll_test_gc = gdk_gc_new (widget->window);
-         gdk_gc_set_exposures (scroll_test_gc, TRUE);
-       }
-
-      gdk_draw_pixmap (widget->window,
-                      scroll_test_gc,
-                      widget->window,
-                      0, source_min,
-                      0, dest_min,
-                      widget->allocation.width,
-                      source_max - source_min);
-
-      /* Make sure graphics expose events are processed before scrolling
-       * again */
-      
-      while ((event = gdk_event_get_graphics_expose (widget->window)) != NULL)
-       {
-         gtk_widget_event (widget, event);
-         if (event->expose.count == 0)
-           {
-             gdk_event_free (event);
-             break;
-           }
-         gdk_event_free (event);
-       }
-    }
-
-  if (rect.height != 0)
-    gtk_widget_draw (widget, &rect);
+  gdk_window_scroll (widget->window, 0, dy);
+  gdk_window_process_updates (widget->window, FALSE);
 }
 
 
@@ -8603,11 +10067,11 @@ create_idle_test (void)
       
       container =
        gtk_widget_new (GTK_TYPE_HBOX,
-                       "GtkWidget::visible", TRUE,
+                       "visible", TRUE,
                        /* "GtkContainer::child", gtk_widget_new (GTK_TYPE_HBOX,
                         * "GtkWidget::visible", TRUE,
                         */
-                        "GtkContainer::child", label,
+                        "child", label,
                        /* NULL), */
                        NULL);
       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), 
@@ -8615,43 +10079,46 @@ create_idle_test (void)
 
       frame =
        gtk_widget_new (GTK_TYPE_FRAME,
-                       "GtkContainer::border_width", 5,
-                       "GtkFrame::label", "Label Container",
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", GTK_DIALOG (window)->vbox,
+                       "border_width", 5,
+                       "label", "Label Container",
+                       "visible", TRUE,
+                       "parent", GTK_DIALOG (window)->vbox,
                        NULL);
       box =
        gtk_widget_new (GTK_TYPE_VBOX,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", frame,
+                       "visible", TRUE,
+                       "parent", frame,
                        NULL);
       button =
-       gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
-                       "GtkButton::label", "Resize-Parent",
-                       "GtkObject::user_data", (void*)GTK_RESIZE_PARENT,
-                       "GtkObject::signal::clicked", toggle_idle_container, container,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box,
-                       NULL);
+       g_object_connect (gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
+                                         "label", "Resize-Parent",
+                                         "user_data", (void*)GTK_RESIZE_PARENT,
+                                         "visible", TRUE,
+                                         "parent", box,
+                                         NULL),
+                         "signal::clicked", toggle_idle_container, container,
+                         NULL);
       button =
-       gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
-                       "GtkButton::label", "Resize-Queue",
-                       "GtkObject::user_data", (void*)GTK_RESIZE_QUEUE,
-                       "GtkObject::signal::clicked", toggle_idle_container, container,
-                       "GtkRadioButton::group", button,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box,
-                       NULL);
+       g_object_connect (gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
+                                         "label", "Resize-Queue",
+                                         "user_data", (void*)GTK_RESIZE_QUEUE,
+                                         "group", button,
+                                         "visible", TRUE,
+                                         "parent", box,
+                                         NULL),
+                         "signal::clicked", toggle_idle_container, container,
+                         NULL);
       button =
-       gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
-                       "GtkButton::label", "Resize-Immediate",
-                       "GtkObject::user_data", (void*)GTK_RESIZE_IMMEDIATE,
-                       "GtkObject::signal::clicked", toggle_idle_container, container,
-                       "GtkRadioButton::group", button,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box,
-                       NULL);
-      
+       g_object_set (g_object_connect (gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
+                                                       "label", "Resize-Immediate",
+                                                       "user_data", (void*)GTK_RESIZE_IMMEDIATE,
+                                                       NULL),
+                                       "signal::clicked", toggle_idle_container, container,
+                                       NULL),
+                     "group", button,
+                     "visible", TRUE,
+                     "parent", box,
+                     NULL);
 
       button = gtk_button_new_with_label ("close");
       gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
@@ -9101,6 +10568,7 @@ create_main_window (void)
       { "event watcher", create_event_watcher },
       { "file selection", create_file_selection },
       { "flipping", create_flipping },
+      { "focus", create_focus },
       { "font selection", create_font_selection },
       { "gamma curve", create_gamma_curve },
       { "handle box", create_handle_box },
@@ -9119,6 +10587,7 @@ create_main_window (void)
       { "preview color", create_color_preview },
       { "preview gray", create_gray_preview },
       { "progress bar", create_progress_bar },
+      { "properties", create_properties },
       { "radio buttons", create_radio_buttons },
       { "range controls", create_range_controls },
       { "rc file", create_rc_file },
@@ -9127,6 +10596,7 @@ create_main_window (void)
       { "saved position", create_saved_position },
       { "scrolled windows", create_scrolled_windows },
       { "shapes", create_shapes },
+      { "size groups", create_size_groups },
       { "spinbutton", create_spins },
       { "statusbar", create_statusbar },
       { "styles", create_styles },
@@ -9141,6 +10611,8 @@ create_main_window (void)
       { "tooltips", create_tooltips },
       { "tree", create_tree_mode_window},
       { "WM hints", create_wmhints },
+      { "window sizing", create_window_sizing },
+      { "window states", create_window_states }
     };
   int nbuttons = sizeof (buttons) / sizeof (buttons[0]);
   GtkWidget *window;
@@ -9151,13 +10623,21 @@ create_main_window (void)
   GtkWidget *label;
   gchar buffer[64];
   GtkWidget *separator;
+  GdkGeometry geometry;
   int i;
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_policy (GTK_WINDOW (window), FALSE, FALSE, FALSE);
   gtk_widget_set_name (window, "main window");
-  gtk_widget_set_usize (window, 200, 400);
   gtk_widget_set_uposition (window, 20, 20);
+  gtk_window_set_default_size (GTK_WINDOW (window), -1, 400);
+
+  geometry.min_width = -1;
+  geometry.min_height = -1;
+  geometry.max_width = -1;
+  geometry.max_height = G_MAXSHORT;
+  gtk_window_set_geometry_hints (GTK_WINDOW (window), NULL,
+                                &geometry,
+                                GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
 
   gtk_signal_connect (GTK_OBJECT (window), "destroy",
                      GTK_SIGNAL_FUNC(gtk_main_quit),
@@ -9187,7 +10667,7 @@ create_main_window (void)
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
   gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 10);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-                                 GTK_POLICY_AUTOMATIC
+                                 GTK_POLICY_NEVER
                                   GTK_POLICY_AUTOMATIC);
   gtk_box_pack_start (GTK_BOX (box1), scrolled_window, TRUE, TRUE, 0);
 
@@ -9218,7 +10698,7 @@ create_main_window (void)
   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");
+  button = gtk_button_new_with_mnemonic ("_Close");
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
                      GTK_SIGNAL_FUNC (do_exit),
                      window);
@@ -9229,11 +10709,14 @@ create_main_window (void)
   gtk_widget_show_all (window);
 }
 
-void
-pixbuf_init ()
+static void
+test_init ()
 {
   if (file_exists ("../gdk-pixbuf/.libs/libpixbufloader-pnm.so"))
-    putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf/.libs");
+    {
+      putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf/.libs");
+      putenv ("GTK_IM_MODULE_FILE=../modules/input/gtk.immodules");
+    }
 }
 
 int
@@ -9243,7 +10726,7 @@ main (int argc, char *argv[])
 
   srand (time (NULL));
 
-  pixbuf_init ();
+  test_init ();
   gtk_set_locale ();
 
   /* Check to see if we are being run from the correct
@@ -9266,15 +10749,16 @@ main (int argc, char *argv[])
   create_main_window ();
 
   gtk_main ();
-  
-  if (0)
+
+  if (1)
     {
-      sleep (1);
       while (g_main_pending ())
        g_main_iteration (FALSE);
+#if 0
       sleep (1);
       while (g_main_pending ())
        g_main_iteration (FALSE);
+#endif
     }
 
   return 0;