Fixed the LSB -> MSB case. Fixes #79463 . (rgb565msb): Fix the MSB -> MSB

2002-07-16 Federico Mena Quintero <federico@ximian.com> * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case. Fixes #79463. (rgb565msb): Fix the MSB -> MSB case. Fixes #79190.
Fix one character typo crasher :/
2002-07-16 17:28:58 +00:00 · 2002-04-22 19:17:00 +00:00 · 2002-04-19 16:59:59 +00:00 · 2002-04-02 17:25:19 +00:00 · 2002-03-30 13:53:56 +00:00 · 2002-03-28 18:37:40 +00:00
2950 changed files with 610734 additions and 2126744 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1,37 @@
+*.lo
+config.log
+config.h
+config.h.in
+libtool
+config.status
+stamp-h
+stamp-h1
+Makefile
+Makefile.in
+aclocal.m4
+configure
+config.h.win32
+gtk-config-2.0
+config.cache
+ABOUT-NLS
+intl
+stamp-h.in
+gtk+.spec
+gtk+-2.0.pc
+gtk+-2.0-uninstalled.pc
+gtk+-linux-fb-2.0.pc
+gtk+-nanox-2.0.pc
+gtk+-x11-2.0.pc
+gdk-2.0.pc
+gdk-2.0-uninstalled.pc
+gdk-linux-fb-2.0.pc
+gdk-nanox-2.0.pc
+gdk-x11-2.0.pc
+gdk-pixbuf-2.0.pc
+gdk-pixbuf-2.0-uninstalled.pc
+gtk-zip.sh
+missing
+install-sh
+mkinstalldirs
+sgml
+autom4te.cache
--- a/39
+++ b/39
@@ -1,12 +1,12 @@
-Please do not mail any of the authors listed here 
-asking questions about this version of GTK+. 
-
 Original Authors
 ----------------
 Peter Mattis      <petm@xcf.berkeley.edu>
 Spencer Kimball   <spencer@xcf.berkeley.edu>
 Josh MacDonald    <jmacd@xcf.berkeley.edu>

+Please do not mail the original authors asking questions about this 
+version of GTK+.
+
 The GTK+ Team (in alphabetical order)
 -------------------------------------
 Shawn T. Amundson <amundson@gtk.org>
@@ -30,36 +30,3 @@ Owen Taylor       <otaylor@gtk.org>

 There are many others who have contributed patches; we thank them,
 GTK+ is much better because of them.
-
-
-Over time, GTK+ has incorporated some pieces of software which 
-started as independent projects. We list the original authors here:
-
-
-MS-Windows theme engine
-----------------------
-Raymond Penners
-Dom Lachowicz
-
-
-Pixbuf theme engine
-------------------
-Owen Taylor
-
-
-IME input method
----------------
-Takuro Ashie
-Kazuki IWAMOTO
-
-
-Mac OS X backend
----------------
-Anders Carlsson
-
-
-DirectFB backend
----------------
-Denis Oliver Kropp
-Sven Neumann
-Mike Emmel
--- a/896
+++ b/896
@@ -0,0 +1,896 @@
+2002-07-16  Federico Mena Quintero  <federico@ximian.com>
+
+	* gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+	Fixes #79463.
+	(rgb565msb): Fix the MSB -> MSB case. Fixes #79190.
+
+Fri Apr 19 16:30:09 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeprivate.h, gtk/gtktreeview.c: rename
+	last_single_clicked{,_2} to last_button_press{,_2}, as the latter
+	is a more sane name.
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): use ->priv->anchor
+	instead of ->priv->cursor, check for the anchor at another place, as
+	you can go in edit mode without	having an anchor.
+
+2002-04-18  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkitemfactory.c:
+	* gtk/gtkiconfactory.c:
+	* gtk/gtkwidget.c:
+	* gtk/gtkstyle.c:
+	* gtk/gtkrc.c:
+	* gtk/gtktreeviewcolumn.c:
+	* gtk/gtkdialog.c:
+	* gtk/gtktreemodel.c: s/<!>/<!-- -->/g throughout the
+	documentation to bring the produced Docbook closer to XML.
+
+2002-04-18  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk-pixbuf/Makefile.am (uninstall-libtool-import-lib)
+	* gdk/Makefile.am (uninstall-libtool-import-lib): Fix typo,
+	thanks to David Sterba for noticing.
+
+	* gtk/gtkmain.h
+	* gtk/gtkmain.c (gtk_init_abi_check, gtk_init_check_abi_check): In
+	GTK+ 2.0 the GtkWindow struct actually is the same size in gcc on
+	Win32 whether compiled with -fnative-struct or not. Unfortunately
+	this wan't noticed until now. So, from now on, check some other
+	struct, too, for which the use of -fnative-struct still
+	matters. GtkBox is one such.
+
+Thu Apr 18 00:23:31 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreemodelsort.c
+	(gtk_tree_model_sort_convert_path_to_child_path): so this function
+	was completely broken. Fix it and improve readability.
+
+2002-04-17  Anders Carlsson  <andersca@gnu.org>
+
+	* tests/testtreeedit.c (button_press_event): Add a small
+	test case.
+
+Wed Apr 17 00:21:36 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreestore.c (gtk_tree_store_insert_before): fix docs
+
+Tue Apr 16 17:28:21 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): check
+	->priv->cursor and ->priv->anchor rowrefs before removing
+	node->children from the rbtree. Also check the
+	->priv->last_single_clicked and ->priv->last_single_clicked_2 rowrefs
+	(I think I really need to rename those two someday).
+
+Tue Apr 16 07:53:49 2002  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkmenu.c (gtk_menu_key_press): don't install/change accelerators
+	from locked accel groups.
+
+	* gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the
+	accel path is from a locked accel group.
+
+Mon Apr 15 15:41:56 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkcontainer.c (gtk_container_focus): include internal
+	children when doing focus.
+	(gtk_container_get_all_children): new static function to include
+	internal children when making a list of them.
+
+Sun Apr 14 16:56:59 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeprivate.h: add _gtk_tree_view_column_get_editable_cell and
+	_gtk_tree_view_column_get_neighbor_sizes
+
+	* gtk/gtktreeviewcolumn.c (struct _GtkTreeViewColumnCellInfo): add
+	real_width field,
+	(_gtk_tree_view_column_get_editable_cell): implement,
+	(gtk_tree_view_column_cell_process_action): fill info->real_width
+	(_gtk_tree_view_column_get_neighbor_sizes): implement
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): make the "editable
+	widget" show up with the same size as the actual cell, so it doesnt
+	cover the complete column if there are any other cells in that column.
+
+2002-04-14  Abigail Brady  <morwen@evilmagic.org>
+
+	* gtk/gtkfilesel.c: Fix typo in message.
+
+2002-04-13  Havoc Pennington  <hp@pobox.com>
+
+	* gdk/gdkpixbuf-drawable.c (gdk_pixbuf_get_from_drawable): create
+	the target pixbuf AFTER filling in width/height, so that 
+	passing in -1 for width/height will work.
+	
+Sat Apr 13 22:49:45 2002  Kristian Rietveld  <kris@gtk.org>
+
+	Fixes #75510
+
+	* gtk/gtktreeselection.c (gtk_tree_selection_get_selected): make this
+	function work correctly and more sane
+
+	* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): remove
+	node->children from rbtree before emitting GtkTreeSelection::changed
+
+Sat Apr 13 17:15:12 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_init): dont set
+	the mode to GTK_CELL_RENDERER_MODE_EDITABLE by default,
+	(gtk_cell_renderer_text_class_init): for some reason our default for
+	editable was TRUE, of course this is FALSE.
+	(gtk_cell_renderer_text_set_property): update mode when editable
+	has been changed.
+
+2002-04-12  jacob berkman  <jacob@ximian.com>
+
+	* gdk/x11/xsettings-client.c (fetch_card8): fix cut-n-paste bug
+	which breaks big-endian machines (fixes #73585)
+
+2002-04-12  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_real_remove): relocate the
+	remove_weak_pointer to just before we free the page, to be sure 
+	it doesn't get re-added. #75282
+
+Fri Apr 12 18:32:46 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): add
+	clamp_node argument
+	(toplevel): update usages of gtk_tree_view_real_set_cursor,
+	(gtk_tree_view_focus_to_cursor): don't let
+	gtk_tree_view_real_set_cursor clamp the node, so you won't get
+	unexpected scrolling
+
+2002-04-11  Michael Meeks  <michael@ximian.com>
+
+	* gtk/gtklabel.c
+	(gtk_label_parse_uline, gtk_label_set_text),
+	(gtk_label_set_text_with_mnemonic): add freeze / thaws
+	to stop deluge of 'notify' signals.
+
+Sat Apr  6 06:57:00 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenushell.[ch] gtk/gtkmenuitem.c: Export
+	private _gtk_menu_shell_activate() to encapsulate
+	cut-and-paste code.
+
+	* gtk/gtkmenubar.c: Select the first item on the menu bar
+	for F10	rather than acting as if the user pressed <Alt>F
+	to select the file manager.
+
+Tue Apr  9 19:01:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+        Fix problems with HandleBox and focusing - #78232
+
+	* gtk/gtkwidget.c (gtk_widget_translate_coordinates): Handle
+	GtkHandleBox / GnomeDock style window heirarchy / widget
+	heirarchy disconnects. :-(. 
+
+	* gtk/gtkcontainer.c: Handle failures from
+	gtk_widget_translate_coordinates (Focusing is not right, but at
+	least it doesn't go into infinite loops.)
+
+Tue Apr  9 18:34:58 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkcontainer.c (_gtk_container_queue_resize): Always
+	set the ALLOC_NEEDED and REQUEST_NEEDED flags up the hierarchy,
+	even if we aren't currently in a resize container... we need
+	this to properly handle size changes to widgets that are
+	being moved from one heirarchy to another. (#78226)
+
+Tue Apr  9 21:41:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+	Fixes #78110
+
+	* gtk/gtktreeselection.c (_gtk_tree_selection_internal_select_node):
+	add override_browse_mode argument and implement,
+	(gtk_tree_selection_unselect_path): always unselect the path,
+	(toplevel): update uses of _gtk_tree_selection_internal_select_node
+
+	* gtk/gtktreeview.c: update uses of
+	_gtk_tree_selection_internal_select_node
+
+	* gtk/gtktreeprivate.h (_gtk_tree_selection_internal_select_node):
+	update prototype
+
+Tue Apr  9 21:39:44 2002  Kristian Rietveld  <kris@gtk.org>
+
+	Fixes #77862
+
+	* gtk/gtktreeprivate.h: add _gtk_tree_view_column_has_editable_cell
+
+	* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_has_editable_cell):
+	new function
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): send cell event
+	on first click when cell isn't editable
+
+Tue Apr  9 21:37:31 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreedatalist.c (_gtk_tree_data_list_check_type): add some
+	types which were missing and useful to use (fixes #77870)
+
+2002-04-09  Anders Carlsson  <andersca@gnu.org>
+
+	* gtk/gtkfilesel.c (open_new_dir): Initialize error to NULL.
+
+2002-04-08  Manish Singh  <yosh@gimp.org>
+
+	* tests/testgtk.c: really revert testgtk.c
+
+Mon Apr  8 20:28:54 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeselection.c (gtk_tree_selection_select_path),
+	(gtk_tree_selection_unselect_path),
+	(gtk_tree_selection_path_is_selected): check the return value of
+	_gtk_tree_view_find_node and return if it's TRUE. This makes those
+	functions work somewhat saner on non-expanded trees.
+
+Fri Apr  5 18:28:56 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeselection.c (gtk_tree_selection_set_mode): free
+	anchor row reference after unselecting the selection (fixes #76272)
+
+Fri Apr  5 18:27:48 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): only return
+	when we don't have to open all children (fixes #75736)
+
+Fri Apr  5 18:24:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_clear): unref
+	cellrenderer after clearing the attributes of the renderer (fixes
+	#75592)
+
+Fri Apr  5 05:55:14 2002  Jonathan Blandford  <jrb@gnome.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_grab_focus): implement.
+	  (gtk_tree_view_move_cursor_up_down): check for focus
+	  (gtk_tree_view_move_cursor_page_up_down): ditto
+	  (gtk_tree_view_move_cursor_left_right): ditto
+	  (gtk_tree_view_move_cursor_start_end): ditto
+	  (gtk_tree_view_real_select_all): ditto
+	  (gtk_tree_view_real_unselect_all): ditto
+	  (gtk_tree_view_real_select_cursor_row): ditto	
+	  (gtk_tree_view_real_toggle_cursor_row): ditto
+	  (gtk_tree_view_real_expand_collapse_cursor_row): ditto
+	  (gtk_tree_view_real_select_cursor_parent): ditto
+	  (gtk_tree_view_real_start_interactive_search): ditto
+
+	* gtk/gtktreeviewcolumn.c: grab focus
+
+2002-04-05  Alex Larsson  <alexl@redhat.com>
+
+	* gdk/linux-fb/gdkkeyboard-fb.c (write_string):
+	Fix undefined variable typo.
+	Patch from Simon Floery <simon.floery@gmx.at>
+
+Fri Apr  5 01:06:15 2002  Tim Janik  <timj@gtk.org>
+
+	* gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault
+	upon NULL return from gdk_utf8_to_string_target().
+
+	* gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix
+	return value comment to mention NULL returns upon EMFILE.
+
+Thu Apr  4 22:35:42 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* tests/testgtk.c (menu_items): revert accidentally commited
+	change to testgtk.c
+
+Thu Apr  4 22:28:08 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkmenuitem.c (gtk_menu_item_paint): Fix problem with menu
+	titles being clipped (#75948)
+	
+2002-04-04  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/gdkrgb.c: Fix some bugs, and introduce a minor feature.
+
+	(gdk_rgb_convert_4_pack): New function, for 16-color (4 bits per
+	pixel) static visuals (fixes #858).
+
+	(gdk_rgb_convert_gray4_pack, gdk_rgb_convert_gray4_d_pack): Fix
+	same bugs in both functions: Odd start coordinate (partial byte)
+	was not handled correctly. Also a partial final byte was not
+	handled correctly.
+
+	(gdk_rgb_do_colormaps): Use G_N_ELEMENTS.
+	(gdk_rgb_create_info): For pseudocolor visuals, use the 2x2x2
+	colorcube only for depths 3 and 4. For static color, use it for
+	depths 3..7 like before. (Depth 5..7 pseudocolor probably never
+	occurs on X11. It doesn't normally occur on Win32 either, but
+	there is experimental code in gdkvisual-win32.c to let the user
+	restrict the size of palette used.)
+	(gdk_rgb_init): Set gdk_rgb_verbose if the GDK_DEBUG_GDKRGB flag
+	is set.
+	(gdk_rgb_select_conv): Use gdk_rgb_convert_8 also for depths 5, 6
+	and 7 (see above). Use gdk_rgb_convert_4_pack for 4 bits per pixel
+	static color.
+
+Tue Apr  2 11:10:13 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the
+	sort_func correctly, 77030
+
+Tue Apr  2 13:44:27 2002  Tim Janik  <timj@gtk.org>
+
+	* configure.in: update version to 2.0.2, binary age 2, interface
+	age 2.
+
+	* NEWS: updates for 2.0.2.
+
+Mon Apr  1 22:20:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): add
+	check for y > tree_view->priv->height (fixes #76974)
+
+Mon Apr  1 22:19:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): get
+	the stamp changes right this time
+
+Mon Apr  1 22:13:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreemodel.c (gtk_tree_row_reference_free): only
+	disconnect the ref callbacks when model == proxy (Thanks go to
+	Manuel Clos Crespo for the remote debugging)
+
+Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreemodelsort.c: revert the latest stamp increment changes,
+	as it broke stuff for trees
+
+Fri Mar 29 18:15:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* ===== Released 2.0.1 ======
+
+Fri Mar 29 18:09:18 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkaccelgroup.c (gtk_accel_group_query): Call 
+	gdk_keyval_to_lower() on the key passed in, since we
+	lowercase all other key vals passed in, so querying
+	keyvals will otherwise fail if the caller used
+	an uppercase accelerators (#76899, Vitaly Tishkov)
+
+Fri Mar 29 17:41:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmain.c (load_modules): Fix screwup in handling
+	of module path that was resulting in freed memory being
+	accessed when both GTK_MODULES and a theme were set.
+	(#76902, Johan Dahlin)
+
+Fri Mar 29 17:57:36 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkiconfactory.c (get_default_icons): Fix wrong
+	stock id's for ADD/REMOVE. (#76915, Vitaly Tishkov)
+
+2002-03-29  Hans Breuer  <hans@breuer.org>
+
+	* gtk/gtkmain.h : fix typo in gtk_init_check macro, which
+	caused crashes if argc != 0
+
+	* gtk/stock-icons/makefile.msc : added new icons
+
+Fri Mar 29 20:17:35 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered):
+	remove call to gtk_tree_model_sort_increment_stamp
+	(gtk_tree_model_sort_sort_level): always increment the stamp
+
+Fri Mar 29 00:19:41 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* NEWS: Updates
+
+	* configure.in: Version 2.0.1, binary, interface age 1.
+
+	* configure.in (GDK_PIXBUF_VERSION): Up required versions
+	of dependencies.
+
+	* gtk/gtkiconfactory.c gtk/stock-icons/Makefile.am:
+	Add stock_add/remove_16.
+
+Thu Mar 28 18:38:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): 
+	Don't show the window unless the widget is mapped.
+	(#76742, Dennis Björklund, Soeren Sandmann)
+
+2002-03-29  Hans Breuer  <hans@breuer.org>
+
+	Fixed dashed line issues (#74441) to an IMO reasonable extend. 
+	That is: use PS_USERSTYLE on WinNT (the next GDI limit appears
+	to be with lines width > 50); Render horizontal and vertical
+	dashed lines on Win9x 'by hand'. Dotted selection rectangles 
+	and Dia look nice ...
+
+	* gdk/win32/gdkprivate-win32.h : add pen_dashes pointer and
+	num_pen_dashes to _GdkGCWin32
+	* gdk/win32/gdkgc-win32.c : initialize pen_dashes and remove
+	the guesses from dashes to windoze line styles.
+	(predraw_set_forground) : always ExtCreatePen (PS_SOLID) on
+	Win9x, which does not support PS_USERSTYLE.
+	* gdk/win32/gdkdrawable-win32.c : new functions render_line_
+	<horizontal|vertical>. Use them if not running on NT in
+	gdk_win32_draw_<rectangle|segments|lines> ()
+
+	* gdk/win32/gdkkeys-win32.c (gdk_keyval_name) : return NULL
+	for keyval == 0 to avoid to have zeros in all menu entries 
+	without accelerator.
+
+2002-03-29  Jakub Steiner <jimmac@ximian.com>
+
+	* gtk/stock-icons/stock_add_24.png:
+	* gtk/stock-icons/stock_add_16.png:
+	* gtk/stock-icons/stock_remove_24.png:
+	* gtk/stock-icons/stock_remove_16.png: use a simple '+' and '-',
+	  works better. the old box was too clumsy
+
+Thu Mar 28 21:11:04 2002  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkfilesel.c (open_new_dir): when encountering non-UTF-8 file
+	names, alert the user with g_message() instead of g_warning() and
+	put out the actual conversion error.
+
+2002-03-28  Dave Camp  <dave@ximian.com>
+
+	* gtk/gtktreeview.c (install_scroll_sync_handler): Don't install
+	the handler if the widget isn't realized.
+
+2002-03-28  Jakub Steiner <jimmac@ximian.com>
+
+	* gtk/stock-icons/stock_font*:
+	* gtk/stock-icons/stock_align*:
+	* gtk/stock-icons/stock_text*: better solution to the dark theme
+	  problem. Also looks more pretty IMHO
+
+2002-03-27  Matthias Clasen  <maclas@gmx.de>
+
+	* configure.in: Try to find libpng via pkg-config first,
+	since libpng-1.2.2 will come with a .pc file.
+
+Wed Mar 27 11:10:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_real_remove): Set
+	page->last_focus_child to NULL as well as removing the
+	weak reference, to deal with reentrancy in set_focus_child().
+	(#76634, Dennis Björklund)
+
+2002-03-27  Murray Cumming  <murrayc@usa.net>
+ 
+ 	* gtk/gtktreeview.c: Corrected registered return type of
+	"move-cursor" signal. Had to add a marshaller to 
+ 	gtk/gtkmarshalers.list.
+	
+Tue Mar 26 14:46:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around
+	some more (position before realizing) fixing problems with 
+	arrows popping up at the wrong time (#73386), hopefully not
+	introducing other problems. (Reported by Ettore Perrazoli, others)
+
+2002-03-26  Dave Camp  <dave@ximian.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path
+	after calling gtk_tree_view_row_activated() rather than before.
+
+2002-03-25  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
+	font_description before assigning a new one.
+	(gtk_rc_parse_stock): always unref the created icon_set. #76289
+	
+2002-03-25  Mark McLoughlin  <mark@skynet.ie>
+
+	* gtk/gtkbindings.c: (gtk_binding_entry_add_signal),
+	kill code duplicated in gtk_binding_entry_add_signall.
+
+Sun Mar 24 10:32:38 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreemodel.c (gtk_tree_path_copy): Make path arg const, #75653
+
+	* gtk/gtkfontsel.c (gtk_font_selection_show_available_styles): fix
+	a warning
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): remove the grab
+	when we emit row_activated so that listeners of this signal can
+	grab the mouse, #75629
+
+2002-03-23  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktextlayout.c (gtk_text_layout_real_invalidate):
+	invalidate the line containing start, even if the [start,end)
+	range is empty (just invalidate [start,end], essentially).
+	Partially fixes #72374
+
+2002-03-23  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktextview.c (gtk_text_view_do_popup): end any selection in
+	progress, patch from db@zigo.dhs.org, #74620
+
+2002-03-23  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): extend
+	selection for pageup/pagedown and ctrl+pageup/pagedown if 
+	shift is held. more of #53934
+
+2002-03-23  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktextview.c (gtk_text_view_destroy_layout): disconnect 
+	layout handlers earlier in the function, to avoid possible
+	reentrancy screwups
+	(gtk_text_view_invalidate): Don't install idle handlers if 
+	layout == NULL, otherwise we get problems during finalization 
+	since clearing the buffer invalidates and puts the idle handlers
+	back after we destroy the layout. #74660
+	(gtk_text_view_ensure_layout): Install the validation handlers
+	right after creating the layout.
+
+	* gtk/gtktexttagtable.c (foreach_unref): call
+	_gtk_text_buffer_notify_will_remove_tag(), #75126
+
+2002-03-22  Havoc Pennington  <hp@pobox.com>
+
+	* gdk/x11/gdkfont-x11.c (gdk_fontset_load): add more explanatory
+	text to the error message about missing charsets, and use
+	g_printerr() not g_warning() since this is typically not a
+	programming error (we do not export any API to ask whether 
+	a font set will have missing charsets so apps realistically can't 
+	do anything other than try the gdk_fontset_load())
+
+	* gtk/gtktextview.c (gtk_text_view_key_press_event): return FALSE
+	if the text view isn't editable and the user presses Return, 
+	so default buttons and such can be activated, #74937
+
+	* gtk/gtktextbuffer.c (paste_from_buffer): don't insert 
+	if the insertion point is not editable and the paste 
+	is interactive, #74125
+
+	* gtk/gtkwindow.c (gtk_window_move_resize): enhance the #if 0
+	debug spew
+
+	* gtk/gtktextbuffer.c (cut_or_copy): only remove the previous 
+	cut/copied data right before replacing it, when we know we are
+	going to replace it. Fixes #74049
+
+2002-03-22  Richard Hult  <rhult@codefactory.se>
+
+	* gdk/gdkevents.c (gdk_event_get_root_coords): Fix typo, where x
+	value was assigned to both x and y.
+
+Fri Mar 22 11:29:11 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Partial fix for problem where keypad keys acted
+	as shift-arrows in an entry rather than arrows (#74327)
+
+	* gtk/gtkkeyhash.c (_gtk_key_hash_lookup): Sort lookup
+	results by number of modifiers in the entry. Fixes
+	problem where if a key matched both modified and unmodified
+	key bindings ... e.g., the distinguishing key binding
+	was consumed, then it was random which was used. 
+
+	* gtk/gtkbindings.c (gtk_binding_entries_sort_patterns): 
+	Catch the case where there are multiple entries from the
+	same bindingset (with different modifiers), and use only
+	the first entry, which, with the change in _gtk_key_hash_lookup()
+	will be the preferred value.
+
+Fri Mar 22 10:56:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkaccelmap.c (gtk_accel_map_save_fd): Fix memory
+	leak. (#74400, Morten Welinder.)
+
+	* gtk/gtkaccelmap.c: Properly handle short returns from
+	write() calls. (Handling EINTR isn't enough... that only
+	handles the case where you were interrupted before you
+	wrote a single byte.)
+	
+	* gdk/linux-fb/gdkmouse-fb.c gdk/linux-fb/gdkkeyboard-fb.c:
+	Robustify against short returns from write() calls.
+
+Fri Mar 22 10:12:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_paint): Change
+	G_BREAKPOINT() to g_assert_not_reached ().
+	(#75865, Ashok Venkiteswaran)
+	
+2002-03-22  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Don't clear
+	all of the pen_style, just the PS_STYLE_MASK. Seems to fix #74441,
+	but that is just the special case of one-pixel wide one-pixel
+	on-off dotted lines. To fully implement generic X11 style dashed
+	lines a major rewrite would be needed.
+
+2002-03-21  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkaccelgroup.c (gtk_accelerator_valid): Trivial typo
+	fix. (Vitaly Tishkov, #75726)
+
+Thu Mar 21 10:04:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkwindow.c (gdk_window_real_get_depth): Remove
+	some left over debugging code with a G_BREAKPOINT()
+	in it.
+
+Wed Mar 20 19:33:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkcalendar.c (gtk_calendar_main_button): When
+	changing months when the user clicks on a prev-month
+	or next-month day, focus and select the new day.
+	Ignore double clicks on prev-month, next-month days.
+	(Based on suggestions from Andras Salamon, #74173)
+
+	* gtk/gtkcalendar.c: Implement the focused/unfocused
+	selected color change.
+
+2002-03-20  Alex Larsson  <alexl@redhat.com>
+
+	Patches from Carlo E. Prelz <fluido@fluido.as>
+	Now gtkfb at least compiles and mostly works. The keyboard
+	stuff needs more loving.
+	
+	* gdk/linux-fb/gdkkeyboard-fb.c (xlate_get_for_keyval,
+	xlate_get_for_keycode, raw_get_for_keyval, raw_get_for_keycode):
+	At least set the out parameters for these calls.
+
+	* gdk/linux-fb/gdkmain-fb.c:
+	(gdk_pointer_grab_info_libgtk_only, gdk_keyboard_grab_info_libgtk_only):
+	Implement new functions.
+	
+Wed Mar 20 19:00:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_set_text): Short-circuit
+	the text to the exact same thing, so we don't 
+	unexpectedly change the selection or cursor position.
+	(#74290, John Ellis.)
+
+Thu Mar 21 00:05:14 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_get_background_area),
+	(gtk_tree_view_get_cell_area): fix logic (fixes #74235, #73593)
+
+Wed Mar 20 17:11:51 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkrc.c: Patch from Richard Hestilow to fix
+	gtk-font-name changes for widgets that get the actual
+	default style. (#73709)
+
+Wed Mar 20 22:59:23 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkrbtree.[ch]: add _gtk_rbtree_set_fixed_height()
+
+	* gtk/gtktreeprivate.h: add fixed_height_check field
+
+	* gtk/gtktreeview.c (gtk_tree_view_init): initialize
+	scroll_sync_timer and fixed_height_check
+	(do_validate_rows): add fixed_height_check. If all validated rows
+	in the first cycle have the same height, then we set that height for
+	the entire tree. This is some sort of 'fake' optimization, but helps
+	a lot for the common case. We keep validating the entire tree in
+	the background though.
+	(gtk_tree_view_set_model): reset fixed_height_check
+
+Wed Mar 20 16:36:08 2002  Owen Taylor  <otaylor@redhat.com>
+
+        * gtk/*.c: Patch from Erwann Chenede, #73900 fixing
+	a lot of warnings with Forte CC, mostly implicit
+	casts between void * and function pointers.
+	
+	* gdk/gdkevents.c (gdk_event_get_state): GdkEventVisibility's
+	state field is not a GdkModifierType. (Also #73900)
+
+Wed Mar 20 12:35:22 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_grab_default): Remove
+	leftover notification of has-default. (#75508, Jacob
+	Berkman.)
+
+Wed Mar 20 12:27:07 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkaccelgroup.c (gtk_accelerator_valid): Allow
+	arrow keys as accelerators, as long as some modifier
+	is pressed. (#75495)
+
+	* gtk/gtkaccelgroup.c (gtk_accelerator_valid): Fix
+	incorrect example in the docs.
+
+Wed Mar 20 12:06:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_set_child_visible):
+	Fix segfault when widget->parent is NULL. 
+	(#75615, Alexey A. Malyshev) 
+
+Wed Mar 20 11:32:07 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkentry.c: Improve test to prevent infinite
+	loop. (#74952, Thomas Leonard)
+
+	* gtk/gtkmenushell.c (gtk_real_menu_shell_cycle_focus):
+	Fix warning when toplevel menu shell isn't a menu
+	bar. (Thomas Leonard, #75602)
+
+Wed Mar 20 11:00:59 2002  Owen Taylor  <otaylor@redhat.com>
+
+        * configure.in: Use $PKG_CONFIG, not pkg-config.
+        (LEE Sau Dan, #75572)
+
+Wed Mar 20 10:55:56 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment
+	of time in scroll events. (Sven Neumann, #75574)
+
+2002-03-20  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use
+	gdk_window_get_toplevel(), as it is the top-level windows that are
+	registered for DND.
+
+	* gdk/win32/gdkwin32.h: Don't include gdkinternals.h.
+
+2002-03-19  jacob berkman  <jacob@ximian.com>
+
+	* gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when
+	gtk_combo_func() returns NULL (bug #75464)
+
+2002-03-18  jacob berkman  <jacob@ximian.com>
+
+	* gtk/gtkaspectframe.c (gtk_aspect_frame_class_init): set the
+	correct min/max values for the ratio property (fixes #75331)
+
+Mon Mar 18 11:55:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkimmulticontext.c (gtk_im_multicontext_get_slave):
+	Patch from Yao Zhang fixing reference count leak.
+
+	* gtk/gtkentry.c (gtk_entry_key_release): if (entry->editable),
+	not if (!entry->editable).
+
+Mon Mar 18 11:09:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_set_override_redirect): 
+	Fix backwards conditional. (#75019, Dan Winship.)
+
+Sun Mar 17 01:11:16 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_request): use
+	do_validate_rows instead of validate_rows_handler (fix by
+	Mike Pieper, #74126)
+
+Sat Mar 16 23:54:56 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_set_static_bit_gravity): just
+	return when we have an input_only window (fix by Owen Taylor)
+
+	* gtk/gtktreeprivate.h (struct _GtkTreeViewPrivate): add
+	scroll_sync_timer
+
+	* gtk/gtktreeview.c (install_scroll_sync_handler): new function,
+	(scroll_sync_handler): ditto,
+	(gtk_tree_view_unrealize): take scroll_sync_timer into account
+	(gtk_tree_view_row_deleted): install scroll_sync_timer instead of
+	calling top_row_to_dy/dy_to_top_row directly
+	-- this greatly speeds up clearing the model (#73199)
+
+	* gtk/gtktreemodelsort.c
+	(gtk_tree_model_sort_convert_path_to_child_path): fix up this function,
+	for some reason I really screwed it up (fixes #74663)
+
+2002-03-16  Sven Neumann  <sven@gimp.org>
+
+	* configure.in (GDK_PIXBUF_DEP_CFLAGS) (GDK_PIXBUF_XLIB_DEP_CFLAGS) 
+	(GDK_DEP_CFLAGS) (GTK_DEP_CFLAGS): include CFLAGS from gthread-2.0
+	so that the libs work correctly in a threaded environment.
+
+Fri Mar 15 12:51:42 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeviewcolumn.c
+	(gtk_tree_view_column_new_with_attributes): add example to docs,
+	as people are seeming to have trouble with this function.
+
+2002-03-15  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: Set MATH_LIB to empty also on Win32.
+
+Fri Mar 15 15:37:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkdrawable-x11.c (convert_to_format): 
+	Fix byte shift arithmetic for big-endian. (Tracked
+	down with help from Tuomas Kuosmanen)
+
+Fri Mar 15 11:28:41 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):
+	make args const, 74159
+	(gtk_tree_view_insert_column_with_attributes): ditto
+
+	* gtk/gtktreeviewcolumn.c
+	(gtk_tree_view_column_cell_process_action): remov unused variables.
+
+Fri Mar 15 13:31:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active
+	submenu".
+
+2002-03-15 Padraig O'Briain <padraig.obriain@sun.com>
+
+	* gdk/x11/gdkkeys-x11.c (update_keymaps): Fudge keymap to have lower
+	upper case variants if there is only a single keysym per keycode and
+	the key symbol has upper and lower case variants (#74512)
+
+Thu Mar 14 17:09:52 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkwindow.c (gdk_window_process_all_updates): Fix rather
+	improbable reentrancy problem if a window is destroyed
+	while updates are being processed on another window. (Noticed
+	by Michael Meeks, #74708)
+
+2002-03-14 Vitaly Tishkov <tvv@sparc.spb.su>
+
+        * gtk/gtktreemodelsort.c
+	typo in docs for gtk_tree_model_sort_convert_iter_to_child_iter() fixed
+
+
+Thu Mar 14 11:17:18 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkkeyhash.c (_gtk_key_hash_remove_entry): When
+	removing keys from the key hash, reinsert the right list
+	back into the hash. (Dave Camp, #74571)
+
+Wed Mar 13 17:17:40 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkobject.h: Remove left-over GTK_OBJECT_CONNECTED
+	macro that was defined in terms of the now-gone GTK_CONNECTED
+	flag. (Seth Burgess, #74028)
+
+Wed Mar 13 17:11:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkaccelgroup.c (accel_group_weak_ref_detach): Unset 
+	the acceleratable_groups qdata because qdata isn't removed
+	on ->dispose but rather on ->finalize. (#74569, found
+	by Matt Wilson.)
+
+Tue Mar 12 23:14:23 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix
+	cut-n-paste bug.
+
+Sat Mar  9 18:23:25 2002  Richard Hestilow  <hestilow@ximian.com>
+
+	* gtk/gtkimage.c (gtk_image_set_from_filename): Allow NULL
+	filenames.
+	
+Tue Mar 12 10:50:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress):
+	Fix incorrect return value, filter out returns of 0x7f for
+	the delete key. (#74179, Kang Jeong-He)
+
+Mon Mar 11 23:42:11 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken
+	foreach function.
+
+2002-03-11  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkitemfactory.c (gtk_item_factory_add_foreign): Document
+	gtk_{menu_item,widget}_set_accel_path() as the recommended API.  
+	(#69244)
+
+2002-03-11  James Henstridge  <james@daa.com.au>
+
+	* configure.in: set CCAS and CCASFLAGS to get automake 1.6
+	compatibility without breaking things for people using 1.4.
+
+Sun Mar 10 21:04:30 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): finally get the
+	right behavior.
+
+Mon Mar 11 01:25:14 2002  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): compare path with
+	cursor path and not with the selected iter in the 'decide to edit'
+	check
+
--- a/ChangeLog.gtk-async-file-chooser
+++ b/ChangeLog.gtk-async-file-chooser
@@ -1,514 +0,0 @@
-2006-04-30  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystem.[ch] (gtk_file_info_render_icon): remove the
-	caching code,
-	(gtk_file_info_get_icon_name): new function,
-	(gtk_file_system_volume_get_icon_name): new function,
-	(gtk_file_system_volume_render_icon): refactor to use
-	get_icon_name() and render the icon on the fly.
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_volume_render_icon),
-	(gtk_file_system_unix_volume_get_icon_name): reflect updates in
-	file system interface,
-	(get_fallback_icon): remove, along with icon caching code.
-
-	* gtk/gtk.symbols: updated.
-
-2006-04-30  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystemmodel.c (got_root_folder_cb), (ref_path_cb),
-	(get_children_get_folder_cb): don't leak the handle,
-	(got_root_folder_cb), (get_children_get_folder_cb): emit
-	row-inserted for the newly added nodes.
-
-2006-04-30  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (file_list_drag_data_select_uris),
-	(file_list_drag_data_received_get_info_cb),
-	(file_list_drag_data_received_cb): refactor code for selecting
-	multiple uris into file_list_drag_data_select_uris().
-
-2006-04-23  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserbutton.c (dnd_select_folder_get_info_cb): don't
-	leak handle,
-	(change_icon_theme_get_info_cb), (set_info_get_info_cb),
-	(model_add_special_get_info_cb), (update_label_get_info_cb): ditto.
-
-	* gtk/gtkfilechooserdefault.c (shortcuts_reload_icons_get_info_cb):
-	don't leak the handle,
-	(get_file_info_finished), (edited_idle_create_folder_cb),
-	(file_list_drag_data_received_get_info_cb),
-	(show_and_select_paths_get_folder_cb),
-	(update_current_folder_get_info_cb), (add_shortcut_get_info_cb),
-	(confirmation_confirm_get_info_cb), (action_create_folder_cb),
-	(save_entry_get_info_cb), (shortcuts_activate_volume_mount_cb),
-	(shortcuts_activate_get_info_cb), (update_from_entry_get_info_cb):
-	ditto.
-
-	* gtk/gtkfilechooserentry.c (load_directory_get_folder_callback):
-	don't leak the handle.
-
-	* gtk/gtkpathbar.c (set_button_image_get_info_cb),
-	(gtk_path_bar_get_info_callback): don't leak the handle.
-
-2006-04-23  Kristian Rietveld  <kris@imendio.com>
-
-	Review.
-
-	* gtk/gtkfilechooserdefault.c (shortcuts_reload_icons_get_info_cb):
-	don't forget to unref data->impl at the end.
-
-2006-04-23  Kristian Rietveld  <kris@imendio.com>
-
-	Review, continued.
-
-	* gtk/gtkfilechooserdialog.c (response_cb): set response_requested
-	to FALSE after stopping emission of the response signal.
-
-2006-03-16  Kristian Rietveld  <kris@imendio.com>
-
-	More review work.
-
-	* gtk/gtkfilechooserprivate.h: remove idle_finished_loading_source
-	from GtkFileSystemModel.
-
-	* gtk/gtkfilesystemmodel.c (gtk_file_system_model_finalize): remove
-	idle_finished_loading_source,
-	(idle_finished_loading_cb), (queue_finished_loading): removed,
-	(got_root_folder_cb): save a list walk, immediately emit
-	finished-loading and don't queue it, since we are already in an
-	idle here, always list_children() so the children the folder already
-	has are returned, 
-	(_gtk_file_system_model_new): handle the case where NULL is
-	returned by _get_folder(),
-	(_gtk_file_system_model_path_do): remove comment, and append the
-	new handle to the list, don't try to remove,
-	(get_children_get_folder_cb): save a list walk, remove the dummy
-	child if the _get_folder() call fails or is cancelled.
-
-2006-03-14  Kristian Rietveld  <kris@imendio.com>
-
-	More suggestions from Federico.
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_create_folder):
-	remove check for filename_is_root(), since we never hit that code
-	and else mkdir will fail anyway,
-	(gtk_file_system_unix_create_folder): fixup parent folder refresh
-	code.
-
-2006-03-14  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystemunix.c (read_hidden_file), (fill_in_hidden),
-	(get_is_hidden_for_file): factor out g_file_get_contents() code
-	in read_hidden_file().  (Federico Mena Quintero).
-
-2006-03-14  Kristian Rietveld  <kris@imendio.com>
-
-	Icon name code suggestions by Federico Mena Quintero.
-
-	* gtk/gtkfilesystemunix.c: add GTK_FILE_INFO_ICON to
-	STAT_NEEDED_MASK,
-	(get_fallback_icon_name), (get_fallback_icon),
-	(get_icon_name_for_directory), (get_special_icon_name): get rid
-	of strdups,
-	(get_icon_type_from_path): add a statbuf argument and use the
-	statbuf when folder_unix is NULL,
-	(create_file_info): adapt to work with above changes.
-
-2006-03-14  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_info): path
-	is NULL is an error here (gtk_file_system_get_info() already guards
-	path = NULL),
-	(gtk_file_system_unix_get_info): move basename creation to just
-	before create_file_info().  (Federico Mena Quintero).
-
-2006-03-14  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystemunix.c (struct _GtkFileFolderUnix): add
-	load_folder_id field,
-	(load_folder): add thread enter/leave construct, set load_folder_id
-	to zero since we have the idle removed when we return,
-	(gtk_file_system_unix_get_folder): initialize load_folder_id to 0
-	and store the source id of the load_folder idle,
-	(gtk_file_folder_unix_finalize): remove the load_folder idle
-	if necessary.  (Federico Mena Quintero).
-
-2006-03-14  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooser.c (gtk_file_chooser_get_current_folder): return
-	NULL if there is no current folder path.
-
-	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_map): we
-	reload the current folder if there is one, else we continue the
-	still pending load.
-
-2006-03-14  Kristian Rietveld  <kris@imendio.com>
-
-	Couple of fixes from Markku Vire.
-
-	* gtk/gtkfilesystem.c (gtk_file_info_copy): also strdup icon_name
-	and display_key.
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_create_folder):
-	initialize error to NULL,
-	(gtk_file_folder_unix_list_children): return an empty list for now if
-	we couldn't read the directory.
-
-2005-12-23  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb),
-	(gtk_file_chooser_default_update_current_folder): set and unset
-	busy cursor while checking whether the given path is a folder.
-
-2005-12-23  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystem.h: change the GtkFileInfo argument of the
-	GetInfoCallback to be const.
-
-	* gtk/gtkfilechooserbutton.c, gtk/gtkfilechooserdefault.c,
-	gtk/gtkpathbar.c: changes functions to reflect the above change.
-
-2005-12-23  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c, gtk/gtkfilechooserprivate.h: keep track
-	of handles, cancel all pending operations on dispose.
-
-2005-12-23  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserprivate.h (struct _GtkFileSystemModel): add
-	pending_handles field,
-	(struct _FileModelNode): add load_pending flag.
-
-	* gtk/gtkfilesystemmodel.c (gtk_file_system_model_dispose): introduce, 
-	cancel all pending operations here,
-	(got_root_folder_cb), (_gtk_file_system_model_new), (ref_path_cb),
-	(_gtk_file_system_model_path_do): keep track of all pending
-	operations, handle cancelled operations.
-
-2005-12-23  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_finalize),
-	(gtk_file_chooser_button_destroy): move all handle cancellations
-	and object unrefs to destroy.
-
-	* gtk/gtkpathbar.c (gtk_path_bar_finalize), (gtk_path_bar_dispose):
-	likewise.
-
-	* gtk/gtkfilechooserentry.c (gtk_file_chooser_entry_class_init): 
-	add dispose,
-	(gtk_file_chooser_entry_dispose): cancel handles and unrefs
-	objects here instead of finalize.
-
-2005-12-23  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystem.c (get_cached_icon): check if "name" is an
-	absolute path, if so load the icon from that file.
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): fix
-	the build.
-
-2005-12-21  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): remove
-	the FIXME since it doesn't make sense, when we return a cached
-	folder we won't emit finished-loading either,
-	(gtk_file_system_unix_create_folder): remove unused variable,
-	(gtk_file_folder_unix_list_children): remove unused code,
-	(get_is_hidden_for_file): new function,
-	(create_file_info): also handle getting is_hidden when called
-	without a folder unix (from _system_get_info() for example).
-
-2005-12-20  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (check_is_folder): fully removed!
-	woo!,
-	(check_save_entry): add is_folder argument,
-	(gtk_file_chooser_default_get_paths): update check_save_entry() call,
-	(get_display_name_for_folder): removed,
-	(confirmation_confirm_get_info_cb): new function which will
-	handle the confirmation dialog now we have all information for it,
-	(should_respond_after_confirm_overwrite): replace the call to
-	get_display_name_for_folder() with an asynchronous solution,
-	(action_create_folder_cb): request dialog response on successfull
-	folder creation,
-	(gtk_file_chooser_default_should_respond): update call to
-	check_save_entry(); replace the check is folder call for "path"
-	by just using the is_folder return value from check_save_entry();
-	replaced the check is folder call for "parent_path" with an
-	asynchronous setup, remainder of that work is now done in
-	save_entry_get_info_cb(),
-	(save_entry_get_info_cb): new function.
-
-	* gtk/gtkfilechoosermebed.[ch]: add response-requested signal.
-
-	* gtk/gtkfilechooserdialog.c, gtk/gtkfilechooserprivate.h: handle
-	response_requested signal.
-
-	* gtk/gtkfilechooserentry.[ch]
-	(_gtk_file_chooser_entry_get_is_folder): new function.
-
-2005-12-20  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (ref_path_cb): when called with
-	!folder, check if node is the node we are looking for (can be
-	triggered when we call ref_path_cb ourselves after a find_child_node),
-	(_gtk_file_system_model_path_do): introduce parent_node field;
-	after finding a child node in a loaded parent node, don't forget
-	to call ref_path_cb,
-	(get_children_get_folder_cb): don't forget to set data->node->folder
-	to the newly acquired folder.
-
-2005-12-20  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (show_and_select_paths_get_folder_cb):
-	handle case where the folder we get already finished loading.
-
-	* gtk/gtkfilesystemmodel.c (ref_path_cb),
-	(_gtk_file_system_model_path_do): make this work.
-
-2005-12-19  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (shortcuts_update_count): modify
-	in such a way that it can also negatively update the count on
-	failures,
-	(get_file_info_finished): handle failures, update save folder
-	combo box on success,
-	(shortcuts_insert_path): change the boolean return value into a
-	void one, also refilter the model and update the save folder combo
-	box for the non-asynchronous case,
-	(shortcuts_append_home), (shortcuts_append_desktop),
-	(shortcuts_add_volumes), (shortcuts_add_current_folder),
-	(add_shortcuts_get_info_cb): adapt to shortcuts_insert_path() updates.
-
-2005-12-19  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkpathbar.[ch]: add handle fields to ButtonData and
-	GtkPathBar; do correct handle bookkeeping.
-
-	* gtk/gtkfilesystemunix.c (load_folder),
-	(gtk_file_system_unix_get_folder),
-	(gtk_file_folder_unix_is_finished_loading): add is_finished_loading
-	field to GtkFileFolderUnix, which is set to true once we are
-	really finished with loading (previous assumption that we are
-	always finshed loading is not true anymore).
-
-	* gtk/gtkfilesystemmodel.c (got_root_folder_cb): if the folder is
-	finished loading, list the children and update the root level.
-
-	* gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb):
-	handle cancellation.
-
-2005-12-16  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystemunix.c: always call the callback, even when
-	cancelled; ref handles passed to the callback queue functions;
-	don't set cancelled to TRUE in _cancel_operation(), since operations
-	in this backend are always completed,
-	(get_special_icon_name): don't strdup the value of
-	get_icon_name_for_directory() again.
-
-	* gtk/gtkfilechooserbutton.c: adapt to new cancellation policy;
-	reference all objects which are passed as callback arguments; in the
-	callback check if the handles match.
-
-	* gtk/gtkfilechooserentry.c: likewise.
-
-	* gtk/gtkfilechooserdefault.c: likewise.  Also changed the shortcut
-	loading code to be more like the code in GtkFileChooserButton, where
-	we store all handles in the model and have model_row_free_data
-	cancel any pending operations,
-	(shortcuts_model_create): copy the error.
-
-	* gtk/gtkfilechooserprivate.h (struct _GtkFileChooserDefault): remove
-	loading_volumes and loading_bookmarks fields.
-
-	* gtk/gtkfilesystem.c (gtk_file_info_free): free icon_name here...
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (edited_idle_create_folder_cb): fix
-	thinko.
-
-	* gtk/gtkfilesystemunix.c (dispatch_create_folder_callback),
-	(queue_create_folder_callback): need to copy/free the path,
-	(gtk_file_system_unix_create_folder): put the "reget folder" hack
-	back in, though it's working different now.
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_finalize),
-	(dnd_select_folder_get_info_cb), (gtk_file_chooser_drag_data_received),
-	(change_icon_theme_get_info_cb), (change_icon_theme),
-	(model_add_special_get_info_cb), (model_add_special),
-	(update_label_get_info_cb), (update_label_and_image): cancel existing
-	operations, if any; added apprioriate fields to
-	GtkFileChooserButtonPrivate.
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserentry.c (gtk_file_chooser_entry_finalize): if
-	there's a folder loading, cancel the operation,
-	(load_directory_get_folder_callback): set the loading folder handle
-	to NULL,
-	(load_directory_callback): cancel any currently loading folders
-	before starting a new get folder operation.
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (shortcuts_insert_path): don't overwrite
-	data if it's already set (for example by the "is volume" case).
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserbutton.c (set_info_get_info_cb),
-	(set_info_for_path_at_iter): store a row reference in the temporary
-	data structure and not an iter,
-	(model_add_special), (model_update_current_folder),
-	(gtk_file_chooser_button_add_shorcut_folder): remove unused pixbuf
-	variable.
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (get_file_info_finished),
-	(shortcuts_insert_path): replace gtk_file_system_render_icon() call
-	with gtk_file_system_get_file_info(),
-	(gtk_file_chooser_default_add_shortcut_folder),
-	(gtk_file_chooser_default_remove_shortcut_folder): handle shortcuts
-	which are still loading.
-
-	* gtk/gtkfilechooserprivate.h: add shortcuts_loading field to
-	struct _GtkFileChooserDefault.
-
-	* gtk/gtkfilechooserbutton.c (set_info_get_info_cb),
-	(set_info_for_path_at_iter), (model_free_row_data): keep handle
-	and path together; now supports adding/removing shortcuts
-	which are still loading.
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystem.c: make the cancelled field an GObject property.
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystem.h: make the GError argument in the callbacks
-	const.
-
-	* gtk/gtkfilechooserbutton.c: update callbacks,
-	* gtk/gtkfilechooserentry.c: likewise,
-	* gtk/gtkfilechooserdefault.c: likewise,
-	* gtk/gtkfilesystemmodel.c: likewise,
-	* gtk/gtkpathbar.c: likewise.
-
-	* gtk/gtkfilechooserdefault.c (edited_idle_create_folder_cb): copy
-	the error which will be passed to error_creating_folder_dialog(),
-	(action_create_folder_cb): likewise,
-	(file_list_drag_data_received_get_info_cb): add forgotten GError
-	declaration.
-
-2005-12-13  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkpathbar.c (get_button_image), (set_button_image),
-	(set_button_image_get_info_cb),
-	(gtk_path_bar_update_button_appearance): update to new icon
-	rendering call.
-
-2005-12-09  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (file_list_drag_data_received),
-	(gtk_file_chooser_default_add_shortcut_folder),
-	(shortcuts_activate_get_info_cb): replace synchronous check_is_folder
-	calls with an async gtk_file_system_get_info() solution.
-
-2005-12-09  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilesystem.c (icon_cache_element_free), (icon_theme_changed),
-	(get_cached_icon), (gtk_file_info_render_icon): implement pixbuf
-	caching as found in the file system backends.
-
-2005-12-09  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtk.symbols: updated.
-
-	* gtk/gtkfilesystem.[ch] (struct GtkFileInfo): added icon_name field,
-	(enum GtkFileInfoType): added GTK_FILE_INFO_ICON,
-	(gtk_file_info_set_icon_name): new function,
-	(gtk_file_info_render_icon): new function,
-	(gtk_file_system_render_icon): removed.
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_render_icon): removed,
-	(create_file_info): fill icon_name field if required,
-	(get_*_icon): modified to suit create_file_info() better.
-
-	* gtk/gtkfilechooserbutton.c: modified to use
-	gtk_file_info_render_icon() instead of gtk_file_system_render_icon().
-
-	* gtk/gtkfilechooserdefault.c: likewise.
-
-2005-12-06  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (get_file_info_finished),
-	(update_current_folder_get_info_cb): fix mem leaks.
-
-	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_info): ditto.
-
-	* gtk/gtkpathbar.c (gtk_path_bar_set_path_finish): ditto.
-
-2005-12-06  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserbutton.c (dnd_select_folder_get_info_cb),
-	(gtk_file_chooser_button_drag_data_received): make asynchronous,
-	(update_label_and_image): remove unused variable.
-
-	* gtk/gtkfilechooserdefault.c
-	(gtk_file_chooser_default_update_current_folder): split in two
-	functions, so we can have the is_folder check back.
-	* gtk/gtkfilechooserprivate.h: add update_current_folder_handle
-	field.
-
-2005-12-06  Kristian Rietveld  <kris@imendio.com>
-
-	* gtk/gtkfilechooserdefault.c (show_and_select_paths): fixed a typo.
-
-2005-12-05  Federico Mena Quintero  <federico@ximian.com>
-
-	(merge from HEAD)
-
-	* gtk/gtkfilechooserdefault.c (trap_activate_cb): "event->state &
-	modifiers", not "event->state && modifiers".  Patch by Sadrul
-	Habib Chowdhury <imadil@gmail.com>.  Fixes bug #323073.
-
-2005-12-06  Kristian Rietveld  <kris@imendio.com>
-
-	Beginnings of an asynchronous file chooser.
-
-	* gtk/gtkfilechooserbutton.c: display name and the is folder property
-	are now asynchronously set using set_info_for_at_path_iter(), the
-	is folder property is now also stored in the tree model.
-
-	* gtk/gtkfilechooserdefault.c: lots of changes to the shortcuts
-	model code to make it operate asynchronously, check_is_folder() has
-	been "disabled" for now, all other synchronous calls were
-	replaced with asychronous ones.
-
-	* gtk/gtkfilechooserentry.c: update call to 
-	gtk_file_system_get_folder().
-
-	* gtk/gtkfilechooserprivate.h: added two fields.
-
-	* gtk/gtkfilesystem.[ch]: for about 85% changed to the changes
-	outlined in the proposal discussed on gtk-devel-list.
-
-	* gtk/gtkfilesystemmodel.[ch]: updated all asynchronous calls,
-	_gtk_file_system_model_path_do() basically had to be rewritten
-	(and I still need to finish that).
-
-	* gtk/gtkfilesystemunix.c: changed to be compatible with the new
-	GtkFileSystem interface.
-
-	* gtk/gtkpathbar.c (button_clicked_cb): block/unblock the
-	button_clicked_cb callback around the call to
-	gtk_toggle_button_set_active(), avoids button_clicked_cb getting
-	called twice.
-	(_gtk_path_bar_set_path): refactored to be asynchronous.
--- a/ChangeLog.gtk-printing
+++ b/ChangeLog.gtk-printing
@@ -1,500 +0,0 @@
-2006-04-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* docs/tools/widgets.c (get_all_widgets): Add print dialog
-	and page setup dialog.
-
-2006-04-11  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkpapersize.c (gtk_paper_size_get_display_name):
-	Call gettext on the standard paper names. 
-
-2006-04-11  Alexander Larsson  <alexl@redhat.com>
-
-	* gdk/gdk.symbols:
-	* gdk/win32/gdkevents-win32.c:
-	* gdk/win32/gdkwin32.h:
-	Add gdk_win32_set_modal_dialog_libgtk_only that we
-	need for handling the mainloop in the print dialogs.
-
-	* gtk/gtkprintoperation-win32.c:
-	Pump the gtk+ mainloop when needed in the print dialogs.
-	This means gtk+ windows will redraw while the print dialogs
-	are up.
-
-2006-04-10  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprintoperation-win32.c: 
-	Better size handling.
-	Save win32-specific settings in additions to the generic ones
-	if the generic one is lossy.
-
-2006-04-10  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprintoperation-win32.c:
-	Finish implementing run_page_setup_dialog.
-
-	* gtk/gtkpagesetup.h:
-	* gtk/gtkpapersize.h:
-	* gtk/gtkprint-win32.h:
-	* gtk/gtkprintcontext.h:
-	* gtk/gtkprinter-private.h:
-	* gtk/gtkprintoperation-private.h:
-	* gtk/gtkprintoperation-unix.c:
-	* gtk/gtkprintoperation.h:
-	* gtk/gtkprintsettings.h:
-	s/EGG/GTK/
-
-2006-04-09  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk+-unix-print-2.0.pc.in: Fix a typo  (#337698)
-
-2006-04-07  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/paper_names_offsets.c: 
-	* gtk/gen-paper-names.c: Correct the suffix/duplicate optimizations.
-
-2006-04-07  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprintoperation-win32.c:
-	Initial work on gtk_print_run_page_setup_dialog.
-	Not reading margins yet.
-
-2006-04-07  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/Makefile.am:
-	Link to winspool
-	
-	* gtk/gtk.symbols:
-	* gtk/gtkprintoperation-private.h:
-	* gtk/gtkprintoperation-unix.c:
-	* gtk/gtkprintoperation.[ch]: 
-	Add gtk_print_operation_get_status_string() and status
-	string to _gtk_print_operation_set_status.
-	Rename GTK_PRINT_STATUS_PROCESSING to GTK_PRINT_STATUS_PRINTING.
-	
-	* gtk/gtkprintoperation-win32.c:
-	Poll for status updates
-	
-	* modules/printbackends/cups/gtkprintbackendcups.c:
-	Rename GTK_PRINT_STATUS_PROCESSING to GTK_PRINT_STATUS_PRINTING.
-	
-	* tests/print-editor.c:
-	Show print status string
-
-2006-04-06  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/paper_names_offsets.c: 
-	* gtk/gtkpapersize.c: Save 4K of .data by converting
-	the array of paper names to offsets. 
-
-	* gtk/gen-paper-names.c: Utility used to create
-	paper_names_offsets.c from paper_names.c.
-
-	* gtk/Makefile.am: Necessary glue.
-
-2006-04-06  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprintoperation-win32.c: 
-	Use glib base64 code.
-	Set up manual_* vars fully.
-
-2006-04-06  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/Makefile.am:
-	Add -lcomdlg32 on win32
-	
-	* gtk/gtkprint-win32.h:
-	Move WINVER define to .c files
-	
-	* gtk/gtk.symbols:
-	* gtk/gtkprintoperation-win32.c:
-	Add empty gtk_print_run_page_setup win implementation
-	Move WINVER define to this file
-	
-	* modules/Makefile.am:
-	Only build print backends on unix
-
-2006-04-05  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkprintunixdialog.c:
-	* gtk/gtkprintoperation-unix.c: Use GTK_RESPONSE_CANCEL/OK
-	instead of GTK_RESPONSE_REJECT/ACCEPT, to make Esc close
-	the dialog, and to not use values which are documented
-	as reserved for apps.
-
-2006-04-05  Alexander Larsson  <alexl@redhat.com>
-
-	* modules/printbackends/lpr/gtkprintbackendlpr.c:
-	Don't hardcode lpr command, expose full commandline.
-
-2006-04-05  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpagesetupunixdialog.c:
-	* gtk/gtkprintunixdialog.c:
-	Don't check for printer changes after dialog is dead.
-	
-	* gtk/gtkprintbackend.c: (gtk_print_backend_load_modules):
-	Strip whitespace from backend strings
-	
-	* gtk/gtkprintbackend.h:
-	Add private printer functions
-	
-	* gtk/gtkprinter-private.h:
-	Move GtkPrinterPrivate into gtkprinter.c
-	
-	* gtk/gtkprinter.[ch]:
-	Move GtkPrinterPrivate into gtkprinter.c
-	Add new construct properties.
-	Add setter functions.
-	
-	* modules/printbackends/cups/gtkprintbackendcups.c:
-	* modules/printbackends/cups/gtkprintercups.[ch]:
-	Update to new APIs.
-	
-	* modules/printbackends/lpr/Makefile.am:
-	* modules/printbackends/lpr/gtkprintbackendlpr.c:
-	* modules/printbackends/lpr/gtkprinterlpr.[ch]
-	Update to new APIs.
-	Remove GtkPrinterLPR.
-	Read/Save command line option in settings
-	
-	* modules/printbackends/pdf/Makefile.am:
-	* modules/printbackends/pdf/gtkprintbackendpdf.c:
-	* modules/printbackends/pdf/gtkprinterpdf.[ch]:
-	Update to new APIs.
-	Remove GtkPrinterPDF.
-
-2006-04-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkprintoperation.h: Add missing standard
-	GObject macros.  (#337277, Yevgen Muntyan)
-
-2006-04-04  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprinteroption.[ch]:
-	Add gtk_printer_option_has_choice.
-	
-	* gtk/gtkprintunixdialog.c:
-	* modules/printbackends/cups/gtkprintbackendcups.c:
-	Add support for "print at time".
-
-2006-04-04  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpapersize.c:
-	Handle ppd names with ".Transverse" suffix
-	Don't force width < height
-	
-	* gtk/gtkprinteroption.c:
-	Make sure that value is never NULL.
-	
-	* modules/printbackends/cups/gtkprintbackendcups.c:
-	Add some HP whitelist names
-	Remove spew from ignored options.
-
-2006-04-03  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpagesetupunixdialog.c:
-	Fix warnings
-	
-	* gtk/gtkprinter-private.h:
-	* gtk/gtkprinter.[ch]:
-	Add gtk_printer_is_default.
-	
-	* gtk/gtkprintunixdialog.c:
-	Use gtk_printer_is_default.
-	
-	* modules/printbackends/cups/gtkprintbackendcups.c:
-	Get default printer info
-	
-	* modules/printbackends/pdf/gtkprintbackendpdf.c:
-	Fix warning.
-
-2006-04-03  Alexander Larsson  <alexl@redhat.com>
-
-	* modules/printbackends/pdf/gtkprintbackendpdf.c:
-	* modules/printbackends/pdf/gtkprinterpdf.[ch]:
-	Correctly read/write/use the output filename setting.
-
-2006-04-03  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpagesetupunixdialog.c:
-	Disable margin from printers if there are no printers.
-	
-	* gtk/gtkpapersize.c:
-	Fix build.
-
-2006-04-01  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk.symbols: protect unix-only symbols by 
-	G_OS_UNIX (#336819, Yevgen Muntyan)
-
-	* gtk/gtkpapersize.c: Win32 fixes.  (#336806, Yevgen Muntyan)
-
-2006-03-30  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtk.symbols:
-	Update
-	
-	* gtk/gtkprintbackend.[ch]:
-	Add dnotify to gtk_print_backend_print_stream
-	
-	* gtk/gtkprinter-private.h:
-	Declare gtk_print_job_set_status
-	
-	* gtk/gtkprinter.[ch]:
-	Remove gtk_printer_prepare_job.
-	
-	* gtk/gtkprintjob.[ch]:
-	Now you create print job directly with gtk_print_job_new() and
-	they'll be prepared automatically.
-	Add status_changed signal and get_status.
-	Add gtk_print_job_set_source_file to allow sending a file.
-	
-	* gtk/gtkprintoperation-private.h:
-	Add destroy notify for platform_data.
-	Declare _gtk_print_operation_set_status.
-	
-	* gtk/gtkprintoperation-unix.c:
-	Hook up status change handling.
-	Use the new way to get a print job.
-
-	* gtk/gtkprintoperation.[ch]:
-	Add status_changed signal and get_status/is_finished.
-
-	
-	* modules/printbackends/cups/gtkprintbackendcups.c:
-	* modules/printbackends/lpr/gtkprintbackendlpr.c:
-	* modules/printbackends/pdf/gtkprintbackendpdf.c:
-	Update to use new APIs and set status on the job.
-	Cups polls for the status.
-	
-	* tests/print-editor.c:
-	Track the print operations in the status bar.
-
-2006-03-30  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/Makefile.am:
-	* gtk/gtkprintbackend.c:
-	Default to "pdf,cups" if we found cups, and
-	"pdf,lpr" otherwise.
-
-2006-03-29  Matthias Clasen  <mclasen@redhat.com>
-
-	* modules/printbackends/Makefile.am: 
-	* configure.in: Don't build the cups backend 
-	if cups is not there.
-
-2006-03-29  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtk.symbols:
-	gtk_printer_prep_job -> gtk_printer_prepare_job
-	gtk_print_job_prep -> gtk_print_job_prepare
-	
-	* gtk/gtkprintbackend.h:
-	* gtk/gtkprinter-private.h:
-	* gtk/gtkprinter.[ch]:
-	Add print_job argument to printer_prepare_for_print
-	gtk_printer_prep_job -> gtk_printer_prepare_job
-	
-	* gtk/gtkprintjob.[ch]:
-	Add manual rendering settings to GtkPrintJob.
-	gtk_print_job_prep -> gtk_print_job_prepare
-	
-	* gtk/gtkprintoperation-private.h:
-	* gtk/gtkprintoperation-unix.c:
-	* gtk/gtkprintoperation.c:
-	Get more manual_* settings working.
-	Run mainloop after each printed page.
-
-	* gtk/gtkprintunixdialog.c:
-	Save page ranges.
-	
-	* modules/printbackends/cups/gtkprintbackendcups.c:
-	* modules/printbackends/lpr/gtkprintbackendlpr.c:
-	* modules/printbackends/pdf/gtkprintbackendpdf.c:
-	Now put the manual_* settings inside the PrintJob in
-	prepare_for_print.
-
-2006-03-29  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprintunixdialog.c:
-	Make sure we remember the format-for printer.
-	Also, use it as the default if set.
-
-2006-03-28  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprintunixdialog.c:
-	Remove unnecessary padding under list.
-	
-2006-03-28  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpagesetupunixdialog.c:
-	* gtk/gtkprintunixdialog.c:
-	More HIGy layout.
-
-2006-03-28  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpagesetupunixdialog.c:
-	HIG conformance of spacing and titles.
-	
-	* gtk/gtkprintunixdialog.c:
-	Use standard constructor form print button too.
-
-2006-03-27  Matthias Clasen  <mclasen@redhat.com>
-
-	* modules/printbackends/*/Makefile.am: Fix 
-	a problem with builddir != srcdir builds.
-	(#335915, Yevgen Muntyan)
-
-2006-03-27  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkprintbackend.c: Simply the syntax
-	of the setting to "cups,pdf", and get rid
-	of the GScanner used to parse it.
-
-2006-03-27  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkprintunixdialog.c:
-	Reorder print list so status is at the end.
-	Ellipsize the status column.
-
-2006-03-27  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpagesetupunixdialog.c:
-	Handle removed printers and status-changed.
-	Handle NULL printer location.
-
-2006-03-27  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/Makefile.am:
-	* gtk/stock-icons/24/gtk-orientation-landscape.png:
-	* gtk/stock-icons/24/gtk-orientation-portrait.png:
-	* gtk/stock-icons/24/gtk-orientation-reverse-landscape.png:
-	* gtk/gtkiconfactory.c: (get_default_icons):
-	* gtk/gtkstock.h:
-	Add orientation stock icons.
-	
-	* gtk/gtkpagesetupunixdialog.c:
-	Use the orientation icons.
-
-2006-03-27  Alexander Larsson  <alexl@redhat.com>
-
-	* gtk/gtkpagesetupunixdialog.c:
-	* gtk/gtkprintjob.c:
-	* gtk/gtkprintoperation-unix.c:
-	* gtk/gtkprintunixdialog.c:
-	s/impl/dialog/
-	Don't prefix static functions with _
-
-2006-03-26  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtkprintunixdialog.c: Don't use _(""). (#335898,
-	Christian Persch)
-
-	* modules/printbackends/*: Don't use G_DEFINE_TYPE
-	in modules.
-
-	* gtk/gtkprintbackend.c: Remove an unused static function.
-
-2006-03-25  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtk.symbols: Add printing symbols
-
-	* gtk/gtkpapersize.[hc]: 
-	* gtk/gtkpage*.[hc]: 
-	* gtk/gtkprint*.[hc]: Add aliasing, #include cleanups.
-
-	* gtk/gtkprintcontext.h:
-	* gtk/gtkprintoperation.h:
-	* gtk/gtkprintsettings.h: Make get_type function const.
-
-	* modules/printbackends/pdf/gtkprintbackendpdf.c: Remove
-	C99ism.
-
-	* modules/printbackends/cups/gtkcupsutils.c: Use unsigned
-	integers for bitfields.
-
-2006-03-24  Matthias Clasen  <mclasen@redhat.com>
-
-	* gtk/gtknotebook.c: Fix docs
-
-	* gtk/Makefile.am (EXTRA_DIST): Add the stock icons here.
-
-	* gdk/directfb/Makefile.am (EXTRA_DIST): Remove ChangeLog,
-	to make make dist happier.
-
-2006-03-24  Alexander Larsson  <alexl@redhat.com>
-
-	* configure.in:
-	* gtk/gtkprintbackend.c:
-	* modules/printbackends/Makefile.am:
-	* modules/printbackends/cups/Makefile.am:
-	* modules/printbackends/lpr/Makefile.am:
-	* modules/printbackends/lpr/gtkprintbackendlpr.[ch]:
-	* modules/printbackends/lpr/gtkprinterlpr.[ch]:
-	* modules/printbackends/pdf/Makefile.am:
-	* modules/printbackends/pdf/gtkprintbackendpdf.[ch]:
-	* modules/printbackends/pdf/gtkprinterpdf.[ch]:
-	Import pdf and lpr backend
-
-2006-03-24  Alexander Larsson  <alexl@redhat.com>
-
-        Import print-operation into gtk+
-	
-	* .cvsignore:
-	* Makefile.am:
-	* gtk+-unix-print-2.0.pc.in:
-	Add gtk+-unix-print-2.0.pc
-	
-	* configure.in:
-	Look for cups
-	Look for various _NL_* extensions
-	Output new makefiles and .pc.in
-	
-	* gtk/Makefile.am:
-	Add new files
-	
-	* gtk/gtk.h:
-	Include gtkprintoperation.h
-	
-	* gtk/gtkenums.h:
-	Add printing enums
-	
-	* gtk/gtkmarshalers.list:
-	Add required new marshallers
-	
-	* gtk/gtkpagesetup.[ch]:
-	* gtk/gtkpagesetupunixdialog.[ch]:
-	* gtk/gtkpagesetupunixdialog.h:
-	* gtk/gtkpapersize.[ch]:
-	* gtk/gtkprint-win32.[ch]:
-	* gtk/gtkprintbackend.[ch]:
-	* gtk/gtkprintcontext.[ch]:
-	* gtk/gtkprinter-private.h:
-	* gtk/gtkprinter.[ch]:
-	* gtk/gtkprinteroption.[ch]:
-	* gtk/gtkprinteroptionset.[ch]:
-	* gtk/gtkprinteroptionwidget.[ch]:
-	* gtk/gtkprintjob.[ch]:
-	* gtk/gtkprintoperation-private.h:
-	* gtk/gtkprintoperation-unix.c:
-	* gtk/gtkprintoperation-win32.c:
-	* gtk/gtkprintoperation.[ch]:
-	* gtk/gtkprintsettings.[ch]:
-	* gtk/gtkprintunixdialog.[ch]:
-	* gtk/paper_names.c:
-	Generic printing support
-	
-	* modules/Makefile.am:
-	* modules/printbackends/Makefile.am:
-	* modules/printbackends/cups/Makefile.am:
-	* modules/printbackends/cups/gtkcupsutils.[ch]:
-	* modules/printbackends/cups/gtkprintbackendcups.[ch]:
-	* modules/printbackends/cups/gtkprintercups.[ch]:
-	Cups backend
-	
-	* tests/.cvsignore:
-	* tests/Makefile.am:
-	* tests/print-editor.c:
-	Add printing test app
-
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -7981,7 +7981,7 @@ Thu Jun  4 02:20:42 1998  Tim Janik  <timj@gtk.org>
 	* gtk/gtkwidget.h:
 	* gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
 	the emission of the "add-accelerator" signal on a widget. this is
-	useful to prevent accelerator installation on certain widgets.
+	usefull to prevent accelerator installation on certain widgets.

 	* gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
 	labels left justified, by setting their alignment. stop accelerator
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -17108,7 +17108,7 @@ Tue Jan 16 13:13:13 GMT 2001  Tony Gale <gale@gtk.org>
 	Use fb_mem, fb_stride, fb_width, fb_height.
 	Added recompute_rowstride to reset the rowstride of all windows.
 	Added gdk_fb_recompute_all() which recomputes rootwindow size,
-	window abs positions and window rowstrides. Useful when the
+	window abs positions and window rowstrides. Usefull when the
 	rotation has changed.

 Thu Jan 11 13:16:50 GMT 2001  Tony Gale <gale@gtk.org>
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
--- a/ChangeLog.pre-2-14
+++ b/ChangeLog.pre-2-14
--- a/ChangeLog.pre-2-16
+++ b/ChangeLog.pre-2-16
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
--- a/79
+++ b/79
@@ -1,64 +1,55 @@
 If you want to hack on the GTK+ project, you'll need to have
 the following packages installed:

-        - GNU autoconf 2.54
-        - GNU automake 1.7
-        - GNU libtool 1.4
-        - indent (GNU indent 1.9.1 is known good)
-        - GNU gettext 10.40
+	- GNU autoconf 2.52
+	- GNU automake 1.4
+	- GNU libtool 1.4
+	- indent (GNU indent 1.9.1 is known good)
+	- GNU gettext 10.40

 These should be available by ftp from ftp.gnu.org or any of the
 fine GNU mirrors.  Beta software can be found at alpha.gnu.org.

-Up-to-date instructions about developing GNOME applications and libraries
-can be found here:
-
-        http://library.gnome.org/devel/
-
-Information about using git with GNOME can be found here:
-
-        http://live.gnome.org/Git
-
-In order to get GIT gtk+ installed on your system, you need to have
-the most recent GIT versions of glib, pango, and atk installed as well.
+In order to get CVS gtk+ installed on your system, you need to have
+the most recent CVS version of glib, pango, and atk installed as well.
 The installation process of these libraries is similar to that of gtk+, but
 needs to be fulfilled prior to installation of gtk+.

-If at all possible, please use GIT to get the latest development version of
-gtk+ and glib. You can do the following to get glib and gtk+ from GIT:
-
-        $ git clone git://git.gnome.org/glib
-        $ git clone git://git.gnome.org/pango
-        $ git clone git://git.gnome.org/atk
-        $ git clone git://git.gnome.org/gtk+
-
-Note: if you plan to push changes to back to the master repository and
-have a gnome account, you want to use the following instead:
-
-        $ git clone ssh://<username>@git.gnome.org/git/gtk+
-
-To compile the GIT version of gtk+ on your system, you will need to take
+To compile a CVS version of gtk+ on your system, you will need to take
 several steps to setup the tree for compilation.  You can do all these
 steps at once by running:

-        gtk+$ ./autogen.sh
-
+        cvsroot/gtk+# ./autogen.sh
+   
 Basically this does the following for you:

-        gtk+$ aclocal; automake; autoconf
+  	cvsroot/gtk+# aclocal; automake; autoconf

-The above commands create the `configure' script.  Now you
-run the `configure' script in `gtk+/' to create all Makefiles.
-More information about that in `INSTALL'.
+        The above commands create the "configure" script.  Now you
+	can run the configure script in cvsroot/gtk+ to create all
+	the Makefiles.

-Before running `autogen.sh' or `configure', make sure you have libtool
-in your path.
+Before running autogen.sh or configure, make sure you have libtool 
+in your path.  

 Note that autogen.sh runs configure for you.  If you wish to pass
-options like `--prefix=/usr' to `configure' you can give those options
-to `autogen.sh' and they will be passed on to `configure'.
+options like --prefix=/usr to configure you can give those options
+to autogen.sh and they will be passed on to configure.
+
+If at all possible, please use CVS to get the latest development version of
+gtk+ and glib.  You can do the following to get glib and gtk+ from cvs:
+
+   $ export CVSROOT=':pserver:anonymous@cvs.gnome.org:/cvs/gnome'
+   $ cvs login
+     (there is no password, just hit return)
+   $ cvs -z3 checkout glib
+   $ cvs -z3 checkout pango
+   $ cvs -z3 checkout atk
+   $ cvs -z3 checkout gtk+
+
+For information about submitting patches and commiting changes
+to CVS, see the README and README.cvs-commits files. In particular, 
+don't, under any circumstances, commit anything to CVS before
+reading and understanding README.cvs-commmits.
+

-For information about submitting patches and pushing changes
-to GIT, see the `README' and `README.commits' files. In particular,
-don't, under any circumstances, push anything to GIT before
-reading and understanding `README.commmits'.
--- a/41
+++ b/41
@@ -0,0 +1,41 @@
+Prerequisites
+=============
+
+GTK+ requires the following packages:
+
+ - The GLib, Pango, and Atk libraries, available at the same location as GTK+
+
+ - The TIFF, PNG, and JPEG image loading libraries. You most
+   likely have these installed on your system already. If not
+   these libraries are available from:
+
+    http://www.libtiff.org/
+    ftp://swrinde.nde.swri.edu/pub/png/src/
+    ftp://ftp.uu.net/graphics/jpeg/
+
+   If these libraries are not available, the corresponding 
+   image loaders will simply not be built. However, this
+   may cause applications using GTK+ not to function properly.
+
+Simple install procedure
+========================
+
+  % gzip -cd gtk+-2.0.2.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.0.2			   # change to the toplevel directory
+  % ./configure				   # run the `configure' script
+  % make				   # build GTK
+  [ Become root if necessary ]
+  % make install			   # install GTK
+
+The Details
+===========
+
+Complete information about installing GTK+ and related libraries can be found 
+in the file:
+
+ docs/reference/gtk/docs/reference/gtk/html/gtk-building.html
+
+Or online at:
+
+ http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html
+
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -3,13 +3,19 @@ Prerequisites

 GTK+ requires the following packages:

- - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at
-   the same location as GTK+. GTK+ @GTK_VERSION@ requires at least
-   GLib @GLIB_REQUIRED_VERSION@, Pango @PANGO_REQUIRED_VERSION@,
-   GdkPixbuf @GDK_PIXBUF_REQUIRED_VERSION@, ATK @ATK_REQUIRED_VERSION@
-   and cairo @CAIRO_REQUIRED_VERSION@.
+ - The GLib, Pango, and Atk libraries, available at the same location as GTK+

- - gobject-introspection 0.9.3 or newer.
+ - The TIFF, PNG, and JPEG image loading libraries. You most
+   likely have these installed on your system already. If not
+   these libraries are available from:
+
+    http://www.libtiff.org/
+    ftp://swrinde.nde.swri.edu/pub/png/src/
+    ftp://ftp.uu.net/graphics/jpeg/
+
+   If these libraries are not available, the corresponding 
+   image loaders will simply not be built. However, this
+   may cause applications using GTK+ not to function properly.

 Simple install procedure
 ========================
@@ -17,9 +23,9 @@ Simple install procedure
  % gzip -cd gtk+-@GTK_VERSION@.tar.gz | tar xvf - # unpack the sources
  % cd gtk+-@GTK_VERSION@			   # change to the toplevel directory
  % ./configure				   # run the `configure' script
-  % make				   # build GTK+
+  % make				   # build GTK
  [ Become root if necessary ]
-  % make install			   # install GTK+
+  % make install			   # install GTK

 The Details
 ===========
@@ -27,8 +33,9 @@ The Details
 Complete information about installing GTK+ and related libraries can be found 
 in the file:

- docs/reference/gtk/html/gtk-building.html
+ docs/reference/gtk/docs/reference/gtk/html/gtk-building.html

 Or online at:

- http://library.gnome.org/devel/gtk/stable/gtk-building.html
+ http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html
+
--- a/12
+++ b/12
@@ -1,12 +0,0 @@
-Matthias Clasen
-E-mail: mclasen@redhat.com
-Userid: matthiasc
-
-Tim Janik
-E-mail: timj@gtk.org
-Userid: timj
-
-Note that a lot of people are contributing to GTK+, and some parts of it 
-are technically maintained by other people. The people listed above are
-meant as contacts for administrative questions such as cvs accounts. Other
-questions are best directed to the mailing list gtk-devel-list@gnome.org.
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,125 +1,167 @@
 ## Makefile.am for GTK+
-include $(top_srcdir)/Makefile.decl

-SRC_SUBDIRS = gdk gtk modules demos tests perf examples
-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
+SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros

-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+# require automake 1.4
+AUTOMAKE_OPTIONS = 1.4

-EXTRA_DIST +=			\
-	autogen.sh		\
+EXTRA_DIST =			\
 	HACKING			\
+	gtk+.spec.in		\
 	makecopyright		\
 	NEWS.pre-1-0		\
 	ChangeLog.pre-1-0	\
 	ChangeLog.pre-1-2	\
-	ChangeLog.pre-2-0	\
-	ChangeLog.pre-2-2	\
-	ChangeLog.pre-2-4	\
-	ChangeLog.pre-2-6	\
-	ChangeLog.pre-2-8	\
-	ChangeLog.pre-2-10	\
-	ChangeLog.pre-2-12	\
-	ChangeLog.pre-2-14	\
-	ChangeLog.pre-2-16	\
-	ChangeLog.gtk-async-file-chooser	\
-	ChangeLog.gtk-printing	\
-	README.commits	\
+	README.cvs-commits	\
 	README.win32		\
+	README.nanox		\
 	config.h.win32		\
-	makefile.msc	\
-	gtk-zip.sh.in		\
+	gtk-zip.sh		\
 	sanitize-la.sh		\
+	po/README.tools		\
 	po/README.translators	\
-	po/po2tbl.sed.in
-
-MAINTAINERCLEANFILES = \
-	$(srcdir)/INSTALL \
-	$(srcdir)/README \
-	$(srcdir)/aclocal.m4 \
-	$(srcdir)/autoscan.log \
-	$(srcdir)/compile \
-	$(srcdir)/config.guess \
-	$(srcdir)/config.h.in \
-	$(srcdir)/config.sub \
-	$(srcdir)/configure.scan \
-	$(srcdir)/depcomp \
-	$(srcdir)/install-sh \
-	$(srcdir)/ltmain.sh \
-	$(srcdir)/missing \
-	$(srcdir)/mkinstalldirs \
-	$(srcdir)/omf.make \
-	$(srcdir)/xmldocs.make \
-	$(srcdir)/gtk-doc.make \
-	$(srcdir)/ChangeLog \
-	`find "$(srcdir)" -type f -name Makefile.in -print`
+	po/desk.pl		\
+	po/makefile.mingw	\
+	po/update.pl		\
+	po/po2tbl.sed.in	\
+	examples/aspectframe/Makefile  \
+	examples/aspectframe/aspectframe.c  \
+	examples/Makefile  \
+	examples/README.1ST  \
+	examples/extract.awk  \
+	examples/extract.sh  \
+	examples/arrow/Makefile	\
+	examples/arrow/arrow.c	\
+	examples/base/Makefile  \
+	examples/base/base.c  \
+	examples/buttonbox/Makefile \
+	examples/buttonbox/buttonbox.c	\
+	examples/buttons/Makefile  \
+	examples/buttons/buttons.c  \
+	examples/buttons/info.xpm  \
+	examples/calendar/Makefile  \
+	examples/calendar/calendar.c  \
+	examples/clist/Makefile  \
+	examples/clist/clist.c  \
+	examples/entry/Makefile  \
+	examples/entry/entry.c  \
+	examples/eventbox/Makefile  \
+	examples/eventbox/eventbox.c  \
+	examples/filesel/Makefile  \
+	examples/filesel/filesel.c  \
+	examples/gtkdial/Makefile  \
+	examples/gtkdial/dial_test.c  \
+	examples/gtkdial/gtkdial.c  \
+	examples/gtkdial/gtkdial.h  \
+	examples/helloworld/Makefile  \
+	examples/helloworld/helloworld.c  \
+	examples/helloworld2/Makefile  \
+	examples/helloworld2/helloworld2.c  \
+	examples/label/Makefile	\
+	examples/label/label.c	\
+	examples/list/Makefile  \
+	examples/list/list.c  \
+	examples/menu/Makefile  \
+	examples/menu/menu.c  \
+	examples/menu/itemfactory.c  \
+	examples/notebook/Makefile  \
+	examples/notebook/notebook.c  \
+	examples/packbox/Makefile  \
+	examples/packbox/packbox.c  \
+	examples/paned/Makefile  \
+	examples/paned/paned.c  \
+	examples/pixmap/Makefile  \
+	examples/pixmap/pixmap.c  \
+	examples/progressbar/Makefile  \
+	examples/progressbar/progressbar.c  \
+	examples/radiobuttons/Makefile  \
+	examples/radiobuttons/radiobuttons.c  \
+	examples/rangewidgets/Makefile  \
+	examples/rangewidgets/rangewidgets.c  \
+	examples/rulers/Makefile  \
+	examples/rulers/rulers.c  \
+	examples/scribble-simple/Makefile  \
+	examples/scribble-simple/scribble-simple.c  \
+	examples/scribble-xinput/Makefile	\
+	examples/scribble-xinput/scribble-xinput.c	\
+	examples/scrolledwin/Makefile  \
+	examples/scrolledwin/scrolledwin.c  \
+	examples/selection/Makefile  \
+	examples/selection/gettargets.c  \
+	examples/selection/setselection.c  \
+	examples/statusbar/Makefile  \
+	examples/statusbar/statusbar.c  \
+	examples/table/Makefile  \
+	examples/table/table.c  \
+	examples/text/Makefile  \
+	examples/text/text.c  \
+	examples/tictactoe/Makefile  \
+	examples/tictactoe/tictactoe.c  \
+	examples/tictactoe/tictactoe.h  \
+	examples/tictactoe/ttt_test.c  \
+	examples/tree/Makefile  \
+	examples/tree/tree.c  \
+	examples/wheelbarrow/Makefile  \
+	examples/wheelbarrow/wheelbarrow.c  \
+	examples/fixed/fixed.c  \
+	examples/fixed/Makefile  \
+	examples/frame/frame.c  \
+	examples/frame/Makefile  \
+	examples/spinbutton/spinbutton.c  \
+	examples/spinbutton/Makefile  \
+	examples/find-examples.sh

+GDKTARGET=@gdktarget@

 ## Copy .pc files to target-specific names
-gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc: gtk+-3.0.pc
-	rm -f $@ && \
-	cp gtk+-3.0.pc $@
+gtk+-$(GDKTARGET)-2.0.pc: gtk+-2.0.pc
+	rm -f gtk+-$(GDKTARGET)-2.0.pc && \
+	cp gtk+-2.0.pc gtk+-$(GDKTARGET)-2.0.pc

-gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc: gdk-3.0.pc
-	rm -f $@ && \
-	cp gdk-3.0.pc $@
+gdk-$(GDKTARGET)-2.0.pc: gdk-2.0.pc
+	rm -f gdk-$(GDKTARGET)-2.0.pc && \
+	cp gdk-2.0.pc gdk-$(GDKTARGET)-2.0.pc

-gtk+-*-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
-	rm -f $@ && \
-	cp gtk+-3.0-uninstalled.pc $@
+gtk+-$(GDKTARGET)-2.0-uninstalled.pc: gtk+-2.0-uninstalled.pc
+	rm -f gtk+-$(GDKTARGET)-2.0-uninstalled.pc && \
+	cp gtk+-2.0-uninstalled.pc gtk+-$(GDKTARGET)-2.0-uninstalled.pc
+
+gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
+	rm -f gdk-$(GDKTARGET)-2.0-uninstalled.pc && \
+	cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc

 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc
+pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc

-pkgconfig_DATA += $(patsubst %,gtk+-%-3.0.pc,@gdktarget@)
-pkgconfig_DATA += $(patsubst %,gdk-%-3.0.pc,@gdktarget@)
+DISTCLEANFILES =				\
+	gtk+-$(GDKTARGET)-2.0.pc		\
+	gdk-$(GDKTARGET)-2.0.pc			\
+	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
+	gdk-$(GDKTARGET)-2.0-uninstalled.pc

-if OS_UNIX
-pkgconfig_DATA += gtk+-unix-print-3.0.pc
-endif
+## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc
+DEFAULT_GDKTARGET=x11
+install-data-hook:
+	(cd $(DESTDIR)$(pkgconfigdir) && \
+	 test -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
+	 test -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
+	 rm -f gdk-2.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
+	 rm -f gtk+-2.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \
+	(cd $(DESTDIR)$(pkgconfigdir) && \
+	 rm -f gdk-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
+	 rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)

-DISTCLEANFILES = \
-	gtk+-unix-print-3.0.pc		\
-	gtk+-3.0.pc			\
-	gtk+-x11-3.0.pc			\
-	gdk-3.0.pc			\
-	gdk-x11-3.0.pc			\
-	gail-3.0.pc			\
-	gtk+-3.0-uninstalled.pc		\
-	gail-3.0-uninstalled.pc		\
-	config.lt
-
-distclean-local:
-	if test "$(srcdir)" = "."; then :; else \
-		rm -f ChangeLog; \
-	fi
-
-ChangeLog:
-	@echo Creating $@
-	@if test -d "$(srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
-	  && mv -f $@.tmp $@ \
-	  || ($(RM) $@.tmp; \
-	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
-	else \
-	  test -f $@ || \
-	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
-	  echo A git checkout and git-log is required to generate this file >> $@); \
-	fi
-
-uninstall-local:
-	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc
-
-dist-hook:
+dist-hook: gtk+.spec
 	if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
 	     CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
 	     CONFIG_HEADERS= \
 	     $(SHELL) config.status \
 	     && cp INSTALL README $(distdir) ; \
-	fi
+	fi \
+	&& cp gtk+.spec $(distdir)

-.PHONY: files release sanity snapshot ChangeLog
+.PHONY: files release sanity snapshot

 files:
 	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
@@ -143,20 +185,27 @@ sanity:
 snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`

-DISTCHECK_CONFIGURE_FLAGS =		\
-		--enable-gtk-doc 	\
-		--enable-man 		\
-		--disable-rebuilds 	\
-		--enable-introspection

-GITIGNOREFILES = \
-	po-properties/Makefile.in.in \
-	po-properties/Makefile.in \
-	po-properties/Makefile \
-	po-properties/*.gmo \
-	po-properties/*.mo \
-	po-properties/POTFILES \
-	po-properties/stamp-it \
-	po-properties/.intltool-merge-cache
-
-include $(top_srcdir)/git.mk
+# This is a version of the automake-1.4 distcheck rule modified
+# to pass --enable-gtk-doc to ./configure
+#
+mydistcheck: dist
+	-rm -rf $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+	cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist
+	-rm -rf $(distdir)
+	@banner="$(distdir).tar.gz is ready for distribution"; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -1,86 +0,0 @@
-# GTK+ - The GIMP Toolkit
-
-GTESTER        = gtester		# in $PATH for non-GLIB packages
-GTESTER_REPORT = gtester-report		# in $PATH for non-GLIB packages
-
-# initialize variables for unconditional += appending
-EXTRA_DIST =
-TEST_PROGS =
-
-### testing rules
-
-# Xvfb based test rules
-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
-XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
-   491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
-   991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
-  1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
-  9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
-  9995 9996 9997 9998 9999
-SKIP_GDKTARGET = \
-	test "$(gdktarget)" != "x11" \
-	&& echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
-XVFB_START = \
-	${XVFB} -help 2>/dev/null 1>&2 \
-	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
-	&& { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
-	       trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
-	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
-	&& DISPLAY=:$$XID && export DISPLAY
-# call as: $(XVFB_START) && someprogram
-
-# test: run all tests in cwd and subdirs
-test: test-cwd test-recurse
-# test-cwd: run tests in cwd
-test-cwd: ${TEST_PROGS}
-	@$(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
-	  $(XVFB_START) && { set -e; $(TESTS_ENVIRONMENT) ${GTESTER} --verbose ${TEST_PROGS}; }; \
-	}
-# test-recurse: run tests in subdirs
-test-recurse:
-	@ for subdir in $(SUBDIRS) ; do \
-	    test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) test ) || exit $? ; \
-	  done
-# test-report: run tests in subdirs and generate report
-# perf-report: run tests in subdirs with -m perf and generate report
-# full-report: like test-report: with -m perf and -m slow
-test-report perf-report full-report:	${TEST_PROGS}
-	@ ignore_logdir=true ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then \
-	    GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
-	    ignore_logdir=false ; \
-	  fi ; \
-	  for subdir in $(SUBDIRS) ; do \
-	    test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
-	  done ; \
-	  $(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
-	    case $@ in \
-	    test-report) test_options="-k";; \
-	    perf-report) test_options="-k -m=perf";; \
-	    full-report) test_options="-k -m=perf -m=slow";; \
-	    esac ; \
-	    $(XVFB_START) && { \
-	      set -e; \
-	      if test -z "$$GTESTER_LOGDIR" ; then \
-	        ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
-	      elif test -n "${TEST_PROGS}" ; then \
-	        ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
-	      fi ; \
-	    }; \
-	  }; \
-	  $$ignore_logdir || { \
-	    echo '<?xml version="1.0"?>' > $@.xml ; \
-	    echo '<report-collection>'  >> $@.xml ; \
-	    for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
-	      sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
-	    done ; \
-	    echo >> $@.xml ; \
-	    echo '</report-collection>' >> $@.xml ; \
-	    rm -rf "$$GTESTER_LOGDIR"/ ; \
-	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
-	  }
-.PHONY: test test-cwd test-recurse test-report perf-report full-report
-# run make test-cwd as part of make check
-check-local: test-cwd
--- a/6646
+++ b/6646
--- a/163
+++ b/163
@@ -0,0 +1,163 @@
+General Information
+===================
+
+This is GTK+ version 2.0.2. GTK+ is a multi-platform toolkit for
+creating graphical user interfaces. Offering a complete set of widgets,
+GTK+ is suitable for projects ranging from small one-off projects to
+complete application suites.
+
+GTK+ is free software and part of the GNU Project. However, the
+licensing terms for GTK+, the GNU LGPL, allow it to be used by all
+developers, including those developing proprietary software, without any
+license fees or royalties.
+
+The official ftp site is:
+  ftp://ftp.gtk.org/pub/gtk
+
+The official web site is:
+  http://www.gtk.org/
+
+Information about mailing lists can be found at
+  http://www.gtk.org/mailinglists.html
+
+Installation
+============
+
+See the file 'INSTALL'
+
+GTK+-2.0.0 Specific Notes
+=========================
+
+* The default configuration of GTK+ has been stream-lined to reduce
+  confusion on the part of new users or users coming from other
+  environments.  Users used to older versions of GTK+ may want to make
+  some adjustments to the default configuration.
+
+   - Emacs keybindings such as Control-A and Control-E to move to the
+     ends of lines are not enabled by default in the editing widgets. To
+     turn on Emacs keybindings, add the line:
+
+      gtk-key-theme-name = "Emacs"
+   
+     To your ~/.gtkrc-2.0
+
+   - Editing of menu accelerators by pressing an accelerator over the
+     menu item is disabled by default. To enable, it, add:
+
+      gtk-can-change-accels = 1
+
+     to your ~/.gtkrc-2.0
+
+   - To improve useability for keyboard operation, GTK+ now selects the
+     contents of an entry when tabbing into it or when it is focused on
+     initial window map. To disable this behavior, add:
+
+      gtk-entry-select-on-focus = 0
+ 
+     to your ~/.gtkrc-2.0
+
+* The GTK+ libraries use an '_' prefix to indicate private symbols that
+  must not be used by applications. The intention was not to export
+  symbols beginning with prefixes such as _gtk, _gdk, and _pango from
+  the libraries at all, but due to a bug in libtool, they are actually
+  exported at the moment on some platforms (including Linux). 
+  Applications that use these private symbols _will_ break when
+  this bug is fixed.
+
+* The Xft library that GTK+ uses to display anti-aliased fonts will
+  undergo a major version revision in the next few months. To deal with
+  this, by default, GTK+ and Pango are built so that applications will
+  not have explicit dependencies on version 1 on Xft. To make sure that
+  your application will be binary compatible with future versions of
+  GTK+:
+
+    - Do not configure Pango or GTK+ with the --enable-static or
+      --enable-explicit otions, since they will cause dependencies on
+      Xft version 1.
+
+    - Do not use Xft directly in your applicatons.
+
+* There is a bug in the Xft library in XFree86-4.1 and possibly previous
+  versions that causes random crashes when using the Pango Xft
+  backend. If you want to use Xft fonts, you should upgrade to
+  XFree86-4.2.
+
+* Xft support is not on by default. To turn it on set the environment
+  variable GDK_USE_XFT to '1'
+
+   GDK_USE_XFT=1
+   export GDK_USE_XFT
+
+* The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
+  is provided on a as-is basis and has not been tested at all. No
+  guarantees about the degree of workingness or about future
+  compatibility are provided.
+
+* There are known problems with some of the image loaders in the
+  gdk-pixbuf library included in GTK+ where corrupted images can cause
+  crashes and conceivably worse problems. Until these problems are fixed
+  (we hope to have this done for 2.0.1), gdk-pixbuf should not be used
+  to load untrusted data.
+
+* The assumption of GLib and GTK+ by default is that filenames on the
+  filesystem are encoded in UTF-8 rather than the encoding of the locale;
+  The GTK+ developers consider that having filenames whose interpretation
+  depends on the current locale is fundamentally a bad idea.
+
+  If you have filenames encoded in the encoding of your locale, then
+  you may want to set the G_BROKEN_FILENAMES environment variable:
+  
+   G_BROKEN_FILENAMES=1
+   export G_BROKEN_FILENAMES
+
+  Best integration of GTK+-2.0 with the environment is achieved by 
+  using a UTF-8 locale.
+
+How to report bugs
+==================
+
+Bugs should be reported to the GNOME bug tracking system.
+(http://bugzilla.gnome.org, product gtk+.) You will need to create an
+account for yourself.
+  
+In the bug report please include:
+  
+* Information about your system. For instance:
+
+   - What operating system and version
+   - What version of X
+   - For Linux, what version of the C library
+
+  And anything else you think is relevant.
+
+* How to reproduce the bug. 
+
+  If you can reproduce it with the testgtk program that is built in the
+  gtk/ subdirectory, that will be most convenient.  Otherwise, please
+  include a short test program that exhibits the behavior.  As a last
+  resort, you can also provide a pointer to a larger piece of software
+  that can be downloaded.
+
+* If the bug was a crash, the exact text that was printed out when the
+  crash occured.
+
+* Further information such as stack traces may be useful, but is not
+  necessary. If you do send a stack trace, and the error is an X error,
+  it will be more useful if the stacktrace is produced running the test
+  program with the --sync command line option.
+
+Patches
+=======
+
+Patches should also be submitted to bugzilla.gnome.org. If the patch
+fixes an existing bug, add the patch as an attachment to that bug
+report.
+
+Otherwise, enter a new bug report that describes the patch, and attach
+the patch to that bug report.
+
+Bug reports containing patches should include the PATCH keyword in their
+keyword fields. If the patch adds to or changes the GTK programming
+interface, the API keyword should also be included.
+  
+Patches should be in unified diff form. (The -u option to GNU diff.)
--- a/README.commits
+++ b/README.commits
@@ -1,72 +0,0 @@
-GTK+ is part of the GNOME git repository. At the current time, any
-person with write access to the GNOME repository, can make changes to
-GTK+. This is a good thing, in that it encourages many people to work
-on GTK+, and progress can be made quickly. However, GTK+ is a fairly
-large and complicated package that many other things depend on, so to
-avoid unnecessary breakage, and to take advantage of the knowledge
-about GTK+ that has been built up over the years, we'd like to ask
-people committing to GTK+ to follow a few rules:
-
-0) Ask first. If your changes are major, or could possibly break existing
-   code, you should always ask. If your change is minor and you've
-   been working on GTK+ for a while it probably isn't necessary
-   to ask. But when in doubt, ask. Even if your change is correct,
-   somebody may know a better way to do things.
-
-   If you are making changes to GTK+, you should be subscribed
-   to gtk-devel-list@gnome.org. (Subscription address:
-   gtk-devel-list-request@gnome.org.) This is a good place to ask
-   about intended changes.
-
-   #gtk+ on GIMPNet (irc.gimp.org, irc.us.gimp.org, irc.eu.gimp.org, ...)
-   is also a good place to find GTK+ developers to discuss changes with,
-   however, email to gtk-devel-list is the most certain and preferred
-   method.
-
-1) Ask _first_.
-
-2) With git, we no longer maintain a ChangeLog file, but you are expected
-   to produce a meaningful commit message. Changes without a sufficient
-   commit message will be reverted. See below for the expected format
-   of commit messages.
-
-Notes:
-
-* When developing larger features or complicated bug fixes, it is
-  advisable to work in a branch in your own cloned GTK+ repository.
-  You may even consider making your repository publically available
-  so that others can easily test and review your changes.
-
-* The expected format for git commit messages is as follows:
-
-=== begin example commit ===
-Short explanation of the commit
-
-Longer explanation explaining exactly what's changed, whether any
-external or private interfaces changed, what bugs were fixed (with bug
-tracker reference if applicable) and so forth. Be concise but not too brief.
-=== end example commit ===
-
-  - Always add a brief description of the commit to the _first_ line of
-    the commit and terminate by two newlines (it will work without the
-    second newline, but that is not nice for the interfaces).
-
-  - First line (the brief description) must only be one sentence and
-    should start with a capital letter unless it starts with a lowercase
-    symbol or identifier. Don't use a trailing period either. Don't exceed
-    72 characters.
-
-  - The main description (the body) is normal prose and should use normal
-    punctuation and capital letters where appropriate. Normally, for patches
-    sent to a mailing list it's copied from there.
-
-  - When committing code on behalf of others use the --author option, e.g.
-    git commit -a --author "Joe Coder <joe@coder.org>" and --signoff.
-
-
-Owen Taylor
-13 Aug 1998
-17 Apr 2001
-
-Matthias Clasen
-31 Mar 2009
--- a/README.cvs-commits
+++ b/README.cvs-commits
@@ -0,0 +1,54 @@
+GTK+ is part of the GNOME CVS repository. At the current time, any
+person with write access to the GNOME repository, can make changes to
+GTK+. This is a good thing, in that it encourages many people to work
+on GTK+, and progress can be made quickly. However, GTK+ is a fairly
+large and complicated package that many other things depend on, so to
+avoid unnecessary breakage, and to take advantage of the knowledge
+about GTK+ that has been built up over the last 4 years, we'd like
+to ask people commiting to GTK+ to follow a few rules:
+
+0) Ask first. If your changes are major, or could possibly break existing
+   code, you should always ask. If your change is minor and you've
+   been working on GTK+ for a while it probably isn't necessary
+   to ask. But when in doubt, ask. Even if your change is correct,
+   somebody may know a better way to do things.
+
+   If you are making changes to GTK+, you should be subscribed
+   to gtk-devel-list@gnome.org. (Subscription address:  
+   gtk-devel-list-request@gnome.org.) This is a good place to ask
+   about intended changes. 
+
+   #gimp on byxnet (irc.gimp.org, irc2.gimp.org, irc3.gimp.org, 
+   irc.germany.gimp.org...)s also a good place to find GTK+ developers to
+   discuss changes with, however, email to gtk-devel-list is the most
+   certain and preferred method.
+
+1) Ask _first_.
+
+2) There must be a ChangeLog for every commit. (If you discover that
+   you only committed half the files you meant to and need to fix that
+   up, or something, you don't need a new ChangeLog entry. But in general,
+   ChangeLog entries are mandatory.) Changes with out ChangeLog entries
+   will be reverted.
+
+3) There _must_ be a ChangeLog for every commit.
+
+Notes:
+
+* If you are going to be changing many files in an experimental fashion,
+  it probably is a good idea to create a separate branch for your changes.
+
+* The ChangeLog entries should preferrably match in date format
+  with the existing entries. You can set how emacs does this
+  by using customize mode:
+
+  - M-x customize
+  - set Programming/Tools/ChangeLog/Add Log Time Format to
+    'Old Format'
+
+ Or, set the add-log-time-format to 'current-time-string in
+ your .emacs file.
+
+Owen Taylor
+13 Aug 1998
+17 Apr 2001
--- a/README.in
+++ b/README.in
@@ -20,399 +20,99 @@ The official web site is:
 Information about mailing lists can be found at
  http://www.gtk.org/mailinglists.html

-
 Installation
 ============

 See the file 'INSTALL'

+GTK+-2.0.0 Specific Notes
+=========================

-Release notes for 2.20
-======================
+* The default configuration of GTK+ has been stream-lined to reduce
+  confusion on the part of new users or users coming from other
+  environments.  Users used to older versions of GTK+ may want to make
+  some adjustments to the default configuration.

-* GtkStatusbar now has a message area (see gtk_status_bar_get_message_area)
-  which makes it easy to place additional widgets inside the statusbar
-  frame or to replace the label widgets. Previously, this was only possible
-  by accessing the innards of the statusbar widget directly. Applications
-  which are doing so may need some adjustments, since the addition of the
-  message area changed the internal widget hierarchy.
+   - Emacs keybindings such as Control-A and Control-E to move to the
+     ends of lines are not enabled by default in the editing widgets. To
+     turn on Emacs keybindings, add the line:

-* GtkBuilder no longer sets the "name" property of widgets to the ID
-  attribute of the <object>. Use gtk_buildable_get_name() instead of
-  gtk_widget_get_name() to obtain the ID.
+      gtk-key-theme-name = "Emacs"
+   
+     To your ~/.gtkrc-2.0

-* GTK+ now includes introspection data, as a consequence, it gained a
-  dependency on gobject-introspection. It is possible to build without
-  introspection by passing --disable-introspection to configure.
+   - Editing of menu accelerators by pressing an accelerator over the
+     menu item is disabled by default. To enable, it, add:

+      gtk-can-change-accels = 1

-Release notes for 2.18
-======================
+     to your ~/.gtkrc-2.0

-* gtk_tooltip_set_custom now accept a NULL custom_widget to unset the
-  old custom_widget. Custom_widget does not get destroyed when the
-  tooltip goes away.
+   - To improve useability for keyboard operation, GTK+ now selects the
+     contents of an entry when tabbing into it or when it is focused on
+     initial window map. To disable this behavior, add:

-* JPEG2000 support is no longer enabled by default. It must be
-  explicitly turned on, by passing --with-libjasper to configure.
-
-* GDK has been reworked to implement 'client-side windows'. This offers
-  exciting new possibilities, such as transformed, offscreen rendering,
-  but it breaks some long-standing assumptions that applications may
-  have about GDK windows. Setting the environment variable
-  GDK_NATIVE_WINDOWS makes GDK create a native X11 window for each
-  GDK window, which might make problematic applications work better.
-
-* GTK+ calls signal (SIGPIPE, SIG_IGN) during initialization, to ignore
-  SIGPIPE signals, since these are almost never wanted in graphical
-  applications. If you do need to handle SIGPIPE for some reason, reset
-  the handler after gtk_init(), but notice that other libraries (e.g.
-  libdbus or gvfs) might do similar things.
-
-Release notes for 2.16
-======================
-
-* Password entries now display a caps-lock warning. This can be turned off
-  with the caps-lock-warning property.
-
-* Various orientation-related functions have been deprecated in favour
-  of the new GtkOrientable interface: gtk_scale_button_get_orientation,
-  gtk_scale_button_set_orientation, gtk_toolbar_set_orientation.
-
-* The action-proxy interaction has been changed. Widgets that operate as
-  proxies have to implement the GtkActivatable interface now. GtkActivatable
-  implementation are responsible for syncing their appearance with the
-  action and for activating the action. All GTK+ widgets that are commonly
-  used as proxies implement the GtkActivatable interface.
-
-* The handling of keyboard shortcuts has been changed, to help with a
-  longstanding complaint about the way GTK+ handles multiple layouts. GTK+
-  now only uses keys from groups other than the current group if they are
-  not present in the current group.
-
-Release notes for 2.14
-======================
-
-* gtkitemfactory.h is now completely deprecated.
-  As gtkactiongroup.h and gtkstock.h no longer include the gtkitemfactory.h
-  header, this might break application using gtk_item_factory_* symbols
-  without including gtkitemfactory.h - even though this behaviour has never
-  been supported in the first place.
-
-* The GtkFileSystem semi-private interface has been removed.
-  The GTK+ filechooser implementation now uses GIO directly, which has
-  rendered external filesystem implementations unnecessary. Consequently,
-  the GtkFileSystem interface is no longer available, nor the filechooser
-  will load any GtkFileSystem implementation.
-
-* GtkComboBox now renders the popdown button insensitive when
-  the model is empty. Applications which want to populate the list
-  only before displaying it can set gtk_combo_box_set_button_sensitivity
-  to GTK_SENSITIVITY_ON, so that the button is always sensitive or
-  GTK_SENSITIVITY_OFF to make it insensitive respectively.
-
-* GtkAdjustment now enforces that values are restricted to the
-  range [lower, upper - page_size]. This has always been the documented
-  behaviour, and the recommended practice is to set page_size to 0
-  when using adjustments for simple scalar values, like in a slider
-  or spin button.
-
-* gdk-pixbuf will use GIO for mime type detection if possible. For
-  this to work, shared-mime-info needs to be installed and XDG_DATA_DIRS
-  set accordingly at configure time. Otherwise, gdk-pixbuf falls
-  back to its built-in sniffing implementation.
-
-Release notes for 2.12
-======================
-
-* gtk_about_dialog_get/set_name() were deprecated in favour of
-  gtk_about_dialog_get/set_program_name(), the GtkAboutDialog now uses the
-  "program-name" property instead of the conflicting "name" property.
-
-* The gdk-pixbuf tiff loader now requires libtiff 3.6.0 or later.
-
-* Support for Windows 9x/ME has officially been removed. It hasn't worked
-  since 2.6 anyway.
-
-* The GtkTextBufferTargetInfo enumeration values have been changed from
-  G_MAXUINT-0, G_MAXUINT-1, G_MAXUINT-2, etc, to -1, -2, -3 to stay within
-  ANSI C limits.
-
-* A change in the handling of _NET_WM_USER_TIME properties on toplevel
-  windows can cause deadlock problems with window managers that are using
-  GDK for drawing decorations. In particular, metacity <= 2.18.0 is affected
-  by this. The problem has been fixed in metacity 2.18.1.
-
-* Semi-private GtkTextLayout api has changed: new GtkTextLayout method
-  invalidate_cursors(), and new functions gtk_text_layout_invalidate_cursors()
-  and gtk_text_layout_cursors_changed(), which should be used in place of
-  gtk_text_layout_invalidate() and gtk_text_layout_changed() if invalidation
-  is due to marks moved or changed selection; new GtkTextLineDisplay structure
-  member. Source compatibility is preserved; binary compatibility may break
-  only if GtkTextLineDisplay structure was created on stack or as a part
-  of another structure (in particular GnomeCanvas and its clones do not need
-  recompiling).
-
-* Another new signal has been added to GtkNotebook. The new signal
-  is called create-window, so this name can no longer be used for signals
-  in objects derived from GtkNotebook.
-
-* The gtk_notebook_set/get_group_id() functions were found to be insufficient
-  and have been deprecated in favour of gtk_notebook_set/get_group().
-
-* The move-focus signal has been moved to GtkWidget, to unify the 
-  various implementations of this signal in specific widgets. Great care 
-  has been taken to make sure that all code using this signal continues
-  to work.
-
-* An unused and hardly visible GtkFrame has been removed from the menu 
-  widget hierarchy when GtkComboBox::appears-as-list style property is 
-  set. Any RC file applying a different style to any widget below the 
-  widget path "gtk-combobox-popup-window.GtkFrame" should take into 
-  account that the frame no longer exists.
-
-* The external print preview application used by GtkPrintOperationPreview 
-  is now passed the print settings on the command line with the 
-  --print-settings parameter pointing to a temp file containing the 
-  settings. The preview application assumes ownership of the file and 
-  should delete it once it does not need it anymore. The --print-settings 
-  commandline option is understood by Evince 0.9.0 and newer. To use a 
-  different print preview application, change the gtk-print-preview-command 
-  setting in your gtkrc file, e.g. gtk-print-preview-command = "ggv %f"
-
-* GtkMenuShell is now defined as an abstract type. It was already 
-  documented as an abstract class, and there is little reason to 
-  instantiate it.
-
-* The GtkTooltips struct (this is the old tooltips API) is now considered
-  private. Code that used to access this struct, in particular the
-  tips_data_list field, will need to change. All of the old tooltips
-  API has been deprecated in favour of a new implementation and
-  API. This affects all of the gtk_tooltips_ functions, and functions 
-  which take a GtkTooltips argument, such as gtk_tool_item_set_tooltip()
-  and gtk_menu_tool_button_set_arrow_tooltip().
-  
-* The memory management of the GtkRecentManager object has been changed,
-  as using the screen didn't guarantee that the singleton instance was
-  correctly destroyed. The screen-related functions have been deprecated,
-  and should not be used anymore; the GtkRecentManager instance returned by
-  the gtk_recent_manager_get_default() function is guaranteed to be valid
-  for the entire lifetime of an application.
-
-* A number of interfaces that have been superseded by newer interfaces for 
-  a long time have finally been deprecated. This includes 
-  gtk_widget_ref/unref(), gtk_rc_style_ref/unref() and the old file selector.
-
-* The various coordinate systems in use in GtkTreeView widgets have
-  been clarified in the documentation, and in the cause of doing so, 
-  the functions gtk_tree_view_widget_to_tree_coords() and
-  gtk_tree_view_tree_to_widget_coords() have been deprecated in 
-  favour of a new family of gtk_tree_view_convert_ functions.
-
-* gtk_menu_item_remove_submenu() has been deprecated in favour of
-  gtk_menu_item_set_submenu (..., NULL).
-
-* gtk_default_draw_check() has been fixed to really decrease the
-  indicator size by one pixel to ensure an odd size instead of
-  accidentially increasing it.
-  Consequently, gtk_cell_renderer_toggle_render() could be fixed to
-  not subtract 1 from the size passed to gtk_paint_option(), which
-  was just a workaround for above off-by-two for even sizes (theme
-  engines now get the real indicator size passed).
-  The default toggle size of GtkCheckMenuItem and GtkCellRendererToggle
-  has been changed to 13 to be consistent with GtkCheckButton.
-  The only visible change with default settings is that the indicator in
-  GtkCellRendererToggle has changed its size from 11 to 13 and is now
-  consistent with menus and toggle buttons.
-
-* GTK+ has always required that gtk_init() (or a variant thereof) is
-  called before any other GTK+ function. Some applications call functions
-  like gtk_clipboard_get() to check if they need to call gtk_init(),
-  anyway. A change in GLib 2.14 has recently broken this unsupported
-  practise. It is worth pointing out that calling gtk_init() twice
-  does no harm.
-
-
-Release notes for 2.10
-======================
-
-* The hexadecimal Unicode input feature has been reworked. It no longer
-  blocks the use of the sixteen Ctrl-Shift-<hex digit> key sequences. Now
-  it only uses Ctrl-Shift-u.
-
-* A memory leak in GtkStyle handling has been fixed. This may expose bugs
-  in third-party widgets which forget to call gtk_style_attach() in their
-  realize functions.
-
-* Range widgets like GtkScrollbar now render their arrows insensitive
-  when the slider is at the end. Applications which react to arrow
-  clicks even if the slider is at the end may want to use the new
-  gtk_range_set_[upper/lower]_stepper_sensitivity() functions to
-  prevent the arrows from being rendered insensitive.
-
-* GtkObject now uses the "floating reference" support in GObject. 
-  GTK_OBJECT_IS_FLOATING() will still work, but direct checking
-  of the GTK_FLOATING flag will no longer detect the floating 
-  reference. Details about floating references can be found in the docs:
-  http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#floating-ref
-
-* Accelerators like (_F) are now stripped from labels when they are 
-  displayed in toolbars. If this is not wanted, the feature can be 
-  suppressed by inserting a Unicode control character, e.g ZWNJ.
-
-* The pixbuf theme engine can now customize expanders (in GtkTreeView
-  and GtkExpander) and resize grips, using the new EXPANDER and
-  RESIZE_GRIP function values.
-
-* Dialogs created by gtk_about_dialog_new() no longer hide automatically
-  when the user clicks close. It is the applications responsibility to
-  hide or destroy the dialog.
-
-* Several new signals have been added to GtkNotebook. Care has been taken
-  to choose signal names which do not collide with signals added by well-known
-  derived classes. The names which can no longer be used for signals in 
-  objects derived from GtkNotebook are page-reordered, page-removed and
-  page-added.
-
-* Due to the interface changes in the file chooser backend interface, 
-  the GTK+ ABI version has been bumped to 2.10.0. Third-party filesystem 
-  backends have to be ported to the new interface, other modules, such as 
-  theme engines, input method modules or pixbuf loaders have to be rebuilt 
-  so that they are installed in the right place for GTK+ to find them.
-
-
-Release notes for 2.8
-=====================
-
-* GTK+ 2.8 and Pango 1.10 require the cairo library.
-
-* The default theme has been renamed to "Raleigh". Existing configurations
-  specifying the "Default" theme name should still work.
-
-* The GtkTreeView::enable-search property has been changed to control
-  only typeahead search, not the C-f keybinding to start an interactive
-  search. To turn off interactive searching completely, you have to
-  set GtkTreeView::search-column to -1.
-
-* The restriction on using the same cell renderer in multiple columns
-  of a GtkTreeView is now more strictly enforced.
-
-* In GTK+ 2.8, GtkCalendar uses nl_langinfo() (if available) to determine
-  the first day of the week. Thus, it is possible to select the first day
-  of the week independently from the language, by setting LC_TIME.
-
-* In GTK+ 2.8, the gtk-update-icon-cache utility includes image data
-  in the icon caches, which will make the icon cache files larger than
-  the one produced by GTK+ 2.6. This change will reduce the memory
-  overhead of icon themes at runtime, since all GTK+ applications can
-  share the image data in memory.
-
-* In 2.8, GDK emits GdkEventGrabBroken events when a keyboard or pointer
-  grab is broken. On X11, this can happen if the same application grabs
-  again, or if the window used for the grab becomes unviewable. It happens
-  more often on Win32. Applications which use grabs should pay attention
-  to these events and do the necessary cleanups when the grab is lost.
-* The GIOChannel code for sockets on win32 has been rewritten.
-  Applications who make non-trivial use of GIOChannels on win32 should
-  be watched for possible problems.
-
-* GLib 2.8 uses atomic operations to implement reference counting, thus
-  g_object_ref/unref, g_closure_ref/sink/unref and g_iochannel_ref/unref
-  can be used without locking in multithreaded applications. Note that
-  other modifications, like concurrent setting of properties still require
-  locking.
-
-* g_convert() and related character set conversion functions have been
-  fixed to emit pending shift states and to not cache iconv descriptors
-  across multiple calls, since that is problematic for some encodings.
-  Note that these functions are not suitable for streaming conversions;
-  use g_iconv() to do streaming conversion.
-
-
-Release notes for 2.6
-=====================
-
-* GTK+ 2.6 supports clipboard persistency. To make use of this feature,
-  a clipboard manager following the specification at
-  http://www.freedesktop.org/wiki/Standards/clipboard-manager-spec
-  must be running. A sample implementation of such a clipboard manager
-  is available at 
-  http://people.imendio.com/andersca/archives/clipboard-manager-0.3.tar.gz
-  Applications can use the function gdk_display_supports_clipboard_persistence() 
-  to find out if clipboard persistence is available.
-
-* Notification on clipboard ownership changes via GdkOwnerChange events 
-  requires the XFIXES X extension. Applications can use the function
-  gdk_display_supports_selection_notification() to find out if ownerchip
-  change notification is available.
-
-* The icon theme code in GTK+ 2.6 follows the freedesktop.org icon theme 
-  specification. Setting the XDG_DATA_DIRS environtment variable may be 
-  necessary if your icons aren't installed in the default location 
-  /usr/share/icons.
-
-* The icon theme code in GTK+ 2.6 can make use of mmap()able cache files
-  to avoid a lot of disk searching overhead. GTK+ includes a utility named
-  gtk-update-icon-cache to generate these cache files. For further details,
-  see the gtk-update-icon-cache man page or the GTK+ documentation.
-
-* To reduce code size and improve efficiency, GTK+, when compiled 
-  with the GNU toolchain, has separate internal and external entry 
-  points for exported functions. The internal names, which begin with 
-  IA__, may be seen when debugging a GTK+ program.
-
-* The following functions have been deprecated in GTK+ 2.6:
-  gdk_pango_context_set_colormap
-  gtk_cell_renderer_editing_canceled
-
-* The new GtkFileChooser widget emphasizes simplicity and thus does 
-  not provide a navigation entry by default when opening files. 
-  Experienced command line users will likely want to make heavy use of
-  the location dialog brought up by the Control-L key shortcut.
+      gtk-entry-select-on-focus = 0
+ 
+     to your ~/.gtkrc-2.0

 * The GTK+ libraries use an '_' prefix to indicate private symbols that
-  must not be used by applications. On some platforms, symbols beginning 
-  with prefixes such as _gtk, _gdk, and _pango will be exported
-  from the library, on others not. In no case can applications
-  use these private symbols. In addition to that, GTK+ 2.6 makes several
-  symbols private which were not in any installed header files and
-  were never intended to be exported.
+  must not be used by applications. The intention was not to export
+  symbols beginning with prefixes such as _gtk, _gdk, and _pango from
+  the libraries at all, but due to a bug in libtool, they are actually
+  exported at the moment on some platforms (including Linux). 
+  Applications that use these private symbols _will_ break when
+  this bug is fixed.

-* The gdk_pixbuf_xlib library included in the contrib/ directory 
-  and the framebuffer GDK backend included in the gdk/linux-fb directory
-  of GTK+ are provided on an as-is basis and have not been tested at all. 
-  No guarantees about the degree of workingness or about future
+* The Xft library that GTK+ uses to display anti-aliased fonts will
+  undergo a major version revision in the next few months. To deal with
+  this, by default, GTK+ and Pango are built so that applications will
+  not have explicit dependencies on version 1 on Xft. To make sure that
+  your application will be binary compatible with future versions of
+  GTK+:
+
+    - Do not configure Pango or GTK+ with the --enable-static or
+      --enable-explicit otions, since they will cause dependencies on
+      Xft version 1.
+
+    - Do not use Xft directly in your applicatons.
+
+* There is a bug in the Xft library in XFree86-4.1 and possibly previous
+  versions that causes random crashes when using the Pango Xft
+  backend. If you want to use Xft fonts, you should upgrade to
+  XFree86-4.2.
+
+* Xft support is not on by default. To turn it on set the environment
+  variable GDK_USE_XFT to '1'
+
+   GDK_USE_XFT=1
+   export GDK_USE_XFT
+
+* The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
+  is provided on a as-is basis and has not been tested at all. No
+  guarantees about the degree of workingness or about future
  compatibility are provided.

-* On Unix, the assumption of GLib and GTK+ by default is that filenames on 
-  the filesystem are encoded in UTF-8 rather than the encoding of the locale;
-  the GTK+ developers consider that having filenames whose interpretation
+* There are known problems with some of the image loaders in the
+  gdk-pixbuf library included in GTK+ where corrupted images can cause
+  crashes and conceivably worse problems. Until these problems are fixed
+  (we hope to have this done for 2.0.1), gdk-pixbuf should not be used
+  to load untrusted data.
+
+* The assumption of GLib and GTK+ by default is that filenames on the
+  filesystem are encoded in UTF-8 rather than the encoding of the locale;
+  The GTK+ developers consider that having filenames whose interpretation
  depends on the current locale is fundamentally a bad idea.

-  If you have filenames encoded in the encoding of your locale, then you 
-  may want to set the G_FILENAME_ENCODING environment variable:
+  If you have filenames encoded in the encoding of your locale, then
+  you may want to set the G_BROKEN_FILENAMES environment variable:
  
-   G_FILENAME_ENCODING=@locale
-   export G_FILENAME_ENCODING
+   G_BROKEN_FILENAMES=1
+   export G_BROKEN_FILENAMES

-  (Earlier versions of GLib 2.x required a different environment variable
-  setting; G_BROKEN_FILENAMES=1 to achieve the same effect; this 
-  is still supported, but G_FILENAME_ENCODING is preferred.)
-  Best integration of GTK+ 2.6 with the environment is achieved by 
+  Best integration of GTK+-2.0 with the environment is achieved by 
  using a UTF-8 locale.

-  On Windows, filenames passed to GTK+ should always be in UTF-8, as
-  in GLib 2.6. This is different than in previous versions of GTK+
-  where the system codepage was used. As in GLib, for DLL ABI
-  stability, applications built against previous versions of GTK+ will
-  use entry points providing the old semantics.
-
-  When compiling against GTK+ 2.6, applications intended to be
-  portable to Windows must take the UTF-8 file name encoding into
-  consideration, and use the gstdio wrappers to access files whose 
-  names have been constructed from strings returned from GTK+ or GLib.
-
-
 How to report bugs
 ==================

@@ -432,10 +132,10 @@ In the bug report please include:

 * How to reproduce the bug. 

-  If you can reproduce it with one of the tests or demos built with GTK+, 
-  such as demos/gtk-demo/gtk-demo, that would be most convenient. Otherwise, 
-  please include a short test program that exhibits the behavior. As a 
-  last resort, you can also provide a pointer to a larger piece of software 
+  If you can reproduce it with the testgtk program that is built in the
+  gtk/ subdirectory, that will be most convenient.  Otherwise, please
+  include a short test program that exhibits the behavior.  As a last
+  resort, you can also provide a pointer to a larger piece of software
  that can be downloaded.

 * If the bug was a crash, the exact text that was printed out when the
@@ -446,7 +146,6 @@ In the bug report please include:
  it will be more useful if the stacktrace is produced running the test
  program with the --sync command line option.

-
 Patches
 =======

@@ -457,4 +156,8 @@ report.
 Otherwise, enter a new bug report that describes the patch, and attach
 the patch to that bug report.

-Patches should be in unified diff form. (The -up option to GNU diff.)
+Bug reports containing patches should include the PATCH keyword in their
+keyword fields. If the patch adds to or changes the GTK programming
+interface, the API keyword should also be included.
+  
+Patches should be in unified diff form. (The -u option to GNU diff.)
--- a/README.nanox
+++ b/README.nanox
@@ -0,0 +1,32 @@
+Gtk port to nano-X
+
+STATUS
+
+Once upon a time I got a few apps working, then started merging
+the new features added by Owen (32 bit sizes for windows and buffering).
+Since then I haven't found the time to work on it:-/
+
+
+TODO
+
+Finish internal window manager abstraction or add proper support in nano-X.
+Fix event polling.
+Implement GdkImage, GdkRgb stuff.
+Put generic region code in generic gdk and/or use the region code from nano-X.
+Fix ugly automake stuff for make dist.
+
+TODO in nano-X
+
+We need to be able to clip and change the background of windows at runtime
+for apps to not look so ugly!
+Fonts: wait for better nano-X font implementation.
+Properties on windows.
+Provide a pango module.
+
+If you want to work on this port or get additional informnation, get in 
+touch with me.
+Configure gtk with the --with-gdktarget=nanox to compile with nano-X support.
+
+Paolo Molaro
+lupus@linuxcare.com
+
--- a/README.win32
+++ b/README.win32
@@ -1,184 +1,95 @@
-The Win32 backend in GTK+ is not as stable or correct as the X11 one.
-
-For prebuilt runtime and developer packages see
-http://ftp.gnome.org/pub/gnome/binaries/win32/
-
-Building GTK+ on Win32
-======================
-
-First you obviously need developer packages for the compile-time
-dependencies: Pango, atk, glib, gettext-runtime, libiconv, libpng,
-zlib, libtiff at least. See
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies .
-
-After installing the dependencies, there are two ways to build GTK+
-for win32.
-
-1) GNU tools, ./configure && make install
-----------------------------------------
-
-This requires you have mingw and MSYS.
-
-Use the configure script, and the resulting Makefiles (which use
-libtool and gcc to do the compilation). I use this myself, but it can
-be hard to setup correctly.
-
-The full script I run to build GTK+ 2.16 unpacked from a source
-distribution is as below. This is from bulding GTK+ 2.16.5. I don't
-use any script like this to build the development branch, as I don't
-distribute any binaries from development branches.
-
-# This is a shell script that calls functions and scripts from
-# tml@iki.fi's personal work env<6E>ronment. It is not expected to be
-# usable unmodified by others, and is included only for reference.
-
-MOD=gtk+
-VER=2.16.5
-REV=1
-ARCH=win32
-
-THIS=${MOD}_${VER}-${REV}_${ARCH}
-
-RUNZIP=${MOD}_${VER}-${REV}_${ARCH}.zip
-DEVZIP=${MOD}-dev_${VER}-${REV}_${ARCH}.zip
-
-HEX=`echo $THIS | md5sum | cut -d' ' -f1`
-TARGET=c:/devel/target/$HEX
-
-usedev
-usemsvs6
-
-(
-
-set -x
-
-DEPS=`latest --arch=${ARCH} glib atk cairo pango libpng zlib libtiff jpeg`
-PROXY_LIBINTL=`latest --arch=${ARCH} proxy-libintl`
-
-PKG_CONFIG_PATH=
-for D in $DEPS; do
-    PATH=/devel/dist/${ARCH}/$D/bin:$PATH
-    [ -d /devel/dist/${ARCH}/$D/lib/pkgconfig ] && PKG_CONFIG_PATH=/devel/dist/${ARCH}/$D/lib/pkgconfig:$PKG_CONFIG_PATH
-done
-
-LIBPNG=`latest --arch=${ARCH} libpng`
-ZLIB=`latest --arch=${ARCH} zlib`
-LIBTIFF=`latest --arch=${ARCH} libtiff`
-JPEG=`latest --arch=${ARCH} jpeg`
-
-patch -p0 <<'EOF'
-EOF
-
-lt_cv_deplibs_check_method='pass_all' \
-CC='gcc -mtune=pentium3 -mthreads' \
-CPPFLAGS="-I/devel/dist/${ARCH}/${LIBPNG}/include \
-I/devel/dist/${ARCH}/${ZLIB}/include \
-I/devel/dist/${ARCH}/${LIBTIFF}/include \
-I/devel/dist/${ARCH}/${JPEG}/include \
-I/devel/dist/${ARCH}/${PROXY_LIBINTL}/include" \
-LDFLAGS="-L/devel/dist/${ARCH}/${LIBPNG}/lib \
-L/devel/dist/${ARCH}/${ZLIB}/lib \
-L/devel/dist/${ARCH}/${LIBTIFF}/lib \
-L/devel/dist/${ARCH}/${JPEG}/lib \
-L/devel/dist/${ARCH}/${PROXY_LIBINTL}/lib -Wl,--exclude-libs=libintl.a \
-Wl,--enable-auto-image-base" \
-LIBS=-lintl \
-CFLAGS=-O2 \
-./configure \
--with-gdktarget=win32 \
--disable-gdiplus \
--with-included-immodules \
--without-libjasper \
--enable-debug=yes \
--enable-explicit-deps=no \
--disable-gtk-doc \
--disable-static \
--prefix=$TARGET &&
-
-libtoolcacheize &&
-rm gtk/gtk.def &&
-(PATH="$PWD/gdk-pixbuf/.libs:/devel/target/$HEX/bin:$PATH" make -j3 install || (rm .libtool-cache* && PATH="/devel/target/$HEX/bin:$PATH" make -j3 install)) &&
-
-PATH="/devel/target/$HEX/bin:$PATH" gdk-pixbuf-query-loaders >/devel/target/$HEX/etc/gtk-2.0/gdk-pixbuf.loaders &&
-
-grep -v -E 'Automatically generated|Created by|LoaderDir =' <$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders >$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp &&
-    mv $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders &&
-grep -v -E 'Automatically generated|Created by|ModulesPath =' <$TARGET/etc/gtk-2.0/gtk.immodules >$TARGET/etc/gtk-2.0/gtk.immodules.temp &&
-    mv $TARGET/etc/gtk-2.0/gtk.immodules.temp $TARGET/etc/gtk-2.0/gtk.immodules &&
-
-./gtk-zip.sh &&
-
-mv /tmp/${MOD}-${VER}.zip /tmp/$RUNZIP &&
-mv /tmp/${MOD}-dev-${VER}.zip /tmp/$DEVZIP
-
-) 2>&1 | tee /devel/src/tml/packaging/$THIS.log
-
-(cd /devel && zip /tmp/$DEVZIP src/tml/packaging/$THIS.{sh,log}) &&
-manifestify /tmp/$RUNZIP /tmp/$DEVZIP
-
-You should not just copy the above blindly. There are some things in
-the script that are very specific to *my* build setup on *my* current
-machine. For instance the "latest" command, the "usedev" and
-"usemsvs6" shell functions, the /devel/dist folder. The above script
-is really just meant for reference, to give an idea. You really need
-to understand what things like PKG_CONFIG_PATH are and set them up
-properly after installing the dependencies before building GTK+.
-
-As you see above, after running configure, one can just say "make
-install", like on Unix. A post-build fix is needed, running
-gdk-pixbuf-query-loaders once more to get a correct gdk-pixbuf.loaders
-file.
-
-For a 64-bit build you need to remove the gtk/gtk.def file and let it
-be regenerated by the makefilery. This is because the 64-bit GTK dll
-has a slightly different list of exported function names. This is on
-purpose and not a bug. The API is the same at the source level, and
-the same #defines of some function names to actually have a _utf8
-suffix is used (just to keep the header simpler). But the
-corresponding non-suffixed function to maintain ABI stability are not
-needed in the 64-bit case (because there are no older EXEs around that
-would require such for ABI stability).
-
-
-2) Microsoft's tools
--------------------
-
-Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
-makefile.msc in gdk and gtk. Be prepared to manually edit various
-makefile.msc files, and the makefile snippets in build/win32.
-
-Alternative 1 also generates Microsoft import libraries (.lib), if you
-have lib.exe available. It might also work for cross-compilation from
-Unix.
-
-I use method 1 myself. Hans Breuer has been taking care of the MSVC
-makefiles. At times, we disagree a bit about various issues, and for
-instance the makefile.msc files might not produce identically named
-DLLs and import libraries as the "autoconfiscated" makefiles and
-libtool do. If this bothers you, you will have to fix the makefiles.
-
-Using GTK+ on Win32
-===================
-
-To use GTK+ on Win32, you also need either one of the above mentioned
-compilers. Other compilers might work, but don't count on it. Look for
-prebuilt developer packages (DLLs, import libraries, headers) on the
-above website.
-
-Multi-threaded use of GTK+ on Win32
-===================================
-
-Multi-threaded GTK+ programs might work on Windows in special simple
-cases, but not in general. Sorry. If you have all GTK+ and GDK calls
-in the same thread, it might work. Otherwise, probably not at
-all. Possible ways to fix this are being investigated.
-
-Wintab
-======
-
-The tablet support uses the Wintab API. The Wintab development kit is
-no longer required. The wintab.h header file is bundled with GTK+
-sources. Unfortunately it seems that only Wacom tablets come with
-support for the Wintab API nowadays.
-
--Tor Lillqvist <tml@iki.fi>, <tml@novell.com>
+The Win32 port of GTK+ is a work in progress, and not as stable or
+correct as the Unix/X11 version. For more information about the Win32
+port, and prebuilt runtime and developer packages see
+http://www.gimp.org/win32/ .
+
+There is a gtk-1-3-win32-production branch of GTK+ that was branched
+off from before the addition of the no-flicker and other recent
+functionality. That is what should be used by "production" code until
+this CVS HEAD (2.0) version is useable. (But note, the Win32 backend
+has never been claimed to be "production quality", although it works
+surprisingly well for the GIMP.)
+
+Building GTK+ on Win32
+======================
+
+There are two ways to build GTK+ for win32:
+
+1) Use the autoconf-generated configure script, and the resulting
+Makefiles (which use libtool and gcc to do the compilation). I use
+this myself, but it might be hell to setup correctly. 
+
+Personally I run configure with:
+CC='gcc -mpentium -fnative-struct' CPPFLAGS='-I/target/include' CFLAGS=-O2 LDFLAGS='-L/target/lib' ./configure --disable-static --prefix=/target --with-gdktarget=win32 --with-wintab=/src/wtkit126 --with-ie55=/src/workshop/ie55_lib --host=i386-pc-mingw32 --enable-maintainer-mode
+
+It might well be that in order for this to work, you will have to get
+a bleeding-edge version of libtool for Win32, run libtoolize yourself,
+and then run autoconf to generate the configure script.
+
+2) Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
+makefile.msc in gdk and gtk.
+
+Alternative 1 also generates Microsoft import libraries (.lib), if you
+have lib.exe available. It might also work for cross-compilation from
+Unix.
+
+There are hand-written makefiles for mingw (look for makefile.mingw in
+various directories), but those haven't been kept up-to-date, and
+probably won't work without editing. Sorry. If you make them work
+again, by all means do submit patches.
+
+Note that I use method 1 myself. Hans Breuer has been taking care of
+the MSVC makefiles. At times, we disagree a bit about various issues,
+and the makefile.msc files might not produce identically named DLLs
+and import libraries as the "autoconfiscated" makefiles and libtool
+do.
+
+Using GTK+ on Win32
+===================
+
+To use GTK+ on Win32, you also need either one of the above mentioned
+compilers. Other compilers might work, but don't count on it. Look for
+prebuilt developer packages (DLLs, import libraries, headers) on the
+above website.
+
+Multi-threaded use of GTK+ on Win32
+===================================
+
+Multi-threaded GTK+ programs might work in special simple cases, but
+not in general. Sorry. If you have all GTK+ and GDK calls in the same
+thread, it might work. Otherwise, probably not at all. Possible ways
+to fix this are being investigated.
+
+Wintab
+======
+
+The tablet support uses the Wintab API. The Wintab development kit can
+be downloaded from http://www.pointing.com. Pass the --with-wintab
+flag to configure if you use that. If you use nmake and you don't care
+for Wintab, undefine HAVE_WINTAB in config.h.win32 and remove
+references to the wntab32x library from the makefile before building.
+
+Libintl
+=======
+
+GTK wants to be built with the GNU "intl" library for
+internationalisation (i18n). Get the version ported to Win32 (not a
+very big deal) from the web site mentioned above. The "intl" library
+as gets built as a DLL called libintl-1.dll. If you don't want any
+i18n stuff, undefine ENABLE_NLS, HAVE_GETTEXT and HAVE_LIBINTL in the
+config.h.win32 file, and remove references to the intl library from
+the makefiles.
+
+ActiveIMM
+=========
+
+If you want to build a GTK+ that supports ActiveIMM (the Input Method
+Manager for non-EastAsia locales that can be used on Win9x/NT4), you
+need the dimm.h header file. That is somewhat difficult to find, but
+http://msdn.microsoft.com/downloads/samples/internet/wizard/ seems to
+be a good place to look nowadays. If you use "autoconfiscated" build,
+pass the --with-ie55 flag to configure specifyin the location of the
+ie55_lib directory created by downloading the IE5.5 headers and libs
+from the above URL.
+
+--Tor Lillqvist <tml@iki.fi>
--- a/200
+++ b/200
@@ -0,0 +1,200 @@
+
+Outstanding items:
+
+ * focus handling for GtkOptionMenu (needs the previous)
+
+ * implement gtk_default_draw_oval and other missing things in gtkstyle.c.
+ 
+ * enforce invariants on *_RESIZE* and *_REDRAW* flags.
+
+ * GtkToolTips: allocate GtkTooltipsData from memchunks
+                          
+ * Make all widget attributes configurable after the widget is created (timj).
+ 
+ * Radio buttons need to display CAN/HAS_DEFAULT correctly, if draw_inidicator
+   is TRUE. (Radio buttons do not need to CAN_DEFAULT! OWT)
+
+ * More dialogs: Print, maybe others...
+
+ * make the gtk_main callbacks consistent in their add/remove behaviour.
+ 
+ * Check return values on all calls to XIC[Get/Set]Values
+
+ * The "--geometry" option should be supported
+
+  - Having gdk_init() parse the geometry option. (putting it into
+    GDK means you can use XParseGeometry() without wrapping it)
+
+  - Add a call gdk_get_geometry() that retrieves the results 
+    in a form like that returned by XParseGeometry()
+
+  - The application then can modify the results (as would gemvt)
+    then call a routine gtk_window_set_geometry() on whatever
+    it considers to be its main window.
+
+  - Then in some manner GtkWindow takes that into account when
+    setting its hints. (Probably it uses the size and position
+    as the current uposition and usize, and modulates that
+    be the equivalents of the X flags
+
+     XValue, YValue, WidthValue, HeightValue, XNegative, or YNegative
+
+    ( You'd have to extend gdk_window_set_hints to accept the
+      window gravity option to get it right. )
+
+ * Allow moving the separator for paned widgets by dragging 
+   it directly instead of using the handle. 
+
+ * Check into XAddConnectionWatch - is this needed for XIM?
+
+ * Places where a _full variant is needed:
+
+    gtk_init_add
+    gtk_menu_popup
+    gtk_toolbar_prepend_element
+    gtk_toolbar_insert_element
+ 
+ * Try to rationally deal with someone else deleting one of our
+   windows??? This would mean keeping track of our window heirarchy
+   ourselves, for one thing, and will never be safe, because of
+   race conditions.
+
+ * Should all the default handlers really return FALSE? This can
+   cause confusing presses to be sent to containers that actually
+   want to get events on themselves.
+
+ * The menu code should skip separators during keyboard navigation,
+   whether they are sensitive or insensitive.
+
+ * OwnerButtonPressGrab needs to go!
+
+Text/Edit widget:
+
+  Bugs:
+
+  - Really big font (150 pt), plus lots of editing caused segfault
+
+  Improvements:
+
+  - Unify the key binding support in some fashion between the
+    Entry and Text widget widgets, use GtkBindings for this.
+
+  - Figure out a way not to recompute the geometry on insertions/deletions
+    which are large, but not a significant fraction of the
+    entire text. (e.g., compute the changes as when the widget
+    is not frozen, but without the actual scrolling)
+
+  - Prune the line start cache. But since it is only 68 bytes
+    per line, and it is a lot faster when lines are in the cache,
+    it may be better not to, at least for now.
+
+  - Show the non-editable state by changing colors. (Use the
+    style entries for insensitive?)
+
+  - Multibyte support for the Text widget.
+
+  - Unicode support to do the multi-byte right.
+
+  - Support an .inputrc. (The readline one doesn't really work,
+    unless it is extended because it can't represent X keysyms,
+    just terminal type input)
+
+  - A vi mode
+
+  - Word wrap, instead of line folding. (Should the continuation
+    characters be shown?)
+
+  - Horizontal scrolling
+
+  - Disable pasting compound text
+
+  - When showing background pixmap (not editable) actually set
+    the background pixmap as the windows bg pixmap, to improve
+    appearance on exposes. But this would require using another
+    window to get the origins.
+
+  - In word wrap mode, break:
+
+     aaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+
+     as:
+                            | Maximum column
+     aaaaaaaaaaa bbbbbbbbbbb|
+     bbbbbbbbbbbbbbbbbbbbbbb|
+     bbbbbbbbb              |
+
+     Instead of:
+                            | 
+     aaaaaaaaaaa            |
+     bbbbbbbbbbbbbbbbbbbbbbb|
+     bbbbbbbbbbbbbbbbbbbb   |
+
+  - Blinking cursor
+
+  - API's : gtk_text_clear, gtk_text_delete_lines (gint start, gint end),
+    gtk_text_append/prepend, gtk_text_insert_at (gint row, gint column),
+    some function to get the row/column from the x/y-coordinates of a 
+    mouse click, some function to get the word/line under the mouse pointer 
+    [ From: Stefan Jeske <jeske@braunschweig.netsurf.de> ]
+
+  - "changed" emitted when doing deletes on empty Text widget.
+
+  - Delete IC in editable->unrealize, not editable->finalize?
+
+Themes
+======
+
+ - When a scale gets shown/hidden only queue a redraw on the
+   non-window portion, not the whole area.
+
+ - In various places, to avoid shaping windows excessively,
+   we set parent relative backgrounds. This is an ugly
+   hack and needs a better solution. Plus, I don't think
+   these parent-relative backgrounds always persist to
+   when they are actually needed.
+
+   Such calls exist in: GtkButton, GtkHandeBox, GtkItem,
+   GtkListItem, GtkMenu, GtkMenuItem, GtkMisc, 
+   GtkNoteBook, GtkOptionMenu, GtkPaned, GtkPreview,
+   GtkSpinButton and GtkTreeItem.
+
+ - For menus and for GtkWindow's, the realize() function
+   calls paint(), so that background pixmaps can be set
+   ahead of time, and prevent flashing when the window is
+   shown. This is an ugly hack and needs a better solution.
+
+=======
+
+Calendar Widget:
+
+ - The widget should be nicely resizeable vertical too.
+
+ - CALENDAR_MARGIN should be removed, uses INNER_BORDER and
+   style->class->[xy]thickness insted.
+
+ - Flag to choose between using standard three letter abbreviated
+   weekday name or just the first character from it. It looks like
+   that is what most other calendar-widgets do.
+
+ - Arrows should resize with the header-font.
+
+ - The keyboard support has to be finished.
+
+DND
+===
+
+ - Use a cursor instead of an ICON when over Motif windows,
+   to get rid of the current junk that Motif leaves because
+   of its XCopyArea stupidity for doing highlighting.
+
+ - Add a GTK_DRAG_VERIFY target flag and a "drag_data_verify"   
+   signal so that apps can easily check if a, say, 
+   text/uri-list URL looks OK during the drop.
+
+ - Check more for memory leaks.
+
+ - Drag and drop for Entry and Text widgets.
+
+ - Send synthetic motion events on structure changes so 
+   drag_enter/leave get sent properly. (See the popup
+   in testdnd)
--- a/TODO.xml
+++ b/TODO.xml
@@ -0,0 +1,739 @@
+<!-- This is used to generate the online TODO list for GTK+ using
+     the script docs/make-todo. Whenever a change to this file is
+     committed to CVS,the file is run through make-todo and the online
+     version updated. If you modify this file, you should check for
+     parse errors by running:
+
+     $ docs/make-todo TODO.xml > /dev/null
+
+     before committing, or you may screw up the online version --> 
+<todo logourl="gtk-logo-rgb.gif">
+  <title>GTK+ TODO list</title>
+  <section>
+    <title>GDK</title>
+    
+    <entry size="medium" status="90%" target="2.0">
+      <title>Add backing store support</title>
+      <description>
+	<p>
+	  GTK+'s drawing model involves clearing to a background, and
+	  then drawing widgets on top of this. Without having
+	  backing-store support, this results in flickering in various
+	  situations. Backing store cannot be added widget-by-widget,
+	  because the drawing in a particular window is not confined
+	  to a single widget. Instead it needs to be added per GDK
+	  window. 
+	</p>
+	<p>
+	  The way this is done is by having
+	  <tt>gdk_window_begin_paint()</tt>
+	  and <tt>gdk_window_end_paint()</tt> functions that
+	  redirect all drawing to a particular window to an offscreen
+	  pixmap, and then copy that offscreen pixmap back onto the
+	  screen when the paint operation is done. The implementation
+	  of this is mostly complete in the <tt>gtk-no-flicker</tt> branch of
+	  GTK+.
+	</p>
+      </description>
+      <url>http://www.gtk.org/~otaylor/gtk/1.4/gdk-drawing.html</url>
+      <contact>Owen Taylor &lt;otaylor@redhat.com&gt;</contact>
+    </entry>
+
+    <entry size="medium" status="90%" target="2.0">
+      <title>32 Bit Coordinates</title>
+      <description>
+	<p>
+	  GTK+-1.2 and earlier share X's limitation on the
+	  size of coordinates and restrict all dimensions
+	  to 16 bit quantities. By clever use of X it is
+	  possible to lift this restriction and present a
+	  full 32-bit space to the user.
+	</p>
+	<p>
+	  There are some difficulties with performance in this
+	  approach - mostly because scrolling can involve mapping and
+	  unmapping lots of widgets, but in general, current
+	  trials in this area seem to work pretty well.  
+	</p>
+      </description>
+      <url>http://www.gtk.org/~otaylor/gtk/1.4/gdk-drawing.html</url>
+      <contact>Owen Taylor &lt;otaylor@redhat.com&gt;</contact>
+    </entry>
+
+    <entry size="small" status="0%" target="2.0">
+      <title>Customizable double-click timeout</title>
+      <description>
+	<p>
+	  The current fixed double-click timeout in GTK+
+	  is too small for some users. This needs to be
+	  customizable
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+      <bugs>#3958</bugs>
+    </entry>
+
+    <entry size="small" status="0%" target="2.0">
+      <title>Make color handling more convenient</title>
+      <description>
+	<p>
+          Add some color convenience functions; such as a way to get an
+          allocated GdkColor from GdkRGB, and export functions from gtkstyle.c
+          that lighten/darken a given color, and set a color from HSV in
+          addition to RGB. Also, consider having static variables that contain
+          preallocated common colors (gdk_blue, gdk_red, etc.), the problem
+          being colormap issues.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="small" status="0%" target="2.0">
+      <title>Cursors</title>
+      <description>
+	<p>
+          Two tasks: 1) move the cursors in the cursor font that people actually
+          care about to the top of the gdkcursor.h header file, and put a nice
+          list of the 15 cursors people actually care about in the docs 2) if
+          the cursor font lacks some commonly-useful cursors (like magnifying
+          glass), add these cursors to gdkcursor.h and then emulate them in
+          gdk_cursor_new by transparently creating the cursor from a bitmap.
+          The list of Qt cursors is worth http://doc.trolltech.com/qcursor.html
+          looking at for this task.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="medium" status="100%" target="2.0">
+      <title>Make GdkRGB work on any visual</title>
+      <description>
+	<p>
+          GdkRGB should be able to render to an arbitrary visual
+          (i.e. the visual shouldn't be fixed at gdk_rgb_init() 
+          time). This will break gdk_rgb_gc_set_foreground() and 
+          friends, though.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+  </section> <!-- GDK -->
+
+  <section>
+    <title>Internationalization</title>
+    
+    <entry size="big" status="90%" target="2.0">
+      <title>Integrate Pango</title>
+      <description>
+	<p>
+	  The purpose of the Pango project is to provide a system for
+	  layout and rendering of internationalized text. It handles
+	  most of the issues necessary to 
+	</p>
+      </description>
+      <url>http://www.pango.org</url>
+      <contact>gtk-i18n-list@redhat.com</contact>
+    </entry>
+
+    <entry size="medium" status="90%" target="2.0">
+      <title>Switch to using UTF-8</title>
+      <description>
+	<p>
+	  This is closely related to Pango integration. Pango deals
+	  with all strings in terms of UTF-8; by switching GTK+ over
+	  to UTF-8 we make it considerably simpler for developers to
+	  support multiple languages properly while still retaining
+	  a large degree of compatibility with existing programs.
+	</p>
+	<p>
+	  Some work has already been done on this as part of the Win32
+	  port, since the Win32 port is currently using UTF-8 for all
+	  strings. In general, this should be an easy job; the hardest
+	  parts are places like GtkFileSelection, cut and paste, and
+	  input method support where there is interaction between GTK+
+	  and the operating system.
+	</p>
+      </description>
+      <contact>gtk-i18n-list@redhat.com</contact>
+    </entry>
+
+    <entry size="big" status="60%" target="2.0">
+      <title>Rewrite Input Method Support</title>
+      <description>
+	<p>
+	  Support for Input Methods is GTK+-1.2 is done via XIM, with
+	  supported styles being over-the-spot and the root-window
+	  styles. However, the over-the-spot style is not going to
+	  work well with the Pango integration, since it relies on the
+	  text rendering in the program being done in the standard
+	  Xlib style, so it will be necessary to also support
+	  on-the-spot input. On-the-spot input is done by supplying a
+	  set of callbacks that are invoked by the input methods.
+	</p>
+	<p>
+	  GTK+-2.0 will have a new system with loadable input method
+	  modules. These modules can either be implemented using XIM,
+	  or written from scratch.
+	</p>
+      </description>
+      <contact>gtk-i18n-list@redhat.com</contact>
+    </entry>
+  </section> <!-- i18n -->
+
+  <section>
+    <title>GTK+ Core</title>
+
+    <entry size="big" status="60%" target="2.0">
+      <title>GLib based object and type system</title>
+      <description>
+	<p>
+	  The GTK+ object system is already in use in quite a few different
+	  non-GUI applications; it would be desirable for these uses
+	  to have the object and type systems separated from the GUI portions
+	  of GTK+ and be generalized for non-GUI usage.
+	</p>
+      </description>
+      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
+    </entry>
+
+    <entry size="big" status="1%" target="2.0">
+      <title>Overall callback improvements</title>
+      <description>
+	<p>
+	  The GTK+ type and signal systems need significant improvements to
+	  allow signal creation with default handlers from language bindings
+	  and to aid language bindings in deriving new objects.
+	  One aspect of this is the Closure support, recently suggested by
+	  Karl Nelson &lt;kenelson@ece.ucdavis.edu&gt;, but this also
+	  requires a GLib based type and parameter system (ties in with
+	  "GLib based object and type system").
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="big" status="0%" target="2.0">
+      <title>State change notification</title>
+      <description>
+	<p>
+	  GTK+ objects emit various types of signals, some to perform
+	  arbitrary actions, some to allow customization from user code,
+	  and some signals are emitted to notify of certain changes
+	  of an object. For the latter, what really is required is a
+	  gneneric signal that can be used to monitor *any* kind of object
+	  changes. For that, all object changes need to be routed through
+	  a central point (otherwise the signal emissions are spread all
+	  over the object implementation), i.e. an object argument setter.
+	  The state change notification signal doesn't need to be emitted
+	  syncronously, in fact, it's probably most effective to always
+	  emit this asynchronously, so subsequent changes are accumulated.
+	</p>
+      </description>
+      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
+    </entry>
+
+    <entry size="big" status="5%" target="2.0">
+      <title>Widget as sensitivity/grab state machine</title>
+      <description>
+	<p>
+	  Maintenance of pointer and keybnoard grabs is currently very
+	  tedious and error-prone, most widget's cook up their own stuff
+	  in this regard.
+	  By moving the general concept of "Grabs" to the GTK+ level as
+	  a widget state, and providing a new signal for alterations of
+	  a widget's state ("visible", "visible+insensitive",
+	  "visible+grab", "hidden", "hidden+insensitive", etc.), things
+	  can be unified and more stabelize. A couple of bugs, such as
+	  insensitive widgets still holding a grab, or buttons that
+	  still think they are depressed when hidden, will be squeezed
+	  automatically with that.
+	</p>
+      </description>
+      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
+    </entry>
+
+    <entry size="big" status="0%" target="2.0">
+      <title>Allow argument customization</title>
+      <description>
+	<p>
+	  Many types of object arguments (expander style in the CList,
+	  default padding in button boxes, etc), conceptually go with
+	  the theme, or as user preferences; they should not be set by
+	  a particular program.
+	</p>
+	<p>
+	  There needs to be a mechanism for themes to be able to
+	  control these arguments from the RC file. 
+	</p>
+      </description>
+    </entry>
+
+    <entry size="medium" status="0%" target="2.0">
+      <title>Allow global customization</title>
+      <description>
+	<p>
+	  There are a number of global parameters in GTK+ and GDK that should be
+	  customizable by the user, such as the double-click timeout,
+	  or whether widgets should be backing-stored by default. 
+	</p>
+	<p>
+	  If we had argument customization from an RC file, it might
+	  be possible to do this simply with a global object with
+	  arguments for the various global parameters that was
+	  customized in the same fashion as object arguments.
+	</p>
+      </description>
+    </entry>
+
+    <entry size="small" status="0%" target="2.0">
+      <title>Gtk+ Modules installation directory</title>
+      <description>
+	<p>
+	  Gtk+ needs to support an extra lib/ directory, to search
+	  for dynamically loadable modules, it also needs to support
+	  an environment variable to specify module search paths.
+	  This has quite some cross-platform issues with the GModule
+	  code (especially on AIX).
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+
+    <entry size="small" status="20%" target="2.0">
+      <title>Convenient widget setup</title>
+      <description>
+	<p>
+          Make it simpler to set all the basic attributes of a widget.  Might
+          want set_tooltip(), set_accel(), set_color(FOREGROUND, color),
+          set_min_size() (usize does this, but needs a rename), set_whatsthis(),
+          etc. set_accel() may not work for all widgets, may need a convenience
+          API for button and label accelerators specifically.
+	</p>
+        <p>
+          The idea is that it should be easy, out of the box, to set up a widget
+          with all the nice touches and features the widget really should
+          have. Users shouldn't need to do their own convenience functions for
+          this.
+        </p>
+
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="medium" status="0%" target="> 2.0">
+      <title>Make selections/clipboard more convenient</title>
+      <description>
+	<p>
+          Make GtkSelectionData more like the MIME blobs in Swing and Qt.
+          Consider a GtkClipboard object to simplify cut-and-paste handling.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+
+    <entry size="small" status="80%" target="2.0">
+      <title>Stock label/icon system</title>
+      <description>
+	<p>
+          A system like GnomeStock for getting a standard labels/icons 
+          for menus and toolbars. Should be extensible by themes, and 
+          by libgnomeui. Some work already done on this.
+	</p>
+      </description>
+      <contact>hp@redhat.com</contact>
+    </entry>
+
+
+    <entry size="big" status="0%" target="> 2.0">
+      <title>Session Management</title>
+      <description>
+	<p>
+          Look in to session management. Consider whether to use 
+          X11R6 SM, or some custom spec shared with KDE. Create
+          GTK+ API for this.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="big" status="0%" target="> 2.0">
+      <title>Online help enhancements</title>
+      <description>
+	<p>
+          Look at a small "What's This" popup widget, 
+          and a What's This system in general (this part 
+          could maybe be done for 2.0). A more difficult, probably 
+          a post-2.0 task, is to integrate a very simple little
+          help browser gizmo into GTK.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+
+    <entry size="medium" status="0%" target="2.0">
+      <title>GUI-editable means of user configuration</title>
+      <description>
+	<p>
+          Need to be able to set double click time, whether cursors
+          blink, etc., from a control panel type of deal.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+  </section> <!-- Core -->
+
+  <section>
+    <title>GTK+ Widgets</title>
+
+    <entry size="small" status="100%" target="2.0">
+      <title>Make GtkFrame use a label</title>
+      <description>
+	<p>
+	  The title of a frame should simply be another child widget
+	  which, by default, holds a label widget. This will important
+	  with Pango where proper text behavior will be more complex to
+	  implement, but is also useful for certain user-interface
+	  designs. (It can be useful, for example, to put a checkbutton
+	  in that slot.)
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="big" status="90%" target="2.0">
+      <title>Replace GtkText Widget</title>
+      <description>
+	<p>
+	  The GtkText widget is badly in need of replacement, since it
+	  is buggy and insufficiently feature rich. This is being done
+	  using Havoc Pennington's port of the Tk Text widget.
+	</p>
+	<p>
+	  As part of this job <a href="http://www.pango.org">Pango</a>
+	  support is being added to the replacement. The structure of
+	  the Tk text widget port is suited to this as it works
+	  paragraph-by-paragraph, and Pango works at a sub-paragraph
+	  scale. The main remaining tasks here are to implement
+	  incremental reflow to make performance acceptable and to
+	  implement embedded pixmaps and widgets.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="small" status="20%" target="2.0">
+      <title>Improve Radio/Checkbutton Look</title>
+      <description>
+	<p>
+	  The default look for the radio and checkbuttons is both
+	  unattractive and not friendly to the user . Motif did not
+	  get this one right, and we should not keep on following the
+	  Motif look. The right thing here is probably to copy the
+	  Windows appearance for these controls fairly closely. This
+	  will fit in with well with the rest of the GTK+ look.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="small" status="99%" target="2.0">
+      <title>Improve Submenu Navigation</title>
+      <description>
+	<p>
+	  Navigating through a deep menu tree in GTK+ is currently
+	  quite tricky, because as soon as one leaves a menu item,
+	  the submenu disappears. The way that the Macintosh is
+	  reputed to handle this is that to pop down the current
+	  submenu, you have to leave the triangle defined by the
+	  upper left hand corner of the menu item and right
+	  side of the submenu.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="small" status="0%" target="2.0 ?">
+      <title>Improve Spinbutton Look</title>
+      <description>
+	<p>
+	  Spinbuttons currently appear to have lumpy boundaries,
+	  because sides of the arrows aren't at an angle that
+	  meshes well with the pixel grid. However, fixing this
+	  would require making the spinbuttons narrower and
+	  harder to hit. This points out a general problem with
+	  the spinbutton (and the arrows on the scrollbars) - the
+	  target area for clicks actually the bounding box of the
+	  arrows, but the user thinks that they must click on the
+	  arrows themselves. It would probably be more friendly
+	  to use a square button with an arrow drawn on top instead
+	  of a arrow-shaped button, the approach taken by most other
+	  windowing systems.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="big" status="90%" target="2.0">
+      <title>Supply horizontable/vertical wrapping boxes</title>
+      <description>
+	<p>
+	  An often requested feature are wrapping containers, at this
+	  point, gimp's development version already uses such widgets:
+	  horizontable/vertical wrap boxes, that need to go into 2.0
+	  proper at some point.
+	</p>
+      </description>
+      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
+    </entry>
+
+    <entry size="medium" status="90%" target="2.0">
+      <title>Improved generic combo support</title>
+      <description>
+	<p>
+	  Gtk+'s combo box has several drawbacks in design and
+	  implementation. An new attempt at providing the combo box
+	  functionality with improved flexibility has been made with
+	  the GtkClueHunter widget, sitting in the CVS module "gle".
+	</p>
+      </description>
+      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
+    </entry>
+
+    <entry size="big" status="40%" target="2.0?">
+      <title>Add unified set of List/Tree/Grid widgets</title>
+      <description>
+	<p>
+	  Currently, GTK+ has a large number of list and tree widgets
+	  (GtkList, GtkTree, GtkCList, GtkCTree), none of which are
+	  ideal. The GtkList and GtkTree widgets perform badly on large
+	  number of items. (GtkTree widget is also quite buggy.) GtkCList
+	  and GtkCTree mostly solve the size problem, but are quite
+	  complex and, despite that, not very flexible. They are limited to
+	  displaying pixmaps and text, and can neither support arbitrary
+	  widgets nor custom drawing functions.
+	</p>
+	<p>
+	  In addition to list and tree widgets, a closely related need
+	  is a sheet widget that displays a (possibly editable) 2-D grid.
+	  It would be desirable to have a complete set of widgets that
+	  could be presented as the one-true-solution for these needs.
+	  Model/View techniques could be used effectively to increase
+	  both the simplicity and power of the interfaces.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="small" status="0%" target="2.0">
+      <title>GtkImage</title>
+      <description>
+	<p>
+          gdk-pixbuf is moving to become a GTK+ dependency, a new image-display
+          widget is thus needed.
+	</p>
+      </description>
+      <contact>hp@redhat.com</contact>
+    </entry>
+
+    <entry size="small" status="0%" target="2.0">
+      <title>Attempt to fix GtkStatusbar</title>
+      <description>
+	<p>
+          GtkStatusbar is too inconvenient to use.
+          The only non-breakage-inducing fix we could
+          come up with is to permit 0 as a context ID, so you
+          don't have to use gtk_statusbar_get_context_id().
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+    
+    <entry size="small" status="95%" target="2.0">
+      <title>Decruft GtkProgress, GtkProgressbar</title>
+      <description>
+        <p>UPDATE: this is done, just need to apply the patch.
+        </p>
+        
+	<p>
+          This interface is just a disaster of overcomplexity;
+          it should pretty much just be set_percentage(), 
+          pulse() (to move during activity mode), and set_text().
+          There's no reason that there are two objects, should 
+          just be one interface. Almost all the functions
+          that currently exist should be deprecated.
+	</p>
+      </description>
+      <contact>hp@redhat.com</contact>
+    </entry>
+
+    <entry size="small" status="0%" target="2.0">
+      <title>Entry validation hooks</title>
+      <description>
+	<p>
+          Simple hooks for validation in a GtkEntry.  Pretty much just a
+          "validate" callback which takes a string (current entry contents) and
+          returns either VALID, INVALID, or COULDBEVALID. Then the 
+          GtkEntry calls this function if it's set, and does the appropriate 
+          UI things. GTK should come with validators for int and float,
+          see GtkSpinButton where these are already implemented.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="big" status="0%" target="> 2.0">
+      <title>pseudo-MDI Widget</title>
+      <description>
+	<p>
+          Add a widget that lets you rearrange various views (similar to many
+          IDEs, like Visual SlickEdit or JBuilder). Basically there should be a
+          central slot and 4 slots around the sides; each slot holds one or more
+          views. If two views are dropped in the same slot, then a notebook is
+          created displaying both views. If a view is dropped outside the
+          application window, it becomes a standalone window. It should be
+          possible to restrict whether a view can be dropped on the sides,
+          horizontal/vertical sides only, in the central content area, or in
+          any of those places.
+	</p>
+        <p>
+          (Havoc has a proposed interface for this, mail hp@redhat.com)
+        </p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="medium" status="0%" target="> 2.0">
+      <title>Icon List Widget</title>
+      <description>
+	<p>
+          A simple icon list widget, suitable for creating a file selector or
+          the like.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="medium" status="0%" target="> 2.0">
+      <title>Dock widget</title>
+      <description>
+	<p>
+          Add a widget like GnomeDock (perhaps based on GnomeDock)
+          that allows people to put rearrangeable toolbars, menubars, etc. 
+          around a central content area. The widget should have hooks for 
+          saving the current positions of the various docked bars.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="big" status="0%" target="> 2.0">
+      <title>Canvas widget</title>
+      <description>
+	<p>
+          Figure out how to get GnomeCanvas or a derived work into GTK+ itself.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="medium" status="57%" target="2.0">
+      <title>Menu scroll</title>
+      <description>
+	<p>
+          When menus are bigger than the screen, allow scrolling
+          as on the Mac.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="medium" status="20%" target="2.0">
+      <title>Toolbar/menubar wrap</title>
+      <description>
+	<p>
+          When toolbars and menubars are too wide, do some sort of 
+          wrapping or drop-down deal. (See Windows/Mac apps for examples.)
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="small" status="0%" target="2.0">
+      <title>Blink cursor in GtkEntry</title>
+      <description>
+	<p>
+          Make the cursor optionally blink in GtkEntry. Beware, the entry code
+          is somewhat in flux; mail Owen and ask.
+	</p>
+      </description>
+      <contact>otaylor@redhat.com</contact>
+    </entry>
+
+    <entry size="small" status="100%" target="2.0">
+      <title>Don't highlight first menu item when menus come up</title>
+      <description>
+	<p>
+          Keep GtkMenu from prelighting the first menu item.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="small" status="100%" target="2.0">
+      <title>Integrate new color selector</title>
+      <description>
+	<p>
+          There's a new color selector in CVS (module gnome-colorsel),
+          it needs to be folded in to GTK and any remaining issues resolved.
+          (This new selector is API-compatible with the old one, and 
+          still called GtkColorSelector).
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="medium" status="70%" target="2.0">
+      <title>Write new font selector</title>
+      <description>
+	<p>
+          Pango introduces a new font handling system,
+          replacing the XLFD system. Need a font selector for this.
+          The XLFD selector should probably remain, for apps where
+          it makes sense (like gnome-terminal probably).
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="small" status="0%" target="2.0">
+      <title>Stack Widget</title>
+      <description>
+	<p>
+          Jonathan has a widget like a tabless/frameless notebook, used for
+          something like the GNOME control center where you want to toggle which
+          widget is visible to the user. Needs to be cleaned up and considered
+          for GTK.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org, jrb@redhat.com</contact>
+    </entry>
+
+    <entry size="small" status="0%" target="2.0">
+      <title>Clean up GtkNotebook</title>
+      <description>
+	<p>
+          GtkNotebook currently breaks GTK invariants about
+          mapping/visibility/etc., needs fixing.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+  </section> <!-- GTK+ -->
+</todo>
+
--- a/acconfig.h
+++ b/acconfig.h
@@ -0,0 +1,83 @@
+/* acconfig.h
+   This file is in the public domain.
+
+   Descriptive text for the C preprocessor macros that
+   the distributed Autoconf macros can define.
+   No software package will use all of them; autoheader copies the ones
+   your configure.in uses into your configuration header file templates.
+
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  Although this order
+   can split up related entries, it makes it easier to check whether
+   a given entry is in the file.
+
+   Leave the following blank line there!!  Autoheader needs it.  */
+
+
+/* Other stuff */
+#undef ENABLE_NLS
+#undef GTK_COMPILED_WITH_DEBUGGING
+
+#undef HAVE_CATGETS
+#undef HAVE_DIMM_H
+#undef HAVE_GETTEXT
+#undef HAVE_IPC_H
+#undef HAVE_LC_MESSAGES
+#undef HAVE_PROGRESSIVE_JPEG
+#undef HAVE_PWD_H
+#undef HAVE_SHM_H
+#undef HAVE_STPCPY
+#undef HAVE_XSHM_H
+#undef HAVE_SHAPE_EXT
+#undef HAVE_SYS_SELECT_H
+#undef HAVE_SYS_TIME_H
+#undef HAVE_WINSOCK_H
+#undef HAVE_WINTAB
+#undef HAVE_XCONVERTCASE
+#undef HAVE_XFT
+
+#undef HAVE_SIGSETJMP
+
+#undef NO_FD_SET
+
+#undef RESOURCE_BASE
+
+#undef USE_GMODULE
+#undef USE_MMX
+
+/* Define to use X11R6 additions to XIM */
+#undef USE_X11R6_XIM
+
+/* Define to use XKB extension */
+#undef HAVE_XKB
+
+/* Define to use shadowfb in the linux-fb port */
+#undef ENABLE_SHADOW_FB
+
+/* Define to use a fb manager in the linux-fb port */
+#undef ENABLE_FB_MANAGER
+
+#undef XINPUT_NONE
+#undef XINPUT_GXI
+#undef XINPUT_XFREE
+
+/* Define as the return type of signal handlers (int or void).  */
+#undef RETSIGTYPE
+
+/* Most machines will be happy with int or void.  IRIX requires '...' */
+#undef SIGNAL_ARG_TYPE
+
+#undef HAS_SOLARIS_XINERAMA
+#undef HAS_XFREE_XINERAMA
+#undef HAS_XINERAMA
+
+#undef GETTEXT_PACKAGE
+
+/* #undef PACKAGE */
+/* #undef VERSION */
+
+
+/* Leave that blank line there!!  Autoheader needs it.
+   If you're adding to this file, keep in mind:
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  */
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -11,69 +11,341 @@ AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP],
 $1
 AC_DIVERT_POP()])])])

-# GTK_ADD_LIB(VAR,LIBNAME)
-# ---------------------------------
-# Helper macro to add a -lBlah to a variable, avoiding repeats
-# Note that this needs to be quoted when used in an enclosing macro
-AC_DEFUN([GTK_ADD_LIB],
-[ case "$$1 " in
-    *-l$2[[\ \	]]*)               ;;
-    *)               $1="-l$2 $$1" ;;
-  esac
-])
+
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# Modified to never use included libintl. 
+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
+#
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 5
+
+AC_DEFUN(AM_GTK_WITH_NLS,
+  [AC_MSG_CHECKING([whether NLS is requested])
+    dnl Default is enabled NLS
+    AC_ARG_ENABLE(nls,
+      [  --disable-nls           do not use Native Language Support],
+      USE_NLS=$enableval, USE_NLS=yes)
+    AC_MSG_RESULT($USE_NLS)
+    AC_SUBST(USE_NLS)
+
+    USE_INCLUDED_LIBINTL=no
+
+    dnl If we use NLS figure out what method
+    if test "$USE_NLS" = "yes"; then
+#      AC_DEFINE(ENABLE_NLS)
+#      AC_MSG_CHECKING([whether included gettext is requested])
+#      AC_ARG_WITH(included-gettext,
+#        [  --with-included-gettext use the GNU gettext library included here],
+#        nls_cv_force_use_gnu_gettext=$withval,
+#        nls_cv_force_use_gnu_gettext=no)
+#      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+      nls_cv_force_use_gnu_gettext="no"
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If gettext or catgets are available (in this order) we
+        dnl use this.  Else we have to fall back to GNU NLS library.
+	dnl catgets is only used if permitted by option --with-catgets.
+	nls_cv_header_intl=
+	nls_cv_header_libgt=
+	CATOBJEXT=NONE
+
+	AC_CHECK_HEADER(libintl.h,
+	  [AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+	    [AC_TRY_LINK([#include <libintl.h>], [return (int) dgettext ("","")],
+	       gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no)])
+
+	   if test "$gt_cv_func_dgettext_libc" != "yes"; then
+	     AC_CHECK_LIB(intl, bindtextdomain,
+	       [AC_CACHE_CHECK([for dgettext in libintl],
+		 gt_cv_func_dgettext_libintl,
+		 [AC_CHECK_LIB(intl, dgettext,
+		  gt_cv_func_dgettext_libintl=yes,
+		  gt_cv_func_dgettext_libintl=no)],
+		 gt_cv_func_dgettext_libintl=no)])
+	   fi
+
+           if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+	     LIBS="$LIBS -lintl";
+           fi
+
+	   if test "$gt_cv_func_dgettext_libc" = "yes" \
+	      || test "$gt_cv_func_dgettext_libintl" = "yes"; then
+	      AC_DEFINE(HAVE_GETTEXT)
+	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	      if test "$MSGFMT" != "no"; then
+		AC_CHECK_FUNCS(dcgettext)
+		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+		AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+			       return _nl_msg_cat_cntr],
+		  [CATOBJEXT=.gmo
+		   DATADIRNAME=share],
+		  [CATOBJEXT=.mo
+		   DATADIRNAME=lib])
+		INSTOBJEXT=.mo
+	      fi
+	    fi
+
+	    # Added by Martin Baulig 12/15/98 for libc5 systems
+	    if test "$gt_cv_func_dgettext_libc" != "yes" \
+	       && test "$gt_cv_func_dgettext_libintl" = "yes"; then
+	       INTLLIBS=-lintl
+	       LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+	    fi
+	])
+
+        if test "$CATOBJEXT" = "NONE"; then
+	  AC_MSG_CHECKING([whether catgets can be used])
+	  AC_ARG_WITH(catgets,
+	    [  --with-catgets          use catgets functions if available],
+	    nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
+	  AC_MSG_RESULT($nls_cv_use_catgets)
+
+	  if test "$nls_cv_use_catgets" = "yes"; then
+	    dnl No gettext in C library.  Try catgets next.
+	    AC_CHECK_LIB(i, main)
+	    AC_CHECK_FUNC(catgets,
+	      [AC_DEFINE(HAVE_CATGETS)
+	       INTLOBJS="\$(CATOBJS)"
+	       AC_PATH_PROG(GENCAT, gencat, no)dnl
+#	       if test "$GENCAT" != "no"; then
+#		 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
+#		 if test "$GMSGFMT" = "no"; then
+#		   AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
+#		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+#		 fi
+#		 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+#		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+#		 USE_INCLUDED_LIBINTL=yes
+#		 CATOBJEXT=.cat
+#		 INSTOBJEXT=.cat
+#		 DATADIRNAME=lib
+#		 INTLDEPS='$(top_builddir)/intl/libintl.a'
+#		 INTLLIBS=$INTLDEPS
+#		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+#		 nls_cv_header_intl=intl/libintl.h
+#		 nls_cv_header_libgt=intl/libgettext.h
+#              fi
+            ])
+	  fi
+        fi
+
+        if test "$CATOBJEXT" = "NONE"; then
+	  dnl Neither gettext nor catgets in included in the C library.
+	  dnl Fall back on GNU gettext library.
+	  nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" != "yes"; then
+        AC_DEFINE(ENABLE_NLS)
+      else
+         # Unset this variable since we use the non-zero value as a flag.
+         CATOBJEXT=
+#        dnl Mark actions used to generate GNU NLS library.
+#        INTLOBJS="\$(GETTOBJS)"
+#        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+#	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+#        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+#        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+#	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+#        AC_SUBST(MSGFMT)
+#	USE_INCLUDED_LIBINTL=yes
+#        CATOBJEXT=.gmo
+#        INSTOBJEXT=.mo
+#        DATADIRNAME=share
+#	INTLDEPS='$(top_builddir)/intl/libintl.a'
+#	INTLLIBS=$INTLDEPS
+#	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+#        nls_cv_header_intl=intl/libintl.h
+#        nls_cv_header_libgt=intl/libgettext.h
+      fi
+
+      dnl Test whether we really found GNU xgettext.
+      if test "$XGETTEXT" != ":"; then
+	dnl If it is no GNU xgettext we define it as : so that the
+	dnl Makefiles still can work.
+	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+	  : ;
+	else
+	  AC_MSG_RESULT(
+	    [found xgettext program is not GNU xgettext; ignore it])
+	  XGETTEXT=":"
+	fi
+      fi
+
+      # We need to process the po/ directory.
+      POSUB=po
+    else
+      DATADIRNAME=share
+      nls_cv_header_intl=intl/libintl.h
+      nls_cv_header_libgt=intl/libgettext.h
+    fi
+    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+    AC_OUTPUT_COMMANDS(
+     [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])


-# Checks the location of the XML Catalog
-# Usage:
-#   JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# Defines XMLCATALOG and XML_CATALOG_FILE substitutions
-AC_DEFUN([JH_PATH_XML_CATALOG],
-[
-  # check for the presence of the XML catalog
-  AC_ARG_WITH([xml-catalog],
-              AC_HELP_STRING([--with-xml-catalog=CATALOG],
-                             [path to xml catalog to use]),,
-              [with_xml_catalog=/etc/xml/catalog])
-  jh_found_xmlcatalog=true
-  XML_CATALOG_FILE="$with_xml_catalog"
-  AC_SUBST([XML_CATALOG_FILE])
-  AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)])
-  if test -f "$XML_CATALOG_FILE"; then
-    AC_MSG_RESULT([found])
-  else
-    jh_found_xmlcatalog=false
-    AC_MSG_RESULT([not found])
-  fi
+#    # If this is used in GNU gettext we have to set USE_NLS to `yes'
+#    # because some of the sources are only built for this goal.
+#    if test "$PACKAGE" = gettext; then
+#      USE_NLS=yes
+#      USE_INCLUDED_LIBINTL=yes
+#    fi

-  # check for the xmlcatalog program
-  AC_PATH_PROG(XMLCATALOG, xmlcatalog, no)
-  if test "x$XMLCATALOG" = xno; then
-    jh_found_xmlcatalog=false
-  fi
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.in.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done

-  if $jh_found_xmlcatalog; then
-    ifelse([$1],,[:],[$1])
-  else
-    ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2])
-  fi
-])
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(USE_INCLUDED_LIBINTL)
+    AC_SUBST(CATALOGS)
+    AC_SUBST(CATOBJEXT)
+    AC_SUBST(DATADIRNAME)
+    AC_SUBST(GMOFILES)
+    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INTLDEPS)
+    AC_SUBST(INTLLIBS)
+    AC_SUBST(INTLOBJS)
+    AC_SUBST(POFILES)
+    AC_SUBST(POSUB)
+  ])
+
+AC_DEFUN(AM_GTK_GNU_GETTEXT,
+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+   AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_PROG_RANLIB])dnl
+   AC_REQUIRE([AC_ISC_POSIX])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   AC_REQUIRE([AC_C_CONST])dnl
+   AC_REQUIRE([AC_C_INLINE])dnl
+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+   AC_REQUIRE([AC_FUNC_MMAP])dnl
+
+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
+unistd.h sys/param.h])
+   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+strdup __argz_count __argz_stringify __argz_next])
+
+   if test "${ac_cv_func_stpcpy+set}" != "set"; then
+     AC_CHECK_FUNCS(stpcpy)
+   fi
+   if test "${ac_cv_func_stpcpy}" = "yes"; then
+     AC_DEFINE(HAVE_STPCPY)
+   fi
+
+   AM_LC_MESSAGES
+   AM_GTK_WITH_NLS
+
+   if test "x$CATOBJEXT" != "x"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
+         case "$ALL_LINGUAS" in
+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+         esac
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+   dnl The reference to <locale.h> in the installed <libintl.h> file
+   dnl must be resolved because we cannot expect the users of this
+   dnl to define HAVE_LOCALE_H.
+   if test $ac_cv_header_locale_h = yes; then
+     INCLUDE_LOCALE_H="#include <locale.h>"
+   else
+     INCLUDE_LOCALE_H="\
+/* The system does not provide the header <locale.h>.  Take care yourself.  */"
+   fi
+   AC_SUBST(INCLUDE_LOCALE_H)
+
+   dnl Determine which catalog format we have (if any is needed)
+   dnl For now we know about two different formats:
+   dnl   Linux libc-5 and the normal X/Open format
+   test -d intl || mkdir intl
+   if test "$CATOBJEXT" = ".cat"; then
+     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
+
+     dnl Transform the SED scripts while copying because some dumb SEDs
+     dnl cannot handle comments.
+     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
+   fi
+   dnl po2tbl.sed is always needed.
+   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
+     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+
+   dnl In the intl/Makefile.in we have a special dependency which makes
+   dnl only sense for gettext.  We comment this out for non-gettext
+   dnl packages.
+   if test "$PACKAGE" = "gettext"; then
+     GT_NO="#NO#"
+     GT_YES=
+   else
+     GT_NO=
+     GT_YES="#YES#"
+   fi
+   AC_SUBST(GT_NO)
+   AC_SUBST(GT_YES)
+
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl *** For now the libtool support in intl/Makefile is not for real.
+   l=
+   AC_SUBST(l)
+
+   dnl Generate list of files to be processed by xgettext which will
+   dnl be included in po/Makefile.
+   test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
+   fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
+  ])

-# Checks if a particular URI appears in the XML catalog
-# Usage:
-#   JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-AC_DEFUN([JH_CHECK_XML_CATALOG],
-[
-  AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
-  AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
-  if $jh_found_xmlcatalog && \
-     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
-    AC_MSG_RESULT([found])
-    ifelse([$3],,,[$3
-])dnl
-  else
-    AC_MSG_RESULT([not found])
-    ifelse([$4],,
-       [AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],
-       [$4])
-  fi
-])
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,32 +1,112 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.

-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.

-olddir=`pwd`
-cd "$srcdir"
+ORIGDIR=`pwd`
+cd $srcdir
+PROJECT=Gtk+
+TEST_TYPE=-d
+FILE=gdk

-GTKDOCIZE=`which gtkdocize`
-if test -z $GTKDOCIZE; then
-        echo "*** No GTK-Doc found, please install it ***"
-        exit 1
-else
-        gtkdocize || exit $?
+DIE=0
+
+have_libtool=false
+if libtool --version < /dev/null > /dev/null 2>&1 ; then
+	libtool_version=`libtoolize --version |  libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+	case $libtool_version in
+	    1.4*)
+		have_libtool=true
+		;;
+	esac
+fi
+if $have_libtool ; then : ; else
+	echo
+	echo "You must have libtool 1.4 installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+	DIE=1
 fi

-# README and INSTALL are required by automake, but may be deleted by clean
-# up rules. to get automake to work, simply touch these here, they will be
-# regenerated from their corresponding *.in files by ./configure anyway.
-touch README INSTALL
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have autoconf installed to compile $PROJECT."
+	echo "libtool the appropriate package for your distribution,"
+	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+	DIE=1
+}

-AUTORECONF=`which autoreconf`
-if test -z $AUTORECONF; then
-        echo "*** No autoreconf found, please install it ***"
-        exit 1
-else
-        autoreconf --force --install --verbose || exit $?
+have_automake=false
+if automake --version < /dev/null > /dev/null 2>&1 ; then
+	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+	case $automake_version in
+	   1.2*|1.3*|1.4) 
+		;;
+	   *)
+		have_automake=true
+		;;
+	esac
+fi
+if $have_automake ; then : ; else
+	echo
+	echo "You must have automake 1.4-p1 installed to compile $PROJECT."
+	echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.4-p1.tar.gz"
+	echo "(or a newer version if it is available)"
+	DIE=1
 fi

-cd "$olddir"
-test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
+if test "$DIE" -eq 1; then
+	exit 1
+fi
+
+test $TEST_TYPE $FILE || {
+	echo "You must run this script in the top-level $PROJECT directory"
+	exit 1
+}
+
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+        if test -z "$*"; then
+                echo "I am going to run ./configure with no arguments - if you wish "
+                echo "to pass any to it, please specify them on the $0 command line."
+        fi
+fi
+
+case $CC in
+*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
+esac
+
+if test -z "$ACLOCAL_FLAGS"; then
+
+	acdir=`aclocal --print-ac-dir`
+        m4list="glib-2.0.m4 glib-gettext.m4"
+
+	for file in $m4list
+	do
+		if [ ! -f "$acdir/$file" ]; then
+			echo "WARNING: aclocal's directory is $acdir, but..."
+			echo "         no file $acdir/$file"
+			echo "         You may see fatal macro warnings below."
+			echo "         If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
+			echo "         environment variable to \"-I /some/dir\", or install"
+			echo "         $acdir/$file."
+			echo ""
+		fi
+	done
+fi
+
+aclocal $ACLOCAL_FLAGS
+
+# optionally feature autoheader
+(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+
+automake -a $am_opt
+autoconf
+cd $ORIGDIR
+
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+        $srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@"
+
+        echo 
+        echo "Now type 'make' to compile $PROJECT."
+fi
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -1,4 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = \
-	win32
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -1,4 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = \
-	vs9
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -1,13 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-EXTRA_DIST += \
-	README.txt \
-	gtk+.sln \
-	gtk+.vsprops \
-	gdk-win32.vcproj \
-	gdk.vcproj \
-	gdk.vcprojin \
-	gtk.vcproj \
-	gtk.vcprojin \
-	gtk-demo.vcproj \
-	install.vcproj
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -1,22 +0,0 @@
-Note that all this is rather experimental.
-
-This VS9 solution and the projects it includes are intented to be used
-in a GTK+ source tree unpacked from a tarball. In a git checkout you
-first need to use some Unix-like environment or manual work to expand
-the files needed, like config.h.win32.in into config.h.win32 and the
-.vcprojin files here into corresponding actual .vcproj files.
-
-You will need the parts from below in the GTK+ stack: pango, atk and
-glib. External dependencies are at least zlib, libpng, proxy-libintl,
-fontconfig, freetype, expat. See the corresponding README.txt file in
-glib for details where to unpack them.
-
-The "install" project will copy build results and headers into their
-appropriate location under <root>\vs9\<PlatformName>. For instance,
-built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
-<root>\vs9\<PlatformName>\lib and GTK+ headers into
-<root>\vs9\<PlatformName>\include\gtk-2.0. This is then from where
-project files higher in the stack are supposed to look for them, not
-from a specific GLib source tree.
-
--Tor Lillqvist <tml@iki.fi>
--- a/build/win32/vs9/gdk-win32.vcproj
+++ b/build/win32/vs9/gdk-win32.vcproj
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk-win32"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
-	RootNamespace="gdkwin32"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gdk\win32\gdkapplaunchcontext-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkcolor-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkcursor-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkdisplay-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkdnd-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkdrawable-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkevents-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkfont-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkgc-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkgeometry-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkglobals-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkim-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkinput-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkinput.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkkeys-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkmain-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkpixmap-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkproperty-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkscreen-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkselection-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkspawn-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdktestutils-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkvisual-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkwin32id.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkwindow-win32.c" />
-		</Filter>
-	</Files>
-</VisualStudioProject>
--- a/build/win32/vs9/gdk.vcprojin
+++ b/build/win32/vs9/gdk.vcprojin
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
-	RootNamespace="gdk"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GdkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GdkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\..\gdk\gdk.symbols"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk.def"
-						CommandLine="$(GtkGenerateGdkDef)"
-						Outputs="$(IntDir)\gdk.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk.def"
-						CommandLine="$(GtkGenerateGdkDef)"
-						Outputs="$(IntDir)\gdk.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk.def"
-						CommandLine="$(GtkGenerateGdkDef)"
-						Outputs="$(IntDir)\gdk.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk.def"
-						CommandLine="$(GtkGenerateGdkDef)"
-						Outputs="$(IntDir)\gdk.def"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gdk\win32\rc\gdk.rc" />
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "libgdk.sourcefiles"
-		</Filter>
-	</Files>
-</VisualStudioProject>
--- a/build/win32/vs9/gtk+.sln
+++ b/build/win32/vs9/gtk+.sln
@@ -1,80 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-win32", "gdk-win32.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-demo", "gtk-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/build/win32/vs9/gtk+.vsprops
+++ b/build/win32/vs9/gtk+.vsprops
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gtk+props"
-	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0"
-		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
-		ForcedIncludeFiles="msvc_recommended_pragmas.h"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="gdk_pixbuf-2.0.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
-		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
-	/>
-	<Tool
-		Name="VCPreBuildEventTool"
-		CommandLine="
-if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
-copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
-:DONE_CONFIG_H&#x0D;&#x0A;
-
-if exist ..\..\..\gdk\gdkconfig.h goto DONE_GDKCONFIG_H&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-:DONE_GDKCONFIG_H&#x0D;&#x0A;
-"
-	/>
-	<UserMacro
-		Name="GtkApiVersion"
-		Value="3.0"
-	/>
-	<UserMacro
-		Name="GtkBinaryVersion"
-		Value="2.10.0"
-	/>
-	<UserMacro
-		Name="GtkDummyPrefix"
-		Value="/dummy"
-	/>
-	<UserMacro
-		Name="GtkPrefixDefine"
-		Value="GTK_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;"
-	/>
-	<UserMacro
-		Name="GdkDefines"
-		Value="GDK_COMPILATION;G_LOG_DOMAIN=\&quot;Gdk\&quot;"
-	/>
-	<UserMacro
-		Name="GtkIncludedImmodulesDefines"
-		Value="INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr"
-	/>
-	<UserMacro
-		Name="GtkDefines"
-		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs9\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_PREVIEW_COMMAND=\&quot;undefined-gtk-print-preview-command\&quot;;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(GtkApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED"
-	/>
-	<UserMacro
-		Name="GtkDoInstall"
-		Value="
-echo on&#x0D;&#x0A;
-mkdir $(OutDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;
-
-mkdir $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.c $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.h $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.ui $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.jpg $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.png $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.gif $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
-
-mkdir $(OutDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
-
-mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkapplaunchcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcairo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcolor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcursor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdevice.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdevicemanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdisplay.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdisplaymanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdrawable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkenumtypes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkevents.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkinput.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkkeys.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkkeysyms.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkmain.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkpango.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkproperty.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkrectangle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkrgba.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkscreen.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkspawn.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdktestutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkthreads.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdktypes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkvisual.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-
-mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaboutdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelgroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelgroupprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccellabel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccessible.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactiongroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactivatable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkadjustment.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkalignment.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkapplication.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkarrow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaspectframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkassistant.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbin.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbindings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbuildable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbuilder.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcalendar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcelleditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcelllayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendereraccel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderercombo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererprogress.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererspin.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererspinner.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderertext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderertoggle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcheckbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcheckmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkclipboard.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorseldialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcombobox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcomboboxtext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcontainer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdebug.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdrawingarea.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkeditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentry.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentrybuffer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentrycompletion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkenums.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkeventbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkexpander.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilefilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfixed.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgrid.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhandlebox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhruler.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhsv.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkiconfactory.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkicontheme.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkiconview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimage.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimagemenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontextsimple.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimmodule.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimmulticontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkinfobar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkinvisible.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklabel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklinkbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkliststore.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmain.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenubar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenushell.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenutoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmessagedialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmisc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmodules.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmountoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtknotebook.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkoffscreenwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkorientable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpagesetup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpapersize.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkplug.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintoperationpreview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintsettings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprogressbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradioaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiobutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiomenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiotoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrange.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchoosermenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentfilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentmanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkruler.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscalebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrollable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrolledwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparatormenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparatortoolitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksettings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkshow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksizegroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksizerequest.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksocket.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkspinbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkspinner.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstatusbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstatusicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstock.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstyle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktearoffmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktestutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextbuffer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextbufferrichtext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextchild.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextdisplay.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextiter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextlayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextmark.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktexttag.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktexttagtable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoggleaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktogglebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoggletoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolitemgroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolpalette.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolshell.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktooltip.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreednd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodelfilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodelsort.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreesortable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreestore.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeviewcolumn.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktypebuiltins.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktypeutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkuimanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkversion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkviewport.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvolumebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvruler.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-
-mkdir $(OutDir)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkconfig.h $(OutDir)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#x0A;
-
-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
-"
-	/>
-	<UserMacro
-		Name="GtkGenerateGdkDef"
-		Value="echo EXPORTS &gt;&quot;$(IntDir)\gdk.def&quot; &amp;&amp; cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols &gt;&gt;&quot;$(IntDir)\gdk.def&quot;"
-	/>
-	<UserMacro
-		Name="GtkGenerateGtkDef"
-		Value="echo EXPORTS &gt;&quot;$(IntDir)\gtk.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt;&quot;$(IntDir)\gtk.def&quot;"
-	/>
-	<UserMacro
-		Name="GtkLibtoolCompatibleDllPrefix"
-		Value="lib"
-	/>
-	<UserMacro
-		Name="GtkLibtoolCompatibleDllSuffix"
-		Value="-$(GtkApiVersion)-0"
-	/>
-	<UserMacro
-		Name="GtkSeparateVS9DllPrefix"
-		Value=""
-	/>
-	<UserMacro
-		Name="GtkSeparateVS9DllSuffix"
-		Value="-3-vs9"
-	/>
-	<!-- Change these two to GtkLibtoolCompatibleDllPrefix and
-	GtkLibtoolCompatibleDllSuffix if that is what you want -->
-	<UserMacro
-		Name="GtkDllPrefix"
-		Value="$(GtkSeparateVS9DllPrefix)"
-	/>
-	<UserMacro
-		Name="GtkDllSuffix"
-		Value="$(GtkSeparateVS9DllSuffix)"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRoot"
-		Value="..\..\..\..\..\vs9\$(PlatformName)"
-	/>
-</VisualStudioPropertySheet>
--- a/build/win32/vs9/gtk-demo.vcproj
+++ b/build/win32/vs9/gtk-demo.vcproj
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk-demo"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
-	RootNamespace="gtkdemo"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="$(GtkPrefixDefine)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="$(GtkPrefixDefine)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\demos\gtk-demo\appwindow.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\assistant.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\builder.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\button_box.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\changedisplay.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\clipboard.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\colorsel.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\combobox.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\dialog.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\drawingarea.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\editable_cells.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\entry_buffer.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\entry_completion.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\expander.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\hypertext.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\iconview.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\iconview_edit.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\images.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\infobar.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\links.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\list_store.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\main.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\menus.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window2.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\panes.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\pickers.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\pixbufs.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\printing.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\rotated_text.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\search_entry.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\sizegroup.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\spinner.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\stock_browser.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\toolpalette.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\tree_store.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\ui_manager.c" />
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
-	RootNamespace="gtk"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;$(GtkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gtk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GtkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gtk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GtkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gtk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GtkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gtk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\..\gdk\gtk.symbols"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gtk.def"
-						CommandLine="$(GtkGenerateGtkDef)"
-						Outputs="$(IntDir)\gtk.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gtk.def"
-						CommandLine="$(GtkGenerateGtkDef)"
-						Outputs="$(IntDir)\gtk.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gtk.def"
-						CommandLine="$(GtkGenerateGtkDef)"
-						Outputs="$(IntDir)\gtk.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gtk.def"
-						CommandLine="$(GtkGenerateGtkDef)"
-						Outputs="$(IntDir)\gtk.def"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gtk\gtk-win32.rc" />
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "libgtk.sourcefiles"
-			<File RelativePath="..\..\..\modules\input\gtkimcontextime.c" />
-			<File RelativePath="..\..\..\modules\input\gtkimcontextmultipress.c" />
-			<File RelativePath="..\..\..\modules\input\gtkimcontextthai.c" />
-			<File RelativePath="..\..\..\modules\input\imam-et.c" />
-			<File RelativePath="..\..\..\modules\input\imcedilla.c" />
-			<File RelativePath="..\..\..\modules\input\imcyrillic-translit.c" />
-			<File RelativePath="..\..\..\modules\input\imime.c" />
-			<File RelativePath="..\..\..\modules\input\iminuktitut.c" />
-			<File RelativePath="..\..\..\modules\input\imipa.c" />
-			<File RelativePath="..\..\..\modules\input\immultipress.c" />
-			<File RelativePath="..\..\..\modules\input\imthai.c" />
-			<File RelativePath="..\..\..\modules\input\imti-er.c" />
-			<File RelativePath="..\..\..\modules\input\imti-et.c" />
-			<File RelativePath="..\..\..\modules\input\imviqr.c" />
-			<File RelativePath="..\..\..\modules\input\thai-charprop.c" />
-		</Filter>
-	</Files>
-</VisualStudioProject>
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="install"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
-	RootNamespace="install"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			
-ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstall)"
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioProject>
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -1,179 +1,238 @@
 /* config.h.win32.in. Merged from two versions generated by configure for gcc and MSVC.  */
-/* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
+/* acconfig.h
+   This file is in the public domain.
+
+   Descriptive text for the C preprocessor macros that
+   the distributed Autoconf macros can define.
+   No software package will use all of them; autoheader copies the ones
+   your configure.in uses into your configuration header file templates.
+
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  Although this order
+   can split up related entries, it makes it easier to check whether
+   a given entry is in the file.
+
+   Leave the following blank line there!!  Autoheader needs it.  */
+
+
+/* Other stuff */
+#define ENABLE_NLS 1
+#define GTK_COMPILED_WITH_DEBUGGING "yes"
+
+/* #undef HAVE_CATGETS */
+/* #undef HAVE_DIMM_H */
+#define HAVE_GETTEXT 1
+/* #undef HAVE_IPC_H */
+/* #undef HAVE_LC_MESSAGES */
+#define HAVE_PROGRESSIVE_JPEG 1
+/* #undef HAVE_PWD_H */
+/* #undef HAVE_SHM_H */
+/* #undef HAVE_STPCPY */
+/* #undef HAVE_XSHM_H */
+/* #undef HAVE_SHAPE_EXT */
+/* #undef HAVE_SYS_SELECT_H */
+#ifndef _MSC_VER
+#define HAVE_SYS_TIME_H 1
+#else /* _MSC_VER */
+/* #undef HAVE_SYS_TIME_H */
+#endif /* _MSC_VER */
+#define HAVE_WINSOCK_H 1
+#define HAVE_WINTAB 1
+/* #undef HAVE_XCONVERTCASE */
+/* #undef HAVE_XFT */
+
+/* #undef HAVE_SIGSETJMP */
+
+#define NO_FD_SET 1
+
+/* #undef RESOURCE_BASE */
+
+#ifndef _MSC_VER
+#define USE_GMODULE 1
+#define USE_MMX 1
+#endif
+
+/* Define to use X11R6 additions to XIM */
+/* #undef USE_X11R6_XIM */
+
+/* Define to use XKB extension */
+/* #undef HAVE_XKB */
+
+/* Define to use shadowfb in the linux-fb port */
+/* #undef ENABLE_SHADOW_FB */
+
+/* Define to use a fb manager in the linux-fb port */
+/* #undef ENABLE_FB_MANAGER */
+
+/* #undef XINPUT_NONE */
+/* #undef XINPUT_GXI */
+/* #undef XINPUT_XFREE */
+
+/* Define as the return type of signal handlers (int or void).  */
+#define RETSIGTYPE void
+
+/* Most machines will be happy with int or void.  IRIX requires '...' */
+/* #undef SIGNAL_ARG_TYPE */
+
+#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+
+/* #undef PACKAGE */
+/* #undef VERSION */
+
+
+/* Leave that blank line there!!  Autoheader needs it.
+   If you're adding to this file, keep in mind:
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  */
+
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+/* #undef CRAY_STACKSEG_END */
+
+/* Define if using `alloca.c'. */
+/* #undef C_ALLOCA */

 /* always defined to indicate that i18n is enabled */
 #define ENABLE_NLS 1

-/* Define if gio can sniff image data */
-/* #undef GDK_PIXBUF_USE_GIO_MIME */
+/* Define if you have `alloca', as a function or macro. */
+#define HAVE_ALLOCA 1

-/* The prefix for our gettext translation domains. */
-#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
+/* #undef HAVE_ALLOCA_H */

-/* Define if debugging is enabled */
-#define GTK_COMPILED_WITH_DEBUGGING "yes"
+/* Define if you have the <argz.h> header file. */
+/* #undef HAVE_ARGZ_H */

-/* Define the location where the catalogs will be installed */
-#define GTK_LOCALEDIR "NONE/share/locale"
-
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+/* Define if you have the `bind_textdomain_codeset' function. */
+/* #undef HAVE_BIND_TEXTDOMAIN_CODESET */

 /* Is the wctype implementation broken */
 /* #undef HAVE_BROKEN_WCTYPE */

-/* Define to 1 if you have the <crt_externs.h> header file. */
-/* #undef HAVE_CRT_EXTERNS_H */
-
-/* Define to 1 if CUPS 1.2 API is available */
-/* #undef HAVE_CUPS_API_1_2 */
-
-/* Define to 1 if you have the `dcgettext' function. */
+/* Define if you have the `dcgettext' function. */
 #define HAVE_DCGETTEXT 1

-/* Define to 1 if you have the <dlfcn.h> header file. */
+/* Define if you have the <dlfcn.h> header file. */
 /* #undef HAVE_DLFCN_H */

-/* Define to 1 if you have the `flockfile' function. */
-/* #undef HAVE_FLOCKFILE */
+/* Define if you have the `getcwd' function. */
+#define HAVE_GETCWD 1

-/* Define to 1 if you have the <ftw.h> header file. */
-/* #undef HAVE_FTW_H */
-
-/* Define to 1 if you have the `getc_unlocked' function. */
-/* #undef HAVE_GETC_UNLOCKED */
-
-/* Define to 1 if you have the `getpagesize' function. */
+/* Define if you have the `getpagesize' function. */
 #ifndef _MSC_VER
 #define HAVE_GETPAGESIZE 1
-#else
+#else /* _MSC_VER */
 /* #undef HAVE_GETPAGESIZE */
-#endif
+#endif /* _MSC_VER */

-/* Define to 1 if you have the `getresuid' function. */
+/* Define if you have the `getresuid' function. */
 /* #undef HAVE_GETRESUID */

 /* Define if the GNU gettext() function is already present or preinstalled. */
 #define HAVE_GETTEXT 1

-/* Have GNU ftw */
-/* #undef HAVE_GNU_FTW */
-
-/* Define to 1 if you have the `httpGetAuthString' function. */
-/* #undef HAVE_HTTPGETAUTHSTRING */
-
-/* Define if cups http_t authstring field is accessible */
-/* #undef HAVE_HTTP_AUTHSTRING */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_INTTYPES_H 1
-#else
+/* Define if you have the <inttypes.h> header file. */
 /* #undef HAVE_INTTYPES_H */
-#endif
-
-/* Define to 1 if ipc.h is available */
-/* #undef HAVE_IPC_H */

 /* Define if your <locale.h> file defines LC_MESSAGES. */
 /* #undef HAVE_LC_MESSAGES */

-/* Define to 1 if you have the <locale.h> header file. */
+/* Define if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1

-/* Define to 1 if you have the `localtime_r' function. */
-/* #undef HAVE_LOCALTIME_R */
-
-/* Define to 1 if you have the `lstat' function. */
+/* Define if you have the `lstat' function. */
 /* #undef HAVE_LSTAT */

-/* Define to 1 if you have the `mallinfo' function. */
-/* #undef HAVE_MALLINFO */
+/* Define if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1

-/* Define to 1 if you have the <memory.h> header file. */
+/* Define if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1

-/* Define to 1 if you have the `mkstemp' function. */
+/* Define if you have the `mkstemp' function. */
 /* #undef HAVE_MKSTEMP */

-/* Define to 1 if you have a working `mmap' system call. */
+/* Define if you have a working `mmap' system call. */
 /* #undef HAVE_MMAP */

-/* Define to 1 if libpapi available */
-/* #undef HAVE_PAPI */
+/* Define if you have the `munmap' function. */
+/* #undef HAVE_MUNMAP */

-/* Define to 1 is libjpeg supports progressive JPEG */
-/* #undef HAVE_PROGRESSIVE_JPEG */
+/* Define if you have the <nl_types.h> header file. */
+/* #undef HAVE_NL_TYPES_H */

-/* Define to 1 if you have the <pwd.h> header file. */
+/* Define if you have the `putenv' function. */
+#define HAVE_PUTENV 1
+
+/* Define if you have the <pwd.h> header file. */
 /* #undef HAVE_PWD_H */

-/* Have the Xrandr extension library */
-/* #undef HAVE_RANDR */
+/* Define if you have the `setenv' function. */
+/* #undef HAVE_SETENV */

-/* Define to 1 if shm.h is available */
-/* #undef HAVE_SHM_H */
+/* Define if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1

-/* Define to 1 if sigsetjmp is available */
-/* #undef HAVE_SIGSETJMP */
-
-/* Have the sockaddr_un.sun_len member */
-/* #undef HAVE_SOCKADDR_UN_SUN_LEN */
-
-/* Define to 1 if solaris xinerama is available */
-/* #undef HAVE_SOLARIS_XINERAMA */
-
-/* Define to 1 if you have the <stdint.h> header file. */
+/* Define if you have the <stdint.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_STDINT_H 1
-#else
+#else /* _MSC_VER */
 /* #undef HAVE_STDINT_H */
-#endif
+#endif /* _MSC_VER */

-/* Define to 1 if you have the <stdlib.h> header file. */
+/* Define if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1

-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
+/* Define if you have the `strcasecmp' function. */
+#ifndef _MSC_VER
+#define HAVE_STRCASECMP 1
+#else /* _MSC_VER */
+/* #undef HAVE_STRCASECMP */
+#endif /* _MSC_VER */

-/* Define to 1 if you have the <string.h> header file. */
+/* Define if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define if you have the <strings.h> header file. */
+/* #undef HAVE_STRINGS_H */
+
+/* Define if you have the <string.h> header file. */
 #define HAVE_STRING_H 1

-/* Define to 1 if sys/select.h is available */
-/* #undef HAVE_SYS_SELECT_H */
+/* Define if you have the <sys/param.h> header file. */
+/* #undef HAVE_SYS_PARAM_H */

-/* Define to 1 if you have the <sys/stat.h> header file. */
+/* Define if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1

-/* Define to 1 if sys/sysinfo.h is available */
-/* #undef HAVE_SYS_SYSINFO_H */
-
-/* Define to 1 if sys/systeminfo.h is available */
-/* #undef HAVE_SYS_SYSTEMINFO_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
+/* Define if you have the <sys/time.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_SYS_TIME_H 1
 #else /* _MSC_VER */
 /* #undef HAVE_SYS_TIME_H */
-#endif
+#endif /* _MSC_VER */

-/* Define to 1 if you have the <sys/types.h> header file. */
+/* Define if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1

-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
 /* #undef HAVE_SYS_WAIT_H */

-/* Define to 1 if you have the <unistd.h> header file. */
+/* Define if you have the <unistd.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_UNISTD_H 1
-#else
+#else /* _MSC_VER */
 /* #undef HAVE_UNISTD_H */
-#endif
-
-/* Have uxtheme.h include file */
-#define HAVE_UXTHEME_H 1
+#endif /* _MSC_VER */

 /* Have wchar.h include file */
 #define HAVE_WCHAR_H 1
@@ -181,128 +240,50 @@
 /* Have wctype.h include file */
 #define HAVE_WCTYPE_H 1

-/* Define if we have X11R6 */
-/* #undef HAVE_X11R6 */
+/* Define if you have the <winsock.h> header file. */
+#define HAVE_WINSOCK_H 1

-/* Have the XCOMPOSITE X extension */
-/* #undef HAVE_XCOMPOSITE */
+/* Define if you have the `__argz_count' function. */
+/* #undef HAVE___ARGZ_COUNT */

-/* Define to 1 if you have the `XConvertCase' function. */
-/* #undef HAVE_XCONVERTCASE */
+/* Define if you have the `__argz_next' function. */
+/* #undef HAVE___ARGZ_NEXT */

-/* Have the Xcursor library */
-/* #undef HAVE_XCURSOR */
-
-/* Have the XDAMAGE X extension */
-/* #undef HAVE_XDAMAGE */
-
-/* Have the XFIXES X extension */
-/* #undef HAVE_XFIXES */
-
-/* Define to 1 if XFree Xinerama is available */
-/* #undef HAVE_XFREE_XINERAMA */
-
-/* Define to 1 if xinerama is available */
-/* #undef HAVE_XINERAMA */
-
-/* Define to 1 if you have the `XInternAtoms' function. */
-/* #undef HAVE_XINTERNATOMS */
-
-/* Define to use XKB extension */
-/* #undef HAVE_XKB */
-
-/* Define to 1 if xshm.h is available */
-/* #undef HAVE_XSHM_H */
-
-/* Have the SYNC extension library */
-/* #undef HAVE_XSYNC */
-
-/* Define if _NL_MEASUREMENT_MEASUREMENT is available */
-/* #undef HAVE__NL_MEASUREMENT_MEASUREMENT */
-
-/* Define if _NL_PAPER_HEIGHT is available */
-/* #undef HAVE__NL_PAPER_HEIGHT */
-
-/* Define if _NL_PAPER_WIDTH is available */
-/* #undef HAVE__NL_PAPER_WIDTH */
-
-/* Define if _NL_TIME_FIRST_WEEKDAY is available */
-/* #undef HAVE__NL_TIME_FIRST_WEEKDAY */
-
-/* Define to 1 if you have the `_NSGetEnviron' function. */
-/* #undef HAVE__NSGETENVIRON */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Define if <X11/extensions/XIproto.h> needed for xReply */
-/* #undef NEED_XIPROTO_H_FOR_XREPLY */
-
-/* Define to 1 if fd_set is not available */
-#define NO_FD_SET 1
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#ifndef _MSC_VER
-/* #undef NO_MINUS_C_MINUS_O */
-#else 
-#define NO_MINUS_C_MINUS_O 1
-#endif
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "gtk+"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gtk+ @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "gtk+"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
+/* Define if you have the `__argz_stringify' function. */
+/* #undef HAVE___ARGZ_STRINGIFY */

 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void

-/* Define to 1 if you have the ANSI C header files. */
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+        STACK_DIRECTION > 0 => grows toward higher addresses
+        STACK_DIRECTION < 0 => grows toward lower addresses
+        STACK_DIRECTION = 0 => direction of growth unknown */
+/* #undef STACK_DIRECTION */
+
+/* Define if you have the ANSI C header files. */
 #define STDC_HEADERS 1

-/* Define to 1 if gmodule works and should be used */
-#define USE_GMODULE 1
-
-/* Whether to load modules via .la files rather than directly */
-/* #undef USE_LA_MODULES */
-
-/* Define to 1 if XXM is available and should be used */
-#ifndef _MSC_VER
-#  define USE_MMX 1
-#else
-#  undef USE_MMX
-#endif
-
-/* Define to 1 if no XInput should be used */
-/* #undef XINPUT_NONE */
-
-/* Define to 1 if XFree XInput should be used */
-/* #undef XINPUT_XFREE */
-
-/* Define to 1 if the X Window System is missing or not being used. */
+/* Define if the X Window System is missing or not being used. */
 /* #undef X_DISPLAY_MISSING */

-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

 /* Define to `int' if <sys/types.h> doesn't define. */
 #define gid_t int

+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+   if it is not supported. */
+/* #undef inline */
+
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
 /* Define to `int' if <sys/types.h> doesn't define. */
 #define uid_t int
--- a/configure.ac
+++ b/configure.ac
--- a/configure.in
+++ b/configure.in
--- a/contrib/.cvsignore
+++ b/contrib/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -0,0 +1,8 @@
+
+if USE_X11
+XDIRS=gdk-pixbuf-xlib
+else
+XDIRS=
+endif
+
+SUBDIRS=$(XDIRS)
--- a/contrib/gdk-pixbuf-xlib/.cvsignore
+++ b/contrib/gdk-pixbuf-xlib/.cvsignore
@@ -0,0 +1,7 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+.libs
+.deps
+gdk-pixbuf-xlib-2.0.pc
--- a/contrib/gdk-pixbuf-xlib/ChangeLog
+++ b/contrib/gdk-pixbuf-xlib/ChangeLog
@@ -0,0 +1,86 @@
+2002-01-25  Federico Mena Quintero  <federico@ximian.com>
+
+	Merge from gdk-pixbuf stable.
+
+	* gdk-pixbuf-xlib-drawable.c (rgb565msb): Fixed the endianness
+	conversion --- swap the individual 16 bit values instead of taking
+	everying as a 32 bit value.
+	(rgb565lsb): Likewise.
+	(rgb555lsb): Likewise.
+	(rgb555msb): Likewise.
+
+2001-11-26  Akira TAGOH  <tagoh@redhat.com>
+
+	* Makefile.am (libgdk_pixbuf_xlib_1_3_la_LDFLAGS):
+	Added -version-info.
+
+2001-05-19  Havoc Pennington  <hp@pobox.com>
+
+	* gdk-pixbuf-xlibrgb.c: docs
+
+2001-06-04  Havoc Pennington  <hp@redhat.com>
+
+	* gdk-pixbuf-xlibrgb.c (xlib_rgb_init): remove C++ comment,
+	reported by Dan McNichol
+
+Mon Jan  8 11:41:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (INCLUDES): Add @x_cflags@ (#36310)
+
+2001-01-02  Havoc Pennington  <hp@redhat.com>
+
+	* gdk-pixbuf-xlib-2.0.pc.in (Description): fix up description a bit.
+
+2000-10-06  Havoc Pennington  <hp@redhat.com>
+
+	* gdk-pixbuf-xlib.c: Put display/screen here, instead of in 
+	the main gdk-pixbuf library as it was in 1.0; since the io-xpm 
+	loader doesn't use these variables anymore it should be OK
+
+2000-09-26  Federico Mena Quintero  <federico@helixcode.com>
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-drawable.c
+	(gdk_pixbuf_xlib_get_from_drawable): Do not use
+	gdk_screen_{width,height}().  Thanks to John Harper for pointing
+	this out.
+
+2000-08-26  Federico Mena Quintero  <federico@helixcode.com>
+
+	* gdk-pixbuf/gdk-pixbuf-xlibrgb.c: Added API reference docs.
+
+2000-08-25  Federico Mena Quintero  <federico@helixcode.com>
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-drawable.c (handle_x_error): Return
+	0.
+	(xlib_window_is_viewable): Return FALSE in the last case.
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-render.c: Updated the inline docs.
+
+	* gdk-pixbuf/gdk-pixbuf-xlib.c: Added API docs.
+
+2000-08-25  John Harper  <john@dcs.warwick.ac.uk>
+
+	Work to create an Xlib version of gdk-pixbuf (with the Xlib
+	port of GdkRGB for rendering):
+
+	* configure.in: check for X libraries, set and substitute
+	GDK_PIXBUF_XLIB_{LIBDIR,INCLUDEDIR,LIBS} variables
+
+	* gdk_pixbuf_xlibConf.sh.in: new file -- gnome-config details
+	for the gdk-pixbuf-xlib library
+	* Makefile.am: build and install gdk_pixbuf_xlibConf.sh
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-render.c,
+	gdk-pixbuf/gdk-pixbuf-xlib.c, gdk-pixbuf/gdk-pixbuf-xlib.h,
+	gdk-pixbuf/gdk-pixbuf-xlib-private.h,
+	gdk-pixbuf/gdk-pixbuf-xlib-drawable.c: new files, ported the
+	GDK dependent parts of gdk-pixbuf to use Xlib. Functions that
+	were called gdk_pixbuf_FOO are now gdk_pixbuf_xlib_FOO
+
+	* gdk-pixbuf/gdk-pixbuf-xlibrgb.c,
+	gdk-pixbuf/gdk-pixbuf-xlibrgb.h: added Chris Blizzard's Xlib
+	port of GdkRGB (from Mozilla CVS)
+
+	* gdk-pixbuf/Makefile.am: build a library libgdk_pixbuf_xlib.la
+	including the non-GDK dependent objects from libgdk_pixbuf.la
+	plus the Xlib ports and xlibrgb
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -0,0 +1,34 @@
+lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
+
+INCLUDES = @STRIP_BEGIN@			\
+	-I$(top_srcdir) -I$(top_builddir) 	\
+	-I$(top_srcdir)/gdk-pixbuf 		\
+	-I$(top_srcdir)/contrib 		\
+	@GDK_PIXBUF_XLIB_DEP_CFLAGS@		\
+@STRIP_END@
+
+LDADDS = @STRIP_BEGIN@ 				\
+	@GDK_PIXBUF_XLIB_DEP_LIBS@		\
+@STRIP_END@
+
+libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
+	-export-dynamic						\
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
+libgdk_pixbuf_xlib_2_0_la_SOURCES =         \
+	gdk-pixbuf-xlib-private.h	\
+        gdk-pixbuf-xlib.c               \
+        gdk-pixbuf-xlib-render.c        \
+        gdk-pixbuf-xlib-drawable.c      \
+        gdk-pixbuf-xlibrgb.c
+
+libgdk_pixbuf_xlibincludedir=$(includedir)/gtk-2.0/gdk-pixbuf-xlib
+
+libgdk_pixbuf_xlibinclude_HEADERS =         		\
+        gdk-pixbuf-xlib.h               	    	\
+        gdk-pixbuf-xlibrgb.h
+
+pkgconfigdir   = $(libdir)/pkgconfig
+pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc
+
+EXTRA_DIST = gdk-pixbuf-xlib-2.0.pc.in
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: GdkPixbuf Xlib
+Description: GdkPixbuf rendering for Xlib
+Version: @VERSION@
+Requires: gobject-2.0,gmodule-2.0,gdk-pixbuf-2.0
+Libs: -L${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@
+Cflags: -I${includedir}
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-private.h
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-private.h
@@ -0,0 +1,30 @@
+/* GdkPixbuf library - Xlib header file
+ *
+ * Authors: John Harper <john@dcs.warwick.ac.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef GDK_PIXBUF_XLIB_PRIVATE_H
+#define GDK_PIXBUF_XLIB_PRIVATE_H
+
+#include "gdk-pixbuf-xlib.h"
+#include <X11/Xlib.h>
+
+extern Display *gdk_pixbuf_dpy;
+extern int gdk_pixbuf_screen;
+
+#endif
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c
@@ -0,0 +1,398 @@
+/* GdkPixbuf library - Rendering functions
+ *
+ * Copyright (C) 1999 The Free Software Foundation
+ *
+ * Author: Federico Mena-Quintero <federico@gimp.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/* Trivially ported to Xlib(RGB) by John Harper. */
+
+#include <config.h>
+#include "gdk-pixbuf-private.h"
+#include "gdk-pixbuf-xlib-private.h"
+
+
+
+/**
+ * gdk_pixbuf_xlib_render_threshold_alpha:
+ * @pixbuf: A pixbuf.
+ * @bitmap: Bitmap where the bilevel mask will be painted to.
+ * @src_x: Source X coordinate.
+ * @src_y: source Y coordinate.
+ * @dest_x: Destination X coordinate.
+ * @dest_y: Destination Y coordinate.
+ * @width: Width of region to threshold.
+ * @height: Height of region to threshold.
+ * @alpha_threshold: Opacity values below this will be painted as zero; all
+ * other values will be painted as one.
+ *
+ * Takes the opacity values in a rectangular portion of a pixbuf and thresholds
+ * them to produce a bi-level alpha mask that can be used as a clipping mask for
+ * a drawable.
+ *
+ **/
+void
+gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap,
+					int src_x, int src_y,
+					int dest_x, int dest_y,
+					int width, int height,
+					int alpha_threshold)
+{
+	GC gc;
+	XColor color;
+	int x, y;
+	guchar *p;
+	int start, start_status;
+	int status;
+	XGCValues gcv;
+
+	g_return_if_fail (pixbuf != NULL);
+	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
+	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
+	g_return_if_fail (pixbuf->bits_per_sample == 8);
+
+	g_return_if_fail (bitmap != 0);
+	g_return_if_fail (width >= 0 && height >= 0);
+	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
+	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+
+	g_return_if_fail (alpha_threshold >= 0 && alpha_threshold <= 255);
+
+	if (width == 0 || height == 0)
+		return;
+
+	gc = XCreateGC (gdk_pixbuf_dpy, bitmap, 0, &gcv);
+
+	if (!pixbuf->has_alpha) {
+		color.pixel = (alpha_threshold == 255) ? 0 : 1;
+		XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
+		XFillRectangle (gdk_pixbuf_dpy, bitmap, gc,
+				dest_x, dest_y, width, height);
+		XFreeGC (gdk_pixbuf_dpy, gc);
+		return;
+	}
+
+	color.pixel = 0;
+	XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
+	XFillRectangle (gdk_pixbuf_dpy, bitmap, gc,
+			dest_x, dest_y, width, height);
+
+	color.pixel = 1;
+	XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
+
+	for (y = 0; y < height; y++) {
+		p = (pixbuf->pixels + (y + src_y) * pixbuf->rowstride + src_x * pixbuf->n_channels
+		     + pixbuf->n_channels - 1);
+
+		start = 0;
+		start_status = *p < alpha_threshold;
+
+		for (x = 0; x < width; x++) {
+			status = *p < alpha_threshold;
+
+			if (status != start_status) {
+				if (!start_status)
+					XDrawLine (gdk_pixbuf_dpy, bitmap, gc,
+						   start + dest_x, y + dest_y,
+						   x - 1 + dest_x, y + dest_y);
+
+				start = x;
+				start_status = status;
+			}
+
+			p += pixbuf->n_channels;
+		}
+
+		if (!start_status)
+			XDrawLine (gdk_pixbuf_dpy, bitmap, gc,
+				   start + dest_x, y + dest_y,
+				   x - 1 + dest_x, y + dest_y);
+	}
+
+	XFreeGC (gdk_pixbuf_dpy, gc);
+}
+
+
+
+/* Creates a buffer by stripping the alpha channel of a pixbuf */
+static guchar *
+remove_alpha (GdkPixbuf *pixbuf, int x, int y, int width, int height, int *rowstride)
+{
+	guchar *buf;
+	int xx, yy;
+	guchar *src, *dest;
+
+	g_assert (pixbuf->n_channels == 4);
+	g_assert (pixbuf->has_alpha);
+	g_assert (width > 0 && height > 0);
+	g_assert (x >= 0 && x + width <= pixbuf->width);
+	g_assert (y >= 0 && y + height <= pixbuf->height);
+
+	*rowstride = 4 * ((width * 3 + 3) / 4);
+
+	buf = g_new (guchar, *rowstride * height);
+
+	for (yy = 0; yy < height; yy++) {
+		src = pixbuf->pixels + pixbuf->rowstride * (yy + y) + x * pixbuf->n_channels;
+		dest = buf + *rowstride * yy;
+
+		for (xx = 0; xx < width; xx++) {
+			*dest++ = *src++;
+			*dest++ = *src++;
+			*dest++ = *src++;
+			src++;
+		}
+	}
+
+	return buf;
+}
+
+/**
+ * gdk_pixbuf_xlib_render_to_drawable:
+ * @pixbuf: A pixbuf.
+ * @drawable: Destination drawable.
+ * @gc: GC used for rendering.
+ * @src_x: Source X coordinate within pixbuf.
+ * @src_y: Source Y coordinate within pixbuf.
+ * @dest_x: Destination X coordinate within drawable.
+ * @dest_y: Destination Y coordinate within drawable.
+ * @width: Width of region to render, in pixels.
+ * @height: Height of region to render, in pixels.
+ * @dither: Dithering mode for XlibRGB.
+ * @x_dither: X offset for dither.
+ * @y_dither: Y offset for dither.
+ *
+ * Renders a rectangular portion of a pixbuf to a drawable while using the
+ * specified GC.  This is done using XlibRGB, so the specified drawable must
+ * have the XlibRGB visual and colormap.  Note that this function will ignore
+ * the opacity information for images with an alpha channel; the GC must already
+ * have the clipping mask set if you want transparent regions to show through.
+ *
+ * For an explanation of dither offsets, see the XlibRGB documentation.  In
+ * brief, the dither offset is important when re-rendering partial regions of an
+ * image to a rendered version of the full image, or for when the offsets to a
+ * base position change, as in scrolling.  The dither matrix has to be shifted
+ * for consistent visual results.  If you do not have any of these cases, the
+ * dither offsets can be both zero.
+ **/
+void
+gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
+				    Drawable drawable, GC gc,
+				    int src_x, int src_y,
+				    int dest_x, int dest_y,
+				    int width, int height,
+				    XlibRgbDither dither,
+				    int x_dither, int y_dither)
+{
+	guchar *buf;
+	int rowstride;
+
+	g_return_if_fail (pixbuf != NULL);
+	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
+	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
+	g_return_if_fail (pixbuf->bits_per_sample == 8);
+
+	g_return_if_fail (drawable != 0);
+	g_return_if_fail (gc != 0);
+
+	g_return_if_fail (width >= 0 && height >= 0);
+	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
+	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+
+	if (width == 0 || height == 0)
+		return;
+
+	/* This will have to be modified once we support other image types.
+	 * Also, GdkRGB does not have gdk_draw_rgb_32_image_dithalign(), so we
+	 * have to pack the buffer first.  Sigh.
+	 */
+
+	if (pixbuf->has_alpha)
+		buf = remove_alpha (pixbuf, src_x, src_y, width, height, &rowstride);
+	else {
+		buf = pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 3;
+		rowstride = pixbuf->rowstride;
+	}
+
+	xlib_draw_rgb_image_dithalign (drawable, gc,
+				       dest_x, dest_y,
+				       width, height,
+				       dither,
+				       buf, rowstride,
+				       x_dither, y_dither);
+
+	if (pixbuf->has_alpha)
+		g_free (buf);
+}
+
+
+
+/**
+ * gdk_pixbuf_xlib_render_to_drawable_alpha:
+ * @pixbuf: A pixbuf.
+ * @drawable: Destination drawable.
+ * @src_x: Source X coordinate within pixbuf.
+ * @src_y: Source Y coordinates within pixbuf.
+ * @dest_x: Destination X coordinate within drawable.
+ * @dest_y: Destination Y coordinate within drawable.
+ * @width: Width of region to render, in pixels.
+ * @height: Height of region to render, in pixels.
+ * @alpha_mode: If the image does not have opacity information, this is ignored.
+ * Otherwise, specifies how to handle transparency when rendering.
+ * @alpha_threshold: If the image does have opacity information and @alpha_mode
+ * is GDK_PIXBUF_ALPHA_BILEVEL, specifies the threshold value for opacity
+ * values.
+ * @dither: Dithering mode for XlibRGB.
+ * @x_dither: X offset for dither.
+ * @y_dither: Y offset for dither.
+ *
+ * Renders a rectangular portion of a pixbuf to a drawable.  This is done using
+ * XlibRGB, so the specified drawable must have the XlibRGB visual and colormap.
+ *
+ * When used with #GDK_PIXBUF_ALPHA_BILEVEL, this function has to create a bitmap
+ * out of the thresholded alpha channel of the image and, it has to set this
+ * bitmap as the clipping mask for the GC used for drawing.  This can be a
+ * significant performance penalty depending on the size and the complexity of
+ * the alpha channel of the image.  If performance is crucial, consider handling
+ * the alpha channel yourself (possibly by caching it in your application) and
+ * using gdk_pixbuf_xlib_render_to_drawable() or GdkRGB directly instead.
+ **/
+void
+gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, Drawable drawable,
+					  int src_x, int src_y,
+					  int dest_x, int dest_y,
+					  int width, int height,
+					  GdkPixbufAlphaMode alpha_mode,
+					  int alpha_threshold,
+					  XlibRgbDither dither,
+					  int x_dither, int y_dither)
+{
+	Pixmap bitmap = 0;
+	GC gc;
+	XGCValues gcv;
+
+	g_return_if_fail (pixbuf != NULL);
+	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
+	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
+	g_return_if_fail (pixbuf->bits_per_sample == 8);
+
+	g_return_if_fail (drawable != 0);
+	g_return_if_fail (width >= 0 && height >= 0);
+	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
+	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+
+	if (width == 0 || height == 0)
+		return;
+
+	gc = XCreateGC (gdk_pixbuf_dpy, drawable, 0, &gcv);
+
+	if (pixbuf->has_alpha) {
+		/* Right now we only support GDK_PIXBUF_ALPHA_BILEVEL, so we
+		 * unconditionally create the clipping mask.
+		 */
+
+		bitmap = XCreatePixmap (gdk_pixbuf_dpy,
+					RootWindow (gdk_pixbuf_dpy,
+						    gdk_pixbuf_screen),
+					width, height, 1);
+		gdk_pixbuf_xlib_render_threshold_alpha (pixbuf, bitmap,
+							src_x, src_y,
+							0, 0,
+							width, height,
+							alpha_threshold);
+
+		XSetClipMask (gdk_pixbuf_dpy, gc, bitmap);
+		XSetClipOrigin (gdk_pixbuf_dpy, gc, dest_x, dest_y);
+	}
+
+	gdk_pixbuf_xlib_render_to_drawable (pixbuf, drawable, gc,
+					    src_x, src_y,
+					    dest_x, dest_y,
+					    width, height,
+					    dither,
+					    x_dither, y_dither);
+
+	if (bitmap)
+	        XFreePixmap (gdk_pixbuf_dpy, bitmap);
+
+	XFreeGC (gdk_pixbuf_dpy, gc);
+}
+
+/**
+ * gdk_pixbuf_xlib_render_pixmap_and_mask:
+ * @pixbuf: A pixbuf.
+ * @pixmap_return: Return value for the created pixmap.
+ * @mask_return: Return value for the created mask.
+ * @alpha_threshold: Threshold value for opacity values.
+ *
+ * Creates a pixmap and a mask bitmap which are returned in the @pixmap_return
+ * and @mask_return arguments, respectively, and renders a pixbuf and its
+ * corresponding tresholded alpha mask to them.  This is merely a convenience
+ * function; applications that need to render pixbufs with dither offsets or to
+ * given drawables should use gdk_pixbuf_xlib_render_to_drawable_alpha() or
+ * gdk_pixbuf_xlib_render_to_drawable(), and
+ * gdk_pixbuf_xlib_render_threshold_alpha().
+ *
+ * If the pixbuf does not have an alpha channel, then *@mask_return will be set
+ * to None.
+ **/
+void
+gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
+					Pixmap *pixmap_return,
+					Pixmap *mask_return,
+					int alpha_threshold)
+{
+        g_return_if_fail (pixbuf != NULL);
+
+	if (pixmap_return) {
+		GC gc;
+		XGCValues gcv;
+
+		*pixmap_return = XCreatePixmap (gdk_pixbuf_dpy,
+						RootWindow (gdk_pixbuf_dpy,
+							    gdk_pixbuf_screen),
+						pixbuf->width,
+						pixbuf->height,
+						xlib_rgb_get_depth ());
+		gc = XCreateGC (gdk_pixbuf_dpy, *pixmap_return, 0, &gcv);
+		gdk_pixbuf_xlib_render_to_drawable (pixbuf, *pixmap_return, gc,
+						    0, 0, 0, 0,
+						    pixbuf->width,
+						    pixbuf->height,
+						    XLIB_RGB_DITHER_NORMAL,
+						    0, 0);
+		XFreeGC (gdk_pixbuf_dpy, gc);
+	}
+
+	if (mask_return) {
+		if (pixbuf->has_alpha) {
+		    *mask_return = XCreatePixmap (gdk_pixbuf_dpy,
+						  RootWindow (gdk_pixbuf_dpy,
+							      gdk_pixbuf_screen),
+						  pixbuf->width,
+						  pixbuf->height, 1);
+		    gdk_pixbuf_xlib_render_threshold_alpha (pixbuf,
+							    *mask_return,
+							    0, 0, 0, 0,
+							    pixbuf->width,
+							    pixbuf->height,
+							    alpha_threshold);
+		} else
+			*mask_return = 0;
+	}
+}
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c
@@ -0,0 +1,63 @@
+/* GdkPixbuf library - Initialization functions
+ *
+ * Author: John Harper <john@dcs.warwick.ac.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <config.h>
+#include <X11/Xlib.h>
+#include <gdk-pixbuf/gdk-pixbuf-private.h>
+#include "gdk-pixbuf-xlib-private.h"
+
+Display *gdk_pixbuf_dpy = NULL;
+int gdk_pixbuf_screen = -1;
+
+/**
+ * gdk_pixbuf_xlib_init:
+ * @display: X display to use.
+ * @screen_num: Screen number.
+ * 
+ * Initializes the gdk-pixbuf Xlib machinery by calling xlib_rgb_init().  This
+ * function should be called near the beginning of your program, or before using
+ * any of the gdk-pixbuf-xlib functions.
+ **/
+void
+gdk_pixbuf_xlib_init (Display *display, int screen_num)
+{
+    xlib_rgb_init (display, ScreenOfDisplay (display, screen_num));
+    gdk_pixbuf_dpy = display;
+    gdk_pixbuf_screen = screen_num;
+}
+
+/**
+ * gdk_pixbuf_xlib_init_with_depth:
+ * @display: X display to use.
+ * @screen_num: Screen number.
+ * @prefDepth: Preferred depth for XlibRGB.
+ * 
+ * Similar to gdk_pixbuf_xlib_init(), but also lets you specify the preferred
+ * depth for XlibRGB if you do not want it to use the default depth it picks.
+ **/
+void
+gdk_pixbuf_xlib_init_with_depth (Display *display,
+				 int screen_num, int prefDepth)
+{
+    xlib_rgb_init_with_depth (display, ScreenOfDisplay (display, screen_num),
+			      prefDepth);
+    gdk_pixbuf_dpy = display;
+    gdk_pixbuf_screen = screen_num;
+}
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
@@ -0,0 +1,82 @@
+/* GdkPixbuf library - Xlib header file
+ *
+ * Authors: John Harper <john@dcs.warwick.ac.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef GDK_PIXBUF_XLIB_H
+#define GDK_PIXBUF_XLIB_H
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
+#include <X11/Xlib.h>
+
+
+
+/* init */
+
+void gdk_pixbuf_xlib_init (Display *display, int screen_num);
+
+void gdk_pixbuf_xlib_init_with_depth (Display *display, int screen_num,
+				      int prefDepth);
+
+
+
+/* render */
+
+void gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap,
+					     int src_x, int src_y,
+					     int dest_x, int dest_y,
+					     int width, int height,
+					     int alpha_threshold);
+
+void gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
+					 Drawable drawable, GC gc,
+					 int src_x, int src_y,
+					 int dest_x, int dest_y,
+					 int width, int height,
+					 XlibRgbDither dither,
+					 int x_dither, int y_dither);
+
+
+void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
+					       Drawable drawable,
+					       int src_x, int src_y,
+					       int dest_x, int dest_y,
+					       int width, int height,
+					       GdkPixbufAlphaMode alpha_mode,
+					       int alpha_threshold,
+					       XlibRgbDither dither,
+					       int x_dither, int y_dither);
+
+void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
+					     Pixmap *pixmap_return,
+					     Pixmap *mask_return,
+					     int alpha_threshold);
+
+
+
+/* drawable */
+
+GdkPixbuf *gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest,
+					      Drawable src,
+					      Colormap cmap, Visual *visual,
+					      int src_x, int src_y,
+					      int dest_x, int dest_y,
+					      int width, int height);
+
+#endif /* GDK_PIXBUF_XLIB_H */
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
@@ -0,0 +1,195 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "MPL"); you may not use this file except in
+ * compliance with the MPL.  You may obtain a copy of the MPL at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the MPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL
+ * for the specific language governing rights and limitations under the
+ * MPL.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU Library General Public License (the "LGPL"), in
+ * which case the provisions of the LGPL are applicable instead of
+ * those above.  If you wish to allow use of your version of this file
+ * only under the terms of the LGPL and not to allow others to use
+ * your version of this file under the MPL, indicate your decision by
+ * deleting the provisions above and replace them with the notice and
+ * other provisions required by the LGPL.  If you do not delete the
+ * provisions above, a recipient may use your version of this file
+ * under either the MPL or the LGPL.
+ */
+
+/*
+ * This code is derived from GdkRgb.
+ * For more information on GdkRgb, see http://www.levien.com/gdkrgb/
+ * Raph Levien <raph@acm.org>
+ */
+
+/* Ported by Christopher Blizzard to Xlib.  With permission from the
+ * original authors of this file, the contents of this file are also
+ * redistributable under the terms of the Mozilla Public license.  For
+ * information about the Mozilla Public License, please see the
+ * license information at http://www.mozilla.org/MPL/
+ */
+
+/* This code is copyright the following authors:
+ * Raph Levien          <raph@acm.org>
+ * Manish Singh         <manish@gtk.org>
+ * Tim Janik            <timj@gtk.org>
+ * Peter Mattis         <petm@xcf.berkeley.edu>
+ * Spencer Kimball      <spencer@xcf.berkeley.edu>
+ * Josh MacDonald       <jmacd@xcf.berkeley.edu>
+ * Christopher Blizzard <blizzard@redhat.com>
+ * Owen Taylor          <otaylor@redhat.com>
+ * Shawn T. Amundson    <amundson@gtk.org>
+*/
+
+
+#ifndef __XLIB_RGB_H__
+#define __XLIB_RGB_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xos.h>
+#include <X11/Intrinsic.h>
+
+#include <glib.h>
+
+typedef struct _XlibRgbCmap XlibRgbCmap;
+
+struct _XlibRgbCmap {
+  unsigned int colors[256];
+  unsigned char lut[256]; /* for 8-bit modes */
+};
+
+void
+xlib_rgb_init (Display *display, Screen *screen);
+void
+xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth);
+
+unsigned long
+xlib_rgb_xpixel_from_rgb (guint32 rgb);
+
+void
+xlib_rgb_gc_set_foreground (GC gc, guint32 rgb);
+
+void
+xlib_rgb_gc_set_background (GC gc, guint32 rgb);
+
+typedef enum
+{
+  XLIB_RGB_DITHER_NONE,
+  XLIB_RGB_DITHER_NORMAL,
+  XLIB_RGB_DITHER_MAX
+} XlibRgbDither;
+
+void
+xlib_draw_rgb_image (Drawable drawable,
+		     GC gc,
+		     int x,
+		     int y,
+		     int width,
+		     int height,
+		     XlibRgbDither dith,
+		     unsigned char *rgb_buf,
+		     int rowstride);
+
+void
+xlib_draw_rgb_image_dithalign (Drawable drawable,
+			       GC gc,
+			       int x,
+			       int y,
+			       int width,
+			       int height,
+			       XlibRgbDither dith,
+			       unsigned char *rgb_buf,
+			       int rowstride,
+			       int xdith,
+			       int ydith);
+
+void
+xlib_draw_rgb_32_image (Drawable drawable,
+			GC gc,
+			int x,
+			int y,
+			int width,
+			int height,
+			XlibRgbDither dith,
+			unsigned char *buf,
+			int rowstride);
+
+void
+xlib_draw_gray_image (Drawable drawable,
+		      GC gc,
+		      int x,
+		      int y,
+		      int width,
+		      int height,
+		      XlibRgbDither dith,
+		      unsigned char *buf,
+		      int rowstride);
+
+XlibRgbCmap *
+xlib_rgb_cmap_new (guint32 *colors, int n_colors);
+
+void
+xlib_rgb_cmap_free (XlibRgbCmap *cmap);
+
+void
+xlib_draw_indexed_image (Drawable drawable,
+                         GC gc,
+                         int x,
+                         int y,
+                         int width,
+                         int height,
+                         XlibRgbDither dith,
+                         unsigned char *buf,
+                         int rowstride,
+                         XlibRgbCmap *cmap);
+
+/* Below are some functions which are primarily useful for debugging
+   and experimentation. */
+Bool
+xlib_rgb_ditherable (void);
+
+void
+xlib_rgb_set_verbose (Bool verbose);
+
+/* experimental colormap stuff */
+void
+xlib_rgb_set_install (Bool install);
+
+void
+xlib_rgb_set_min_colors (int min_colors);
+
+Colormap
+xlib_rgb_get_cmap (void);
+
+Visual *
+xlib_rgb_get_visual (void);
+
+XVisualInfo *
+xlib_rgb_get_visual_info (void);
+
+int
+xlib_rgb_get_depth (void);
+
+Display *
+xlib_rgb_get_display (void);
+
+Screen *
+xlib_rgb_get_screen (void);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __XLIB_RGB_H__ */
--- a/demos/.cvsignore
+++ b/demos/.cvsignore
@@ -0,0 +1,11 @@
+Makefile
+Makefile.in
+.libs
+.deps
+testanimation
+test-inline-pixbufs.h
+testpixbuf-drawable
+testpixbuf-scale
+testpixbuf-save
+testpixbuf
+pixbuf-demo
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,51 +1,67 @@
 ## Makefile.am for gtk+/demos
-include $(top_srcdir)/Makefile.decl

 SUBDIRS = gtk-demo

-INCLUDES = 				\
-	-I$(top_srcdir) 		\
-	-I$(top_builddir)/gdk		\
-	-DGDK_DISABLE_DEPRECATED	\
-	-DGTK_DISABLE_DEPRECATED	\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)
+INCLUDES = @STRIP_BEGIN@ \
+	-I$(top_srcdir) 				\
+	-I$(top_builddir)/gdk				\
+	-DG_DISABLE_DEPRECATED	 			\
+	-DGDK_DISABLE_DEPRECATED			\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
+	-DGTK_DISABLE_DEPRECATED			\
+	@GTK_DEBUG_FLAGS@				\
+	@GTK_DEP_CFLAGS@				\
+@STRIP_END@

 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.0.la
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+	$(top_builddir)/gdk/@gdktargetlib@ 				\
+	$(top_builddir)/gtk/@gtktargetlib@

-LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
-	$(top_builddir)/gdk/libgdk-3.0.la	\
-	$(GTK_DEP_LIBS)				\
-	$(MATH_LIB)
+LDADDS = @STRIP_BEGIN@ 							\
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+	$(top_builddir)/gdk/@gdktargetlib@        			\
+	$(top_builddir)/gtk/@gtktargetlib@ 				\
+@STRIP_END@

 noinst_PROGRAMS = 		\
+	testpixbuf 		\
+	testpixbuf-drawable 	\
 	testanimation 		\
-	testpixbuf-color	\
 	testpixbuf-save		\
 	testpixbuf-scale 	\
 	pixbuf-demo

+test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource$(EXEEXT) apple-red.png gnome-foot.png
+	(topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \
+	  cd $(srcdir) &&				     \
+	    GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs \
+	      $$topdir/gdk-pixbuf/gdk-pixbuf-csource --build-list \
+	        apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h)
+
+testpixbuf_DEPENDENCIES = $(DEPS)
+testpixbuf_drawable_DEPENDENCIES = $(DEPS)
 testpixbuf_save_DEPENDENCIES = $(DEPS)
-testpixbuf_color_DEPENDENCIES = $(DEPS)
 testpixbuf_scale_DEPENDENCIES = $(DEPS)
 testanimation_DEPENDENCIES = $(DEPS)
 pixbuf_demo_DEPENDENCIES = $(DEPS)

+testpixbuf_LDADD = $(LDADDS)
+testpixbuf_drawable_LDADD = $(LDADDS)
 testpixbuf_save_LDADD = $(LDADDS)
-testpixbuf_color_LDADD = $(LDADDS)
 testpixbuf_scale_LDADD = $(LDADDS)
 testanimation_LDADD = $(LDADDS)
 pixbuf_demo_LDADD = $(LDADDS)

+testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c
+$(testpixbuf_OBJECTS): test-inline-pixbufs.h
+testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c
 testpixbuf_save_SOURCES = testpixbuf-save.c
-testpixbuf_color_SOURCES = testpixbuf-color.c
 testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
 testanimation_SOURCES = testanimation.c pixbuf-init.c
 pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c

-EXTRA_DIST +=			\
+EXTRA_DIST =			\
 	apple-red.png		\
 	background.jpg		\
 	gnome-applets.png	\
@@ -55,5 +71,3 @@ EXTRA_DIST +=			\
 	gnome-gmush.png		\
 	gnome-gsame.png		\
 	gnu-keys.png
-
-include $(top_srcdir)/git.mk
--- a/demos/gtk-demo/.cvsignore
+++ b/demos/gtk-demo/.cvsignore
@@ -0,0 +1,7 @@
+Makefile
+Makefile.in
+.libs
+.deps
+gtk-demo
+demos.h
+
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -1,88 +1,74 @@
 ## Makefile.am for gtk+/demos
-include $(top_srcdir)/Makefile.decl

-democodedir=$(datadir)/gtk-$(GTK_API_VERSION)/demo
+democodedir=$(datadir)/gtk-2.0/demo

-## These should be in the order you want them to appear in the
+## These should be in the order you want them to appear in the 
 ## demo app, which means alphabetized by demo title, not filename
-demos =						\
-	appwindow.c				\
-	assistant.c				\
-	builder.c				\
-	button_box.c				\
-	changedisplay.c				\
-	clipboard.c				\
-	colorsel.c				\
-	combobox.c				\
-	dialog.c				\
-	drawingarea.c				\
-	editable_cells.c			\
-	entry_buffer.c				\
-	entry_completion.c			\
-	expander.c  				\
-	hypertext.c				\
-	iconview.c				\
-	iconview_edit.c				\
-	images.c				\
-	infobar.c				\
-	links.c					\
-	list_store.c				\
-	menus.c					\
-	offscreen_window.c			\
-	offscreen_window2.c			\
-	panes.c					\
-	pickers.c				\
-	pixbufs.c				\
-	printing.c				\
-	rotated_text.c				\
-	search_entry.c				\
-	sizegroup.c				\
-	spinner.c				\
-	stock_browser.c				\
-	textview.c				\
-	textscroll.c				\
-	toolpalette.c				\
-	tree_store.c				\
-	ui_manager.c
+demos = @STRIP_BEGIN@	\
+	appwindow.c	\
+	button_box.c	\
+	colorsel.c	\
+	dialog.c	\
+	drawingarea.c	\
+	editable_cells.c \
+	images.c	\
+	item_factory.c	\
+	list_store.c	\
+	menus.c		\
+	panes.c		\
+	pixbufs.c	\
+	sizegroup.c	\
+	stock_browser.c	\
+	textview.c	\
+	tree_store.c	\
+	multiscreen.c	\
+	multidisplay.c	\
+	virtualscreen.c \
+	movedemo.c      \
+@STRIP_END@

-INCLUDES = \
-	-DDEMOCODEDIR="\"$(democodedir)\""	\
-	-I$(top_srcdir) 			\
-	-I$(top_builddir)/gdk			\
-	-DGDK_DISABLE_DEPRECATED		\
-	-DGTK_DISABLE_DEPRECATED 		\
-	$(GTK_DEBUG_FLAGS)			\
-	$(GTK_DEP_CFLAGS)
+INCLUDES = @STRIP_BEGIN@ \
+	-DDEMOCODEDIR="\"$(democodedir)\""		\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir)/gdk				\
+	-DG_DISABLE_DEPRECATED	 			\
+	-DGDK_DISABLE_DEPRECATED			\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
+	-DGTK_DISABLE_DEPRECATED 			\
+	@GTK_DEBUG_FLAGS@				\
+	@GTK_DEP_CFLAGS@				\
+@STRIP_END@

 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.0.la
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+	$(top_builddir)/gdk/@gdktargetlib@ 				\
+	$(top_builddir)/gtk/@gtktargetlib@

-LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
-	$(top_builddir)/gdk/libgdk-3.0.la	\
-	$(GTK_DEP_LIBS)				\
-	-lm
+LDADDS = @STRIP_BEGIN@ 							\
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+	$(top_builddir)/gdk/@gdktargetlib@        			\
+	$(top_builddir)/gtk/@gtktargetlib@ 				\
+@STRIP_END@

-bin_PROGRAMS = gtk3-demo
+bin_PROGRAMS = gtk-demo

 BUILT_SOURCES = demos.h

-EXTRA_DIST += 		\
-	$(IMAGEFILES)	\
-	demo.ui
+EXTRA_DIST = 		\
+	geninclude.pl	\
+	$(IMAGEFILES)

-demos.h: @REBUILD@ $(demos) geninclude.pl
-	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
+demos.h: $(demos) geninclude.pl
+	(cd $(srcdir) && ./geninclude.pl $(demos) > demos.h)

-gtk3_demo_SOURCES = 		\
+gtk_demo_SOURCES = 		\
 	$(demos)		\
 	demo-common.h		\
 	main.c			\
 	demos.h

-gtk3_demo_DEPENDENCIES = $(DEPS)
-gtk3_demo_LDADD = $(LDADDS)
-gtk3_demo_LDFLAGS = -export-dynamic
+gtk_demo_DEPENDENCIES = $(DEPS)
+gtk_demo_LDADD = $(LDADDS)

 IMAGEFILES=	alphatest.png		\
 	        apple-red.png		\
@@ -90,8 +76,6 @@ IMAGEFILES=	alphatest.png		\
 		floppybuddy.gif		\
 		gnome-applets.png	\
 		gnome-calendar.png	\
-		gnome-fs-directory.png	\
-		gnome-fs-regular.png	\
 		gnome-foot.png		\
 		gnome-gimp.png		\
 		gnome-gmush.png		\
@@ -99,8 +83,4 @@ IMAGEFILES=	alphatest.png		\
 		gnu-keys.png		\
 		gtk-logo-rgb.gif

-democode_DATA = $(demos) $(IMAGEFILES) demo.ui
-
-DISTCLEANFILES = demos.h
-
-include $(top_srcdir)/git.mk
+democode_DATA = $(demos) $(IMAGEFILES)
--- a/demos/gtk-demo/appwindow.c
+++ b/demos/gtk-demo/appwindow.c
@@ -1,283 +1,84 @@
 /* Application main window
 *
- * Demonstrates a typical application window with menubar, toolbar, statusbar.
+ * Demonstrates a typical application window, with menubar, toolbar, statusbar.
 */

 #include <gtk/gtk.h>
-#include "config.h"
 #include "demo-common.h"
-
-static GtkWidget *window = NULL;
-static GtkWidget *infobar = NULL;
-static GtkWidget *messagelabel = NULL;
+#include <stdio.h>

 static void
-activate_action (GtkAction *action)
+menuitem_cb (gpointer             callback_data,
+             guint                callback_action,
+             GtkWidget           *widget)
 {
-  const gchar *name = gtk_action_get_name (action);
-  const gchar *typename = G_OBJECT_TYPE_NAME (action);
-
  GtkWidget *dialog;
-
-  if (g_str_equal (name, "DarkTheme"))
-    {
-      gboolean value = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-      GtkSettings *settings = gtk_settings_get_default ();
-
-      g_object_set (G_OBJECT (settings),
-		    "gtk-application-prefer-dark-theme", value,
-		    NULL);
-      return;
-    }
-  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+  
+  dialog = gtk_message_dialog_new (GTK_WINDOW (callback_data),
                                   GTK_DIALOG_DESTROY_WITH_PARENT,
                                   GTK_MESSAGE_INFO,
                                   GTK_BUTTONS_CLOSE,
-                                   "You activated action: \"%s\" of type \"%s\"",
-                                    name, typename);
+                                   "You selected or toggled the menu item: \"%s\"",
+                                    gtk_item_factory_path_from_widget (widget));

  /* Close dialog on user response */
-  g_signal_connect (dialog,
+  g_signal_connect (G_OBJECT (dialog),
                    "response",
                    G_CALLBACK (gtk_widget_destroy),
                    NULL);
-
+  
  gtk_widget_show (dialog);
 }

-static void
-activate_radio_action (GtkAction *action, GtkRadioAction *current)
+
+static GtkItemFactoryEntry menu_items[] =
 {
-  const gchar *name = gtk_action_get_name (GTK_ACTION (current));
-  const gchar *typename = G_OBJECT_TYPE_NAME (GTK_ACTION (current));
-  gboolean active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current));
-  gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));
+  { "/_File",            NULL,         0,                     0, "<Branch>" },
+  { "/File/_New",        "<control>N", menuitem_cb,       0, "<StockItem>", GTK_STOCK_NEW },
+  { "/File/_Open",       "<control>O", menuitem_cb,       0, "<StockItem>", GTK_STOCK_OPEN },
+  { "/File/_Save",       "<control>S", menuitem_cb,       0, "<StockItem>", GTK_STOCK_SAVE },
+  { "/File/Save _As...", NULL,         menuitem_cb,       0, "<StockItem>", GTK_STOCK_SAVE },
+  { "/File/sep1",        NULL,         menuitem_cb,       0, "<Separator>" },
+  { "/File/_Quit",       "<control>Q", menuitem_cb,       0, "<StockItem>", GTK_STOCK_QUIT },

-  if (active)
-    {
-      gchar *text;
+  { "/_Preferences",                    NULL, 0,               0, "<Branch>" },
+  { "/_Preferences/_Color",             NULL, 0,               0, "<Branch>" },
+  { "/_Preferences/Color/_Red",         NULL, menuitem_cb, 0, "<RadioItem>" },
+  { "/_Preferences/Color/_Green",       NULL, menuitem_cb, 0, "/Preferences/Color/Red" },
+  { "/_Preferences/Color/_Blue",        NULL, menuitem_cb, 0, "/Preferences/Color/Red" },
+  { "/_Preferences/_Shape",             NULL, 0,               0, "<Branch>" },
+  { "/_Preferences/Shape/_Square",      NULL, menuitem_cb, 0, "<RadioItem>" },
+  { "/_Preferences/Shape/_Rectangle",   NULL, menuitem_cb, 0, "/Preferences/Shape/Square" },
+  { "/_Preferences/Shape/_Oval",        NULL, menuitem_cb, 0, "/Preferences/Shape/Rectangle" },

-      text = g_strdup_printf ("You activated radio action: \"%s\" of type \"%s\".\n"
-                              "Current value: %d",
-                              name, typename, value);
-      gtk_label_set_text (GTK_LABEL (messagelabel), text);
-      gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar), (GtkMessageType)value);
-      gtk_widget_show (infobar);
-      g_free (text);
-    }
-}
+  /* If you wanted this to be right justified you would use "<LastBranch>", not "<Branch>".
+   * Right justified help menu items are generally considered a bad idea now days.
+   */
+  { "/_Help",            NULL,         0,                     0, "<Branch>" },
+  { "/Help/_About",      NULL,         menuitem_cb,       0 },
+};

 static void
-about_cb (GtkAction *action,
-	  GtkWidget *window)
+toolbar_cb (GtkWidget *button,
+            gpointer   data)
 {
-  GdkPixbuf *pixbuf, *transparent;
-  gchar *filename;
+  GtkWidget *dialog;
+  
+  dialog = gtk_message_dialog_new (GTK_WINDOW (data),
+                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_MESSAGE_INFO,
+                                   GTK_BUTTONS_CLOSE,
+                                   "You selected a toolbar button");

-  const gchar *authors[] = {
-    "Peter Mattis",
-    "Spencer Kimball",
-    "Josh MacDonald",
-    "and many more...",
-    NULL
-  };
-
-  const gchar *documentors[] = {
-    "Owen Taylor",
-    "Tony Gale",
-    "Matthias Clasen <mclasen@redhat.com>",
-    "and many more...",
-    NULL
-  };
-
-  pixbuf = NULL;
-  transparent = NULL;
-  filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
-  if (filename)
-    {
-      pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-      g_free (filename);
-      transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
-      g_object_unref (pixbuf);
-    }
-
-  gtk_show_about_dialog (GTK_WINDOW (window),
-			 "program-name", "GTK+ Code Demos",
-			 "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
-						     PACKAGE_VERSION,
-						     gtk_get_major_version (),
-						     gtk_get_minor_version (),
-						     gtk_get_micro_version ()),
-			 "copyright", "(C) 1997-2009 The GTK+ Team",
-			 "license-type", GTK_LICENSE_LGPL_2_1,
-			 "website", "http://www.gtk.org",
-			 "comments", "Program to demonstrate GTK+ functions.",
-			 "authors", authors,
-			 "documenters", documentors,
-			 "logo", transparent,
-                         "title", "About GTK+ Code Demos",
-			 NULL);
-
-  g_object_unref (transparent);
+  /* Close dialog on user response */
+  g_signal_connect (G_OBJECT (dialog),
+                    "response",
+                    G_CALLBACK (gtk_widget_destroy),
+                    NULL);
+  
+  gtk_widget_show (dialog);
 }

-typedef struct
-{
-  GtkAction action;
-} ToolMenuAction;
-
-typedef struct
-{
-  GtkActionClass parent_class;
-} ToolMenuActionClass;
-
-G_DEFINE_TYPE(ToolMenuAction, tool_menu_action, GTK_TYPE_ACTION)
-
-static void
-tool_menu_action_class_init (ToolMenuActionClass *class)
-{
-  GTK_ACTION_CLASS (class)->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON;
-}
-
-static void
-tool_menu_action_init (ToolMenuAction *action)
-{
-}
-
-static GtkActionEntry entries[] = {
-  { "FileMenu", NULL, "_File" },               /* name, stock id, label */
-  { "OpenMenu", NULL, "_Open" },               /* name, stock id, label */
-  { "PreferencesMenu", NULL, "_Preferences" }, /* name, stock id, label */
-  { "ColorMenu", NULL, "_Color"  },            /* name, stock id, label */
-  { "ShapeMenu", NULL, "_Shape" },             /* name, stock id, label */
-  { "HelpMenu", NULL, "_Help" },               /* name, stock id, label */
-  { "New", GTK_STOCK_NEW,                      /* name, stock id */
-    "_New", "<control>N",                      /* label, accelerator */
-    "Create a new file",                       /* tooltip */
-    G_CALLBACK (activate_action) },
-  { "File1", NULL,                             /* name, stock id */
-    "File1", NULL,                             /* label, accelerator */
-    "Open first file",                         /* tooltip */
-    G_CALLBACK (activate_action) },
-  { "Save", GTK_STOCK_SAVE,                    /* name, stock id */
-    "_Save","<control>S",                      /* label, accelerator */
-    "Save current file",                       /* tooltip */
-    G_CALLBACK (activate_action) },
-  { "SaveAs", GTK_STOCK_SAVE,                  /* name, stock id */
-    "Save _As...", NULL,                       /* label, accelerator */
-    "Save to a file",                          /* tooltip */
-    G_CALLBACK (activate_action) },
-  { "Quit", GTK_STOCK_QUIT,                    /* name, stock id */
-    "_Quit", "<control>Q",                     /* label, accelerator */
-    "Quit",                                    /* tooltip */
-    G_CALLBACK (activate_action) },
-  { "About", NULL,                             /* name, stock id */
-    "_About", "<control>A",                    /* label, accelerator */
-    "About",                                   /* tooltip */
-    G_CALLBACK (about_cb) },
-  { "Logo", "demo-gtk-logo",                   /* name, stock id */
-     NULL, NULL,                               /* label, accelerator */
-    "GTK+",                                    /* tooltip */
-    G_CALLBACK (activate_action) },
-};
-static guint n_entries = G_N_ELEMENTS (entries);
-
-
-static GtkToggleActionEntry toggle_entries[] = {
-  { "Bold", GTK_STOCK_BOLD,                    /* name, stock id */
-     "_Bold", "<control>B",                    /* label, accelerator */
-    "Bold",                                    /* tooltip */
-    G_CALLBACK (activate_action),
-    TRUE },                                    /* is_active */
-  { "DarkTheme", NULL,                         /* name, stock id */
-     "_Prefer Dark Theme", NULL,               /* label, accelerator */
-    "Prefer Dark Theme",                       /* tooltip */
-    G_CALLBACK (activate_action),
-    FALSE },                                   /* is_active */
-};
-static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);
-
-enum {
-  COLOR_RED,
-  COLOR_GREEN,
-  COLOR_BLUE
-};
-
-static GtkRadioActionEntry color_entries[] = {
-  { "Red", NULL,                               /* name, stock id */
-    "_Red", "<control>R",                      /* label, accelerator */
-    "Blood", COLOR_RED },                      /* tooltip, value */
-  { "Green", NULL,                             /* name, stock id */
-    "_Green", "<control>G",                    /* label, accelerator */
-    "Grass", COLOR_GREEN },                    /* tooltip, value */
-  { "Blue", NULL,                              /* name, stock id */
-    "_Blue", "<control>B",                     /* label, accelerator */
-    "Sky", COLOR_BLUE },                       /* tooltip, value */
-};
-static guint n_color_entries = G_N_ELEMENTS (color_entries);
-
-enum {
-  SHAPE_SQUARE,
-  SHAPE_RECTANGLE,
-  SHAPE_OVAL
-};
-
-static GtkRadioActionEntry shape_entries[] = {
-  { "Square", NULL,                            /* name, stock id */
-    "_Square", "<control>S",                   /* label, accelerator */
-    "Square",  SHAPE_SQUARE },                 /* tooltip, value */
-  { "Rectangle", NULL,                         /* name, stock id */
-    "_Rectangle", "<control>R",                /* label, accelerator */
-    "Rectangle", SHAPE_RECTANGLE },            /* tooltip, value */
-  { "Oval", NULL,                              /* name, stock id */
-    "_Oval", "<control>O",                     /* label, accelerator */
-    "Egg", SHAPE_OVAL },                       /* tooltip, value */
-};
-static guint n_shape_entries = G_N_ELEMENTS (shape_entries);
-
-static const gchar *ui_info =
-"<ui>"
-"  <menubar name='MenuBar'>"
-"    <menu action='FileMenu'>"
-"      <menuitem action='New'/>"
-"      <menuitem action='Open'/>"
-"      <menuitem action='Save'/>"
-"      <menuitem action='SaveAs'/>"
-"      <separator/>"
-"      <menuitem action='Quit'/>"
-"    </menu>"
-"    <menu action='PreferencesMenu'>"
-"      <menuitem action='DarkTheme'/>"
-"      <menu action='ColorMenu'>"
-"	<menuitem action='Red'/>"
-"	<menuitem action='Green'/>"
-"	<menuitem action='Blue'/>"
-"      </menu>"
-"      <menu action='ShapeMenu'>"
-"        <menuitem action='Square'/>"
-"        <menuitem action='Rectangle'/>"
-"        <menuitem action='Oval'/>"
-"      </menu>"
-"      <menuitem action='Bold'/>"
-"    </menu>"
-"    <menu action='HelpMenu'>"
-"      <menuitem action='About'/>"
-"    </menu>"
-"  </menubar>"
-"  <toolbar name='ToolBar'>"
-"    <toolitem action='Open'>"
-"      <menu action='OpenMenu'>"
-"        <menuitem action='File1'/>"
-"      </menu>"
-"    </toolitem>"
-"    <toolitem action='Quit'/>"
-"    <separator action='Sep1'/>"
-"    <toolitem action='Logo'/>"
-"  </toolbar>"
-"</ui>";
-
-
-
 /* This function registers our custom toolbar icons, so they can be themed.
 *
 * It's totally optional to do this, you could just manually insert icons
@@ -288,7 +89,7 @@ static void
 register_stock_icons (void)
 {
  static gboolean registered = FALSE;
-
+  
  if (!registered)
    {
      GdkPixbuf *pixbuf;
@@ -300,17 +101,17 @@ register_stock_icons (void)
          "_GTK!",
          0, 0, NULL }
      };
-
+      
      registered = TRUE;

      /* Register our stock items */
      gtk_stock_add (items, G_N_ELEMENTS (items));
-
+      
      /* Add our custom icon factory to the list of defaults */
      factory = gtk_icon_factory_new ();
      gtk_icon_factory_add_default (factory);

-      /* demo_find_file() looks in the current directory first,
+      /* demo_find_file() looks in the the current directory first,
       * so you can run gtk-demo without installing GTK, then looks
       * in the location where the file is installed.
       */
@@ -330,18 +131,18 @@ register_stock_icons (void)

          /* The gtk-logo-rgb icon has a white background, make it transparent */
          transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
-
+          
          icon_set = gtk_icon_set_new_from_pixbuf (transparent);
          gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set);
          gtk_icon_set_unref (icon_set);
-          g_object_unref (pixbuf);
-          g_object_unref (transparent);
+          g_object_unref (G_OBJECT (pixbuf));
+          g_object_unref (G_OBJECT (transparent));
        }
      else
        g_warning ("failed to load GTK logo for toolbar");
-
+      
      /* Drop our reference to the factory, GTK will hold a reference. */
-      g_object_unref (factory);
+      g_object_unref (G_OBJECT (factory));
    }
 }

@@ -353,10 +154,8 @@ update_statusbar (GtkTextBuffer *buffer,
  gint row, col;
  gint count;
  GtkTextIter iter;
-
-  gtk_statusbar_pop (statusbar, 0); /* clear any previous message,
-				     * underflow is allowed
-				     */
+  
+  gtk_statusbar_pop (statusbar, 0); /* clear any previous message, underflow is allowed */

  count = gtk_text_buffer_get_char_count (buffer);

@@ -386,95 +185,100 @@ mark_set_callback (GtkTextBuffer     *buffer,

 GtkWidget *
 do_appwindow (GtkWidget *do_widget)
-{
+{  
+  GtkWidget *window = get_cached_widget (do_widget, "do_appwindow");
+
  if (!window)
    {
      GtkWidget *table;
+      GtkWidget *toolbar;
      GtkWidget *statusbar;
      GtkWidget *contents;
      GtkWidget *sw;
-      GtkWidget *bar;
      GtkTextBuffer *buffer;
-      GtkActionGroup *action_group;
-      GtkAction *open_action;
-      GtkUIManager *merge;
-      GError *error = NULL;
+      GtkAccelGroup *accel_group;      
+      GtkItemFactory *item_factory;

      register_stock_icons ();
-
+      
      /* Create the toplevel window
       */
-
+      
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
+      gtk_window_set_screen (GTK_WINDOW (window), 
 			     gtk_widget_get_screen (do_widget));
+      cache_widget (window, "do_appwindow");
      gtk_window_set_title (GTK_WINDOW (window), "Application Window");
-      gtk_window_set_icon_name (GTK_WINDOW (window), "document-open");

      /* NULL window variable when window is closed */
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed),
-                        &window);
-
-      table = gtk_table_new (1, 5, FALSE);
+      g_signal_connect (G_OBJECT (window), "destroy",
+                        G_CALLBACK (remove_cached_widget),
+                        "do_appwindow");

+      table = gtk_table_new (1, 4, FALSE);
+      
      gtk_container_add (GTK_CONTAINER (window), table);
-
-      /* Create the menubar and toolbar
+      
+      /* Create the menubar
       */
+      
+      accel_group = gtk_accel_group_new ();
+      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+      g_object_unref (accel_group);
+      
+      item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);

-      action_group = gtk_action_group_new ("AppWindowActions");
-      open_action = g_object_new (tool_menu_action_get_type (),
-				  "name", "Open",
-				  "label", "_Open",
-				  "tooltip", "Open a file",
-				  "stock-id", GTK_STOCK_OPEN,
-				  NULL);
-      gtk_action_group_add_action (action_group, open_action);
-      g_object_unref (open_action);
-      gtk_action_group_add_actions (action_group,
-				    entries, n_entries,
-				    window);
-      gtk_action_group_add_toggle_actions (action_group,
-					   toggle_entries, n_toggle_entries,
-					   NULL);
-      gtk_action_group_add_radio_actions (action_group,
-					  color_entries, n_color_entries,
-					  COLOR_RED,
-					  G_CALLBACK (activate_radio_action),
-					  NULL);
-      gtk_action_group_add_radio_actions (action_group,
-					  shape_entries, n_shape_entries,
-					  SHAPE_SQUARE,
-					  G_CALLBACK (activate_radio_action),
-					  NULL);
+      /* Set up item factory to go away with the window */
+      g_object_ref (item_factory);
+      gtk_object_sink (GTK_OBJECT (item_factory));
+      g_object_set_data_full (G_OBJECT (window),
+                              "<main>",
+                              item_factory,
+                              (GDestroyNotify) g_object_unref);

-      merge = gtk_ui_manager_new ();
-      g_object_set_data_full (G_OBJECT (window), "ui-manager", merge,
-			      g_object_unref);
-      gtk_ui_manager_insert_action_group (merge, action_group, 0);
-      gtk_window_add_accel_group (GTK_WINDOW (window),
-				  gtk_ui_manager_get_accel_group (merge));
+      /* create menu items */
+      gtk_item_factory_create_items (item_factory, G_N_ELEMENTS (menu_items),
+                                     menu_items, window);

-      if (!gtk_ui_manager_add_ui_from_string (merge, ui_info, -1, &error))
-	{
-	  g_message ("building menus failed: %s", error->message);
-	  g_error_free (error);
-	}
-
-      bar = gtk_ui_manager_get_widget (merge, "/MenuBar");
-      gtk_widget_show (bar);
      gtk_table_attach (GTK_TABLE (table),
-			bar,
+			gtk_item_factory_get_widget (item_factory, "<main>"),
                        /* X direction */          /* Y direction */
                        0, 1,                      0, 1,
                        GTK_EXPAND | GTK_FILL,     0,
                        0,                         0);

-      bar = gtk_ui_manager_get_widget (merge, "/ToolBar");
-      gtk_widget_show (bar);
+      /* Create the toolbar
+       */
+      toolbar = gtk_toolbar_new ();
+
+      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+                                GTK_STOCK_OPEN,
+                                "This is a demo button with an 'open' icon",
+                                NULL,
+                                G_CALLBACK (toolbar_cb),
+                                window, /* user data for callback */
+                                -1);  /* -1 means "append" */
+
+      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+                                GTK_STOCK_QUIT,
+                                "This is a demo button with a 'quit' icon",
+                                NULL,
+                                G_CALLBACK (toolbar_cb),
+                                window, /* user data for callback */
+                                -1);  /* -1 means "append" */
+
+      gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
+
+      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+                                "demo-gtk-logo",
+                                "This is a demo button with a 'gtk' icon",
+                                NULL,
+                                G_CALLBACK (toolbar_cb),
+                                window, /* user data for callback */
+                                -1);  /* -1 means "append" */
+
      gtk_table_attach (GTK_TABLE (table),
-			bar,
+                        toolbar,
                        /* X direction */       /* Y direction */
                        0, 1,                   1, 2,
                        GTK_EXPAND | GTK_FILL,  0,
@@ -483,25 +287,6 @@ do_appwindow (GtkWidget *do_widget)
      /* Create document
       */

-      infobar = gtk_info_bar_new ();
-      gtk_widget_set_no_show_all (infobar, TRUE);
-      messagelabel = gtk_label_new ("");
-      gtk_widget_show (messagelabel);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar))),
-                          messagelabel,
-                          TRUE, TRUE, 0);
-      gtk_info_bar_add_button (GTK_INFO_BAR (infobar),
-                               GTK_STOCK_OK, GTK_RESPONSE_OK);
-      g_signal_connect (infobar, "response",
-                        G_CALLBACK (gtk_widget_hide), NULL);
-
-      gtk_table_attach (GTK_TABLE (table),
-                        infobar,
-                        /* X direction */       /* Y direction */
-                        0, 1,                   2, 3,
-                        GTK_EXPAND | GTK_FILL,  0,
-                        0,                      0);
-
      sw = gtk_scrolled_window_new (NULL, NULL);

      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
@@ -510,19 +295,18 @@ do_appwindow (GtkWidget *do_widget)

      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
                                           GTK_SHADOW_IN);
-
+      
      gtk_table_attach (GTK_TABLE (table),
                        sw,
                        /* X direction */       /* Y direction */
-                        0, 1,                   3, 4,
+                        0, 1,                   2, 3,
                        GTK_EXPAND | GTK_FILL,  GTK_EXPAND | GTK_FILL,
                        0,                      0);

      gtk_window_set_default_size (GTK_WINDOW (window),
                                   200, 200);
-
+      
      contents = gtk_text_view_new ();
-      gtk_widget_grab_focus (contents);

      gtk_container_add (GTK_CONTAINER (sw),
                         contents);
@@ -533,7 +317,7 @@ do_appwindow (GtkWidget *do_widget)
      gtk_table_attach (GTK_TABLE (table),
                        statusbar,
                        /* X direction */       /* Y direction */
-                        0, 1,                   4, 5,
+                        0, 1,                   3, 4,
                        GTK_EXPAND | GTK_FILL,  0,
                        0,                      0);

@@ -551,20 +335,18 @@ do_appwindow (GtkWidget *do_widget)
                               G_CALLBACK (mark_set_callback),
                               statusbar,
                               0);
-
+      
      update_statusbar (buffer, GTK_STATUSBAR (statusbar));
    }

-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
    {
      gtk_widget_show_all (window);
    }
  else
-    {
+    {    
      gtk_widget_destroy (window);
      window = NULL;
-      infobar = NULL;
-      messagelabel = NULL;
    }

  return window;
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -1,216 +0,0 @@
-/* Assistant
- *
- * Demonstrates a sample multistep assistant. Assistants are used to divide
- * an operation into several simpler sequential steps, and to guide the user
- * through these steps.
- */
-
-#include <gtk/gtk.h>
-#include "demo-common.h"
-
-static GtkWidget *assistant = NULL;
-static GtkWidget *progress_bar = NULL;
-
-static gboolean
-apply_changes_gradually (gpointer data)
-{
-  gdouble fraction;
-
-  /* Work, work, work... */
-  fraction = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (progress_bar));
-  fraction += 0.05;
-
-  if (fraction < 1.0)
-    {
-      gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), fraction);
-      return TRUE;
-    }
-  else
-    {
-      /* Close automatically once changes are fully applied. */
-      gtk_widget_destroy (assistant);
-      return FALSE;
-    }
-}
-
-static void
-on_assistant_apply (GtkWidget *widget, gpointer data)
-{
-  /* Start a timer to simulate changes taking a few seconds to apply. */
-  g_timeout_add (100, apply_changes_gradually, NULL);
-}
-
-static void
-on_assistant_close_cancel (GtkWidget *widget, gpointer data)
-{
-  GtkWidget **assistant = (GtkWidget **) data;
-
-  gtk_widget_destroy (*assistant);
-  *assistant = NULL;
-}
-
-static void
-on_assistant_prepare (GtkWidget *widget, GtkWidget *page, gpointer data)
-{
-  gint current_page, n_pages;
-  gchar *title;
-
-  current_page = gtk_assistant_get_current_page (GTK_ASSISTANT (widget));
-  n_pages = gtk_assistant_get_n_pages (GTK_ASSISTANT (widget));
-
-  title = g_strdup_printf ("Sample assistant (%d of %d)", current_page + 1, n_pages);
-  gtk_window_set_title (GTK_WINDOW (widget), title);
-  g_free (title);
-
-  /* The fourth page (counting from zero) is the progress page.  The
-  * user clicked Apply to get here so we tell the assistant to commit,
-  * which means the changes up to this point are permanent and cannot
-  * be cancelled or revisited. */
-  if (current_page == 3)
-      gtk_assistant_commit (GTK_ASSISTANT (widget));
-}
-
-static void
-on_entry_changed (GtkWidget *widget, gpointer data)
-{
-  GtkAssistant *assistant = GTK_ASSISTANT (data);
-  GtkWidget *current_page;
-  gint page_number;
-  const gchar *text;
-
-  page_number = gtk_assistant_get_current_page (assistant);
-  current_page = gtk_assistant_get_nth_page (assistant, page_number);
-  text = gtk_entry_get_text (GTK_ENTRY (widget));
-
-  if (text && *text)
-    gtk_assistant_set_page_complete (assistant, current_page, TRUE);
-  else
-    gtk_assistant_set_page_complete (assistant, current_page, FALSE);
-}
-
-static void
-create_page1 (GtkWidget *assistant)
-{
-  GtkWidget *box, *label, *entry;
-  GdkPixbuf *pixbuf;
-
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  gtk_container_set_border_width (GTK_CONTAINER (box), 12);
-
-  label = gtk_label_new ("You must fill out this entry to continue:");
-  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
-
-  entry = gtk_entry_new ();
-  gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0);
-  g_signal_connect (G_OBJECT (entry), "changed",
-		    G_CALLBACK (on_entry_changed), assistant);
-
-  gtk_widget_show_all (box);
-  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 1");
-  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), box, GTK_ASSISTANT_PAGE_INTRO);
-
-  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
-  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
-  g_object_unref (pixbuf);
-}
-
-static void
-create_page2 (GtkWidget *assistant)
-{
-  GtkWidget *box, *checkbutton;
-  GdkPixbuf *pixbuf;
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-  gtk_container_set_border_width (GTK_CONTAINER (box), 12);
-
-  checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
-						 "even if you do not check this");
-  gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE, FALSE, 0);
-
-  gtk_widget_show_all (box);
-  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 2");
-
-  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
-  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
-  g_object_unref (pixbuf);
-}
-
-static void
-create_page3 (GtkWidget *assistant)
-{
-  GtkWidget *label;
-  GdkPixbuf *pixbuf;
-
-  label = gtk_label_new ("This is a confirmation page, press 'Apply' to apply changes");
-
-  gtk_widget_show (label);
-  gtk_assistant_append_page (GTK_ASSISTANT (assistant), label);
-  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), label, GTK_ASSISTANT_PAGE_CONFIRM);
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), label, TRUE);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), label, "Confirmation");
-
-  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
-  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), label, pixbuf);
-  g_object_unref (pixbuf);
-}
-
-static void
-create_page4 (GtkWidget *assistant)
-{
-  GtkWidget *page;
-
-  page = gtk_alignment_new (0.5, 0.5, 0.5, 0.0);
-
-  progress_bar = gtk_progress_bar_new ();
-  gtk_container_add (GTK_CONTAINER (page), progress_bar);
-
-  gtk_widget_show_all (page);
-  gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
-  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_PROGRESS);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Applying changes");
-
-  /* This prevents the assistant window from being
-   * closed while we're "busy" applying changes. */
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, FALSE);
-}
-
-GtkWidget*
-do_assistant (GtkWidget *do_widget)
-{
-  if (!assistant)
-    {
-      assistant = gtk_assistant_new ();
-
-	 gtk_window_set_default_size (GTK_WINDOW (assistant), -1, 300);
-
-      gtk_window_set_screen (GTK_WINDOW (assistant),
-			     gtk_widget_get_screen (do_widget));
-
-      create_page1 (assistant);
-      create_page2 (assistant);
-      create_page3 (assistant);
-      create_page4 (assistant);
-
-      g_signal_connect (G_OBJECT (assistant), "cancel",
-			G_CALLBACK (on_assistant_close_cancel), &assistant);
-      g_signal_connect (G_OBJECT (assistant), "close",
-			G_CALLBACK (on_assistant_close_cancel), &assistant);
-      g_signal_connect (G_OBJECT (assistant), "apply",
-			G_CALLBACK (on_assistant_apply), NULL);
-      g_signal_connect (G_OBJECT (assistant), "prepare",
-			G_CALLBACK (on_assistant_prepare), NULL);
-    }
-
-  if (!gtk_widget_get_visible (assistant))
-    gtk_widget_show (assistant);
-  else
-    {
-      gtk_widget_destroy (assistant);
-      assistant = NULL;
-    }
-
-  return assistant;
-}
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -1,68 +0,0 @@
-/* Builder
- *
- * Demonstrates an interface loaded from a XML description.
- */
-
-#include <gtk/gtk.h>
-#include "demo-common.h"
-
-static GtkBuilder *builder;
-
-G_MODULE_EXPORT void
-quit_activate (GtkAction *action)
-{
-  GtkWidget *window;
-
-  window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-  gtk_widget_destroy (window);
-}
-
-G_MODULE_EXPORT void
-about_activate (GtkAction *action)
-{
-  GtkWidget *about_dlg;
-
-  about_dlg = GTK_WIDGET (gtk_builder_get_object (builder, "aboutdialog1"));
-  gtk_dialog_run (GTK_DIALOG (about_dlg));
-  gtk_widget_hide (about_dlg);
-}
-
-GtkWidget *
-do_builder (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GError *err = NULL;
-  gchar *filename;
-  
-  if (!window)
-    {
-      builder = gtk_builder_new ();
-      filename = demo_find_file ("demo.ui", NULL);
-      gtk_builder_add_from_file (builder, filename, &err);
-      g_free (filename);
-      if (err)
-	{
-	  g_error ("ERROR: %s\n", err->message);
-	  return NULL;
-	}
-      gtk_builder_connect_signals (builder, NULL);
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {	 
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-
-  return window;
-}
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -4,6 +4,7 @@
 */

 #include <gtk/gtk.h>
+#include <demo-common.h>

 static GtkWidget *
 create_bbox (gint  horizontal,
@@ -18,9 +19,9 @@ create_bbox (gint  horizontal,
  frame = gtk_frame_new (title);

  if (horizontal)
-    bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+    bbox = gtk_hbutton_box_new ();
  else
-    bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
+    bbox = gtk_vbutton_box_new ();

  gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
  gtk_container_add (GTK_CONTAINER (frame), bbox);
@@ -43,7 +44,7 @@ create_bbox (gint  horizontal,
 GtkWidget *
 do_button_box (GtkWidget *do_widget)
 {
-  static GtkWidget *window = NULL;
+  GtkWidget *window = get_cached_widget (do_widget, "do_button_box");
  GtkWidget *main_vbox;
  GtkWidget *vbox;
  GtkWidget *hbox;
@@ -55,21 +56,22 @@ do_button_box (GtkWidget *do_widget)
    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
    gtk_window_set_screen (GTK_WINDOW (window),
 			   gtk_widget_get_screen (do_widget));
+    cache_widget (window, "do_button_box");
    gtk_window_set_title (GTK_WINDOW (window), "Button Boxes");
    
    g_signal_connect (window, "destroy",
-		      G_CALLBACK (gtk_widget_destroyed),
-		      &window);
+		      G_CALLBACK (remove_cached_widget),
+		      "do_button_box");
    
    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

-    main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+    main_vbox = gtk_vbox_new (FALSE, 0);
    gtk_container_add (GTK_CONTAINER (window), main_vbox);
    
    frame_horz = gtk_frame_new ("Horizontal Button Boxes");
    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10);
    
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+    vbox = gtk_vbox_new (FALSE, 0);
    gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
    gtk_container_add (GTK_CONTAINER (frame_horz), vbox);

@@ -92,7 +94,7 @@ do_button_box (GtkWidget *do_widget)
    frame_vert = gtk_frame_new ("Vertical Button Boxes");
    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
    
-    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+    hbox = gtk_hbox_new (FALSE, 0);
    gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
    gtk_container_add (GTK_CONTAINER (frame_vert), hbox);

@@ -113,7 +115,7 @@ do_button_box (GtkWidget *do_widget)
 			TRUE, TRUE, 5);
  }

-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
    {
      gtk_widget_show_all (window);
    }
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -1,647 +0,0 @@
-/* Change Display
- *
- * Demonstrates migrating a window between different displays and
- * screens. A display is a mouse and keyboard with some number of
- * associated monitors. A screen is a set of monitors grouped
- * into a single physical work area. The neat thing about having
- * multiple displays is that they can be on a completely separate
- * computers, as long as there is a network connection to the
- * computer where the application is running.
- *
- * Only some of the windowing systems where GTK+ runs have the
- * concept of multiple displays and screens. (The X Window System
- * is the main example.) Other windowing systems can only
- * handle one keyboard and mouse, and combine all monitors into
- * a single screen.
- *
- * This is a moderately complex example, and demonstrates:
- *
- *  - Tracking the currently open displays and screens
- *
- *  - Changing the screen for a window
- *
- *  - Letting the user choose a window by clicking on it
- *
- *  - Using GtkListStore and GtkTreeView
- *
- *  - Using GtkDialog
- */
-#include <string.h>
-#include <gtk/gtk.h>
-#include "demo-common.h"
-
-/* The ChangeDisplayInfo structure corresponds to a toplevel window and
- * holds pointers to widgets inside the toplevel window along with other
- * information about the contents of the window.
- * This is a common organizational structure in real applications.
- */
-typedef struct _ChangeDisplayInfo ChangeDisplayInfo;
-
-struct _ChangeDisplayInfo
-{
-  GtkWidget *window;
-  GtkSizeGroup *size_group;
-
-  GtkTreeModel *display_model;
-  GtkTreeModel *screen_model;
-  GtkTreeSelection *screen_selection;
-
-  GdkDisplay *current_display;
-  GdkScreen *current_screen;
-};
-
-/* These enumerations provide symbolic names for the columns
- * in the two GtkListStore models.
- */
-enum
-{
-  DISPLAY_COLUMN_NAME,
-  DISPLAY_COLUMN_DISPLAY,
-  DISPLAY_NUM_COLUMNS
-};
-
-enum
-{
-  SCREEN_COLUMN_NUMBER,
-  SCREEN_COLUMN_SCREEN,
-  SCREEN_NUM_COLUMNS
-};
-
-/* Finds the toplevel window under the mouse pointer, if any.
- */
-static GtkWidget *
-find_toplevel_at_pointer (GdkDisplay *display)
-{
-  GdkWindow *pointer_window;
-  GtkWidget *widget = NULL;
-
-  pointer_window = gdk_display_get_window_at_pointer (display, NULL, NULL);
-
-  /* The user data field of a GdkWindow is used to store a pointer
-   * to the widget that created it.
-   */
-  if (pointer_window)
-    {
-      gpointer widget_ptr;
-      gdk_window_get_user_data (pointer_window, &widget_ptr);
-      widget = widget_ptr;
-    }
-
-  return widget ? gtk_widget_get_toplevel (widget) : NULL;
-}
-
-static gboolean
-button_release_event_cb (GtkWidget       *widget,
-			 GdkEventButton  *event,
-			 gboolean        *clicked)
-{
-  *clicked = TRUE;
-  return TRUE;
-}
-
-/* Asks the user to click on a window, then waits for them click
- * the mouse. When the mouse is released, returns the toplevel
- * window under the pointer, or NULL, if there is none.
- */
-static GtkWidget *
-query_for_toplevel (GdkScreen  *screen,
-		    const char *prompt)
-{
-  GdkDisplay *display = gdk_screen_get_display (screen);
-  GtkWidget *popup, *label, *frame;
-  GdkCursor *cursor;
-  GtkWidget *toplevel = NULL;
-
-  popup = gtk_window_new (GTK_WINDOW_POPUP);
-  gtk_window_set_screen (GTK_WINDOW (popup), screen);
-  gtk_window_set_modal (GTK_WINDOW (popup), TRUE);
-  gtk_window_set_position (GTK_WINDOW (popup), GTK_WIN_POS_CENTER);
-
-  frame = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
-  gtk_container_add (GTK_CONTAINER (popup), frame);
-
-  label = gtk_label_new (prompt);
-  gtk_misc_set_padding (GTK_MISC (label), 10, 10);
-  gtk_container_add (GTK_CONTAINER (frame), label);
-
-  gtk_widget_show_all (popup);
-  cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
-
-  if (gdk_pointer_grab (gtk_widget_get_window (popup), FALSE,
-			GDK_BUTTON_RELEASE_MASK,
-			NULL,
-			cursor,
-			GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS)
-    {
-      gboolean clicked = FALSE;
-
-      g_signal_connect (popup, "button-release-event",
-			G_CALLBACK (button_release_event_cb), &clicked);
-
-      /* Process events until clicked is set by button_release_event_cb.
-       * We pass in may_block=TRUE since we want to wait if there
-       * are no events currently.
-       */
-      while (!clicked)
-	g_main_context_iteration (NULL, TRUE);
-
-      toplevel = find_toplevel_at_pointer (gdk_screen_get_display (screen));
-      if (toplevel == popup)
-	toplevel = NULL;
-    }
-
-  g_object_unref (cursor);
-  gtk_widget_destroy (popup);
-  gdk_flush ();			/* Really release the grab */
-
-  return toplevel;
-}
-
-/* Prompts the user for a toplevel window to move, and then moves
- * that window to the currently selected display
- */
-static void
-query_change_display (ChangeDisplayInfo *info)
-{
-  GdkScreen *screen = gtk_widget_get_screen (info->window);
-  GtkWidget *toplevel;
-
-  toplevel = query_for_toplevel (screen,
-				 "Please select the toplevel\n"
-				 "to move to the new screen");
-
-  if (toplevel)
-    gtk_window_set_screen (GTK_WINDOW (toplevel), info->current_screen);
-  else
-    gdk_display_beep (gdk_screen_get_display (screen));
-}
-
-/* Fills in the screen list based on the current display
- */
-static void
-fill_screens (ChangeDisplayInfo *info)
-{
-  gtk_list_store_clear (GTK_LIST_STORE (info->screen_model));
-
-  if (info->current_display)
-    {
-      gint n_screens = gdk_display_get_n_screens (info->current_display);
-      gint i;
-
-      for (i = 0; i < n_screens; i++)
-	{
-	  GdkScreen *screen = gdk_display_get_screen (info->current_display, i);
-	  GtkTreeIter iter;
-
-	  gtk_list_store_append (GTK_LIST_STORE (info->screen_model), &iter);
-	  gtk_list_store_set (GTK_LIST_STORE (info->screen_model), &iter,
-			      SCREEN_COLUMN_NUMBER, i,
-			      SCREEN_COLUMN_SCREEN, screen,
-			      -1);
-
-	  if (i == 0)
-	    gtk_tree_selection_select_iter (info->screen_selection, &iter);
-	}
-    }
-}
-
-/* Called when the user clicks on a button in our dialog or
- * closes the dialog through the window manager. Unless the
- * "Change" button was clicked, we destroy the dialog.
- */
-static void
-response_cb (GtkDialog         *dialog,
-	     gint               response_id,
-	     ChangeDisplayInfo *info)
-{
-  if (response_id == GTK_RESPONSE_OK)
-    query_change_display (info);
-  else
-    gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-/* Called when the user clicks on "Open..." in the display
- * frame. Prompts for a new display, and then opens a connection
- * to that display.
- */
-static void
-open_display_cb (GtkWidget         *button,
-		 ChangeDisplayInfo *info)
-{
-  GtkWidget *content_area;
-  GtkWidget *dialog;
-  GtkWidget *display_entry;
-  GtkWidget *dialog_label;
-  gchar *new_screen_name = NULL;
-  GdkDisplay *result = NULL;
-
-  dialog = gtk_dialog_new_with_buttons ("Open Display",
-					GTK_WINDOW (info->window),
-					GTK_DIALOG_MODAL,
-					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					GTK_STOCK_OK, GTK_RESPONSE_OK,
-					NULL);
-
-  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-  display_entry = gtk_entry_new ();
-  gtk_entry_set_activates_default (GTK_ENTRY (display_entry), TRUE);
-  dialog_label =
-    gtk_label_new ("Please enter the name of\nthe new display\n");
-
-  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-
-  gtk_container_add (GTK_CONTAINER (content_area), dialog_label);
-  gtk_container_add (GTK_CONTAINER (content_area), display_entry);
-
-  gtk_widget_grab_focus (display_entry);
-  gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (dialog)));
-
-  while (!result)
-    {
-      gint response_id = gtk_dialog_run (GTK_DIALOG (dialog));
-      if (response_id != GTK_RESPONSE_OK)
-	break;
-
-      new_screen_name = gtk_editable_get_chars (GTK_EDITABLE (display_entry),
-						0, -1);
-
-      if (strcmp (new_screen_name, "") != 0)
-	{
-	  result = gdk_display_open (new_screen_name);
-	  if (!result)
-	    {
-	      gchar *error_msg =
-		g_strdup_printf  ("Can't open display :\n\t%s\nplease try another one\n",
-				  new_screen_name);
-	      gtk_label_set_text (GTK_LABEL (dialog_label), error_msg);
-	      g_free (error_msg);
-	    }
-
-	  g_free (new_screen_name);
-	}
-    }
-
-  gtk_widget_destroy (dialog);
-}
-
-/* Called when the user clicks on the "Close" button in the
- * "Display" frame. Closes the selected display.
- */
-static void
-close_display_cb (GtkWidget         *button,
-		  ChangeDisplayInfo *info)
-{
-  if (info->current_display)
-    gdk_display_close (info->current_display);
-}
-
-/* Called when the selected row in the display list changes.
- * Updates info->current_display, then refills the list of
- * screens.
- */
-static void
-display_changed_cb (GtkTreeSelection  *selection,
-		    ChangeDisplayInfo *info)
-{
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-
-  if (info->current_display)
-    g_object_unref (info->current_display);
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    gtk_tree_model_get (model, &iter,
-			DISPLAY_COLUMN_DISPLAY, &info->current_display,
-			-1);
-  else
-    info->current_display = NULL;
-
-  fill_screens (info);
-}
-
-/* Called when the selected row in the sceen list changes.
- * Updates info->current_screen.
- */
-static void
-screen_changed_cb (GtkTreeSelection  *selection,
-		   ChangeDisplayInfo *info)
-{
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-
-  if (info->current_screen)
-    g_object_unref (info->current_screen);
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    gtk_tree_model_get (model, &iter,
-			SCREEN_COLUMN_SCREEN, &info->current_screen,
-			-1);
-  else
-    info->current_screen = NULL;
-}
-
-/* This function is used both for creating the "Display" and
- * "Screen" frames, since they have a similar structure. The
- * caller hooks up the right context for the value returned
- * in tree_view, and packs any relevant buttons into button_vbox.
- */
-static void
-create_frame (ChangeDisplayInfo *info,
-	      const char        *title,
-	      GtkWidget        **frame,
-	      GtkWidget        **tree_view,
-	      GtkWidget        **button_vbox)
-{
-  GtkTreeSelection *selection;
-  GtkWidget *scrollwin;
-  GtkWidget *hbox;
-
-  *frame = gtk_frame_new (title);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-  gtk_container_add (GTK_CONTAINER (*frame), hbox);
-
-  scrollwin = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin),
-				  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin),
-				       GTK_SHADOW_IN);
-  gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE, TRUE, 0);
-
-  *tree_view = gtk_tree_view_new ();
-  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (*tree_view), FALSE);
-  gtk_container_add (GTK_CONTAINER (scrollwin), *tree_view);
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (*tree_view));
-  gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
-
-  *button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-  gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE, FALSE, 0);
-
-  if (!info->size_group)
-    info->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-
-  gtk_size_group_add_widget (GTK_SIZE_GROUP (info->size_group), *button_vbox);
-}
-
-/* If we have a stack of buttons, it often looks better if their contents
- * are left-aligned, rather than centered. This function creates a button
- * and left-aligns it contents.
- */
-GtkWidget *
-left_align_button_new (const char *label)
-{
-  GtkWidget *button = gtk_button_new_with_mnemonic (label);
-  GtkWidget *child = gtk_bin_get_child (GTK_BIN (button));
-
-  gtk_misc_set_alignment (GTK_MISC (child), 0., 0.5);
-
-  return button;
-}
-
-/* Creates the "Display" frame in the main window.
- */
-GtkWidget *
-create_display_frame (ChangeDisplayInfo *info)
-{
-  GtkWidget *frame;
-  GtkWidget *tree_view;
-  GtkWidget *button_vbox;
-  GtkTreeViewColumn *column;
-  GtkTreeSelection *selection;
-  GtkWidget *button;
-
-  create_frame (info, "Display", &frame, &tree_view, &button_vbox);
-
-  button = left_align_button_new ("_Open...");
-  g_signal_connect (button, "clicked",  G_CALLBACK (open_display_cb), info);
-  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE, 0);
-
-  button = left_align_button_new ("_Close");
-  g_signal_connect (button, "clicked",  G_CALLBACK (close_display_cb), info);
-  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE, 0);
-
-  info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS,
-							    G_TYPE_STRING,
-							    GDK_TYPE_DISPLAY);
-
-  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), info->display_model);
-
-  column = gtk_tree_view_column_new_with_attributes ("Name",
-						     gtk_cell_renderer_text_new (),
-						     "text", DISPLAY_COLUMN_NAME,
-						     NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-  g_signal_connect (selection, "changed",
-		    G_CALLBACK (display_changed_cb), info);
-
-  return frame;
-}
-
-/* Creates the "Screen" frame in the main window.
- */
-GtkWidget *
-create_screen_frame (ChangeDisplayInfo *info)
-{
-  GtkWidget *frame;
-  GtkWidget *tree_view;
-  GtkWidget *button_vbox;
-  GtkTreeViewColumn *column;
-
-  create_frame (info, "Screen", &frame, &tree_view, &button_vbox);
-
-  info->screen_model = (GtkTreeModel *)gtk_list_store_new (SCREEN_NUM_COLUMNS,
-							   G_TYPE_INT,
-							   GDK_TYPE_SCREEN);
-
-  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), info->screen_model);
-
-  column = gtk_tree_view_column_new_with_attributes ("Number",
-						     gtk_cell_renderer_text_new (),
-						     "text", SCREEN_COLUMN_NUMBER,
-						     NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
-
-  info->screen_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-  g_signal_connect (info->screen_selection, "changed",
-		    G_CALLBACK (screen_changed_cb), info);
-
-  return frame;
-}
-
-/* Called when one of the currently open displays is closed.
- * Remove it from our list of displays.
- */
-static void
-display_closed_cb (GdkDisplay        *display,
-		   gboolean           is_error,
-		   ChangeDisplayInfo *info)
-{
-  GtkTreeIter iter;
-  gboolean valid;
-
-  for (valid = gtk_tree_model_get_iter_first (info->display_model, &iter);
-       valid;
-       valid = gtk_tree_model_iter_next (info->display_model, &iter))
-    {
-      GdkDisplay *tmp_display;
-
-      gtk_tree_model_get (info->display_model, &iter,
-			  DISPLAY_COLUMN_DISPLAY, &tmp_display,
-			  -1);
-      if (tmp_display == display)
-	{
-	  gtk_list_store_remove (GTK_LIST_STORE (info->display_model), &iter);
-	  break;
-	}
-    }
-}
-
-/* Adds a new display to our list of displays, and connects
- * to the "closed" signal so that we can remove it from the
- * list of displays again.
- */
-static void
-add_display (ChangeDisplayInfo *info,
-	     GdkDisplay        *display)
-{
-  const gchar *name = gdk_display_get_name (display);
-  GtkTreeIter iter;
-
-  gtk_list_store_append (GTK_LIST_STORE (info->display_model), &iter);
-  gtk_list_store_set (GTK_LIST_STORE (info->display_model), &iter,
-		      DISPLAY_COLUMN_NAME, name,
-		      DISPLAY_COLUMN_DISPLAY, display,
-		      -1);
-
-  g_signal_connect (display, "closed",
-		    G_CALLBACK (display_closed_cb), info);
-}
-
-/* Called when a new display is opened
- */
-static void
-display_opened_cb (GdkDisplayManager *manager,
-		   GdkDisplay        *display,
-		   ChangeDisplayInfo *info)
-{
-  add_display (info, display);
-}
-
-/* Adds all currently open displays to our list of displays,
- * and set up a signal connection so that we'll be notified
- * when displays are opened in the future as well.
- */
-static void
-initialize_displays (ChangeDisplayInfo *info)
-{
-  GdkDisplayManager *manager = gdk_display_manager_get ();
-  GSList *displays = gdk_display_manager_list_displays (manager);
-  GSList *tmp_list;
-
-  for (tmp_list = displays; tmp_list; tmp_list = tmp_list->next)
-    add_display (info, tmp_list->data);
-
-  g_slist_free (tmp_list);
-
-  g_signal_connect (manager, "display-opened",
-		    G_CALLBACK (display_opened_cb), info);
-}
-
-/* Cleans up when the toplevel is destroyed; we remove the
- * connections we use to track currently open displays, then
- * free the ChangeDisplayInfo structure.
- */
-static void
-destroy_info (ChangeDisplayInfo *info)
-{
-  GdkDisplayManager *manager = gdk_display_manager_get ();
-  GSList *displays = gdk_display_manager_list_displays (manager);
-  GSList *tmp_list;
-
-  g_signal_handlers_disconnect_by_func (manager,
-					display_opened_cb,
-					info);
-
-  for (tmp_list = displays; tmp_list; tmp_list = tmp_list->next)
-    g_signal_handlers_disconnect_by_func (tmp_list->data,
-					  display_closed_cb,
-					  info);
-
-  g_slist_free (tmp_list);
-
-  g_object_unref (info->size_group);
-  g_object_unref (info->display_model);
-  g_object_unref (info->screen_model);
-
-  if (info->current_display)
-    g_object_unref (info->current_display);
-  if (info->current_screen)
-    g_object_unref (info->current_screen);
-
-  g_free (info);
-}
-
-static void
-destroy_cb (GObject            *object,
-	    ChangeDisplayInfo **info)
-{
-  destroy_info (*info);
-  *info = NULL;
-}
-
-/* Main entry point. If the dialog for this demo doesn't yet exist, creates
- * it. Otherwise, destroys it.
- */
-GtkWidget *
-do_changedisplay (GtkWidget *do_widget)
-{
-  static ChangeDisplayInfo *info = NULL;
-
-  if (!info)
-    {
-      GtkWidget *content_area;
-      GtkWidget *vbox;
-      GtkWidget *frame;
-
-      info = g_new0 (ChangeDisplayInfo, 1);
-
-      info->window = gtk_dialog_new_with_buttons ("Change Screen or display",
-					    GTK_WINDOW (do_widget),
-					    0,
-					    GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
-					    "Change",         GTK_RESPONSE_OK,
-					    NULL);
-
-      gtk_window_set_default_size (GTK_WINDOW (info->window), 300, 400);
-
-      g_signal_connect (info->window, "response",
-			G_CALLBACK (response_cb), info);
-      g_signal_connect (info->window, "destroy",
-			G_CALLBACK (destroy_cb), &info);
-
-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
-
-      frame = create_display_frame (info);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-
-      frame = create_screen_frame (info);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-
-      initialize_displays (info);
-
-      gtk_widget_show_all (info->window);
-      return info->window;
-    }
-  else
-    {
-      gtk_widget_destroy (info->window);
-      return NULL;
-    }
-}
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -1,326 +0,0 @@
-/* Clipboard
- *
- * GtkClipboard is used for clipboard handling. This demo shows how to
- * copy and paste text to and from the clipboard.
- *
- * It also shows how to transfer images via the clipboard or via
- * drag-and-drop, and how to make clipboard contents persist after
- * the application exits. Clipboard persistence requires a clipboard
- * manager to run.
- */
-
-#include <gtk/gtk.h>
-#include <string.h>
-
-static GtkWidget *window = NULL;
-
-void
-copy_button_clicked (GtkWidget *button,
-                     gpointer   user_data)
-{
-  GtkWidget *entry;
-  GtkClipboard *clipboard;
-
-  entry = GTK_WIDGET (user_data);
-
-  /* Get the clipboard object */
-  clipboard = gtk_widget_get_clipboard (entry,
-                                        GDK_SELECTION_CLIPBOARD);
-
-  /* Set clipboard text */
-  gtk_clipboard_set_text (clipboard, gtk_entry_get_text (GTK_ENTRY (entry)), -1);
-}
-
-void
-paste_received (GtkClipboard *clipboard,
-                const gchar  *text,
-                gpointer      user_data)
-{
-  GtkWidget *entry;
-
-  entry = GTK_WIDGET (user_data);
-
-  /* Set the entry text */
-  if(text)
-    gtk_entry_set_text (GTK_ENTRY (entry), text);
-}
-
-void
-paste_button_clicked (GtkWidget *button,
-                     gpointer   user_data)
-{
-  GtkWidget *entry;
-  GtkClipboard *clipboard;
-
-  entry = GTK_WIDGET (user_data);
-
-  /* Get the clipboard object */
-  clipboard = gtk_widget_get_clipboard (entry,
-                                        GDK_SELECTION_CLIPBOARD);
-
-  /* Request the contents of the clipboard, contents_received will be
-     called when we do get the contents.
-   */
-  gtk_clipboard_request_text (clipboard,
-                              paste_received, entry);
-}
-
-static GdkPixbuf *
-get_image_pixbuf (GtkImage *image)
-{
-  gchar *stock_id;
-  GtkIconSize size;
-
-  switch (gtk_image_get_storage_type (image))
-    {
-    case GTK_IMAGE_PIXBUF:
-      return g_object_ref (gtk_image_get_pixbuf (image));
-    case GTK_IMAGE_STOCK:
-      gtk_image_get_stock (image, &stock_id, &size);
-      return gtk_widget_render_icon_pixbuf (GTK_WIDGET (image),
-                                            stock_id, size);
-    default:
-      g_warning ("Image storage type %d not handled",
-                 gtk_image_get_storage_type (image));
-      return NULL;
-    }
-}
-
-static void
-drag_begin (GtkWidget      *widget,
-            GdkDragContext *context,
-            gpointer        data)
-{
-  GdkPixbuf *pixbuf;
-
-  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
-  gtk_drag_set_icon_pixbuf (context, pixbuf, -2, -2);
-  g_object_unref (pixbuf);
-}
-
-void
-drag_data_get  (GtkWidget        *widget,
-                GdkDragContext   *context,
-                GtkSelectionData *selection_data,
-                guint             info,
-                guint             time,
-                gpointer          data)
-{
-  GdkPixbuf *pixbuf;
-
-  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
-  gtk_selection_data_set_pixbuf (selection_data, pixbuf);
-  g_object_unref (pixbuf);
-}
-
-static void
-drag_data_received (GtkWidget        *widget,
-                    GdkDragContext   *context,
-                    gint              x,
-                    gint              y,
-                    GtkSelectionData *selection_data,
-                    guint             info,
-                    guint32           time,
-                    gpointer          data)
-{
-  GdkPixbuf *pixbuf;
-
-  if (gtk_selection_data_get_length (selection_data) > 0)
-    {
-      pixbuf = gtk_selection_data_get_pixbuf (selection_data);
-      gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);
-      g_object_unref (pixbuf);
-    }
-}
-
-static void
-copy_image (GtkMenuItem *item,
-            gpointer     data)
-{
-  GtkClipboard *clipboard;
-  GdkPixbuf *pixbuf;
-
-  clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
-
-  gtk_clipboard_set_image (clipboard, pixbuf);
-  g_object_unref (pixbuf);
-}
-
-static void
-paste_image (GtkMenuItem *item,
-             gpointer     data)
-{
-  GtkClipboard *clipboard;
-  GdkPixbuf *pixbuf;
-
-  clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-  pixbuf = gtk_clipboard_wait_for_image (clipboard);
-
-  if (pixbuf)
-    {
-      gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);
-      g_object_unref (pixbuf);
-    }
-}
-
-static gboolean
-button_press (GtkWidget      *widget,
-              GdkEventButton *button,
-              gpointer        data)
-{
-  GtkWidget *menu;
-  GtkWidget *item;
-
-  if (button->button != 3)
-    return FALSE;
-
-  menu = gtk_menu_new ();
-
-  item = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL);
-  g_signal_connect (item, "activate", G_CALLBACK (copy_image), data);
-  gtk_widget_show (item);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-  item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PASTE, NULL);
-  g_signal_connect (item, "activate", G_CALLBACK (paste_image), data);
-  gtk_widget_show (item);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-  gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 3, button->time);
-  return TRUE;
-}
-
-GtkWidget *
-do_clipboard (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *vbox, *hbox;
-      GtkWidget *label;
-      GtkWidget *entry, *button;
-      GtkWidget *ebox, *image;
-      GtkClipboard *clipboard;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Clipboard demo");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");
-
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-
-      /* Create the first entry */
-      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-
-      /* Create the button */
-      button = gtk_button_new_from_stock (GTK_STOCK_COPY);
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-      g_signal_connect (button, "clicked",
-                        G_CALLBACK (copy_button_clicked), entry);
-
-      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-
-      /* Create the second entry */
-      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-
-      /* Create the button */
-      button = gtk_button_new_from_stock (GTK_STOCK_PASTE);
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-      g_signal_connect (button, "clicked",
-                        G_CALLBACK (paste_button_clicked), entry);
-
-      label = gtk_label_new ("Images can be transferred via the clipboard, too");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-
-      /* Create the first image */
-      image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
-                                        GTK_ICON_SIZE_BUTTON);
-      ebox = gtk_event_box_new ();
-      gtk_container_add (GTK_CONTAINER (ebox), image);
-      gtk_container_add (GTK_CONTAINER (hbox), ebox);
-
-      /* make ebox a drag source */
-      gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
-      gtk_drag_source_add_image_targets (ebox);
-      g_signal_connect (ebox, "drag-begin",
-                        G_CALLBACK (drag_begin), image);
-      g_signal_connect (ebox, "drag-data-get",
-                        G_CALLBACK (drag_data_get), image);
-
-      /* accept drops on ebox */
-      gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL,
-                         NULL, 0, GDK_ACTION_COPY);
-      gtk_drag_dest_add_image_targets (ebox);
-      g_signal_connect (ebox, "drag-data-received",
-                        G_CALLBACK (drag_data_received), image);
-
-      /* context menu on ebox */
-      g_signal_connect (ebox, "button-press-event",
-                        G_CALLBACK (button_press), image);
-
-      /* Create the second image */
-      image = gtk_image_new_from_stock (GTK_STOCK_STOP,
-                                        GTK_ICON_SIZE_BUTTON);
-      ebox = gtk_event_box_new ();
-      gtk_container_add (GTK_CONTAINER (ebox), image);
-      gtk_container_add (GTK_CONTAINER (hbox), ebox);
-
-      /* make ebox a drag source */
-      gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
-      gtk_drag_source_add_image_targets (ebox);
-      g_signal_connect (ebox, "drag-begin",
-                        G_CALLBACK (drag_begin), image);
-      g_signal_connect (ebox, "drag-data-get",
-                        G_CALLBACK (drag_data_get), image);
-
-      /* accept drops on ebox */
-      gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL,
-                         NULL, 0, GDK_ACTION_COPY);
-      gtk_drag_dest_add_image_targets (ebox);
-      g_signal_connect (ebox, "drag-data-received",
-                        G_CALLBACK (drag_data_received), image);
-
-      /* context menu on ebox */
-      g_signal_connect (ebox, "button-press-event",
-                        G_CALLBACK (button_press), image);
-
-      /* tell the clipboard manager to make the data persistent */
-      clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-      gtk_clipboard_set_can_store (clipboard, NULL, 0);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -6,60 +6,42 @@
 */

 #include <gtk/gtk.h>
+#include <demo-common.h>

-static GtkWidget *window = NULL;
-static GtkWidget *da;
-static GdkRGBA color;
 static GtkWidget *frame;

-/* draw callback for the drawing area
- */
-static gboolean
-draw_callback (GtkWidget *widget,
-               cairo_t   *cr,
-               gpointer   data)
-{
-  GtkStyleContext *context;
-  GdkRGBA *bg;
-
-  context = gtk_widget_get_style_context (widget);
-  gtk_style_context_get (context, 0, "background-color", &bg, NULL);
-  gdk_cairo_set_source_rgba (cr, bg);
-  cairo_paint (cr);
-  gdk_rgba_free (bg);
-
-  return TRUE;
-}
-
 static void
 change_color_callback (GtkWidget *button,
-                       gpointer   data)
+		       gpointer	  data)
 {
  GtkWidget *dialog;
  GtkColorSelection *colorsel;
-  GtkColorSelectionDialog *selection_dialog;
  gint response;
+  GtkWidget *window = get_cached_widget (button, "do_colorsel");
+  GtkWidget *da = get_cached_widget (button, "do_colorsel_da");
+  GdkColor *color = get_cached_pointer (button, "do_colorsel_color");

  dialog = gtk_color_selection_dialog_new ("Changing color");

  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
+  
+  colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (dialog)->colorsel);

-  selection_dialog = GTK_COLOR_SELECTION_DIALOG (dialog);
-  colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));
-
-  gtk_color_selection_set_previous_rgba (colorsel, &color);
-  gtk_color_selection_set_current_rgba (colorsel, &color);
+  gtk_color_selection_set_previous_color (colorsel, color);
+  gtk_color_selection_set_current_color (colorsel, color);
  gtk_color_selection_set_has_palette (colorsel, TRUE);
-
+  
  response = gtk_dialog_run (GTK_DIALOG (dialog));

  if (response == GTK_RESPONSE_OK)
    {
-      gtk_color_selection_get_current_rgba (colorsel, &color);
-
-      gtk_widget_override_background_color (da, 0, &color);
+      gtk_color_selection_get_current_color (colorsel,
+					     color);
+      
+      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, color);
    }
-
+  
+  g_free (color);
  gtk_widget_destroy (dialog);
 }

@@ -69,60 +51,64 @@ do_colorsel (GtkWidget *do_widget)
  GtkWidget *vbox;
  GtkWidget *button;
  GtkWidget *alignment;
-
+  GtkWidget *da;
+  GtkWidget *window = get_cached_widget (do_widget, "do_colorsel");
+  GdkColor  *color;
+  
  if (!window)
    {
-      color.red = 0;
-      color.blue = 1;
-      color.green = 0;
-      color.alpha = 1;
-
+      color = g_new (GdkColor, 1);
+      color->red = 0;
+      color->blue = 65535;
+      color->green = 0;
+      
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window), 
+			     gtk_widget_get_screen (do_widget));
+      cache_widget (window, "do_colorsel");
+      cache_pointer (window, "do_colorsel_color", color);
      gtk_window_set_title (GTK_WINDOW (window), "Color Selection");

      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (remove_cached_widget), 
+			"do_colorsel");

      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+      vbox = gtk_vbox_new (FALSE, 8);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      /*
       * Create the color swatch area
       */
-
-
+      
+      
      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-
+      
      da = gtk_drawing_area_new ();
-
-      g_signal_connect (da, "draw", G_CALLBACK (draw_callback), NULL);
-
      /* set a minimum size */
      gtk_widget_set_size_request (da, 200, 200);
      /* set the color */
-      gtk_widget_override_background_color (da, 0, &color);
-
+      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, color);
+      
      gtk_container_add (GTK_CONTAINER (frame), da);
+      cache_widget (da, "do_colorsel_da");

      alignment = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
-
+      
      button = gtk_button_new_with_mnemonic ("_Change the above color");
      gtk_container_add (GTK_CONTAINER (alignment), button);
-
+      
      gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
-
+      
      g_signal_connect (button, "clicked",
-                        G_CALLBACK (change_color_callback), NULL);
+			G_CALLBACK (change_color_callback), NULL);
    }

-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
    {
      gtk_widget_show_all (window);
    }
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -1,473 +0,0 @@
-/* Combo boxes 
- *
- * The ComboBox widget allows to select one option out of a list.
- * The ComboBoxEntry additionally allows the user to enter a value
- * that is not in the list of options. 
- *
- * How the options are displayed is controlled by cell renderers.
- */
-
-#include <gtk/gtk.h>
-
-enum 
-{
-  PIXBUF_COL,
-  TEXT_COL
-};
-
-static gchar *
-strip_underscore (const gchar *text)
-{
-  gchar *p, *q;
-  gchar *result;
-  
-  result = g_strdup (text);
-  p = q = result;
-  while (*p) 
-    {
-      if (*p != '_')
-	{
-	  *q = *p;
-	  q++;
-	}
-      p++;
-    }
-  *q = '\0';
-
-  return result;
-}
-
-static GtkTreeModel *
-create_stock_icon_store (void)
-{
-  gchar *stock_id[6] = {
-    GTK_STOCK_DIALOG_WARNING,
-    GTK_STOCK_STOP,
-    GTK_STOCK_NEW,
-    GTK_STOCK_CLEAR,
-    NULL,
-    GTK_STOCK_OPEN    
-  };
-
-  GtkStockItem item;
-  GdkPixbuf *pixbuf;
-  GtkWidget *cellview;
-  GtkTreeIter iter;
-  GtkListStore *store;
-  gchar *label;
-  gint i;
-
-  cellview = gtk_cell_view_new ();
-  
-  store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
-
-  for (i = 0; i < G_N_ELEMENTS (stock_id); i++)
-    {
-      if (stock_id[i])
-	{
-	  pixbuf = gtk_widget_render_icon_pixbuf (cellview, stock_id[i],
-					          GTK_ICON_SIZE_BUTTON);
-	  gtk_stock_lookup (stock_id[i], &item);
-	  label = strip_underscore (item.label);
-	  gtk_list_store_append (store, &iter);
-	  gtk_list_store_set (store, &iter,
-			      PIXBUF_COL, pixbuf,
-			      TEXT_COL, label,
-			      -1);
-	  g_object_unref (pixbuf);
-	  g_free (label);
-	}
-      else
-	{
-	  gtk_list_store_append (store, &iter);
-	  gtk_list_store_set (store, &iter,
-			      PIXBUF_COL, NULL,
-			      TEXT_COL, "separator",
-			      -1);
-	}
-    }
-
-  gtk_widget_destroy (cellview);
-  
-  return GTK_TREE_MODEL (store);
-}
-
-/* A GtkCellLayoutDataFunc that demonstrates how one can control
- * sensitivity of rows. This particular function does nothing 
- * useful and just makes the second row insensitive.
- */
-static void
-set_sensitive (GtkCellLayout   *cell_layout,
-	       GtkCellRenderer *cell,
-	       GtkTreeModel    *tree_model,
-	       GtkTreeIter     *iter,
-	       gpointer         data)
-{
-  GtkTreePath *path;
-  gint *indices;
-  gboolean sensitive;
-
-  path = gtk_tree_model_get_path (tree_model, iter);
-  indices = gtk_tree_path_get_indices (path);
-  sensitive = indices[0] != 1;
-  gtk_tree_path_free (path);
-
-  g_object_set (cell, "sensitive", sensitive, NULL);
-}
-
-/* A GtkTreeViewRowSeparatorFunc that demonstrates how rows can be
- * rendered as separators. This particular function does nothing 
- * useful and just turns the fourth row into a separator.
- */
-static gboolean
-is_separator (GtkTreeModel *model,
-	      GtkTreeIter  *iter,
-	      gpointer      data)
-{
-  GtkTreePath *path;
-  gboolean result;
-
-  path = gtk_tree_model_get_path (model, iter);
-  result = gtk_tree_path_get_indices (path)[0] == 4;
-  gtk_tree_path_free (path);
-
-  return result;
-}
-
-static GtkTreeModel *
-create_capital_store (void)
-{
-  struct {
-    gchar *group;
-    gchar *capital;
-  } capitals[] = {
-    { "A - B", NULL }, 
-    { NULL, "Albany" },
-    { NULL, "Annapolis" },
-    { NULL, "Atlanta" },
-    { NULL, "Augusta" }, 
-    { NULL, "Austin" },
-    { NULL, "Baton Rouge" },
-    { NULL, "Bismarck" },
-    { NULL, "Boise" },
-    { NULL, "Boston" },
-    { "C - D", NULL },
-    { NULL, "Carson City" },
-    { NULL, "Charleston" },
-    { NULL, "Cheyenne" },
-    { NULL, "Columbia" },
-    { NULL, "Columbus" },
-    { NULL, "Concord" },
-    { NULL, "Denver" },
-    { NULL, "Des Moines" },
-    { NULL, "Dover" },
-    { "E - J", NULL },
-    { NULL, "Frankfort" },
-    { NULL, "Harrisburg" },
-    { NULL, "Hartford" },
-    { NULL, "Helena" },
-    { NULL, "Honolulu" },
-    { NULL, "Indianapolis" },
-    { NULL, "Jackson" },
-    { NULL, "Jefferson City" },
-    { NULL, "Juneau" },
-    { "K - O" },
-    { NULL, "Lansing" },
-    { NULL, "Lincoln" },
-    { NULL, "Little Rock" },
-    { NULL, "Madison" },
-    { NULL, "Montgomery" },
-    { NULL, "Montpelier" },
-    { NULL, "Nashville" },
-    { NULL, "Oklahoma City" },
-    { NULL, "Olympia" },
-    { NULL, "P - S" },
-    { NULL, "Phoenix" },
-    { NULL, "Pierre" },
-    { NULL, "Providence" },
-    { NULL, "Raleigh" },
-    { NULL, "Richmond" },
-    { NULL, "Sacramento" },
-    { NULL, "Salem" },
-    { NULL, "Salt Lake City" },
-    { NULL, "Santa Fe" },
-    { NULL, "Springfield" },
-    { NULL, "St. Paul" },
-    { "T - Z", NULL },
-    { NULL, "Tallahassee" },
-    { NULL, "Topeka" },
-    { NULL, "Trenton" },
-    { NULL, NULL }
-  };
-  
-  GtkTreeIter iter, iter2;
-  GtkTreeStore *store;
-  gint i;
-
-  store = gtk_tree_store_new (1, G_TYPE_STRING);
-  
-  for (i = 0; capitals[i].group || capitals[i].capital; i++)
-    {
-      if (capitals[i].group)
-	{
-	  gtk_tree_store_append (store, &iter, NULL);
-	  gtk_tree_store_set (store, &iter, 0, capitals[i].group, -1);
-	}
-      else if (capitals[i].capital)
-	{
-	  gtk_tree_store_append (store, &iter2, &iter);
-	  gtk_tree_store_set (store, &iter2, 0, capitals[i].capital, -1);
-	}
-    }
-  
-  return GTK_TREE_MODEL (store);
-}
-
-static void
-is_capital_sensitive (GtkCellLayout   *cell_layout,
-		      GtkCellRenderer *cell,
-		      GtkTreeModel    *tree_model,
-		      GtkTreeIter     *iter,
-		      gpointer         data)
-{
-  gboolean sensitive;
-
-  sensitive = !gtk_tree_model_iter_has_child (tree_model, iter);
-
-  g_object_set (cell, "sensitive", sensitive, NULL);
-}
-
-static void
-fill_combo_entry (GtkWidget *combo)
-{
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "One");
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Two");
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "2\302\275");
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Three");
-}
-
-
-/* A simple validating entry */
-
-#define TYPE_MASK_ENTRY             (mask_entry_get_type ())
-#define MASK_ENTRY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MASK_ENTRY, MaskEntry))
-#define MASK_ENTRY_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TYPE_MASK_ENTRY, MaskEntryClass))
-#define IS_MASK_ENTRY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MASK_ENTRY))
-#define IS_MASK_ENTRY_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TYPE_MASK_ENTRY))
-#define MASK_ENTRY_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TYPE_MASK_ENTRY, MaskEntryClass))
-
-
-typedef struct _MaskEntry MaskEntry;
-struct _MaskEntry
-{
-  GtkEntry entry;
-  gchar *mask;
-};
-
-typedef struct _MaskEntryClass MaskEntryClass;
-struct _MaskEntryClass
-{
-  GtkEntryClass parent_class;
-};
-
-
-static void mask_entry_editable_init (GtkEditableInterface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
-			 G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
-						mask_entry_editable_init));
-
-
-static void
-mask_entry_set_background (MaskEntry *entry)
-{
-  static const GdkRGBA error_color = { 1.0, 0.9, 0.9, 1.0 };
-
-  if (entry->mask)
-    {
-      if (!g_regex_match_simple (entry->mask, gtk_entry_get_text (GTK_ENTRY (entry)), 0, 0))
-	{
-	  gtk_widget_override_color (GTK_WIDGET (entry), 0, &error_color);
-	  return;
-	}
-    }
-
-  gtk_widget_override_color (GTK_WIDGET (entry), 0, NULL);
-}
-
-
-static void
-mask_entry_changed (GtkEditable *editable)
-{
-  mask_entry_set_background (MASK_ENTRY (editable));
-}
-
-
-static void
-mask_entry_init (MaskEntry *entry)
-{
-  entry->mask = NULL;
-}
-
-
-static void
-mask_entry_class_init (MaskEntryClass *klass)
-{ }
-
-
-static void
-mask_entry_editable_init (GtkEditableInterface *iface)
-{
-  iface->changed = mask_entry_changed;
-}
-
-
-GtkWidget *
-do_combobox (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *vbox, *frame, *box, *combo, *entry;
-  GtkTreeModel *model;
-  GtkCellRenderer *renderer;
-  GtkTreePath *path;
-  GtkTreeIter iter;
-
-  if (!window)
-  {
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_screen (GTK_WINDOW (window),
-                           gtk_widget_get_screen (do_widget));
-    gtk_window_set_title (GTK_WINDOW (window), "Combo boxes");
-   
-    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed),
-                      &window);
-    
-    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-    gtk_container_add (GTK_CONTAINER (window), vbox);
-
-    /* A combobox demonstrating cell renderers, separators and
-     *  insensitive rows 
-     */
-    frame = gtk_frame_new ("Some stock icons");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-    
-    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
-    gtk_container_add (GTK_CONTAINER (frame), box);
-    
-    model = create_stock_icon_store ();
-    combo = gtk_combo_box_new_with_model (model);
-    g_object_unref (model);
-    gtk_container_add (GTK_CONTAINER (box), combo);
-    
-    renderer = gtk_cell_renderer_pixbuf_new ();
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
-    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
-				    "pixbuf", PIXBUF_COL, 
-				    NULL);
-
-    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
-					renderer,
-					set_sensitive,
-					NULL, NULL);
-    
-    renderer = gtk_cell_renderer_text_new ();
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
-    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
-				    "text", TEXT_COL,
-				    NULL);
-
-    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
-					renderer,
-					set_sensitive,
-					NULL, NULL);
-
-    gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo), 
-					  is_separator, NULL, NULL);
-    
-    gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
-    
-    /* A combobox demonstrating trees.
-     */
-    frame = gtk_frame_new ("Where are we ?");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-
-    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
-    gtk_container_add (GTK_CONTAINER (frame), box);
-    
-    model = create_capital_store ();
-    combo = gtk_combo_box_new_with_model (model);
-    g_object_unref (model);
-    gtk_container_add (GTK_CONTAINER (box), combo);
-
-    renderer = gtk_cell_renderer_text_new ();
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
-    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
-				    "text", 0,
-				    NULL);
-    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
-					renderer,
-					is_capital_sensitive,
-					NULL, NULL);
-
-    path = gtk_tree_path_new_from_indices (0, 8, -1);
-    gtk_tree_model_get_iter (model, &iter, path);
-    gtk_tree_path_free (path);
-    gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);
-
-    /* A GtkComboBoxEntry with validation.
-     */
-    frame = gtk_frame_new ("Editable");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-    
-    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
-    gtk_container_add (GTK_CONTAINER (frame), box);
-    
-    combo = gtk_combo_box_text_new_with_entry ();
-    fill_combo_entry (combo);
-    gtk_container_add (GTK_CONTAINER (box), combo);
-    
-    entry = g_object_new (TYPE_MASK_ENTRY, NULL);
-    MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";
-     
-    gtk_container_remove (GTK_CONTAINER (combo), gtk_bin_get_child (GTK_BIN (combo)));
-    gtk_container_add (GTK_CONTAINER (combo), entry);
-
-    /* A combobox with string IDs */
-    frame = gtk_frame_new ("String IDs");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-
-    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
-    gtk_container_add (GTK_CONTAINER (frame), box);
-
-    combo = gtk_combo_box_text_new ();
-    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "never", "Not visible");
-    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "when-active", "Visible when active");
-    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "always", "Always visible");
-    gtk_container_add (GTK_CONTAINER (box), combo);
-
-    entry = gtk_entry_new ();
-    g_object_bind_property (combo, "active-id",
-                            entry, "text",
-                            G_BINDING_BIDIRECTIONAL);
-    gtk_container_add (GTK_CONTAINER (box), entry);
-  }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {    
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/demo-common.h
+++ b/demos/gtk-demo/demo-common.h
@@ -6,6 +6,17 @@ G_BEGIN_DECLS
 gchar *demo_find_file (const gchar  *base,
 		       GError      **err);

+GtkWidget *get_cached_widget	  (GtkWidget *widget,
+				   gchar     *key);
+void cache_widget		  (GtkWidget *widget,
+				   gchar     *key);
+gpointer get_cached_pointer	  (GtkWidget *widget,
+				   gchar     *key);
+void  cache_pointer		  (GtkWidget *widget,
+				   gchar     *key,
+				   gpointer  data);
+void remove_cached_widget	  (GtkWidget *widget, 
+				   gchar *key);
 G_END_DECLS

 #endif /* __DEMO_COMMON_H__ */
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -1,258 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<interface domain="gtk20">
-    <object class="GtkListStore" id="liststore1">
-      <columns>
-        <column type="gchararray"/>
-        <column type="gchararray"/>
-        <column type="gint"/>
-        <column type="gchararray"/>
-      </columns>
-      <data>
-        <row>
-          <col id="0" translatable="yes">John</col>
-          <col id="1" translatable="yes">Doe</col>
-          <col id="2">25</col>
-          <col id="3" translatable="yes">This is the John Doe row</col>
-        </row>
-        <row>
-          <col id="0" translatable="yes">Mary</col>
-          <col id="1" translatable="yes">Unknown</col>
-          <col id="2">50</col>
-          <col id="3" translatable="yes">This is the Mary Unknown row</col>
-        </row>
-      </data>
-    </object>
-    <object class="GtkUIManager" id="uimanager">
-        <child>
-            <object class="GtkActionGroup" id="DefaultActions">
-                <child>
-                    <object class="GtkAction" id="Copy">
-                        <property name="name">Copy</property>
-                        <property name="tooltip" translatable="yes">Copy selected object into the clipboard</property>
-                        <property name="stock_id">gtk-copy</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Cut">
-                        <property name="name">Cut</property>
-                        <property name="tooltip" translatable="yes">Cut selected object into the clipboard</property>
-                        <property name="stock_id">gtk-cut</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="EditMenu">
-                        <property name="name">EditMenu</property>
-                        <property name="label" translatable="yes">_Edit</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="FileMenu">
-                        <property name="name">FileMenu</property>
-                        <property name="label" translatable="yes">_File</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="New">
-                        <property name="name">New</property>
-                        <property name="tooltip" translatable="yes">Create a new file</property>
-                        <property name="stock_id">gtk-new</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Open">
-                        <property name="name">Open</property>
-                        <property name="tooltip" translatable="yes">Open a file</property>
-                        <property name="stock_id">gtk-open</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Paste">
-                        <property name="name">Paste</property>
-                        <property name="tooltip" translatable="yes">Paste object from the Clipboard</property>
-                        <property name="stock_id">gtk-paste</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Quit">
-                        <property name="name">Quit</property>
-                        <property name="tooltip" translatable="yes">Quit the program</property>
-                        <property name="stock_id">gtk-quit</property>
-                        <signal handler="quit_activate" name="activate"/>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Save">
-                        <property name="name">Save</property>
-                        <property name="is_important">True</property>
-                        <property name="tooltip" translatable="yes">Save a file</property>
-                        <property name="stock_id">gtk-save</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="SaveAs">
-                        <property name="name">SaveAs</property>
-                        <property name="tooltip" translatable="yes">Save with a different name</property>
-                        <property name="stock_id">gtk-save-as</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="HelpMenu">
-                        <property name="name">HelpMenu</property>
-                        <property name="label" translatable="yes">_Help</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="About">
-                        <property name="name">About</property>
-                        <property name="stock_id">gtk-about</property>
-                        <signal handler="about_activate" name="activate"/>
-                    </object>
-                    <accelerator key="F1"/>
-                </child>
-            </object>
-        </child>
-        <ui>
-          <menubar name="menubar1">
-            <menu action="FileMenu" name="FileMenu">
-              <menuitem action="New" name="New"/>
-              <menuitem action="Open" name="Open"/>
-              <menuitem action="Save" name="Save"/>
-              <menuitem action="SaveAs" name="SaveAs"/>
-              <separator/>
-              <menuitem action="Quit" name="Quit"/>
-            </menu>
-            <menu action="EditMenu">
-              <menuitem action="Copy" name="Copy"/>
-              <menuitem action="Cut" name="Cut"/>
-              <menuitem action="Paste" name="Paste"/>
-            </menu>
-            <menu action="HelpMenu" name="HelpMenu">
-              <menuitem action="About" name="About"/>
-            </menu>
-          </menubar>
-          <toolbar name="toolbar1">
-            <toolitem action="New" name="New"/>
-            <toolitem action="Open" name="Open"/>
-            <toolitem action="Save" name="Save"/>
-            <separator/>
-            <toolitem action="Copy" name="Copy"/>
-            <toolitem action="Cut" name="Cut"/>
-            <toolitem action="Paste" name="Paste"/>
-          </toolbar>
-        </ui>
-    </object>
-    <object class="GtkAboutDialog" id="aboutdialog1">
-        <property name="program-name" translatable="yes">GtkBuilder demo</property>
-         <accessibility>
-	     <relation target="window1" type="subwindow-of"/>
-	 </accessibility>
-    </object>
-    <object class="GtkWindow" id="window1">
-        <property name="default_height">250</property>
-        <property name="default_width">440</property>
-        <property name="title">GtkBuilder demo</property>
-        <child>
-            <object class="GtkVBox" id="vbox1">
-                <property name="visible">True</property>
-                <child>
-                    <object constructor="uimanager" class="GtkMenuBar" id="menubar1">
-                        <property name="visible">True</property>
-	            	<child internal-child="accessible">
-	            	    <object class="AtkObject" id="a11y-menubar">
-	            	        <property name="AtkObject::accessible-name">The menubar</property>
-	            	    </object>
-	            	</child>
-	            </object>
-                    <packing>
-                        <property name="expand">False</property>
-                    </packing>
-                </child>
-                <child>
-                    <object constructor="uimanager" class="GtkToolbar" id="toolbar1">
-                        <property name="visible">True</property>
-	            	<child internal-child="accessible">
-	            	    <object class="AtkObject" id="a11y-toolbar">
-	            	        <property name="AtkObject::accessible-name">The toolbar</property>
-	            	    </object>
-	            	</child>
-                    </object>
-                    <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                    </packing>
-                </child>
-                <child>
-                    <object class="GtkScrolledWindow" id="scrolledwindow1">
-                      <property name="hscrollbar_policy">automatic</property>
-                      <property name="shadow_type">in</property>
-                      <property name="visible">True</property>
-                      <property name="vscrollbar_policy">automatic</property>
-                      <child>
-                        <object class="GtkTreeView" id="treeview1">
-                          <property name="visible">True</property>
-                          <property name="model">liststore1</property>
-                          <property name="tooltip-column">3</property>
-	            	  <child internal-child="accessible">
-	            	      <object class="AtkObject" id="a11y-treeview">
-	            	          <property name="AtkObject::accessible-name">Name list</property>
-                                  <property name="AtkObject::accessible-description">
-                                    A list of person with name, surname and age columns
-                                  </property>
-	            	      </object>
-	            	  </child>
-                          <child>
-                            <object class="GtkTreeViewColumn" id="column1">
-                              <property name="title">Name</property>
-                              <child>
-                                <object class="GtkCellRendererText" id="renderer1"/>
-                                <attributes>
-                                  <attribute name="text">0</attribute>
-                                </attributes>
-                              </child>
-                            </object>
-                          </child>
-                          <child>
-                            <object class="GtkTreeViewColumn" id="column2">
-                              <property name="title">Surname</property>
-                              <child>
-                                <object class="GtkCellRendererText" id="renderer2"/>
-                                <attributes>
-                                  <attribute name="text">1</attribute>
-                                </attributes>
-                              </child>
-                            </object>
-                          </child>
-                          <child>
-                            <object class="GtkTreeViewColumn" id="column3">
-                              <property name="title">Age</property>
-                              <child>
-                                <object class="GtkCellRendererText" id="renderer3"/>
-                                <attributes>
-                                  <attribute name="text">2</attribute>
-                                </attributes>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
-		    <accessibility>
-		      	<action action_name="move-cursor" description="Move the cursor to select another person."/>
-		    </accessibility>
-                    </object>
-                    <packing>
-                        <property name="position">2</property>
-                    </packing>
-                </child>
-                <child>
-                    <object class="GtkStatusbar" id="statusbar1">
-                        <property name="visible">True</property>
-                    </object>
-                    <packing>
-                        <property name="expand">False</property>
-                        <property name="position">3</property>
-                    </packing>
-                </child>
-            </object>
-        </child>
-    </object>
-</interface>
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -4,16 +4,14 @@
 */

 #include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-static GtkWidget *entry1 = NULL;
-static GtkWidget *entry2 = NULL;
+#include "demo-common.h"

 static void
 message_dialog_clicked (GtkButton *button,
 			gpointer   user_data)
 {
  GtkWidget *dialog;
+  GtkWidget *window = get_cached_widget (GTK_WIDGET (button), "do_dialog");
  static gint i = 1;

  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
@@ -21,9 +19,8 @@ message_dialog_clicked (GtkButton *button,
 				   GTK_MESSAGE_INFO,
 				   GTK_BUTTONS_OK,
 				   "This message box has been popped up the following\n"
-				   "number of times:");
-  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                            "%d", i);
+				   "number of times:\n\n"
+				   "%d", i);
  gtk_dialog_run (GTK_DIALOG (dialog));
  gtk_widget_destroy (dialog);
  i++;
@@ -33,7 +30,6 @@ static void
 interactive_dialog_clicked (GtkButton *button,
 			    gpointer   user_data)
 {
-  GtkWidget *content_area;
  GtkWidget *dialog;
  GtkWidget *hbox;
  GtkWidget *stock;
@@ -42,6 +38,11 @@ interactive_dialog_clicked (GtkButton *button,
  GtkWidget *local_entry2;
  GtkWidget *label;
  gint response;
+  GtkWidget *window = get_cached_widget (GTK_WIDGET (button), "do_dialog");
+  GtkWidget *entry1 = get_cached_widget (GTK_WIDGET (button),
+					 "do_dialog_entry_1");
+  GtkWidget *entry2 = get_cached_widget (GTK_WIDGET (button), 
+					 "do_dialog_entry_2");

  dialog = gtk_dialog_new_with_buttons ("Interactive Dialog",
 					GTK_WINDOW (window),
@@ -51,12 +52,9 @@ interactive_dialog_clicked (GtkButton *button,
                                        "_Non-stock Button",
                                        GTK_RESPONSE_CANCEL,
 					NULL);
-
-  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+  hbox = gtk_hbox_new (FALSE, 8);
  gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-  gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);

  stock = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
  gtk_box_pack_start (GTK_BOX (hbox), stock, FALSE, FALSE, 0);
@@ -106,39 +104,43 @@ do_dialog (GtkWidget *do_widget)
  GtkWidget *button;
  GtkWidget *table;
  GtkWidget *label;
+  GtkWidget *window = get_cached_widget (do_widget, "do_dialog");
+  GtkWidget *entry1;
+  GtkWidget *entry2;
  
  if (!window)
    {
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Dialogs");
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
+      gtk_window_set_screen (GTK_WINDOW (window), 
+			     gtk_widget_get_screen (do_widget));
+      cache_widget (window, "do_dialog");
+      g_signal_connect (window, "destroy", 
+			G_CALLBACK (remove_cached_widget), 
+			"do_dialog");
      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

      frame = gtk_frame_new ("Dialogs");
      gtk_container_add (GTK_CONTAINER (window), frame);

-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+      vbox = gtk_vbox_new (FALSE, 8);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (frame), vbox);

      /* Standard message dialog */
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+      hbox = gtk_hbox_new (FALSE, 8);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
      button = gtk_button_new_with_mnemonic ("_Message Dialog");
      g_signal_connect (button, "clicked",
 			G_CALLBACK (message_dialog_clicked), NULL);
      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);

-      gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
-                          FALSE, FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, 0);

      /* Interactive dialog*/
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+      hbox = gtk_hbox_new (FALSE, 8);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      vbox2 = gtk_vbox_new (FALSE, 0);

      button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
      g_signal_connect (button, "clicked",
@@ -159,6 +161,7 @@ do_dialog (GtkWidget *do_widget)
      entry1 = gtk_entry_new ();
      gtk_table_attach_defaults (GTK_TABLE (table), entry1, 1, 2, 0, 1);
      gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry1);
+      cache_widget (entry1, "do_dialog_entry_1");

      label = gtk_label_new_with_mnemonic ("E_ntry 2");
      
@@ -169,9 +172,10 @@ do_dialog (GtkWidget *do_widget)
      entry2 = gtk_entry_new ();
      gtk_table_attach_defaults (GTK_TABLE (table), entry2, 1, 2, 1, 2);
      gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry2);
+      cache_widget (entry2, "do_dialog_entry_2");
    }

-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
    {
      gtk_widget_show_all (window);
    }
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -14,89 +14,93 @@
 */

 #include <gtk/gtk.h>
+#include "demo-common.h"

-static GtkWidget *window = NULL;
-/* Pixmap for scribble area, to store current scribbles */
-static cairo_surface_t *surface = NULL;
-
-/* Create a new surface of the appropriate size to store our scribbles */
+/* Create a new pixmap of the appropriate size to store our scribbles */
 static gboolean
-scribble_configure_event (GtkWidget         *widget,
-                          GdkEventConfigure *event,
-                          gpointer           data)
+scribble_configure_event (GtkWidget	    *widget,
+			  GdkEventConfigure *event,
+			  gpointer	     data)
 {
-  GtkAllocation allocation;
-  cairo_t *cr;
+  GdkPixmap *pixmap = get_cached_pointer (widget, "do_drawingarea_pixmap");
+  if (pixmap)
+    g_object_unref (G_OBJECT (pixmap));

-  if (surface)
-    cairo_surface_destroy (surface);
+ /* Pixmap for scribble area, to store current scribbles */
+  pixmap = gdk_pixmap_new (widget->window,
+			   widget->allocation.width,
+			   widget->allocation.height,
+			   -1);
+  cache_pointer (widget, "do_drawingarea_pixmap", pixmap);

-  gtk_widget_get_allocation (widget, &allocation);
-  surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget),
-                                               CAIRO_CONTENT_COLOR,
-                                               allocation.width,
-                                               allocation.height);
-
-  /* Initialize the surface to white */
-  cr = cairo_create (surface);
-
-  cairo_set_source_rgb (cr, 1, 1, 1);
-  cairo_paint (cr);
-
-  cairo_destroy (cr);
+  /* Initialize the pixmap to white */
+  gdk_draw_rectangle (pixmap,
+		      widget->style->white_gc,
+		      TRUE,
+		      0, 0,
+		      widget->allocation.width,
+		      widget->allocation.height);

  /* We've handled the configure event, no need for further processing. */
  return TRUE;
 }

-/* Redraw the screen from the surface */
+/* Redraw the screen from the pixmap */
 static gboolean
-scribble_draw (GtkWidget *widget,
-               cairo_t   *cr,
-               gpointer   data)
+scribble_expose_event (GtkWidget      *widget,
+		       GdkEventExpose *event,
+		       gpointer	       data)
 {
-  cairo_set_source_surface (cr, surface, 0, 0);
-  cairo_paint (cr);
-
+  /* We use the "foreground GC" for the widget since it already exists,
+   * but honestly any GC would work. The only thing to worry about
+   * is whether the GC has an inappropriate clip region set.
+   */
+  
+  gdk_draw_drawable (widget->window,
+		     widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+		     get_cached_pointer (widget, "do_drawingarea_pixmap"),
+		     /* Only copy the area that was exposed. */
+		     event->area.x, event->area.y,
+		     event->area.x, event->area.y,
+		     event->area.width, event->area.height);
+  
  return FALSE;
 }

 /* Draw a rectangle on the screen */
 static void
 draw_brush (GtkWidget *widget,
-            gdouble    x,
-            gdouble    y)
+	    gdouble    x,
+	    gdouble    y)
 {
  GdkRectangle update_rect;
-  cairo_t *cr;

  update_rect.x = x - 3;
  update_rect.y = y - 3;
  update_rect.width = 6;
  update_rect.height = 6;

-  /* Paint to the surface, where we store our state */
-  cr = cairo_create (surface);
-
-  gdk_cairo_rectangle (cr, &update_rect);
-  cairo_fill (cr);
-
-  cairo_destroy (cr);
+  /* Paint to the pixmap, where we store our state */
+  gdk_draw_rectangle (get_cached_pointer (widget, "do_drawingarea_pixmap"),
+		      widget->style->black_gc,
+		      TRUE,
+		      update_rect.x, update_rect.y,
+		      update_rect.width, update_rect.height);

  /* Now invalidate the affected region of the drawing area. */
-  gdk_window_invalidate_rect (gtk_widget_get_window (widget),
-                              &update_rect,
-                              FALSE);
+  gdk_window_invalidate_rect (widget->window,
+			      &update_rect,
+			      FALSE);
 }

 static gboolean
-scribble_button_press_event (GtkWidget      *widget,
-                             GdkEventButton *event,
-                             gpointer        data)
+scribble_button_press_event (GtkWidget	    *widget,
+			     GdkEventButton *event,
+			     gpointer	     data)
 {
-  if (surface == NULL)
+  if (get_cached_pointer (widget, "do_drawingarea_pixmap") == NULL)
    return FALSE; /* paranoia check, in case we haven't gotten a configure event */
-
+  
  if (event->button == 1)
    draw_brush (widget, event->x, event->y);

@@ -105,14 +109,14 @@ scribble_button_press_event (GtkWidget      *widget,
 }

 static gboolean
-scribble_motion_notify_event (GtkWidget      *widget,
-                              GdkEventMotion *event,
-                              gpointer        data)
+scribble_motion_notify_event (GtkWidget	     *widget,
+			      GdkEventMotion *event,
+			      gpointer	      data)
 {
  int x, y;
  GdkModifierType state;

-  if (surface == NULL)
+  if (get_cached_pointer (widget, "do_drawingarea_pixmap") == NULL)
    return FALSE; /* paranoia check, in case we haven't gotten a configure event */

  /* This call is very important; it requests the next motion event.
@@ -125,9 +129,9 @@ scribble_motion_notify_event (GtkWidget      *widget,
   * we avoid getting a huge number of events faster than we
   * can cope.
   */
-
+  
  gdk_window_get_pointer (event->window, &x, &y, &state);
-
+    
  if (state & GDK_BUTTON1_MASK)
    draw_brush (widget, x, y);

@@ -137,66 +141,83 @@ scribble_motion_notify_event (GtkWidget      *widget,


 static gboolean
-checkerboard_draw (GtkWidget *da,
-                   cairo_t   *cr,
-                   gpointer   data)
+checkerboard_expose (GtkWidget	    *da,
+		     GdkEventExpose *event,
+		     gpointer	     data)
 {
-  gint i, j, xcount, ycount, width, height;
-
+  gint i, j, xcount, ycount;
+  GdkGC *gc1, *gc2;
+  GdkColor color;
+  
 #define CHECK_SIZE 10
 #define SPACING 2
-
-  /* At the start of a draw handler, a clip region has been set on
-   * the Cairo context, and the contents have been cleared to the
+  
+  /* At the start of an expose handler, a clip region of event->area
+   * is set on the window, and event->area has been cleared to the
   * widget's background color. The docs for
   * gdk_window_begin_paint_region() give more details on how this
   * works.
   */

+  /* It would be a bit more efficient to keep these
+   * GC's around instead of recreating on each expose, but
+   * this is the lazy/slow way.
+   */
+  gc1 = gdk_gc_new (da->window);
+  color.red = 30000;
+  color.green = 0;
+  color.blue = 30000;
+  gdk_gc_set_rgb_fg_color (gc1, &color);
+
+  gc2 = gdk_gc_new (da->window);
+  color.red = 65535;
+  color.green = 65535;
+  color.blue = 65535;
+  gdk_gc_set_rgb_fg_color (gc2, &color);
+  
  xcount = 0;
-  width = gtk_widget_get_allocated_width (da);
-  height = gtk_widget_get_allocated_height (da);
  i = SPACING;
-  while (i < width)
+  while (i < da->allocation.width)
    {
      j = SPACING;
      ycount = xcount % 2; /* start with even/odd depending on row */
-      while (j < height)
-        {
-          if (ycount % 2)
-            cairo_set_source_rgb (cr, 0.45777, 0, 0.45777);
-          else
-            cairo_set_source_rgb (cr, 1, 1, 1);
+      while (j < da->allocation.height)
+	{
+	  GdkGC *gc;
+	  
+	  if (ycount % 2)
+	    gc = gc1;
+	  else
+	    gc = gc2;

-          /* If we're outside the clip, this will do nothing.
-           */
-          cairo_rectangle (cr, i, j, CHECK_SIZE, CHECK_SIZE);
-          cairo_fill (cr);
+	  /* If we're outside event->area, this will do nothing.
+	   * It might be mildly more efficient if we handled
+	   * the clipping ourselves, but again we're feeling lazy.
+	   */
+	  gdk_draw_rectangle (da->window,
+			      gc,
+			      TRUE,
+			      i, j,
+			      CHECK_SIZE,
+			      CHECK_SIZE);

-          j += CHECK_SIZE + SPACING;
-          ++ycount;
-        }
+	  j += CHECK_SIZE + SPACING;
+	  ++ycount;
+	}

      i += CHECK_SIZE + SPACING;
      ++xcount;
    }
-
+  
+  g_object_unref (G_OBJECT (gc1));
+  g_object_unref (G_OBJECT (gc2));
+  
  /* return TRUE because we've handled this event, so no
   * further processing is required.
   */
  return TRUE;
 }

-static void
-close_window (void)
-{
-  window = NULL;
-
-  if (surface)
-    cairo_surface_destroy (surface);
-  surface = NULL;
-}
-
 GtkWidget *
 do_drawingarea (GtkWidget *do_widget)
 {
@@ -204,93 +225,101 @@ do_drawingarea (GtkWidget *do_widget)
  GtkWidget *vbox;
  GtkWidget *da;
  GtkWidget *label;
+  GtkWidget *window = get_cached_widget (do_widget, "do_drawingarea");

  if (!window)
    {
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Drawing Area");
+      gtk_window_set_screen (GTK_WINDOW (window), 
+			     gtk_widget_get_screen (do_widget));
+      cache_widget (window, "do_drawingarea");

-      g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
+      g_signal_connect (window, "destroy", G_CALLBACK (remove_cached_widget),
+			"do_drawingarea");

      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+      vbox = gtk_vbox_new (FALSE, 8);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      /*
       * Create the checkerboard area
       */
-
+      
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Checkerboard pattern</u>");
+			    "<u>Checkerboard pattern</u>");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
+      
      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-
+      
      da = gtk_drawing_area_new ();
      /* set a minimum size */
      gtk_widget_set_size_request (da, 100, 100);

      gtk_container_add (GTK_CONTAINER (frame), da);

-      g_signal_connect (da, "draw",
-                        G_CALLBACK (checkerboard_draw), NULL);
+      g_signal_connect (da, "expose_event",
+			G_CALLBACK (checkerboard_expose), NULL);

      /*
       * Create the scribble area
       */
-
+      
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Scribble area</u>");
+			    "<u>Scribble area</u>");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
+      
      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-
+      
      da = gtk_drawing_area_new ();
      /* set a minimum size */
      gtk_widget_set_size_request (da, 100, 100);

      gtk_container_add (GTK_CONTAINER (frame), da);

-      /* Signals used to handle backing surface */
-
-      g_signal_connect (da, "draw",
-                        G_CALLBACK (scribble_draw), NULL);
-      g_signal_connect (da,"configure-event",
-                        G_CALLBACK (scribble_configure_event), NULL);
-
+      /* Signals used to handle backing pixmap */
+      
+      g_signal_connect (da, "expose_event",
+			G_CALLBACK (scribble_expose_event), NULL);
+      g_signal_connect (da,"configure_event",
+			G_CALLBACK (scribble_configure_event), NULL);
+      
      /* Event signals */
-
-      g_signal_connect (da, "motion-notify-event",
-                        G_CALLBACK (scribble_motion_notify_event), NULL);
-      g_signal_connect (da, "button-press-event",
-                        G_CALLBACK (scribble_button_press_event), NULL);
+      
+      g_signal_connect (da, "motion_notify_event",
+			G_CALLBACK (scribble_motion_notify_event), NULL);
+      g_signal_connect (da, "button_press_event",
+			G_CALLBACK (scribble_button_press_event), NULL);


      /* Ask to receive events the drawing area doesn't normally
       * subscribe to
       */
      gtk_widget_set_events (da, gtk_widget_get_events (da)
-                             | GDK_LEAVE_NOTIFY_MASK
-                             | GDK_BUTTON_PRESS_MASK
-                             | GDK_POINTER_MOTION_MASK
-                             | GDK_POINTER_MOTION_HINT_MASK);
+			     | GDK_LEAVE_NOTIFY_MASK
+			     | GDK_BUTTON_PRESS_MASK
+			     | GDK_POINTER_MOTION_MASK
+			     | GDK_POINTER_MOTION_HINT_MASK);

    }

-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
+    {
      gtk_widget_show_all (window);
+    }
  else
+    {
      gtk_widget_destroy (window);
+      window = NULL;
+    }

  return window;
 }
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -2,40 +2,29 @@
 *
 * This demo demonstrates the use of editable cells in a GtkTreeView. If
 * you're new to the GtkTreeView widgets and associates, look into
- * the GtkListStore example first. It also shows how to use the
- * GtkCellRenderer::editing-started signal to do custom setup of the
- * editable widget.
+ * the GtkListStore example first.
 *
- * The cell renderers used in this demo are GtkCellRendererText, 
- * GtkCellRendererCombo and GtkCellRendererProgress.
 */

 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
-
-static GtkWidget *window = NULL;
+#include "demo-common.h"

 typedef struct
 {
-  gint   number;
-  gchar *product;
-  gint   yummy;
+  gint     number;
+  gchar   *product;
+  gboolean editable;
 }
 Item;

 enum
 {
-  COLUMN_ITEM_NUMBER,
-  COLUMN_ITEM_PRODUCT,
-  COLUMN_ITEM_YUMMY,
-  NUM_ITEM_COLUMNS
-};
-
-enum
-{
-  COLUMN_NUMBER_TEXT,
-  NUM_NUMBER_COLUMNS
+  COLUMN_NUMBER,
+  COLUMN_PRODUCT,
+  COLUMN_EDITABLE,
+  NUM_COLUMNS
 };

 static GArray *articles = NULL;
@@ -49,32 +38,32 @@ add_items (void)

  foo.number = 3;
  foo.product = g_strdup ("bottles of coke");
-  foo.yummy = 20;
+  foo.editable = TRUE;
  g_array_append_vals (articles, &foo, 1);

  foo.number = 5;
  foo.product = g_strdup ("packages of noodles");
-  foo.yummy = 50;
+  foo.editable = TRUE;
  g_array_append_vals (articles, &foo, 1);

  foo.number = 2;
  foo.product = g_strdup ("packages of chocolate chip cookies");
-  foo.yummy = 90;
+  foo.editable = TRUE;
  g_array_append_vals (articles, &foo, 1);

  foo.number = 1;
  foo.product = g_strdup ("can vanilla ice cream");
-  foo.yummy = 60;
+  foo.editable = TRUE;
  g_array_append_vals (articles, &foo, 1);

  foo.number = 6;
  foo.product = g_strdup ("eggs");
-  foo.yummy = 10;
+  foo.editable = TRUE;
  g_array_append_vals (articles, &foo, 1);
 }

 static GtkTreeModel *
-create_items_model (void)
+create_model (void)
 {
  gint i = 0;
  GtkListStore *model;
@@ -86,8 +75,8 @@ create_items_model (void)
  add_items ();

  /* create list store */
-  model = gtk_list_store_new (NUM_ITEM_COLUMNS, G_TYPE_INT, G_TYPE_STRING,
-                              G_TYPE_INT, G_TYPE_BOOLEAN);
+  model = gtk_list_store_new (NUM_COLUMNS, G_TYPE_INT, G_TYPE_STRING,
+			      G_TYPE_BOOLEAN);

  /* add items */
  for (i = 0; i < articles->len; i++)
@@ -95,49 +84,18 @@ create_items_model (void)
      gtk_list_store_append (model, &iter);

      gtk_list_store_set (model, &iter,
-                          COLUMN_ITEM_NUMBER,
-                          g_array_index (articles, Item, i).number,
-                          COLUMN_ITEM_PRODUCT,
-                          g_array_index (articles, Item, i).product,
-                          COLUMN_ITEM_YUMMY,
-                          g_array_index (articles, Item, i).yummy,
-                          -1);
+			  COLUMN_NUMBER,
+			  g_array_index (articles, Item, i).number,
+			  COLUMN_PRODUCT,
+			  g_array_index (articles, Item, i).product,
+			  COLUMN_EDITABLE,
+			  g_array_index (articles, Item, i).editable,
+			  -1);
    }

  return GTK_TREE_MODEL (model);
 }

-static GtkTreeModel *
-create_numbers_model (void)
-{
-#define N_NUMBERS 10
-  gint i = 0;
-  GtkListStore *model;
-  GtkTreeIter iter;
-
-  /* create list store */
-  model = gtk_list_store_new (NUM_NUMBER_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
-
-  /* add numbers */
-  for (i = 0; i < N_NUMBERS; i++)
-    {
-      char str[2];
-
-      str[0] = '0' + i;
-      str[1] = '\0';
-
-      gtk_list_store_append (model, &iter);
-
-      gtk_list_store_set (model, &iter,
-                          COLUMN_NUMBER_TEXT, str,
-                          -1);
-    }
-
-  return GTK_TREE_MODEL (model);
-
-#undef N_NUMBERS
-}
-
 static void
 add_item (GtkWidget *button, gpointer data)
 {
@@ -149,15 +107,15 @@ add_item (GtkWidget *button, gpointer data)

  foo.number = 0;
  foo.product = g_strdup ("Description here");
-  foo.yummy = 50;
+  foo.editable = TRUE;
  g_array_append_vals (articles, &foo, 1);

  gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-                      COLUMN_ITEM_NUMBER, foo.number,
-                      COLUMN_ITEM_PRODUCT, foo.product,
-                      COLUMN_ITEM_YUMMY, foo.yummy,
-                      -1);
+		      COLUMN_NUMBER, foo.number,
+		      COLUMN_PRODUCT, foo.product,
+		      COLUMN_EDITABLE, foo.editable,
+		      -1);
 }

 static void
@@ -183,73 +141,49 @@ remove_item (GtkWidget *widget, gpointer data)
    }
 }

-static gboolean
-separator_row (GtkTreeModel *model,
-               GtkTreeIter  *iter,
-               gpointer      data)
-{
-  GtkTreePath *path;
-  gint idx;
-
-  path = gtk_tree_model_get_path (model, iter);
-  idx = gtk_tree_path_get_indices (path)[0];
-
-  gtk_tree_path_free (path);
-
-  return idx == 5;
-}
-
-static void
-editing_started (GtkCellRenderer *cell,
-                 GtkCellEditable *editable,
-                 const gchar     *path,
-                 gpointer         data)
-{
-  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (editable), 
-                                        separator_row, NULL, NULL);
-}
-
 static void
 cell_edited (GtkCellRendererText *cell,
-             const gchar         *path_string,
-             const gchar         *new_text,
-             gpointer             data)
+	     const gchar         *path_string,
+	     const gchar         *new_text,
+	     gpointer             data)
 {
  GtkTreeModel *model = (GtkTreeModel *)data;
  GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
  GtkTreeIter iter;

-  gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column"));
+  gint *column;
+
+  column = g_object_get_data (G_OBJECT (cell), "column");

  gtk_tree_model_get_iter (model, &iter, path);

-  switch (column)
+  switch ((gint) column)
    {
-    case COLUMN_ITEM_NUMBER:
+    case COLUMN_NUMBER:
      {
-        gint i;
+	gint i;

-        i = gtk_tree_path_get_indices (path)[0];
-        g_array_index (articles, Item, i).number = atoi (new_text);
+	i = gtk_tree_path_get_indices (path)[0];
+	g_array_index (articles, Item, i).number = atoi (new_text);

-        gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
-                            g_array_index (articles, Item, i).number, -1);
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
+			    g_array_index (articles, Item, i).number, -1);
      }
      break;

-    case COLUMN_ITEM_PRODUCT:
+    case COLUMN_PRODUCT:
      {
-        gint i;
-        gchar *old_text;
+	gint i;
+	gchar *old_text;

        gtk_tree_model_get (model, &iter, column, &old_text, -1);
-        g_free (old_text);
+	g_free (old_text);

-        i = gtk_tree_path_get_indices (path)[0];
-        g_free (g_array_index (articles, Item, i).product);
-        g_array_index (articles, Item, i).product = g_strdup (new_text);
+	i = gtk_tree_path_get_indices (path)[0];
+	g_free (g_array_index (articles, Item, i).product);
+	g_array_index (articles, Item, i).product = g_strdup (new_text);

-        gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
                            g_array_index (articles, Item, i).product, -1);
      }
      break;
@@ -259,60 +193,41 @@ cell_edited (GtkCellRendererText *cell,
 }

 static void
-add_columns (GtkTreeView  *treeview, 
-             GtkTreeModel *items_model,
-             GtkTreeModel *numbers_model)
+add_columns (GtkTreeView *treeview)
 {
  GtkCellRenderer *renderer;
+  GtkTreeModel *model = gtk_tree_view_get_model (treeview);

  /* number column */
-  renderer = gtk_cell_renderer_combo_new ();
-  g_object_set (renderer,
-                "model", numbers_model,
-                "text-column", COLUMN_NUMBER_TEXT,
-                "has-entry", FALSE,
-                "editable", TRUE,
-                NULL);
-  g_signal_connect (renderer, "edited",
-                    G_CALLBACK (cell_edited), items_model);
-  g_signal_connect (renderer, "editing-started",
-                    G_CALLBACK (editing_started), NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (COLUMN_ITEM_NUMBER));
+  renderer = gtk_cell_renderer_text_new ();
+  g_signal_connect (G_OBJECT (renderer), "edited",
+		    G_CALLBACK (cell_edited), model);
+  g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_NUMBER);

  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-                                               -1, "Number", renderer,
-                                               "text", COLUMN_ITEM_NUMBER,
-                                               NULL);
+					       -1, "Number", renderer,
+					       "text", COLUMN_NUMBER,
+					       "editable", COLUMN_EDITABLE,
+					       NULL);

  /* product column */
  renderer = gtk_cell_renderer_text_new ();
-  g_object_set (renderer,
-                "editable", TRUE,
-                NULL);
-  g_signal_connect (renderer, "edited",
-                    G_CALLBACK (cell_edited), items_model);
-  g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (COLUMN_ITEM_PRODUCT));
+  g_signal_connect (G_OBJECT (renderer), "edited",
+		    G_CALLBACK (cell_edited), model);
+  g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_PRODUCT);

  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-                                               -1, "Product", renderer,
-                                               "text", COLUMN_ITEM_PRODUCT,
-                                               NULL);
-
-  /* yummy column */
-  renderer = gtk_cell_renderer_progress_new ();
-  g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (COLUMN_ITEM_YUMMY));
-
-  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-                                               -1, "Yummy", renderer,
-                                               "value", COLUMN_ITEM_YUMMY,
-                                               NULL);
-  
-
+					       -1, "Product", renderer,
+					       "text", COLUMN_PRODUCT,
+					       "editable", COLUMN_EDITABLE,
+					       NULL);
 }

 GtkWidget *
 do_editable_cells (GtkWidget *do_widget)
 {
+  GtkWidget *window = get_cached_widget (do_widget, "do_editable_cells");
+
  if (!window)
    {
      GtkWidget *vbox;
@@ -320,69 +235,66 @@ do_editable_cells (GtkWidget *do_widget)
      GtkWidget *sw;
      GtkWidget *treeview;
      GtkWidget *button;
-      GtkTreeModel *items_model;
-      GtkTreeModel *numbers_model;
+      GtkTreeModel *model;

      /* create window, etc */
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+     gtk_window_set_screen (GTK_WINDOW (window), 
+			     gtk_widget_get_screen (do_widget));
+      cache_widget (window, "do_editable_cells");
      gtk_window_set_title (GTK_WINDOW (window), "Shopping list");
      gtk_container_set_border_width (GTK_CONTAINER (window), 5);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_signal_connect (G_OBJECT (window), "destroy",
+			G_CALLBACK (remove_cached_widget), 
+			"do_editable_cells");

-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+      vbox = gtk_vbox_new (FALSE, 5);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      gtk_box_pack_start (GTK_BOX (vbox),
-                          gtk_label_new ("Shopping list (you can edit the cells!)"),
-                          FALSE, FALSE, 0);
+			  gtk_label_new ("Shopping list (you can edit the cells!)"),
+			  FALSE, FALSE, 0);

      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_ETCHED_IN);
+					   GTK_SHADOW_ETCHED_IN);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_AUTOMATIC);
+				      GTK_POLICY_AUTOMATIC,
+				      GTK_POLICY_AUTOMATIC);
      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);

-      /* create models */
-      items_model = create_items_model ();
-      numbers_model = create_numbers_model ();
+      /* create model */
+      model = create_model ();

      /* create tree view */
-      treeview = gtk_tree_view_new_with_model (items_model);
+      treeview = gtk_tree_view_new_with_model (model);
+      g_object_unref (G_OBJECT (model));
      gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
      gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
-                                   GTK_SELECTION_SINGLE);
+				   GTK_SELECTION_SINGLE);

-      add_columns (GTK_TREE_VIEW (treeview), items_model, numbers_model);
-
-      g_object_unref (numbers_model);
-      g_object_unref (items_model);
+      add_columns (GTK_TREE_VIEW (treeview));

      gtk_container_add (GTK_CONTAINER (sw), treeview);

      /* some buttons */
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
+      hbox = gtk_hbox_new (TRUE, 4);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);

      button = gtk_button_new_with_label ("Add item");
-      g_signal_connect (button, "clicked",
-                        G_CALLBACK (add_item), items_model);
+      g_signal_connect (G_OBJECT (button), "clicked",
+			G_CALLBACK (add_item), model);
      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);

      button = gtk_button_new_with_label ("Remove item");
-      g_signal_connect (button, "clicked",
-                        G_CALLBACK (remove_item), treeview);
+      g_signal_connect (G_OBJECT (button), "clicked",
+			G_CALLBACK (remove_item), treeview);
      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);

      gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
    }

-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
    gtk_widget_show_all (window);
  else
    {
--- a/demos/gtk-demo/entry_buffer.c
+++ b/demos/gtk-demo/entry_buffer.c
@@ -1,68 +0,0 @@
-/* Entry/Entry Buffer
- *
- * GtkEntryBuffer provides the text content in a GtkEntry.
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_entry_buffer (GtkWidget *do_widget)
-{
-  GtkWidget *content_area;
-  GtkWidget *vbox;
-  GtkWidget *label;
-  GtkWidget *entry;
-  GtkEntryBuffer *buffer;
-
-  if (!window)
-  {
-    window = gtk_dialog_new_with_buttons ("GtkEntryBuffer",
-					  GTK_WINDOW (do_widget),
-					  0,
-					  GTK_STOCK_CLOSE,
-					  GTK_RESPONSE_NONE,
-					  NULL);
-    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-    g_signal_connect (window, "response",
-		      G_CALLBACK (gtk_widget_destroy), NULL);
-    g_signal_connect (window, "destroy",
-		      G_CALLBACK (gtk_widget_destroyed), &window);
-
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-
-    label = gtk_label_new (NULL);
-    gtk_label_set_markup (GTK_LABEL (label), "Entries share a buffer. Typing in one is reflected in the other.");
-    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-    /* Create a buffer */
-    buffer = gtk_entry_buffer_new (NULL, 0);
-
-    /* Create our first entry */
-    entry = gtk_entry_new_with_buffer (buffer);
-    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
-
-    /* Create the second entry */
-    entry = gtk_entry_new_with_buffer (buffer);
-    gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE);
-    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
-
-    g_object_unref (buffer);
-  }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
-
-
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -1,100 +0,0 @@
-/* Entry/Entry Completion
- *
- * GtkEntryCompletion provides a mechanism for adding support for
- * completion in GtkEntry.
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-/* Creates a tree model containing the completions */
-GtkTreeModel *
-create_completion_model (void)
-{
-  GtkListStore *store;
-  GtkTreeIter iter;
-  
-  store = gtk_list_store_new (1, G_TYPE_STRING);
-
-  /* Append one word */
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter, 0, "GNOME", -1);
-
-  /* Append another word */
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter, 0, "total", -1);
-
-  /* And another word */
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter, 0, "totally", -1);
-  
-  return GTK_TREE_MODEL (store);
-}
-
-
-GtkWidget *
-do_entry_completion (GtkWidget *do_widget)
-{
-  GtkWidget *content_area;
-  GtkWidget *vbox;
-  GtkWidget *label;
-  GtkWidget *entry;
-  GtkEntryCompletion *completion;
-  GtkTreeModel *completion_model;
-  
-  if (!window)
-  {
-    window = gtk_dialog_new_with_buttons ("GtkEntryCompletion",
-					  GTK_WINDOW (do_widget),
-					  0,
-					  GTK_STOCK_CLOSE,
-					  GTK_RESPONSE_NONE,
-					  NULL);
-    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-    g_signal_connect (window, "response",
-		      G_CALLBACK (gtk_widget_destroy), NULL);
-    g_signal_connect (window, "destroy",
-		      G_CALLBACK (gtk_widget_destroyed), &window);
-
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-
-    label = gtk_label_new (NULL);
-    gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
-    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-    /* Create our entry */
-    entry = gtk_entry_new ();
-    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
-
-    /* Create the completion object */
-    completion = gtk_entry_completion_new ();
-
-    /* Assign the completion to the entry */
-    gtk_entry_set_completion (GTK_ENTRY (entry), completion);
-    g_object_unref (completion);
-    
-    /* Create a tree model and use it as the completion model */
-    completion_model = create_completion_model ();
-    gtk_entry_completion_set_model (completion, completion_model);
-    g_object_unref (completion_model);
-    
-    /* Use model column 0 as the text column */
-    gtk_entry_completion_set_text_column (completion, 0);
-  }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
-
-
--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -1,61 +0,0 @@
-/* Expander
- *
- * GtkExpander allows to provide additional content that is initially hidden.
- * This is also known as "disclosure triangle".
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-
-GtkWidget *
-do_expander (GtkWidget *do_widget)
-{
-  GtkWidget *content_area;
-  GtkWidget *vbox;
-  GtkWidget *label;
-  GtkWidget *expander;
-  
-  if (!window)
-  {
-    window = gtk_dialog_new_with_buttons ("GtkExpander",
-					  GTK_WINDOW (do_widget),
-					  0,
-					  GTK_STOCK_CLOSE,
-					  GTK_RESPONSE_NONE,
-					  NULL);
-    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-    g_signal_connect (window, "response",
-		      G_CALLBACK (gtk_widget_destroy), NULL);
-    g_signal_connect (window, "destroy",
-		      G_CALLBACK (gtk_widget_destroyed), &window);
-
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-
-    label = gtk_label_new ("Expander demo. Click on the triangle for details.");
-    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-    /* Create the expander */
-    expander = gtk_expander_new ("Details");
-    gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
-
-    label = gtk_label_new ("Details can be shown or hidden.");
-    gtk_container_add (GTK_CONTAINER (expander), label);
-  }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
-
-
--- a/demos/gtk-demo/geninclude.pl
+++ b/demos/gtk-demo/geninclude.pl
@@ -0,0 +1,163 @@
+#!/usr/bin/perl -w
+
+print <<EOT;
+typedef	GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);
+
+typedef struct _Demo Demo;
+
+struct _Demo 
+{
+  gchar *title;
+  gchar *filename;
+  GDoDemoFunc func;
+  Demo *children;
+};
+
+EOT
+
+for $file (@ARGV) {
+    my %demo;
+    
+    ($basename = $file) =~ s/\.c$//;
+
+    open INFO_FILE, $file or die "Cannot open '$file'\n";
+    $title = <INFO_FILE>;
+    $title =~ s@^\s*/\*\s*@@;
+    $title =~ s@\s*$@@;
+
+    close INFO_FILE;
+
+    print "GtkWidget *do_$basename (GtkWidget *do_widget);\n";
+
+    push @demos, {"title" => $title, "file" => $file,
+		  "func"  => "do_$basename"};
+}
+
+# generate a list of 'parent names'
+foreach $href (@demos) {
+    if ($href->{"title"} =~ m|^([\w\s]+)/[\w\s]+$|) {
+	my $parent_name = $1;
+	my $do_next = 0;
+
+	# parent detected
+	if (defined @parents) {
+	    foreach $foo (@parents) {
+		if ($foo eq $parent_name) {
+		    $do_next = 1;
+		}
+	    }
+	    
+	    if ($do_next) {
+		next;
+	    }
+	}
+
+	push @parents, $parent_name;
+
+	$tmp = (defined @child_arrays)?($#child_arrays + 1):0;
+	push @child_arrays, "child$tmp";
+
+	push @demos, {"title" => $parent_name, "file" => "NULL",
+		      "func" => "NULL"};
+    }
+}
+
+if (defined @parents) {
+    $i = 0;
+    for ($i = 0; $i <= $#parents; $i++) {
+	$first = 1;
+	
+	print "\nDemo ", $child_arrays[$i], "[] = {\n";
+	
+	$j = 0;
+	for ($j = 0; $j <= $#demos; $j++) {
+	    $href = $demos[$j];
+	    
+	    if (!defined $demos[$j]) {
+		next;
+	    }
+	    
+	    if ($demos[$j]{"title"} =~ m|^$parents[$i]/([\w\s]+)$|) {
+		if ($first) {
+		    $first = 0;
+		} else {
+		    print ",\n";
+		}
+		
+		print qq (  { "$1", "$demos[$j]{file}", $demos[$j]{func}, NULL });
+
+		# hack ... ugly
+		$demos[$j]{"title"} = "foo";
+	    }
+	}
+
+	print ",\n";
+	print qq (  { NULL } );
+	print "\n};\n";
+    }   
+}
+
+# sort @demos
+@demos_old = @demos;
+
+@demos = sort {
+    $a->{"title"} cmp $b->{"title"};
+} @demos_old;
+
+# sort the child arrays
+if (defined @child_arrays) {
+    for ($i = 0; $i <= $#child_arrays; $i++) {
+	@foo_old = @{$child_arrays[$i]};
+
+	@{$child_arrays[$i]} = sort {
+	    $a->{"title"} cmp $b->{"title"};
+	} @foo_old;
+    }
+}
+
+# toplevel
+print "\nDemo testgtk_demos[] = {\n";
+
+$first = 1;
+foreach $href (@demos) {
+    $handled = 0;
+
+    # ugly evil hack
+    if ($href->{title} eq "foo") {
+	next;
+    }
+
+    if ($first) {
+	$first = 0;
+    } else {
+	print ", \n";
+    }
+
+    if (defined @parents) {
+	for ($i = 0; $i <= $#parents; $i++) {
+	    if ($parents[$i] eq $href->{title}) {
+
+		if ($href->{file} eq 'NULL') {
+		    print qq (  { "$href->{title}", NULL, $href->{func}, $child_arrays[$i] });
+		} else {
+		    print qq (  { "$href->{title}", "$href->{file}", $href->{func}, $child_arrays[$i] });
+		}
+		
+		$handled = 1;
+		last;
+	    }
+	}
+    }
+    
+    if ($handled) {
+	next;
+    }
+    
+    print qq (  { "$href->{title}", "$href->{file}", $href->{func}, NULL });
+}
+
+print ",\n";
+print qq (  { NULL } );
+print "\n};\n";
+
+exit 0;
--- a/demos/gtk-demo/geninclude.pl.in
+++ b/demos/gtk-demo/geninclude.pl.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!/usr/bin/perl -w

 print <<EOT;
 typedef	GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);
@@ -35,7 +35,7 @@ for $file (@ARGV) {

 # generate a list of 'parent names'
 foreach $href (@demos) {
-    if ($href->{"title"} =~ m|^([-\w\s]+)/[-\w\s]+$|) {
+    if ($href->{"title"} =~ m|^([\w\s]+)/[\w\s]+$|) {
 	my $parent_name = $1;
 	my $do_next = 0;

@@ -77,7 +77,7 @@ if (defined @parents) {
 		next;
 	    }
 	    
-	    if ($demos[$j]{"title"} =~ m|^$parents[$i]/([-\w\s]+)$|) {
+	    if ($demos[$j]{"title"} =~ m|^$parents[$i]/([\w\s]+)$|) {
 		if ($first) {
 		    $first = 0;
 		} else {
--- a/demos/gtk-demo/gnome-fs-directory.png
+++ b/demos/gtk-demo/gnome-fs-directory.png
--- a/demos/gtk-demo/gnome-fs-regular.png
+++ b/demos/gtk-demo/gnome-fs-regular.png
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -1,317 +0,0 @@
-/* Text Widget/Hypertext
- *
- * Usually, tags modify the appearance of text in the view, e.g. making it 
- * bold or colored or underlined. But tags are not restricted to appearance. 
- * They can also affect the behavior of mouse and key presses, as this demo 
- * shows.
- */
-
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-/* Inserts a piece of text into the buffer, giving it the usual
- * appearance of a hyperlink in a web browser: blue and underlined.
- * Additionally, attaches some data on the tag, to make it recognizable
- * as a link. 
- */
-static void 
-insert_link (GtkTextBuffer *buffer, 
-             GtkTextIter   *iter, 
-             gchar         *text, 
-             gint           page)
-{
-  GtkTextTag *tag;
-  
-  tag = gtk_text_buffer_create_tag (buffer, NULL, 
-                                    "foreground", "blue", 
-                                    "underline", PANGO_UNDERLINE_SINGLE, 
-                                    NULL);
-  g_object_set_data (G_OBJECT (tag), "page", GINT_TO_POINTER (page));
-  gtk_text_buffer_insert_with_tags (buffer, iter, text, -1, tag, NULL);
-}
-
-/* Fills the buffer with text and interspersed links. In any real
- * hypertext app, this method would parse a file to identify the links.
- */
-static void
-show_page (GtkTextBuffer *buffer, 
-           gint           page)
-{
-  GtkTextIter iter;
-
-  gtk_text_buffer_set_text (buffer, "", 0);
-  gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
-  if (page == 1)
-    {
-      gtk_text_buffer_insert (buffer, &iter, "Some text to show that simple ", -1);
-      insert_link (buffer, &iter, "hypertext", 3);
-      gtk_text_buffer_insert (buffer, &iter, " can easily be realized with ", -1);
-      insert_link (buffer, &iter, "tags", 2);
-      gtk_text_buffer_insert (buffer, &iter, ".", -1);
-    }
-  else if (page == 2)
-    {
-      gtk_text_buffer_insert (buffer, &iter, 
-                              "A tag is an attribute that can be applied to some range of text. "
-                              "For example, a tag might be called \"bold\" and make the text inside "
-                              "the tag bold. However, the tag concept is more general than that; "
-                              "tags don't have to affect appearance. They can instead affect the "
-                              "behavior of mouse and key presses, \"lock\" a range of text so the "
-                              "user can't edit it, or countless other things.\n", -1);
-      insert_link (buffer, &iter, "Go back", 1);
-    }
-  else if (page == 3) 
-    {
-      GtkTextTag *tag;
-  
-      tag = gtk_text_buffer_create_tag (buffer, NULL, 
-                                        "weight", PANGO_WEIGHT_BOLD, 
-                                        NULL);
-      gtk_text_buffer_insert_with_tags (buffer, &iter, "hypertext:\n", -1, tag, NULL);
-      gtk_text_buffer_insert (buffer, &iter, 
-                              "machine-readable text that is not sequential but is organized "
-                              "so that related items of information are connected.\n", -1);
-      insert_link (buffer, &iter, "Go back", 1);
-    }
-}
-
-/* Looks at all tags covering the position of iter in the text view, 
- * and if one of them is a link, follow it by showing the page identified
- * by the data attached to it.
- */
-static void
-follow_if_link (GtkWidget   *text_view, 
-                GtkTextIter *iter)
-{
-  GSList *tags = NULL, *tagp = NULL;
-
-  tags = gtk_text_iter_get_tags (iter);
-  for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
-    {
-      GtkTextTag *tag = tagp->data;
-      gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
-
-      if (page != 0)
-        {
-          show_page (gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)), page);
-          break;
-        }
-    }
-
-  if (tags) 
-    g_slist_free (tags);
-}
-
-/* Links can be activated by pressing Enter.
- */
-static gboolean
-key_press_event (GtkWidget *text_view,
-                 GdkEventKey *event)
-{
-  GtkTextIter iter;
-  GtkTextBuffer *buffer;
-
-  switch (event->keyval)
-    {
-      case GDK_KEY_Return: 
-      case GDK_KEY_KP_Enter:
-        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
-        gtk_text_buffer_get_iter_at_mark (buffer, &iter, 
-                                          gtk_text_buffer_get_insert (buffer));
-        follow_if_link (text_view, &iter);
-        break;
-
-      default:
-        break;
-    }
-
-  return FALSE;
-}
-
-/* Links can also be activated by clicking.
- */
-static gboolean
-event_after (GtkWidget *text_view,
-             GdkEvent  *ev)
-{
-  GtkTextIter start, end, iter;
-  GtkTextBuffer *buffer;
-  GdkEventButton *event;
-  gint x, y;
-
-  if (ev->type != GDK_BUTTON_RELEASE)
-    return FALSE;
-
-  event = (GdkEventButton *)ev;
-
-  if (event->button != 1)
-    return FALSE;
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
-
-  /* we shouldn't follow a link if the user has selected something */
-  gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
-  if (gtk_text_iter_get_offset (&start) != gtk_text_iter_get_offset (&end))
-    return FALSE;
-
-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
-                                         GTK_TEXT_WINDOW_WIDGET,
-                                         event->x, event->y, &x, &y);
-
-  gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (text_view), &iter, x, y);
-
-  follow_if_link (text_view, &iter);
-
-  return FALSE;
-}
-
-static gboolean hovering_over_link = FALSE;
-static GdkCursor *hand_cursor = NULL;
-static GdkCursor *regular_cursor = NULL;
-
-/* Looks at all tags covering the position (x, y) in the text view, 
- * and if one of them is a link, change the cursor to the "hands" cursor
- * typically used by web browsers.
- */
-static void
-set_cursor_if_appropriate (GtkTextView    *text_view,
-                           gint            x,
-                           gint            y)
-{
-  GSList *tags = NULL, *tagp = NULL;
-  GtkTextIter iter;
-  gboolean hovering = FALSE;
-
-  gtk_text_view_get_iter_at_location (text_view, &iter, x, y);
-  
-  tags = gtk_text_iter_get_tags (&iter);
-  for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
-    {
-      GtkTextTag *tag = tagp->data;
-      gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
-
-      if (page != 0) 
-        {
-          hovering = TRUE;
-          break;
-        }
-    }
-
-  if (hovering != hovering_over_link)
-    {
-      hovering_over_link = hovering;
-
-      if (hovering_over_link)
-        gdk_window_set_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), hand_cursor);
-      else
-        gdk_window_set_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), regular_cursor);
-    }
-
-  if (tags) 
-    g_slist_free (tags);
-}
-
-/* Update the cursor image if the pointer moved. 
- */
-static gboolean
-motion_notify_event (GtkWidget      *text_view,
-                     GdkEventMotion *event)
-{
-  gint x, y;
-
-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
-                                         GTK_TEXT_WINDOW_WIDGET,
-                                         event->x, event->y, &x, &y);
-
-  set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y);
-
-  gdk_window_get_pointer (gtk_widget_get_window (text_view),
-                          NULL, NULL, NULL);
-  return FALSE;
-}
-
-/* Also update the cursor image if the window becomes visible
- * (e.g. when a window covering it got iconified).
- */
-static gboolean
-visibility_notify_event (GtkWidget          *text_view,
-                         GdkEventVisibility *event)
-{
-  gint wx, wy, bx, by;
-
-  gdk_window_get_pointer (gtk_widget_get_window (text_view),
-                          &wx, &wy, NULL);
-
-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
-                                         GTK_TEXT_WINDOW_WIDGET,
-                                         wx, wy, &bx, &by);
-
-  set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), bx, by);
-
-  return FALSE;
-}
-
-GtkWidget *
-do_hypertext (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *view;
-      GtkWidget *sw;
-      GtkTextBuffer *buffer;
-
-      hand_cursor = gdk_cursor_new (GDK_HAND2);
-      regular_cursor = gdk_cursor_new (GDK_XTERM);
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window),
-                                   450, 450);
-      
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_window_set_title (GTK_WINDOW (window), "Hypertext");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
-      view = gtk_text_view_new ();
-      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
-      g_signal_connect (view, "key-press-event", 
-                        G_CALLBACK (key_press_event), NULL);
-      g_signal_connect (view, "event-after", 
-                        G_CALLBACK (event_after), NULL);
-      g_signal_connect (view, "motion-notify-event", 
-                        G_CALLBACK (motion_notify_event), NULL);
-      g_signal_connect (view, "visibility-notify-event", 
-                        G_CALLBACK (visibility_notify_event), NULL);
-
-      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-      
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-      gtk_container_add (GTK_CONTAINER (sw), view);
-
-      show_page (buffer, 1);
-
-      gtk_widget_show_all (sw);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -1,371 +0,0 @@
-/* Icon View/Icon View Basics
- *
- * The GtkIconView widget is used to display and manipulate icons.
- * It uses a GtkTreeModel for data storage, so the list store
- * example might be helpful.
- */
-
-#include <gtk/gtk.h>
-#include <string.h>
-#include "demo-common.h"
-
-static GtkWidget *window = NULL;
-
-#define FOLDER_NAME "gnome-fs-directory.png"
-#define FILE_NAME "gnome-fs-regular.png"
-
-enum
-{
-  COL_PATH,
-  COL_DISPLAY_NAME,
-  COL_PIXBUF,
-  COL_IS_DIRECTORY,
-  NUM_COLS
-};
-
-
-static GdkPixbuf *file_pixbuf, *folder_pixbuf;
-gchar *parent;
-GtkToolItem *up_button;
-
-/* Loads the images for the demo and returns whether the operation succeeded */
-static gboolean
-load_pixbufs (GError **error)
-{
-  char *filename;
-
-  if (file_pixbuf)
-    return TRUE; /* already loaded earlier */
-
-  /* demo_find_file() looks in the current directory first,
-   * so you can run gtk-demo without installing GTK, then looks
-   * in the location where the file is installed.
-   */
-  filename = demo_find_file (FILE_NAME, error);
-  if (!filename)
-    return FALSE; /* note that "error" was filled in and returned */
-
-  file_pixbuf = gdk_pixbuf_new_from_file (filename, error);
-  g_free (filename);
-
-  if (!file_pixbuf)
-    return FALSE; /* Note that "error" was filled with a GError */
-
-  filename = demo_find_file (FOLDER_NAME, error);
-  if (!filename)
-    return FALSE; /* note that "error" was filled in and returned */
-
-  folder_pixbuf = gdk_pixbuf_new_from_file (filename, error);
-  g_free (filename);
-
-  return TRUE;
-}
-
-static void
-fill_store (GtkListStore *store)
-{
-  GDir *dir;
-  const gchar *name;
-  GtkTreeIter iter;
-
-  /* First clear the store */
-  gtk_list_store_clear (store);
-
-  /* Now go through the directory and extract all the file
-   * information */
-  dir = g_dir_open (parent, 0, NULL);
-  if (!dir)
-    return;
-
-  name = g_dir_read_name (dir);
-  while (name != NULL)
-    {
-      gchar *path, *display_name;
-      gboolean is_dir;
-
-      /* We ignore hidden files that start with a '.' */
-      if (name[0] != '.')
-	{
-	  path = g_build_filename (parent, name, NULL);
-
-	  is_dir = g_file_test (path, G_FILE_TEST_IS_DIR);
-
-	  display_name = g_filename_to_utf8 (name, -1, NULL, NULL, NULL);
-
-	  gtk_list_store_append (store, &iter);
-	  gtk_list_store_set (store, &iter,
-			      COL_PATH, path,
-			      COL_DISPLAY_NAME, display_name,
-			      COL_IS_DIRECTORY, is_dir,
-			      COL_PIXBUF, is_dir ? folder_pixbuf : file_pixbuf,
-			      -1);
-	  g_free (path);
-	  g_free (display_name);
-	}
-
-      name = g_dir_read_name (dir);
-    }
-}
-
-static gint
-sort_func (GtkTreeModel *model,
-	   GtkTreeIter  *a,
-	   GtkTreeIter  *b,
-	   gpointer      user_data)
-{
-  gboolean is_dir_a, is_dir_b;
-  gchar *name_a, *name_b;
-  int ret;
-
-  /* We need this function because we want to sort
-   * folders before files.
-   */
-
-
-  gtk_tree_model_get (model, a,
-		      COL_IS_DIRECTORY, &is_dir_a,
-		      COL_DISPLAY_NAME, &name_a,
-		      -1);
-
-  gtk_tree_model_get (model, b,
-		      COL_IS_DIRECTORY, &is_dir_b,
-		      COL_DISPLAY_NAME, &name_b,
-		      -1);
-
-  if (!is_dir_a && is_dir_b)
-    ret = 1;
-  else if (is_dir_a && !is_dir_b)
-    ret = -1;
-  else
-    {
-      ret = g_utf8_collate (name_a, name_b);
-    }
-
-  g_free (name_a);
-  g_free (name_b);
-
-  return ret;
-}
-
-static GtkListStore *
-create_store (void)
-{
-  GtkListStore *store;
-
-  store = gtk_list_store_new (NUM_COLS,
-			      G_TYPE_STRING,
-			      G_TYPE_STRING,
-			      GDK_TYPE_PIXBUF,
-			      G_TYPE_BOOLEAN);
-
-  /* Set sort column and function */
-  gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store),
-					   sort_func,
-					   NULL, NULL);
-  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
-					GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
-					GTK_SORT_ASCENDING);
-
-  return store;
-}
-
-static void
-item_activated (GtkIconView *icon_view,
-		GtkTreePath *tree_path,
-		gpointer     user_data)
-{
-  GtkListStore *store;
-  gchar *path;
-  GtkTreeIter iter;
-  gboolean is_dir;
-
-  store = GTK_LIST_STORE (user_data);
-
-  gtk_tree_model_get_iter (GTK_TREE_MODEL (store),
-			   &iter, tree_path);
-  gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
-		      COL_PATH, &path,
-		      COL_IS_DIRECTORY, &is_dir,
-		      -1);
-
-  if (!is_dir)
-    {
-      g_free (path);
-      return;
-    }
-
-  /* Replace parent with path and re-fill the model*/
-  g_free (parent);
-  parent = path;
-
-  fill_store (store);
-
-  /* Sensitize the up button */
-  gtk_widget_set_sensitive (GTK_WIDGET (up_button), TRUE);
-}
-
-static void
-up_clicked (GtkToolItem *item,
-	    gpointer     user_data)
-{
-  GtkListStore *store;
-  gchar *dir_name;
-
-  store = GTK_LIST_STORE (user_data);
-
-  dir_name = g_path_get_dirname (parent);
-  g_free (parent);
-
-  parent = dir_name;
-
-  fill_store (store);
-
-  /* Maybe de-sensitize the up button */
-  gtk_widget_set_sensitive (GTK_WIDGET (up_button),
-			    strcmp (parent, "/") != 0);
-}
-
-static void
-home_clicked (GtkToolItem *item,
-	      gpointer     user_data)
-{
-  GtkListStore *store;
-
-  store = GTK_LIST_STORE (user_data);
-
-  g_free (parent);
-  parent = g_strdup (g_get_home_dir ());
-
-  fill_store (store);
-
-  /* Sensitize the up button */
-  gtk_widget_set_sensitive (GTK_WIDGET (up_button),
-			    TRUE);
-}
-
-static void close_window(void)
-{
-  gtk_widget_destroy (window);
-  window = NULL;
-
-  g_object_unref (file_pixbuf);
-  file_pixbuf = NULL;
-
-  g_object_unref (folder_pixbuf);
-  folder_pixbuf = NULL;
-}
-
-GtkWidget *
-do_iconview (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GError *error;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
-
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "GtkIconView demo");
-
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (close_window), NULL);
-
-      error = NULL;
-      if (!load_pixbufs (&error))
-	{
-	  GtkWidget *dialog;
-
-	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-					   GTK_DIALOG_DESTROY_WITH_PARENT,
-					   GTK_MESSAGE_ERROR,
-					   GTK_BUTTONS_CLOSE,
-					   "Failed to load an image: %s",
-					   error->message);
-
-	  g_error_free (error);
-
-	  g_signal_connect (dialog, "response",
-			    G_CALLBACK (gtk_widget_destroy), NULL);
-
-	  gtk_widget_show (dialog);
-	}
-      else
-	{
-	  GtkWidget *sw;
-	  GtkWidget *icon_view;
-	  GtkListStore *store;
-	  GtkWidget *vbox;
-	  GtkWidget *tool_bar;
-	  GtkToolItem *home_button;
-
-	  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-	  gtk_container_add (GTK_CONTAINER (window), vbox);
-
-	  tool_bar = gtk_toolbar_new ();
-	  gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE, 0);
-
-	  up_button = gtk_tool_button_new_from_stock (GTK_STOCK_GO_UP);
-	  gtk_tool_item_set_is_important (up_button, TRUE);
-	  gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
-	  gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), up_button, -1);
-
-	  home_button = gtk_tool_button_new_from_stock (GTK_STOCK_HOME);
-	  gtk_tool_item_set_is_important (home_button, TRUE);
-	  gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), home_button, -1);
-
-
-	  sw = gtk_scrolled_window_new (NULL, NULL);
-	  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-					       GTK_SHADOW_ETCHED_IN);
-	  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-					  GTK_POLICY_AUTOMATIC,
-					  GTK_POLICY_AUTOMATIC);
-
-	  gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
-
-	  /* Create the store and fill it with the contents of '/' */
-	  parent = g_strdup ("/");
-	  store = create_store ();
-	  fill_store (store);
-
-	  icon_view = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store));
-	  gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
-					    GTK_SELECTION_MULTIPLE);
-	  g_object_unref (store);
-
-	  /* Connect to the "clicked" signal of the "Up" tool button */
-	  g_signal_connect (up_button, "clicked",
-			    G_CALLBACK (up_clicked), store);
-
-	  /* Connect to the "clicked" signal of the "Home" tool button */
-	  g_signal_connect (home_button, "clicked",
-			    G_CALLBACK (home_clicked), store);
-
-	  /* We now set which model columns that correspond to the text
-	   * and pixbuf of each item
-	   */
-	  gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), COL_DISPLAY_NAME);
-	  gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_view), COL_PIXBUF);
-
-	  /* Connect to the "item-activated" signal */
-	  g_signal_connect (icon_view, "item-activated",
-			    G_CALLBACK (item_activated), store);
-	  gtk_container_add (GTK_CONTAINER (sw), icon_view);
-
-	  gtk_widget_grab_focus (icon_view);
-	}
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
--- a/demos/gtk-demo/iconview_edit.c
+++ b/demos/gtk-demo/iconview_edit.c
@@ -1,159 +0,0 @@
-/* Icon View/Editing and Drag-and-Drop
- *
- * The GtkIconView widget supports Editing and Drag-and-Drop.
- * This example also demonstrates using the generic GtkCellLayout
- * interface to set up cell renderers in an icon view.
- */
-
-#include <gtk/gtk.h>
-#include <string.h>
-#include "demo-common.h"
-
-static GtkWidget *window = NULL;
-
-enum
-{
-  COL_TEXT,
-  NUM_COLS
-};
-
-
-static void
-fill_store (GtkListStore *store)
-{
-  GtkTreeIter iter;
-  const gchar *text[] = { "Red", "Green", "Blue", "Yellow" };
-  gint i;
-
-  /* First clear the store */
-  gtk_list_store_clear (store);
-
-  for (i = 0; i < 4; i++)
-    {
-      gtk_list_store_append (store, &iter);
-      gtk_list_store_set (store, &iter, COL_TEXT, text[i], -1);
-    }
-}
-
-static GtkListStore *
-create_store (void)
-{
-  GtkListStore *store;
-
-  store = gtk_list_store_new (NUM_COLS, G_TYPE_STRING);
-
-  return store;
-}
-
-static void
-set_cell_color (GtkCellLayout   *cell_layout,
-		GtkCellRenderer *cell,
-		GtkTreeModel    *tree_model,
-		GtkTreeIter     *iter,
-		gpointer         data)
-{
-  gchar *text;
-  GdkColor color;
-  guint32 pixel = 0;
-  GdkPixbuf *pixbuf;
-
-  gtk_tree_model_get (tree_model, iter, COL_TEXT, &text, -1);
-  if (gdk_color_parse (text, &color))
-    pixel =
-      (color.red   >> 8) << 24 |
-      (color.green >> 8) << 16 |
-      (color.blue  >> 8) << 8;
-
-  g_free (text);
-
-  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 24, 24);
-  gdk_pixbuf_fill (pixbuf, pixel);
-
-  g_object_set (cell, "pixbuf", pixbuf, NULL);
-
-  g_object_unref (pixbuf);
-}
-
-static void
-edited (GtkCellRendererText *cell,
-	gchar               *path_string,
-	gchar               *text,
-	gpointer             data)
-{
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-  GtkTreePath *path;
-
-  model = gtk_icon_view_get_model (GTK_ICON_VIEW (data));
-  path = gtk_tree_path_new_from_string (path_string);
-
-  gtk_tree_model_get_iter (model, &iter, path);
-  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-		      COL_TEXT, text, -1);
-
-  gtk_tree_path_free (path);
-}
-
-GtkWidget *
-do_iconview_edit (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *icon_view;
-      GtkListStore *store;
-      GtkCellRenderer *renderer;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Editing and Drag-and-Drop");
-
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-
-      store = create_store ();
-      fill_store (store);
-
-      icon_view = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store));
-      g_object_unref (store);
-
-      gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
-					GTK_SELECTION_SINGLE);
-      gtk_icon_view_set_item_orientation (GTK_ICON_VIEW (icon_view),
-				          GTK_ORIENTATION_HORIZONTAL);
-      gtk_icon_view_set_columns (GTK_ICON_VIEW (icon_view), 2);
-      gtk_icon_view_set_reorderable (GTK_ICON_VIEW (icon_view), TRUE);
-
-      renderer = gtk_cell_renderer_pixbuf_new ();
-      gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_view),
-				  renderer, TRUE);
-      gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (icon_view),
-					  renderer,
-					  set_cell_color,
-					  NULL, NULL);
-
-      renderer = gtk_cell_renderer_text_new ();
-      gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_view),
-				  renderer, TRUE);
-      g_object_set (renderer, "editable", TRUE, NULL);
-      g_signal_connect (renderer, "edited", G_CALLBACK (edited), icon_view);
-      gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (icon_view),
-				      renderer,
-				      "text", COL_TEXT,
-				      NULL);
-
-      gtk_container_add (GTK_CONTAINER (window), icon_view);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -13,15 +13,31 @@
 */

 #include <gtk/gtk.h>
-#include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>
 #include "demo-common.h"

-static GtkWidget *window = NULL;
-static GdkPixbufLoader *pixbuf_loader = NULL;
-static guint load_timeout = 0;
-static FILE* image_stream = NULL;
+
+typedef struct {
+  GdkPixbufLoader *pixbuf_loader;
+  guint load_timeout;
+  FILE* image_stream;
+} ImageVarPerScr;
+
+static ImageVarPerScr * get_image_var (GtkWidget *widget,
+				       gchar	 *key)
+{
+  ImageVarPerScr *tmp = 
+    g_object_get_data (G_OBJECT (gtk_widget_get_screen (widget)),
+		       key);
+  if (tmp)
+    return tmp;
+  
+  tmp = g_new0 (ImageVarPerScr, 1);
+  g_object_set_data (G_OBJECT (gtk_widget_get_screen (widget)),
+		     key, tmp);
+  return tmp;
+}

 static void
 progressive_prepared_callback (GdkPixbufLoader *loader,
@@ -31,14 +47,14 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
  GtkWidget *image;

  image = GTK_WIDGET (data);
-
+  
  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);

  /* Avoid displaying random memory contents, since the pixbuf
   * isn't filled in yet.
   */
  gdk_pixbuf_fill (pixbuf, 0xaaaaaaff);
-
+  
  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
 }

@@ -51,7 +67,7 @@ progressive_updated_callback (GdkPixbufLoader *loader,
                              gpointer	   data)
 {
  GtkWidget *image;
-
+  
  image = GTK_WIDGET (data);

  /* We know the pixbuf inside the GtkImage has changed, but the image
@@ -61,34 +77,34 @@ progressive_updated_callback (GdkPixbufLoader *loader,
   * the pixbuf on the display, then we could queue a draw for only
   * the updated area of the image.
   */
-
+  
  gtk_widget_queue_draw (image);
 }

 static gint
 progressive_timeout (gpointer data)
 {
-  GtkWidget *image;
-
-  image = GTK_WIDGET (data);
+  GtkWidget *image = GTK_WIDGET (data);
+  GtkWidget *window = get_cached_widget (image, "do_images");
+  ImageVarPerScr *i = get_image_var (window, "do_images_var");

  /* This shows off fully-paranoid error handling, so looks scary.
   * You could factor out the error handling code into a nice separate
   * function to make things nicer.
   */
-
-  if (image_stream)
+  
+  if (i->image_stream)
    {
      size_t bytes_read;
      guchar buf[256];
      GError *error = NULL;
+      
+      bytes_read = fread (buf, 1, 256, i->image_stream);

-      bytes_read = fread (buf, 1, 256, image_stream);
-
-      if (ferror (image_stream))
+      if (ferror (i->image_stream))
 	{
 	  GtkWidget *dialog;
-
+	  
 	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
 					   GTK_DIALOG_DESTROY_WITH_PARENT,
 					   GTK_MESSAGE_ERROR,
@@ -99,22 +115,22 @@ progressive_timeout (gpointer data)
 	  g_signal_connect (dialog, "response",
 			    G_CALLBACK (gtk_widget_destroy), NULL);

-	  fclose (image_stream);
-	  image_stream = NULL;
+	  fclose (i->image_stream);
+	  i->image_stream = NULL;

 	  gtk_widget_show (dialog);
-
-	  load_timeout = 0;
+	  
+	  i->load_timeout = 0;

 	  return FALSE; /* uninstall the timeout */
 	}

-      if (!gdk_pixbuf_loader_write (pixbuf_loader,
+      if (!gdk_pixbuf_loader_write (i->pixbuf_loader,
 				    buf, bytes_read,
 				    &error))
 	{
 	  GtkWidget *dialog;
-
+	  
 	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
 					   GTK_DIALOG_DESTROY_WITH_PARENT,
 					   GTK_MESSAGE_ERROR,
@@ -123,68 +139,68 @@ progressive_timeout (gpointer data)
 					   error->message);

 	  g_error_free (error);
-
+	  
 	  g_signal_connect (dialog, "response",
 			    G_CALLBACK (gtk_widget_destroy), NULL);

-	  fclose (image_stream);
-	  image_stream = NULL;
-
+	  fclose (i->image_stream);
+	  i->image_stream = NULL;
+	  
 	  gtk_widget_show (dialog);

-	  load_timeout = 0;
+	  i->load_timeout = 0;

 	  return FALSE; /* uninstall the timeout */
 	}

-      if (feof (image_stream))
+      if (feof (i->image_stream))
 	{
-	  fclose (image_stream);
-	  image_stream = NULL;
+	  fclose (i->image_stream);
+	  i->image_stream = NULL;

 	  /* Errors can happen on close, e.g. if the image
 	   * file was truncated we'll know on close that
 	   * it was incomplete.
 	   */
 	  error = NULL;
-	  if (!gdk_pixbuf_loader_close (pixbuf_loader,
+	  if (!gdk_pixbuf_loader_close (i->pixbuf_loader,
 					&error))
 	    {
 	      GtkWidget *dialog;
-
+	      
 	      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
 					       GTK_DIALOG_DESTROY_WITH_PARENT,
 					       GTK_MESSAGE_ERROR,
 					       GTK_BUTTONS_CLOSE,
 					       "Failed to load image: %s",
 					       error->message);
-
+	      
 	      g_error_free (error);
-
+	      
 	      g_signal_connect (dialog, "response",
 				G_CALLBACK (gtk_widget_destroy), NULL);
-
+	      
 	      gtk_widget_show (dialog);

-	      g_object_unref (pixbuf_loader);
-	      pixbuf_loader = NULL;
-
-	      load_timeout = 0;
-
+	      g_object_unref (G_OBJECT (i->pixbuf_loader));
+	      i->pixbuf_loader = NULL;
+	      
+	      i->load_timeout = 0;
+	      
 	      return FALSE; /* uninstall the timeout */
 	    }
-
-	  g_object_unref (pixbuf_loader);
-	  pixbuf_loader = NULL;
+	  
+	  g_object_unref (G_OBJECT (i->pixbuf_loader));
+	  i->pixbuf_loader = NULL;
 	}
    }
  else
    {
      gchar *filename;
      gchar *error_message = NULL;
-      GError *error = NULL;
+      GError *error = NULL; 

-      /* demo_find_file() looks in the current directory first,
+      /* demo_find_file() looks in the the current directory first,
       * so you can run gtk-demo without installing GTK, then looks
       * in the location where the file is installed.
       */
@@ -196,18 +212,18 @@ progressive_timeout (gpointer data)
 	}
      else
 	{
-	  image_stream = g_fopen (filename, "rb");
+	  i->image_stream = fopen (filename, "r");
 	  g_free (filename);

-	  if (!image_stream)
+	  if (!i->image_stream)
 	    error_message = g_strdup_printf ("Unable to open image file 'alphatest.png': %s",
 					     g_strerror (errno));
 	}

-      if (image_stream == NULL)
+      if (i->image_stream == NULL)
 	{
 	  GtkWidget *dialog;
-
+	  
 	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
 					   GTK_DIALOG_DESTROY_WITH_PARENT,
 					   GTK_MESSAGE_ERROR,
@@ -217,27 +233,27 @@ progressive_timeout (gpointer data)

 	  g_signal_connect (dialog, "response",
 			    G_CALLBACK (gtk_widget_destroy), NULL);
-
+	  
 	  gtk_widget_show (dialog);

-	  load_timeout = 0;
+	  i->load_timeout = 0;

 	  return FALSE; /* uninstall the timeout */
 	}

-      if (pixbuf_loader)
+      if (i->pixbuf_loader)
 	{
-	  gdk_pixbuf_loader_close (pixbuf_loader, NULL);
-	  g_object_unref (pixbuf_loader);
-	  pixbuf_loader = NULL;
+	  gdk_pixbuf_loader_close (i->pixbuf_loader, NULL);
+	  g_object_unref (G_OBJECT (i->pixbuf_loader));
+	  i->pixbuf_loader = NULL;
 	}
-
-      pixbuf_loader = gdk_pixbuf_loader_new ();
-
-      g_signal_connect (pixbuf_loader, "area-prepared",
+      
+      i->pixbuf_loader = gdk_pixbuf_loader_new ();
+      
+      g_signal_connect (G_OBJECT (i->pixbuf_loader), "area_prepared",
 			G_CALLBACK (progressive_prepared_callback), image);
-
-      g_signal_connect (pixbuf_loader, "area-updated",
+      
+      g_signal_connect (G_OBJECT (i->pixbuf_loader), "area_updated",
 			G_CALLBACK (progressive_updated_callback), image);
    }

@@ -255,31 +271,38 @@ start_progressive_loading (GtkWidget *image)
   * The timeout simply simulates a slow data source by inserting
   * pauses in the reading process.
   */
-  load_timeout = gdk_threads_add_timeout (150,
-				progressive_timeout,
-				image);
+  ImageVarPerScr *i = get_image_var (image, "do_images_var");
+  i->load_timeout = g_timeout_add (150,
+				   progressive_timeout,
+				   image);
 }

 static void
-cleanup_callback (GObject   *object,
+cleanup_callback (GtkObject *object,
 		  gpointer   data)
 {
-  if (load_timeout)
+  ImageVarPerScr *i = get_image_var (GTK_WIDGET (object), "do_images_var");
+  g_object_set_data (G_OBJECT (gtk_widget_get_screen (GTK_WIDGET (object))),
+		     "do_images_var", NULL);
+
+  if (i->load_timeout)
    {
-      g_source_remove (load_timeout);
-      load_timeout = 0;
+      g_source_remove (i->load_timeout);
+      i->load_timeout = 0;
+    }
+  
+  if (i->pixbuf_loader)
+    {
+      gdk_pixbuf_loader_close (i->pixbuf_loader, NULL);
+      g_object_unref (G_OBJECT (i->pixbuf_loader));
+      i->pixbuf_loader = NULL;
    }

-  if (pixbuf_loader)
-    {
-      gdk_pixbuf_loader_close (pixbuf_loader, NULL);
-      g_object_unref (pixbuf_loader);
-      pixbuf_loader = NULL;
-    }
+  if (i->image_stream)
+    fclose (i->image_stream);
+  i->image_stream = NULL;

-  if (image_stream)
-    fclose (image_stream);
-  image_stream = NULL;
+  g_free (i);
 }

 static void
@@ -289,7 +312,7 @@ toggle_sensitivity_callback (GtkWidget *togglebutton,
  GtkContainer *container = user_data;
  GList *list;
  GList *tmp;
-
+  
  list = gtk_container_get_children (container);

  tmp = list;
@@ -299,13 +322,13 @@ toggle_sensitivity_callback (GtkWidget *togglebutton,
      if (GTK_WIDGET (tmp->data) != togglebutton)
        gtk_widget_set_sensitive (GTK_WIDGET (tmp->data),
                                  !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton)));
-
+      
      tmp = tmp->next;
    }

  g_list_free (list);
 }
-
+  

 GtkWidget *
 do_images (GtkWidget *do_widget)
@@ -317,25 +340,26 @@ do_images (GtkWidget *do_widget)
  GtkWidget *align;
  GtkWidget *button;
  GdkPixbuf *pixbuf;
-  GIcon     *gicon;
  GError *error = NULL;
  char *filename;
+  GtkWidget *window = get_cached_widget (do_widget, "do_images");

  if (!window)
    {
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
+      gtk_window_set_screen (GTK_WINDOW (window), 
 			     gtk_widget_get_screen (do_widget));
+      cache_widget (window, "do_images");
      gtk_window_set_title (GTK_WINDOW (window), "Images");

-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
      g_signal_connect (window, "destroy",
 			G_CALLBACK (cleanup_callback), NULL);
+      g_signal_connect (window, "destroy",
+			G_CALLBACK (remove_cached_widget), "do_images");

      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+      vbox = gtk_vbox_new (FALSE, 8);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

@@ -343,7 +367,7 @@ do_images (GtkWidget *do_widget)
      gtk_label_set_markup (GTK_LABEL (label),
 			    "<u>Image loaded from a file</u>");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
+      
      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      /* The alignment keeps the frame from growing when users resize
@@ -353,7 +377,7 @@ do_images (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (align), frame);
      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);

-      /* demo_find_file() looks in the current directory first,
+      /* demo_find_file() looks in the the current directory first,
       * so you can run gtk-demo without installing GTK, then looks
       * in the location where the file is installed.
       */
@@ -374,7 +398,7 @@ do_images (GtkWidget *do_widget)
 	   * be displayed instead.
 	   */
 	  GtkWidget *dialog;
-
+	  
 	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
 					   GTK_DIALOG_DESTROY_WITH_PARENT,
 					   GTK_MESSAGE_ERROR,
@@ -382,13 +406,12 @@ do_images (GtkWidget *do_widget)
 					   "Unable to open image file 'gtk-logo-rgb.gif': %s",
 					   error->message);
 	  g_error_free (error);
-
 	  g_signal_connect (dialog, "response",
 			    G_CALLBACK (gtk_widget_destroy), NULL);
-
+	  
 	  gtk_widget_show (dialog);
 	}
-
+	  
      image = gtk_image_new_from_pixbuf (pixbuf);

      gtk_container_add (GTK_CONTAINER (frame), image);
@@ -400,7 +423,7 @@ do_images (GtkWidget *do_widget)
      gtk_label_set_markup (GTK_LABEL (label),
 			    "<u>Animation loaded from a file</u>");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
+      
      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      /* The alignment keeps the frame from growing when users resize
@@ -415,36 +438,16 @@ do_images (GtkWidget *do_widget)
      g_free (filename);

      gtk_container_add (GTK_CONTAINER (frame), image);
-
-      /* Symbolic icon */
-
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-			    "<u>Symbolic themed icon</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      /* The alignment keeps the frame from growing when users resize
-       * the window
-       */
-      align = gtk_alignment_new (0.5, 0.5, 0, 0);
-      gtk_container_add (GTK_CONTAINER (align), frame);
-      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
-
-      gicon = g_themed_icon_new_with_default_fallbacks ("battery-critical-charging-symbolic");
-      image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
-
-      gtk_container_add (GTK_CONTAINER (frame), image);
+      

      /* Progressive */
-
-
+      
+      
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
 			    "<u>Progressive image loading</u>");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
+      
      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      /* The alignment keeps the frame from growing when users resize
@@ -466,12 +469,12 @@ do_images (GtkWidget *do_widget)
      button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);

-      g_signal_connect (button, "toggled",
+      g_signal_connect (G_OBJECT (button), "toggled",
                        G_CALLBACK (toggle_sensitivity_callback),
                        vbox);
    }

-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
    {
      gtk_widget_show_all (window);
    }
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -1,104 +0,0 @@
-/* Info bar
- *
- * Info bar widgets are used to report important messages to the user.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-static void
-on_bar_response (GtkInfoBar *info_bar,
-                 gint        response_id,
-                 gpointer    user_data)
-{
-  GtkWidget *dialog;
-
-  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-				   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-				   GTK_MESSAGE_INFO,
-				   GTK_BUTTONS_OK,
-				   "You clicked a button on an info bar");
-  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                            "Your response has id %d", response_id);
-  gtk_dialog_run (GTK_DIALOG (dialog));
-  gtk_widget_destroy (dialog);
-}
-
-GtkWidget *
-do_infobar (GtkWidget *do_widget)
-{
-  GtkWidget *frame;
-  GtkWidget *bar;
-  GtkWidget *vbox;
-  GtkWidget *vbox2;
-  GtkWidget *label;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Info Bars");
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
-      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO);
-      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO");
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);
-
-      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
-      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING);
-      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING");
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);
-
-      bar = gtk_info_bar_new_with_buttons (GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
-      g_signal_connect (bar, "response", G_CALLBACK (on_bar_response), window);
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
-      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION);
-      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION");
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);
-
-      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
-      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR);
-      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR");
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);
-
-      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
-      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER);
-      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER");
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);
-
-      frame = gtk_frame_new ("Info bars");
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 8);
-
-      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
-      gtk_container_add (GTK_CONTAINER (frame), vbox2);
-
-      /* Standard message dialog */
-      label = gtk_label_new ("An example of different info bars");
-      gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/item_factory.c
+++ b/demos/gtk-demo/item_factory.c
@@ -0,0 +1,124 @@
+/* Item Factory
+ *
+ * The GtkItemFactory object allows the easy creation of menus
+ * from an array of descriptions of menu items.
+ */
+
+#include <gtk/gtk.h>
+#include "demo-common.h"
+
+static void
+gtk_ifactory_cb (gpointer   callback_data,
+		 guint      callback_action,
+		 GtkWidget *widget)
+{
+  g_message ("ItemFactory: activated \"%s\"",
+	     gtk_item_factory_path_from_widget (widget));
+}
+
+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 },
+
+  { "/_Preferences",			NULL, 0,	       0, "<Branch>" },
+  { "/_Preferences/_Color",		NULL, 0,	       0, "<Branch>" },
+  { "/_Preferences/Color/_Red",		NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
+  { "/_Preferences/Color/_Green",	NULL, gtk_ifactory_cb, 0, "/Preferences/Color/Red" },
+  { "/_Preferences/Color/_Blue",	NULL, gtk_ifactory_cb, 0, "/Preferences/Color/Red" },
+  { "/_Preferences/_Shape",		NULL, 0,	       0, "<Branch>" },
+  { "/_Preferences/Shape/_Square",	NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
+  { "/_Preferences/Shape/_Rectangle",	NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Square" },
+  { "/_Preferences/Shape/_Oval",	NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Rectangle" },
+
+  { "/_Help",		 NULL,	       0,		      0, "<LastBranch>" },
+  { "/Help/_About",	 NULL,	       gtk_ifactory_cb,	      0 },
+};
+
+static int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
+
+GtkWidget *
+do_item_factory (GtkWidget *do_widget)
+{
+  GtkWidget *window = get_cached_widget (do_widget, "do_item_factory");
+  
+  if (!window)
+    {
+      GtkWidget *box1;
+      GtkWidget *box2;
+      GtkWidget *separator;
+      GtkWidget *label;
+      GtkWidget *button;
+      GtkAccelGroup *accel_group;
+      GtkItemFactory *item_factory;
+      
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window), 
+			     gtk_widget_get_screen (do_widget));
+      cache_widget (window, "do_item_factory");
+      
+      g_signal_connect (window, "destroy",
+			G_CALLBACK (remove_cached_widget), "do_item_factory");
+      g_signal_connect (window, "delete-event",
+			G_CALLBACK (gtk_true), NULL);
+      
+      accel_group = gtk_accel_group_new ();
+      item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
+      g_object_set_data_full (G_OBJECT (window), "<main>",
+			      item_factory, (GDestroyNotify) g_object_unref);
+      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+      gtk_window_set_title (GTK_WINDOW (window), "Item Factory");
+      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
+      gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, NULL);
+
+      /* preselect /Preferences/Shape/Oval over the other radios
+       */
+      gtk_check_menu_item_set_active
+	(GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory,
+							 "/Preferences/Shape/Oval")),
+	 TRUE);
+
+      box1 = gtk_vbox_new (FALSE, 0);
+      gtk_container_add (GTK_CONTAINER (window), box1);
+      
+      gtk_box_pack_start (GTK_BOX (box1),
+			  gtk_item_factory_get_widget (item_factory, "<main>"),
+			  FALSE, FALSE, 0);
+
+      label = gtk_label_new ("Type\n<alt>\nto start");
+      gtk_widget_set_size_request (label, 200, 200);
+      gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
+      gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);
+
+
+      separator = gtk_hseparator_new ();
+      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+
+
+      box2 = gtk_vbox_new (FALSE, 10);
+      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
+      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
+
+      button = gtk_button_new_with_label ("close");
+      g_signal_connect_swapped (button, "clicked",
+				G_CALLBACK (gtk_widget_destroy), window);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+      gtk_widget_grab_default (button);
+
+      gtk_widget_show_all (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}
--- a/demos/gtk-demo/links.c
+++ b/demos/gtk-demo/links.c
@@ -1,84 +0,0 @@
-/* Links
- *
- * GtkLabel can show hyperlinks. The default action is to call
- * gtk_show_uri() on their URI, but it is possible to override
- * this with a custom handler.
- */
-
-#include <gtk/gtk.h>
-
-static void
-response_cb (GtkWidget *dialog,
-             gint       response_id,
-             gpointer   data)
-{
-  gtk_widget_destroy (dialog);
-}
-
-static gboolean
-activate_link (GtkWidget   *label,
-               const gchar *uri,
-               gpointer     data)
-{
-  if (g_strcmp0 (uri, "keynav") == 0)
-    {
-      GtkWidget *dialog;
-      GtkWidget *parent;
-
-      parent = gtk_widget_get_toplevel (label);
-      dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (parent),
-                 GTK_DIALOG_DESTROY_WITH_PARENT,
-                 GTK_MESSAGE_INFO,
-                 GTK_BUTTONS_OK,
-                 "The term <i>keynav</i> is a shorthand for "
-                 "keyboard navigation and refers to the process of using "
-                 "a program (exclusively) via keyboard input.");
-
-      gtk_window_present (GTK_WINDOW (dialog));
-      g_signal_connect (dialog, "response", G_CALLBACK (response_cb), NULL);
-
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_links (GtkWidget *do_widget)
-{
-  GtkWidget *label;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Links");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 12);
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-
-      label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\""
-                             "title=\"plain text\">text</a> may be marked up\n"
-                             "as hyperlinks, which can be clicked\n"
-                             "or activated via <a href=\"keynav\">keynav</a>");
-      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-      g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL);
-      gtk_container_add (GTK_CONTAINER (window), label);
-      gtk_widget_show (label);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -8,10 +8,7 @@
 */

 #include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-static GtkTreeModel *model = NULL;
-static guint timeout = 0;
+#include "demo-common.h"

 typedef struct
 {
@@ -28,10 +25,6 @@ enum
  COLUMN_NUMBER,
  COLUMN_SEVERITY,
  COLUMN_DESCRIPTION,
-  COLUMN_PULSE,
-  COLUMN_ICON,
-  COLUMN_ACTIVE,
-  COLUMN_SENSITIVE,
  NUM_COLUMNS
 };

@@ -53,33 +46,6 @@ static Bug data[] =
  { FALSE, 1,     "Normal",     "First bug :=)" },
 };

-static gboolean
-spinner_timeout (gpointer data)
-{
-  GtkTreeIter iter;
-  guint pulse;
-
-  if (model == NULL)
-    return FALSE;
-
-  gtk_tree_model_get_iter_first (model, &iter);
-  gtk_tree_model_get (model, &iter,
-                      COLUMN_PULSE, &pulse,
-                      -1);
-  if (pulse == G_MAXUINT)
-    pulse = 0;
-  else
-    pulse++;
-
-  gtk_list_store_set (GTK_LIST_STORE (model),
-                      &iter,
-                      COLUMN_PULSE, pulse,
-                      COLUMN_ACTIVE, TRUE,
-                      -1);
-
-  return TRUE;
-}
-
 static GtkTreeModel *
 create_model (void)
 {
@@ -89,40 +55,21 @@ create_model (void)

  /* create list store */
  store = gtk_list_store_new (NUM_COLUMNS,
-                              G_TYPE_BOOLEAN,
-                              G_TYPE_UINT,
-                              G_TYPE_STRING,
-                              G_TYPE_STRING,
-                              G_TYPE_UINT,
-                              G_TYPE_STRING,
-                              G_TYPE_BOOLEAN,
-                              G_TYPE_BOOLEAN);
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_UINT,
+			      G_TYPE_STRING,
+			      G_TYPE_STRING);

  /* add data to the list store */
  for (i = 0; i < G_N_ELEMENTS (data); i++)
    {
-      gchar *icon_name;
-      gboolean sensitive;
-
-      if (i == 1 || i == 3)
-        icon_name = "battery-critical-charging-symbolic";
-      else
-        icon_name = NULL;
-      if (i == 3)
-        sensitive = FALSE;
-      else
-        sensitive = TRUE;
      gtk_list_store_append (store, &iter);
      gtk_list_store_set (store, &iter,
-                          COLUMN_FIXED, data[i].fixed,
-                          COLUMN_NUMBER, data[i].number,
-                          COLUMN_SEVERITY, data[i].severity,
-                          COLUMN_DESCRIPTION, data[i].description,
-                          COLUMN_PULSE, 0,
-                          COLUMN_ICON, icon_name,
-                          COLUMN_ACTIVE, FALSE,
-                          COLUMN_SENSITIVE, sensitive,
-                          -1);
+			  COLUMN_FIXED, data[i].fixed,
+			  COLUMN_NUMBER, data[i].number,
+			  COLUMN_SEVERITY, data[i].severity,
+			  COLUMN_DESCRIPTION, data[i].description,
+			  -1);
    }

  return GTK_TREE_MODEL (store);
@@ -130,8 +77,8 @@ create_model (void)

 static void
 fixed_toggled (GtkCellRendererToggle *cell,
-               gchar                 *path_str,
-               gpointer               data)
+	       gchar                 *path_str,
+	       gpointer               data)
 {
  GtkTreeModel *model = (GtkTreeModel *)data;
  GtkTreeIter  iter;
@@ -161,112 +108,75 @@ add_columns (GtkTreeView *treeview)

  /* column for fixed toggles */
  renderer = gtk_cell_renderer_toggle_new ();
-  g_signal_connect (renderer, "toggled",
-                    G_CALLBACK (fixed_toggled), model);
+  g_signal_connect (G_OBJECT (renderer), "toggled",
+		    G_CALLBACK (fixed_toggled), model);

  column = gtk_tree_view_column_new_with_attributes ("Fixed?",
-                                                     renderer,
-                                                     "active", COLUMN_FIXED,
-                                                     NULL);
+						     renderer,
+						     "active", COLUMN_FIXED,
+						     NULL);

  /* set this column to a fixed sizing (of 50 pixels) */
  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-                                   GTK_TREE_VIEW_COLUMN_FIXED);
+				   GTK_TREE_VIEW_COLUMN_FIXED);
  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
  gtk_tree_view_append_column (treeview, column);

  /* column for bug numbers */
  renderer = gtk_cell_renderer_text_new ();
  column = gtk_tree_view_column_new_with_attributes ("Bug number",
-                                                     renderer,
-                                                     "text",
-                                                     COLUMN_NUMBER,
-                                                     NULL);
+						     renderer,
+						     "text",
+						     COLUMN_NUMBER,
+						     NULL);
  gtk_tree_view_column_set_sort_column_id (column, COLUMN_NUMBER);
  gtk_tree_view_append_column (treeview, column);

  /* column for severities */
  renderer = gtk_cell_renderer_text_new ();
  column = gtk_tree_view_column_new_with_attributes ("Severity",
-                                                     renderer,
-                                                     "text",
-                                                     COLUMN_SEVERITY,
-                                                     NULL);
+						     renderer,
+						     "text",
+						     COLUMN_SEVERITY,
+						     NULL);
  gtk_tree_view_column_set_sort_column_id (column, COLUMN_SEVERITY);
  gtk_tree_view_append_column (treeview, column);

  /* column for description */
  renderer = gtk_cell_renderer_text_new ();
  column = gtk_tree_view_column_new_with_attributes ("Description",
-                                                     renderer,
-                                                     "text",
-                                                     COLUMN_DESCRIPTION,
-                                                     NULL);
+						     renderer,
+						     "text",
+						     COLUMN_DESCRIPTION,
+						     NULL);
  gtk_tree_view_column_set_sort_column_id (column, COLUMN_DESCRIPTION);
  gtk_tree_view_append_column (treeview, column);
-
-  /* column for spinner */
-  renderer = gtk_cell_renderer_spinner_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Spinning",
-                                                     renderer,
-                                                     "pulse",
-                                                     COLUMN_PULSE,
-                                                     "active",
-                                                     COLUMN_ACTIVE,
-                                                     NULL);
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_PULSE);
-  gtk_tree_view_append_column (treeview, column);
-
-  /* column for symbolic icon */
-  renderer = gtk_cell_renderer_pixbuf_new ();
-  g_object_set (G_OBJECT (renderer), "follow-state", TRUE, NULL);
-  column = gtk_tree_view_column_new_with_attributes ("Symbolic icon",
-                                                     renderer,
-                                                     "icon-name",
-                                                     COLUMN_ICON,
-                                                     "sensitive",
-                                                     COLUMN_SENSITIVE,
-                                                     NULL);
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_ICON);
-  gtk_tree_view_append_column (treeview, column);
-}
-
-static gboolean
-window_closed (GtkWidget *widget,
-               GdkEvent  *event,
-               gpointer   user_data)
-{
-  model = NULL;
-  window = NULL;
-  if (timeout != 0)
-    {
-      g_source_remove (timeout);
-      timeout = 0;
-    }
-  return FALSE;
 }

 GtkWidget *
 do_list_store (GtkWidget *do_widget)
 {
+  GtkWidget *window = get_cached_widget (do_widget, "do_list_store");
+  
  if (!window)
    {
      GtkWidget *vbox;
      GtkWidget *label;
      GtkWidget *sw;
+      GtkTreeModel *model;
      GtkWidget *treeview;

      /* create window, etc */
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "GtkListStore demo");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      gtk_window_set_screen (GTK_WINDOW (window), 
+			     gtk_widget_get_screen (do_widget));
+      cache_widget (window, "do_list_store");
+      g_signal_connect (G_OBJECT (window), "destroy",
+			G_CALLBACK (remove_cached_widget), "do_list_store");
      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+      vbox = gtk_vbox_new (FALSE, 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
@@ -274,10 +184,10 @@ do_list_store (GtkWidget *do_widget)

      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_ETCHED_IN);
+					   GTK_SHADOW_ETCHED_IN);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_NEVER,
-                                      GTK_POLICY_AUTOMATIC);
+				      GTK_POLICY_NEVER,
+				      GTK_POLICY_AUTOMATIC);
      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);

      /* create tree model */
@@ -287,9 +197,9 @@ do_list_store (GtkWidget *do_widget)
      treeview = gtk_tree_view_new_with_model (model);
      gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
      gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview),
-                                       COLUMN_DESCRIPTION);
+				       COLUMN_DESCRIPTION);

-      g_object_unref (model);
+      g_object_unref (G_OBJECT (model));

      gtk_container_add (GTK_CONTAINER (sw), treeview);

@@ -298,27 +208,14 @@ do_list_store (GtkWidget *do_widget)

      /* finish & show */
      gtk_window_set_default_size (GTK_WINDOW (window), 280, 250);
-      g_signal_connect (window, "delete-event",
-                        G_CALLBACK (window_closed), NULL);
    }

-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-      if (timeout == 0) {
-        /* FIXME this should use the animation-duration instead */
-        timeout = g_timeout_add (80, spinner_timeout, NULL);
-      }
-    }
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show_all (window);
  else
    {
      gtk_widget_destroy (window);
      window = NULL;
-      if (timeout != 0)
-        {
-          g_source_remove (timeout);
-          timeout = 0;
-        }
    }

  return window;
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -1,17 +1,17 @@
-#include "config.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

 #include <gtk/gtk.h>
-#include <glib/gstdio.h>

-#include "demos.h"
+#include <demos.h>

 static GtkTextBuffer *info_buffer;
 static GtkTextBuffer *source_buffer;

+GtkWidget *notebook;
+
 static gchar *current_file = NULL;


@@ -19,7 +19,7 @@ enum {
  TITLE_COLUMN,
  FILENAME_COLUMN,
  FUNC_COLUMN,
-  STYLE_COLUMN,
+  ITALIC_COLUMN,
  NUM_COLUMNS
 };

@@ -30,31 +30,6 @@ struct _CallbackData
  GtkTreePath *path;
 };

-#ifdef G_OS_WIN32
-
-#undef DEMOCODEDIR
-
-static char *
-get_democodedir (void)
-{
-  static char *result = NULL;
-
-  if (result == NULL)
-    {
-      result = g_win32_get_package_installation_directory_of_module (NULL);
-      if (result == NULL)
-	result = "unknown-location";
-
-      result = g_strconcat (result, "\\share\\gtk-2.0\\demo", NULL);
-    }
-
-  return result;
-}
-
-#define DEMOCODEDIR get_democodedir ()
-
-#endif
-
 /**
 * demo_find_file:
 * @base: base filename
@@ -70,10 +45,9 @@ gchar *
 demo_find_file (const char *base,
 		GError    **err)
 {
-  g_return_val_if_fail (err == NULL || *err == NULL, NULL);
+  g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
  
-  if (g_file_test ("gtk-logo-rgb.gif", G_FILE_TEST_EXISTS) &&
-      g_file_test (base, G_FILE_TEST_EXISTS))
+  if (g_file_test (base, G_FILE_TEST_EXISTS))
    return g_strdup (base);
  else
    {
@@ -89,20 +63,76 @@ demo_find_file (const char *base,
    }
 }

+/**
+ * get_cached_widget:
+ * @widget: a widget on the same screen as the demo_widget.
+ * @key: a string representing the cache key.
+ *
+ * Check is the widget is cached on this screen
+ *
+ * Return value: widget is present returns the widget,
+ *		 NULL otherwise
+ */
+
+GtkWidget * get_cached_widget (GtkWidget *widget,
+			       gchar     *key)
+{
+  GdkScreen *screen;
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+  screen = gtk_widget_get_screen (widget);
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+  
+  return g_object_get_data (G_OBJECT (screen), key);
+}
+void  cache_widget (GtkWidget *widget,
+			 gchar     *key)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  g_object_set_data (G_OBJECT (gtk_widget_get_screen (widget)),
+		     key, widget);
+}
+
+gpointer get_cached_pointer (GtkWidget *widget,
+			     gchar     *key)
+{
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+  
+  return g_object_get_data (G_OBJECT (gtk_widget_get_screen (widget)), key);
+}
+void  cache_pointer (GtkWidget *widget,
+		     gchar     *key,
+		     gpointer  data)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  g_object_set_data (G_OBJECT (gtk_widget_get_screen (widget)),
+		     key, data);
+}
+
+void remove_cached_widget (GtkWidget *widget, gchar *key)
+{
+  g_object_set_data (G_OBJECT (gtk_widget_get_screen (widget)),
+		     key, NULL);
+}
+  
+
+
+
 static void
 window_closed_cb (GtkWidget *window, gpointer data)
 {
  CallbackData *cbdata = data;
  GtkTreeIter iter;
-  PangoStyle style;
+  gboolean italic;

  gtk_tree_model_get_iter (cbdata->model, &iter, cbdata->path);
  gtk_tree_model_get (GTK_TREE_MODEL (cbdata->model), &iter,
-		      STYLE_COLUMN, &style,
+		      ITALIC_COLUMN, &italic,
 		      -1);
-  if (style == PANGO_STYLE_ITALIC)
+  if (italic)
    gtk_tree_store_set (GTK_TREE_STORE (cbdata->model), &iter,
-			STYLE_COLUMN, PANGO_STYLE_NORMAL,
+			ITALIC_COLUMN, !italic,
 			-1);

  gtk_tree_path_free (cbdata->path);
@@ -114,7 +144,7 @@ read_line (FILE *stream, GString *str)
 {
  int n_read = 0;
  
-#ifdef HAVE_FLOCKFILE
+#ifndef G_OS_WIN32
  flockfile (stream);
 #endif

@@ -124,7 +154,7 @@ read_line (FILE *stream, GString *str)
    {
      int c;
      
-#ifdef HAVE_FLOCKFILE
+#ifndef G_OS_WIN32
      c = getc_unlocked (stream);
 #else
      c = getc (stream);
@@ -140,7 +170,7 @@ read_line (FILE *stream, GString *str)
 	case '\r':
 	case '\n':
 	  {
-#ifdef HAVE_FLOCKFILE
+#ifndef G_OS_WIN32
 	    int next_c = getc_unlocked (stream);
 #else
 	    int next_c = getc (stream);
@@ -160,7 +190,7 @@ read_line (FILE *stream, GString *str)

 done:

-#ifdef HAVE_FLOCKFILE
+#ifndef G_OS_WIN32
  funlockfile (stream);
 #endif

@@ -195,12 +225,11 @@ static gchar *types[] =
  "const ",
  "void",
  "gint",
-  " int ",
-  " char ",
+  "int ",
+  "char ",
  "gchar ",
  "gfloat",
  "float",
-  "double",
  "gint8",
  "gint16",
  "gint32",
@@ -223,6 +252,7 @@ static gchar *types[] =
  "FALSE",
  "TRUE",
  "FILE ",
+  "GtkObject ",
  "GtkColorSelection ",
  "GtkWidget ",
  "GtkButton ",
@@ -234,87 +264,6 @@ static gchar *types[] =
  "GdkPixbuf ",
  "GError",
  "size_t",
-  "GtkAboutDialog ",
-  "GtkAction ",
-  "GtkActionEntry ",
-  "GtkRadioActionEntry ",
-  "GtkIconFactory ",
-  "GtkStockItem ",
-  "GtkIconSet ",
-  "GtkTextBuffer ",
-  "GtkStatusbar ",
-  "GtkTextIter ",
-  "GtkTextMark ",
-  "GdkEventWindowState ",
-  "GtkActionGroup ",
-  "GtkUIManager ",
-  "GtkRadioAction ",
-  "GtkActionClass ",
-  "GtkToggleActionEntry ",
-  "GtkAssistant ",
-  "GtkBuilder ",
-  "GtkSizeGroup ",
-  "GtkTreeModel ",
-  "GtkTreeSelection ",
-  "GdkDisplay ",
-  "GdkScreen ",
-  "GdkWindow ",
-  "GdkEventButton ",
-  "GdkCursor ",
-  "GtkTreeIter ",
-  "GtkTreeViewColumn ",
-  "GdkDisplayManager ",
-  "GtkClipboard ",
-  "GtkIconSize ",
-  "GtkImage ",
-  "GdkDragContext ",
-  "GtkSelectionData ",
-  "GtkDialog ",
-  "GtkMenuItem ",
-  "GtkListStore ",
-  "GtkCellLayout ",
-  "GtkCellRenderer ",
-  "GtkTreePath ",
-  "GtkTreeStore ",
-  "GtkEntry ",
-  "GtkEditable ",
-  "GtkEditableInterface ",
-  "GdkPixmap ",
-  "GdkEventConfigure ",
-  "GdkEventMotion ",
-  "GdkModifierType ",
-  "GtkEntryCompletion ",
-  "GtkToolItem ",
-  "GDir ",
-  "GtkIconView ",
-  "GtkCellRendererText ",
-  "GtkContainer ",
-  "GtkAccelGroup ",
-  "GtkPaned ",
-  "GtkPrintOperation ",
-  "GtkPrintContext ",
-  "cairo_t ",
-  "PangoLayout "
-  "PangoFontDescription ",
-  "PangoRenderer ",
-  "PangoMatrix ",
-  "PangoContext ",
-  "PangoLayout ",
-  "GtkTable ",
-  "GtkToggleButton ",
-  "GString ",
-  "GtkIconSize ",
-  "GtkTreeView ",
-  "GtkTextTag ",
-  "GdkEvent ",
-  "GdkEventKey ",
-  "GtkTextView ",
-  "GdkEventVisibility ",
-  "GdkBitmap ",
-  "GtkTextChildAnchor ",
-  "GArray ",
-  "GtkCellEditable ",
-  "GtkCellRendererToggle ",
  NULL
 };

@@ -389,8 +338,7 @@ parse_chars (gchar     *text,
    }
  /* check for types */
  for (i = 0; types[i] != NULL; i++)
-    if (!strncmp (text, types[i], strlen (types[i])) ||
-        (start && types[i][0] == ' ' && !strncmp (text, types[i] + 1, strlen (types[i]) - 1)))
+    if (!strncmp (text, types[i], strlen (types[i])))
      {
 	*end_ptr = text + strlen (types[i]);
 	*tag = "type";
@@ -469,7 +417,7 @@ parse_chars (gchar     *text,

 /* While not as cool as c-mode, this will do as a quick attempt at highlighting */
 static void
-fontify (void)
+fontify ()
 {
  GtkTextIter start_iter, next_iter, tmp_iter;
  gint state;
@@ -548,7 +496,7 @@ load_file (const gchar *filename)
      return;
    }

-  file = g_fopen (full_filename, "r");
+  file = fopen (full_filename, "r");

  if (!file)
    g_warning ("Cannot open %s: %s\n", full_filename, g_strerror (errno));
@@ -657,8 +605,6 @@ load_file (const gchar *filename)
 	}
    }

-  fclose (file);
-  
  fontify ();

  g_string_free (buffer, TRUE);
@@ -670,7 +616,7 @@ row_activated_cb (GtkTreeView       *tree_view,
 		  GtkTreeViewColumn *column)
 {
  GtkTreeIter iter;
-  PangoStyle style;
+  gboolean italic;
  GDoDemoFunc func;
  GtkWidget *window;
  GtkTreeModel *model;
@@ -681,16 +627,16 @@ row_activated_cb (GtkTreeView       *tree_view,
  gtk_tree_model_get (GTK_TREE_MODEL (model),
 		      &iter,
 		      FUNC_COLUMN, &func,
-		      STYLE_COLUMN, &style,
+		      ITALIC_COLUMN, &italic,
 		      -1);

  if (func)
    {
      gtk_tree_store_set (GTK_TREE_STORE (model),
 			  &iter,
-			  STYLE_COLUMN, (style == PANGO_STYLE_ITALIC ? PANGO_STYLE_NORMAL : PANGO_STYLE_ITALIC),
+			  ITALIC_COLUMN, !italic,
 			  -1);
-      window = (func) (gtk_widget_get_toplevel (GTK_WIDGET (tree_view)));
+      window = (func) (GTK_WIDGET (tree_view));
      
      if (window != NULL)
 	{
@@ -750,8 +696,8 @@ create_text (GtkTextBuffer **buffer,
  
  if (is_source)
    {
-      font_desc = pango_font_description_from_string ("monospace");
-      gtk_widget_override_font (text_view, font_desc);
+      font_desc = pango_font_description_from_string ("Courier 12");
+      gtk_widget_modify_font (text_view, font_desc);
      pango_font_description_free (font_desc);

      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view),
@@ -780,11 +726,10 @@ create_tree (void)
  GtkTreeViewColumn *column;
  GtkTreeStore *model;
  GtkTreeIter iter;
-  GtkWidget *box, *label, *scrolled_window;

  Demo *d = testgtk_demos;

-  model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT);
+  model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
  tree_view = gtk_tree_view_new ();
  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (model));
  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
@@ -807,7 +752,7 @@ create_tree (void)
 			  TITLE_COLUMN, d->title,
 			  FILENAME_COLUMN, d->filename,
 			  FUNC_COLUMN, d->func,
-			  STYLE_COLUMN, PANGO_STYLE_NORMAL,
+			  ITALIC_COLUMN, FALSE,
 			  -1);

      d++;
@@ -826,7 +771,7 @@ create_tree (void)
 			      TITLE_COLUMN, children->title,
 			      FILENAME_COLUMN, children->filename,
 			      FUNC_COLUMN, children->func,
-			      STYLE_COLUMN, PANGO_STYLE_NORMAL,
+			      ITALIC_COLUMN, FALSE,
 			      -1);
 	  
 	  children++;
@@ -835,40 +780,24 @@ create_tree (void)

  cell = gtk_cell_renderer_text_new ();

+  g_object_set (G_OBJECT (cell),
+                "style", PANGO_STYLE_ITALIC,
+                NULL);
+  
  column = gtk_tree_view_column_new_with_attributes ("Widget (double click for demo)",
 						     cell,
 						     "text", TITLE_COLUMN,
-						     "style", STYLE_COLUMN,
+						     "style_set", ITALIC_COLUMN,
 						     NULL);
  
  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
 			       GTK_TREE_VIEW_COLUMN (column));

-  gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter);
-  gtk_tree_selection_select_iter (GTK_TREE_SELECTION (selection), &iter);
-
  g_signal_connect (selection, "changed", G_CALLBACK (selection_cb), model);
  g_signal_connect (tree_view, "row_activated", G_CALLBACK (row_activated_cb), model);

-  gtk_tree_view_collapse_all (GTK_TREE_VIEW (tree_view));
-  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
-  				    
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-				  GTK_POLICY_NEVER,
-				  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
-
-  label = gtk_label_new ("Widget (double click for demo)");
-
-  box = gtk_notebook_new ();
-  gtk_notebook_append_page (GTK_NOTEBOOK (box), scrolled_window, label);
-
-  gtk_widget_grab_focus (tree_view);
-
-   g_object_unref (model);
-
-  return box;
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
+  return tree_view;
 }

 static void
@@ -919,8 +848,8 @@ setup_default_icon (void)
      list = g_list_append (list, transparent);
      gtk_window_set_default_icon_list (list);
      g_list_free (list);
-      g_object_unref (pixbuf);
-      g_object_unref (transparent);
+      g_object_unref (G_OBJECT (pixbuf));
+      g_object_unref (G_OBJECT (transparent));
    }
 }

@@ -928,7 +857,6 @@ int
 main (int argc, char **argv)
 {
  GtkWidget *window;
-  GtkWidget *notebook;
  GtkWidget *hbox;
  GtkWidget *tree;
  GtkTextTag *tag;
@@ -940,8 +868,8 @@ main (int argc, char **argv)
  if (g_file_test ("../../gdk-pixbuf/libpixbufloader-pnm.la",
                   G_FILE_TEST_EXISTS))
    {
-      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/loaders.cache", TRUE);
-      g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/immodules.cache", TRUE);
+      putenv ("GDK_PIXBUF_MODULEDIR=../../gdk-pixbuf");
+      putenv ("GTK_IM_MODULE_FILE=../../modules/input/gtk.immodules");
    }
  /* -- End of hack -- */
  
@@ -951,10 +879,10 @@ main (int argc, char **argv)
  
  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
  gtk_window_set_title (GTK_WINDOW (window), "GTK+ Code Demos");
-  g_signal_connect_after (window, "destroy",
+  g_signal_connect (window, "destroy",
 		    G_CALLBACK (gtk_main_quit), NULL);

-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  hbox = gtk_hbox_new (FALSE, 0);
  gtk_container_add (GTK_CONTAINER (window), hbox);

  tree = create_tree ();
@@ -967,18 +895,15 @@ main (int argc, char **argv)
 			    create_text (&info_buffer, FALSE),
 			    gtk_label_new_with_mnemonic ("_Info"));

-  tag = gtk_text_buffer_create_tag (info_buffer, "title",
-                                    "font", "Sans 18",
-                                    NULL);
-   g_object_unref (info_buffer);
-
  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
 			    create_text (&source_buffer, TRUE),
 			    gtk_label_new_with_mnemonic ("_Source"));

-
+  tag = gtk_text_buffer_create_tag (info_buffer, "title",
+                                    "font", "Sans 18",
+                                    NULL);
  tag = gtk_text_buffer_create_tag (source_buffer, "comment",
-				    "foreground", "DodgerBlue",
+				    "foreground", "red",
                                    NULL);
  tag = gtk_text_buffer_create_tag (source_buffer, "type",
 				    "foreground", "ForestGreen",
@@ -998,7 +923,6 @@ main (int argc, char **argv)
 				    "weight", PANGO_WEIGHT_BOLD,
 				    "foreground", "DarkGoldenrod4",
                                    NULL);
-   g_object_unref (source_buffer);
  
  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
  gtk_widget_show_all (window);
--- a/demos/gtk-demo/makefile.msc.in
+++ b/demos/gtk-demo/makefile.msc.in
@@ -14,15 +14,15 @@ PERL = perl
 ################################################################

 # Possibly override versions from build/win32/module.defs
-GTK_VER = 2.0
-GDK_PIXBUF_VER = 2.0
+GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
+GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@

 GDK_LIBS = ../../gdk/gdk-win32-$(GTK_VER).lib
 GTK_LIBS = ../../gtk/gtk-win32-$(GTK_VER).lib
 GDK_PIXBUF_LIBS = ../../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib

 INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ../.. -I ../../gdk -I ../../gdk-pixbuf -I ../../gtk
-DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS)
+DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS)
 LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
 DEFINES = -DG_LOG_DOMAIN=\"GtkDemo\" -DGTK_VERSION=\"$(GTK_VER)\" \
 	-DDEMOCODEDIR=\".\"
@@ -38,27 +38,20 @@ all :	\
 DEMOS = \
 	appwindow.c	\
 	button_box.c	\
-	clipboard.c	\
 	colorsel.c	\
-	dialog.c		\
+	dialog.c	\
 	drawingarea.c	\
-	editable_cells.c	\
-	entry_completion.c	\
-	expander.c	\
-	hypertext.c	\
-	iconview.c	\
-	images.c		\
+	editable_cells.c \
+	images.c	\
+	item_factory.c	\
 	list_store.c	\
 	menus.c		\
 	panes.c		\
-	pixbufs.c		\
-	rotated_text.c	\
+	pixbufs.c	\
 	sizegroup.c	\
 	stock_browser.c	\
 	textview.c	\
 	tree_store.c	\
-	ui_manager.c	\
-

 demos.h: $(DEMOS) geninclude.pl
 	$(PERL) geninclude.pl $(DEMOS) > demos.h
@@ -66,30 +59,22 @@ demos.h: $(DEMOS) geninclude.pl
 OBJECTS = \
 	appwindow.obj	\
 	button_box.obj	\
-	changedisplay.obj	\
-	clipboard.obj	\
 	colorsel.obj	\
 	dialog.obj	\
 	drawingarea.obj	\
-	editable_cells.obj	\
-	entry_completion.obj	\
-	expander.obj	\
-	hypertext.obj	\
-	iconview.obj	\
+	editable_cells.obj \
 	images.obj	\
+	item_factory.obj	\
 	list_store.obj	\
 	menus.obj		\
 	panes.obj		\
 	pixbufs.obj	\
-	rotated_text.obj \
 	sizegroup.obj	\
 	stock_browser.obj	\
 	textview.obj	\
 	tree_store.obj	\
-	ui_manager.obj	\
 	main.obj \

 gtk-demo.exe : demos.h $(OBJECTS)
-	$(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \
-	$(CAIRO_LIBS) $(PANGOCAIRO_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+	$(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)

--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -1,12 +1,12 @@
 /* Menus
 *
 * There are several widgets involved in displaying menus. The
- * GtkMenuBar widget is a menu bar, which normally appears horizontally
- * at the top of an application, but can also be layed out vertically.
- * The GtkMenu widget is the actual menu that pops up. Both GtkMenuBar
- * and GtkMenu are subclasses of GtkMenuShell; a GtkMenuShell contains
- * menu items (GtkMenuItem). Each menu item contains text and/or images
- * and can be selected by the user.
+ * GtkMenuBar widget is a horizontal menu bar, which normally appears
+ * at the top of an application. The GtkMenu widget is the actual menu
+ * that pops up. Both GtkMenuBar and GtkMenu are subclasses of
+ * GtkMenuShell; a GtkMenuShell contains menu items
+ * (GtkMenuItem). Each menu item contains text and/or images and can
+ * be selected by the user.
 *
 * There are several kinds of menu item, including plain GtkMenuItem,
 * GtkCheckMenuItem which can be checked/unchecked, GtkRadioMenuItem
@@ -19,15 +19,19 @@
 * up when the menu item is selected. Typically, all menu items in a menu bar
 * have submenus.
 *
- * GtkUIManager provides a higher-level interface for creating menu bars
+ * The GtkOptionMenu widget is a button that pops up a GtkMenu when clicked.
+ * It's used inside dialogs and such.
+ *
+ * GtkItemFactory provides a higher-level interface for creating menu bars
 * and menus; while you can construct menus manually, most people don't
- * do that. There's a separate demo for GtkUIManager.
+ * do that. There's a separate demo for GtkItemFactory.
+ * 
 */

 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-
 #include <stdio.h>
+#include "demo-common.h"

 static GtkWidget *
 create_menu (gint     depth,
@@ -69,102 +73,54 @@ create_menu (gint     depth,
  return menu;
 }

-static void
-change_orientation (GtkWidget *button,
-                    GtkWidget *menubar)
-{
-  GtkWidget *parent;
-  GtkWidget *box = NULL;
-
-  parent = gtk_widget_get_parent (menubar);
-
-  if (GTK_IS_VBOX (parent))
-    {
-      box = gtk_widget_get_parent (parent);
-
-      g_object_ref (menubar);
-      gtk_container_remove (GTK_CONTAINER (parent), menubar);
-      gtk_container_add (GTK_CONTAINER (box), menubar);
-      gtk_box_reorder_child (GTK_BOX (box), menubar, 0);
-      g_object_unref (menubar);
-      g_object_set (menubar, 
-		    "pack-direction", GTK_PACK_DIRECTION_TTB,
-		    NULL);
-    }
-  else
-    {
-      GList *children, *l;
-
-      children = gtk_container_get_children (GTK_CONTAINER (parent));
-      for (l = children; l; l = l->next)
-	{
-	  if (GTK_IS_VBOX (l->data))
-	    {
-	      box = l->data;
-	      break;
-	    }
-	}
-      g_list_free (children);
-
-      g_object_ref (menubar);
-      gtk_container_remove (GTK_CONTAINER (parent), menubar);
-      gtk_container_add (GTK_CONTAINER (box), menubar);
-      gtk_box_reorder_child (GTK_BOX (box), menubar, 0);
-      g_object_unref (menubar);
-      g_object_set (menubar, 
-		    "pack-direction", GTK_PACK_DIRECTION_LTR,
-		    NULL);
-    }
-}
-
-static GtkWidget *window = NULL;
-
 GtkWidget *
 do_menus (GtkWidget *do_widget)
 {
-  GtkWidget *box;
+  GtkWidget *window = get_cached_widget (do_widget, "do_menus");
  GtkWidget *box1;
  GtkWidget *box2;
  GtkWidget *button;
-
+  GtkWidget *optionmenu;
+  GtkWidget *separator;
+  
  if (!window)
    {
      GtkWidget *menubar;
      GtkWidget *menu;
      GtkWidget *menuitem;
      GtkAccelGroup *accel_group;
-
+      
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
+      gtk_window_set_screen (GTK_WINDOW (window), 
 			     gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Menus");
+      cache_widget (window, "do_menus");
      g_signal_connect (window, "destroy",
-			G_CALLBACK(gtk_widget_destroyed), &window);
-
+			G_CALLBACK(remove_cached_widget), "do_menus");
+      g_signal_connect (window, "delete-event",
+			G_CALLBACK (gtk_true), NULL);
+      
      accel_group = gtk_accel_group_new ();
      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);

+      gtk_window_set_title (GTK_WINDOW (window), "menus");
      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), box);
-      gtk_widget_show (box);
-
-      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (box), box1);
+      
+      
+      box1 = gtk_vbox_new (FALSE, 0);
+      gtk_container_add (GTK_CONTAINER (window), box1);
      gtk_widget_show (box1);
-
+      
      menubar = gtk_menu_bar_new ();
      gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE, 0);
      gtk_widget_show (menubar);
-
+      
      menu = create_menu (2, TRUE);
-
+      
      menuitem = gtk_menu_item_new_with_label ("test\nline2");
      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
      gtk_widget_show (menuitem);
-
+      
      menuitem = gtk_menu_item_new_with_label ("foo");
      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (3, TRUE));
      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
@@ -175,28 +131,78 @@ do_menus (GtkWidget *do_widget)
      gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE);
      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
      gtk_widget_show (menuitem);
+      
+      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);
+      
+      menu = create_menu (1, FALSE);
+      gtk_menu_set_accel_group (GTK_MENU (menu), accel_group);
+      
+      menuitem = gtk_separator_menu_item_new ();
+      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);
+      gtk_widget_add_accelerator (menuitem,
+				  "activate",
+				  accel_group,
+				  GDK_F1,
+				  0,
+				  GTK_ACCEL_VISIBLE);
+      menuitem = gtk_check_menu_item_new_with_label ("Accelerator Locked");
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+      gtk_widget_show (menuitem);
+      gtk_widget_add_accelerator (menuitem,
+				  "activate",
+				  accel_group,
+				  GDK_F2,
+				  0,
+				  GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED);
+      menuitem = gtk_check_menu_item_new_with_label ("Accelerators Frozen");
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+      gtk_widget_show (menuitem);
+      gtk_widget_add_accelerator (menuitem,
+				  "activate",
+				  accel_group,
+				  GDK_F2,
+				  0,
+				  GTK_ACCEL_VISIBLE);
+      gtk_widget_add_accelerator (menuitem,
+				  "activate",
+				  accel_group,
+				  GDK_F3,
+				  0,
+				  GTK_ACCEL_VISIBLE);
+      
+      optionmenu = gtk_option_menu_new ();
+      gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
+      gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), 3);
+      gtk_box_pack_start (GTK_BOX (box2), optionmenu, TRUE, TRUE, 0);
+      gtk_widget_show (optionmenu);

-      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
+      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 ("Flip");
-      g_signal_connect (button, "clicked",
-			G_CALLBACK (change_orientation), menubar);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      gtk_widget_show (button);
-
-      button = gtk_button_new_with_label ("Close");
+      button = gtk_button_new_with_label ("close");
      g_signal_connect_swapped (button, "clicked",
 				G_CALLBACK(gtk_widget_destroy), window);
      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      gtk_widget_set_can_default (button, TRUE);
+      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
      gtk_widget_grab_default (button);
      gtk_widget_show (button);
    }

-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
    {
      gtk_widget_show (window);
    }
--- a/demos/gtk-demo/movedemo.c
+++ b/demos/gtk-demo/movedemo.c
@@ -0,0 +1,226 @@
+/* Multihead Support/Move Demo
+ * 
+ * Demostrates a way of recreating a widget tree from a top level window
+ * to either a other screen of the same display or a different display.
+ *
+ */
+#include <gtk/gtk.h>
+#include "demo-common.h"
+
+static GtkWidget *window = NULL;
+
+typedef struct
+{
+  GtkEntry *entry;
+  GtkWidget *radio_dpy;
+  GtkWidget *toplevel;
+  GtkWidget *dialog_window;
+  GList *valid_display_list;
+}
+ScreenDisplaySelection;
+
+/* Create a new toplevel and reparent  */
+void
+change_screen (GdkScreen * new_screen, GtkWidget * toplevel)
+{
+  GtkWidget *child = gtk_bin_get_child (GTK_BIN (toplevel));
+  GtkWidget *new_toplevel;
+
+  new_toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+  gtk_window_set_screen (GTK_WINDOW (new_toplevel), new_screen);
+
+  gtk_widget_set_name (new_toplevel, "main window");
+  gtk_window_set_default_size (GTK_WINDOW (new_toplevel), 600, 400);
+
+  g_signal_connect (G_OBJECT (new_toplevel), "destroy",
+		    G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (G_OBJECT (new_toplevel), "delete-event",
+		    G_CALLBACK (gtk_false), NULL);
+
+  gtk_widget_reparent (GTK_WIDGET (child), new_toplevel);
+  /* App dependant initialization */
+
+
+  gtk_widget_show_all (new_toplevel);
+
+  g_signal_handlers_disconnect_by_func (G_OBJECT (toplevel),
+					G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_handlers_disconnect_by_func (G_OBJECT (toplevel),
+					G_CALLBACK (gtk_false), NULL);
+  gtk_widget_destroy (toplevel);
+}
+
+static gint
+display_name_cmp (gconstpointer a, gconstpointer b)
+{
+  return g_ascii_strcasecmp (a, b);
+}
+
+
+void
+screen_display_check (GtkWidget * widget, ScreenDisplaySelection * data)
+{
+  char *display_name;
+  GdkDisplay *display = gtk_widget_get_display (widget);
+  GtkWidget *dialog;
+  GdkScreen *new_screen = NULL;
+  GdkScreen *current_screen = gtk_widget_get_screen (widget);
+
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->radio_dpy)))
+    {
+      display_name = g_strdup (gtk_entry_get_text (data->entry));
+      display = gdk_display_new (0, NULL, (char *) display_name);
+
+      if (!display)
+	{
+	  dialog =
+	    gtk_message_dialog_new (GTK_WINDOW
+				    (gtk_widget_get_toplevel (widget)),
+				    GTK_DIALOG_DESTROY_WITH_PARENT,
+				    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+				    "The display :\n%s\ncannot be opened",
+				    display_name);
+	  gtk_window_set_screen (GTK_WINDOW (dialog), current_screen);
+	  gtk_widget_show (dialog);
+	  g_signal_connect (G_OBJECT (dialog), "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);
+	}
+      else
+	{
+	  if (!g_list_find_custom (data->valid_display_list,
+				   display_name, display_name_cmp))
+	    data->valid_display_list =
+	      g_list_append (data->valid_display_list, display_name);
+
+	  new_screen = gdk_display_get_default_screen (display);
+	}
+    }
+  else
+    {
+      int number_of_screens = gdk_display_get_n_screens (display);
+      int screen_num = gdk_screen_get_number (current_screen);
+      if ((screen_num + 1) < number_of_screens)
+	new_screen = gdk_display_get_screen (display, screen_num + 1);
+      else
+	new_screen = gdk_display_get_screen (display, 0);
+    }
+  if (new_screen)
+    {
+      change_screen (new_screen, data->toplevel);
+      gtk_widget_destroy (data->dialog_window);
+      window = NULL;
+    }
+}
+
+void
+screen_display_destroy_diag (GtkWidget * widget, GtkWidget * data)
+{
+  gtk_widget_destroy (data);
+  window = NULL;
+}
+
+GtkWidget *
+do_movedemo (GtkWidget * do_widget)
+{
+  GtkWidget *table, *frame, *combo_dpy, *vbox;
+  GtkWidget *radio_dpy, *radio_scr, *applyb, *cancelb;
+  GtkWidget *bbox;
+  ScreenDisplaySelection *scr_dpy_data;
+  GdkScreen *screen = gtk_widget_get_screen (do_widget);
+  static GList *valid_display_list = NULL;
+
+  if (!window)
+    {
+      GdkDisplay *display = gdk_screen_get_display (screen);
+
+      window = gtk_widget_new (gtk_window_get_type (),
+			       "screen", screen,
+			       "user_data", NULL,
+			       "type", GTK_WINDOW_TOPLEVEL,
+			       "title",
+			       "Screen or Display selection",
+			       "border_width", 10, NULL);
+      g_signal_connect (G_OBJECT (window), "destroy",
+			G_CALLBACK (gtk_widget_destroy), NULL);
+
+      vbox = gtk_vbox_new (FALSE, 3);
+      gtk_container_add (GTK_CONTAINER (window), vbox);
+
+      frame = gtk_frame_new ("Select screen or display");
+      gtk_container_add (GTK_CONTAINER (vbox), frame);
+
+      table = gtk_table_new (2, 2, TRUE);
+      gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+      gtk_table_set_col_spacings (GTK_TABLE (table), 3);
+
+      gtk_container_add (GTK_CONTAINER (frame), table);
+
+      radio_dpy =
+	gtk_radio_button_new_with_label (NULL, "move to another X display");
+      if (gdk_display_get_n_screens (display) > 1)
+	radio_scr = gtk_radio_button_new_with_label
+	  (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_dpy)),
+	   "move to next screen");
+      else
+	{
+	  radio_scr = gtk_radio_button_new_with_label
+	    (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_dpy)),
+	     "only one screen on the current display");
+	  gtk_widget_set_sensitive (radio_scr, FALSE);
+	}
+      combo_dpy = gtk_combo_new ();
+      if (!valid_display_list)
+	valid_display_list =
+	  g_list_append (valid_display_list, "diabolo:0.0");
+
+      gtk_combo_set_popdown_strings (GTK_COMBO (combo_dpy),
+				     valid_display_list);
+
+      gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo_dpy)->entry),
+			  "<hostname>:<X Server Num>.<Screen Num>");
+
+      gtk_table_attach_defaults (GTK_TABLE (table), radio_dpy, 0, 1, 0, 1);
+      gtk_table_attach_defaults (GTK_TABLE (table), radio_scr, 0, 1, 1, 2);
+      gtk_table_attach_defaults (GTK_TABLE (table), combo_dpy, 1, 2, 0, 1);
+
+      bbox = gtk_hbutton_box_new ();
+      applyb = gtk_button_new_from_stock (GTK_STOCK_APPLY);
+      cancelb = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+
+      gtk_container_add (GTK_CONTAINER (vbox), bbox);
+
+      gtk_container_add (GTK_CONTAINER (bbox), applyb);
+      gtk_container_add (GTK_CONTAINER (bbox), cancelb);
+
+      scr_dpy_data = g_new0 (ScreenDisplaySelection, 1);
+
+      scr_dpy_data->entry = GTK_ENTRY (GTK_COMBO (combo_dpy)->entry);
+      scr_dpy_data->radio_dpy = radio_dpy;
+      scr_dpy_data->toplevel = gtk_widget_get_toplevel (do_widget);
+      scr_dpy_data->dialog_window = window;
+      scr_dpy_data->valid_display_list = valid_display_list;
+
+      g_signal_connect (G_OBJECT (cancelb), "clicked",
+			G_CALLBACK (screen_display_destroy_diag),
+			G_OBJECT (window));
+      g_signal_connect (G_OBJECT (applyb), "clicked",
+			G_CALLBACK (screen_display_check), scr_dpy_data);
+      { /* FIXME need to realize the two notebook pages before moving display
+	 * otherwise the text tags created on the first display get realized
+	 * on the new display then core dump */
+	extern GtkWidget *notebook;
+	gint num_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
+	gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), num_page ? 0 : 1);
+	gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), num_page);
+      }
+      gtk_widget_show_all (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}
--- a/demos/gtk-demo/multidisplay.c
+++ b/demos/gtk-demo/multidisplay.c
@@ -0,0 +1,191 @@
+/* Multihead Support/Multidisplay demo
+ *
+ * Demonstrates a multidisplay application, here multi display cut and paste.
+ */
+
+#include <gtk/gtk.h>
+#include "demo-common.h"
+#include <stdio.h>
+
+gchar *screen2_name = NULL;
+static GtkWidget *entry = NULL;
+static GtkWidget *entry2 = NULL;
+
+typedef struct
+{
+  GtkEntry *e1;
+  GtkEntry *e2;
+}
+MyDoubleGtkEntry;
+
+void
+get_dialog_response (GtkDialog * dialog, gint arg1, gpointer data)
+{
+  GtkEntry *entry;
+  if (arg1 == GTK_RESPONSE_DELETE_EVENT)
+    return;
+  g_return_if_fail (GTK_IS_ENTRY (data));
+  entry = GTK_ENTRY (data);
+  screen2_name = g_strdup (gtk_entry_get_text (entry));
+}
+
+void
+clear_entry (GtkWidget * widget, gpointer * data)
+{
+  MyDoubleGtkEntry *de = (MyDoubleGtkEntry *) data;
+  gtk_entry_set_text (de->e2, gtk_entry_get_text (de->e1));
+}
+
+void
+quit_all (GtkWidget * widget, gpointer * data)
+{
+  MyDoubleGtkEntry *de = (MyDoubleGtkEntry *) data;
+  if (entry)
+    gtk_widget_destroy (gtk_widget_get_toplevel (entry));
+  if (entry2)
+    gtk_widget_destroy (gtk_widget_get_toplevel (entry2));
+  if (de)
+    g_free (de);
+  entry = NULL;
+  entry2 = NULL;
+}
+
+void
+make_selection_dialog (GdkScreen * screen,
+		       GtkWidget * entry, GtkWidget * other_entry)
+{
+  GtkWidget *window, *vbox, *button_box, *clear, *quit;
+  MyDoubleGtkEntry *double_entry = g_new (MyDoubleGtkEntry, 1);
+  double_entry->e1 = GTK_ENTRY (entry);
+  double_entry->e2 = GTK_ENTRY (other_entry);
+
+  window = gtk_widget_new (gtk_window_get_type (),
+			   "screen", screen,
+			   "user_data", NULL,
+			   "type", GTK_WINDOW_TOPLEVEL,
+			   "title",
+			   "MultiDisplay Cut & Paste",
+			   "border_width", 10, NULL);
+  g_signal_connect (G_OBJECT (window), "destroy",
+		    G_CALLBACK (quit_all), double_entry);
+
+  vbox = gtk_vbox_new (TRUE, 0);
+
+  gtk_container_add (GTK_CONTAINER (window), vbox);
+
+  gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+
+  button_box = gtk_hbutton_box_new ();
+
+  gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, FALSE, 0);
+
+  clear = gtk_button_new_from_stock (GTK_STOCK_APPLY);
+  quit = gtk_button_new_from_stock (GTK_STOCK_QUIT);
+
+  gtk_box_pack_start (GTK_BOX (button_box), clear, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (button_box), quit, FALSE, FALSE, 0);
+
+  g_signal_connect (G_OBJECT (quit), "clicked", G_CALLBACK (quit_all),
+		    double_entry);
+  g_signal_connect (G_OBJECT (clear), "clicked", G_CALLBACK (clear_entry),
+		    double_entry);
+
+  gtk_widget_show_all (window);
+}
+
+GtkWidget *
+do_multidisplay (GtkWidget * do_widget)
+{
+  GtkWidget *dialog, *display_entry, *dialog_label;
+  GdkDisplay *dpy2;
+  GdkScreen *scr2 = NULL;	/* Quiet GCC */
+  gboolean correct_second_display = FALSE;
+
+  /* Get the second display */
+
+  if (!entry)
+    {
+      char label_text[300] =
+	"          <big><span foreground=\"white\" background=\"black\">"
+	"Multiple Display Test</span></big>\n"
+	"Please enter the name of the second display";
+
+      dialog = gtk_dialog_new_with_buttons ("Second Display Selection",
+					    GTK_WINDOW
+					    (gtk_widget_get_toplevel
+					     (do_widget)), GTK_DIALOG_MODAL,
+					    GTK_STOCK_OK, GTK_RESPONSE_OK,
+					    NULL);
+
+      gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+      display_entry = gtk_entry_new ();
+      gtk_entry_set_activates_default (GTK_ENTRY (display_entry), TRUE);
+      dialog_label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (dialog_label), label_text);
+
+      gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),
+			 dialog_label);
+      gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),
+			 display_entry);
+      g_signal_connect (G_OBJECT (dialog), "response",
+			G_CALLBACK (get_dialog_response), display_entry);
+
+      gtk_widget_grab_focus (display_entry);
+
+      gtk_widget_show_all (dialog);
+      gtk_dialog_run (GTK_DIALOG (dialog));
+
+      while (!correct_second_display)
+	{
+
+	  if (!g_strcasecmp (screen2_name, ""))
+	    g_print ("No display name, reverting to default display\n");
+
+	  dpy2 = gdk_display_new (0, NULL, screen2_name);
+	  if (dpy2)
+	    {
+	      scr2 = gdk_display_get_default_screen (dpy2);
+	      correct_second_display = TRUE;
+	    }
+	  else
+	    {
+	      char *error_msg = g_new (char, 1000);
+	      sprintf (error_msg,
+		       "<big><span foreground=\"white\" background=\"black\">"
+		       "<b>Can't open display :</b></span>"
+		       "\n\t%s\nplease try another one </big>", screen2_name);
+	      gtk_label_set_markup (GTK_LABEL (dialog_label), error_msg);
+	      gtk_entry_set_text (GTK_ENTRY (display_entry), "");
+	      gtk_widget_show_all (dialog);
+	      gtk_dialog_run (GTK_DIALOG (dialog));
+	      g_free (error_msg);
+	    }
+	}
+      g_free (screen2_name);
+      gtk_widget_destroy (dialog);
+
+      entry = gtk_widget_new (gtk_entry_get_type (),
+			      "activates_default", TRUE,
+			      "visible", TRUE, NULL);
+      entry2 = gtk_widget_new (gtk_entry_get_type (), "visible", TRUE, NULL);
+
+      /* for default display */
+      make_selection_dialog (gtk_widget_get_screen (do_widget), entry2, entry);
+      /* for selected display */
+      make_selection_dialog (scr2, entry, entry2);
+    }
+  else
+    {
+      if (entry)
+	{
+	  gtk_widget_destroy (gtk_widget_get_toplevel (GTK_WIDGET (entry)));
+	  entry = NULL;
+	}
+      if (entry2)
+	{
+	  gtk_widget_destroy (gtk_widget_get_toplevel (GTK_WIDGET (entry2)));
+	  entry2 = NULL;
+	}
+    }
+  return entry;
+}
--- a/demos/gtk-demo/multiscreen.c
+++ b/demos/gtk-demo/multiscreen.c
@@ -0,0 +1,118 @@
+/* Multihead Support/Multiple Screen demo
+ *
+ * Demonstrates an application displaying a window per screen  
+ *
+ */
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include "demo-common.h"
+
+void
+multiscreen_close_all (GtkWidget * widget)
+{
+  GdkDisplay *display = gtk_widget_get_display (widget);
+  GtkWidget **window = g_object_get_data (G_OBJECT (display),
+					  "do_multiscreen");
+  if (window)
+    {
+      gint j = gdk_display_get_n_screens (display);
+      j--;
+      g_object_set_data (G_OBJECT (display), "do_multiscreen", NULL);
+      while (j >= 0)
+	{
+	  if (window[j])
+	    {
+	      gtk_widget_destroy (window[j]);
+	      window[j] = NULL;
+	    }
+	  j--;
+	}
+      if (window)
+	g_free (window);
+    }
+}
+
+GtkWidget *
+do_multiscreen (GtkWidget * do_widget)
+{
+  gint i, num_screen;
+  GdkDisplay *dpy = gtk_widget_get_display (do_widget);
+  GtkWidget *vbox, *label, *button;
+  GtkWidget **window = g_object_get_data (G_OBJECT (dpy), "do_multiscreen");
+
+  if (!window)
+    {
+      num_screen = gdk_display_get_n_screens (dpy);
+
+      if (num_screen <= 1)
+	{
+	  GtkWidget *dialog;
+	  GtkWidget *w = gtk_widget_get_toplevel (do_widget);
+
+	  dialog = gtk_message_dialog_new (GTK_WINDOW (w),
+					   GTK_DIALOG_MODAL,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   "This display (%s) manages only one screen.",
+					   gdk_display_get_name (dpy));
+
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);
+
+	  gtk_widget_show (dialog);
+	  return dialog;
+	}
+
+      window = g_new (GtkWidget *, num_screen);
+      g_object_set_data (G_OBJECT (dpy), "do_multiscreen", window);
+
+      for (i = 0; i < num_screen; i++)
+	{
+	  char *label_text = g_new (char, 300);
+	  GdkScreen *screen = gdk_display_get_screen (dpy, i);
+
+	  window[i] = gtk_widget_new (gtk_window_get_type (), "screen",
+				      screen,
+				      "user_data", NULL, "type",
+				      GTK_WINDOW_TOPLEVEL, "title", label,
+				      "allow_grow", FALSE, "allow_shrink",
+				      FALSE, "border_width", 10, NULL);
+	  /* you can also use gtk_window_new and set the screen afterwards with 
+	   * gtk_window_set_screen */
+
+	  g_signal_connect (G_OBJECT (window[i]), "destroy",
+			    G_CALLBACK (multiscreen_close_all), NULL);
+
+	  vbox = gtk_vbox_new (TRUE, 0);
+
+	  gtk_container_add (GTK_CONTAINER (window[i]), vbox);
+
+	  label = gtk_label_new (NULL);
+
+	  sprintf (label_text,
+		   "       <big><span foreground=\"white\" background=\"black\">"
+		   "Screen %d of %d</span></big>\n"
+		   "<span background=\"darkcyan\"><i>Width - Height : (%d,%d)\n</i></span>",
+		   i + 1, num_screen, gdk_screen_get_width (screen),
+		   gdk_screen_get_height (screen));
+
+	  gtk_label_set_markup (GTK_LABEL (label), label_text);
+
+	  gtk_container_add (GTK_CONTAINER (vbox), label);
+
+	  button = gtk_button_new_with_label ("Close");
+	  g_signal_connect (G_OBJECT (button), "clicked",
+			    G_CALLBACK (multiscreen_close_all), NULL);
+	  gtk_container_add (GTK_CONTAINER (vbox), button);
+	  gtk_widget_show_all (window[i]);
+	}
+      return window[0];
+    }
+  else
+    {
+      multiscreen_close_all (do_widget);
+      return NULL;
+    }
+
+
+}
--- a/demos/gtk-demo/offscreen_window.c
+++ b/demos/gtk-demo/offscreen_window.c
@@ -1,617 +0,0 @@
-/* Offscreen windows/Rotated button
- *
- * Offscreen windows can be used to transform parts of a widget
- * hierarchy. Note that the rotated button is fully functional.
- */
-#include <math.h>
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_ROTATED_BIN              (gtk_rotated_bin_get_type ())
-#define GTK_ROTATED_BIN(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ROTATED_BIN, GtkRotatedBin))
-#define GTK_ROTATED_BIN_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ROTATED_BIN, GtkRotatedBinClass))
-#define GTK_IS_ROTATED_BIN(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ROTATED_BIN))
-#define GTK_IS_ROTATED_BIN_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ROTATED_BIN))
-#define GTK_ROTATED_BIN_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ROTATED_BIN, GtkRotatedBinClass))
-
-typedef struct _GtkRotatedBin   GtkRotatedBin;
-typedef struct _GtkRotatedBinClass  GtkRotatedBinClass;
-
-struct _GtkRotatedBin
-{
-  GtkContainer container;
-
-  GtkWidget *child;
-  GdkWindow *offscreen_window;
-  gdouble angle;
-};
-
-struct _GtkRotatedBinClass
-{
-  GtkContainerClass parent_class;
-};
-
-GType      gtk_rotated_bin_get_type  (void) G_GNUC_CONST;
-GtkWidget* gtk_rotated_bin_new       (void);
-void       gtk_rotated_bin_set_angle (GtkRotatedBin *bin,
-                                      gdouble        angle);
-
-/*** implementation ***/
-
-static void     gtk_rotated_bin_realize       (GtkWidget       *widget);
-static void     gtk_rotated_bin_unrealize     (GtkWidget       *widget);
-static void     gtk_rotated_bin_get_preferred_width  (GtkWidget *widget,
-                                                      gint      *minimum,
-                                                      gint      *natural);
-static void     gtk_rotated_bin_get_preferred_height (GtkWidget *widget,
-                                                      gint      *minimum,
-                                                      gint      *natural);
-static void     gtk_rotated_bin_size_allocate (GtkWidget       *widget,
-                                               GtkAllocation   *allocation);
-static gboolean gtk_rotated_bin_damage        (GtkWidget       *widget,
-                                               GdkEventExpose  *event);
-static gboolean gtk_rotated_bin_draw          (GtkWidget       *widget,
-                                               cairo_t         *cr);
-
-static void     gtk_rotated_bin_add           (GtkContainer    *container,
-                                               GtkWidget       *child);
-static void     gtk_rotated_bin_remove        (GtkContainer    *container,
-                                               GtkWidget       *widget);
-static void     gtk_rotated_bin_forall        (GtkContainer    *container,
-                                               gboolean         include_internals,
-                                               GtkCallback      callback,
-                                               gpointer         callback_data);
-static GType    gtk_rotated_bin_child_type    (GtkContainer    *container);
-
-G_DEFINE_TYPE (GtkRotatedBin, gtk_rotated_bin, GTK_TYPE_CONTAINER);
-
-static void
-to_child (GtkRotatedBin *bin,
-          double         widget_x,
-          double         widget_y,
-          double        *x_out,
-          double        *y_out)
-{
-  GtkAllocation child_area;
-  double x, y, xr, yr;
-  double c, s;
-  double w, h;
-
-  s = sin (bin->angle);
-  c = cos (bin->angle);
-  gtk_widget_get_allocation (bin->child, &child_area);
-
-  w = c * child_area.width + s * child_area.height;
-  h = s * child_area.width + c * child_area.height;
-
-  x = widget_x;
-  y = widget_y;
-
-  x -= (w - child_area.width) / 2;
-  y -= (h - child_area.height) / 2;
-
-  x -= child_area.width / 2;
-  y -= child_area.height / 2;
-
-  xr = x * c + y * s;
-  yr = y * c - x * s;
-  x = xr;
-  y = yr;
-
-  x += child_area.width / 2;
-  y += child_area.height / 2;
-
-  *x_out = x;
-  *y_out = y;
-}
-
-static void
-to_parent (GtkRotatedBin *bin,
-           double         offscreen_x,
-           double         offscreen_y,
-           double        *x_out,
-           double        *y_out)
-{
-  GtkAllocation child_area;
-  double x, y, xr, yr;
-  double c, s;
-  double w, h;
-
-  s = sin (bin->angle);
-  c = cos (bin->angle);
-  gtk_widget_get_allocation (bin->child, &child_area);
-
-  w = c * child_area.width + s * child_area.height;
-  h = s * child_area.width + c * child_area.height;
-
-  x = offscreen_x;
-  y = offscreen_y;
-
-  x -= child_area.width / 2;
-  y -= child_area.height / 2;
-
-  xr = x * c - y * s;
-  yr = x * s + y * c;
-  x = xr;
-  y = yr;
-
-  x += child_area.width / 2;
-  y += child_area.height / 2;
-
-  x -= (w - child_area.width) / 2;
-  y -= (h - child_area.height) / 2;
-
-  *x_out = x;
-  *y_out = y;
-}
-
-static void
-gtk_rotated_bin_class_init (GtkRotatedBinClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
-
-  widget_class->realize = gtk_rotated_bin_realize;
-  widget_class->unrealize = gtk_rotated_bin_unrealize;
-  widget_class->get_preferred_width = gtk_rotated_bin_get_preferred_width;
-  widget_class->get_preferred_height = gtk_rotated_bin_get_preferred_height;
-  widget_class->size_allocate = gtk_rotated_bin_size_allocate;
-  widget_class->draw = gtk_rotated_bin_draw;
-
-  g_signal_override_class_closure (g_signal_lookup ("damage-event", GTK_TYPE_WIDGET),
-                                   GTK_TYPE_ROTATED_BIN,
-                                   g_cclosure_new (G_CALLBACK (gtk_rotated_bin_damage),
-                                                   NULL, NULL));
-
-  container_class->add = gtk_rotated_bin_add;
-  container_class->remove = gtk_rotated_bin_remove;
-  container_class->forall = gtk_rotated_bin_forall;
-  container_class->child_type = gtk_rotated_bin_child_type;
-}
-
-static void
-gtk_rotated_bin_init (GtkRotatedBin *bin)
-{
-  gtk_widget_set_has_window (GTK_WIDGET (bin), TRUE);
-}
-
-GtkWidget *
-gtk_rotated_bin_new (void)
-{
-  return g_object_new (GTK_TYPE_ROTATED_BIN, NULL);
-}
-
-static GdkWindow *
-pick_offscreen_child (GdkWindow     *offscreen_window,
-                      double         widget_x,
-                      double         widget_y,
-                      GtkRotatedBin *bin)
-{
- GtkAllocation child_area;
- double x, y;
-
- if (bin->child && gtk_widget_get_visible (bin->child))
-    {
-      to_child (bin, widget_x, widget_y, &x, &y);
-
-      gtk_widget_get_allocation (bin->child, &child_area);
-
-      if (x >= 0 && x < child_area.width &&
-          y >= 0 && y < child_area.height)
-        return bin->offscreen_window;
-    }
-
-  return NULL;
-}
-
-static void
-offscreen_window_to_parent (GdkWindow     *offscreen_window,
-                            double         offscreen_x,
-                            double         offscreen_y,
-                            double        *parent_x,
-                            double        *parent_y,
-                            GtkRotatedBin *bin)
-{
-  to_parent (bin, offscreen_x, offscreen_y, parent_x, parent_y);
-}
-
-static void
-offscreen_window_from_parent (GdkWindow     *window,
-                              double         parent_x,
-                              double         parent_y,
-                              double        *offscreen_x,
-                              double        *offscreen_y,
-                              GtkRotatedBin *bin)
-{
-  to_child (bin, parent_x, parent_y, offscreen_x, offscreen_y);
-}
-
-static void
-gtk_rotated_bin_realize (GtkWidget *widget)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  GtkAllocation allocation;
-  GtkStyleContext *context;
-  GdkWindow *window;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-  guint border_width;
-  GtkRequisition child_requisition;
-
-  gtk_widget_set_realized (widget, TRUE);
-
-  gtk_widget_get_allocation (widget, &allocation);
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
-  attributes.x = allocation.x + border_width;
-  attributes.y = allocation.y + border_width;
-  attributes.width = allocation.width - 2 * border_width;
-  attributes.height = allocation.height - 2 * border_width;
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.event_mask = gtk_widget_get_events (widget)
-                        | GDK_EXPOSURE_MASK
-                        | GDK_POINTER_MOTION_MASK
-                        | GDK_BUTTON_PRESS_MASK
-                        | GDK_BUTTON_RELEASE_MASK
-                        | GDK_SCROLL_MASK
-                        | GDK_ENTER_NOTIFY_MASK
-                        | GDK_LEAVE_NOTIFY_MASK;
-
-  attributes.visual = gtk_widget_get_visual (widget);
-  attributes.wclass = GDK_INPUT_OUTPUT;
-
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
-
-  window = gdk_window_new (gtk_widget_get_parent_window (widget),
-                           &attributes, attributes_mask);
-  gtk_widget_set_window (widget, window);
-  gdk_window_set_user_data (window, widget);
-  g_signal_connect (window, "pick-embedded-child",
-                    G_CALLBACK (pick_offscreen_child), bin);
-
-  attributes.window_type = GDK_WINDOW_OFFSCREEN;
-
-  child_requisition.width = child_requisition.height = 0;
-  if (bin->child && gtk_widget_get_visible (bin->child))
-    {
-      GtkAllocation child_allocation;
-
-      gtk_widget_get_allocation (bin->child, &child_allocation);
-      attributes.width = child_allocation.width;
-      attributes.height = child_allocation.height;
-    }
-  bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
-                                          &attributes, attributes_mask);
-  gdk_window_set_user_data (bin->offscreen_window, widget);
-  if (bin->child)
-    gtk_widget_set_parent_window (bin->child, bin->offscreen_window);
-  gdk_offscreen_window_set_embedder (bin->offscreen_window, window);
-  g_signal_connect (bin->offscreen_window, "to-embedder",
-                    G_CALLBACK (offscreen_window_to_parent), bin);
-  g_signal_connect (bin->offscreen_window, "from-embedder",
-                    G_CALLBACK (offscreen_window_from_parent), bin);
-
-  gtk_widget_style_attach (widget);
-  context = gtk_widget_get_style_context (widget);
-  gtk_style_context_set_background (context, window);
-  gtk_style_context_set_background (context, bin->offscreen_window);
-  gdk_window_show (bin->offscreen_window);
-}
-
-static void
-gtk_rotated_bin_unrealize (GtkWidget *widget)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-
-  gdk_window_set_user_data (bin->offscreen_window, NULL);
-  gdk_window_destroy (bin->offscreen_window);
-  bin->offscreen_window = NULL;
-
-  GTK_WIDGET_CLASS (gtk_rotated_bin_parent_class)->unrealize (widget);
-}
-
-static GType
-gtk_rotated_bin_child_type (GtkContainer *container)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (container);
-
-  if (bin->child)
-    return G_TYPE_NONE;
-
-  return GTK_TYPE_WIDGET;
-}
-
-static void
-gtk_rotated_bin_add (GtkContainer *container,
-                     GtkWidget    *widget)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (container);
-
-  if (!bin->child)
-    {
-      gtk_widget_set_parent_window (widget, bin->offscreen_window);
-      gtk_widget_set_parent (widget, GTK_WIDGET (bin));
-      bin->child = widget;
-    }
-  else
-    g_warning ("GtkRotatedBin cannot have more than one child\n");
-}
-
-static void
-gtk_rotated_bin_remove (GtkContainer *container,
-                        GtkWidget    *widget)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (container);
-  gboolean was_visible;
-
-  was_visible = gtk_widget_get_visible (widget);
-
-  if (bin->child == widget)
-    {
-      gtk_widget_unparent (widget);
-
-      bin->child = NULL;
-
-      if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
-        gtk_widget_queue_resize (GTK_WIDGET (container));
-    }
-}
-
-static void
-gtk_rotated_bin_forall (GtkContainer *container,
-                        gboolean      include_internals,
-                        GtkCallback   callback,
-                        gpointer      callback_data)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (container);
-
-  g_return_if_fail (callback != NULL);
-
-  if (bin->child)
-    (*callback) (bin->child, callback_data);
-}
-
-void
-gtk_rotated_bin_set_angle (GtkRotatedBin *bin,
-                           gdouble        angle)
-{
-  g_return_if_fail (GTK_IS_ROTATED_BIN (bin));
-
-  bin->angle = angle;
-  gtk_widget_queue_resize (GTK_WIDGET (bin));
-
-  gdk_window_geometry_changed (bin->offscreen_window);
-}
-
-static void
-gtk_rotated_bin_size_request (GtkWidget      *widget,
-                              GtkRequisition *requisition)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  GtkRequisition child_requisition;
-  double s, c;
-  double w, h;
-  guint border_width;
-
-  child_requisition.width = 0;
-  child_requisition.height = 0;
-
-  if (bin->child && gtk_widget_get_visible (bin->child))
-    gtk_widget_get_preferred_size ( (bin->child),
-                               &child_requisition, NULL);
-
-  s = sin (bin->angle);
-  c = cos (bin->angle);
-  w = c * child_requisition.width + s * child_requisition.height;
-  h = s * child_requisition.width + c * child_requisition.height;
-
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-  requisition->width = border_width * 2 + w;
-  requisition->height = border_width * 2 + h;
-}
-
-static void
-gtk_rotated_bin_get_preferred_width (GtkWidget *widget,
-                                     gint      *minimum,
-                                     gint      *natural)
-{
-  GtkRequisition requisition;
-
-  gtk_rotated_bin_size_request (widget, &requisition);
-
-  *minimum = *natural = requisition.width;
-}
-
-static void
-gtk_rotated_bin_get_preferred_height (GtkWidget *widget,
-                                      gint      *minimum,
-                                      gint      *natural)
-{
-  GtkRequisition requisition;
-
-  gtk_rotated_bin_size_request (widget, &requisition);
-
-  *minimum = *natural = requisition.height;
-}
-
-static void
-gtk_rotated_bin_size_allocate (GtkWidget     *widget,
-                               GtkAllocation *allocation)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  guint border_width;
-  gint w, h;
-  gdouble s, c;
-
-  gtk_widget_set_allocation (widget, allocation);
-
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
-  w = allocation->width - border_width * 2;
-  h = allocation->height - border_width * 2;
-
-  if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (gtk_widget_get_window (widget),
-                            allocation->x + border_width,
-                            allocation->y + border_width,
-                            w, h);
-
-  if (bin->child && gtk_widget_get_visible (bin->child))
-    {
-      GtkRequisition child_requisition;
-      GtkAllocation child_allocation;
-
-      s = sin (bin->angle);
-      c = cos (bin->angle);
-
-      gtk_widget_get_preferred_size (bin->child,
-                                     &child_requisition, NULL);
-      child_allocation.x = 0;
-      child_allocation.y = 0;
-      child_allocation.height = child_requisition.height;
-      if (c == 0.0)
-        child_allocation.width = h / s;
-      else if (s == 0.0)
-        child_allocation.width = w / c;
-      else
-        child_allocation.width = MIN ((w - s * child_allocation.height) / c,
-                                      (h - c * child_allocation.height) / s);
-
-      if (gtk_widget_get_realized (widget))
-        gdk_window_move_resize (bin->offscreen_window,
-                                child_allocation.x,
-                                child_allocation.y,
-                                child_allocation.width,
-                                child_allocation.height);
-
-      child_allocation.x = child_allocation.y = 0;
-      gtk_widget_size_allocate (bin->child, &child_allocation);
-    }
-}
-
-static gboolean
-gtk_rotated_bin_damage (GtkWidget      *widget,
-                        GdkEventExpose *event)
-{
-  gdk_window_invalidate_rect (gtk_widget_get_window (widget),
-                              NULL, FALSE);
-
-  return TRUE;
-}
-
-static gboolean
-gtk_rotated_bin_draw (GtkWidget *widget,
-                      cairo_t   *cr)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  GdkWindow *window;
-  gdouble s, c;
-  gdouble w, h;
-
-  window = gtk_widget_get_window (widget);
-  if (gtk_cairo_should_draw_window (cr, window))
-    {
-      cairo_surface_t *surface;
-      GtkAllocation child_area;
-
-      if (bin->child && gtk_widget_get_visible (bin->child))
-        {
-          surface = gdk_offscreen_window_get_surface (bin->offscreen_window);
-          gtk_widget_get_allocation (bin->child, &child_area);
-
-          /* transform */
-          s = sin (bin->angle);
-          c = cos (bin->angle);
-          w = c * child_area.width + s * child_area.height;
-          h = s * child_area.width + c * child_area.height;
-
-          cairo_translate (cr, (w - child_area.width) / 2, (h - child_area.height) / 2);
-          cairo_translate (cr, child_area.width / 2, child_area.height / 2);
-          cairo_rotate (cr, bin->angle);
-          cairo_translate (cr, -child_area.width / 2, -child_area.height / 2);
-
-          /* clip */
-          cairo_rectangle (cr,
-                           0, 0,
-                           gdk_window_get_width (bin->offscreen_window),
-                           gdk_window_get_height (bin->offscreen_window));
-          cairo_clip (cr);
-          /* paint */
-          cairo_set_source_surface (cr, surface, 0, 0);
-          cairo_paint (cr);
-        }
-    }
-  if (gtk_cairo_should_draw_window (cr, bin->offscreen_window))
-    {
-      gtk_render_background (gtk_widget_get_style_context (widget),
-                             cr,
-                             0, 0,
-                             gdk_window_get_width (bin->offscreen_window),
-                             gdk_window_get_height (bin->offscreen_window));
-
-      if (bin->child)
-        gtk_container_propagate_draw (GTK_CONTAINER (widget),
-                                      bin->child,
-                                      cr);
-    }
-
-  return FALSE;
-}
-
-/*** ***/
-
-static void
-scale_changed (GtkRange      *range,
-               GtkRotatedBin *bin)
-{
-  gtk_rotated_bin_set_angle (bin, gtk_range_get_value (range));
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_offscreen_window (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *bin, *vbox, *scale, *button;
-      GdkRGBA black;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Rotated widget");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gdk_rgba_parse (&black, "black");
-      gtk_widget_override_background_color (window, 0, &black);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
-                                        0, G_PI/2, 0.01);
-      gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
-
-      button = gtk_button_new_with_label ("A Button");
-      bin = gtk_rotated_bin_new ();
-
-      g_signal_connect (scale, "value-changed", G_CALLBACK (scale_changed), bin);
-
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-      gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), bin, TRUE, TRUE, 0);
-      gtk_container_add (GTK_CONTAINER (bin), button);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
--- a/demos/gtk-demo/offscreen_window2.c
+++ b/demos/gtk-demo/offscreen_window2.c
@@ -1,528 +0,0 @@
-/* Offscreen windows/Effects
- *
- * Offscreen windows can be used to render elements multiple times to achieve
- * various effects.
- */
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_MIRROR_BIN              (gtk_mirror_bin_get_type ())
-#define GTK_MIRROR_BIN(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MIRROR_BIN, GtkMirrorBin))
-#define GTK_MIRROR_BIN_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MIRROR_BIN, GtkMirrorBinClass))
-#define GTK_IS_MIRROR_BIN(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MIRROR_BIN))
-#define GTK_IS_MIRROR_BIN_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MIRROR_BIN))
-#define GTK_MIRROR_BIN_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MIRROR_BIN, GtkMirrorBinClass))
-
-typedef struct _GtkMirrorBin   GtkMirrorBin;
-typedef struct _GtkMirrorBinClass  GtkMirrorBinClass;
-
-struct _GtkMirrorBin
-{
-  GtkContainer container;
-
-  GtkWidget *child;
-  GdkWindow *offscreen_window;
-};
-
-struct _GtkMirrorBinClass
-{
-  GtkContainerClass parent_class;
-};
-
-GType      gtk_mirror_bin_get_type  (void) G_GNUC_CONST;
-GtkWidget* gtk_mirror_bin_new       (void);
-
-/*** implementation ***/
-
-static void     gtk_mirror_bin_realize       (GtkWidget       *widget);
-static void     gtk_mirror_bin_unrealize     (GtkWidget       *widget);
-static void     gtk_mirror_bin_get_preferred_width  (GtkWidget *widget,
-                                                     gint      *minimum,
-                                                     gint      *natural);
-static void     gtk_mirror_bin_get_preferred_height (GtkWidget *widget,
-                                                     gint      *minimum,
-                                                     gint      *natural);
-static void     gtk_mirror_bin_size_allocate (GtkWidget       *widget,
-                                               GtkAllocation   *allocation);
-static gboolean gtk_mirror_bin_damage        (GtkWidget       *widget,
-                                               GdkEventExpose  *event);
-static gboolean gtk_mirror_bin_draw          (GtkWidget       *widget,
-                                              cairo_t         *cr);
-
-static void     gtk_mirror_bin_add           (GtkContainer    *container,
-                                               GtkWidget       *child);
-static void     gtk_mirror_bin_remove        (GtkContainer    *container,
-                                               GtkWidget       *widget);
-static void     gtk_mirror_bin_forall        (GtkContainer    *container,
-                                               gboolean         include_internals,
-                                               GtkCallback      callback,
-                                               gpointer         callback_data);
-static GType    gtk_mirror_bin_child_type    (GtkContainer    *container);
-
-G_DEFINE_TYPE (GtkMirrorBin, gtk_mirror_bin, GTK_TYPE_CONTAINER);
-
-static void
-to_child (GtkMirrorBin *bin,
-          double         widget_x,
-          double         widget_y,
-          double        *x_out,
-          double        *y_out)
-{
-  *x_out = widget_x;
-  *y_out = widget_y;
-}
-
-static void
-to_parent (GtkMirrorBin *bin,
-           double         offscreen_x,
-           double         offscreen_y,
-           double        *x_out,
-           double        *y_out)
-{
-  *x_out = offscreen_x;
-  *y_out = offscreen_y;
-}
-
-static void
-gtk_mirror_bin_class_init (GtkMirrorBinClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
-
-  widget_class->realize = gtk_mirror_bin_realize;
-  widget_class->unrealize = gtk_mirror_bin_unrealize;
-  widget_class->get_preferred_width = gtk_mirror_bin_get_preferred_width;
-  widget_class->get_preferred_height = gtk_mirror_bin_get_preferred_height;
-  widget_class->size_allocate = gtk_mirror_bin_size_allocate;
-  widget_class->draw = gtk_mirror_bin_draw;
-
-  g_signal_override_class_closure (g_signal_lookup ("damage-event", GTK_TYPE_WIDGET),
-                                   GTK_TYPE_MIRROR_BIN,
-                                   g_cclosure_new (G_CALLBACK (gtk_mirror_bin_damage),
-                                                   NULL, NULL));
-
-  container_class->add = gtk_mirror_bin_add;
-  container_class->remove = gtk_mirror_bin_remove;
-  container_class->forall = gtk_mirror_bin_forall;
-  container_class->child_type = gtk_mirror_bin_child_type;
-}
-
-static void
-gtk_mirror_bin_init (GtkMirrorBin *bin)
-{
-  gtk_widget_set_has_window (GTK_WIDGET (bin), TRUE);
-}
-
-GtkWidget *
-gtk_mirror_bin_new (void)
-{
-  return g_object_new (GTK_TYPE_MIRROR_BIN, NULL);
-}
-
-static GdkWindow *
-pick_offscreen_child (GdkWindow     *offscreen_window,
-                      double         widget_x,
-                      double         widget_y,
-                      GtkMirrorBin *bin)
-{
- GtkAllocation child_area;
- double x, y;
-
- if (bin->child && gtk_widget_get_visible (bin->child))
-    {
-      to_child (bin, widget_x, widget_y, &x, &y);
-
-      gtk_widget_get_allocation (bin->child, &child_area);
-
-      if (x >= 0 && x < child_area.width &&
-          y >= 0 && y < child_area.height)
-        return bin->offscreen_window;
-    }
-
-  return NULL;
-}
-
-static void
-offscreen_window_to_parent (GdkWindow     *offscreen_window,
-                            double         offscreen_x,
-                            double         offscreen_y,
-                            double        *parent_x,
-                            double        *parent_y,
-                            GtkMirrorBin *bin)
-{
-  to_parent (bin, offscreen_x, offscreen_y, parent_x, parent_y);
-}
-
-static void
-offscreen_window_from_parent (GdkWindow     *window,
-                              double         parent_x,
-                              double         parent_y,
-                              double        *offscreen_x,
-                              double        *offscreen_y,
-                              GtkMirrorBin *bin)
-{
-  to_child (bin, parent_x, parent_y, offscreen_x, offscreen_y);
-}
-
-static void
-gtk_mirror_bin_realize (GtkWidget *widget)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
-  GtkAllocation allocation;
-  GtkStyleContext *context;
-  GdkWindow *window;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-  guint border_width;
-  GtkRequisition child_requisition;
-
-  gtk_widget_set_realized (widget, TRUE);
-
-  gtk_widget_get_allocation (widget, &allocation);
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
-  attributes.x = allocation.x + border_width;
-  attributes.y = allocation.y + border_width;
-  attributes.width = allocation.width - 2 * border_width;
-  attributes.height = allocation.height - 2 * border_width;
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.event_mask = gtk_widget_get_events (widget)
-                        | GDK_EXPOSURE_MASK
-                        | GDK_POINTER_MOTION_MASK
-                        | GDK_BUTTON_PRESS_MASK
-                        | GDK_BUTTON_RELEASE_MASK
-                        | GDK_SCROLL_MASK
-                        | GDK_ENTER_NOTIFY_MASK
-                        | GDK_LEAVE_NOTIFY_MASK;
-
-  attributes.visual = gtk_widget_get_visual (widget);
-  attributes.wclass = GDK_INPUT_OUTPUT;
-
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
-
-  window = gdk_window_new (gtk_widget_get_parent_window (widget),
-                           &attributes, attributes_mask);
-  gtk_widget_set_window (widget, window);
-  gdk_window_set_user_data (window, widget);
-  g_signal_connect (window, "pick-embedded-child",
-                    G_CALLBACK (pick_offscreen_child), bin);
-
-  attributes.window_type = GDK_WINDOW_OFFSCREEN;
-
-  child_requisition.width = child_requisition.height = 0;
-  if (bin->child && gtk_widget_get_visible (bin->child))
-    {
-      GtkAllocation child_allocation;
-
-      gtk_widget_get_allocation (bin->child, &child_allocation);
-      attributes.width = child_allocation.width;
-      attributes.height = child_allocation.height;
-    }
-  bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
-                                          &attributes, attributes_mask);
-  gdk_window_set_user_data (bin->offscreen_window, widget);
-  if (bin->child)
-    gtk_widget_set_parent_window (bin->child, bin->offscreen_window);
-  gdk_offscreen_window_set_embedder (bin->offscreen_window, window);
-  g_signal_connect (bin->offscreen_window, "to-embedder",
-                    G_CALLBACK (offscreen_window_to_parent), bin);
-  g_signal_connect (bin->offscreen_window, "from-embedder",
-                    G_CALLBACK (offscreen_window_from_parent), bin);
-
-  gtk_widget_style_attach (widget);
-  context = gtk_widget_get_style_context (widget);
-  gtk_style_context_set_background (context, window);
-  gtk_style_context_set_background (context, bin->offscreen_window);
-  gdk_window_show (bin->offscreen_window);
-}
-
-static void
-gtk_mirror_bin_unrealize (GtkWidget *widget)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
-
-  gdk_window_set_user_data (bin->offscreen_window, NULL);
-  gdk_window_destroy (bin->offscreen_window);
-  bin->offscreen_window = NULL;
-
-  GTK_WIDGET_CLASS (gtk_mirror_bin_parent_class)->unrealize (widget);
-}
-
-static GType
-gtk_mirror_bin_child_type (GtkContainer *container)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (container);
-
-  if (bin->child)
-    return G_TYPE_NONE;
-
-  return GTK_TYPE_WIDGET;
-}
-
-static void
-gtk_mirror_bin_add (GtkContainer *container,
-                     GtkWidget    *widget)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (container);
-
-  if (!bin->child)
-    {
-      gtk_widget_set_parent_window (widget, bin->offscreen_window);
-      gtk_widget_set_parent (widget, GTK_WIDGET (bin));
-      bin->child = widget;
-    }
-  else
-    g_warning ("GtkMirrorBin cannot have more than one child\n");
-}
-
-static void
-gtk_mirror_bin_remove (GtkContainer *container,
-                        GtkWidget    *widget)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (container);
-  gboolean was_visible;
-
-  was_visible = gtk_widget_get_visible (widget);
-
-  if (bin->child == widget)
-    {
-      gtk_widget_unparent (widget);
-
-      bin->child = NULL;
-
-      if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
-        gtk_widget_queue_resize (GTK_WIDGET (container));
-    }
-}
-
-static void
-gtk_mirror_bin_forall (GtkContainer *container,
-                        gboolean      include_internals,
-                        GtkCallback   callback,
-                        gpointer      callback_data)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (container);
-
-  g_return_if_fail (callback != NULL);
-
-  if (bin->child)
-    (*callback) (bin->child, callback_data);
-}
-
-static void
-gtk_mirror_bin_size_request (GtkWidget      *widget,
-                              GtkRequisition *requisition)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
-  GtkRequisition child_requisition;
-  guint border_width;
-
-  child_requisition.width = 0;
-  child_requisition.height = 0;
-
-  if (bin->child && gtk_widget_get_visible (bin->child))
-    gtk_widget_get_preferred_size ( (bin->child),
-                               &child_requisition, NULL);
-
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-  requisition->width = border_width * 2 + child_requisition.width + 10;
-  requisition->height = border_width * 2 + child_requisition.height * 2 + 10;
-}
-
-static void
-gtk_mirror_bin_get_preferred_width (GtkWidget *widget,
-                                    gint      *minimum,
-                                    gint      *natural)
-{
-  GtkRequisition requisition;
-
-  gtk_mirror_bin_size_request (widget, &requisition);
-
-  *minimum = *natural = requisition.width;
-}
-
-static void
-gtk_mirror_bin_get_preferred_height (GtkWidget *widget,
-                                     gint      *minimum,
-                                     gint      *natural)
-{
-  GtkRequisition requisition;
-
-  gtk_mirror_bin_size_request (widget, &requisition);
-
-  *minimum = *natural = requisition.width;
-}
-
-static void
-gtk_mirror_bin_size_allocate (GtkWidget     *widget,
-                               GtkAllocation *allocation)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
-  gint w, h;
-  guint border_width;
-
-  gtk_widget_set_allocation (widget, allocation);
-
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
-  w = allocation->width - border_width * 2;
-  h = allocation->height - border_width * 2;
-
-  if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (gtk_widget_get_window (widget),
-                            allocation->x + border_width,
-                            allocation->y + border_width,
-                            w, h);
-
-  if (bin->child && gtk_widget_get_visible (bin->child))
-    {
-      GtkRequisition child_requisition;
-      GtkAllocation child_allocation;
-
-      gtk_widget_get_preferred_size (bin->child,
-                                     &child_requisition, NULL);
-      child_allocation.x = 0;
-      child_allocation.y = 0;
-      child_allocation.height = child_requisition.height;
-      child_allocation.width = child_requisition.width;
-
-      if (gtk_widget_get_realized (widget))
-        gdk_window_move_resize (bin->offscreen_window,
-                                allocation->x + border_width,
-                                allocation->y + border_width,
-                                child_allocation.width, child_allocation.height);
-      gtk_widget_size_allocate (bin->child, &child_allocation);
-    }
-}
-
-static gboolean
-gtk_mirror_bin_damage (GtkWidget      *widget,
-                        GdkEventExpose *event)
-{
-  gdk_window_invalidate_rect (gtk_widget_get_window (widget),
-                              NULL, FALSE);
-
-  return TRUE;
-}
-
-static gboolean
-gtk_mirror_bin_draw (GtkWidget *widget,
-                     cairo_t   *cr)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
-  GdkWindow *window;
-
-  window = gtk_widget_get_window (widget);
-  if (gtk_cairo_should_draw_window (cr, window))
-    {
-      cairo_surface_t *surface;
-      cairo_matrix_t matrix;
-      cairo_pattern_t *mask;
-      int height;
-
-      if (bin->child && gtk_widget_get_visible (bin->child))
-        {
-          surface = gdk_offscreen_window_get_surface (bin->offscreen_window);
-          height = gdk_window_get_height (bin->offscreen_window);
-
-          /* paint the offscreen child */
-          cairo_set_source_surface (cr, surface, 0, 0);
-          cairo_paint (cr);
-
-          cairo_matrix_init (&matrix, 1.0, 0.0, 0.3, 1.0, 0.0, 0.0);
-          cairo_matrix_scale (&matrix, 1.0, -1.0);
-          cairo_matrix_translate (&matrix, -10, - 3 * height - 10);
-          cairo_transform (cr, &matrix);
-
-          cairo_set_source_surface (cr, surface, 0, height);
-
-          /* create linear gradient as mask-pattern to fade out the source */
-          mask = cairo_pattern_create_linear (0.0, height, 0.0, 2*height);
-          cairo_pattern_add_color_stop_rgba (mask, 0.0,  0.0, 0.0, 0.0, 0.0);
-          cairo_pattern_add_color_stop_rgba (mask, 0.25, 0.0, 0.0, 0.0, 0.01);
-          cairo_pattern_add_color_stop_rgba (mask, 0.5,  0.0, 0.0, 0.0, 0.25);
-          cairo_pattern_add_color_stop_rgba (mask, 0.75, 0.0, 0.0, 0.0, 0.5);
-          cairo_pattern_add_color_stop_rgba (mask, 1.0,  0.0, 0.0, 0.0, 1.0);
-
-          /* paint the reflection */
-          cairo_mask (cr, mask);
-
-          cairo_pattern_destroy (mask);
-        }
-    }
-  else if (gtk_cairo_should_draw_window (cr, bin->offscreen_window))
-    {
-      gtk_render_background (gtk_widget_get_style_context (widget),
-                             cr,
-                             0, 0,
-                             gdk_window_get_width (bin->offscreen_window),
-                             gdk_window_get_height (bin->offscreen_window));
-
-      if (bin->child)
-        gtk_container_propagate_draw (GTK_CONTAINER (widget),
-                                      bin->child,
-                                      cr);
-    }
-
-  return FALSE;
-}
-
-/*** ***/
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_offscreen_window2 (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *bin, *vbox;
-      GtkWidget *hbox, *entry, *applybutton, *backbutton;
-      GtkSizeGroup *group;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Effects");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-
-      bin = gtk_mirror_bin_new ();
-
-      group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
-
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-      backbutton = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (backbutton),
-                         gtk_image_new_from_stock (GTK_STOCK_GO_BACK, 4));
-      gtk_size_group_add_widget (group, backbutton);
-      entry = gtk_entry_new ();
-      gtk_size_group_add_widget (group, entry);
-      applybutton = gtk_button_new ();
-      gtk_size_group_add_widget (group, applybutton);
-      gtk_container_add (GTK_CONTAINER (applybutton),
-                         gtk_image_new_from_stock (GTK_STOCK_APPLY, 4));
-
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-      gtk_box_pack_start (GTK_BOX (vbox), bin, TRUE, TRUE, 0);
-      gtk_container_add (GTK_CONTAINER (bin), hbox);
-      gtk_box_pack_start (GTK_BOX (hbox), backbutton, FALSE, FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), applybutton, FALSE, FALSE, 0);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
--- a/Show More
+++ b/Show More