=== Released 2.2.2 ===

Mon Jun 9 16:29:51 2003 Owen Taylor <otaylor@redhat.com> * === Released 2.2.2 === * demos/gtk-demo/Makefile.am (demos.h): srcdir != builddir fix.
Updated Hungarian Translation.
2003-06-09 21:59:58 +00:00 · 2003-06-09 21:59:19 +00:00 · 2003-06-09 21:59:19 +00:00 · 2003-06-09 20:29:21 +00:00 · 2003-06-09 19:26:32 +00:00 · 2003-06-09 19:04:47 +00:00
2291 changed files with 298745 additions and 1479361 deletions
@@ -19,17 +19,14 @@ stamp-h.in
 gtk+.spec
 gtk+-2.0.pc
 gtk+-2.0-uninstalled.pc
-gtk+-unix-print-2.0.pc
 gtk+-linux-fb-2.0.pc
 gtk+-nanox-2.0.pc
 gtk+-x11-2.0.pc
-gtk+-quartz-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-quartz-2.0.pc
 gdk-pixbuf-2.0.pc
 gdk-pixbuf-2.0-uninstalled.pc
 gtk-zip.sh
@@ -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
@@ -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.
@@ -1,438 +0,0 @@
-2007-08-28  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtktable.c: Make sure natural_delta is initialized.
-
-2007-08-28  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Test size-for-allocation for GtkTable.
-	* gtk/gtk.symbols, gtk/gtktable.c, gtk/gtktable.h: Add orientation
-	property needed for choosing a size-for-allocation strategy.
-
-2007-08-28  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkhbox.c: Consider width-for-height information.
-	* gtk/gtkvbox.c, gtk/gtkprivate.h: Move GtkChildSizeRequest
-	to gtkprivate.h.
-
-2007-08-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkvbox.c: Properly calculate minimum_height in size-allocate.
-	So I yell it into the night: Height-for-width is shiny and bright!
-
-2007-08-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtklabel.c: Announce size-for-allocation features only when
-	ellipsis or wrapping with full size allocation are active.
-	* tests/testextendedlayout.c: Display size-for-allocation information
-	in statusbar.
-
-2007-08-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Improve contrast for currently
-	selected widget, show pointer address of widget in status bar.
-	Provider names in size-for-allocation test.
-
-2007-08-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Start real testing of height-for-width
-	and width-for-height.
-	* gtk/gtklabel.c, gtk/gtklabel.h, gtk/gtk.symbols: Add "full-size"
-	property to be able to provide a meaningfull implementation of
-	height-for-width and width-for-height.
-	* gtk/gtkvbox.c: Consider height-for-width information.
-
-2007-08-13  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Provide context menu to directly select
-	testable widgets. Defer self invokation for socket testing until
-	sockets are realized: Plugs cannot receive the "embedded" signal
-	before their socket is realized.
-
-2007-08-13  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testellipsise.c: Pimped the test for better demonstration. 
-	* gtk/gtklabel.c: Correctly calulate layout width for rotated
-	text when ellipses are used.
-
-2007-08-12  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkbin.c: Filter feature set returned by the child to match
-	the subset supported by bins. Ensure natural size matches at least
-	the requested size.
-	* gtk/gtkextendedlayout.c: Ensure natural size matches at least
-	the requested size by considering explicit size requests.
-	* gtk/gtkhbox.c, gtk/gtkvbox.c, gtk/gtktable.c, gtk/gtktable.h: 
-	Delegate natural size calculation to the (modified) size_request
-	method for more accurate resutls. This trick was developed already
-	for GtkLabel, but not recognized before working on GtkScrolledWindow.
-	* gtk/gtktreeview.c: Skip invisible columns for natural size.
-	* tests/autotestextendedlayout.c: Test natural size properties
-	for all classes implementing GtkExtendLayout.
-
-2007-08-06  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtklabel.c: Practice consistent pixel rounding to avoid GtkLabel
-	showing ellipses when PANGO_PIXELS and PANGO_PIXELS_FLOOR differ by
-	less then 0.5 pixels.
-
-2007-08-06  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtktreeviewcolumn.c:
-	Rename gtk_tree_view_column_cell_get_size_impl
-	to gtk_tree_view_column_cell_get_real_size to
-	fit naming conventions.
-	* gtk/gtkscrolledwindow.c:
-	Provide and consider natural size information.
-	* tests/testextendedlayout.c:
-	Show natural size of the hovered widget in statusbar.
-
-2007-08-06  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtktreeprivate.h, gtk/gtktreeviewcolumn.h: 
-	Introduce GtkTreeViewColumnPrivate.
-	* gtk/gtktreeview.c, gtk/gtktreeviewcolumn.c:
-	Provide and consider natural size information.
-
-2007-08-06  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Use tree-view instead of notebook
-	tabs for test case navigation. Support running a sub-set of tests.
-	Display plug-id of sockets as tooltip.
-	
-2007-08-06  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Improve layout of natural size for
-	various widgets test and add a test for GtkTreeViews within
-	GtkScrolledWindows to it.
-
-2007-08-06  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtksocket.c: Repair sizing algorithm - gtk_socket_size_request
-	and gtk_socket_extended_layout_get_natural_size were calling each
-	other's windowing backend function. Was I drunk when commiting the
-	previous revision?
-
-2007-08-01  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkcellrenderertext.c: Provide natural size information.
-	* gtk/gtkcellview.c: Consider and provide natural size information.
-	* tests/testextendedlayout.c: Change background of testing cell view.
-
-2007-08-01  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkcellview.c: Seems there is no point in distinguishing between
-	GTK_PACK_START and GTK_PACK_END during size allocation. The loops only
-	differ in the packing check.
-
-2007-08-01  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkcellview.c: Fix up the mess I commited before.
-	Rule of the thumb: Never write code when tired or in hurry.
-
-2007-07-29  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkcellview.c: Avoid rounding errors in size
-	allocation by adopting the algorithm used by GtkHBox.
-
-2007-07-28  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Preparing natural 
-	size tests for GtkCellView and GtkTreeView.
-
-2007-07-27  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Add paned widgets to
-	the natural size test for GtkAlignment and GtkSocket.
-	* gtk/gtksocket-x11.c: Fix some cast.
-
-2007-07-27  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkalignment.c, gtk/gtksocket.c, gtk/gtksocket-x11.c,
-	gtk/gtksocketprivate.h: Consider natural size of the child.
-	* gtk/gtkplug.c, gtk/gtkplug-x11.c, gtk/gtkplugprivate.h:
-	Expose natural size via _GTK_NATURAL_SIZE window property.
-	* tests/testextendedlayout.c: Test natural size handling
-	of GtkAlignment, GtkPlug and GtkSocket.
-
-2007-07-26  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtktable.c: Seems natural size for spanning cells worked already.
-	* tests/testextendedlayout.c: Test spanning cells. Do not expand
-	succeeded root nodes.
-
-2007-07-24  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkhbox.c, gtk/gtktable.c, gtk/gtkvbox.c: Also apply natural
-	size, when there are no expandable children. Fix natural size 
-	calculation for GtkVBox.
-	* tests/testextendedlayout.c: More extensive natural size testing.
-	Make sure that really all guide groups are tested. Add detail
-	to test case label in results page.
-
-2007-07-24  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtktable.c, gtk/gtktable.h: Consider natural size to allocate 
-	widgets spanning a single, rename GtkTableRowCol::natural_size.
-	Remove some lost g_print statements.
-	* tests/testextendedlayout.c: Test natural size allocation in
-	GtkTable for simple cases.
-
-2007-07-23  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtktable.c, gtk/gtktable.h: Provide natural size information.
-	* tests/autotestextendedlayout.c: Implemented some initial natural 
-	size tests for GtkTable.
-
-2007-07-18  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkextendedlayout.h, gtk/gtkhbox.c, gtk/gtkvbox.c:
-	Make the type check part of the extended layout feature check macros.
-
-2007-07-16  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testellipsise.c: Extend the test to support rotations.
-	* gtk/gtklabel.c: Support ellipsizing and wrapping on labels
-	rotated by multiples of 90°.
-
-2007-07-16  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkvbox.c, tests/testextendedlayout.c:
-	Implement and test natural size support for GtkVBox.
-	* gtk/gtkhbox.c: Cleanup issues found when implementing
-	natural size for GtkVBox.
-
-2007-07-15  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Improve test result grouping.
-
-2007-07-04  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkbin.c: Propagate baseline offset to the child widget.
-	* gtk/gtkhbox.c: Properly apply baseline alignment by using the
-	baseline found during requisition calculation for size allocation.
-	* tests/testextendedlayout.c: Add yscale variantes of GtkAlignment
-	to the baseline tests. Improve widget names. Split status message
-	into two lines.
-
-2007-07-03  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Allow choosing initially active 
-	notebook page from command line and create more sane widget names
-	for the sake of g_print-debugging.
-
-2007-07-02  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkbin.c: Properly evaluate natural size.
-	* gtk/gtkhbox.c: Consider natural size for child placement.
-	* gtk/gtklabel.c: Drop any PangoLayout width assigned during the
-	size allocation process to get proper natural size readings.
-	* tests/testextendedlayout.c: Add some GtkHPaned to the natural
-	size test for dynamic evaluation of the algorithm. Create guides for
-	the button of the height-for-width test for debugging, as it is
-	affected by natural sizing of GtkHBox.
-
-2007-07-01  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtk.symbols, gtk/gtkextendedlayout.c, gtk/gtkextendedlayout.h:
-	Add gtk_extended_layout_set_baseline_offset to allow widget to adjust
-	their baselines to the findings of their parent container.
-	* gtk/gtkhbox.c: Use gtk_extended_layout_set_baseline_offset to obey
-	the uniform height constraint of the horizontal box. Do not cache
-	baselines found during requisition evaluation, as baselines can
-	change, when assigning a widget more space than requested.
-	* gtk/gtklabel.c: Implement gtk_extended_layout_set_baseline_offset.
-
-2007-07-01  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Invalidate previously selected
-	widget when choosing another one, to avoid drawing artifacts.
-
-2007-07-01  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Improve drawing of baseline guides.
-
-2007-07-01  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkhbox.c: Properly report feature set and consider
-	baseline_policy when evaluating the baseline of the box.
-	* gtk/gtklabel.c: Adjust the coding style of get_features
-	to match the style of GtkHBox.
-
-2007-07-01  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkhbox.c: Make baseline alignment work, by ignoring the uniform
-	height constraint a GtkHBox implies. TODO: Obey that constraint.
-
-2007-07-01  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkhbox.c: Rudimentary implementation of GtkExtendLayout.
-
-2007-06-30  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Provide button variant of the 
-	GtkHBox baseline alignment test, as those buttons show some
-	shortcomings of my current baseline concept.
-
-2007-06-30  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c:
-	Provide status text, when no widget is selected.
-
-2007-06-29  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkframe.c: Drop g_debug messages.
-
-2007-06-29  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Move buttons to top and
-	provide textual information about currently hovered widget.
-
-2007-06-29  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Move code to setup UI
-	from main to test_suite_new.
-
-2007-06-29  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Split Baseline Alignment tests into
-	separate tests and move the notebook tabs to the right.
-	* gtk/gtkhbox.c: Properly decode "debug-wanted" object
-	tag with GPOINTER_TO_INT.
-
-2007-06-29  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkextendedlayout.h, gtk/gtkextendedlayout.c,
-	gtk/gtk.symbols: Add gtk_extended_layout_get_padding.
-	* gtk/gtkalignment.c, gtk/gtkbin.c, gtk/gtkbutton.c, 
-	gtk/gtkframe.c: Implement gtk_extended_layout_get_padding.
-	* tests/autotestextendedlayout.c: Verify padding information 
-	provided via gtk_extended_layout_get_padding.
-
-2007-06-28  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkhbox.c: Merge separate, but nearly identical child allocation
-	code for start and end packing into one single loop. This should avoid
-	programming errors caused by extensive code duplication, as they happend 
-	to me with the previous commit. Maybe some advanced compiler is able
-	to do the trivial loop unrolling.
-	* tests/testextendedlayout.c: Use exteriour guides instead of
-	separators to identify GtkHBox allocation and extend the baseline
-	alignment tests for GtkHBox.
-
-2007-06-28  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkhbox.c, gtk/gtkhbox.h, gtk/gtk.symbols:
-	Initial, buggish implementation of baseline alignment in GtkHBox.
-	* tests/testextendedlayout.c: Add baseline alignment tests.
-
-2007-06-28  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkenums.h: Introduce GtkBaselinePolicy.
-	* gtk/gtk.symbols: Add missing symbols.
-	* gtk/gtkextendedlayout.c, gtk/gtkextendedlayout.h:
-	  Introduce gtk_extended_layout_get_single_baseline.
-
-2007-06-28  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkbin.c: Prevent undefined behaviour when
-	gtk_widget_translate_coordinates fails.
-	
-2007-06-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Provide checkboxes 
-	to choose guide types at runtime.
-
-2007-06-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Don't create
-	the tile pixmap with every expose event.
-
-2007-06-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkextendedlayout.h, tests/testextendedlayout.c:
-	Dynamically highlight the currently hovered widget and its guides.
-
-2007-06-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtkbin.c, tests/autotestextendedlayout.c,
-	tests/testextendedlayout.c: Implement GtkExtendedLayout for GtkBin.
-
-2007-06-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtklabel.c, tests/autotestextendedlayout.c:
-	Implement get_natural_size for GtkLabel.
-
-2007-06-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtklabel.c, tests/autotestextendedlayout.c: 
-	Implement get_height_for_width for GtkLabel.
-
-2007-06-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/autotestextendedlayout.c: Correct some assumptions,
-	write baseline values to console.
-
-2007-06-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtklabel.c: Remove some late hacking crack.
-
-2007-06-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/gtklabel.c, tests/autotestextendedlayout.c,
-	tests/testextendedlayout.c, tests/Makefile.am:
-	Implementing get_baselines for GtkLabel and testing it.
-
-2007-06-19  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gtk/Makefile.am, gtk/gtk.h, gtk/gtkextendedlayout.c, 
-	gtk/gtkextendedlayout.h: Implement GtkExtendLayout interface.
-
-2007-06-18  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* gdk/*, gtk/*: Resynching with trunk to avoid future
-	merge conflicts with the giant GtkBuilder patch.
-
-2007-05-29  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* testextendedlayout.c: Implement formal testing.
-
-2007-05-29  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* testextendedlayout.c: Create initial height-for-width test.
-
-2007-05-29  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* testextendedlayout.c: Also retreive base line information
-	for GtkTextView widgets.
-
-2007-05-28  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* testextendedlayout.c: Ported guides drawing to legacy
-	GdkGC API, which looks worse but supports IncludeInferiors.
-
-2007-05-28  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* testextendedlayout.c: Provide some hint which label
-	a guide belongs to.
-
-2007-05-28  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* testextendedlayout.c: Some refactoring to get rid
-	of the global list of allocation guides.
-
-2007-05-27  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c, tests/Makefile.am:
-	Build-fixes for testextendedlayout.
-
-2007-04-21  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c: Initial implementation of
-	base line test.
-
-2007-04-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* tests/testextendedlayout.c, tests/Makefile.am,
-	ChangeLog.gtk-extended-layout: Creating testing framework,
-	starting with natural size testing.
-
@@ -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
-
@@ -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
@@ -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>
@@ -47,7 +47,7 @@ gtk+ and glib.  You can do the following to get glib and gtk+ from cvs:
   $ cvs -z3 checkout atk
   $ cvs -z3 checkout gtk+

-For information about submitting patches and committing changes
+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.
@@ -3,29 +3,31 @@ Prerequisites

 GTK+ requires the following packages:

- - The GLib, Pango, ATK and cairo libraries, available at the same 
-   location as GTK+. GTK+ 2.11.3 requires at least GLib 2.12, 
-   Pango 1.13, ATK 1.9 and cairo 1.2.
+ - The GLib, Pango, and Atk libraries, available at the same location as GTK+
+   (Either Pango-1.0 or Pango-1.2 can be used with GTK+-2.2; 
+   Pango-1.2 is recommended.)

 - 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/
-    http://www.libpng.org/
-    http://www.ijg.org/
+    ftp://swrinde.nde.swri.edu/pub/png/src/
+    ftp://ftp.uu.net/graphics/jpeg/

-    libtiff must be version 3.6.0 or higher.
+   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.11.3.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.11.3			   # change to the toplevel directory
+  % gzip -cd gtk+-2.2.2.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.2.2			   # 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
 ===========
@@ -33,7 +35,7 @@ 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:

@@ -3,19 +3,21 @@ Prerequisites

 GTK+ requires the following packages:

- - The GLib, Pango, ATK and cairo libraries, available at the same 
-   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.12, 
-   Pango 1.13, ATK 1.9 and cairo 1.2.
+ - The GLib, Pango, and Atk libraries, available at the same location as GTK+
+   (Either Pango-1.0 or Pango-1.2 can be used with GTK+-2.2; 
+   Pango-1.2 is recommended.)

 - 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/
-    http://www.libpng.org/
-    http://www.ijg.org/
+    ftp://swrinde.nde.swri.edu/pub/png/src/
+    ftp://ftp.uu.net/graphics/jpeg/

-    libtiff must be version 3.6.0 or higher.
+   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
 ========================
@@ -23,9 +25,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
 ===========
@@ -33,7 +35,7 @@ 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:

@@ -1,7 +0,0 @@
-Email: mclasen@redhat.com
-Email: timj@gtk.org
-
-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.
@@ -1,10 +1,10 @@
 ## Makefile.am for GTK+

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

 # require automake 1.4
-AUTOMAKE_OPTIONS = 1.7
+AUTOMAKE_OPTIONS = 1.4

 EXTRA_DIST =			\
 	HACKING			\
@@ -13,19 +13,13 @@ EXTRA_DIST =			\
 	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.gtk-async-file-chooser	\
-	ChangeLog.gtk-printing	\
 	README.cvs-commits	\
 	README.win32		\
 	config.h.win32		\
-	makefile.msc	\
 	gtk-zip.sh.in		\
 	sanitize-la.sh		\
 	po/README.translators	\
+	po/makefile.mingw	\
 	po/po2tbl.sed.in	\
 	examples/aspectframe/Makefile  \
 	examples/aspectframe/aspectframe.c  \
@@ -136,12 +130,7 @@ gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc

-if OS_UNIX
-pkgconfig_DATA += gtk+-unix-print-2.0.pc
-endif
-
 DISTCLEANFILES =				\
-	gtk+-unix-print-2.0.pc			\
 	gtk+-$(GDKTARGET)-2.0.pc		\
 	gdk-$(GDKTARGET)-2.0.pc			\
 	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
@@ -159,10 +148,6 @@ install-data-hook:
 	 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)

-uninstall-local:
-	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-2.0.pc
-	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-2.0.pc
-
 dist-hook:
 	if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
 	     CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
@@ -195,4 +180,27 @@ sanity:
 snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`

-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds
+
+# 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"
@@ -1,7 +1,7 @@
 General Information
 ===================

-This is GTK+ version 2.11.3. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.2.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.
@@ -20,240 +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'

+Release notes
+=============

-Release notes for 2.12
-======================
+* As compared to GTK+-1.2, the default configuration of GTK+-2 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.

-* Functions: 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.
+   - 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:

-* The tiff loader now requires libtiff 3.6.0 or later.
+      gtk-key-theme-name = "Emacs"
+   
+     To your ~/.gtkrc-2.0

-* Support for Windows 9x/ME has officially been removed. It hasn't worked
-  since 2.6 anyway.
+   - Editing of menu accelerators by pressing an accelerator over the
+     menu item is disabled by default. To enable, it, add:

-* 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.
+      gtk-can-change-accels = 1

-* 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.
+     to your ~/.gtkrc-2.0

-* 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).
+   - 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:

-* 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 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.
-
-* Removed an unused and hardly visible GtkFrame 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.
-
-
-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://developer.gnome.org/doc/API/2.0/gobject/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.
+  use these private symbols.

-* 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
+* GTK+-2.2 can be build either with Pango-1.0 and version 1 of
+  the Xft library or Pango-1.2 and version 2 of the Xft library
+  (Xft is used to to display anti-aliased fonts) By default, GTK+ and 
+  Pango are built so that applications will not have explicit dependencies 
+  on either version of 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-deps options, since they will cause dependencies 
+      on the particular version of Xft.
+
+    - Do not use Xft version 1 directly in your applications.
+
+* 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 on by default when using Xft2 but off by
+  default when using Xft1. To change this default, set the
+  variable GDK_USE_XFT to '1' or '0'. For instance, to 
+  turn on Xft fonts when Xft1.
+
+   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
+* While efforts have been made to make gdk-pixbuf robust against
+  invalid images, using gdk-pixbuf to load untrusted data 
+  is not recommended, due to the likelyhood that there are
+  additional problems where an invalid image could cause
+  gdk-pixbuf to crash or worse.
+
+* 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.2 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
 ==================

@@ -273,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
@@ -287,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
 =======

@@ -299,7 +157,7 @@ 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
+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.)
@@ -18,17 +18,17 @@ to ask people commiting to GTK+ to follow a few rules:
   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.
+   #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 without ChangeLog entries
+   ChangeLog entries are mandatory.) Changes with out ChangeLog entries
   will be reverted.

 3) There _must_ be a ChangeLog for every commit.
@@ -38,7 +38,7 @@ 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 preferably match in date format
+* The ChangeLog entries should preferrably match in date format
  with the existing entries. You can set how emacs does this
  by using customize mode:

@@ -20,253 +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'

+Release notes
+=============

-Release notes for 2.12
-======================
+* As compared to GTK+-1.2, the default configuration of GTK+-2 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.

-* Functions: 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.
+   - 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:

-* The tiff loader now requires libtiff 3.6.0 or later.
+      gtk-key-theme-name = "Emacs"
+   
+     To your ~/.gtkrc-2.0

-* Support for Windows 9x/ME has officially been removed. It hasn't worked
-  since 2.6 anyway.
+   - Editing of menu accelerators by pressing an accelerator over the
+     menu item is disabled by default. To enable, it, add:

-* 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.
+      gtk-can-change-accels = 1

-* 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.
+     to your ~/.gtkrc-2.0

-* 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).
+   - 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:

-* 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 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.
-
-* Removed an unused and hardly visible GtkFrame 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.
-  
-
-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://developer.gnome.org/doc/API/2.0/gobject/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.
+  use these private symbols.

-* 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
+* GTK+-2.2 can be build either with Pango-1.0 and version 1 of
+  the Xft library or Pango-1.2 and version 2 of the Xft library
+  (Xft is used to to display anti-aliased fonts) By default, GTK+ and 
+  Pango are built so that applications will not have explicit dependencies 
+  on either version of 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-deps options, since they will cause dependencies 
+      on the particular version of Xft.
+
+    - Do not use Xft version 1 directly in your applications.
+
+* 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 on by default when using Xft2 but off by
+  default when using Xft1. To change this default, set the
+  variable GDK_USE_XFT to '1' or '0'. For instance, to 
+  turn on Xft fonts when Xft1.
+
+   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
+* While efforts have been made to make gdk-pixbuf robust against
+  invalid images, using gdk-pixbuf to load untrusted data 
+  is not recommended, due to the likelyhood that there are
+  additional problems where an invalid image could cause
+  gdk-pixbuf to crash or worse.
+
+* 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.2 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
 ==================

@@ -286,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
@@ -300,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
 =======

@@ -312,7 +157,7 @@ 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
+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.)
@@ -1,93 +1,42 @@
-The Win32 backend in GTK+ is not as stable or correct as the X11 one.
+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/ .

-For prebuilt runtime and developer packages see
-http://ftp.gnome.org/pub/gnome/binaries/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
 ======================

-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 .
+There are two ways to build GTK+ for win32:

-After installing the dependencies, 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. 

-1) GNU tools, ./configure && make install
-----------------------------------------
+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

-This requires you have mingw and MSYS.
+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.

-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.10 unpacked from a source
-distribution is as below. This is from bulding GTK+ 2.10.9, slightly
-edited to make it match this 2.11 development branch. Actually I don't
-use any script like this to build the development branch, as I don't
-distribute any binaries from development branches.
-
-MOD=gtk+
-VER=2.10.9
-THIS=$MOD-$VER
-HEX=`echo $THIS | md5sum | cut -d' ' -f1`
-TARGET=c:/devel/target/$HEX
-DEPS="`/devel/src/tml/latest.sh glib atk cairo pango`"
-sed -e 's/need_relink=yes/need_relink=no # no way --tml/' <ltmain.sh >ltmain.temp && mv ltmain.temp ltmain.sh
-usedev
-usemsvs6
-MY_PKG_CONFIG_PATH=""
-for D in $DEPS; do
-    PATH=/devel/dist/$D/bin:$PATH
-    MY_PKG_CONFIG_PATH=/devel/dist/$D/lib/pkgconfig:$MY_PKG_CONFIG_PATH
-done
-PKG_CONFIG_PATH=$MY_PKG_CONFIG_PATH:$PKG_CONFIG_PATH CC='gcc -mtune=pentium3 -mthreads' CPPFLAGS='-I/opt/gnu/include -I/opt/gnuwin32/include -I/opt/misc/include' LDFLAGS='-L/opt/gnu/lib -L/opt/gnuwin32/lib -L/opt/misc/lib -Wl,--enable-auto-image-base' LIBS=-lintl CFLAGS=-O2 ./configure --with-gdktarget=win32 --enable-debug=yes --disable-gtk-doc --disable-static --prefix=$TARGET &&
-libtoolcacheize &&
-unset MY_PKG_CONFIG_PATH &&
-PATH=/devel/target/$HEX/bin:.libs:$PATH make install &&
-(cd $TARGET/bin; strip --strip-unneeded *.dll *.exe) &&
-(cd $TARGET/lib/gtk-2.0/2.10.0/loaders; strip --strip-unneeded *.dll) &&
-(cd $TARGET/lib/gtk-2.0/2.10.0/immodules; strip --strip-unneeded *.dll) &&
-(cd $TARGET/lib/gtk-2.0/2.10.0/engines; strip --strip-unneeded *.dll) &&
-PATH=$TARGET/bin:$PATH gdk-pixbuf-query-loaders >$TARGET/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 &&
-(cd /devel/src/tml && zip /tmp/$MOD-dev-$VER.zip make/$THIS.make) &&
-manifestify /tmp/$MOD*-$VER.zip
-
-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.sh" script, 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.
-
-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.
+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.

-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
+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 for instance the makefile.msc files will 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
@@ -101,17 +50,41 @@ 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.
+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 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.
+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.

--Tor Lillqvist <tml@iki.fi>, <tml@novell.com>
+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>
@@ -19,6 +19,7 @@
 #undef GTK_COMPILED_WITH_DEBUGGING

 #undef HAVE_CATGETS
+#undef HAVE_DIMM_H
 #undef HAVE_GETTEXT
 #undef HAVE_IPC_H
 #undef HAVE_LC_MESSAGES
@@ -26,8 +27,6 @@
 #undef HAVE_PWD_H
 #undef HAVE_SHM_H
 #undef HAVE_STPCPY
-#undef HAVE_SYS_SYSINFO_H
-#undef HAVE_SYS_SYSTEMINFO_H
 #undef HAVE_XSHM_H
 #undef HAVE_SHAPE_EXT
 #undef HAVE_SOLARIS_XINERAMA
@@ -35,6 +34,8 @@
 #undef HAVE_SYS_TIME_H
 #undef HAVE_XFREE_XINERAMA
 #undef HAVE_XINERAMA
+#undef HAVE_WINSOCK_H
+#undef HAVE_WINTAB
 #undef HAVE_XCONVERTCASE
 #undef HAVE_XFT

@@ -46,8 +47,6 @@

 #undef USE_GMODULE
 #undef USE_MMX
-#undef USE_MEDIALIB
-#undef USE_MEDIALIB25

 /* Define to use XKB extension */
 #undef HAVE_XKB
@@ -70,8 +69,6 @@

 #undef GETTEXT_PACKAGE

-#undef HAVE_CUPS_API_1_2
-
 /* #undef PACKAGE */
 /* #undef VERSION */

@@ -10,70 +10,3 @@ AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP],
              [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 $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
-])
-
-
-# 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
-
-  # check for the xmlcatalog program
-  AC_PATH_PROG(XMLCATALOG, xmlcatalog, no)
-  if test "x$XMLCATALOG" = xno; then
-    jh_found_xmlcatalog=false
-  fi
-
-  if $jh_found_xmlcatalog; then
-    ifelse([$1],,[:],[$1])
-  else
-    ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2])
-  fi
-])
-
-# 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
-])
@@ -25,34 +25,34 @@ 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 http://ftp.gnu.org/gnu/libtool/"
+	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
 	DIE=1
 fi

-(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have gtk-doc installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-	DIE=1
-}
-
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
+	echo "libtool the appropriate package for your distribution,"
+	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
 	DIE=1
 }

-if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.7
-    ACLOCAL=aclocal-1.7
-else
+have_automake=false
+if automake-1.4 --version < /dev/null > /dev/null 2>&1 ; then
+	automake_version=`automake-1.4 --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.7.x installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
+	echo "You must have automake 1.4-p6 installed to compile $PROJECT."
+	echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.4-p6.tar.gz"
+	echo "(or a newer version if it is available)"
 	DIE=1
 fi

@@ -72,9 +72,13 @@ if test -z "$AUTOGEN_SUBDIR_MODE"; then
        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`
+	acdir=`aclocal-1.4 --print-ac-dir`
        m4list="glib-2.0.m4 glib-gettext.m4"

 	for file in $m4list
@@ -91,26 +95,17 @@ if test -z "$ACLOCAL_FLAGS"; then
 	done
 fi

-rm -rf autom4te.cache
+aclocal-1.4 $ACLOCAL_FLAGS

-# 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
+# optionally feature autoheader
+(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader

-$ACLOCAL $ACLOCAL_FLAGS || exit $?
-
-libtoolize --force || exit $?
-gtkdocize || exit $?
-
-autoheader || exit $?
-
-$AUTOMAKE --add-missing || exit $?
-autoconf || exit $?
-cd $ORIGDIR || exit $?
+automake-1.4 -a $am_opt
+autoconf
+cd $ORIGDIR

 if test -z "$AUTOGEN_SUBDIR_MODE"; then
-        $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
+        $srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@"

        echo 
        echo "Now type 'make' to compile $PROJECT."
@@ -31,15 +31,14 @@
 /* #undef HAVE_STPCPY */
 /* #undef HAVE_XSHM_H */
 /* #undef HAVE_SHAPE_EXT */
-/* #undef HAVE_SOLARIS_XINERAMA */
 /* #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 */
-/* #undef HAVE_XFREE_XINERAMA */
-/* #undef HAVE_XINERAMA */
+#define HAVE_WINSOCK_H 1
+#define HAVE_WINTAB 1
 /* #undef HAVE_XCONVERTCASE */
 /* #undef HAVE_XFT */

@@ -54,6 +53,9 @@
 #define USE_MMX 1
 #endif

+/* Define to use X11R6 additions to XIM */
+/* #undef USE_X11R6_XIM */
+
 /* Define to use XKB extension */
 /* #undef HAVE_XKB */

@@ -84,184 +86,204 @@
   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 the location where the catalogs will be installed */
-#define GTK_LOCALEDIR "UNUSED"
+/* Define if you have `alloca', as a function or macro. */
+#define HAVE_ALLOCA 1

-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define if you have the <argz.h> header file. */
+/* #undef HAVE_ARGZ_H */
+
+/* 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 `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 `getpagesize' function. */
+/* Define if you have the `getpagesize' function. */
 #ifndef _MSC_VER
 #define HAVE_GETPAGESIZE 1
 #else /* _MSC_VER */
 /* #undef HAVE_GETPAGESIZE */
 #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

-/* Define to 1 if you have the <inttypes.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_INTTYPES_H 1
-#else /* _MSC_VER */
+/* Define if you have the <inttypes.h> header file. */
 /* #undef HAVE_INTTYPES_H */
-#endif /* _MSC_VER */

 /* 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 `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 you have the <pwd.h> header file. */
+/* Define if you have the `munmap' function. */
+/* #undef HAVE_MUNMAP */
+
+/* Define if you have the <nl_types.h> header file. */
+/* #undef HAVE_NL_TYPES_H */
+
+/* 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 you have the <stdint.h> header file. */
+/* Define if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
+/* Define if you have the <stdint.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_STDINT_H 1
 #else /* _MSC_VER */
 /* #undef HAVE_STDINT_H */
 #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 if you have the `strcasecmp' function. */
+#ifndef _MSC_VER
+#define HAVE_STRCASECMP 1
+#else /* _MSC_VER */
+/* #undef HAVE_STRCASECMP */
+#endif /* _MSC_VER */
+
+/* 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 to 1 if you have the <string.h> header file. */
+/* Define if you have the <string.h> header file. */
 #define HAVE_STRING_H 1

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

-/* 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 /* _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 /* _MSC_VER */
 /* #undef HAVE_UNISTD_H */
 #endif /* _MSC_VER */

-/* Have uxtheme.h include file */
-#define HAVE_UXTHEME_H 1
-
 /* Have wchar.h include file */
 #define HAVE_WCHAR_H 1

 /* 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

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

-/* Have the Xcursor library */
-/* #undef HAVE_XCURSOR */
+/* Define if you have the `__argz_next' function. */
+/* #undef HAVE___ARGZ_NEXT */

-/* Have the XFIXES X extension */
-/* #undef HAVE_XFIXES */
-
-/* Define to 1 if you have the `XInternAtoms' function. */
-/* #undef HAVE_XINTERNATOMS */
-
-/* Have the SYNC extension library */
-/* #undef HAVE_XSYNC */
-
-/* Define if _NL_TIME_FIRST_WEEKDAY is available */
-/* #undef HAVE__NL_TIME_FIRST_WEEKDAY */
-
-/* Define if <X11/extensions/XIproto.h> needed for xReply */
-/* #undef NEED_XIPROTO_H_FOR_XREPLY */
-
-/* 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+ 2.9.0"
-
-/* 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

-/* Whether to load modules via .la files rather than directly */
-/* #undef USE_LA_MODULES */
-
-/* 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
@@ -1,5 +1,8 @@

-SUBDIRS =
 if USE_X11
-SUBDIRS += gdk-pixbuf-xlib
+XDIRS=gdk-pixbuf-xlib
+else
+XDIRS=
 endif
+
+SUBDIRS=$(XDIRS)
@@ -1,164 +1,3 @@
-2007-06-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.3 ===
-
-2007-06-06  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.2 ===
-
-2007-06-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.1 ===
-
-2007-05-24   Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.11.0 ===
-
-2006-10-08  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk-pixbuf-xlib.c: Apply a cleanup patch by
-	Kjartan	Maraas  (#341812)
-
-2006-08-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.10.2 ===
-
-2006-07-23  Matthias Clasen  <mclasen@redhat.com>
-	
-	* === Released 2.10.1 ===
-
-2006-07-02  Matthias Clasen  <mclasen@redhat.com>
-	
-	* === Released 2.10.0 ===
-
-2006-06-21  Matthias Clasen  <mclasen@redhat.com>
-	
-	* === Released 2.9.4 ===
-
-2006-06-12  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.3 ===
-
-2006-06-05  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.2 ===
-
-2006-05-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.1 ====
-
-2006-05-04  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.9.0 ===
-
-2005-11-17  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk-pixbuf-xlib-drawable.c: 
-	* gdk-pixbuf-xlibrgb.c: const correctness fixes
-	found by Arjan van de Ven and gcc.
-
-2005-10-05  Matthias Clasen  <mclasen@redhat.com>
-
-	* gdk-pixbuf-xlib-2.0.pc.in (Requires): Require
-	gmodule-no-export-2.0 instead of gmodule-2.0
-
-2005-08-24  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.8.2 ===
-
-	* === Released 2.8.1 ===
-
-2005-08-13  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.8.0 ===
-
-2005-08-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.7.5 ===
-
-2005-07-22  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.7.4 === 
-
-2005-07-15  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.7.3 ===
-	
-2005-07-08  Matthias Clasen  <mclasen@redhat.com>
-	
-	* === Released 2.7.2 ===
-
-2005-07-01  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.7.1 ===
-	
-2005-06-20  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.7.0 ===
-
-2005-01-08  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.6.1 ===
-	
-2004-12-16  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.6.0 ===
-
-2004-12-02  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.6 ===
-
-2004-11-12  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.5 ===
-
-2004-10-27  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.4 ===
-
-2004-09-19  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.3 ===
-
-2004-08-25  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.2 ===
-
-2004-08-01  Matthias Clasen  <mclasen@redhat.com>
-
-	* === Released 2.5.1 ===
-
-Tue Jul 20 23:26:10 2004  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf-xlibrgb.c:  Include config.h first.  (#148034)
-
-Sun Jul 18 20:17:41 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
-
-	* === released 2.5.0 ==
-
-Tue Mar  9 09:33:54 2004  Owen Taylor  <otaylor@redhat.com>
-
-	* === Released 2.3.6 ===
-
-Wed Mar  3 15:50:28 2004  Owen Taylor  <otaylor@redhat.com>
-
-	* Makefile.am (libgdk_pixbuf_xlib_2_0_la_LIBADD): Add 
-	a shared library dependency on libgdk-pixbuf (#124687)
-
-Tue Feb 24 14:45:03 2004  Owen Taylor  <otaylor@redhat.com>
-
-	* === Released 2.3.3 ===
-
-Fri Feb 13 10:32:09 2004  Owen Taylor  <otaylor@redhat.com>
-
-	* gdk-pixbuf-xlibrgb.h: Remove a couple of unneeded
-	#includes. Isn't unsupported code fun?
-	(133833, Gregory Merchan)
-
-Tue Oct  7 23:30:00 2003  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf-xlib.h: Add C++ guards. (123955, Harring Figueiredo)
-
 2002-08-06  jacob berkman  <jacob@ximian.com>

 	* Makefile.am (lib_LTLIBRARIES): link against xlibs
@@ -1,24 +1,20 @@
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la

-INCLUDES = \
+INCLUDES = @STRIP_BEGIN@			\
 	-I$(top_srcdir) -I$(top_builddir) 	\
 	-I$(top_srcdir)/gdk-pixbuf 		\
 	-I$(top_srcdir)/contrib 		\
+	-DG_DISABLE_DEPRECATED			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
-	$(GDK_PIXBUF_XLIB_DEP_CFLAGS)
+	@GDK_PIXBUF_XLIB_DEP_CFLAGS@		\
+@STRIP_END@

 libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
 	-export-dynamic						\
-	$(no_undefined)						\
-	-version-info $(LT_VERSION_INFO)
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)

 libgdk_pixbuf_xlib_2_0_la_LIBADD = \
-        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
-	$(GDK_PIXBUF_XLIB_DEP_LIBS)
+	@GDK_PIXBUF_XLIB_DEP_LIBS@

 libgdk_pixbuf_xlib_2_0_la_SOURCES =         \
 	gdk-pixbuf-xlib-private.h	\
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: GdkPixbuf Xlib
 Description: GdkPixbuf rendering for Xlib
 Version: @VERSION@
-Requires: gobject-2.0,gmodule-no-export-2.0,gdk-pixbuf-2.0
+Requires: gobject-2.0,gmodule-2.0,gdk-pixbuf-2.0
 Libs: -L${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@
 Cflags: -I${includedir}
@@ -41,7 +41,7 @@



-static const guint32 mask_table[] = {
+static guint32 mask_table[] = {
 	0x00000000, 0x00000001, 0x00000003, 0x00000007,
 	0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f,
 	0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff,
@@ -152,6 +152,7 @@ rgb1 (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	int xx, yy;
 	int width, height;
 	int bpl;
+	guint8 *s;
 	register guint8 data;
 	guint8 *o;
 	guint8 *srow = image->data, *orow = pixels;
@@ -166,6 +167,7 @@ rgb1 (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	bpl = image->bytes_per_line;

 	for (yy = 0; yy < height; yy++) {
+		s = srow;
 		o = orow;

 		for (xx = 0; xx < width; xx ++) {
@@ -189,6 +191,7 @@ rgb1a (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	int xx, yy;
 	int width, height;
 	int bpl;
+	guint8 *s;
 	register guint8 data;
 	guint8 *o;
 	guint8 *srow = image->data, *orow = pixels;
@@ -218,6 +221,7 @@ rgb1a (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	}

 	for (yy = 0; yy < height; yy++) {
+		s = srow;
 		o = orow;

 		for (xx = 0; xx < width; xx ++) {
@@ -543,11 +547,7 @@ rgb565amsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
 	bpl = image->bytes_per_line;

 	for (yy = 0; yy < height; yy++) {
-#ifdef LITTLE
 		s = srow;
-#else
-		s = (guint16 *) srow;
-#endif
 		o = (guint32 *) orow;
 		for (xx = 0; xx < width; xx ++) {
 			register guint32 data;
@@ -670,11 +670,7 @@ rgb555msb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
 	bpl = image->bytes_per_line;

 	for (yy = 0; yy < height; yy++) {
-#ifdef LITTLE
 		s = srow;
-#else
-		s = (guint32 *) srow;
-#endif
 		o = (guint16 *) orow;
 		for (xx = 1; xx < width; xx += 2) {
 			register guint32 data;
@@ -984,6 +980,7 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
 	int width, height;
 	int bpl;
 	guint8 *srow = image->data, *orow = pixels;
+	guint8 *s;
 	guint8 *o;
 	guint32 pixel;
 	Visual *v;
@@ -1006,6 +1003,7 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
 		 red_prec, green_prec, blue_prec));

 	for (yy = 0; yy < height; yy++) {
+		s = srow;
 		o = orow;
 		for (xx = 0; xx < width; xx++) {
 			pixel = XGetPixel (image, xx, yy);
@@ -1052,7 +1050,7 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *

 typedef void (* cfunc) (XImage *image, guchar *pixels, int rowstride, xlib_colormap *cmap);

-static const cfunc convert_map[] = {
+static cfunc convert_map[] = {
 	rgb1,rgb1,rgb1a,rgb1a,
 	rgb8,rgb8,rgb8a,rgb8a,
 	rgb555lsb,rgb555msb,rgb555alsb,rgb555amsb,
@@ -21,10 +21,6 @@
 #ifndef GDK_PIXBUF_XLIB_H
 #define GDK_PIXBUF_XLIB_H

-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
 #include <X11/Xlib.h>
@@ -83,9 +79,4 @@ GdkPixbuf *gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest,
 					      int dest_x, int dest_y,
 					      int width, int height);

-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
 #endif /* GDK_PIXBUF_XLIB_H */
@@ -47,6 +47,8 @@
 * Shawn T. Amundson    <amundson@gtk.org>
 */

+#include <math.h>
+
 #if HAVE_CONFIG_H
 #  include <config.h>
 #  if STDC_HEADERS
@@ -59,8 +61,6 @@
 #  include <stdlib.h>
 #endif

-#include <math.h>
-
 #define ENABLE_GRAYSCALE

 /* include this before so that we can get endian definitions if
@@ -516,7 +516,7 @@ static guint32
 xlib_rgb_score_visual (XVisualInfo *visual)
 {
  guint32 quality, speed, pseudo, sys;
-  static const char * const visual_names[] =
+  static const char* visual_names[] =
  {
    "static gray",
    "grayscale",
@@ -821,7 +821,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)

      image_info->stage_buf = NULL;

-      image_info->own_gc = NULL;
+      image_info->own_gc = 0;
      
      image_info->red_shift = 0;
      image_info->red_prec = 0;
@@ -908,7 +908,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)
 					 image_info->x_visual_info->visual,
 					 1,
 					 XYBitmap,
-					 0, NULL, IMAGE_WIDTH, IMAGE_HEIGHT,
+					 0, 0, IMAGE_WIDTH, IMAGE_HEIGHT,
 					 8,
 					 0);
 	  static_image[i]->data = malloc(IMAGE_WIDTH * IMAGE_HEIGHT >> 3);
@@ -920,7 +920,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)
 					 image_info->x_visual_info->visual,
 					 (unsigned int)image_info->x_visual_info->depth,
 					 ZPixmap,
-					 0, NULL,
+					 0, 0,
 					 IMAGE_WIDTH,
 					 IMAGE_HEIGHT,
 					 32, 0);
@@ -3651,7 +3651,7 @@ xlib_rgb_get_visual (void)
  if (image_info)
    return image_info->x_visual_info->visual;
  else
-    return NULL;
+    return 0;
 }

 /**
@@ -3668,7 +3668,7 @@ xlib_rgb_get_visual_info (void)
  if (image_info)
    return image_info->x_visual_info;
  else
-    return NULL;
+    return 0;
 }

 /**
@@ -57,6 +57,8 @@ extern "C" {

 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/Xos.h>
+#include <X11/Intrinsic.h>

 #include <glib.h>

@@ -2,52 +2,49 @@

 SUBDIRS = gtk-demo

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

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

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

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

-# Need to build test-inline-pixbufs.h for testpixbuf
-if HAVE_PNG
-noinst_PROGRAMS += testpixbuf
-BUILT_SOURCES = test-inline-pixbufs.h
-endif
-
 if CROSS_COMPILING
 pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
 pixbuf_csource_deps=
 else
-pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
-pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders 
+pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$$topdir/gdk-pixbuf/gdk-pixbuf.loaders $$topdir/gdk-pixbuf/gdk-pixbuf-csource
+pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders
 endif

 test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
-	$(pixbuf_csource) --raw --build-list		\
-	        apple_red  $(srcdir)/apple-red.png	\
-                gnome_foot $(srcdir)/gnome-foot.png	\
-        > test-inline-pixbufs.h				\
-	|| (rm -f test-inline-pixbufs.h && false)
+	(topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \
+	  cd $(srcdir) &&				     \
+	      $(pixbuf_csource) --build-list \
+	        apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h || (rm -f $$curdir/test-inline-pixbufs.h && false))

 testpixbuf_DEPENDENCIES = $(DEPS)
 testpixbuf_drawable_DEPENDENCIES = $(DEPS)
@@ -64,6 +61,7 @@ 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_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
@@ -80,5 +78,3 @@ EXTRA_DIST =			\
 	gnome-gmush.png		\
 	gnome-gsame.png		\
 	gnu-keys.png
-
-DISTCLEANFILES = test-inline-pixbufs.h
@@ -4,4 +4,4 @@ Makefile.in
 .deps
 gtk-demo
 demos.h
-geninclude.pl
+
@@ -4,68 +4,58 @@ democodedir=$(datadir)/gtk-2.0/demo

 ## 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_completion.c			\
-	expander.c  				\
-	hypertext.c				\
-	iconview.c				\
-	iconview_edit.c				\
-	images.c				\
-	list_store.c				\
-	menus.c					\
-	panes.c					\
-	pickers.c				\
-	pixbufs.c				\
-	printing.c				\
-	rotated_text.c				\
-	sizegroup.c				\
-	stock_browser.c				\
-	textview.c				\
-	textscroll.c				\
-	tree_store.c				\
-	ui_manager.c
+demos = @STRIP_BEGIN@	\
+	appwindow.c	\
+	button_box.c	\
+	changedisplay.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	\
+@STRIP_END@

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

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

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

 bin_PROGRAMS = gtk-demo

 BUILT_SOURCES = demos.h

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

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

 gtk_demo_SOURCES = 		\
 	$(demos)		\
@@ -75,7 +65,6 @@ gtk_demo_SOURCES = 		\

 gtk_demo_DEPENDENCIES = $(DEPS)
 gtk_demo_LDADD = $(LDADDS)
-gtk_demo_LDFLAGS = -export-dynamic

 IMAGEFILES=	alphatest.png		\
 	        apple-red.png		\
@@ -83,15 +72,11 @@ 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		\
 		gnome-gsame.png		\
 		gnu-keys.png		\
-		gtk-logo-rgb.gif		
+		gtk-logo-rgb.gif

-democode_DATA = $(demos) $(IMAGEFILES) demo.ui
-
-DISTCLEANFILES = demos.h
+democode_DATA = $(demos) $(IMAGEFILES)
@@ -1,28 +1,27 @@
 /* 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 void
-activate_action (GtkAction *action)
-{
-  const gchar *name = gtk_action_get_name (action);
-  const gchar *typename = G_OBJECT_TYPE_NAME (action);

+static void
+menuitem_cb (gpointer             callback_data,
+             guint                callback_action,
+             GtkWidget           *widget)
+{
  GtkWidget *dialog;
  
-  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,
@@ -33,271 +32,55 @@ activate_action (GtkAction *action)
  gtk_widget_show (dialog);
 }

-static void
-activate_radio_action (GtkAction *action, GtkRadioAction *current)
-{
-  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));

-  if (active) 
-    {
-      GtkWidget *dialog;
+static GtkItemFactoryEntry menu_items[] =
+{
+  { "/_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 },
+
+  { "/_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" },
+
+  /* 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
+toolbar_cb (GtkWidget *button,
+            gpointer   data)
+{
+  GtkWidget *dialog;
  
-      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-				       GTK_DIALOG_DESTROY_WITH_PARENT,
-				       GTK_MESSAGE_INFO,
-				       GTK_BUTTONS_CLOSE,
-				       "You activated radio action: \"%s\" of type \"%s\".\n"
-				       "Current value: %d",
-				       name, typename, value);
+  dialog = gtk_message_dialog_new (GTK_WINDOW (data),
+                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_MESSAGE_INFO,
+                                   GTK_BUTTONS_CLOSE,
+                                   "You selected a toolbar button");

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

-static void 
-activate_email (GtkAboutDialog *about,
-		const gchar    *link,
-		gpointer        data)
-{
-  g_print ("send mail to %s\n", link);
-}
-
-static void 
-activate_url (GtkAboutDialog *about,
-	      const gchar    *link,
-	      gpointer        data)
-{
-  g_print ("show url %s\n", link);
-}
-
-static void
-about_cb (GtkAction *action,
-	  GtkWidget *window)
-{
-  GdkPixbuf *pixbuf, *transparent;
-  gchar *filename;
-
-  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
-  };
-
-  const gchar *license =
-    "This library is free software; you can redistribute it and/or\n"
-    "modify it under the terms of the GNU Library General Public License as\n"
-    "published by the Free Software Foundation; either version 2 of the\n"
-    "License, or (at your option) any later version.\n"
-    "\n"
-    "This library is distributed in the hope that it will be useful,\n"
-    "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
-    "Library General Public License for more details.\n"
-    "\n"
-    "You should have received a copy of the GNU Library General Public\n"
-    "License along with the Gnome Library; see the file COPYING.LIB.  If not,\n"
-    "write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
-    "Boston, MA 02111-1307, USA.\n";
-
-  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_about_dialog_set_email_hook (activate_email, NULL, NULL);
-  gtk_about_dialog_set_url_hook (activate_url, NULL, NULL);
-  gtk_show_about_dialog (GTK_WINDOW (window),
-			 "name", "GTK+ Code Demos",
-			 "version", PACKAGE_VERSION,
-			 "copyright", "(C) 1997-2005 The GTK+ Team",
-			 "license", license,
-			 "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);
-}
-
-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 */
-};
-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'>"
-"      <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
@@ -330,7 +113,7 @@ register_stock_icons (void)
      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.
       */
@@ -374,9 +157,7 @@ update_statusbar (GtkTextBuffer *buffer,
  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);

@@ -404,38 +185,19 @@ mark_set_callback (GtkTextBuffer     *buffer,
  update_statusbar (buffer, GTK_STATUSBAR (data));
 }

-static void
-update_resize_grip (GtkWidget           *widget,
-		    GdkEventWindowState *event,
-		    GtkStatusbar        *statusbar)
-{
-  if (event->changed_mask & (GDK_WINDOW_STATE_MAXIMIZED | 
-			     GDK_WINDOW_STATE_FULLSCREEN))
-    {
-      gboolean maximized;
-
-      maximized = event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED | 
-					     GDK_WINDOW_STATE_FULLSCREEN);
-      gtk_statusbar_set_has_resize_grip (statusbar, !maximized);
-    }
-}
-		    
-
 GtkWidget *
-do_appwindow (GtkWidget *do_widget)
+do_appwindow (void)
 {  
  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 ();
      
@@ -443,10 +205,7 @@ do_appwindow (GtkWidget *do_widget)
       */
      
      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), "Application Window");
-      gtk_window_set_icon_name (GTK_WINDOW (window), "gtk-open");

      /* NULL window variable when window is closed */
      g_signal_connect (window, "destroy",
@@ -457,62 +216,66 @@ do_appwindow (GtkWidget *do_widget)
      
      gtk_container_add (GTK_CONTAINER (window), table);
      
-      /* Create the menubar and toolbar
+      /* Create the menubar
       */
      
-      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);
-
-      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));
+      accel_group = gtk_accel_group_new ();
+      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+      g_object_unref (accel_group);
      
-      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);
-	}
+      item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
+
+      /* 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);
+
+      /* create menu items */
+      gtk_item_factory_create_items (item_factory, G_N_ELEMENTS (menu_items),
+                                     menu_items, window);

-      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_toolbar_set_tooltips (GTK_TOOLBAR (bar), TRUE);
-      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,
@@ -541,8 +304,7 @@ do_appwindow (GtkWidget *do_widget)
                                   200, 200);
      
      contents = gtk_text_view_new ();
-      gtk_widget_grab_focus (contents);
-      
+
      gtk_container_add (GTK_CONTAINER (sw),
                         contents);

@@ -570,12 +332,6 @@ do_appwindow (GtkWidget *do_widget)
                               G_CALLBACK (mark_set_callback),
                               statusbar,
                               0);
-
-      g_signal_connect_object (window, 
-			       "window_state_event", 
-			       G_CALLBACK (update_resize_grip),
-			       statusbar,
-			       0);
      
      update_statusbar (buffer, GTK_STATUSBAR (statusbar));
    }
@@ -1,165 +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 void
-on_assistant_apply (GtkWidget *widget, gpointer data)
-{
-  /* Apply here changes, this is a fictional
-     example, so we just do nothing here */
-}
-
-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);
-}
-
-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_hbox_new (FALSE, 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 (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
-  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_vbox_new (12, FALSE);
-  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 (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
-  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 (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
-  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), label, pixbuf);
-  g_object_unref (pixbuf);
-}
-
-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);
-
-      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_VISIBLE (assistant))
-    gtk_widget_show (assistant);
-  else
-    {
-      gtk_widget_destroy (assistant);
-      assistant = NULL;
-    }
-
-  return assistant;
-}
@@ -1,60 +0,0 @@
-/* Builder
- *
- * Demonstrates an interface loaded from a XML description.
- */
-
-#include <gtk/gtk.h>
-#include "demo-common.h"
-
-void
-quit_activate (GtkAction *action)
-{
-}
-
-void
-about_activate (GtkAction *action)
-{
-  GtkWidget *about_dlg;
-
-  about_dlg = gtk_about_dialog_new ();
-  gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (about_dlg), "GtkBuilder demo");
-  gtk_dialog_run (GTK_DIALOG (about_dlg));
-  gtk_widget_destroy (about_dlg);
-}
-
-GtkWidget *
-do_builder (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkBuilder *builder;
-  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"));
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {	 
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-
-  return window;
-}
@@ -41,7 +41,7 @@ create_bbox (gint  horizontal,
 }

 GtkWidget *
-do_button_box (GtkWidget *do_widget)
+do_button_box (void)
 {
  static GtkWidget *window = NULL;
  GtkWidget *main_vbox;
@@ -53,8 +53,6 @@ do_button_box (GtkWidget *do_widget)
  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), "Button Boxes");
    
    g_signal_connect (window, "destroy",
@@ -300,8 +300,6 @@ display_changed_cb (GtkTreeSelection  *selection,
  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,
@@ -322,8 +320,6 @@ screen_changed_cb (GtkTreeSelection  *selection,
  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,
@@ -566,14 +562,6 @@ destroy_info (ChangeDisplayInfo *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);
 }

@@ -589,7 +577,7 @@ destroy_cb (GtkObject          *object,
 * it. Otherwise, destroys it.
 */
 GtkWidget *
-do_changedisplay (GtkWidget *do_widget)
+do_changedisplay (void)
 {
  static ChangeDisplayInfo *info = NULL;

@@ -601,7 +589,7 @@ do_changedisplay (GtkWidget *do_widget)
      info = g_new0 (ChangeDisplayInfo, 1);

      info->window = gtk_dialog_new_with_buttons ("Change Screen or display",
-					    GTK_WINDOW (do_widget), 
+					    NULL, /* parent */
 					    GTK_DIALOG_NO_SEPARATOR,
 					    GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
 					    "Change",         GTK_RESPONSE_OK,
@@ -1,322 +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 (GTK_WIDGET (image),
-                                     stock_id, size, NULL);
-    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 (selection_data->length > 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);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      vbox = gtk_vbox_new (FALSE, 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_hbox_new (FALSE, 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_hbox_new (FALSE, 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_hbox_new (FALSE, 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_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
@@ -15,9 +15,7 @@ static GtkWidget *frame;
 /* Expose callback for the drawing area
 */
 static gboolean
-expose_event_callback (GtkWidget      *widget, 
-                       GdkEventExpose *event, 
-                       gpointer        data)
+expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
  if (widget->window)
    {
@@ -67,7 +65,7 @@ change_color_callback (GtkWidget *button,
 }

 GtkWidget *
-do_colorsel (GtkWidget *do_widget)
+do_colorsel (void)
 {
  GtkWidget *vbox;
  GtkWidget *button;
@@ -80,8 +78,6 @@ do_colorsel (GtkWidget *do_widget)
      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_title (GTK_WINDOW (window), "Color Selection");

      g_signal_connect (window, "destroy",
@@ -1,454 +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 (cellview, stock_id[i],
-					   GTK_ICON_SIZE_BUTTON, NULL);
-	  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 *entry)
-{
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "One");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "Two");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "2\302\275");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "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 (GtkEditableClass *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 GdkColor error_color = { 0, 65535, 60000, 60000 };
-
-  if (entry->mask)
-    {
-      if (!g_regex_match_simple (entry->mask, gtk_entry_get_text (GTK_ENTRY (entry)), 0, 0))
-	{
-	  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, &error_color);
-	  return;
-	}
-    }
-
-  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, 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 (GtkEditableClass *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_vbox_new (FALSE, 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_vbox_new (FALSE, 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_vbox_new (FALSE, 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_vbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
-    gtk_container_add (GTK_CONTAINER (frame), box);
-    
-    combo = gtk_combo_box_entry_new_text ();
-    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 (combo)->child);
-    gtk_container_add (GTK_CONTAINER (combo), entry);
-  
-  }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {    
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
@@ -1,227 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<interface>
-    <object class="GtkListStore" id="liststore1">
-      <columns>
-        <column type="gchararray"/>
-        <column type="gchararray"/>
-        <column type="gint"/>
-      </columns>
-      <data>
-        <row>
-          <col id="0">John</col>
-          <col id="1">Doe</col>
-          <col id="2">25</col>
-        </row>
-        <row>
-          <col id="0">Mary</col>
-          <col id="1">Dole</col>
-          <col id="2">50</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">Help</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>
-                </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="GtkWindow" id="window1">
-        <property name="default_height">250</property>
-        <property name="default_width">440</property>
-        <signal name="destroy" handler="gtk_widget_destroyed"/>
-        <child>
-            <object class="GtkVBox" id="vbox1">
-                <property name="visible">True</property>
-                <child>
-                    <object constructor="uimanager" class="GtkMenuBar" id="menubar1">
-                        <property name="visible">True</property>
-                    </object>
-                    <packing>
-                        <property name="expand">False</property>
-                    </packing>
-                </child>
-                <child>
-                    <object constructor="uimanager" class="GtkToolbar" id="toolbar1">
-                        <property name="visible">True</property>
-                    </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>
-                          <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>
-                    </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>
@@ -21,9 +21,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++;
@@ -94,7 +93,7 @@ interactive_dialog_clicked (GtkButton *button,
 }

 GtkWidget *
-do_dialog (GtkWidget *do_widget)
+do_dialog (void)
 {
  GtkWidget *frame;
  GtkWidget *vbox;
@@ -107,8 +106,6 @@ do_dialog (GtkWidget *do_widget)
  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);
@@ -218,18 +218,8 @@ checkerboard_expose (GtkWidget	    *da,
  return TRUE;
 }

-static void
-close_window (void)
-{
-  window = NULL;
-
-  if (pixmap)
-    g_object_unref (pixmap);
-  pixmap = NULL;
-}
-
 GtkWidget *
-do_drawingarea (GtkWidget *do_widget)
+do_drawingarea (void)
 {
  GtkWidget *frame;
  GtkWidget *vbox;
@@ -239,11 +229,9 @@ do_drawingarea (GtkWidget *do_widget)
  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");

-      g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

@@ -319,9 +307,14 @@ do_drawingarea (GtkWidget *do_widget)
    }

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

  return window;
 }
@@ -2,12 +2,8 @@
 *
 * 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>
@@ -18,24 +14,18 @@ static GtkWidget *window = NULL;

 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 +39,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 +76,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 +85,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 +108,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 +142,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 (GPOINTER_TO_INT (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,59 +194,38 @@ 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);
+  renderer = gtk_cell_renderer_text_new ();
  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));
+		    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_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)
+do_editable_cells (void)
 {
  if (!window)
    {
@@ -320,47 +234,41 @@ 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_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_CALLBACK (gtk_widget_destroyed), &window);

      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 (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);

@@ -370,12 +278,12 @@ do_editable_cells (GtkWidget *do_widget)

      button = gtk_button_new_with_label ("Add item");
      g_signal_connect (button, "clicked",
-                        G_CALLBACK (add_item), items_model);
+			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_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);
@@ -1,97 +0,0 @@
-/* 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 *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);
-
-    vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), 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_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
-
-
@@ -1,58 +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 *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);
-
-    vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), 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_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
-
-
@@ -1,7 +1,7 @@
 #!@PERL@ -w

 print <<EOT;
-typedef	GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);
+typedef	GtkWidget *(*GDoDemoFunc) (void);

 typedef struct _Demo Demo;

@@ -27,7 +27,7 @@ for $file (@ARGV) {

    close INFO_FILE;

-    print "GtkWidget *do_$basename (GtkWidget *do_widget);\n";
+    print "GtkWidget *do_$basename (void);\n";

    push @demos, {"title" => $title, "file" => $file,
 		  "func"  => "do_$basename"};
@@ -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 {
@@ -1,315 +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_Return: 
-      case GDK_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 (text_view->window, 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 (text_view->window, &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_VISIBLE (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
@@ -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_vbox_new (FALSE, 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_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
@@ -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_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_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
@@ -13,7 +13,6 @@
 */

 #include <gtk/gtk.h>
-#include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>
 #include "demo-common.h"
@@ -184,7 +183,7 @@ progressive_timeout (gpointer data)
      gchar *error_message = 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,7 +195,7 @@ progressive_timeout (gpointer data)
 	}
      else
 	{
-	  image_stream = g_fopen (filename, "rb");
+	  image_stream = fopen (filename, "r");
 	  g_free (filename);

 	  if (!image_stream)
@@ -255,7 +254,7 @@ 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,
+  load_timeout = g_timeout_add (150,
 				progressive_timeout,
 				image);
 }
@@ -308,7 +307,7 @@ toggle_sensitivity_callback (GtkWidget *togglebutton,
  

 GtkWidget *
-do_images (GtkWidget *do_widget)
+do_images (void)
 {
  GtkWidget *frame;
  GtkWidget *vbox;
@@ -323,8 +322,6 @@ do_images (GtkWidget *do_widget)
  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), "Images");

      g_signal_connect (window, "destroy",
@@ -352,7 +349,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.
       */
@@ -0,0 +1,120 @@
+/* Item Factory
+ *
+ * The GtkItemFactory object allows the easy creation of menus
+ * from an array of descriptions of menu items.
+ */
+
+#include <gtk/gtk.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 (void)
+{
+  static GtkWidget *window = NULL;
+  
+  if (!window)
+    {
+      GtkWidget *box1;
+      GtkWidget *box2;
+      GtkWidget *separator;
+      GtkWidget *label;
+      GtkWidget *button;
+      GtkAccelGroup *accel_group;
+      GtkItemFactory *item_factory;
+      
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      
+      g_signal_connect (window, "destroy",
+			G_CALLBACK (gtk_widget_destroyed), &window);
+      g_signal_connect (window, "delete-event",
+			G_CALLBACK (gtk_true), NULL);
+      
+      accel_group = gtk_accel_group_new ();
+      item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
+      g_object_set_data_full (G_OBJECT (window), "<main>",
+			      item_factory, (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;
+}
@@ -155,7 +155,7 @@ add_columns (GtkTreeView *treeview)
 }

 GtkWidget *
-do_list_store (GtkWidget *do_widget)
+do_list_store (void)
 {
  if (!window)
    {
@@ -167,8 +167,6 @@ do_list_store (GtkWidget *do_widget)

      /* 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",
@@ -1,11 +1,9 @@
-#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>

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

@@ -30,31 +28,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 (NULL, 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
@@ -94,15 +67,15 @@ 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);
@@ -124,7 +97,7 @@ read_line (FILE *stream, GString *str)
    {
      int c;
      
-#ifdef HAVE_FLOCKFILE
+#ifndef G_OS_WIN32
      c = getc_unlocked (stream);
 #else
      c = getc (stream);
@@ -387,7 +360,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;
@@ -466,7 +439,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));
@@ -575,8 +548,6 @@ load_file (const gchar *filename)
 	}
    }

-  fclose (file);
-  
  fontify ();

  g_string_free (buffer, TRUE);
@@ -588,7 +559,7 @@ row_activated_cb (GtkTreeView       *tree_view,
 		  GtkTreeViewColumn *column)
 {
  GtkTreeIter iter;
-  PangoStyle style;
+  gboolean italic;
  GDoDemoFunc func;
  GtkWidget *window;
  GtkTreeModel *model;
@@ -599,16 +570,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) ();
      
      if (window != NULL)
 	{
@@ -668,7 +639,7 @@ create_text (GtkTextBuffer **buffer,
  
  if (is_source)
    {
-      font_desc = pango_font_description_from_string ("monospace");
+      font_desc = pango_font_description_from_string ("Courier 12");
      gtk_widget_modify_font (text_view, font_desc);
      pango_font_description_free (font_desc);

@@ -698,11 +669,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));
@@ -725,7 +695,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++;
@@ -744,7 +714,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++;
@@ -753,40 +723,24 @@ create_tree (void)

  cell = gtk_cell_renderer_text_new ();

+  g_object_set (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
@@ -858,8 +812,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/gdk-pixbuf.loaders", TRUE);
-      g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/gtk.immodules", TRUE);
+      putenv ("GDK_PIXBUF_MODULE_FILE=../../gdk-pixbuf/gdk-pixbuf.loaders");
+      putenv ("GTK_IM_MODULE_FILE=../../modules/input/gtk.immodules");
    }
  /* -- End of hack -- */
  
@@ -869,7 +823,7 @@ 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_hbox_new (FALSE, 0);
@@ -885,18 +839,16 @@ 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",
@@ -916,7 +868,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);
@@ -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,27 +59,20 @@ 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)
@@ -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,9 +19,12 @@
 * 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.
 * 
 */

@@ -70,62 +73,15 @@ 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);
-    }
-}
-
 GtkWidget *
-do_menus (GtkWidget *do_widget)
+do_menus (void)
 {
  static GtkWidget *window = NULL;
-  GtkWidget *box;
  GtkWidget *box1;
  GtkWidget *box2;
  GtkWidget *button;
+  GtkWidget *optionmenu;
+  GtkWidget *separator;
  
  if (!window)
    {
@@ -135,8 +91,7 @@ do_menus (GtkWidget *do_widget)
      GtkAccelGroup *accel_group;
      
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
+      
      g_signal_connect (window, "destroy",
 			G_CALLBACK(gtk_widget_destroyed), &window);
      g_signal_connect (window, "delete-event",
@@ -148,13 +103,9 @@ do_menus (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "menus");
      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
      
-            
-      box = gtk_hbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (window), box);
-      gtk_widget_show (box);
-
+      
      box1 = gtk_vbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (box), box1);
+      gtk_container_add (GTK_CONTAINER (window), box1);
      gtk_widget_show (box1);
      
      menubar = gtk_menu_bar_new ();
@@ -179,18 +130,68 @@ do_menus (GtkWidget *do_widget)
      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);
+
+      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);
@@ -112,7 +112,7 @@ create_pane_options (GtkPaned	 *paned,
 }

 GtkWidget *
-do_panes (GtkWidget *do_widget)
+do_panes (void)
 {
  static GtkWidget *window = NULL;
  GtkWidget *frame;
@@ -124,8 +124,6 @@ do_panes (GtkWidget *do_widget)
  if (!window)
    {
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));

      g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
@@ -1,73 +0,0 @@
-/* Pickers 
- *
- * These widgets are mainly intended for use in preference dialogs.
- * They allow to select colors, fonts, files and directories.
- */
-
-#include <gtk/gtk.h>
-
-GtkWidget *
-do_pickers (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *table, *label, *picker;
-
-  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), "Pickers");
-   
-    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed),
-                      &window);
-    
-    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-    table = gtk_table_new (4, 2, FALSE);    
-    gtk_table_set_col_spacing (GTK_TABLE (table), 0, 10);
-    gtk_table_set_row_spacings (GTK_TABLE (table), 3);
-    gtk_container_add (GTK_CONTAINER (window), table);
-
-    gtk_container_set_border_width (GTK_CONTAINER (table), 10);
-
-    label = gtk_label_new ("Color:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-    picker = gtk_color_button_new ();
-    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
-    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 0, 1);
-
-    label = gtk_label_new ("Font:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-    picker = gtk_font_button_new ();
-    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
-    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 1, 2);
-
-    label = gtk_label_new ("File:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-    picker = gtk_file_chooser_button_new ("Pick a File", 
-                                          GTK_FILE_CHOOSER_ACTION_OPEN);
-    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
-    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 2, 3);
-
-    label = gtk_label_new ("Folder:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-    picker = gtk_file_chooser_button_new ("Pick a Folder", 
-                                          GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
-    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 3, 4);
-  }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {    
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
@@ -12,6 +12,7 @@
 *
 */

+#include <config.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <math.h>
@@ -61,7 +62,7 @@ load_pixbufs (GError **error)
  if (background)
    return TRUE; /* already loaded earlier */

-  /* 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.
   */
@@ -187,9 +188,7 @@ timeout (gpointer data)
 			       : MAX (127, fabs (255 * cos (f * 2.0 * G_PI)))));
    }

-  GDK_THREADS_ENTER ();
  gtk_widget_queue_draw (da);
-  GDK_THREADS_LEAVE ();

  frame_num++;
  return TRUE;
@@ -206,15 +205,14 @@ cleanup_callback (GtkObject *object,
 }

 GtkWidget *
-do_pixbufs (GtkWidget *do_widget)
+do_pixbufs (void)
 {
  if (!window)
    {
      GError *error;

+
      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), "Pixbufs");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);

@@ -266,7 +264,6 @@ do_pixbufs (GtkWidget *do_widget)
    {
      gtk_widget_destroy (window);
      window = NULL;
-      g_object_unref (frame);
    }

  return window;
@@ -1,187 +0,0 @@
-/* Printing
- *
- * GtkPrintOperation offers a simple API to support printing
- * in a cross-platform way.
- *
- */
-
-#include <math.h>
-#include <gtk/gtk.h>
-#include "demo-common.h"
-
-/* In points */
-#define HEADER_HEIGHT (10*72/25.4)
-#define HEADER_GAP (3*72/25.4)
-
-typedef struct 
-{
-  gchar *filename;
-  gdouble font_size;
-
-  gint lines_per_page;  
-  gchar **lines;
-  gint num_lines;
-  gint num_pages;
-} PrintData;
-
-static void
-begin_print (GtkPrintOperation *operation, 
-	     GtkPrintContext   *context,
-	     gpointer           user_data)
-{
-  PrintData *data = (PrintData *)user_data;
-  char *contents;
-  int i;
-  double height;
-
-  height = gtk_print_context_get_height (context) - HEADER_HEIGHT - HEADER_GAP;
-  
-  data->lines_per_page = floor (height / data->font_size);
-  
-  g_file_get_contents (data->filename, &contents, NULL, NULL);
-
-  data->lines = g_strsplit (contents, "\n", 0);
-  g_free (contents);
-
-  i = 0;
-  while (data->lines[i] != NULL)
-    i++;
-  
-  data->num_lines = i;
-  data->num_pages = (data->num_lines - 1) / data->lines_per_page + 1;
-  gtk_print_operation_set_n_pages (operation, data->num_pages);
-}
-
-static void
-draw_page (GtkPrintOperation *operation,
-	   GtkPrintContext   *context,
-	   gint               page_nr,
-	   gpointer           user_data)
-{
-  PrintData *data = (PrintData *)user_data;
-  cairo_t *cr;
-  PangoLayout *layout;
-  gint text_width, text_height;
-  gdouble width;
-  gint line, i;
-  PangoFontDescription *desc;
-  gchar *page_str;
-
-  cr = gtk_print_context_get_cairo_context (context);
-  width = gtk_print_context_get_width (context);
-
-  cairo_rectangle (cr, 0, 0, width, HEADER_HEIGHT);
-  
-  cairo_set_source_rgb (cr, 0.8, 0.8, 0.8);
-  cairo_fill_preserve (cr);
-  
-  cairo_set_source_rgb (cr, 0, 0, 0);
-  cairo_set_line_width (cr, 1);
-  cairo_stroke (cr);
-
-  layout = gtk_print_context_create_pango_layout (context);
-
-  desc = pango_font_description_from_string ("sans 14");
-  pango_layout_set_font_description (layout, desc);
-  pango_font_description_free (desc);
-
-  pango_layout_set_text (layout, data->filename, -1);
-  pango_layout_get_pixel_size (layout, &text_width, &text_height);
-
-  if (text_width > width)
-    {
-      pango_layout_set_width (layout, width);
-      pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_START);
-      pango_layout_get_pixel_size (layout, &text_width, &text_height);
-    }
-
-  cairo_move_to (cr, (width - text_width) / 2,  (HEADER_HEIGHT - text_height) / 2);
-  pango_cairo_show_layout (cr, layout);
-
-  page_str = g_strdup_printf ("%d/%d", page_nr + 1, data->num_pages);
-  pango_layout_set_text (layout, page_str, -1);
-  g_free (page_str);
-
-  pango_layout_set_width (layout, -1);
-  pango_layout_get_pixel_size (layout, &text_width, &text_height);
-  cairo_move_to (cr, width - text_width - 4, (HEADER_HEIGHT - text_height) / 2);
-  pango_cairo_show_layout (cr, layout);
-  
-  g_object_unref (layout);
-  
-  layout = gtk_print_context_create_pango_layout (context);
-  
-  desc = pango_font_description_from_string ("mono");
-  pango_font_description_set_size (desc, data->font_size * PANGO_SCALE);
-  pango_layout_set_font_description (layout, desc);
-  pango_font_description_free (desc);
-  
-  cairo_move_to (cr, 0, HEADER_HEIGHT + HEADER_GAP);
-  line = page_nr * data->lines_per_page;
-  for (i = 0; i < data->lines_per_page && line < data->num_lines; i++) 
-    {
-      pango_layout_set_text (layout, data->lines[line], -1);
-      pango_cairo_show_layout (cr, layout);
-      cairo_rel_move_to (cr, 0, data->font_size);
-      line++;
-    }
-
-  g_object_unref (layout);
-}
-
-static void
-end_print (GtkPrintOperation *operation, 
-	   GtkPrintContext   *context,
-	   gpointer           user_data)
-{
-  PrintData *data = (PrintData *)user_data;
-
-  g_free (data->filename);
-  g_strfreev (data->lines);
-  g_free (data);
-}
-
-
-GtkWidget *
-do_printing (GtkWidget *do_widget)
-{
-  GtkPrintOperation *operation;
-  PrintData *data;
-  GError *error = NULL;
-
-  operation = gtk_print_operation_new ();
-  data = g_new0 (PrintData, 1);
-  data->filename = demo_find_file ("printing.c", NULL);
-  data->font_size = 12.0;
-
-  g_signal_connect (G_OBJECT (operation), "begin-print", 
-		    G_CALLBACK (begin_print), data);
-  g_signal_connect (G_OBJECT (operation), "draw-page", 
-		    G_CALLBACK (draw_page), data);
-  g_signal_connect (G_OBJECT (operation), "end-print", 
-		    G_CALLBACK (end_print), data);
-
-  gtk_print_operation_run (operation, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW (do_widget), &error);
-
-  g_object_unref (operation);
-
-  if (error)
-    {
-      GtkWidget *dialog;
-      
-      dialog = gtk_message_dialog_new (GTK_WINDOW (do_widget),
-				       GTK_DIALOG_DESTROY_WITH_PARENT,
-				       GTK_MESSAGE_ERROR,
-				       GTK_BUTTONS_CLOSE,
-				       "%s", error->message);
-      g_error_free (error);
-      
-      g_signal_connect (dialog, "response",
-			G_CALLBACK (gtk_widget_destroy), NULL);
-      
-      gtk_widget_show (dialog);      
-    }
-  
-
-  return NULL;
-}
@@ -1,142 +0,0 @@
-/* Rotated Text
- *
- * This demo shows how to use GDK and Pango to draw rotated and transformed
- * text. The use of GdkPangoRenderer in this example is a somewhat advanced
- * technique; most applications can simply use gdk_draw_layout(). We use
- * it here mostly because that allows us to work in user coordinates - that is,
- * coordinates prior to the application of the transformation matrix, rather
- * than device coordinates.
- *
- * As of GTK+-2.6, the ability to draw transformed and anti-aliased graphics
- * as shown in this example is only present for text. With GTK+-2.8, a new
- * graphics system called "Cairo" will be introduced that provides these
- * capabilities and many more for all types of graphics.
- */
-#include <math.h>
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-static gboolean
-rotated_text_expose_event (GtkWidget      *widget,
-			   GdkEventExpose *event,
-			   gpointer	   data)
-{
-#define RADIUS 150
-#define N_WORDS 10
-#define FONT "Sans Bold 27"
-  
-  PangoRenderer *renderer;
-  PangoMatrix matrix = PANGO_MATRIX_INIT;
-  PangoContext *context;
-  PangoLayout *layout;
-  PangoFontDescription *desc;
-
-  int width = widget->allocation.width;
-  int height = widget->allocation.height;
-  double device_radius;
-  int i;
-
-  /* Get the default renderer for the screen, and set it up for drawing  */
-  renderer = gdk_pango_renderer_get_default (gtk_widget_get_screen (widget));
-  gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), widget->window);
-  gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), widget->style->black_gc);
-
-  /* Set up a transformation matrix so that the user space coordinates for
-   * the centered square where we draw are [-RADIUS, RADIUS], [-RADIUS, RADIUS]
-   * We first center, then change the scale */
-  device_radius = MIN (width, height) / 2.;
-  pango_matrix_translate (&matrix,
-			  device_radius + (width - 2 * device_radius) / 2,
-			  device_radius + (height - 2 * device_radius) / 2);
-  pango_matrix_scale (&matrix, device_radius / RADIUS, device_radius / RADIUS);
-
-  /* Create a PangoLayout, set the font and text */
-  context = gtk_widget_create_pango_context (widget);
-  layout = pango_layout_new (context);
-  pango_layout_set_text (layout, "Text", -1);
-  desc = pango_font_description_from_string (FONT);
-  pango_layout_set_font_description (layout, desc);
-  pango_font_description_free (desc);
-
-  /* Draw the layout N_WORDS times in a circle */
-  for (i = 0; i < N_WORDS; i++)
-    {
-      GdkColor color;
-      PangoMatrix rotated_matrix = matrix;
-      int width, height;
-      double angle = (360. * i) / N_WORDS;
-
-      /* Gradient from red at angle == 60 to blue at angle == 300 */
-      color.red   = 65535 * (1 + cos ((angle - 60) * G_PI / 180.)) / 2;
-      color.green = 0;
-      color.blue  = 65535  - color.red;
-    
-      gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
-					     PANGO_RENDER_PART_FOREGROUND, &color);
-                                             
-      pango_matrix_rotate (&rotated_matrix, angle);
-
-      pango_context_set_matrix (context, &rotated_matrix);
-    
-      /* Inform Pango to re-layout the text with the new transformation matrix */
-      pango_layout_context_changed (layout);
-    
-      pango_layout_get_size (layout, &width, &height);
-      pango_renderer_draw_layout (renderer, layout,
-				  - width / 2, - RADIUS * PANGO_SCALE);
-    }
-
-  /* Clean up default renderer, since it is shared */
-  gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
-					 PANGO_RENDER_PART_FOREGROUND, NULL);
-  gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), NULL);
-  gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), NULL);
-
-  /* free the objects we created */
-  g_object_unref (layout);
-  g_object_unref (context);
-  
-  return FALSE;
-}
-
-GtkWidget *
-do_rotated_text (GtkWidget *do_widget)
-{
-  GtkWidget *drawing_area;
-  
-  if (!window)
-    {
-      const GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
-      
-      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 Text");
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-
-      drawing_area = gtk_drawing_area_new ();
-      gtk_container_add (GTK_CONTAINER (window), drawing_area);
-
-      /* This overrides the background color from the theme */
-      gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, &white);
-
-      g_signal_connect (drawing_area, "expose-event",
-			G_CALLBACK (rotated_text_expose_event), NULL);
-
-      gtk_window_set_default_size (GTK_WINDOW (window), 2 * RADIUS, 2 * RADIUS);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
@@ -17,22 +17,29 @@

 static GtkWidget *window = NULL;

-/* Convenience function to create a combo box holding a number of strings
+/* Convenience function to create an option menu holding a number of strings
 */
 GtkWidget *
-create_combo_box (const char **strings)
+create_option_menu (const char **strings)
 {
-  GtkWidget *combo_box;
+  GtkWidget *menu;
+  GtkWidget *option_menu;
  const char **str;

-  combo_box = gtk_combo_box_new_text ();
+  menu = gtk_menu_new ();
  
  for (str = strings; *str; str++)
-    gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), *str);
+    {
+      GtkWidget *menu_item = gtk_menu_item_new_with_label (*str);
+      gtk_widget_show (menu_item);

-  gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+    }

-  return combo_box;
+  option_menu = gtk_option_menu_new ();
+  gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
+
+  return option_menu;
 }

 static void
@@ -42,7 +49,7 @@ add_row (GtkTable     *table,
 	 const char   *label_text,
 	 const char  **options)
 {
-  GtkWidget *combo_box;
+  GtkWidget *option_menu;
  GtkWidget *label;

  label = gtk_label_new_with_mnemonic (label_text);
@@ -52,10 +59,10 @@ add_row (GtkTable     *table,
 		    GTK_EXPAND | GTK_FILL, 0,
 		    0,                     0);
  
-  combo_box = create_combo_box (options);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo_box);
-  gtk_size_group_add_widget (size_group, combo_box);
-  gtk_table_attach (GTK_TABLE (table), combo_box,
+  option_menu = create_option_menu (options);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), option_menu);
+  gtk_size_group_add_widget (size_group, option_menu);
+  gtk_table_attach (GTK_TABLE (table), option_menu,
 		    1, 2,                  row, row + 1,
 		    0,                     0,
 		    0,                     0);
@@ -80,7 +87,7 @@ toggle_grouping (GtkToggleButton *check_button,
 }

 GtkWidget *
-do_sizegroup (GtkWidget *do_widget)
+do_sizegroup (void)
 {
  GtkWidget *table;
  GtkWidget *frame;
@@ -103,8 +110,7 @@ do_sizegroup (GtkWidget *do_widget)
  if (!window)
    {
      window = gtk_dialog_new_with_buttons ("GtkSizeGroup",
-					    GTK_WINDOW (do_widget),
-					    0,
+					    NULL, 0,
 					    GTK_STOCK_CLOSE,
 					    GTK_RESPONSE_NONE,
 					    NULL);
@@ -400,7 +400,7 @@ label_set_func (GtkTreeViewColumn *tree_column,
 }

 GtkWidget *
-do_stock_browser (GtkWidget *do_widget)
+do_stock_browser (void)
 {  
  if (!window)
    {
@@ -417,8 +417,6 @@ do_stock_browser (GtkWidget *do_widget)
      GtkTreeViewColumn *column;

      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), "Stock Icons and Items");
      gtk_window_set_default_size (GTK_WINDOW (window), -1, 500);

@@ -1,200 +0,0 @@
-/* Text Widget/Automatic scrolling
- *
- * This example demonstrates how to use the gravity of 
- * GtkTextMarks to keep a text view scrolled to the bottom
- * while appending text.
- */
-
-#include <gtk/gtk.h>
-#include "demo-common.h"
-
-/* Scroll to the end of the buffer.
- */
-static gboolean
-scroll_to_end (GtkTextView *textview)
-{
-  GtkTextBuffer *buffer;
-  GtkTextIter iter;
-  GtkTextMark *mark;
-  char *spaces;
-  static int count;
-
-  buffer = gtk_text_view_get_buffer (textview);
-  
-  /* Get "end" mark. It's located at the end of buffer because 
-   * of right gravity
-   */
-  mark = gtk_text_buffer_get_mark (buffer, "end");
-  gtk_text_buffer_get_iter_at_mark (buffer, &iter, mark);
-
-  /* and insert some text at its position, the iter will be 
-   * revalidated after insertion to point to the end of inserted text
-   */
-  spaces = g_strnfill (count++, ' ');
-  gtk_text_buffer_insert (buffer, &iter, "\n", -1);
-  gtk_text_buffer_insert (buffer, &iter, spaces, -1);
-  gtk_text_buffer_insert (buffer, &iter,
-                          "Scroll to end scroll to end scroll "
-                          "to end scroll to end ",
-                          -1);
-  g_free (spaces);
-
-  /* Now scroll the end mark onscreen.
-   */
-  gtk_text_view_scroll_mark_onscreen (textview, mark);
-
-  /* Emulate typewriter behavior, shift to the left if we 
-   * are far enough to the right.
-   */
-  if (count > 150)
-    count = 0;
-
-  return TRUE;
-}
-
-/* Scroll to the bottom of the buffer.
- */
-static gboolean
-scroll_to_bottom (GtkTextView *textview)
-{
-  GtkTextBuffer *buffer;
-  GtkTextIter iter;
-  GtkTextMark *mark;
-  char *spaces;
-  static int count;
-
-  buffer = gtk_text_view_get_buffer (textview);
-  
-  /* Get end iterator */
-  gtk_text_buffer_get_end_iter (buffer, &iter);
-
-  /* and insert some text at it, the iter will be revalidated
-   * after insertion to point to the end of inserted text
-   */
-  spaces = g_strnfill (count++, ' ');
-  gtk_text_buffer_insert (buffer, &iter, "\n", -1);
-  gtk_text_buffer_insert (buffer, &iter, spaces, -1);
-  gtk_text_buffer_insert (buffer, &iter,
-                          "Scroll to bottom scroll to bottom scroll "
-                          "to bottom scroll to bottom",
-                          -1);
-  g_free (spaces);
-
-  /* Move the iterator to the beginning of line, so we don't scroll 
-   * in horizontal direction 
-   */
-  gtk_text_iter_set_line_offset (&iter, 0);
-  
-  /* and place the mark at iter. the mark will stay there after we
-   * insert some text at the end because it has right gravity.
-   */
-  mark = gtk_text_buffer_get_mark (buffer, "scroll");
-  gtk_text_buffer_move_mark (buffer, mark, &iter);
-  
-  /* Scroll the mark onscreen.
-   */
-  gtk_text_view_scroll_mark_onscreen (textview, mark);
-
-  /* Shift text back if we got enough to the right.
-   */
-  if (count > 40)
-    count = 0;
-
-  return TRUE;
-}
-
-static guint
-setup_scroll (GtkTextView *textview,
-              gboolean     to_end)
-{
-  GtkTextBuffer *buffer;
-  GtkTextIter iter;
-
-  buffer = gtk_text_view_get_buffer (textview);
-  gtk_text_buffer_get_end_iter (buffer, &iter);
-
-  if (to_end)
-  {
-    /* If we want to scroll to the end, including horizontal scrolling,
-     * then we just create a mark with right gravity at the end of the 
-     * buffer. It will stay at the end unless explicitely moved with 
-     * gtk_text_buffer_move_mark.
-     */
-    gtk_text_buffer_create_mark (buffer, "end", &iter, FALSE);
-    
-    /* Add scrolling timeout. */
-    return g_timeout_add (50, (GSourceFunc) scroll_to_end, textview);
-  }
-  else
-  {
-    /* If we want to scroll to the bottom, but not scroll horizontally, 
-     * then an end mark won't do the job. Just create a mark so we can 
-     * use it with gtk_text_view_scroll_mark_onscreen, we'll position it
-     * explicitely when needed. Use left gravity so the mark stays where 
-     * we put it after inserting new text.
-     */
-    gtk_text_buffer_create_mark (buffer, "scroll", &iter, TRUE);
-    
-    /* Add scrolling timeout. */
-    return g_timeout_add (100, (GSourceFunc) scroll_to_bottom, textview);
-  }
-}
-
-static void
-remove_timeout (GtkWidget *window,
-                gpointer   timeout)
-{
-  g_source_remove (GPOINTER_TO_UINT (timeout));
-}
-
-static void
-create_text_view (GtkWidget *hbox,
-                  gboolean   to_end)
-{
-  GtkWidget *swindow;
-  GtkWidget *textview;
-  guint timeout;
-
-  swindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_box_pack_start_defaults (GTK_BOX (hbox), swindow);
-  textview = gtk_text_view_new ();
-  gtk_container_add (GTK_CONTAINER (swindow), textview);
-
-  timeout = setup_scroll (GTK_TEXT_VIEW (textview), to_end);
-
-  /* Remove the timeout in destroy handler, so we don't try to
-   * scroll destroyed widget. 
-   */
-  g_signal_connect (textview, "destroy",
-                    G_CALLBACK (remove_timeout),
-                    GUINT_TO_POINTER (timeout));
-}
-
-GtkWidget *
-do_textscroll (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *hbox;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      
-      hbox = gtk_hbox_new (TRUE, 6);
-      gtk_container_add (GTK_CONTAINER (window), hbox);
-
-      create_text_view (hbox, TRUE);
-      create_text_view (hbox, FALSE);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-      gtk_widget_show_all (window);
-  else
-      gtk_widget_destroy (window);
-
-  return window;
-}
@@ -1,4 +1,4 @@
-/* Text Widget/Multiple Views
+/* Text Widget
 *
 * The GtkTextView widget displays a GtkTextBuffer. One GtkTextBuffer
 * can be displayed by multiple GtkTextViews. This demo has two views
@@ -155,7 +155,7 @@ insert_text (GtkTextBuffer *buffer)
  GtkTextChildAnchor *anchor;
  char *filename;

-  /* 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.
   */
@@ -350,7 +350,7 @@ insert_text (GtkTextBuffer *buffer)
  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
  gtk_text_buffer_insert (buffer, &iter, ".\n", -1);
  
-  gtk_text_buffer_insert (buffer, &iter, "\n\nThis demo doesn't demonstrate all the GtkTextBuffer features; it leaves out, for example: invisible/hidden text, tab stops, application-drawn areas on the sides of the widget for displaying breakpoints and such...", -1);
+  gtk_text_buffer_insert (buffer, &iter, "\n\nThis demo doesn't demonstrate all the GtkTextBuffer features; it leaves out, for example: invisible/hidden text (doesn't work in GTK 2, but planned), tab stops, application-drawn areas on the sides of the widget for displaying breakpoints and such...", -1);

  /* Apply word_wrap tag to whole buffer */
  gtk_text_buffer_get_bounds (buffer, &start, &end);
@@ -399,11 +399,21 @@ attach_widgets (GtkTextView *text_view)
        }
      else if (i == 1)
        {
-          widget = gtk_combo_box_new_text ();
+          GtkWidget *menu_item;
+          GtkWidget *menu;

-          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 1");
-          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 2");
-          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 3");
+          menu = gtk_menu_new ();
+          
+          widget = gtk_option_menu_new ();
+
+          menu_item = gtk_menu_item_new_with_label ("Option 1");
+          gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+          menu_item = gtk_menu_item_new_with_label ("Option 2");
+          gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+          menu_item = gtk_menu_item_new_with_label ("Option 3");
+          gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+
+          gtk_option_menu_set_menu (GTK_OPTION_MENU (widget), menu);
        }
      else if (i == 2)
        {
@@ -438,7 +448,7 @@ attach_widgets (GtkTextView *text_view)
 }

 GtkWidget *
-do_textview (GtkWidget *do_widget)
+do_textview (void)
 {
  static GtkWidget *window = NULL;

@@ -451,8 +461,6 @@ do_textview (GtkWidget *do_widget)
      GtkTextBuffer *buffer;
      
      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);
      
@@ -385,7 +385,7 @@ add_columns (GtkTreeView *treeview)
 }

 GtkWidget *
-do_tree_store (GtkWidget *do_widget)
+do_tree_store (void)
 {
  if (!window)
    {
@@ -396,8 +396,6 @@ do_tree_store (GtkWidget *do_widget)

      /* 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), "Card planning sheet");
      g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
@@ -1,237 +0,0 @@
-/* UI Manager
- *
- * The GtkUIManager object allows the easy creation of menus
- * from an array of actions and a description of the menu hierarchy.
- */
-
-#include <gtk/gtk.h>
-
-static void
-activate_action (GtkAction *action)
-{
-  g_message ("Action \"%s\" activated", gtk_action_get_name (action));
-}
-
-static void
-activate_radio_action (GtkAction *action, GtkRadioAction *current)
-{
-  g_message ("Radio action \"%s\" selected", 
-	     gtk_action_get_name (GTK_ACTION (current)));
-}
-
-static GtkActionEntry entries[] = {
-  { "FileMenu", NULL, "_File" },               /* 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) },      
-  { "Open", GTK_STOCK_OPEN,                    /* name, stock id */
-    "_Open","<control>O",                      /* label, accelerator */     
-    "Open a 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 (activate_action) },
-  { "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 */
-};
-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'>"
-"      <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'/>"
-"    <toolitem action='Quit'/>"
-"    <separator action='Sep1'/>"
-"    <toolitem action='Logo'/>"
-"  </toolbar>"
-"</ui>";
-
-GtkWidget *
-do_ui_manager (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  
-  if (!window)
-    {
-      GtkWidget *box1;
-      GtkWidget *box2;
-      GtkWidget *separator;
-      GtkWidget *label;
-      GtkWidget *button;
-      GtkUIManager *ui;
-      GtkActionGroup *actions;
-      GError *error = NULL;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
-      
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-      g_signal_connect (window, "delete-event",
-			G_CALLBACK (gtk_true), NULL);
-
-      actions = gtk_action_group_new ("Actions");
-      gtk_action_group_add_actions (actions, entries, n_entries, NULL);
-      gtk_action_group_add_toggle_actions (actions, 
-					   toggle_entries, n_toggle_entries, 
-					   NULL);
-      gtk_action_group_add_radio_actions (actions, 
-					  color_entries, n_color_entries, 
-					  COLOR_RED,
-					  G_CALLBACK (activate_radio_action), 
-					  NULL);
-      gtk_action_group_add_radio_actions (actions, 
-					  shape_entries, n_shape_entries, 
-					  SHAPE_OVAL,
-					  G_CALLBACK (activate_radio_action), 
-					  NULL);
-
-      ui = gtk_ui_manager_new ();
-      gtk_ui_manager_insert_action_group (ui, actions, 0);
-      g_object_unref (actions);
-      gtk_window_add_accel_group (GTK_WINDOW (window), 
-				  gtk_ui_manager_get_accel_group (ui));
-      gtk_window_set_title (GTK_WINDOW (window), "UI Manager");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
-      
-      if (!gtk_ui_manager_add_ui_from_string (ui, ui_info, -1, &error))
-	{
-	  g_message ("building menus failed: %s", error->message);
-	  g_error_free (error);
-	}
-
-      box1 = gtk_vbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
-      
-      gtk_box_pack_start (GTK_BOX (box1),
-			  gtk_ui_manager_get_widget (ui, "/MenuBar"),
-			  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);
-      g_object_unref (ui);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
@@ -225,7 +225,7 @@ main (int argc, char **argv)

 	gtk_container_add (GTK_CONTAINER (window), da);

-	timeout_id = gdk_threads_add_timeout (FRAME_DELAY, timeout, NULL);
+	timeout_id = g_timeout_add (FRAME_DELAY, timeout, NULL);

 	gtk_widget_show_all (window);
 	gtk_main ();
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <glib.h>

 #include <sys/stat.h>
@@ -16,5 +15,5 @@ void
 pixbuf_init (void)
 {
  if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
-    g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
+    putenv ("GDK_PIXBUF_MODULE_FILE=../gdk-pixbuf/gdk-pixbuf.loaders");
 }
@@ -301,7 +301,7 @@ start_progressive_loading (GtkWidget *image)
   * The timeout simply simulates a slow data source by inserting
   * pauses in the reading process.
   */
-  lc->load_timeout = gdk_threads_add_timeout (100,
+  lc->load_timeout = g_timeout_add (100,
                                    progressive_timeout,
                                    image);
 }
@@ -1,392 +0,0 @@
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <gtk/gtk.h>
-
-#include <demos.h>
-
-static GtkTextBuffer *info_buffer;
-static GtkTextBuffer *source_buffer;
-
-static gchar *current_file = NULL;
-
-enum {
-  TITLE_COLUMN,
-  FILENAME_COLUMN,
-  FUNC_COLUMN,
-  ITALIC_COLUMN,
-  NUM_COLUMNS
-};
-
-gboolean
-read_line (FILE *stream, GString *str)
-{
-  int n_read = 0;
-  
-  flockfile (stream);
-
-  g_string_truncate (str, 0);
-  
-  while (1)
-    {
-      int c;
-      
-      c = getc_unlocked (stream);
-
-      if (c == EOF)
-	goto done;
-      else
-	n_read++;
-
-      switch (c)
-	{
-	case '\r':
-	case '\n':
-	  {
-	    int next_c = getc_unlocked (stream);
-	    
-	    if (!(next_c == EOF ||
-		  (c == '\r' && next_c == '\n') ||
-		  (c == '\n' && next_c == '\r')))
-	      ungetc (next_c, stream);
-	    
-	    goto done;
-	  }
-	default:
-	  g_string_append_c (str, c);
-	}
-    }
-
- done:
-
-  funlockfile (stream);
-
-  return n_read > 0;
-}
-
-void
-load_file (const gchar *filename)
-{
-  FILE *file;
-  GtkTextIter start, end;
-  GString *buffer = g_string_new (NULL);
-  int state = 0;
-  gboolean in_para = 0;
-
-  if (current_file && !strcmp (current_file, filename))
-    return;
-
-  g_free (current_file);
-  current_file = g_strdup (filename);
-  
-  gtk_text_buffer_get_bounds (info_buffer, &start, &end);
-  gtk_text_buffer_delete (info_buffer, &start, &end);
-
-  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
-  gtk_text_buffer_delete (source_buffer, &start, &end);
-
-  file = fopen (filename, "r");
-  if (!file)
-    {
-      g_warning ("Cannot open %s: %s\n", filename, g_strerror (errno));
-      return;
-    }
-
-  gtk_text_buffer_get_iter_at_offset (info_buffer, &start, 0);
-  while (read_line (file, buffer))
-    {
-      gchar *p = buffer->str;
-      gchar *q;
-      
-      switch (state)
-	{
-	case 0:
-	  /* Reading title */
-	  while (*p == '/' || *p == '*' || isspace (*p))
-	    p++;
-	  q = p + strlen (p);
-	  while (q > p && isspace (*(q - 1)))
-	    q--;
-
-	  if (q > p)
-	    {
-	      int len_chars = g_utf8_pointer_to_offset (p, q);
-
-	      end = start;
-
-	      g_assert (strlen (p) >= q - p);
-	      gtk_text_buffer_insert (info_buffer, &end, p, q - p);
-	      start = end;
-
-	      gtk_text_iter_backward_chars (&start, len_chars);
-	      gtk_text_buffer_apply_tag_by_name (info_buffer, "title", &start, &end);
-
-	      start = end;
-	      
-	      state++;
-	    }
-	  break;
-	    
-	case 1:
-	  /* Reading body of info section */
-	  while (isspace (*p))
-	    p++;
-	  if (*p == '*' && *(p + 1) == '/')
-	    {
-	      gtk_text_buffer_get_iter_at_offset (source_buffer, &start, 0);
-	      state++;
-	    }
-	  else
-	    {
-	      int len;
-	      
-	      while (*p == '*' || isspace (*p))
-		p++;
-
-	      len = strlen (p);
-	      while (isspace (*(p + len - 1)))
-		len--;
-	      
-	      if (len > 0)
-		{
-		  if (in_para)
-		    gtk_text_buffer_insert (info_buffer, &start, " ", 1);
-
-		  g_assert (strlen (p) >= len);
-		  gtk_text_buffer_insert (info_buffer, &start, p, len);
-		  in_para = 1;
-		}
-	      else
-		{
-		  gtk_text_buffer_insert (info_buffer, &start, "\n", 1);
-		  in_para = 0;
-		}
-	    }
-	  break;
-
-	case 2:
-	  /* Skipping blank lines */
-	  while (isspace (*p))
-	    p++;
-	  if (*p)
-	    {
-	      p = buffer->str;
-	      state++;
-	      /* Fall through */
-	    }
-	  else
-	    break;
-	  
-	case 3:
-	  /* Reading program body */
-	  gtk_text_buffer_insert (source_buffer, &start, p, -1);
-	  gtk_text_buffer_insert (info_buffer, &start, "\n", 1);
-	  break;
-	}
-    }
-
-  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
-  gtk_text_buffer_apply_tag_by_name (info_buffer, "source", &start, &end);
-}
-
-gboolean
-button_press_event_cb (GtkTreeView    *tree_view,
-		       GdkEventButton *event,
-		       GtkTreeModel   *model)
-{
-  if (event->type == GDK_2BUTTON_PRESS)
-    {
-      GtkTreePath *path = NULL;
-
-      gtk_tree_view_get_path_at_pos (tree_view,
-				     event->window,
-				     event->x,
-				     event->y,
-				     &path,
-				     NULL);
-
-      if (path)
-	{
-	  GtkTreeIter iter;
-	  gboolean italic;
-	  GVoidFunc func;
-
-	  gtk_tree_model_get_iter (model, &iter, path);
-	  gtk_tree_store_get (GTK_TREE_STORE (model),
-			      &iter,
-			      FUNC_COLUMN, &func,
-			      ITALIC_COLUMN, &italic,
-			      -1);
-	  (func) ();
-	  gtk_tree_store_set (GTK_TREE_STORE (model),
-			      &iter,
-			      ITALIC_COLUMN, !italic,
-			      -1);
-	  gtk_tree_path_free (path);
-	}
-
-      gtk_signal_emit_stop_by_name (GTK_OBJECT (tree_view),
-				    "button_press_event");
-      return TRUE;
-    }
-  
-  return FALSE;
-}
-
-static void
-selection_cb (GtkTreeSelection *selection,
-	      GtkTreeModel     *model)
-{
-  GtkTreeIter iter;
-  GValue value = {0, };
-
-  if (! gtk_tree_selection_get_selected (selection, NULL, &iter))
-    return;
-
-  gtk_tree_model_get_value (model, &iter,
-			    FILENAME_COLUMN,
-			    &value);
-  load_file (g_value_get_string (&value));
-  g_value_unset (&value);
-}
-
-static GtkWidget *
-create_text (GtkTextBuffer **buffer,
-	     gboolean        is_source)
-{
-  GtkWidget *scrolled_window;
-  GtkWidget *text_view;
-  PangoFontDescription *font_desc;
-
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-				  GTK_POLICY_AUTOMATIC,
-				  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
-				       GTK_SHADOW_IN);
-  
-  text_view = gtk_text_view_new ();
-  gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
-  
-  *buffer = gtk_text_buffer_new (NULL);
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), *buffer);
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
-  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (text_view), FALSE);
-
-  if (is_source)
-    {
-      font_desc = pango_font_description_from_string ("Courier 10");
-      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), !is_source);
-  
-  return scrolled_window;
-}
-
-/* Technically a list, but if we do go to 80 demos, we may want to move to a tree */
-static GtkWidget *
-create_tree (void)
-{
-  GtkTreeSelection *selection;
-  GtkCellRenderer *cell;
-  GtkWidget *tree_view;
-  GtkTreeViewColumn *column;
-  GtkTreeStore *model;
-  GtkTreeIter iter;
-  gint i;
-
-  model = gtk_tree_store_new_with_types (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
-  tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-
-  gtk_tree_selection_set_type (GTK_TREE_SELECTION (selection),
-			       GTK_TREE_SELECTION_SINGLE);
-  gtk_widget_set_usize (tree_view, 200, -1);
-
-  for (i=0; i < G_N_ELEMENTS (testgtk_demos); i++)
-    {
-      gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
-
-      gtk_tree_store_set (GTK_TREE_STORE (model),
-			  &iter,
-			  TITLE_COLUMN, testgtk_demos[i].title,
-			  FILENAME_COLUMN, testgtk_demos[i].filename,
-			  FUNC_COLUMN, testgtk_demos[i].func,
-			  ITALIC_COLUMN, FALSE,
-			  -1);
-    }
-
-  cell = gtk_cell_renderer_text_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Widget",
-						     cell,
-						     "text", TITLE_COLUMN,
-						     "italic", ITALIC_COLUMN,
-						     NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
-			       GTK_TREE_VIEW_COLUMN (column));
-
-  gtk_signal_connect (GTK_OBJECT (selection), "selection_changed", selection_cb, model);
-  gtk_signal_connect (GTK_OBJECT (tree_view), "button_press_event", GTK_SIGNAL_FUNC (button_press_event_cb), model);
-
-  return tree_view;
-}
-
-int
-main (int argc, char **argv)
-{
-  GtkWidget *window;
-  GtkWidget *notebook;
-  GtkWidget *hbox;
-  GtkWidget *tree;
-  GtkTextTag *tag;
-
-  gtk_init (&argc, &argv);
-  
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_signal_connect (GTK_OBJECT (window), "destroy",
-		      GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_container_add (GTK_CONTAINER (window), hbox);
-
-  tree = create_tree ();
-  gtk_box_pack_start (GTK_BOX (hbox), tree, FALSE, FALSE, 0);
-
-  notebook = gtk_notebook_new ();
-  gtk_box_pack_start (GTK_BOX (hbox), notebook, TRUE, TRUE, 0);
-
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-			    create_text (&info_buffer, FALSE),
-			    gtk_label_new ("Info"));
-
-
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-			    create_text (&source_buffer, TRUE),
-			    gtk_label_new ("Source"));
-
-  tag = gtk_text_buffer_create_tag (info_buffer, "title");
-  gtk_object_set (GTK_OBJECT (tag),
-		 "font", "Sans 18",
-		 NULL);
-
-  tag = gtk_text_buffer_create_tag (info_buffer, "source");
-  gtk_object_set (GTK_OBJECT (tag),
-		  "font", "Courier 10",
-		  "pixels_above_lines", 0,
-		  "pixels_below_lines", 0,
-		 NULL);
-
-  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-  gtk_widget_show_all (window);
-  
-
-  load_file (testgtk_demos[0].filename);
-  
-  gtk_main ();
-
-  return 0;
-}
@@ -66,7 +66,7 @@ configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
   return FALSE;
 }

-extern void pixbuf_init (void);
+extern void pixbuf_init ();

 int
 main (int argc, char **argv)
@@ -67,96 +67,18 @@ compare_pixbufs (GdkPixbuf *pixbuf, GdkPixbuf *compare, const gchar *file_type)
        }
 }

-static gboolean
-save_to_loader (const gchar *buf, gsize count, GError **err, gpointer data)
-{
-        GdkPixbufLoader *loader = data;
-
-        return gdk_pixbuf_loader_write (loader, buf, count, err);
-}
-
-static GdkPixbuf *
-buffer_to_pixbuf (const gchar *buf, gsize count, GError **err)
-{
-        GdkPixbufLoader *loader;
-        GdkPixbuf *pixbuf;
-
-        loader = gdk_pixbuf_loader_new ();
-        if (gdk_pixbuf_loader_write (loader, buf, count, err) && 
-            gdk_pixbuf_loader_close (loader, err)) {
-                pixbuf = g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader));
-                g_object_unref (loader);
-                return pixbuf;
-        } else {
-                return NULL;
-        }
-}
-
-static void
-do_compare (GdkPixbuf *pixbuf, GdkPixbuf *compare, GError *err)
-{
-        if (compare == NULL) {
-                fprintf (stderr, "%s", err->message);
-                g_error_free (err);
-        } else {
-                compare_pixbufs (pixbuf, compare, "jpeg");
-                g_object_unref (compare);
-        }
-}
-
 static void
 keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
 {
        GdkPixbuf *pixbuf;
        GtkDrawingArea *da = (GtkDrawingArea*)data;
        GError *err = NULL;
-        gchar *buffer;
-        gsize count;
-        GdkPixbufLoader *loader;
-
+        
        pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (da), "pixbuf");

        if (evt->keyval == 'q')
                gtk_main_quit ();
-
-        if (evt->keyval == 's' && (evt->state & GDK_CONTROL_MASK)) {
-                /* save to callback */
-                if (pixbuf == NULL) {
-                        fprintf (stderr, "PIXBUF NULL\n");
-                        return;
-                }	
-
-                loader = gdk_pixbuf_loader_new ();
-                if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "jpeg",
-                                                  &err,
-                                                  "quality", "100",
-                                                  NULL) ||
-                    !gdk_pixbuf_loader_close (loader, &err)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare (pixbuf,
-                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
-                                    err);
-                        g_object_unref (loader);
-                }
-        }
-        else if (evt->keyval == 'S') {
-                /* save to buffer */
-                if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "jpeg",
-                                                &err,
-                                                "quality", "100",
-                                                NULL)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare (pixbuf,
-                                    buffer_to_pixbuf (buffer, count, &err),
-                                    err);
-                }
-        }
-        else if (evt->keyval == 's') {
-                /* save normally */
+        if (evt->keyval == 's') {
                if (pixbuf == NULL) {
                        fprintf (stderr, "PIXBUF NULL\n");
                        return;
@@ -169,49 +91,20 @@ keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
                        fprintf (stderr, "%s", err->message);
                        g_error_free (err);
                } else {
-                        do_compare (pixbuf,
-                                    gdk_pixbuf_new_from_file ("foo.jpg", &err),
-                                    err);
-                }
-        }
+                        GdkPixbuf *compare;

-        if (evt->keyval == 'p' && (evt->state & GDK_CONTROL_MASK)) {
-                /* save to callback */
-                if (pixbuf == NULL) {
-                        fprintf (stderr, "PIXBUF NULL\n");
-                        return;
-                }
+                        compare = gdk_pixbuf_new_from_file ("foo.jpg", &err);

-                loader = gdk_pixbuf_loader_new ();
-                if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "png",
-                                                  &err,
-                                                  "tEXt::Software", "testpixbuf-save",
-                                                  NULL)
-                    || !gdk_pixbuf_loader_close (loader, &err)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare (pixbuf,
-                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
-                                    err);
-                        g_object_unref (loader);
+                        if (!compare) {
+                                fprintf (stderr, "%s", err->message);
+                                g_error_free (err);
+                        } else {
+                                compare_pixbufs (pixbuf, compare, "jpeg");
+                                g_object_unref (compare);
+                        }
+                                        
                }
-        }
-        else if (evt->keyval == 'P') {
-                /* save to buffer */
-                if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "png",
-                                                &err,
-                                                "tEXt::Software", "testpixbuf-save",
-                                                NULL)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare (pixbuf,
-                                    buffer_to_pixbuf (buffer, count, &err),
-                                    err);
-                }
-        }
-        else if (evt->keyval == 'p') {
+        } else if (evt->keyval == 'p') {
                if (pixbuf == NULL) {
                        fprintf (stderr, "PIXBUF NULL\n");
                        return;
@@ -224,65 +117,20 @@ keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
                        fprintf (stderr, "%s", err->message);
                        g_error_free (err);
                } else {
-                        do_compare(pixbuf,
-                                   gdk_pixbuf_new_from_file ("foo.png", &err),
-                                   err);
-                }
-        }
+                        GdkPixbuf *compare;

-        if (evt->keyval == 'i' && (evt->state & GDK_CONTROL_MASK)) {
-                /* save to callback */
-                if (pixbuf == NULL) {
-                        fprintf (stderr, "PIXBUF NULL\n");
-                        return;
-                }
+                        compare = gdk_pixbuf_new_from_file ("foo.png", &err);

-                loader = gdk_pixbuf_loader_new ();
-                if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "ico",
-                                                  &err,
-                                                  NULL)
-                    || !gdk_pixbuf_loader_close (loader, &err)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare (pixbuf,
-                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
-                                    err);
-                        g_object_unref (loader);
+                        if (!compare) {
+                                fprintf (stderr, "%s", err->message);
+                                g_error_free (err);
+                        } else {
+                                compare_pixbufs (pixbuf, compare, "png");
+                                g_object_unref (compare);
+                        }
+                                        
                }
-        }
-        else if (evt->keyval == 'I') {
-                /* save to buffer */
-                if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "ico",
-                                                &err,
-                                                NULL)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare (pixbuf,
-                                    buffer_to_pixbuf (buffer, count, &err),
-                                    err);
-                }
-        }
-        else if (evt->keyval == 'i') {
-                if (pixbuf == NULL) {
-                        fprintf (stderr, "PIXBUF NULL\n");
-                        return;
-                }
-
-                if (!gdk_pixbuf_save (pixbuf, "foo.ico", "ico", 
-                                      &err,
-                                      NULL)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare(pixbuf,
-                                   gdk_pixbuf_new_from_file ("foo.ico", &err),
-                                   err);
-                }
-        }
-
-        if (evt->keyval == 'a') {
+        } else if (evt->keyval == 'a') {
                if (pixbuf == NULL) {
                        fprintf (stderr, "PIXBUF NULL\n");
                        return;
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <gtk/gtk.h>

 #include <stdio.h>
@@ -12,12 +11,7 @@ GtkWidget *darea;
 void
 set_interp_type (GtkWidget *widget, gpointer data)
 {
-  guint types[] = { GDK_INTERP_NEAREST,
-                    GDK_INTERP_BILINEAR,
-                    GDK_INTERP_TILES,
-                    GDK_INTERP_HYPER };
-
-  interp_type = types[gtk_combo_box_get_active (GTK_COMBO_BOX (widget))];
+  interp_type = GPOINTER_TO_UINT (data);
  gtk_widget_queue_draw (darea);
 }

@@ -64,7 +58,7 @@ int
 main(int argc, char **argv)
 {
 	GtkWidget *window, *vbox;
-        GtkWidget *combo_box;
+	GtkWidget *menuitem, *optionmenu, *menu;
 	GtkWidget *alignment;
 	GtkWidget *hbox, *label, *hscale;
 	GtkAdjustment *adjustment;
@@ -101,18 +95,37 @@ main(int argc, char **argv)
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (window), vbox);

-        combo_box = gtk_combo_box_new_text ();
+	menu = gtk_menu_new ();
+	
+	menuitem = gtk_menu_item_new_with_label ("NEAREST");
+	g_signal_connect (menuitem, "activate",
+			  G_CALLBACK (set_interp_type),
+			  GUINT_TO_POINTER (GDK_INTERP_NEAREST));
+	gtk_widget_show (menuitem);
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+	
+	menuitem = gtk_menu_item_new_with_label ("BILINEAR");
+	g_signal_connect (menuitem, "activate",
+			  G_CALLBACK (set_interp_type),
+			  GUINT_TO_POINTER (GDK_INTERP_BILINEAR));
+	gtk_widget_show (menuitem);
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+	
+	menuitem = gtk_menu_item_new_with_label ("TILES");
+	g_signal_connect (menuitem, "activate",
+			  G_CALLBACK (set_interp_type),
+			  GUINT_TO_POINTER (GDK_INTERP_TILES));
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);

-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "NEAREST");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "BILINEAR");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "TILES");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "HYPER");
+	menuitem = gtk_menu_item_new_with_label ("HYPER");
+	g_signal_connect (menuitem, "activate",
+			  G_CALLBACK (set_interp_type),
+			  GUINT_TO_POINTER (GDK_INTERP_HYPER));
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);

-        gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 1);
-
-        g_signal_connect (combo_box, "changed",
-                          G_CALLBACK (set_interp_type),
-                          NULL);
+	optionmenu = gtk_option_menu_new ();
+	gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
+	gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), 1);
 	
 	alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
@@ -131,7 +144,7 @@ main(int argc, char **argv)
 	gtk_scale_set_digits (GTK_SCALE (hscale), 0);
 	gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE, TRUE, 0);

-	gtk_container_add (GTK_CONTAINER (alignment), combo_box);
+	gtk_container_add (GTK_CONTAINER (alignment), optionmenu);
 	gtk_widget_show_all (vbox);

 	/* Compute the size without the drawing area, so we know how big to make the default size */
@@ -358,11 +358,11 @@ expose_func (GtkWidget *drawing_area, GdkEventExpose *event, gpointer data)
 static void
 config_func (GtkWidget *drawing_area, GdkEventConfigure *event, gpointer data)
 {
-#if 0
 	GdkPixbuf *pixbuf;
    
 	pixbuf = (GdkPixbuf *)g_object_get_data (G_OBJECT (drawing_area), "pixbuf");

+#if 0
 	if (((event->width) != gdk_pixbuf_get_width (pixbuf)) ||
 	    ((event->height) != gdk_pixbuf_get_height (pixbuf)))
 		gdk_pixbuf_scale (pixbuf, event->width, event->height);
@@ -427,7 +427,7 @@ new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)

 	gtk_widget_show (window);

-        return drawing_area;
+        return window;
 }


@@ -439,8 +439,7 @@ update_timeout (gpointer data)
        GError *error;
        
 	done = FALSE;
-        error = NULL;
-
+        error = FALSE;
 	if (!feof (status->imagefile)) {
 		gint nbytes;
                
@@ -448,6 +447,7 @@ update_timeout (gpointer data)
 			       status->imagefile);


+                error = NULL;
                if (!gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes, &error)) {
                        g_warning ("Error writing to loader: %s",
                                   error->message);
@@ -458,7 +458,7 @@ update_timeout (gpointer data)
                        
        } 
 	else 
-                done = TRUE;
+	  done = TRUE;
 	  
 	if (done) {
                /* ignoring errors, we should not do that. */
@@ -504,11 +504,11 @@ progressive_updated_callback (GdkPixbufLoader* loader, guint x, guint y, guint w

 static int readlen = 4096;

-extern void pixbuf_init (void);
+extern void pixbuf_init ();

 void size_func (GdkPixbufLoader *loader, gint width, gint height, gpointer data)
 {
-        gdk_pixbuf_loader_set_size (loader, width*2, height*2);
+  gdk_pixbuf_loader_set_size (loader, width*2, height*2);
 }


@@ -525,7 +525,7 @@ main (int argc, char **argv)

 	gtk_init (&argc, &argv);

-	/*	gdk_rgb_set_verbose (TRUE);*/
+	gdk_rgb_set_verbose (TRUE);

 	gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());

@@ -611,10 +611,8 @@ main (int argc, char **argv)

 			status.buf = g_malloc (readlen);

-#if 0
 			g_signal_connect (pixbuf_loader, "size_prepared", 
 					  G_CALLBACK (size_func), NULL);
-#endif

                        g_signal_connect (pixbuf_loader, "area_prepared",
 					  G_CALLBACK (progressive_prepared_callback),
@@ -628,7 +626,7 @@ main (int argc, char **argv)

 			status.readlen = readlen;

-                        status.timeout = gdk_threads_add_timeout (100, update_timeout, &status);
+                        status.timeout = g_timeout_add (100, update_timeout, &status);
                }
 #endif
 	}
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in

-SUBDIRS = tutorial faq reference tools
+SUBDIRS = tutorial faq reference

 EXTRA_DIST = \
 	defsformat.txt			\
@@ -11,7 +11,6 @@ EXTRA_DIST = \
 	sizing-test.txt			\
 	styles.txt			\
 	text_widget.txt 		\
-	text_widget_internals.txt	\
 	tree-column-sizing.txt		\
 	widget_geometry.txt		\
 	widget_system.txt 		\
@@ -32,7 +32,7 @@ Freetype can be found at ftp://ftp.freetype.org

 Hardware requirements:
 ----------------------
-You need a graphics card with an available framebuffer driver that can
+You need a graphics card with an availible framebuffer driver that can
 run in 8, 16, 24 or 32 bpp. I use the matroxfb driver, but i.e. vesafb
 should work too. You also need a supported mouse. Currently supported
 is ps2 mouse, ms serial mouse and fidmour touchscreen.
@@ -44,7 +44,7 @@ First build and install glib and pango as usual, in that order.
 Then configure Gtk by running configure (or autogen.sh if running from
 cvs) with --with-gdktarget=linux-fb.

-Then compile as usual: make; make install
+Then compile as ususal: make; make install

 Fonts:
 ------
@@ -124,7 +124,7 @@ GDK_MOUSE_TYPE:
 Default is ps2.

 GDK_KEYBOARD_TYPE:
- Specify keyboard type. Currently supported is
+ Specify keyboard type. Currently suppored is
  xlate - normal tty mode keyboard.
    Quite limited, cannot detect key up/key down events. Doesn't
    handle ctrl/alt/shift for all keys. This is the default driver,
@@ -4,8 +4,8 @@ How to do a GTK+ release?
 Make sure you have Owen's special autoconf and libtool RPMs, available at:
 http://people.redhat.com/otaylor/gtk/autotools/.

-Also make sure you have the following packages installed with all their
-dependencies (I used the RPM package names from RedHat 9):
+Also make sure you have the following packages installed (I used the RPM
+package names from RedHat 8.0):
 * gtk-doc
 * linuxdoc-tools
 * docbook-utils
@@ -15,31 +15,23 @@ Without those packages make distcheck will *not* pass.

 0) Blow away your gtk+ directory, check a new version out
 1) autogen and build it, make sure to enable docs.
-2) Update NEWS based on the various ChangeLog files
-3) Verify that the version in configure.in has been bumped after the last
-release. (Note that this is critical, a slip-up here will cause the soname 
+2) Update NEWS based on ChangeLog
+3) Update version in configure.in, increase MICRO, interface and binary
+age by 1. (Note that this is critical, a slip-up here will cause the soname
 to change).
-4) Make sure that make check is happy (If you don't do it here, make distcheck
-will also catch it, but it is kind of disheartening to see make distcheck fail
-due to an extraneous symbol after watching it build the docs for an hour...)
-5) Add === Released 2.x.y === at the top of all ChangeLog files
-6) make distcheck
-7) Fix broken stuff found by 5) repeat
-8) cvs commit; you'll have a bunch of po file changes, and maybe some
+4) Add === Released 2.0.x === at the top of the ChangeLog
+5) make mydistcheck
+6) Fix broken stuff found by 4) repeat
+7) cvs commit; you'll have a bunch of po file changes, and maybe some
 doc changes too (NOTE: be sure to use cvs with compression, else you'll
 end up waiting for a long time :).
-9) If 7) fails because someone else committed inbetween, curse, cvs up,
+8) If 7) fails because someone else committed inbetween, curse, cvs up
 fix conflicts and go to 5)
-10) type 'cvs tag GTK_2_x_y' in the toplevel directory
-11) You now have the tarball, and the CVS tag, now upload the tarball to
+9) type 'cvs tag GTK_2_0_9' in the toplevel directory
+10) You now have the tarball, and the CVS tag, now upload the tarball to
 gnome.org and gtk.org
-12) Go to the gnome-announce list archives, find the last announce message,
+11) Go to the gnome-announce list archives, find the last announce message,
 create a new message in the same form, replacing version numbers, commentary
 at the top about "what this release is about" and the Summary of changes.
-13) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
+12) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
 gtk-devel-list. Set reply-to to gnome-hackers.
-14) Bump the version number in configure.in. 
-15) Create a new milestone in bugzilla and move the remaining bugs from the
-2.x.y milestone over to the new one.
-16) Add a link to the release announcement to www.gtk.org which lives in
-the gtk-web cvs module.
@@ -6,7 +6,7 @@ programming for/with Gtk, having the spirit of a developers FAQ.
 It is also the correct place to list up things that programmers should
 care about in general.

-In the hope that this text might be useful to someone,
+In the hope that this text might be usefull to someone,

        - Tim Janik <timj@gimp.org>
          1998/02/11
@@ -43,7 +43,7 @@ GDK_SELECTION_CLEAR     GtkWidget::selection_clear_event
 GDK_FOCUS_CHANGE        GtkWidget::focus_in_event
                        GtkWidget::focus_out_event

-Events that are assured to have a valid GdkEvent.any.window field are
+Events that are asured to have a valid GdkEvent.any.window field are

 GDK_EXPOSE		GtkWidget::expose_event

@@ -61,7 +61,7 @@ Writing Gdk functions
 ---------------------

 When writing Gdk functions that operate on GdkWindow structures in any
-meaningful sense, that is casting to a GdkWindowPrivate structure for
+maeningfull sense, that is casting to a GdkWindowPrivate structure for
 access to fields other then GdkWindow.user_data, the programmer is
 recommended to check for the GdkWindowPrivate.destroyed field to be ==
 FALSE, especially if the GdkWindowPrivate.xwindow field is used.
@@ -112,7 +112,7 @@ Retrieves the selection that will be used to communicate
 the data for the drag context (valid on both source
 and dest sides)

-Cursors and window hierarchies
+Cursors and window heirarchies
 ==============================

 The DND code, when possible (and it isn't possible over
@@ -123,7 +123,7 @@ the cursor is in _ourselves_ so we can ignore the
 drag icon properly. (Oh for OutputOnly windows!)

 To avoid obscene amounts of server traffic (which are only
-slightly observable locally, but would really kill a
+slighly observerable locally, but would really kill a
 session over a slow link), the code in GDK does
 XGetWindowAttributes for every child of the root window at
 the beginning of the drag, then selects with
@@ -2,18 +2,14 @@ EXTRA_DIST = 			\
 	gtk-faq.sgml

 if HAVE_DOCBOOK
-html:
-	if test -w $(srcdir); then \
-	  (cd $(srcdir); \
-	   db2html gtk-faq.sgml; \
-	   test -d html && rm -r html; \
-	   mv gtk-faq html); \
-	fi
+html: 
+	(cd $(srcdir); \
+	 db2html gtk-faq.sgml; \
+	 test -d html && rm -r html; \
+	 mv gtk-faq html)

 pdf:
-	if test -w $(srcdir); then \
-	  (cd $(srcdir); db2pdf gtk-faq.sgml); \
-	fi
+	(cd $(srcdir); db2pdf gtk-faq.sgml)

 dist-hook: html
 	cp -Rp $(srcdir)/html $(distdir)
@@ -30,7 +26,7 @@ pdf:

 dist-hook:
 	echo "***"
-	echo "*** Warning: FAQ not built"
+	echo "*** Warning: Tutorial not built"
 	echo "*** DISTRIBUTION IS INCOMPLETE"
 	echo "***"
 endif
@@ -1,161 +0,0 @@
-Notational conventions
-======================
-
-We have a window W that we are tracking events on. Focus
-can be on the following classes of objects
-
-  None        : defined by X protocol
-  PointerRoot : defined by X protocol
-  W           : the window itself
-  Ancestor    : An ancestor of W, including W's root window
-  Descendant  : A descendant of W
-  Other:      : A window that is neither an ancestor or
-                descendant of W
-
-has_pointer(W): the pointer is in W or one of its descendants.
-
-NotifyPointer events
-====================
-
-X sends FocusIn or FocusOut events to W with a detail of NotifyPointer
-in the following transitions, when the pointer is inside W
-
- Other => Ancestor: FocusIn
- Ancestor => {Other,None}: FocusOut
- Ancestor => PointerRoot: FocusOut, then FocusIn
- {None,W,Descendant,Other} => PointerRoot: FocusIn
- PointerRoot => Ancestor: FocusOut, then FocusIn
- PointerRoot => {None,W,Descendant,Other} => FocusOut
-
-[ Ignoring keyboard grabs for the moment ]
-
-Basic focus tracking algorithm
-==============================
-
-Keystroke events are delivered within W if and only if one of two
-predicates hold:
-
- has_focus_window(W): F==W || F==Descendant
- has_pointer_focus(W): (F==Ancestor || F==PointerRoot) && has_pointer(W)
-
-These two conditions are mutually exclusive.
-
-has_focus_window(W) is easy to track.
-
- FocusIn: detail != NotifyInferior: Set has_focus_iwndow
- FocusOut: detail != NotifyInferior: Clear has_focus_iwndow
-
-has_pointer_focus(W) is harder to track.
-
-We can separate out the transitions from !has_pointer_focus(W) to
-has_pointer_focus(W) into four cases:
-
- T1: [(F==W || F==Descendant) => F==Ancestor]; has_pointer(W)
-
- T2: [(F==W || F==Descendant) => F==PointerRoot]; has_pointer(W)
- 
- T3: [(F==None || F==Other) => (F==PointerRoot || F==Ancestor)];
-   has_pointer(W)
-
- T4: [!has_pointer(W) => has_pointer(W)]; (F==Ancestor || F==PointerRoot)
-
-All of these can be tracked by watching events on W.
-
-T1:, we get a FocusOut with a mode of Ancestor or Virtual
-  We need to separately track has_pointer(W) to distinguish
-  this from the case where we get these events and !has_pointer(W)
-
-T2, T3: together these are exactly the cases where we get 
-  FocusIn/NotifyPointer.
-
-For T4, we get an EnterNotify with the focus flag set. An
-  EnterNotify with a focus flag set will also be sent if 
-  F==W, so we have to to explicitly test for that case
-  using has_focus_window(W)
-
-
-The transitions from has_pointer_focus(W) to !has_pointer_focus(W)
-are exactly the opposite
-
- F1: [(F==W || F==Descendant) <= F==Ancestor]; has_pointer(W)
-
- F2: [(F==W || F==Descendant) <= F==PointerRoot]; has_pointer(W)
- 
- F3: [(F==None || F==Other) <= (F==PointerRoot || F==Ancestor)];
-   has_pointer(W)
-
- F4: [!has_pointer(W) <= has_pointer(W)]; (F==Ancestor || F==PointerRoot)
-
-And can be tracked in the same ways:
-
-F1: we get a FocusIn with a mode of Ancestor or Virtual
-  We need to separately track has_pointer(W) to distinguish
-  this from the case we get these events and !has_pointer(W)
-
-F2, F3: together these are exactly the cases where we get 
-  FocusOut/NotifyPointer.
-
-F4: we get an LeaveNotify with the focus flag set. An
-  LeaveNotify with a focus flag set will also be sent if 
-  F==W, so we have to to explicitly test for that case
-  using has_focus_window(W).
-
-
-Modifications for keyboard grabs
-================================
-
-The above algorithm ignores keyboard grabs, which also 
-generate focus events, and needs to be modified somewhat
-to take keyboard grabs into effect. The basic idea 
-is that for has_pointer_focus(W)/has_window_focus(W) we track
-them ignoring grabs and ungrabs, and then supplement
-that with another predicate has_focus(W) which pays
-attention to grabs and ungrabs.
-
-Modification 1:
-   
- When tracking has_pointer_focus(W), ignore all Focus
- events with a mode of NotifyGrab or NotifyUngrab.
-
- Note that this means that with grabs, we don't perfectly.
- track the delivery of keyboard events ... since we think
- we are getting events in the case where
-
-  has_pointer_focus(W) && !(G == None || G==W || G==descendant)
-
- But the X protocol doesn't provide sufficient information
- to do this right... example:
-
-   F=Ancestor, G=None   =>   F=Ancestor, G=Ancestor
-
- We stop getting events, but receive no notification.
-	
- The case of no window manager and keyboard grabs is pretty
- rare in any case.
-
-Modification 2:
-   
- When tracking has_focus_window(W), ignore all Focus
- events with a mode of NotifyGrab or NotifyUngrab.
-
-Modification 3: instead of calculating focus as 
-  
-    has_focus_window(W) || has_pointer_focus(W)
-
-  Calculate it as 
-
-    has_focus(W) || has_pointer_focus(W)
-
-  where has_focus(W) is defined as:
-
-   has_focus(W): F==W || F==Descendant || G=W
-
-  Tracking has_focus(W) is done by 
-
- FocusIn: detail != NotifyInferior, mode != NotifyWhileGrabbed: 
-    set has_focus
- FocusOut: detail != NotifyInferior, mode != NotifyWhileGrabbed: 
-    clear has_focus
-
- We still need to track has_focus_window(W) for the T4/F4 
- transitions.
@@ -107,7 +107,7 @@ makeenums.pl can be run into two modes:

 2) Generate the enumeration portion of gtk.defs.

-The enumeration portion is added to the boxed type 
+The enumearation portion is added to the boxed type 
 declarations in gtk-boxed.defs to create gtk.defs.

 The makeetypes.awk program takes the gtk.defs file, and
@@ -162,7 +162,7 @@ The possible types are:
 	     GtkDestroyNotify Notify)

 Some of these types map to multiple return values - these
-are marked above with the return types in parentheses.
+are marked above with the return types in parantheses.

 NOTES
 =====
@@ -170,7 +170,7 @@ NOTES
 When autogenerating GTK+ files, the autogenerated
 files are often rebuild resulting in the same result.

-To prevent unnecessary rebuilds of the entire directory, some files
+To prevent unecessary rebuilds of the entire directory, some files
 that multiple other source files depend on are not actually written
 to directly.  Instead, an intermediate file is written, which
 is then compared to the old file, and only if it is different
@@ -1,7 +1,7 @@
 CONFIGURING PACKAGES TO WORK WITH GTK
 -------------------------------------

-Compiling a program successfully against the GTK, GDK, and GLIB
+Compiling a program succesfully against the GTK, GDK, and GLIB
 libraries can require a large number of command line options
 to your compiler and linker that are hard to guess correctly.
 The additional libraries required may, for example, depend on the
@@ -1,163 +0,0 @@
-Information about the icon theme cache format used by GTK+
-for more information, see the mailing list threads at 
-
-http://mail.gnome.org/archives/gtk-devel-list/2004-April/msg00065.html
-http://lists.freedesktop.org/archives/xdg/2004-October/005140.html
-
-
-Back in May, Owen Taylor proposed [1] caching scheme for icon theme
-information, to reduce the amount of stating and disk seeking at
-application startup, and to reduce the memory overhead if each app
-allocates all the icon theme data separately.
-
-The proposal is to keep the information about the icons in the 
-directory tree below each icon theme directory in an mmap()able 
-cache file (There is basically one cache file per index.theme file). 
-
-The cache doesn't try to hold all information from the index.theme files
-that you would need to do lookups; it turns out that with the icon theme
-specification, this isn't even sensible - you can install a 
-
- $HOME/.local/share/icons/Bluecurve/index.theme
-
-That overrides
-
- /usr/share/icons/Bluecurve/index.theme
-
-and chances how lookup happens for icons in /usr/share/icons/Bluecurve.
-
-We would like to propose the cache file format as an appendix to the
-icon theme specification. One thing which still needs to be investigated
-is caching of the actual image data; the file format is has an
-IMAGE_DATA_OFFSET member to allow adding that compatibly. An
-implementation of the caching scheme for GTK+ can be found at [2]. The
-cache generator which is included in the patch depends only on glib, and
-it may be a good idea to move it to freedesktop.org as well. 
-
-
-Regards, Matthias Clasen
-
-
-The cache file format:
-
-Header:
-2			CARD16		MAJOR_VERSION	1	
-2			CARD16		MINOR_VERSION	0	
-4			CARD32		HASH_OFFSET		
-4			CARD32		DIRECTORY_LIST_OFFSET
-
-DirectoryList:
-4			CARD32		N_DIRECTORIES		
-4*N_DIRECTORIES		CARD32		DIRECTORY_OFFSET	
-
-Hash:
-4			CARD32		N_BUCKETS		
-4*N_BUCKETS		CARD32		ICON_OFFSET	
-
-Icon:
-4			CARD32		CHAIN_OFFSET		
-4			CARD32		NAME_OFFSET		
-4			CARD32		IMAGE_LIST_OFFSET	
-
-ImageList:
-4			CARD32		N_IMAGES		
-8*N_IMAGES		Image		IMAGES			
-
-Image:
-2			CARD16		DIRECTORY_INDEX	
-2			ICON_FLAGS	FLAGS			
-4			CARD32		IMAGE_DATA_OFFSET	
-
-ICON_FLAGS
-HAS_SUFFIX_PNG	1
-HAS_SUFFIX_XPM	2
-HAS_SUFFIX_SVG	4
-HAS_ICON_FILE	8
-
-ImageData:
-4			CARD32		IMAGE_PIXEL_DATA_OFFSET
-4			CARD32		IMAGE_META_DATA_OFFSET
-
-4			CARD32		IMAGE_PIXEL_DATA_TYPE
-4			CARD32		IMAGE_PIXEL_DATA_LENGTH
-N/A			N/A		PIXEL_DATA
-
-IMAGE_PIXEL_DATA_TYPE
-0 GdkPixdata format
-
-MetaData:
-4			CARD32		EMBEDDED_RECT_OFFSET
-4			CARD32		ATTACH_POINT_LIST_OFFSET
-4			CARD32		DISPLAY_NAME_LIST_OFFSET
-
-EmbeddedRect:
-2			CARD16		X0
-2			CARD16		Y0
-2			CARD16		X1
-2			CARD16		Y1
-
-AttachPointList:
-4			CARD32		N_ATTACH_POINTS
-4*N_ATTACH_POINTS	AttachPoint
-
-AttachPoint:
-2			CARD16		X
-2			CARD16		Y
-
-DisplayNameList:
-4			CARD32		N_DISPLAY_NAMES
-4*N_DISPLAY_NAMES	DisplayName
-
-DisplayName:
-4			CARD32		DISPLAY_LANG_OFFSET
-4			CARD32		DISPLAY_NAME_OFFSET
-		
-
-Notes:
-
-* All offsets are from in bytes from the beginning of the file
-
-* Strings are zero-terminated
-
-* Directories are stored as relative paths.
-
-* All numbers are in network (big-endian) order. This is
-  necessary because the data will be stored in arch-independent
-  directories like /usr/share/icons or even in user's 
-  home directories.
-
-* The hash function is that used by g_str_hash()
-
-  unsigned int
-  icon_str_hash (gconstpointer key)
-  {
-    const char *p = key;
-    unsigned int h = *p;
-
-    if (h)
-      for (p += 1; *p != '\0'; p++)
-        h = (h << 5) - h + *p;
-
-    return h;
-  }
-
- This should not be implemented by calling g_str_hash(). For
- optimal results, N_BUCKETS should be typically be prime.
-
-* The same file format is used for icon themes (e.g.,
-  /usr/share/icons/Bluecurve) and for unthemed icon directories
-  (e.g., /usr/share/pixmaps)
-
-  For an unthemed directory, N_DIRECTORIES==0 and each
-  image has a DIRECTORY_INDEX field of 0xFFFF.
-
-* Up-to-dateness of a cache file is determined simply:
-
-    If the mod-time on the directory where the cache file
-    lives is newer than the mod-time of the cache file,
-    the cache file is out of date.
-
-* Cache files have to be written atomically - write to a
-  temporary name, then move over the old file - so that
-  clients that have the old cache file open and mmap'ed
-  won't get corrupt data.
@@ -22,10 +22,10 @@ GtkObjects also provide the following functions:
 GdkWindow
 ---------

-A GdkWindow has to be explicitly destroyed with gdk_window_destroy.
+A GdkWindow has to be explicitely destroyed with gdk_window_destroy.
 This will send out a request to destroy this window and all its
 children, and will decrement the ref_count of the GdkWindow by one.
-Thus, it releases the initial reference created by gdk_window_new.
+Thus, it releases the inital reference created by gdk_window_new.

 All GdkWindows are kept in a hash table to translate from their XId to
 the actual structure and the pointer in the hash table is reflected in
@@ -62,7 +62,7 @@ GdkVisual
 ---------

 There are no *_new or *_destroy functions and the *_ref and *_unref
-functions are no-ops.  GdkVisuals are static structures and thus do not
+functions are noops.  GdkVisuals are static structures and thus do not
 need reference counting.  The ref counting functions are only there
 for extra defensive programming.

@@ -220,13 +220,13 @@ Then, when the user wants to get rid of the window:
  /* The GdkWindow of `window' and all its child GdkWindows are
   * destroyed.
   *
-   * window is unregistered from the toplevel list and its ref_count
-   * drops to zero.  The destroy code of `window' destroys `option_menu'.
+   * window is unregistered from the loplevel list and its ref_count
+   * drops to zero.  The destroy code of `window' destroyes `option_menu'.
   *
   * The destroy code of `option_menu' causes the `menu' to be detached
   * from it and its reference count drops to zero.
   *
-   * The destroy code of `menu' destroys `menu_item'.
+   * The destroy code of `menu' destroyes `menu_item'.
   *
   * The destruction of `menu_item' removes it from its parent, the
   * menu_item->ref_count drops to zero and `menu_item' is finalized (freed).
@@ -241,7 +241,7 @@ Taking care of proper referencing

 There are some cases where referencing of widgets from outside the toolkit
 (on the application side) is needed.
-Once the application performs an operation on a widget that will cause
+Once the application performes an operation on a widget that will cause
 its reference count to drop, if it wants to take further actions on the
 widget, it needs to hold a reference to it.

@@ -1,6 +0,0 @@
-2007-06-19  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
-
-	* docs/reference/gtk/tmpl/gtkextendedlayout.sgml,
-	docs/reference/gtk/gtk-docs.sgml, docs/reference/gtk/gtk-sections.txt,
-	docs/reference/gtk/gtk.types: Implement GtkExtendLayout interface.
-
@@ -9,7 +9,6 @@ gdk-pixbuf.hierarchy
 gdk-pixbuf.interfaces
 gdk-pixbuf.prerequisites
 gdk-pixbuf.signals
-deprecated
 html
 xml
 *.stamp
@@ -1,18 +1,22 @@
 ## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = 1.6
-
 # The name of the module.
 DOC_MODULE=gdk-pixbuf

 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gdk-pixbuf.sgml

+# The directory containing the source code. Relative to $(srcdir)
+DOC_SOURCE_DIR=../../../gdk-pixbuf
+
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS=--source-dir=../../../contrib/gdk-pixbuf-xlib --deprecated-guards="GDK_PIXBUF_ENABLE_BROKEN|GDK_PIXBUF_DISABLE_DEPRECATED"

-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../gdk-pixbuf
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml
+
+# Extra options to supply to gtkdoc-fixref
+FIXXREF_OPTIONS=

 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.h $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.h
@@ -21,32 +25,19 @@ CFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.c $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.
 # Header files to ignore when scanning
 IGNORE_HFILES=				\
 	pixops				\
-	gdk-pixbuf-alias.h		\
 	gdk-pixbuf-marshal.h		\
 	gdk-pixbuf-xlib-private.h 	\
 	gdk-pixbuf-i18n.h 		\
 	gdk-pixbuf-private.h		\
 	io-gif-animation.h		\
 	io-ani-animation.h		\
-	xpm-color-table.h		\
 	test-images.h

-INCLUDES = 			\
-	-I$(top_srcdir) 	\
-	-I$(top_builddir) 	\
-	-I$(top_builddir)/gdk	\
-	$(GTK_DEBUG_FLAGS)	\
-	$(GTK_DEP_CFLAGS)
+# Extra files to add when scanning
+EXTRA_HFILES=

-GTKDOC_LIBS = \
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib) 				\
-	$(GTK_DEP_LIBS)
-
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml
+# Images to copy into HTML directory
+HTML_IMAGES = 

 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files =				\
@@ -54,43 +45,160 @@ content_files =				\
 	gdk-pixbuf-from-drawables.sgml	\
 	gdk-pixbuf-rendering.sgml	\
 	gdk-pixbuf.sgml			\
-	porting-from-imlib.sgml		\
-	gdk-pixbuf-csource.xml		\
-	gdk-pixbuf-query-loaders.xml
-
-# Images to copy into HTML directory
-HTML_IMAGES = composite.png
-
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS= --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
-	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib
-
-
-include $(top_srcdir)/gtk-doc.make
+	porting-from-imlib.sgml

 # Other files to distribute
-EXTRA_DIST += version.xml.in \
-	composite.png \
-	composite.dia \
-	apple-red-1a.png \
-	apple-red-2c.png \
-	gnome-gmush-1.png
+extra_files = version.xml.in

-########################################################################
+# CFLAGS and LDFLAGS for compiling scan program. Only needed
+# if $(DOC_MODULE).types is non-empty.
+GTKDOC_CFLAGS = @STRIP_BEGIN@ 				\
+	@CFLAGS@					\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir) 				\
+	-I$(top_builddir)/gdk				\
+	@GTK_DEBUG_FLAGS@				\
+	@GTK_DEP_CFLAGS@				\
+@STRIP_END@

-man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 
+GTKDOC_LIBS = @STRIP_BEGIN@ 						\
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+	$(top_builddir)/gdk/@gdktargetlib@        			\
+	$(top_builddir)/gtk/@gtktargetlib@ 				\
+	@GTK_DEP_LIBS@							\
+@STRIP_END@

-if ENABLE_MAN
+GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
+GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)

-%.1 : %.xml 
-	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<

+####################################
+# Everything below here is generic #
+####################################
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+EXTRA_DIST = 				\
+	$(content_files)		\
+	$(extra_files)			\
+	$(HTML_IMAGES)			\
+	$(DOC_MAIN_SGML_FILE)		\
+	$(DOC_MODULE).types		\
+	$(DOC_MODULE)-sections.txt	\
+	$(DOC_MODULE)-overrides.txt
+
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+SCANOBJ_FILES = 		 \
+	$(DOC_MODULE).args 	 \
+	$(DOC_MODULE).hierarchy  \
+	$(DOC_MODULE).interfaces \
+	$(DOC_MODULE).prerequisites \
+	$(DOC_MODULE).signals
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB)
+	@echo '*** Scanning header files ***'
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	else \
+	    cd $(srcdir) ; \
+	    for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+	    done \
+	fi
+	cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+	@true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+	@echo '*** Rebuilding template files ***'
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+	touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+	@true
+
+#### sgml ####
+
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
+	@echo '*** Building SGML ***'
+	cd $(srcdir) && \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
+	touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+	@true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo '*** Building HTML ***'
+	rm -rf $(srcdir)/html 
+	mkdir $(srcdir)/html
+	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@echo '-- Fixing Crossreferences' 
+	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	touch html-build.stamp
 endif

-BUILT_EXTRA_DIST = $(man_MANS)
+##############

-dist-hook-local: $(BUILT_EXTRA_DIST)
-	files='$(BUILT_EXTRA_DIST)';				\
-	for f in $$files; do					\
-	  if test -f $$f; then d=.; else d=$(srcdir); fi;	\
-	  cp $$d/$$f $(distdir) || exit 1; done
+clean-local:
+	rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
+
+maintainer-clean-local: clean
+	cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
+	(installfiles=`echo $(srcdir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
+	then echo '-- Nothing to install' ; \
+	else \
+	  for i in $$installfiles; do \
+	    echo '-- Installing '$$i ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+	  done; \
+	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
+	fi)
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+	@false
+endif
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+	mkdir $(distdir)/tmpl
+	mkdir $(distdir)/xml
+	mkdir $(distdir)/html
+	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+	-cp $(srcdir)/xml/*.xml $(distdir)/xml
+	-cp $(srcdir)/html/* $(distdir)/html
+
+.PHONY : dist-hook-local
--- a/Show More
+++ b/Show More