Released GTK+ 1.2.2

Tue Apr 13 17:14:28 CDT 1999 Shawn T. Amundson <amundson@gtk.org> * Released GTK+ 1.2.2
removed some silly #ifdef HAVE_CONFIG that we don't do in many other
1999-04-13 23:09:16 +00:00 · 1999-04-13 06:55:55 +00:00 · 1999-04-11 15:01:30 +00:00 · 1999-04-09 23:34:05 +00:00 · 1999-04-08 20:11:42 +00:00 · 1999-04-08 03:06:03 +00:00
1791 changed files with 233947 additions and 1137627 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,33 +5,13 @@ config.h.in
 libtool
 config.status
 stamp-h
-stamp-h1
 Makefile
 Makefile.in
 aclocal.m4
 configure
-config.h.win32
-gtk-config-2.0
+gtk-config
 config.cache
 ABOUT-NLS
 intl
 stamp-h.in
 gtk+.spec
-gtk+-2.0.pc
-gtk+-2.0-uninstalled.pc
-gtk+-linux-fb-2.0.pc
-gtk+-nanox-2.0.pc
-gtk+-x11-2.0.pc
-gdk-2.0.pc
-gdk-2.0-uninstalled.pc
-gdk-linux-fb-2.0.pc
-gdk-nanox-2.0.pc
-gdk-x11-2.0.pc
-gdk-pixbuf-2.0.pc
-gdk-pixbuf-2.0-uninstalled.pc
-gtk-zip.sh
-missing
-install-sh
-mkinstalldirs
-sgml
-autom4te.cache
--- a/15040
+++ b/15040
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
--- a/35
+++ b/35
@@ -1,18 +1,20 @@
-If you want to hack on the GTK+ project, you'll need to have
-the following packages installed:
+If you want to hack on the Gtk+ project, it will make you life easier
+to have the following packages installed:

-	- GNU autoconf 2.52
+	- GNU autoconf 2.13
 	- GNU automake 1.4
-	- GNU libtool 1.4
+	        (Beta releases are at ftp://ftp.cygnus.com/pub/tromey)
+	- GNU libtool 1.2d
 	- indent (GNU indent 1.9.1 is known good)
-	- GNU gettext 10.40
+	- GNU gettext 10.35
+		Available in ftp://alpha.gnu.org/gnu

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

 In order to get CVS gtk+ installed on your system, you need to have
-the most recent CVS version of glib, pango, and atk installed as well.
-The installation process of these libraries is similar to that of gtk+, but
+the most recent CVS version of glib installed as well.
+The installation process of glib is similar to that of gtk+, but
 needs to be fulfilled prior to installation of gtk+.

 To compile a CVS version of gtk+ on your system, you will need to take
@@ -39,17 +41,16 @@ to autogen.sh and they will be passed on to configure.
 If at all possible, please use CVS to get the latest development version of
 gtk+ and glib.  You can do the following to get glib and gtk+ from cvs:

-   $ export CVSROOT=':pserver:anonymous@cvs.gnome.org:/cvs/gnome'
+   $ export CVSROOT=':pserver:anonymous@cvs.gimp.org:/debian/home/gnomecvs'
   $ cvs login
     (there is no password, just hit return)
-   $ cvs -z3 checkout glib
-   $ cvs -z3 checkout pango
-   $ cvs -z3 checkout atk
-   $ cvs -z3 checkout gtk+
-
-For information about submitting patches and commiting changes
-to CVS, see the README and README.cvs-commits files. In particular, 
-don't, under any circumstances, commit anything to CVS before
-reading and understanding README.cvs-commmits.
+   $ cvs -z9 checkout glib
+   $ cvs -z9 checkout gtk+

+Please submit patches to the gtk-list@redhat.com mailing list (you must
+subscribe before you post, e-mail gtk-list-request@redhat.com with a
+subject of "subscribe"). All kinds of contributions are accepted.
+Patches that you wish to go into the distribution should also be uploaded 
+to ftp://ftp.gimp.org/incoming.  Follow the rules there for naming your
+patches. 

--- a/171
+++ b/171
@@ -1,43 +1,156 @@
 Prerequisites
 =============

-GTK+ requires the following packages:
-
- - 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/
-    ftp://swrinde.nde.swri.edu/pub/png/src/
-    ftp://ftp.uu.net/graphics/jpeg/
-
-   If these libraries are not available, the corresponding 
-   image loaders will simply not be built. However, this
-   may cause applications using GTK+ not to function properly.
+GTK+ requires the GLIB library, available at the same location as
+you got this package.

 Simple install procedure
 ========================

-  % gzip -cd gtk+-2.3.0.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.3.0			   # change to the toplevel directory
-  % ./configure				   # run the `configure' script
-  % make				   # build GTK
+  % gzip -cd gtk+-1.2.2.tar.gz | tar xvf -  # unpack the sources
+  % cd gtk+-1.2.2                           # change to the toplevel directory
+  % ./configure                             # run the `configure' script
+  % make                                    # build GTK
  [ Become root if necessary ]
-  % make install			   # install GTK
+  % make install                            # install GTK

-The Details
-===========
+The Nitty-Gritty
+================

-Complete information about installing GTK+ and related libraries can be found 
-in the file:
+The 'configure' script can be given a number of options to enable
+and disable various features. For a complete list, type:

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

-Or online at:
+A few of the more important ones:
+
+*  --prefix=PREFIX         install architecture-independent files in PREFIX
+                           [ Defaults to /usr/local ]
+
+*  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                           [ Defaults to the value given to --prefix ]
+
+*  --with-xinput=[no/gxi/xfree] support XInput [default=no]
+
+The --with-xinput flag specifies whether to compile with support
+for the XInput extension (mainly used for graphics tablets), and
+which form of support to use:
+
+  no    : no support 
+  gxi   : Use generic XInput support
+  xfree : Use special features in the Wacom drivers in XFree86 3.3.1
+          and later.
+
+For more information, follow the link from http://www.gtk.org
+
+*  --enable-xim            support XIM [default=yes]
+
+Specifying --disable-xim will disable support for entering
+internationalized text using X Input Methods. This will give some
+slight savings in speed and memory use and might be necessary
+with older versions of X.
+
+*  --with-locale=LOCALE   locale name you want to use
+
+The --with-locale options is used to determine if your operating
+system has support for the locale you will be using. If not, X's
+built in locale support will be used.
+
+Because of bugs in autoconf, it is necessary to specify this
+option even if your LANG environment variable is correctly set.
+
+This option does not determine which locale GTK will use at
+runtime. That will be determined from the usual environment
+variables.  If you will be using multiple locales with GTK,
+specify the one for which your operating system has the worst
+support for the --with-locale option.
+
+
+Options can be given to the compiler and linker by setting
+environment variables before running configure. A few of the more
+important ones:
+
+ CC       : The C compiler to use
+ CPPFLAGS : Flags for the C preprocesser such as -I and -D
+ CFLAGS   : C compiler flags
+
+The most important use of this is to set the
+optimization/debugging flags. For instance, to compile with no
+debugging information at all, run configure as:
+
+ CFLAGS=-O2 ./configure           # Bourne compatible shells (sh/bash/zsh)
+
+or,
+
+ setenv CFLAGS -O2 ; ./configure  # csh and variants
+
+
+Using an uninstalled copy of GLIB
+=================================
+
+You can compile GTK+ against a copy of GLIB that you have not
+yet installed. To do this, give the --with-glib=DIR options
+to ./configure. For instance:
+
+ ./configure --with-glib=../glib-1.2.2
+
+This, however, will not work if you built GLIB with different
+source and build directories.
+
+
+Installation directories
+========================
+
+The location of the installed files is determined by the --prefix
+and --exec-prefix options given to configure. There are also more
+detailed flags to control individual directories. However, the
+use of these flags is not tested.
+
+One particular detail to note, is that the architecture-dependent
+include file glibconfig.h is installed in:
+
+  $exec_pref/lib/glib/include/
+
+if you have a version in $prefix/include, this is out of date
+and should be deleted.
+
+A shell script gtk-config is created during the configure
+process, and installed in the bin/ directory
+($exec_prefix/bin). This is used to determine the location of GTK
+when building applications.  If you move GTK after installation,
+it will be necessary to edit this file.
+
+For complete details, see the file docs/gtk-config.txt
+
+
+Notes for using XIM support for Japanese input
+==============================================
+
+* There is a bug in older versions of kinput2 that will cause GTK
+to hang when destroying a text entry. The latest versions of
+kinput is available from:
+
+  ftp://ftp.sra.co.jp/pub/x11/kinput2
+
+* The locale information file for the ja_JP EUC locale
+distributed with some recent versions of X11 specifies to use the
+C library multibyte functions. Unless your C library has support
+for Japanese locales, this is incorrect, and will cause problems
+for GTK's internationalization.
+
+(In particular, this occurs with GNU libc 2.0 and 2.1, in which
+the multibyte functions always translate to and from UTF-8; but
+the problem may occur for other C libraries, and other operating
+systems as well.)
+
+To fix this, change the line:
+
+use_stdc_env		True
+
+to 
+
+use_stdc_env		False
+
+in the file /usr/X11R6/lib/X11/locale/ja_JP/XLC_LOCALE.

- http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html

--- a/INSTALL.in
+++ b/INSTALL.in
@@ -1,43 +0,0 @@
-Prerequisites
-=============
-
-GTK+ requires the following packages:
-
- - 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/
-    ftp://swrinde.nde.swri.edu/pub/png/src/
-    ftp://ftp.uu.net/graphics/jpeg/
-
-   If these libraries are not available, the corresponding 
-   image loaders will simply not be built. However, this
-   may cause applications using GTK+ not to function properly.
-
-Simple install procedure
-========================
-
-  % gzip -cd gtk+-@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
-  [ Become root if necessary ]
-  % make install			   # install GTK
-
-The Details
-===========
-
-Complete information about installing GTK+ and related libraries can be found 
-in the file:
-
- docs/reference/gtk/html/gtk-building.html
-
-Or online at:
-
- http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html
-
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,44 +1,34 @@
-## Makefile.am for GTK+
+## Process this file with automake to produce Makefile.in

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

-# require automake 1.4
-AUTOMAKE_OPTIONS = 1.7
+bin_SCRIPTS = gtk-config

-EXTRA_DIST =			\
-	HACKING			\
-	makecopyright		\
-	NEWS.pre-1-0		\
+EXTRA_DIST =	\
+	HACKING		\
+	gtk+.spec.in	\
+        gtk.m4          \
+	makecopyright	\
+	TODO		\
+	NEWS.pre-1-0	\
 	ChangeLog.pre-1-0	\
-	ChangeLog.pre-1-2	\
-	ChangeLog.pre-2-0	\
 	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	\
+	intl/libgettext.h	\
+	intl/po2tbl.sed.in	\
 	examples/aspectframe/Makefile  \
 	examples/aspectframe/aspectframe.c  \
 	examples/Makefile  \
 	examples/README.1ST  \
 	examples/extract.awk  \
 	examples/extract.sh  \
-	examples/arrow/Makefile	\
-	examples/arrow/arrow.c	\
 	examples/base/Makefile  \
 	examples/base/base.c  \
-	examples/buttonbox/Makefile \
-	examples/buttonbox/buttonbox.c	\
 	examples/buttons/Makefile  \
 	examples/buttons/buttons.c  \
 	examples/buttons/info.xpm  \
 	examples/calendar/Makefile  \
-	examples/calendar/calendar.c  \
+	examples/calendar/gcalendar.c  \
 	examples/clist/Makefile  \
 	examples/clist/clist.c  \
 	examples/entry/Makefile  \
@@ -55,8 +45,6 @@ EXTRA_DIST =			\
 	examples/helloworld/helloworld.c  \
 	examples/helloworld2/Makefile  \
 	examples/helloworld2/helloworld2.c  \
-	examples/label/Makefile	\
-	examples/label/label.c	\
 	examples/list/Makefile  \
 	examples/list/list.c  \
 	examples/menu/Makefile  \
@@ -66,6 +54,8 @@ EXTRA_DIST =			\
 	examples/notebook/notebook.c  \
 	examples/packbox/Makefile  \
 	examples/packbox/packbox.c  \
+	examples/packer/Makefile  \
+	examples/packer/pack.c  \
 	examples/paned/Makefile  \
 	examples/paned/paned.c  \
 	examples/pixmap/Makefile  \
@@ -80,8 +70,6 @@ EXTRA_DIST =			\
 	examples/rulers/rulers.c  \
 	examples/scribble-simple/Makefile  \
 	examples/scribble-simple/scribble-simple.c  \
-	examples/scribble-xinput/Makefile	\
-	examples/scribble-xinput/scribble-xinput.c	\
 	examples/scrolledwin/Makefile  \
 	examples/scrolledwin/scrolledwin.c  \
 	examples/selection/Makefile  \
@@ -109,57 +97,11 @@ EXTRA_DIST =			\
 	examples/spinbutton/Makefile  \
 	examples/find-examples.sh

-GDKTARGET=@gdktarget@
-
-## Copy .pc files to target-specific names
-gtk+-$(GDKTARGET)-2.0.pc: gtk+-2.0.pc
-	rm -f gtk+-$(GDKTARGET)-2.0.pc && \
-	cp gtk+-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
-
-gdk-$(GDKTARGET)-2.0.pc: gdk-2.0.pc
-	rm -f gdk-$(GDKTARGET)-2.0.pc && \
-	cp gdk-2.0.pc gdk-$(GDKTARGET)-2.0.pc
-
-gtk+-$(GDKTARGET)-2.0-uninstalled.pc: gtk+-2.0-uninstalled.pc
-	rm -f gtk+-$(GDKTARGET)-2.0-uninstalled.pc && \
-	cp gtk+-2.0-uninstalled.pc gtk+-$(GDKTARGET)-2.0-uninstalled.pc
-
-gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
-	rm -f gdk-$(GDKTARGET)-2.0-uninstalled.pc && \
-	cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
-
-DISTCLEANFILES =				\
-	gtk+-$(GDKTARGET)-2.0.pc		\
-	gdk-$(GDKTARGET)-2.0.pc			\
-	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
-	gdk-$(GDKTARGET)-2.0-uninstalled.pc
-
-## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc
-DEFAULT_GDKTARGET=x11
-install-data-hook:
-	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 test -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
-	 test -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
-	 rm -f gdk-2.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
-	 rm -f gtk+-2.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \
-	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 rm -f gdk-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
-	 rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
-
-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" \
-	     CONFIG_HEADERS= \
-	     $(SHELL) config.status \
-	     && cp INSTALL README $(distdir) ; \
-	fi
+	cp gtk+.spec $(distdir)
+
+m4datadir = $(datadir)/aclocal
+m4data_DATA = gtk.m4

 .PHONY: files release sanity snapshot

@@ -183,7 +125,4 @@ sanity:


 snapshot:
-	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
-
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+	$(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
--- a/1302
+++ b/1302
--- a/174
+++ b/174
@@ -1,15 +1,10 @@
 General Information
 ===================

-This is GTK+ version 2.3.0. GTK+ is a multi-platform toolkit for
-creating graphical user interfaces. Offering a complete set of widgets,
-GTK+ is suitable for projects ranging from small one-off projects to
-complete application suites.
-
-GTK+ is free software and part of the GNU Project. However, the
-licensing terms for GTK+, the GNU LGPL, allow it to be used by all
-developers, including those developing proprietary software, without any
-license fees or royalties.
+This is GTK+ version 1.2.2.   GTK+, which stands for the Gimp ToolKit, 
+is a library for creating graphical user interfaces for the X Window 
+System. It is designed to be small, efficient, and flexible. GTK+ is 
+written in C with a very object-oriented approach.

 The official ftp site is:
  ftp://ftp.gtk.org/pub/gtk
@@ -17,93 +12,38 @@ The official ftp site is:
 The official web site is:
  http://www.gtk.org/

-Information about mailing lists can be found at
-  http://www.gtk.org/mailinglists.html
+A mailing list is located at:
+  gtk-list@redhat.com
+
+To subscribe: mail -s subscribe gtk-list-request@redhat.com < /dev/null
+(Send mail to gtk-list-request@redhat.com with the subject "subscribe")

 Installation
 ============

 See the file 'INSTALL'

-Release notes
-=============
-
-* 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.
-
-   - Emacs keybindings such as Control-A and Control-E to move to the
-     ends of lines are not enabled by default in the editing widgets. To
-     turn on Emacs keybindings, add the line:
-
-      gtk-key-theme-name = "Emacs"
-   
-     To your ~/.gtkrc-2.0
-
-   - Editing of menu accelerators by pressing an accelerator over the
-     menu item is disabled by default. To enable, it, add:
-
-      gtk-can-change-accels = 1
-
-     to your ~/.gtkrc-2.0
-
-   - To improve useability for keyboard operation, GTK+ now selects the
-     contents of an entry when tabbing into it or when it is focused on
-     initial window map. To disable this behavior, add:
-
-      gtk-entry-select-on-focus = 0
- 
-     to your ~/.gtkrc-2.0
-
-* The GTK+ libraries use an '_' prefix to indicate private symbols that
-  must not be used by applications. 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.
-
-* GTK+-2.3 now requires version 2 of Xft; old fashioned core X
-  fonts are no longer supported.
-
-* 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
-  at least XFree86-4.2.
-
-* 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.
-
-* 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_BROKEN_FILENAMES environment variable:
-  
-   G_BROKEN_FILENAMES=1
-   export G_BROKEN_FILENAMES
-
-  Best integration of GTK+-2.2 with the environment is achieved by 
-  using a UTF-8 locale.
-
 How to report bugs
 ==================

-Bugs should be reported to the GNOME bug tracking system.
-(http://bugzilla.gnome.org, product gtk+.) You will need to create an
-account for yourself.
-  
-In the bug report please include:
-  
+Bugs should be reported to the GNOME bug tracking
+system. (http://bugs.gnome.org). To report a problem
+about GTK+, send mail to submit@bugs.gnome.org.
+
+The subject of the mail should describe your problem.
+In the body of the mail, you should first include
+a "pseudo-header" that gives the package and 
+version number. This should be separated by a blank
+line from the actual headers.
+
+ Package: gtk+
+ Version: 1.2.2
+
+[ Please substitute 1.2.2 with the version of GTK+ that
+  you have installed ]
+
+Then describe the bug. Include:
+
 * Information about your system. For instance:

   - What operating system and version
@@ -114,32 +54,48 @@ In the bug report please include:

 * How to reproduce the bug. 

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

-* If the bug was a crash, the exact text that was printed out when the
-  crash occured.
+  (Bugs that can be reproduced within the  GIMP are almost as good 
+  as bugs that can be reproduced in testgtk. If you are reporting a 
+  bug found with the GIMP, please include the version number of the GIMP 
+  you are using)

-* Further information such as stack traces may be useful, but is not
-  necessary. If you do send a stack trace, and the error is an X error,
-  it will be more useful if the stacktrace is produced running the test
-  program with the --sync command line option.
+* If the bug was a crash, the exact text that was printed out
+  when the crash occured.
+
+* Further information such as stack traces may be useful, but
+  is not necessary. If you do send a stack trace, and the error
+  is an X error, it will be more useful if the stacktrace
+  is produced running the test program with the --sync command
+  line option.
+
+An example of a bug report:
+
+====
+To: submit@bugs.gnome.org
+From: yourname@your.address.org
+Subject: handlebox test in testgtk is misnamed.
+
+Package: gtk+
+Version: 1.2.2
+
+When I run gtk/testgtk, the button "handle box"
+is misnamed. There are multiple handle boxes in
+the demo, so it should be "handle boxes", to
+be like "buttons" or "check buttons".
+===

 Patches
 =======

-Patches should also be submitted to bugzilla.gnome.org. If the patch
-fixes an existing bug, add the patch as an attachment to that bug
-report.
+Patches can be uploaded to the incoming/ directory on
+ftp.gtk.org.  Please follow the instructions there, and include
+your name and email address in the README file.

-Otherwise, enter a new bug report that describes the patch, and attach
-the patch to that bug report.
-
-Bug reports containing patches should include the PATCH keyword in their
-keyword fields. If the patch adds to or changes the GTK programming
-interface, the API keyword should also be included.
-  
-Patches should be in unified diff form. (The -u option to GNU diff.)
+If the patch fixes a bug, it is usually a good idea to include
+all the information described in "How to Report Bugs".
--- a/README.cvs-commits
+++ b/README.cvs-commits
@@ -4,7 +4,7 @@ GTK+. This is a good thing, in that it encourages many people to work
 on GTK+, and progress can be made quickly. However, GTK+ is a fairly
 large and complicated package that many other things depend on, so to
 avoid unnecessary breakage, and to take advantage of the knowledge
-about GTK+ that has been built up over the last 4 years, we'd like
+about GTK+ that has been built up over the last 18 months, we'd like
 to ask people commiting to GTK+ to follow a few rules:

 0) Ask first. If your changes are major, or could possibly break existing
@@ -14,10 +14,15 @@ to ask people commiting to GTK+ to follow a few rules:
   somebody may know a better way to do things.

   If you are making changes to GTK+, you should be subscribed
-   to gtk-devel-list@gnome.org. (Subscription address:  
-   gtk-devel-list-request@gnome.org.) This is a good place to ask
+   to gtk-devel-list@redhat.com. (Subscription address:  
+   gtk-devel-list-request@redhat.com.) This is a good place to ask
   about intended changes. 

+   If you just want to make a trivial change, and don't want to subscribe, 
+   you can also mail gtk-bugs@gtk.org. Or, alternatively, you can look in 
+   the ChangeLog for somebody who has been making changes to the file 
+   you want to change and email them.
+
   #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
@@ -51,4 +56,8 @@ Notes:

 Owen Taylor
 13 Aug 1998
-17 Apr 2001
+
+
+
+
+
--- a/README.in
+++ b/README.in
@@ -1,145 +0,0 @@
-General Information
-===================
-
-This is GTK+ version @GTK_VERSION@. GTK+ is a multi-platform toolkit for
-creating graphical user interfaces. Offering a complete set of widgets,
-GTK+ is suitable for projects ranging from small one-off projects to
-complete application suites.
-
-GTK+ is free software and part of the GNU Project. However, the
-licensing terms for GTK+, the GNU LGPL, allow it to be used by all
-developers, including those developing proprietary software, without any
-license fees or royalties.
-
-The official ftp site is:
-  ftp://ftp.gtk.org/pub/gtk
-
-The official web site is:
-  http://www.gtk.org/
-
-Information about mailing lists can be found at
-  http://www.gtk.org/mailinglists.html
-
-Installation
-============
-
-See the file 'INSTALL'
-
-Release notes
-=============
-
-* 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.
-
-   - Emacs keybindings such as Control-A and Control-E to move to the
-     ends of lines are not enabled by default in the editing widgets. To
-     turn on Emacs keybindings, add the line:
-
-      gtk-key-theme-name = "Emacs"
-   
-     To your ~/.gtkrc-2.0
-
-   - Editing of menu accelerators by pressing an accelerator over the
-     menu item is disabled by default. To enable, it, add:
-
-      gtk-can-change-accels = 1
-
-     to your ~/.gtkrc-2.0
-
-   - To improve useability for keyboard operation, GTK+ now selects the
-     contents of an entry when tabbing into it or when it is focused on
-     initial window map. To disable this behavior, add:
-
-      gtk-entry-select-on-focus = 0
- 
-     to your ~/.gtkrc-2.0
-
-* The GTK+ libraries use an '_' prefix to indicate private symbols that
-  must not be used by applications. 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.
-
-* GTK+-2.3 now requires version 2 of Xft; old fashioned core X
-  fonts are no longer supported.
-
-* 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
-  at least XFree86-4.2.
-
-* 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.
-
-* 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_BROKEN_FILENAMES environment variable:
-  
-   G_BROKEN_FILENAMES=1
-   export G_BROKEN_FILENAMES
-
-  Best integration of GTK+-2.2 with the environment is achieved by 
-  using a UTF-8 locale.
-
-How to report bugs
-==================
-
-Bugs should be reported to the GNOME bug tracking system.
-(http://bugzilla.gnome.org, product gtk+.) You will need to create an
-account for yourself.
-  
-In the bug report please include:
-  
-* Information about your system. For instance:
-
-   - What operating system and version
-   - What version of X
-   - For Linux, what version of the C library
-
-  And anything else you think is relevant.
-
-* How to reproduce the bug. 
-
-  If you can reproduce it with the testgtk program that is built in the
-  gtk/ subdirectory, that will be most convenient.  Otherwise, please
-  include a short test program that exhibits the behavior.  As a last
-  resort, you can also provide a pointer to a larger piece of software
-  that can be downloaded.
-
-* If the bug was a crash, the exact text that was printed out when the
-  crash occured.
-
-* Further information such as stack traces may be useful, but is not
-  necessary. If you do send a stack trace, and the error is an X error,
-  it will be more useful if the stacktrace is produced running the test
-  program with the --sync command line option.
-
-Patches
-=======
-
-Patches should also be submitted to bugzilla.gnome.org. If the patch
-fixes an existing bug, add the patch as an attachment to that bug
-report.
-
-Otherwise, enter a new bug report that describes the patch, and attach
-the patch to that bug report.
-
-Bug reports containing patches should include the PATCH keyword in their
-keyword fields. If the patch adds to or changes the GTK programming
-interface, the API keyword should also be included.
-  
-Patches should be in unified diff form. (The -u option to GNU diff.)
--- a/README.win32
+++ b/README.win32
@@ -1,99 +0,0 @@
-The Win32 port of GTK+ is a work in progress, and not as stable or
-correct as the Unix/X11 version. For more information about the Win32
-port, and prebuilt runtime and developer packages see
-http://www.gimp.org/win32/ .
-
-There is a gtk-1-3-win32-production branch of GTK+ that was branched
-off from before the addition of the no-flicker and other recent
-functionality. That is what should be used by "production" code until
-this CVS HEAD (2.0) version is useable. (But note, the Win32 backend
-has never been claimed to be "production quality", although it works
-surprisingly well for the GIMP.)
-
-Building GTK+ on Win32
-======================
-
-There are two ways to build GTK+ for win32:
-
-1) Use the autoconf-generated configure script, and the resulting
-Makefiles (which use libtool and gcc to do the compilation). I use
-this myself, but it might be hell to setup correctly. 
-
-Personally I run configure with:
-CC='gcc -mpentium -fnative-struct' CPPFLAGS='-I/target/include' CFLAGS=-O2 LDFLAGS='-L/target/lib' ./configure --disable-static --prefix=/target --with-gdktarget=win32 --with-wintab=/src/wtkit126 --with-ie55=/src/workshop/ie55_lib --host=i386-pc-mingw32 --enable-maintainer-mode
-
-It might well be that in order for this to work, you will have to get
-a bleeding-edge version of libtool for Win32, run libtoolize yourself,
-and then run autoconf to generate the configure script.
-
-2) Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
-makefile.msc in gdk and gtk.
-
-Alternative 1 also generates Microsoft import libraries (.lib), if you
-have lib.exe available. It might also work for cross-compilation from
-Unix.
-
-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
-===================
-
-To use GTK+ on Win32, you also need either one of the above mentioned
-compilers. Other compilers might work, but don't count on it. Look for
-prebuilt developer packages (DLLs, import libraries, headers) on the
-above website.
-
-Multi-threaded use of GTK+ on Win32
-===================================
-
-Multi-threaded GTK+ programs might work in special simple cases, but
-not in general. Sorry. If you have all GTK+ and GDK calls in the same
-thread, it might work. Otherwise, probably not at all. Possible ways
-to fix this are being investigated.
-
-Wintab
-======
-
-The tablet support uses the Wintab API. The Wintab development kit can
-be downloaded from http://www.pointing.com. Pass the --with-wintab
-flag to configure if you use that. If you use nmake and you don't care
-for Wintab, undefine HAVE_WINTAB in config.h.win32 and remove
-references to the wntab32x library from the makefile before building.
-
-Libintl
-=======
-
-Before building GTK+ you must also have GNU gettext. Get prebuilt
-binaries of gettext-runtime (0.12.1 or newer) from your nearest GNU
-ftp mirror. If you use gcc, you will also have to edit the libintl.h
-file from gettext a tiny bit: Change the
-
-# if __GNUC__ >= 2 && !defined __APPLE_CC__ && (defined __STDC__ || defined __cplusplus)
-
-line to
-
-# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && (defined __STDC__ || defined __cplusplus)
-
-around line 102.
-
-If you use libtool, you will also have to copy intl.lib to libintl.a
-so that libtool will find them. Alternatively, use pexports and
-dlltool to generate a gcc import library.
-
-ActiveIMM
-=========
-
-If you want to build a GTK+ that supports ActiveIMM (the Input Method
-Manager for non-EastAsia locales that can be used on Win9x/NT4), you
-need the dimm.h header file. That is somewhat difficult to find, but
-http://msdn.microsoft.com/downloads/samples/internet/wizard/ seems to
-be a good place to look nowadays. If you use "autoconfiscated" build,
-pass the --with-ie55 flag to configure specifyin the location of the
-ie55_lib directory created by downloading the IE5.5 headers and libs
-from the above URL.
-
--Tor Lillqvist <tml@iki.fi>
--- a/202
+++ b/202
@@ -0,0 +1,202 @@
+
+Outstanding items:
+
+ * focus handling for GtkOptionMenu (needs the previous)
+
+ * implement gtk_default_draw_oval and other missing things in gtkstyle.c.
+ 
+ * enforce invariants on *_RESIZE* and *_REDRAW* flags.
+
+ * GtkToolTips: allocate GtkTooltipsData from memchunks
+                          
+ * Make all widget attributes configurable after the widget is created (timj).
+ 
+ * Radio buttons need to display CAN/HAS_DEFAULT correctly, if draw_inidicator
+   is TRUE.
+
+ * gdk_expose_compress: ala-Xt, this would really help for opaque moves and
+   such
+
+ * More dialogs: Print, GtkFontSelector, maybe others...
+
+ * make the gtk_main callbacks consistent in their add/remove behaviour.
+ 
+ * Check return values on all calls to XIC[Get/Set]Values
+
+ * Rewrite the interface to the i18n stuff so GTK widgets don't need to
+   retrieve X values, and so they don't have to know the value of the
+   XNxxx character constants.
+
+ * The "--geometry" option should be supported
+
+  - Having gdk_init() parse the geometry option. (putting it into
+    GDK means you can use XParseGeometry() without wrapping it)
+
+  - Add a call gdk_get_geometry() that retrieves the results 
+    in a form like that returned by XParseGeometry()
+
+  - The application then can modify the results (as would gemvt)
+    then call a routine gtk_window_set_geometry() on whatever
+    it considers to be its main window.
+
+  - Then in some manner GtkWindow takes that into account when
+    setting its hints. (Probably it uses the size and position
+    as the current uposition and usize, and modulates that
+    be the equivalents of the X flags
+
+     XValue, YValue, WidthValue, HeightValue, XNegative, or YNegative
+
+    ( You'd have to extend gdk_window_set_hints to accept the
+      window gravity option to get it right. )
+
+ * Allow moving the separator for paned widgets by dragging 
+   it directly instead of using the handle. 
+
+ * Check into XAddConnectionWatch - is this needed for XIM?
+
+ * Places where a _full variant is needed:
+
+    gtk_init_add
+    gtk_menu_popup
+    gtk_toolbar_prepend_element
+    gtk_toolbar_insert_element
+ 
+ * Try to rationally deal with someone else deleting one of our
+   windows??? This would mean keeping track of our window heirarchy
+   ourselves, for one thing, and will never be safe, because of
+   race conditions.
+
+ * Should all the default handlers really return FALSE? This can
+   cause confusing presses to be sent to containers that actually
+   want to get events on themselves.
+
+Text/Edit widget:
+
+  Bugs:
+
+  - Really big font (150 pt), plus lots of editing caused segfault
+
+  Improvements:
+
+  - Unify the key binding support in some fashion between the
+    Entry and Text widget widgets, use GtkBindings for this.
+
+  - Figure out a way not to recompute the geometry on insertions/deletions
+    which are large, but not a significant fraction of the
+    entire text. (e.g., compute the changes as when the widget
+    is not frozen, but without the actual scrolling)
+
+  - Prune the line start cache. But since it is only 68 bytes
+    per line, and it is a lot faster when lines are in the cache,
+    it may be better not to, at least for now.
+
+  - Show the non-editable state by changing colors. (Use the
+    style entries for insensitive?)
+
+  - Multibyte support for the Text widget.
+
+  - Unicode support to do the multi-byte right.
+
+  - Support an .inputrc. (The readline one doesn't really work,
+    unless it is extended because it can't represent X keysyms,
+    just terminal type input)
+
+  - A vi mode
+
+  - Word wrap, instead of line folding. (Should the continuation
+    characters be shown?)
+
+  - Horizontal scrolling
+
+  - Disable pasting compound text
+
+  - When showing background pixmap (not editable) actually set
+    the background pixmap as the windows bg pixmap, to improve
+    appearance on exposes. But this would require using another
+    window to get the origins.
+
+  - In word wrap mode, break:
+
+     aaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+
+     as:
+                            | Maximum column
+     aaaaaaaaaaa bbbbbbbbbbb|
+     bbbbbbbbbbbbbbbbbbbbbbb|
+     bbbbbbbbb              |
+
+     Instead of:
+                            | 
+     aaaaaaaaaaa            |
+     bbbbbbbbbbbbbbbbbbbbbbb|
+     bbbbbbbbbbbbbbbbbbbb   |
+
+  - Blinking cursor
+
+  - API's : gtk_text_clear, gtk_text_delete_lines (gint start, gint end),
+    gtk_text_append/prepend, gtk_text_insert_at (gint row, gint column),
+    some function to get the row/column from the x/y-coordinates of a 
+    mouse click, some function to get the word/line under the mouse pointer 
+    [ From: Stefan Jeske <jeske@braunschweig.netsurf.de> ]
+
+  - "changed" emitted when doing deletes on empty Text widget.
+
+  - Delete IC in editable->unrealize, not editable->finalize?
+
+Themes
+======
+
+ - When a scale gets shown/hidden only queue a redraw on the
+   non-window portion, not the whole area.
+
+ - In various places, to avoid shaping windows excessively,
+   we set parent relative backgrounds. This is an ugly
+   hack and needs a better solution. Plus, I don't think
+   these parent-relative backgrounds always persist to
+   when they are actually needed.
+
+   Such calls exist in: GtkButton, GtkHandeBox, GtkItem,
+   GtkListItem, GtkMenu, GtkMenuItem, GtkMisc, 
+   GtkNoteBook, GtkOptionMenu, GtkPaned, GtkPreview,
+   GtkSpinButton and GtkTreeItem.
+
+ - For menus and for GtkWindow's, the realize() function
+   calls paint(), so that background pixmaps can be set
+   ahead of time, and prevent flashing when the window is
+   shown. This is an ugly hack and needs a better solution.
+
+=======
+
+Calendar Widget:
+
+ - The widget should be nicely resizeable vertical too.
+
+ - CALENDAR_MARGIN should be removed, uses INNER_BORDER and
+   style->class->[xy]thickness insted.
+
+ - Flag to choose between using standard three letter abbreviated
+   weekday name or just the first character from it. It looks like
+   that is what most other calendar-widgets do.
+
+ - Arrows should resize with the header-font.
+
+ - The keyboard support has to be finished.
+
+DND
+===
+
+ - Use a cursor instead of an ICON when over Motif windows,
+   to get rid of the current junk that Motif leaves because
+   of it's XCopyArea stupidity for doing highlighting.
+
+ - Add a GTK_DRAG_VERIFY target flag and a "drag_data_verify"   
+   signal so that apps can easily check if a, say, 
+   text/uri-list URL looks OK during the drop.
+
+ - Check more for memory leaks.
+
+ - Drag and drop for Entry and Text widgets.
+
+ - Send synthetic motion events on structure changes so 
+   drag_enter/leave get sent properly. (See the popup
+   in testdnd)
--- a/acconfig.h
+++ b/acconfig.h
@@ -19,43 +19,22 @@
 #undef GTK_COMPILED_WITH_DEBUGGING

 #undef HAVE_CATGETS
-#undef HAVE_DIMM_H
 #undef HAVE_GETTEXT
 #undef HAVE_IPC_H
 #undef HAVE_LC_MESSAGES
-#undef HAVE_PROGRESSIVE_JPEG
-#undef HAVE_PWD_H
 #undef HAVE_SHM_H
 #undef HAVE_STPCPY
 #undef HAVE_XSHM_H
 #undef HAVE_SHAPE_EXT
-#undef HAVE_SOLARIS_XINERAMA
 #undef HAVE_SYS_SELECT_H
-#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
-
-#undef HAVE_SIGSETJMP

 #undef NO_FD_SET

 #undef RESOURCE_BASE

-#undef USE_GMODULE
-#undef USE_MMX
-
-/* Define to use XKB extension */
-#undef HAVE_XKB
-
-/* Define to use shadowfb in the linux-fb port */
-#undef ENABLE_SHADOW_FB
-
-/* Define to use a fb manager in the linux-fb port */
-#undef ENABLE_FB_MANAGER
+/* Define to use X11R6 additions to XIM */
+#undef USE_X11R6_XIM

 #undef XINPUT_NONE
 #undef XINPUT_GXI
@@ -67,8 +46,6 @@
 /* Most machines will be happy with int or void.  IRIX requires '...' */
 #undef SIGNAL_ARG_TYPE

-#undef GETTEXT_PACKAGE
-
 /* #undef PACKAGE */
 /* #undef VERSION */

--- a/acinclude.m4
+++ b/acinclude.m4
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,49 +12,21 @@ FILE=gdk

 DIE=0

-have_libtool=false
-if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
-	libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
-	case $libtool_version in
-	    1.4*|1.5*)
-		have_libtool=true
-		;;
-	esac
-fi
-if $have_libtool ; then : ; else
-	echo
-	echo "You must have libtool 1.4 installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
-	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 "Download 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
+(automake --version) < /dev/null > /dev/null 2>&1 || {
 	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 installed to compile $PROJECT."
+	echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz"
+	echo "(or a newer version if it is available)"
 	DIE=1
-fi
+}

 if test "$DIE" -eq 1; then
 	exit 1
@@ -65,17 +37,19 @@ test $TEST_TYPE $FILE || {
 	exit 1
 }

-if test -z "$AUTOGEN_SUBDIR_MODE"; then
-        if test -z "$*"; then
-                echo "I am going to run ./configure with no arguments - if you wish "
-                echo "to pass any to it, please specify them on the $0 command line."
-        fi
+if test -z "$*"; then
+	echo "I am going to run ./configure with no arguments - if you wish "
+        echo "to pass any to it, please specify them on the $0 command line."
 fi

+case $CC in
+*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
+esac
+
 if test -z "$ACLOCAL_FLAGS"; then

-	acdir=`$ACLOCAL --print-ac-dir`
-        m4list="glib-2.0.m4 glib-gettext.m4"
+	acdir=`aclocal --print-ac-dir`
+        m4list="glib.m4 gettext.m4"

 	for file in $m4list
 	do
@@ -91,20 +65,22 @@ if test -z "$ACLOCAL_FLAGS"; then
 	done
 fi

-$ACLOCAL $ACLOCAL_FLAGS || exit 1
+echo "Running gettextize...  Ignore non-fatal messages."
+# Hmm, we specify --force here, since otherwise things dont'
+# get added reliably, but we don't want to overwrite intl
+# while making dist.
+echo "no" | gettextize --copy --force

-libtoolize --force || exit 1
-gtkdocize || exit 1
+aclocal $ACLOCAL_FLAGS

-autoheader || exit 1
+# optionally feature autoheader
+(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader

-$AUTOMAKE --add-missing || exit 1
-autoconf || exit 1
+automake -a $am_opt
+autoconf
 cd $ORIGDIR

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

-        echo 
-        echo "Now type 'make' to compile $PROJECT."
-fi
+echo 
+echo "Now type 'make' to compile $PROJECT."
--- a/config.guess
+++ b/config.guess
@@ -0,0 +1,996 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Written by Per Bothner <bothner@cygnus.com>.
+# The master version of this file is at the FSF in /home/gd/gnu/lib.
+# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit system type (host/target name).
+#
+# Only a few systems have been added to this list; please add others
+# (but try to keep the structure clean).
+#
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 8/24/94.)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	cat <<EOF >$dummy.s
+	.globl main
+	.ent main
+main:
+	.frame \$30,0,\$26,0
+	.prologue 0
+	.long 0x47e03d80 # implver $0
+	lda \$2,259
+	.long 0x47e20c21 # amask $2,$1
+	srl \$1,8,\$2
+	sll \$2,2,\$2
+	sll \$0,3,\$0
+	addl \$1,\$0,\$0
+	addl \$2,\$0,\$0
+	ret \$31,(\$26),1
+	.end main
+EOF
+	${CC-cc} $dummy.s -o $dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		./$dummy
+		case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+		esac
+	fi
+	rm -f $dummy.s $dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
+	exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-cbm-sysv4
+	exit 0;;
+    amiga:NetBSD:*:*)
+      echo m68k-cbm-netbsd${UNAME_RELEASE}
+      exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
+    arc64:OpenBSD:*:*)
+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    arm32:NetBSD:*:*)
+	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    SR2?01:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit 0 ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:NetBSD:*:*)
+	echo m68k-atari-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:NetBSD:*:*)
+	echo m68k-sun-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:NetBSD:*:*)
+	echo m68k-apple-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:NetBSD:*:*)
+        echo powerpc-apple-netbsd${UNAME_RELEASE}
+        exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    2020:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	${CC-cc} $dummy.c -o $dummy \
+	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit 0 ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
+	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	fi
+        else echo i586-dg-dgux${UNAME_RELEASE}
+        fi
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit 0 ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit 0 ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit 0 ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+    i?86:AIX:*:*)
+	echo i386-ibm-aix
+	exit 0 ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+		rm -f $dummy.c $dummy
+		echo rs6000-ibm-aix3.2.5
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit 0 ;;
+    *:AIX:*:4)
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=4.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit 0 ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit 0 ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit 0 ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit 0 ;;
+    9000/[34678]??:HP-UX:*:*)
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/6?? | 9000/7?? | 9000/80[024] | 9000/8?[136790] | 9000/892 )
+              sed 's/^              //' << EOF >$dummy.c
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+	(${CC-cc} $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	rm -f $dummy.c $dummy
+	esac
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    3050*:HI-UX:*:*)
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
+	echo unknown-hitachi-hiuxwe2
+	exit 0 ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit 0 ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit 0 ;;
+    *9??*:MPE*:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
+    *9??*:MPE*:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i?86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit 0 ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*X-MP:*:*:*)
+	echo xmp-cray-unicos
+        exit 0 ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo t3e-cray-unicosmk${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY-2:*:*:*)
+	echo cray2-cray-unicos
+        exit 0 ;;
+    F300:UNIX_System_V:*:*)
+        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    F301:UNIX_System_V:*:*)
+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+       exit 0 ;;
+    hp3[0-9][05]:NetBSD:*:*)
+	echo m68k-hp-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:FreeBSD:*:*)
+	if test -x /usr/bin/objformat; then
+	    if test "elf" = "`/usr/bin/objformat`"; then
+		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+		exit 0
+	    fi
+	fi
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+    *:NetBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    *:Linux:*:*)
+	# uname on the ARM produces all sorts of strangeness, and we need to
+	# filter it out.
+	case "$UNAME_MACHINE" in
+	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
+	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
+	esac
+
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us.
+	ld_help_string=`ld --help 2>&1`
+	ld_supported_emulations=`echo $ld_help_string \
+			 | sed -ne '/supported emulations:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported emulations: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_emulations" in
+	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
+	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
+	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+	esac
+
+	if test "${UNAME_MACHINE}" = "alpha" ; then
+		sed 's/^	//'  <<EOF >$dummy.s
+		.globl main
+		.ent main
+	main:
+		.frame \$30,0,\$26,0
+		.prologue 0
+		.long 0x47e03d80 # implver $0
+		lda \$2,259
+		.long 0x47e20c21 # amask $2,$1
+		srl \$1,8,\$2
+		sll \$2,2,\$2
+		sll \$0,3,\$0
+		addl \$1,\$0,\$0
+		addl \$2,\$0,\$0
+		ret \$31,(\$26),1
+		.end main
+EOF
+		LIBC=""
+		${CC-cc} $dummy.s -o $dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./$dummy
+			case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+			esac
+
+			objdump --private-headers $dummy | \
+			  grep ld.so.1 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi
+		rm -f $dummy.s $dummy
+		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+	elif test "${UNAME_MACHINE}" = "mips" ; then
+	  cat >$dummy.c <<EOF
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
+	else
+	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+	  # or one that does not give us useful --help.
+	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+	  # If ld does not provide *any* "supported emulations:"
+	  # that means it is gnuoldld.
+	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+
+	  case "${UNAME_MACHINE}" in
+	  i?86)
+	    VENDOR=pc;
+	    ;;
+	  *)
+	    VENDOR=unknown;
+	    ;;
+	  esac
+	  # Determine whether the default compiler is a.out or elf
+	  cat >$dummy.c <<EOF
+#include <features.h>
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
+	fi ;;
+# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+# are messed up and put the nodename in both sysname and nodename.
+    i?86:DYNIX/ptx:4*:*)
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    i?86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
+    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	fi
+	exit 0 ;;
+    i?86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    i?86:UnixWare:*:*)
+	if /bin/uname -X 2>/dev/null >/dev/null ; then
+	  (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+	    && UNAME_MACHINE=i586
+	fi
+	echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
+	exit 0 ;;
+    pc:*:*:*)
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit 0 ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit 0 ;;
+    M68*:*:R3V[567]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    m68*:LynxOS:2.*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    news*:NEWS-OS:*:6*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+  printf ("vax-dec-bsd\n"); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
+#echo '(Unable to guess system type)' 1>&2
+
+exit 1
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -1,289 +0,0 @@
-/* config.h.win32.in. Merged from two versions generated by configure for gcc and MSVC.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-/* acconfig.h
-   This file is in the public domain.
-
-   Descriptive text for the C preprocessor macros that
-   the distributed Autoconf macros can define.
-   No software package will use all of them; autoheader copies the ones
-   your configure.in uses into your configuration header file templates.
-
-   The entries are in sort -df order: alphabetical, case insensitive,
-   ignoring punctuation (such as underscores).  Although this order
-   can split up related entries, it makes it easier to check whether
-   a given entry is in the file.
-
-   Leave the following blank line there!!  Autoheader needs it.  */
-
-
-/* Other stuff */
-#define ENABLE_NLS 1
-#define GTK_COMPILED_WITH_DEBUGGING "yes"
-
-/* #undef HAVE_CATGETS */
-/* #undef HAVE_DIMM_H */
-#define HAVE_GETTEXT 1
-/* #undef HAVE_IPC_H */
-/* #undef HAVE_LC_MESSAGES */
-#define HAVE_PROGRESSIVE_JPEG 1
-/* #undef HAVE_PWD_H */
-/* #undef HAVE_SHM_H */
-/* #undef HAVE_STPCPY */
-/* #undef HAVE_XSHM_H */
-/* #undef HAVE_SHAPE_EXT */
-/* #undef HAVE_SYS_SELECT_H */
-#ifndef _MSC_VER
-#define HAVE_SYS_TIME_H 1
-#else /* _MSC_VER */
-/* #undef HAVE_SYS_TIME_H */
-#endif /* _MSC_VER */
-#define HAVE_WINSOCK_H 1
-#define HAVE_WINTAB 1
-/* #undef HAVE_XCONVERTCASE */
-/* #undef HAVE_XFT */
-
-/* #undef HAVE_SIGSETJMP */
-
-#define NO_FD_SET 1
-
-/* #undef RESOURCE_BASE */
-
-#ifndef _MSC_VER
-#define USE_GMODULE 1
-#define USE_MMX 1
-#endif
-
-/* Define to use X11R6 additions to XIM */
-/* #undef USE_X11R6_XIM */
-
-/* Define to use XKB extension */
-/* #undef HAVE_XKB */
-
-/* Define to use shadowfb in the linux-fb port */
-/* #undef ENABLE_SHADOW_FB */
-
-/* Define to use a fb manager in the linux-fb port */
-/* #undef ENABLE_FB_MANAGER */
-
-/* #undef XINPUT_NONE */
-/* #undef XINPUT_GXI */
-/* #undef XINPUT_XFREE */
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Most machines will be happy with int or void.  IRIX requires '...' */
-/* #undef SIGNAL_ARG_TYPE */
-
-#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
-
-/* #undef PACKAGE */
-/* #undef VERSION */
-
-
-/* Leave that blank line there!!  Autoheader needs it.
-   If you're adding to this file, keep in mind:
-   The entries are in sort -df order: alphabetical, case insensitive,
-   ignoring punctuation (such as underscores).  */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define if using `alloca.c'. */
-/* #undef C_ALLOCA */
-
-/* always defined to indicate that i18n is enabled */
-#define ENABLE_NLS 1
-
-/* Define if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 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 if you have the `dcgettext' function. */
-#define HAVE_DCGETTEXT 1
-
-/* Define if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define if you have the `getcwd' function. */
-#define HAVE_GETCWD 1
-
-/* Define if you have the `getpagesize' function. */
-#ifndef _MSC_VER
-#define HAVE_GETPAGESIZE 1
-#else /* _MSC_VER */
-/* #undef HAVE_GETPAGESIZE */
-#endif /* _MSC_VER */
-
-/* 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 if you have the <inttypes.h> header file. */
-/* #undef HAVE_INTTYPES_H */
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-/* #undef HAVE_LC_MESSAGES */
-
-/* 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 if you have the `lstat' function. */
-/* #undef HAVE_LSTAT */
-
-/* Define if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the `mkstemp' function. */
-/* #undef HAVE_MKSTEMP */
-
-/* Define if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* 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 */
-
-/* Define if you have the `setenv' function. */
-/* #undef HAVE_SETENV */
-
-/* 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 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have the `strcasecmp' function. */
-#ifndef _MSC_VER
-#define HAVE_STRCASECMP 1
-#else /* _MSC_VER */
-/* #undef HAVE_STRCASECMP */
-#endif /* _MSC_VER */
-
-/* Define if you have the `strchr' function. */
-#define HAVE_STRCHR 1
-
-/* Define if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
-/* Define if you have the <strings.h> header file. */
-/* #undef HAVE_STRINGS_H */
-
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define 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 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 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-/* #undef HAVE_SYS_WAIT_H */
-
-/* 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 wchar.h include file */
-#define HAVE_WCHAR_H 1
-
-/* Have wctype.h include file */
-#define HAVE_WCTYPE_H 1
-
-/* Define if you have the <winsock.h> header file. */
-#define HAVE_WINSOCK_H 1
-
-/* Define if you have the `__argz_count' function. */
-/* #undef HAVE___ARGZ_COUNT */
-
-/* Define if you have the `__argz_next' function. */
-/* #undef HAVE___ARGZ_NEXT */
-
-/* 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
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
-        STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
-/* Define if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#define gid_t int
-
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
-/* #undef inline */
-
-/* Define to `long' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#define uid_t int
--- a/config.sub
+++ b/config.sub
@@ -0,0 +1,979 @@
+#! /bin/sh
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+if [ x$1 = x ]
+then
+	echo Configuration name missing. 1>&2
+	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+	echo "or     $0 ALIAS" 1>&2
+	echo where ALIAS is a recognized configuration type. 1>&2
+	exit 1
+fi
+
+# First pass through any local machine types.
+case $1 in
+	*local*)
+		echo $1
+		exit 0
+		;;
+	*)
+	;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  linux-gnu*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple)
+		os=
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco5)
+		os=sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
+		| hppa2.0w \
+		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| mipstx39 | mipstx39el \
+		| sparc | sparclet | sparclite | sparc64 | v850)
+		basic_machine=$basic_machine-unknown
+		;;
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i[34567]86)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
+	      | hppa2.0w-* \
+	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | mipstx39-* | mipstx39el-* \
+	      | f301-* | armv*-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-cbm
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-cbm
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-cbm
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	cray2)
+		basic_machine=cray2-cray
+		os=-unicos
+		;;
+	[ctj]90-cray)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		os=-mpeix
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		os=-mpeix
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i[34567]86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i[34567]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i[34567]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i[34567]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux-gnu
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux-gnu
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netwinder)
+		basic_machine=armv4l-corel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+        pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pentium | p5 | k5 | nexen)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | k6 | 6x86)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | nexen-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=rs6000-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+	        ;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+	        ;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	xmp)
+		basic_machine=xmp-cray
+		os=-unicos
+		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	mips)
+		if [ x$os = x-linux-gnu ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sparc)
+		basic_machine=sparc-sun
+		;;
+        cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \
+	      | -openstep* | -mpeix* | -oskit*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-ns2 )
+	        os=-nextstep2
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-corel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+        pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+        *-gould)
+		os=-sysv
+		;;
+        *-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+        *-sgi)
+		os=-irix
+		;;
+        *-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f301-fujitsu)
+		os=-uxpv
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
--- a/configure.in
+++ b/configure.in
--- a/contrib/.cvsignore
+++ b/contrib/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,5 +0,0 @@
-
-SUBDIRS =
-if USE_X11
-SUBDIRS += gdk-pixbuf-xlib
-endif
--- a/contrib/gdk-pixbuf-xlib/.cvsignore
+++ b/contrib/gdk-pixbuf-xlib/.cvsignore
@@ -1,7 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-.libs
-.deps
-gdk-pixbuf-xlib-2.0.pc
--- a/contrib/gdk-pixbuf-xlib/ChangeLog
+++ b/contrib/gdk-pixbuf-xlib/ChangeLog
@@ -1,94 +0,0 @@
-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
-
-2002-01-25  Federico Mena Quintero  <federico@ximian.com>
-
-	Merge from gdk-pixbuf stable.
-
-	* gdk-pixbuf-xlib-drawable.c (rgb565msb): Fixed the endianness
-	conversion --- swap the individual 16 bit values instead of taking
-	everying as a 32 bit value.
-	(rgb565lsb): Likewise.
-	(rgb555lsb): Likewise.
-	(rgb555msb): Likewise.
-
-2001-11-26  Akira TAGOH  <tagoh@redhat.com>
-
-	* Makefile.am (libgdk_pixbuf_xlib_1_3_la_LDFLAGS):
-	Added -version-info.
-
-2001-05-19  Havoc Pennington  <hp@pobox.com>
-
-	* gdk-pixbuf-xlibrgb.c: docs
-
-2001-06-04  Havoc Pennington  <hp@redhat.com>
-
-	* gdk-pixbuf-xlibrgb.c (xlib_rgb_init): remove C++ comment,
-	reported by Dan McNichol
-
-Mon Jan  8 11:41:41 2001  Owen Taylor  <otaylor@redhat.com>
-
-	* Makefile.am (INCLUDES): Add @x_cflags@ (#36310)
-
-2001-01-02  Havoc Pennington  <hp@redhat.com>
-
-	* gdk-pixbuf-xlib-2.0.pc.in (Description): fix up description a bit.
-
-2000-10-06  Havoc Pennington  <hp@redhat.com>
-
-	* gdk-pixbuf-xlib.c: Put display/screen here, instead of in 
-	the main gdk-pixbuf library as it was in 1.0; since the io-xpm 
-	loader doesn't use these variables anymore it should be OK
-
-2000-09-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gdk-pixbuf/gdk-pixbuf-xlib-drawable.c
-	(gdk_pixbuf_xlib_get_from_drawable): Do not use
-	gdk_screen_{width,height}().  Thanks to John Harper for pointing
-	this out.
-
-2000-08-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gdk-pixbuf/gdk-pixbuf-xlibrgb.c: Added API reference docs.
-
-2000-08-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gdk-pixbuf/gdk-pixbuf-xlib-drawable.c (handle_x_error): Return
-	0.
-	(xlib_window_is_viewable): Return FALSE in the last case.
-
-	* gdk-pixbuf/gdk-pixbuf-xlib-render.c: Updated the inline docs.
-
-	* gdk-pixbuf/gdk-pixbuf-xlib.c: Added API docs.
-
-2000-08-25  John Harper  <john@dcs.warwick.ac.uk>
-
-	Work to create an Xlib version of gdk-pixbuf (with the Xlib
-	port of GdkRGB for rendering):
-
-	* configure.in: check for X libraries, set and substitute
-	GDK_PIXBUF_XLIB_{LIBDIR,INCLUDEDIR,LIBS} variables
-
-	* gdk_pixbuf_xlibConf.sh.in: new file -- gnome-config details
-	for the gdk-pixbuf-xlib library
-	* Makefile.am: build and install gdk_pixbuf_xlibConf.sh
-
-	* gdk-pixbuf/gdk-pixbuf-xlib-render.c,
-	gdk-pixbuf/gdk-pixbuf-xlib.c, gdk-pixbuf/gdk-pixbuf-xlib.h,
-	gdk-pixbuf/gdk-pixbuf-xlib-private.h,
-	gdk-pixbuf/gdk-pixbuf-xlib-drawable.c: new files, ported the
-	GDK dependent parts of gdk-pixbuf to use Xlib. Functions that
-	were called gdk_pixbuf_FOO are now gdk_pixbuf_xlib_FOO
-
-	* gdk-pixbuf/gdk-pixbuf-xlibrgb.c,
-	gdk-pixbuf/gdk-pixbuf-xlibrgb.h: added Chris Blizzard's Xlib
-	port of GdkRGB (from Mozilla CVS)
-
-	* gdk-pixbuf/Makefile.am: build a library libgdk_pixbuf_xlib.la
-	including the non-GDK dependent objects from libgdk_pixbuf.la
-	plus the Xlib ports and xlibrgb
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -1,34 +0,0 @@
-lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
-
-INCLUDES = \
-	-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)
-
-libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
-	-export-dynamic						\
-	-version-info $(LT_VERSION_INFO)
-
-libgdk_pixbuf_xlib_2_0_la_LIBADD = \
-	$(GDK_PIXBUF_XLIB_DEP_LIBS)
-
-libgdk_pixbuf_xlib_2_0_la_SOURCES =         \
-	gdk-pixbuf-xlib-private.h	\
-        gdk-pixbuf-xlib.c               \
-        gdk-pixbuf-xlib-render.c        \
-        gdk-pixbuf-xlib-drawable.c      \
-        gdk-pixbuf-xlibrgb.c
-
-libgdk_pixbuf_xlibincludedir=$(includedir)/gtk-2.0/gdk-pixbuf-xlib
-
-libgdk_pixbuf_xlibinclude_HEADERS =         		\
-        gdk-pixbuf-xlib.h               	    	\
-        gdk-pixbuf-xlibrgb.h
-
-pkgconfigdir   = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc
-
-EXTRA_DIST = gdk-pixbuf-xlib-2.0.pc.in
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: GdkPixbuf Xlib
-Description: GdkPixbuf rendering for Xlib
-Version: @VERSION@
-Requires: gobject-2.0,gmodule-2.0,gdk-pixbuf-2.0
-Libs: -L${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@
-Cflags: -I${includedir}
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-private.h
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-private.h
@@ -1,30 +0,0 @@
-/* GdkPixbuf library - Xlib header file
- *
- * Authors: John Harper <john@dcs.warwick.ac.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef GDK_PIXBUF_XLIB_PRIVATE_H
-#define GDK_PIXBUF_XLIB_PRIVATE_H
-
-#include "gdk-pixbuf-xlib.h"
-#include <X11/Xlib.h>
-
-extern Display *gdk_pixbuf_dpy;
-extern int gdk_pixbuf_screen;
-
-#endif
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c
@@ -1,398 +0,0 @@
-/* GdkPixbuf library - Rendering functions
- *
- * Copyright (C) 1999 The Free Software Foundation
- *
- * Author: Federico Mena-Quintero <federico@gimp.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* Trivially ported to Xlib(RGB) by John Harper. */
-
-#include <config.h>
-#include "gdk-pixbuf-private.h"
-#include "gdk-pixbuf-xlib-private.h"
-
-
-
-/**
- * gdk_pixbuf_xlib_render_threshold_alpha:
- * @pixbuf: A pixbuf.
- * @bitmap: Bitmap where the bilevel mask will be painted to.
- * @src_x: Source X coordinate.
- * @src_y: source Y coordinate.
- * @dest_x: Destination X coordinate.
- * @dest_y: Destination Y coordinate.
- * @width: Width of region to threshold.
- * @height: Height of region to threshold.
- * @alpha_threshold: Opacity values below this will be painted as zero; all
- * other values will be painted as one.
- *
- * Takes the opacity values in a rectangular portion of a pixbuf and thresholds
- * them to produce a bi-level alpha mask that can be used as a clipping mask for
- * a drawable.
- *
- **/
-void
-gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap,
-					int src_x, int src_y,
-					int dest_x, int dest_y,
-					int width, int height,
-					int alpha_threshold)
-{
-	GC gc;
-	XColor color;
-	int x, y;
-	guchar *p;
-	int start, start_status;
-	int status;
-	XGCValues gcv;
-
-	g_return_if_fail (pixbuf != NULL);
-	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
-	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
-	g_return_if_fail (pixbuf->bits_per_sample == 8);
-
-	g_return_if_fail (bitmap != 0);
-	g_return_if_fail (width >= 0 && height >= 0);
-	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
-	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
-
-	g_return_if_fail (alpha_threshold >= 0 && alpha_threshold <= 255);
-
-	if (width == 0 || height == 0)
-		return;
-
-	gc = XCreateGC (gdk_pixbuf_dpy, bitmap, 0, &gcv);
-
-	if (!pixbuf->has_alpha) {
-		color.pixel = (alpha_threshold == 255) ? 0 : 1;
-		XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
-		XFillRectangle (gdk_pixbuf_dpy, bitmap, gc,
-				dest_x, dest_y, width, height);
-		XFreeGC (gdk_pixbuf_dpy, gc);
-		return;
-	}
-
-	color.pixel = 0;
-	XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
-	XFillRectangle (gdk_pixbuf_dpy, bitmap, gc,
-			dest_x, dest_y, width, height);
-
-	color.pixel = 1;
-	XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
-
-	for (y = 0; y < height; y++) {
-		p = (pixbuf->pixels + (y + src_y) * pixbuf->rowstride + src_x * pixbuf->n_channels
-		     + pixbuf->n_channels - 1);
-
-		start = 0;
-		start_status = *p < alpha_threshold;
-
-		for (x = 0; x < width; x++) {
-			status = *p < alpha_threshold;
-
-			if (status != start_status) {
-				if (!start_status)
-					XDrawLine (gdk_pixbuf_dpy, bitmap, gc,
-						   start + dest_x, y + dest_y,
-						   x - 1 + dest_x, y + dest_y);
-
-				start = x;
-				start_status = status;
-			}
-
-			p += pixbuf->n_channels;
-		}
-
-		if (!start_status)
-			XDrawLine (gdk_pixbuf_dpy, bitmap, gc,
-				   start + dest_x, y + dest_y,
-				   x - 1 + dest_x, y + dest_y);
-	}
-
-	XFreeGC (gdk_pixbuf_dpy, gc);
-}
-
-
-
-/* Creates a buffer by stripping the alpha channel of a pixbuf */
-static guchar *
-remove_alpha (GdkPixbuf *pixbuf, int x, int y, int width, int height, int *rowstride)
-{
-	guchar *buf;
-	int xx, yy;
-	guchar *src, *dest;
-
-	g_assert (pixbuf->n_channels == 4);
-	g_assert (pixbuf->has_alpha);
-	g_assert (width > 0 && height > 0);
-	g_assert (x >= 0 && x + width <= pixbuf->width);
-	g_assert (y >= 0 && y + height <= pixbuf->height);
-
-	*rowstride = 4 * ((width * 3 + 3) / 4);
-
-	buf = g_new (guchar, *rowstride * height);
-
-	for (yy = 0; yy < height; yy++) {
-		src = pixbuf->pixels + pixbuf->rowstride * (yy + y) + x * pixbuf->n_channels;
-		dest = buf + *rowstride * yy;
-
-		for (xx = 0; xx < width; xx++) {
-			*dest++ = *src++;
-			*dest++ = *src++;
-			*dest++ = *src++;
-			src++;
-		}
-	}
-
-	return buf;
-}
-
-/**
- * gdk_pixbuf_xlib_render_to_drawable:
- * @pixbuf: A pixbuf.
- * @drawable: Destination drawable.
- * @gc: GC used for rendering.
- * @src_x: Source X coordinate within pixbuf.
- * @src_y: Source Y coordinate within pixbuf.
- * @dest_x: Destination X coordinate within drawable.
- * @dest_y: Destination Y coordinate within drawable.
- * @width: Width of region to render, in pixels.
- * @height: Height of region to render, in pixels.
- * @dither: Dithering mode for XlibRGB.
- * @x_dither: X offset for dither.
- * @y_dither: Y offset for dither.
- *
- * Renders a rectangular portion of a pixbuf to a drawable while using the
- * specified GC.  This is done using XlibRGB, so the specified drawable must
- * have the XlibRGB visual and colormap.  Note that this function will ignore
- * the opacity information for images with an alpha channel; the GC must already
- * have the clipping mask set if you want transparent regions to show through.
- *
- * For an explanation of dither offsets, see the XlibRGB documentation.  In
- * brief, the dither offset is important when re-rendering partial regions of an
- * image to a rendered version of the full image, or for when the offsets to a
- * base position change, as in scrolling.  The dither matrix has to be shifted
- * for consistent visual results.  If you do not have any of these cases, the
- * dither offsets can be both zero.
- **/
-void
-gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
-				    Drawable drawable, GC gc,
-				    int src_x, int src_y,
-				    int dest_x, int dest_y,
-				    int width, int height,
-				    XlibRgbDither dither,
-				    int x_dither, int y_dither)
-{
-	guchar *buf;
-	int rowstride;
-
-	g_return_if_fail (pixbuf != NULL);
-	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
-	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
-	g_return_if_fail (pixbuf->bits_per_sample == 8);
-
-	g_return_if_fail (drawable != 0);
-	g_return_if_fail (gc != 0);
-
-	g_return_if_fail (width >= 0 && height >= 0);
-	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
-	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
-
-	if (width == 0 || height == 0)
-		return;
-
-	/* This will have to be modified once we support other image types.
-	 * Also, GdkRGB does not have gdk_draw_rgb_32_image_dithalign(), so we
-	 * have to pack the buffer first.  Sigh.
-	 */
-
-	if (pixbuf->has_alpha)
-		buf = remove_alpha (pixbuf, src_x, src_y, width, height, &rowstride);
-	else {
-		buf = pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 3;
-		rowstride = pixbuf->rowstride;
-	}
-
-	xlib_draw_rgb_image_dithalign (drawable, gc,
-				       dest_x, dest_y,
-				       width, height,
-				       dither,
-				       buf, rowstride,
-				       x_dither, y_dither);
-
-	if (pixbuf->has_alpha)
-		g_free (buf);
-}
-
-
-
-/**
- * gdk_pixbuf_xlib_render_to_drawable_alpha:
- * @pixbuf: A pixbuf.
- * @drawable: Destination drawable.
- * @src_x: Source X coordinate within pixbuf.
- * @src_y: Source Y coordinates within pixbuf.
- * @dest_x: Destination X coordinate within drawable.
- * @dest_y: Destination Y coordinate within drawable.
- * @width: Width of region to render, in pixels.
- * @height: Height of region to render, in pixels.
- * @alpha_mode: If the image does not have opacity information, this is ignored.
- * Otherwise, specifies how to handle transparency when rendering.
- * @alpha_threshold: If the image does have opacity information and @alpha_mode
- * is GDK_PIXBUF_ALPHA_BILEVEL, specifies the threshold value for opacity
- * values.
- * @dither: Dithering mode for XlibRGB.
- * @x_dither: X offset for dither.
- * @y_dither: Y offset for dither.
- *
- * Renders a rectangular portion of a pixbuf to a drawable.  This is done using
- * XlibRGB, so the specified drawable must have the XlibRGB visual and colormap.
- *
- * When used with #GDK_PIXBUF_ALPHA_BILEVEL, this function has to create a bitmap
- * out of the thresholded alpha channel of the image and, it has to set this
- * bitmap as the clipping mask for the GC used for drawing.  This can be a
- * significant performance penalty depending on the size and the complexity of
- * the alpha channel of the image.  If performance is crucial, consider handling
- * the alpha channel yourself (possibly by caching it in your application) and
- * using gdk_pixbuf_xlib_render_to_drawable() or GdkRGB directly instead.
- **/
-void
-gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, Drawable drawable,
-					  int src_x, int src_y,
-					  int dest_x, int dest_y,
-					  int width, int height,
-					  GdkPixbufAlphaMode alpha_mode,
-					  int alpha_threshold,
-					  XlibRgbDither dither,
-					  int x_dither, int y_dither)
-{
-	Pixmap bitmap = 0;
-	GC gc;
-	XGCValues gcv;
-
-	g_return_if_fail (pixbuf != NULL);
-	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
-	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
-	g_return_if_fail (pixbuf->bits_per_sample == 8);
-
-	g_return_if_fail (drawable != 0);
-	g_return_if_fail (width >= 0 && height >= 0);
-	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
-	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
-
-	if (width == 0 || height == 0)
-		return;
-
-	gc = XCreateGC (gdk_pixbuf_dpy, drawable, 0, &gcv);
-
-	if (pixbuf->has_alpha) {
-		/* Right now we only support GDK_PIXBUF_ALPHA_BILEVEL, so we
-		 * unconditionally create the clipping mask.
-		 */
-
-		bitmap = XCreatePixmap (gdk_pixbuf_dpy,
-					RootWindow (gdk_pixbuf_dpy,
-						    gdk_pixbuf_screen),
-					width, height, 1);
-		gdk_pixbuf_xlib_render_threshold_alpha (pixbuf, bitmap,
-							src_x, src_y,
-							0, 0,
-							width, height,
-							alpha_threshold);
-
-		XSetClipMask (gdk_pixbuf_dpy, gc, bitmap);
-		XSetClipOrigin (gdk_pixbuf_dpy, gc, dest_x, dest_y);
-	}
-
-	gdk_pixbuf_xlib_render_to_drawable (pixbuf, drawable, gc,
-					    src_x, src_y,
-					    dest_x, dest_y,
-					    width, height,
-					    dither,
-					    x_dither, y_dither);
-
-	if (bitmap)
-	        XFreePixmap (gdk_pixbuf_dpy, bitmap);
-
-	XFreeGC (gdk_pixbuf_dpy, gc);
-}
-
-/**
- * gdk_pixbuf_xlib_render_pixmap_and_mask:
- * @pixbuf: A pixbuf.
- * @pixmap_return: Return value for the created pixmap.
- * @mask_return: Return value for the created mask.
- * @alpha_threshold: Threshold value for opacity values.
- *
- * Creates a pixmap and a mask bitmap which are returned in the @pixmap_return
- * and @mask_return arguments, respectively, and renders a pixbuf and its
- * corresponding tresholded alpha mask to them.  This is merely a convenience
- * function; applications that need to render pixbufs with dither offsets or to
- * given drawables should use gdk_pixbuf_xlib_render_to_drawable_alpha() or
- * gdk_pixbuf_xlib_render_to_drawable(), and
- * gdk_pixbuf_xlib_render_threshold_alpha().
- *
- * If the pixbuf does not have an alpha channel, then *@mask_return will be set
- * to None.
- **/
-void
-gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
-					Pixmap *pixmap_return,
-					Pixmap *mask_return,
-					int alpha_threshold)
-{
-        g_return_if_fail (pixbuf != NULL);
-
-	if (pixmap_return) {
-		GC gc;
-		XGCValues gcv;
-
-		*pixmap_return = XCreatePixmap (gdk_pixbuf_dpy,
-						RootWindow (gdk_pixbuf_dpy,
-							    gdk_pixbuf_screen),
-						pixbuf->width,
-						pixbuf->height,
-						xlib_rgb_get_depth ());
-		gc = XCreateGC (gdk_pixbuf_dpy, *pixmap_return, 0, &gcv);
-		gdk_pixbuf_xlib_render_to_drawable (pixbuf, *pixmap_return, gc,
-						    0, 0, 0, 0,
-						    pixbuf->width,
-						    pixbuf->height,
-						    XLIB_RGB_DITHER_NORMAL,
-						    0, 0);
-		XFreeGC (gdk_pixbuf_dpy, gc);
-	}
-
-	if (mask_return) {
-		if (pixbuf->has_alpha) {
-		    *mask_return = XCreatePixmap (gdk_pixbuf_dpy,
-						  RootWindow (gdk_pixbuf_dpy,
-							      gdk_pixbuf_screen),
-						  pixbuf->width,
-						  pixbuf->height, 1);
-		    gdk_pixbuf_xlib_render_threshold_alpha (pixbuf,
-							    *mask_return,
-							    0, 0, 0, 0,
-							    pixbuf->width,
-							    pixbuf->height,
-							    alpha_threshold);
-		} else
-			*mask_return = 0;
-	}
-}
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c
@@ -1,63 +0,0 @@
-/* GdkPixbuf library - Initialization functions
- *
- * Author: John Harper <john@dcs.warwick.ac.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <X11/Xlib.h>
-#include <gdk-pixbuf/gdk-pixbuf-private.h>
-#include "gdk-pixbuf-xlib-private.h"
-
-Display *gdk_pixbuf_dpy = NULL;
-int gdk_pixbuf_screen = -1;
-
-/**
- * gdk_pixbuf_xlib_init:
- * @display: X display to use.
- * @screen_num: Screen number.
- * 
- * Initializes the gdk-pixbuf Xlib machinery by calling xlib_rgb_init().  This
- * function should be called near the beginning of your program, or before using
- * any of the gdk-pixbuf-xlib functions.
- **/
-void
-gdk_pixbuf_xlib_init (Display *display, int screen_num)
-{
-    xlib_rgb_init (display, ScreenOfDisplay (display, screen_num));
-    gdk_pixbuf_dpy = display;
-    gdk_pixbuf_screen = screen_num;
-}
-
-/**
- * gdk_pixbuf_xlib_init_with_depth:
- * @display: X display to use.
- * @screen_num: Screen number.
- * @prefDepth: Preferred depth for XlibRGB.
- * 
- * Similar to gdk_pixbuf_xlib_init(), but also lets you specify the preferred
- * depth for XlibRGB if you do not want it to use the default depth it picks.
- **/
-void
-gdk_pixbuf_xlib_init_with_depth (Display *display,
-				 int screen_num, int prefDepth)
-{
-    xlib_rgb_init_with_depth (display, ScreenOfDisplay (display, screen_num),
-			      prefDepth);
-    gdk_pixbuf_dpy = display;
-    gdk_pixbuf_screen = screen_num;
-}
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
@@ -1,91 +0,0 @@
-/* GdkPixbuf library - Xlib header file
- *
- * Authors: John Harper <john@dcs.warwick.ac.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef GDK_PIXBUF_XLIB_H
-#define GDK_PIXBUF_XLIB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
-#include <X11/Xlib.h>
-
-
-
-/* init */
-
-void gdk_pixbuf_xlib_init (Display *display, int screen_num);
-
-void gdk_pixbuf_xlib_init_with_depth (Display *display, int screen_num,
-				      int prefDepth);
-
-
-
-/* render */
-
-void gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap,
-					     int src_x, int src_y,
-					     int dest_x, int dest_y,
-					     int width, int height,
-					     int alpha_threshold);
-
-void gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
-					 Drawable drawable, GC gc,
-					 int src_x, int src_y,
-					 int dest_x, int dest_y,
-					 int width, int height,
-					 XlibRgbDither dither,
-					 int x_dither, int y_dither);
-
-
-void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
-					       Drawable drawable,
-					       int src_x, int src_y,
-					       int dest_x, int dest_y,
-					       int width, int height,
-					       GdkPixbufAlphaMode alpha_mode,
-					       int alpha_threshold,
-					       XlibRgbDither dither,
-					       int x_dither, int y_dither);
-
-void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
-					     Pixmap *pixmap_return,
-					     Pixmap *mask_return,
-					     int alpha_threshold);
-
-
-
-/* drawable */
-
-GdkPixbuf *gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest,
-					      Drawable src,
-					      Colormap cmap, Visual *visual,
-					      int src_x, int src_y,
-					      int dest_x, int dest_y,
-					      int width, int height);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* GDK_PIXBUF_XLIB_H */
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
@@ -1,195 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "MPL"); you may not use this file except in
- * compliance with the MPL.  You may obtain a copy of the MPL at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the MPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL
- * for the specific language governing rights and limitations under the
- * MPL.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Library General Public License (the "LGPL"), in
- * which case the provisions of the LGPL are applicable instead of
- * those above.  If you wish to allow use of your version of this file
- * only under the terms of the LGPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision by
- * deleting the provisions above and replace them with the notice and
- * other provisions required by the LGPL.  If you do not delete the
- * provisions above, a recipient may use your version of this file
- * under either the MPL or the LGPL.
- */
-
-/*
- * This code is derived from GdkRgb.
- * For more information on GdkRgb, see http://www.levien.com/gdkrgb/
- * Raph Levien <raph@acm.org>
- */
-
-/* Ported by Christopher Blizzard to Xlib.  With permission from the
- * original authors of this file, the contents of this file are also
- * redistributable under the terms of the Mozilla Public license.  For
- * information about the Mozilla Public License, please see the
- * license information at http://www.mozilla.org/MPL/
- */
-
-/* This code is copyright the following authors:
- * Raph Levien          <raph@acm.org>
- * Manish Singh         <manish@gtk.org>
- * Tim Janik            <timj@gtk.org>
- * Peter Mattis         <petm@xcf.berkeley.edu>
- * Spencer Kimball      <spencer@xcf.berkeley.edu>
- * Josh MacDonald       <jmacd@xcf.berkeley.edu>
- * Christopher Blizzard <blizzard@redhat.com>
- * Owen Taylor          <otaylor@redhat.com>
- * Shawn T. Amundson    <amundson@gtk.org>
-*/
-
-
-#ifndef __XLIB_RGB_H__
-#define __XLIB_RGB_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xos.h>
-#include <X11/Intrinsic.h>
-
-#include <glib.h>
-
-typedef struct _XlibRgbCmap XlibRgbCmap;
-
-struct _XlibRgbCmap {
-  unsigned int colors[256];
-  unsigned char lut[256]; /* for 8-bit modes */
-};
-
-void
-xlib_rgb_init (Display *display, Screen *screen);
-void
-xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth);
-
-unsigned long
-xlib_rgb_xpixel_from_rgb (guint32 rgb);
-
-void
-xlib_rgb_gc_set_foreground (GC gc, guint32 rgb);
-
-void
-xlib_rgb_gc_set_background (GC gc, guint32 rgb);
-
-typedef enum
-{
-  XLIB_RGB_DITHER_NONE,
-  XLIB_RGB_DITHER_NORMAL,
-  XLIB_RGB_DITHER_MAX
-} XlibRgbDither;
-
-void
-xlib_draw_rgb_image (Drawable drawable,
-		     GC gc,
-		     int x,
-		     int y,
-		     int width,
-		     int height,
-		     XlibRgbDither dith,
-		     unsigned char *rgb_buf,
-		     int rowstride);
-
-void
-xlib_draw_rgb_image_dithalign (Drawable drawable,
-			       GC gc,
-			       int x,
-			       int y,
-			       int width,
-			       int height,
-			       XlibRgbDither dith,
-			       unsigned char *rgb_buf,
-			       int rowstride,
-			       int xdith,
-			       int ydith);
-
-void
-xlib_draw_rgb_32_image (Drawable drawable,
-			GC gc,
-			int x,
-			int y,
-			int width,
-			int height,
-			XlibRgbDither dith,
-			unsigned char *buf,
-			int rowstride);
-
-void
-xlib_draw_gray_image (Drawable drawable,
-		      GC gc,
-		      int x,
-		      int y,
-		      int width,
-		      int height,
-		      XlibRgbDither dith,
-		      unsigned char *buf,
-		      int rowstride);
-
-XlibRgbCmap *
-xlib_rgb_cmap_new (guint32 *colors, int n_colors);
-
-void
-xlib_rgb_cmap_free (XlibRgbCmap *cmap);
-
-void
-xlib_draw_indexed_image (Drawable drawable,
-                         GC gc,
-                         int x,
-                         int y,
-                         int width,
-                         int height,
-                         XlibRgbDither dith,
-                         unsigned char *buf,
-                         int rowstride,
-                         XlibRgbCmap *cmap);
-
-/* Below are some functions which are primarily useful for debugging
-   and experimentation. */
-Bool
-xlib_rgb_ditherable (void);
-
-void
-xlib_rgb_set_verbose (Bool verbose);
-
-/* experimental colormap stuff */
-void
-xlib_rgb_set_install (Bool install);
-
-void
-xlib_rgb_set_min_colors (int min_colors);
-
-Colormap
-xlib_rgb_get_cmap (void);
-
-Visual *
-xlib_rgb_get_visual (void);
-
-XVisualInfo *
-xlib_rgb_get_visual_info (void);
-
-int
-xlib_rgb_get_depth (void);
-
-Display *
-xlib_rgb_get_display (void);
-
-Screen *
-xlib_rgb_get_screen (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __XLIB_RGB_H__ */
--- a/demos/.cvsignore
+++ b/demos/.cvsignore
@@ -1,11 +0,0 @@
-Makefile
-Makefile.in
-.libs
-.deps
-testanimation
-test-inline-pixbufs.h
-testpixbuf-drawable
-testpixbuf-scale
-testpixbuf-save
-testpixbuf
-pixbuf-demo
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,85 +0,0 @@
-## Makefile.am for gtk+/demos
-
-SUBDIRS = gtk-demo
-
-INCLUDES = 						\
-	-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)
-
-DEPS = 									\
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/$(gdktargetlib) 				\
-	$(top_builddir)/gtk/$(gtktargetlib)
-
-LDADDS = 								\
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)
-
-noinst_PROGRAMS = 		\
-	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 
-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)
-
-testpixbuf_DEPENDENCIES = $(DEPS)
-testpixbuf_drawable_DEPENDENCIES = $(DEPS)
-testpixbuf_save_DEPENDENCIES = $(DEPS)
-testpixbuf_scale_DEPENDENCIES = $(DEPS)
-testanimation_DEPENDENCIES = $(DEPS)
-pixbuf_demo_DEPENDENCIES = $(DEPS)
-
-testpixbuf_LDADD = $(LDADDS)
-testpixbuf_drawable_LDADD = $(LDADDS)
-testpixbuf_save_LDADD = $(LDADDS)
-testpixbuf_scale_LDADD = $(LDADDS)
-testanimation_LDADD = $(LDADDS)
-pixbuf_demo_LDADD = $(LDADDS)
-
-testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c
-testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c
-testpixbuf_save_SOURCES = testpixbuf-save.c
-testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
-testanimation_SOURCES = testanimation.c pixbuf-init.c
-pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c
-
-EXTRA_DIST =			\
-	apple-red.png		\
-	background.jpg		\
-	gnome-applets.png	\
-	gnome-calendar.png	\
-	gnome-foot.png		\
-	gnome-gimp.png		\
-	gnome-gmush.png		\
-	gnome-gsame.png		\
-	gnu-keys.png
-
-DISTCLEANFILES = test-inline-pixbufs.h
--- a/demos/apple-red.png
+++ b/demos/apple-red.png
--- a/demos/background.jpg
+++ b/demos/background.jpg
--- a/demos/gnome-applets.png
+++ b/demos/gnome-applets.png
--- a/demos/gnome-calendar.png
+++ b/demos/gnome-calendar.png
--- a/demos/gnome-foot.png
+++ b/demos/gnome-foot.png
--- a/demos/gnome-gimp.png
+++ b/demos/gnome-gimp.png
--- a/demos/gnome-gmush.png
+++ b/demos/gnome-gmush.png
--- a/demos/gnome-gsame.png
+++ b/demos/gnome-gsame.png
--- a/demos/gnu-keys.png
+++ b/demos/gnu-keys.png
--- a/demos/gtk-demo/.cvsignore
+++ b/demos/gtk-demo/.cvsignore
@@ -1,7 +0,0 @@
-Makefile
-Makefile.in
-.libs
-.deps
-gtk-demo
-demos.h
-geninclude.pl
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -1,82 +0,0 @@
-## Makefile.am for gtk+/demos
-
-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				\
-	button_box.c				\
-	changedisplay.c				\
-	colorsel.c				\
-	dialog.c				\
-	drawingarea.c				\
-	editable_cells.c			\
-	hypertext.c				\
-	images.c				\
-	list_store.c				\
-	menus.c					\
-	panes.c					\
-	pixbufs.c				\
-	sizegroup.c				\
-	stock_browser.c				\
-	textview.c				\
-	tree_store.c				\
-	ui_manager.c
-
-INCLUDES = \
-	-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)
-
-DEPS = \
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/$(gdktargetlib) 				\
-	$(top_builddir)/gtk/$(gtktargetlib)
-
-LDADDS = \
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)
-
-bin_PROGRAMS = gtk-demo
-
-BUILT_SOURCES = demos.h
-
-EXTRA_DIST = 		\
-	$(IMAGEFILES)
-
-demos.h: @REBUILD@ $(demos) geninclude.pl
-	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
-
-gtk_demo_SOURCES = 		\
-	$(demos)		\
-	demo-common.h		\
-	main.c			\
-	demos.h
-
-gtk_demo_DEPENDENCIES = $(DEPS)
-gtk_demo_LDADD = $(LDADDS)
-
-IMAGEFILES=	alphatest.png		\
-	        apple-red.png		\
-		background.jpg		\
-		floppybuddy.gif		\
-		gnome-applets.png	\
-		gnome-calendar.png	\
-		gnome-foot.png		\
-		gnome-gimp.png		\
-		gnome-gmush.png		\
-		gnome-gsame.png		\
-		gnu-keys.png		\
-		gtk-logo-rgb.gif
-
-democode_DATA = $(demos) $(IMAGEFILES)
-
-DISTCLEANFILES = demos.h
--- a/demos/gtk-demo/alphatest.png
+++ b/demos/gtk-demo/alphatest.png
--- a/demos/gtk-demo/apple-red.png
+++ b/demos/gtk-demo/apple-red.png
--- a/demos/gtk-demo/appwindow.c
+++ b/demos/gtk-demo/appwindow.c
@@ -1,462 +0,0 @@
-/* Application main window
- *
- * Demonstrates a typical application window, with menubar, toolbar, statusbar.
- */
-
-#include <gtk/gtk.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);
-
-  GtkWidget *dialog;
-  
-  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_CLOSE,
-                                   "You activated action: \"%s\" of type \"%s\"",
-                                    name, typename);
-
-  /* Close dialog on user response */
-  g_signal_connect (dialog,
-                    "response",
-                    G_CALLBACK (gtk_widget_destroy),
-                    NULL);
-  
-  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;
-  
-      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\".\nCurrent value: %d",
-				       name, typename, value);
-
-      /* Close dialog on user response */
-      g_signal_connect (dialog,
-			"response",
-			G_CALLBACK (gtk_widget_destroy),
-			NULL);
-      
-      gtk_widget_show (dialog);
-    }
-}
-
-
-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>";
-
-
-
-/* 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
- * and have them not be themeable, especially if you never expect people
- * to theme your app.
- */
-static void
-register_stock_icons (void)
-{
-  static gboolean registered = FALSE;
-  
-  if (!registered)
-    {
-      GdkPixbuf *pixbuf;
-      GtkIconFactory *factory;
-      char *filename;
-
-      static GtkStockItem items[] = {
-        { "demo-gtk-logo",
-          "_GTK!",
-          0, 0, NULL }
-      };
-      
-      registered = TRUE;
-
-      /* Register our stock items */
-      gtk_stock_add (items, G_N_ELEMENTS (items));
-      
-      /* Add our custom icon factory to the list of defaults */
-      factory = gtk_icon_factory_new ();
-      gtk_icon_factory_add_default (factory);
-
-      /* demo_find_file() looks in the the current directory first,
-       * so you can run gtk-demo without installing GTK, then looks
-       * in the location where the file is installed.
-       */
-      pixbuf = NULL;
-      filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
-      if (filename)
-	{
-	  pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-	  g_free (filename);
-	}
-
-      /* Register icon to accompany stock item */
-      if (pixbuf != NULL)
-        {
-          GtkIconSet *icon_set;
-          GdkPixbuf *transparent;
-
-          /* The gtk-logo-rgb icon has a white background, make it transparent */
-          transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
-          
-          icon_set = gtk_icon_set_new_from_pixbuf (transparent);
-          gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set);
-          gtk_icon_set_unref (icon_set);
-          g_object_unref (pixbuf);
-          g_object_unref (transparent);
-        }
-      else
-        g_warning ("failed to load GTK logo for toolbar");
-      
-      /* Drop our reference to the factory, GTK will hold a reference. */
-      g_object_unref (factory);
-    }
-}
-
-static void
-update_statusbar (GtkTextBuffer *buffer,
-                  GtkStatusbar  *statusbar)
-{
-  gchar *msg;
-  gint row, col;
-  gint count;
-  GtkTextIter iter;
-  
-  gtk_statusbar_pop (statusbar, 0); /* clear any previous message, underflow is allowed */
-
-  count = gtk_text_buffer_get_char_count (buffer);
-
-  gtk_text_buffer_get_iter_at_mark (buffer,
-                                    &iter,
-                                    gtk_text_buffer_get_insert (buffer));
-
-  row = gtk_text_iter_get_line (&iter);
-  col = gtk_text_iter_get_line_offset (&iter);
-
-  msg = g_strdup_printf ("Cursor at row %d column %d - %d chars in document",
-                         row, col, count);
-
-  gtk_statusbar_push (statusbar, 0, msg);
-
-  g_free (msg);
-}
-
-static void
-mark_set_callback (GtkTextBuffer     *buffer,
-                   const GtkTextIter *new_location,
-                   GtkTextMark       *mark,
-                   gpointer           data)
-{
-  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))
-    gtk_statusbar_set_has_resize_grip (statusbar, !(event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)));
-}
-		    
-
-GtkWidget *
-do_appwindow (GtkWidget *do_widget)
-{  
-  if (!window)
-    {
-      GtkWidget *table;
-      GtkWidget *statusbar;
-      GtkWidget *contents;
-      GtkWidget *sw;
-      GtkWidget *bar;
-      GtkTextBuffer *buffer;
-      GtkActionGroup *action_group;
-      GtkUIManager *merge;
-      GError *error = NULL;
-
-      register_stock_icons ();
-      
-      /* Create the toplevel 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), "Application Window");
-
-      /* NULL window variable when window is closed */
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed),
-                        &window);
-
-      table = gtk_table_new (1, 4, FALSE);
-      
-      gtk_container_add (GTK_CONTAINER (window), table);
-      
-      /* Create the menubar and toolbar
-       */
-      
-      action_group = gtk_action_group_new ("AppWindowActions");
-      gtk_action_group_add_actions (action_group, 
-				    entries, n_entries, 
-				    NULL);
-      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));
-      
-      if (!gtk_ui_manager_add_ui_from_string (merge, ui_info, -1, &error))
-	{
-	  g_message ("building menus failed: %s", error->message);
-	  g_error_free (error);
-	}
-
-      bar = gtk_ui_manager_get_widget (merge, "/MenuBar");
-      gtk_widget_show (bar);
-      gtk_table_attach (GTK_TABLE (table),
-			bar, 
-                        /* 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);
-      gtk_table_attach (GTK_TABLE (table),
-			bar, 
-                        /* X direction */       /* Y direction */
-                        0, 1,                   1, 2,
-                        GTK_EXPAND | GTK_FILL,  0,
-                        0,                      0);
-
-      /* Create document
-       */
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_AUTOMATIC);
-
-      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_IN);
-      
-      gtk_table_attach (GTK_TABLE (table),
-                        sw,
-                        /* X direction */       /* Y direction */
-                        0, 1,                   2, 3,
-                        GTK_EXPAND | GTK_FILL,  GTK_EXPAND | GTK_FILL,
-                        0,                      0);
-
-      gtk_window_set_default_size (GTK_WINDOW (window),
-                                   200, 200);
-      
-      contents = gtk_text_view_new ();
-      gtk_widget_grab_focus (contents);
-      
-      gtk_container_add (GTK_CONTAINER (sw),
-                         contents);
-
-      /* Create statusbar */
-
-      statusbar = gtk_statusbar_new ();
-      gtk_table_attach (GTK_TABLE (table),
-                        statusbar,
-                        /* X direction */       /* Y direction */
-                        0, 1,                   3, 4,
-                        GTK_EXPAND | GTK_FILL,  0,
-                        0,                      0);
-
-      /* Show text widget info in the statusbar */
-      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (contents));
-      
-      g_signal_connect_object (buffer,
-                               "changed",
-                               G_CALLBACK (update_statusbar),
-                               statusbar,
-                               0);
-
-      g_signal_connect_object (buffer,
-                               "mark_set", /* cursor moved */
-                               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));
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {    
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
--- a/demos/gtk-demo/background.jpg
+++ b/demos/gtk-demo/background.jpg
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -1,127 +0,0 @@
-/* Button Boxes
- *
- * The Button Box widgets are used to arrange buttons with padding.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *
-create_bbox (gint  horizontal,
-	     char *title, 
-	     gint  spacing,
-	     gint  layout)
-{
-  GtkWidget *frame;
-  GtkWidget *bbox;
-  GtkWidget *button;
-	
-  frame = gtk_frame_new (title);
-
-  if (horizontal)
-    bbox = gtk_hbutton_box_new ();
-  else
-    bbox = gtk_vbutton_box_new ();
-
-  gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
-  gtk_container_add (GTK_CONTAINER (frame), bbox);
-
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
-  gtk_box_set_spacing (GTK_BOX (bbox), spacing);
-  
-  button = gtk_button_new_from_stock (GTK_STOCK_OK);
-  gtk_container_add (GTK_CONTAINER (bbox), button);
-  
-  button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
-  gtk_container_add (GTK_CONTAINER (bbox), button);
-  
-  button = gtk_button_new_from_stock (GTK_STOCK_HELP);
-  gtk_container_add (GTK_CONTAINER (bbox), button);
-
-  return frame;
-}
-
-GtkWidget *
-do_button_box (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *main_vbox;
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *frame_horz;
-  GtkWidget *frame_vert;
-	
-  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",
-		      G_CALLBACK (gtk_widget_destroyed),
-		      &window);
-    
-    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-    main_vbox = gtk_vbox_new (FALSE, 0);
-    gtk_container_add (GTK_CONTAINER (window), main_vbox);
-    
-    frame_horz = gtk_frame_new ("Horizontal Button Boxes");
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10);
-    
-    vbox = gtk_vbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
-    gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
-
-    gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD),
-			TRUE, TRUE, 0);
-
-    gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE),
-			TRUE, TRUE, 5);
-    
-    gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START),
-			TRUE, TRUE, 5);
-    
-    gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END),
-			TRUE, TRUE, 5);
-
-    frame_vert = gtk_frame_new ("Vertical Button Boxes");
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
-    
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
-    gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
-
-    gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "Spread", 30, GTK_BUTTONBOX_SPREAD),
-			TRUE, TRUE, 0);
-
-    gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "Edge", 30, GTK_BUTTONBOX_EDGE),
-			TRUE, TRUE, 5);
-
-    gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "Start", 30, GTK_BUTTONBOX_START),
-			TRUE, TRUE, 5);
-
-    gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "End", 30, GTK_BUTTONBOX_END),
-			TRUE, TRUE, 5);
-  }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {	 
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -1,627 +0,0 @@
-/* Change Display
- * 
- * Demonstrates migrating a window between different displays and
- * screens. A display is a mouse and keyboard with some number of
- * associated monitors. A screen is a set of monitors grouped
- * into a single physical work area. The neat thing about having
- * multiple displays is that they can be on a completely separate
- * computers, as long as there is a network connection to the
- * computer where the application is running.
- *
- * Only some of the windowing systems where GTK+ runs have the
- * concept of multiple displays and screens. (The X Window System
- * is the main example.) Other windowing systems can only
- * handle one keyboard and mouse, and combine all monitors into
- * a single screen.
- *
- * This is a moderately complex example, and demonstrates:
- *
- *  - Tracking the currently open displays and screens
- *
- *  - Changing the screen for a window
- *
- *  - Letting the user choose a window by clicking on it
- * 
- *  - Using GtkListStore and GtkTreeView
- *
- *  - Using GtkDialog
- */
-#include <string.h>
-#include <gtk/gtk.h>
-#include "demo-common.h"
-
-/* The ChangeDisplayInfo structure corresponds to a toplevel window and
- * holds pointers to widgets inside the toplevel window along with other
- * information about the contents of the window.
- * This is a common organizational structure in real applications.
- */
-typedef struct _ChangeDisplayInfo ChangeDisplayInfo;
-
-struct _ChangeDisplayInfo
-{
-  GtkWidget *window;
-  GtkSizeGroup *size_group;
-
-  GtkTreeModel *display_model;
-  GtkTreeModel *screen_model;
-  GtkTreeSelection *screen_selection;
-  
-  GdkDisplay *current_display;
-  GdkScreen *current_screen;
-};
-
-/* These enumerations provide symbolic names for the columns
- * in the two GtkListStore models.
- */
-enum
-{
-  DISPLAY_COLUMN_NAME,
-  DISPLAY_COLUMN_DISPLAY,
-  DISPLAY_NUM_COLUMNS
-};
-
-enum
-{
-  SCREEN_COLUMN_NUMBER,
-  SCREEN_COLUMN_SCREEN,
-  SCREEN_NUM_COLUMNS
-};
-
-/* Finds the toplevel window under the mouse pointer, if any.
- */
-static GtkWidget *
-find_toplevel_at_pointer (GdkDisplay *display)
-{
-  GdkWindow *pointer_window;
-  GtkWidget *widget = NULL;
-
-  pointer_window = gdk_display_get_window_at_pointer (display, NULL, NULL);
-
-  /* The user data field of a GdkWindow is used to store a pointer
-   * to the widget that created it.
-   */
-  if (pointer_window)
-    gdk_window_get_user_data (pointer_window, (gpointer*) &widget);
-
-  return widget ? gtk_widget_get_toplevel (widget) : NULL;
-}
-
-static gboolean
-button_release_event_cb (GtkWidget       *widget,
-			 GdkEventButton  *event,
-			 gboolean        *clicked)
-{
-  *clicked = TRUE;
-  return TRUE;
-}
-
-/* Asks the user to click on a window, then waits for them click
- * the mouse. When the mouse is released, returns the toplevel
- * window under the pointer, or NULL, if there is none.
- */
-static GtkWidget *
-query_for_toplevel (GdkScreen  *screen,
-		    const char *prompt)
-{
-  GdkDisplay *display = gdk_screen_get_display (screen);
-  GtkWidget *popup, *label, *frame;
-  GdkCursor *cursor;
-  GtkWidget *toplevel = NULL;
-  
-  popup = gtk_window_new (GTK_WINDOW_POPUP);
-  gtk_window_set_screen (GTK_WINDOW (popup), screen);
-  gtk_window_set_modal (GTK_WINDOW (popup), TRUE);
-  gtk_window_set_position (GTK_WINDOW (popup), GTK_WIN_POS_CENTER);
-  
-  frame = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
-  gtk_container_add (GTK_CONTAINER (popup), frame);
-  
-  label = gtk_label_new (prompt);
-  gtk_misc_set_padding (GTK_MISC (label), 10, 10);
-  gtk_container_add (GTK_CONTAINER (frame), label);
-  
-  gtk_widget_show_all (popup);
-  cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
-  
-  if (gdk_pointer_grab (popup->window, FALSE,
-			GDK_BUTTON_RELEASE_MASK,
-			NULL,
-			cursor,
-			GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS)
-    {
-      gboolean clicked = FALSE;
-      
-      g_signal_connect (popup, "button-release-event",
-			G_CALLBACK (button_release_event_cb), &clicked);
-      
-      /* Process events until clicked is set by button_release_event_cb.
-       * We pass in may_block=TRUE since we want to wait if there
-       * are no events currently.
-       */
-      while (!clicked)
-	g_main_context_iteration (NULL, TRUE);
-      
-      toplevel = find_toplevel_at_pointer (gdk_screen_get_display (screen));
-      if (toplevel == popup)
-	toplevel = NULL;
-    }
-      
-  gdk_cursor_unref (cursor);
-  gtk_widget_destroy (popup);
-  gdk_flush ();			/* Really release the grab */
-  
-  return toplevel;
-}
-
-/* Prompts the user for a toplevel window to move, and then moves
- * that window to the currently selected display
- */
-static void
-query_change_display (ChangeDisplayInfo *info)
-{
-  GdkScreen *screen = gtk_widget_get_screen (info->window);
-  GtkWidget *toplevel;
-
-  toplevel = query_for_toplevel (screen,
-				 "Please select the toplevel\n"
-				 "to move to the new screen");
-
-  if (toplevel)
-    gtk_window_set_screen (GTK_WINDOW (toplevel), info->current_screen);
-  else
-    gdk_display_beep (gdk_screen_get_display (screen));
-}
-
-/* Fills in the screen list based on the current display
- */
-static void
-fill_screens (ChangeDisplayInfo *info)
-{
-  gtk_list_store_clear (GTK_LIST_STORE (info->screen_model));
-
-  if (info->current_display)
-    {
-      gint n_screens = gdk_display_get_n_screens (info->current_display);
-      gint i;
-      
-      for (i = 0; i < n_screens; i++)
-	{
-	  GdkScreen *screen = gdk_display_get_screen (info->current_display, i);
-	  GtkTreeIter iter;
-	  
-	  gtk_list_store_append (GTK_LIST_STORE (info->screen_model), &iter);
-	  gtk_list_store_set (GTK_LIST_STORE (info->screen_model), &iter,
-			      SCREEN_COLUMN_NUMBER, i,
-			      SCREEN_COLUMN_SCREEN, screen,
-			      -1);
-
-	  if (i == 0)
-	    gtk_tree_selection_select_iter (info->screen_selection, &iter);
-	}
-    }
-}
-
-/* Called when the user clicks on a button in our dialog or
- * closes the dialog through the window manager. Unless the
- * "Change" button was clicked, we destroy the dialog.
- */
-static void
-response_cb (GtkDialog         *dialog,
-	     gint               response_id,
-	     ChangeDisplayInfo *info)
-{
-  if (response_id == GTK_RESPONSE_OK)
-    query_change_display (info);
-  else
-    gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-/* Called when the user clicks on "Open..." in the display
- * frame. Prompts for a new display, and then opens a connection
- * to that display.
- */
-static void
-open_display_cb (GtkWidget         *button,
-		 ChangeDisplayInfo *info)
-{
-  GtkWidget *dialog;
-  GtkWidget *display_entry;
-  GtkWidget *dialog_label;
-  gchar *new_screen_name = NULL;
-  GdkDisplay *result = NULL;
-  
-  dialog = gtk_dialog_new_with_buttons ("Open Display",
-					GTK_WINDOW (info->window),
-					GTK_DIALOG_MODAL,
-					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					GTK_STOCK_OK, GTK_RESPONSE_OK,
-					NULL);
-
-  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-  display_entry = gtk_entry_new ();
-  gtk_entry_set_activates_default (GTK_ENTRY (display_entry), TRUE);
-  dialog_label =
-    gtk_label_new ("Please enter the name of\nthe new display\n");
-
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog_label);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), display_entry);
-
-  gtk_widget_grab_focus (display_entry);
-  gtk_widget_show_all (GTK_BIN (dialog)->child);
-  
-  while (!result)
-    {
-      gint response_id = gtk_dialog_run (GTK_DIALOG (dialog));
-      if (response_id != GTK_RESPONSE_OK)
-	break;
-      
-      new_screen_name = gtk_editable_get_chars (GTK_EDITABLE (display_entry),
-						0, -1);
-
-      if (strcmp (new_screen_name, "") != 0)
-	{
-	  result = gdk_display_open (new_screen_name);
-	  if (!result)
-	    {
-	      gchar *error_msg =
-		g_strdup_printf  ("Can't open display :\n\t%s\nplease try another one\n",
-				  new_screen_name);
-	      gtk_label_set_text (GTK_LABEL (dialog_label), error_msg);
-	      g_free (error_msg);
-	    }
-
-	  g_free (new_screen_name);
-	}
-    }
-  
-  gtk_widget_destroy (dialog);
-}
-
-/* Called when the user clicks on the "Close" button in the
- * "Display" frame. Closes the selected display.
- */
-static void
-close_display_cb (GtkWidget         *button,
-		  ChangeDisplayInfo *info)
-{
-  if (info->current_display)
-    gdk_display_close (info->current_display);
-}
-
-/* Called when the selected row in the display list changes.
- * Updates info->current_display, then refills the list of
- * screens.
- */
-static void
-display_changed_cb (GtkTreeSelection  *selection,
-		    ChangeDisplayInfo *info)
-{
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    gtk_tree_model_get (model, &iter,
-			DISPLAY_COLUMN_DISPLAY, &info->current_display,
-			-1);
-  else
-    info->current_display = NULL;
-
-  fill_screens (info);
-}
-
-/* Called when the selected row in the sceen list changes.
- * Updates info->current_screen.
- */
-static void
-screen_changed_cb (GtkTreeSelection  *selection,
-		   ChangeDisplayInfo *info)
-{
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    gtk_tree_model_get (model, &iter,
-			SCREEN_COLUMN_SCREEN, &info->current_screen,
-			-1);
-  else
-    info->current_screen = NULL;
-}
-
-/* This function is used both for creating the "Display" and
- * "Screen" frames, since they have a similar structure. The
- * caller hooks up the right context for the value returned
- * in tree_view, and packs any relevant buttons into button_vbox.
- */
-static void
-create_frame (ChangeDisplayInfo *info,
-	      const char        *title,
-	      GtkWidget        **frame,
-	      GtkWidget        **tree_view,
-	      GtkWidget        **button_vbox)
-{
-  GtkTreeSelection *selection;
-  GtkWidget *scrollwin;
-  GtkWidget *hbox;
-  
-  *frame = gtk_frame_new (title);
-
-  hbox = gtk_hbox_new (FALSE, 8);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-  gtk_container_add (GTK_CONTAINER (*frame), hbox);
-
-  scrollwin = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin),
-				  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin),
-				       GTK_SHADOW_IN);
-  gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE, TRUE, 0);
-
-  *tree_view = gtk_tree_view_new ();
-  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (*tree_view), FALSE);
-  gtk_container_add (GTK_CONTAINER (scrollwin), *tree_view);
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (*tree_view));
-  gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
-
-  *button_vbox = gtk_vbox_new (FALSE, 5);
-  gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE, FALSE, 0);
-
-  if (!info->size_group)
-    info->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-  
-  gtk_size_group_add_widget (GTK_SIZE_GROUP (info->size_group), *button_vbox);
-}
-
-/* If we have a stack of buttons, it often looks better if their contents
- * are left-aligned, rather than centered. This function creates a button
- * and left-aligns it contents.
- */
-GtkWidget *
-left_align_button_new (const char *label)
-{
-  GtkWidget *button = gtk_button_new_with_mnemonic (label);
-  GtkWidget *child = gtk_bin_get_child (GTK_BIN (button));
-
-  gtk_misc_set_alignment (GTK_MISC (child), 0., 0.5);
-
-  return button;
-}
-
-/* Creates the "Display" frame in the main window.
- */
-GtkWidget *
-create_display_frame (ChangeDisplayInfo *info)
-{
-  GtkWidget *frame;
-  GtkWidget *tree_view;
-  GtkWidget *button_vbox;
-  GtkTreeViewColumn *column;
-  GtkTreeSelection *selection;
-  GtkWidget *button;
-
-  create_frame (info, "Display", &frame, &tree_view, &button_vbox);
-
-  button = left_align_button_new ("_Open...");
-  g_signal_connect (button, "clicked",  G_CALLBACK (open_display_cb), info);
-  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE, 0);
-  
-  button = left_align_button_new ("_Close");
-  g_signal_connect (button, "clicked",  G_CALLBACK (close_display_cb), info);
-  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE, 0);
-
-  info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS,
-							    G_TYPE_STRING,
-							    GDK_TYPE_DISPLAY);
-
-  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), info->display_model);
-
-  column = gtk_tree_view_column_new_with_attributes ("Name",
-						     gtk_cell_renderer_text_new (),
-						     "text", DISPLAY_COLUMN_NAME,
-						     NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-  g_signal_connect (selection, "changed",
-		    G_CALLBACK (display_changed_cb), info);
-
-  return frame;
-}
-
-/* Creates the "Screen" frame in the main window.
- */
-GtkWidget *
-create_screen_frame (ChangeDisplayInfo *info)
-{
-  GtkWidget *frame;
-  GtkWidget *tree_view;
-  GtkWidget *button_vbox;
-  GtkTreeViewColumn *column;
-
-  create_frame (info, "Screen", &frame, &tree_view, &button_vbox);
-
-  info->screen_model = (GtkTreeModel *)gtk_list_store_new (SCREEN_NUM_COLUMNS,
-							   G_TYPE_INT,
-							   GDK_TYPE_SCREEN);
-
-  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), info->screen_model);
-
-  column = gtk_tree_view_column_new_with_attributes ("Number",
-						     gtk_cell_renderer_text_new (),
-						     "text", SCREEN_COLUMN_NUMBER,
-						     NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
-
-  info->screen_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-  g_signal_connect (info->screen_selection, "changed",
-		    G_CALLBACK (screen_changed_cb), info);
-
-  return frame;
-}
-
-/* Called when one of the currently open displays is closed.
- * Remove it from our list of displays.
- */
-static void
-display_closed_cb (GdkDisplay        *display,
-		   gboolean           is_error,
-		   ChangeDisplayInfo *info)
-{
-  GtkTreeIter iter;
-  gboolean valid;
-
-  for (valid = gtk_tree_model_get_iter_first (info->display_model, &iter);
-       valid;
-       valid = gtk_tree_model_iter_next (info->display_model, &iter))
-    {
-      GdkDisplay *tmp_display;
-      
-      gtk_tree_model_get (info->display_model, &iter,
-			  DISPLAY_COLUMN_DISPLAY, &tmp_display,
-			  -1);
-      if (tmp_display == display)
-	{
-	  gtk_list_store_remove (GTK_LIST_STORE (info->display_model), &iter);
-	  break;
-	}
-    }
-}
-
-/* Adds a new display to our list of displays, and connects
- * to the "closed" signal so that we can remove it from the
- * list of displays again.
- */
-static void
-add_display (ChangeDisplayInfo *info,
-	     GdkDisplay        *display)
-{
-  const gchar *name = gdk_display_get_name (display);
-  GtkTreeIter iter;
-  
-  gtk_list_store_append (GTK_LIST_STORE (info->display_model), &iter);
-  gtk_list_store_set (GTK_LIST_STORE (info->display_model), &iter,
-		      DISPLAY_COLUMN_NAME, name,
-		      DISPLAY_COLUMN_DISPLAY, display,
-		      -1);
-
-  g_signal_connect (display, "closed",
-		    G_CALLBACK (display_closed_cb), info); 
-}
-
-/* Called when a new display is opened
- */
-static void
-display_opened_cb (GdkDisplayManager *manager,
-		   GdkDisplay        *display,
-		   ChangeDisplayInfo *info)
-{
-  add_display (info, display);
-}
-
-/* Adds all currently open displays to our list of displays,
- * and set up a signal connection so that we'll be notified
- * when displays are opened in the future as well.
- */
-static void
-initialize_displays (ChangeDisplayInfo *info)
-{
-  GdkDisplayManager *manager = gdk_display_manager_get ();
-  GSList *displays = gdk_display_manager_list_displays (manager);
-  GSList *tmp_list;
-
-  for (tmp_list = displays; tmp_list; tmp_list = tmp_list->next)
-    add_display (info, tmp_list->data);
-
-  g_slist_free (tmp_list);
-
-  g_signal_connect (manager, "display_opened",
-		    G_CALLBACK (display_opened_cb), info);
-}
-
-/* Cleans up when the toplevel is destroyed; we remove the
- * connections we use to track currently open displays, then
- * free the ChangeDisplayInfo structure.
- */
-static void
-destroy_info (ChangeDisplayInfo *info)
-{
-  GdkDisplayManager *manager = gdk_display_manager_get ();
-  GSList *displays = gdk_display_manager_list_displays (manager);
-  GSList *tmp_list;
-
-  g_signal_handlers_disconnect_by_func (manager,
-					display_opened_cb,
-					info);
-
-  for (tmp_list = displays; tmp_list; tmp_list = tmp_list->next)
-    g_signal_handlers_disconnect_by_func (tmp_list->data,
-					  display_closed_cb,
-					  info);
-  
-  g_slist_free (tmp_list);
-
-  g_object_unref (info->size_group);
-  g_free (info);
-}
-
-static void
-destroy_cb (GtkObject          *object,
-	    ChangeDisplayInfo **info)
-{
-  destroy_info (*info);
-  *info = NULL;
-}
-
-/* Main entry point. If the dialog for this demo doesn't yet exist, creates
- * it. Otherwise, destroys it.
- */
-GtkWidget *
-do_changedisplay (GtkWidget *do_widget)
-{
-  static ChangeDisplayInfo *info = NULL;
-
-  if (!info)
-    {
-      GtkWidget *vbox;
-      GtkWidget *frame;
-
-      info = g_new0 (ChangeDisplayInfo, 1);
-
-      info->window = gtk_dialog_new_with_buttons ("Change Screen or display",
-					    GTK_WINDOW (do_widget), 
-					    GTK_DIALOG_NO_SEPARATOR,
-					    GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
-					    "Change",         GTK_RESPONSE_OK,
-					    NULL);
-
-      gtk_window_set_default_size (GTK_WINDOW (info->window), 300, 400);
-
-      g_signal_connect (info->window, "response",
-			G_CALLBACK (response_cb), info);
-      g_signal_connect (info->window, "destroy",
-			G_CALLBACK (destroy_cb), &info);
-
-      vbox = gtk_vbox_new (FALSE, 5);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-	
-      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (info->window)->vbox), vbox,
-			  TRUE, TRUE, 0);
-
-      frame = create_display_frame (info);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-      
-      frame = create_screen_frame (info);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-
-      initialize_displays (info);
-
-      gtk_widget_show_all (info->window);
-      return info->window;
-    }
-  else
-    {
-      gtk_widget_destroy (info->window);
-      return NULL;
-    }
-}
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -1,137 +0,0 @@
-/* Color Selector
- *
- * GtkColorSelection lets the user choose a color. GtkColorSelectionDialog is
- * a prebuilt dialog containing a GtkColorSelection.
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-static GtkWidget *da;
-static GdkColor color;
-static GtkWidget *frame;
-
-/* Expose callback for the drawing area
- */
-static gboolean
-expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
-  if (widget->window)
-    {
-      GtkStyle *style;
-
-      style = gtk_widget_get_style (widget);
-
-      gdk_draw_rectangle (widget->window,
-                          style->bg_gc[GTK_STATE_NORMAL],
-                          TRUE,
-                          event->area.x, event->area.y,
-                          event->area.width, event->area.height);
-    }
-
-  return TRUE;
-}
-
-static void
-change_color_callback (GtkWidget *button,
-		       gpointer	  data)
-{
-  GtkWidget *dialog;
-  GtkColorSelection *colorsel;
-  gint response;
-  
-  dialog = gtk_color_selection_dialog_new ("Changing color");
-
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
-  
-  colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (dialog)->colorsel);
-
-  gtk_color_selection_set_previous_color (colorsel, &color);
-  gtk_color_selection_set_current_color (colorsel, &color);
-  gtk_color_selection_set_has_palette (colorsel, TRUE);
-  
-  response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-  if (response == GTK_RESPONSE_OK)
-    {
-      gtk_color_selection_get_current_color (colorsel,
-					     &color);
-      
-      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &color);
-    }
-  
-  gtk_widget_destroy (dialog);
-}
-
-GtkWidget *
-do_colorsel (GtkWidget *do_widget)
-{
-  GtkWidget *vbox;
-  GtkWidget *button;
-  GtkWidget *alignment;
-  
-  if (!window)
-    {
-      color.red = 0;
-      color.blue = 65535;
-      color.green = 0;
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Color Selection");
-
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      /*
-       * Create the color swatch area
-       */
-      
-      
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-
-      da = gtk_drawing_area_new ();
-
-      g_signal_connect (da, "expose_event",
-			G_CALLBACK (expose_event_callback), NULL);
-
-      /* set a minimum size */
-      gtk_widget_set_size_request (da, 200, 200);
-      /* set the color */
-      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &color);
-      
-      gtk_container_add (GTK_CONTAINER (frame), da);
-
-      alignment = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
-      
-      button = gtk_button_new_with_mnemonic ("_Change the above color");
-      gtk_container_add (GTK_CONTAINER (alignment), button);
-      
-      gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
-      
-      g_signal_connect (button, "clicked",
-			G_CALLBACK (change_color_callback), NULL);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/demo-common.h
+++ b/demos/gtk-demo/demo-common.h
@@ -1,11 +0,0 @@
-#ifndef __DEMO_COMMON_H__
-#define __DEMO_COMMON_H__
-
-G_BEGIN_DECLS
-
-gchar *demo_find_file (const gchar  *base,
-		       GError      **err);
-
-G_END_DECLS
-
-#endif /* __DEMO_COMMON_H__ */
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -1,180 +0,0 @@
-/* Dialog and Message Boxes
- *
- * Dialog widgets are used to pop up a transient window for user feedback.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-static GtkWidget *entry1 = NULL;
-static GtkWidget *entry2 = NULL;
-
-static void
-message_dialog_clicked (GtkButton *button,
-			gpointer   user_data)
-{
-  GtkWidget *dialog;
-  static gint i = 1;
-
-  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-				   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-				   GTK_MESSAGE_INFO,
-				   GTK_BUTTONS_OK,
-				   "This message box has been popped up the following\n"
-				   "number of times:\n\n"
-				   "%d", i);
-  gtk_dialog_run (GTK_DIALOG (dialog));
-  gtk_widget_destroy (dialog);
-  i++;
-}
-
-static void
-interactive_dialog_clicked (GtkButton *button,
-			    gpointer   user_data)
-{
-  GtkWidget *dialog;
-  GtkWidget *hbox;
-  GtkWidget *stock;
-  GtkWidget *table;
-  GtkWidget *local_entry1;
-  GtkWidget *local_entry2;
-  GtkWidget *label;
-  gint response;
-
-  dialog = gtk_dialog_new_with_buttons ("Interactive Dialog",
-					GTK_WINDOW (window),
-					GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT,
-					GTK_STOCK_OK,
-					GTK_RESPONSE_OK,
-                                        "_Non-stock Button",
-                                        GTK_RESPONSE_CANCEL,
-					NULL);
-
-  hbox = gtk_hbox_new (FALSE, 8);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
-
-  stock = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
-  gtk_box_pack_start (GTK_BOX (hbox), stock, FALSE, FALSE, 0);
-
-  table = gtk_table_new (2, 2, FALSE);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 4);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 4);
-  gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0);
-  label = gtk_label_new_with_mnemonic ("_Entry 1");
-  gtk_table_attach_defaults (GTK_TABLE (table),
-			     label,
-			     0, 1, 0, 1);
-  local_entry1 = gtk_entry_new ();
-  gtk_entry_set_text (GTK_ENTRY (local_entry1), gtk_entry_get_text (GTK_ENTRY (entry1)));
-  gtk_table_attach_defaults (GTK_TABLE (table), local_entry1, 1, 2, 0, 1);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry1);
-
-  label = gtk_label_new_with_mnemonic ("E_ntry 2");
-  gtk_table_attach_defaults (GTK_TABLE (table),
-			     label,
-			     0, 1, 1, 2);
-
-  local_entry2 = gtk_entry_new ();
-  gtk_entry_set_text (GTK_ENTRY (local_entry2), gtk_entry_get_text (GTK_ENTRY (entry2)));
-  gtk_table_attach_defaults (GTK_TABLE (table), local_entry2, 1, 2, 1, 2);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry2);
-  
-  gtk_widget_show_all (hbox);
-  response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-  if (response == GTK_RESPONSE_OK)
-    {
-      gtk_entry_set_text (GTK_ENTRY (entry1), gtk_entry_get_text (GTK_ENTRY (local_entry1)));
-      gtk_entry_set_text (GTK_ENTRY (entry2), gtk_entry_get_text (GTK_ENTRY (local_entry2)));
-    }
-
-  gtk_widget_destroy (dialog);
-}
-
-GtkWidget *
-do_dialog (GtkWidget *do_widget)
-{
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *vbox2;
-  GtkWidget *hbox;
-  GtkWidget *button;
-  GtkWidget *table;
-  GtkWidget *label;
-  
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Dialogs");
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      frame = gtk_frame_new ("Dialogs");
-      gtk_container_add (GTK_CONTAINER (window), frame);
-
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-      gtk_container_add (GTK_CONTAINER (frame), vbox);
-
-      /* Standard message dialog */
-      hbox = gtk_hbox_new (FALSE, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-      button = gtk_button_new_with_mnemonic ("_Message Dialog");
-      g_signal_connect (button, "clicked",
-			G_CALLBACK (message_dialog_clicked), NULL);
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-
-      gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, 0);
-
-      /* Interactive dialog*/
-      hbox = gtk_hbox_new (FALSE, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-      vbox2 = gtk_vbox_new (FALSE, 0);
-
-      button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
-      g_signal_connect (button, "clicked",
-			G_CALLBACK (interactive_dialog_clicked), NULL);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
-
-      table = gtk_table_new (2, 2, FALSE);
-      gtk_table_set_row_spacings (GTK_TABLE (table), 4);
-      gtk_table_set_col_spacings (GTK_TABLE (table), 4);
-      gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0);
-
-      label = gtk_label_new_with_mnemonic ("_Entry 1");
-      gtk_table_attach_defaults (GTK_TABLE (table),
-				 label,
-				 0, 1, 0, 1);
-
-      entry1 = gtk_entry_new ();
-      gtk_table_attach_defaults (GTK_TABLE (table), entry1, 1, 2, 0, 1);
-      gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry1);
-
-      label = gtk_label_new_with_mnemonic ("E_ntry 2");
-      
-      gtk_table_attach_defaults (GTK_TABLE (table),
-				 label,
-				 0, 1, 1, 2);
-
-      entry2 = gtk_entry_new ();
-      gtk_table_attach_defaults (GTK_TABLE (table), entry2, 1, 2, 1, 2);
-      gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry2);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {	 
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -1,322 +0,0 @@
-/* Drawing Area
- *
- * GtkDrawingArea is a blank area where you can draw custom displays
- * of various kinds.
- *
- * This demo has two drawing areas. The checkerboard area shows
- * how you can just draw something; all you have to do is write
- * a signal handler for expose_event, as shown here.
- *
- * The "scribble" area is a bit more advanced, and shows how to handle
- * events such as button presses and mouse motion. Click the mouse
- * and drag in the scribble area to draw squiggles. Resize the window
- * to clear the area.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-/* Pixmap for scribble area, to store current scribbles */
-static GdkPixmap *pixmap = NULL;
-
-/* Create a new pixmap of the appropriate size to store our scribbles */
-static gboolean
-scribble_configure_event (GtkWidget	    *widget,
-			  GdkEventConfigure *event,
-			  gpointer	     data)
-{
-  if (pixmap)
-    g_object_unref (pixmap);
-
-  pixmap = gdk_pixmap_new (widget->window,
-			   widget->allocation.width,
-			   widget->allocation.height,
-			   -1);
-
-  /* Initialize the pixmap to white */
-  gdk_draw_rectangle (pixmap,
-		      widget->style->white_gc,
-		      TRUE,
-		      0, 0,
-		      widget->allocation.width,
-		      widget->allocation.height);
-
-  /* We've handled the configure event, no need for further processing. */
-  return TRUE;
-}
-
-/* Redraw the screen from the pixmap */
-static gboolean
-scribble_expose_event (GtkWidget      *widget,
-		       GdkEventExpose *event,
-		       gpointer	       data)
-{
-  /* We use the "foreground GC" for the widget since it already exists,
-   * but honestly any GC would work. The only thing to worry about
-   * is whether the GC has an inappropriate clip region set.
-   */
-  
-  gdk_draw_drawable (widget->window,
-		     widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-		     pixmap,
-		     /* Only copy the area that was exposed. */
-		     event->area.x, event->area.y,
-		     event->area.x, event->area.y,
-		     event->area.width, event->area.height);
-  
-  return FALSE;
-}
-
-/* Draw a rectangle on the screen */
-static void
-draw_brush (GtkWidget *widget,
-	    gdouble    x,
-	    gdouble    y)
-{
-  GdkRectangle update_rect;
-
-  update_rect.x = x - 3;
-  update_rect.y = y - 3;
-  update_rect.width = 6;
-  update_rect.height = 6;
-
-  /* Paint to the pixmap, where we store our state */
-  gdk_draw_rectangle (pixmap,
-		      widget->style->black_gc,
-		      TRUE,
-		      update_rect.x, update_rect.y,
-		      update_rect.width, update_rect.height);
-
-  /* Now invalidate the affected region of the drawing area. */
-  gdk_window_invalidate_rect (widget->window,
-			      &update_rect,
-			      FALSE);
-}
-
-static gboolean
-scribble_button_press_event (GtkWidget	    *widget,
-			     GdkEventButton *event,
-			     gpointer	     data)
-{
-  if (pixmap == NULL)
-    return FALSE; /* paranoia check, in case we haven't gotten a configure event */
-  
-  if (event->button == 1)
-    draw_brush (widget, event->x, event->y);
-
-  /* We've handled the event, stop processing */
-  return TRUE;
-}
-
-static gboolean
-scribble_motion_notify_event (GtkWidget	     *widget,
-			      GdkEventMotion *event,
-			      gpointer	      data)
-{
-  int x, y;
-  GdkModifierType state;
-
-  if (pixmap == NULL)
-    return FALSE; /* paranoia check, in case we haven't gotten a configure event */
-
-  /* This call is very important; it requests the next motion event.
-   * If you don't call gdk_window_get_pointer() you'll only get
-   * a single motion event. The reason is that we specified
-   * GDK_POINTER_MOTION_HINT_MASK to gtk_widget_set_events().
-   * If we hadn't specified that, we could just use event->x, event->y
-   * as the pointer location. But we'd also get deluged in events.
-   * By requesting the next event as we handle the current one,
-   * we avoid getting a huge number of events faster than we
-   * can cope.
-   */
-  
-  gdk_window_get_pointer (event->window, &x, &y, &state);
-    
-  if (state & GDK_BUTTON1_MASK)
-    draw_brush (widget, x, y);
-
-  /* We've handled it, stop processing */
-  return TRUE;
-}
-
-
-static gboolean
-checkerboard_expose (GtkWidget	    *da,
-		     GdkEventExpose *event,
-		     gpointer	     data)
-{
-  gint i, j, xcount, ycount;
-  GdkGC *gc1, *gc2;
-  GdkColor color;
-  
-#define CHECK_SIZE 10
-#define SPACING 2
-  
-  /* At the start of an expose handler, a clip region of event->area
-   * is set on the window, and event->area has been cleared to the
-   * widget's background color. The docs for
-   * gdk_window_begin_paint_region() give more details on how this
-   * works.
-   */
-
-  /* It would be a bit more efficient to keep these
-   * GC's around instead of recreating on each expose, but
-   * this is the lazy/slow way.
-   */
-  gc1 = gdk_gc_new (da->window);
-  color.red = 30000;
-  color.green = 0;
-  color.blue = 30000;
-  gdk_gc_set_rgb_fg_color (gc1, &color);
-
-  gc2 = gdk_gc_new (da->window);
-  color.red = 65535;
-  color.green = 65535;
-  color.blue = 65535;
-  gdk_gc_set_rgb_fg_color (gc2, &color);
-  
-  xcount = 0;
-  i = SPACING;
-  while (i < da->allocation.width)
-    {
-      j = SPACING;
-      ycount = xcount % 2; /* start with even/odd depending on row */
-      while (j < da->allocation.height)
-	{
-	  GdkGC *gc;
-	  
-	  if (ycount % 2)
-	    gc = gc1;
-	  else
-	    gc = gc2;
-
-	  /* If we're outside event->area, this will do nothing.
-	   * It might be mildly more efficient if we handled
-	   * the clipping ourselves, but again we're feeling lazy.
-	   */
-	  gdk_draw_rectangle (da->window,
-			      gc,
-			      TRUE,
-			      i, j,
-			      CHECK_SIZE,
-			      CHECK_SIZE);
-
-	  j += CHECK_SIZE + SPACING;
-	  ++ycount;
-	}
-
-      i += CHECK_SIZE + SPACING;
-      ++xcount;
-    }
-  
-  g_object_unref (gc1);
-  g_object_unref (gc2);
-  
-  /* return TRUE because we've handled this event, so no
-   * further processing is required.
-   */
-  return TRUE;
-}
-
-GtkWidget *
-do_drawingarea (GtkWidget *do_widget)
-{
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *da;
-  GtkWidget *label;
-  
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Drawing Area");
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      /*
-       * Create the checkerboard area
-       */
-      
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-			    "<u>Checkerboard pattern</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-      
-      da = gtk_drawing_area_new ();
-      /* set a minimum size */
-      gtk_widget_set_size_request (da, 100, 100);
-
-      gtk_container_add (GTK_CONTAINER (frame), da);
-
-      g_signal_connect (da, "expose_event",
-			G_CALLBACK (checkerboard_expose), NULL);
-
-      /*
-       * Create the scribble area
-       */
-      
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-			    "<u>Scribble area</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-      
-      da = gtk_drawing_area_new ();
-      /* set a minimum size */
-      gtk_widget_set_size_request (da, 100, 100);
-
-      gtk_container_add (GTK_CONTAINER (frame), da);
-
-      /* Signals used to handle backing pixmap */
-      
-      g_signal_connect (da, "expose_event",
-			G_CALLBACK (scribble_expose_event), NULL);
-      g_signal_connect (da,"configure_event",
-			G_CALLBACK (scribble_configure_event), NULL);
-      
-      /* Event signals */
-      
-      g_signal_connect (da, "motion_notify_event",
-			G_CALLBACK (scribble_motion_notify_event), NULL);
-      g_signal_connect (da, "button_press_event",
-			G_CALLBACK (scribble_button_press_event), NULL);
-
-
-      /* Ask to receive events the drawing area doesn't normally
-       * subscribe to
-       */
-      gtk_widget_set_events (da, gtk_widget_get_events (da)
-			     | GDK_LEAVE_NOTIFY_MASK
-			     | GDK_BUTTON_PRESS_MASK
-			     | GDK_POINTER_MOTION_MASK
-			     | GDK_POINTER_MOTION_HINT_MASK);
-
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -1,301 +0,0 @@
-/* Tree View/Editable Cells
- *
- * 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.
- *
- */
-
-#include <gtk/gtk.h>
-#include <string.h>
-#include <stdlib.h>
-
-static GtkWidget *window = NULL;
-
-typedef struct
-{
-  gint     number;
-  gchar   *product;
-  gboolean editable;
-}
-Item;
-
-enum
-{
-  COLUMN_NUMBER,
-  COLUMN_PRODUCT,
-  COLUMN_EDITABLE,
-  NUM_COLUMNS
-};
-
-static GArray *articles = NULL;
-
-static void
-add_items (void)
-{
-  Item foo;
-
-  g_return_if_fail (articles != NULL);
-
-  foo.number = 3;
-  foo.product = g_strdup ("bottles of coke");
-  foo.editable = TRUE;
-  g_array_append_vals (articles, &foo, 1);
-
-  foo.number = 5;
-  foo.product = g_strdup ("packages of noodles");
-  foo.editable = TRUE;
-  g_array_append_vals (articles, &foo, 1);
-
-  foo.number = 2;
-  foo.product = g_strdup ("packages of chocolate chip cookies");
-  foo.editable = TRUE;
-  g_array_append_vals (articles, &foo, 1);
-
-  foo.number = 1;
-  foo.product = g_strdup ("can vanilla ice cream");
-  foo.editable = TRUE;
-  g_array_append_vals (articles, &foo, 1);
-
-  foo.number = 6;
-  foo.product = g_strdup ("eggs");
-  foo.editable = TRUE;
-  g_array_append_vals (articles, &foo, 1);
-}
-
-static GtkTreeModel *
-create_model (void)
-{
-  gint i = 0;
-  GtkListStore *model;
-  GtkTreeIter iter;
-
-  /* create array */
-  articles = g_array_sized_new (FALSE, FALSE, sizeof (Item), 1);
-
-  add_items ();
-
-  /* create list store */
-  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++)
-    {
-      gtk_list_store_append (model, &iter);
-
-      gtk_list_store_set (model, &iter,
-			  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 void
-add_item (GtkWidget *button, gpointer data)
-{
-  Item foo;
-  GtkTreeIter iter;
-  GtkTreeModel *model = (GtkTreeModel *)data;
-
-  g_return_if_fail (articles != NULL);
-
-  foo.number = 0;
-  foo.product = g_strdup ("Description here");
-  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_NUMBER, foo.number,
-		      COLUMN_PRODUCT, foo.product,
-		      COLUMN_EDITABLE, foo.editable,
-		      -1);
-}
-
-static void
-remove_item (GtkWidget *widget, gpointer data)
-{
-  GtkTreeIter iter;
-  GtkTreeView *treeview = (GtkTreeView *)data;
-  GtkTreeModel *model = gtk_tree_view_get_model (treeview);
-  GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview);
-
-  if (gtk_tree_selection_get_selected (selection, NULL, &iter))
-    {
-      gint i;
-      GtkTreePath *path;
-
-      path = gtk_tree_model_get_path (model, &iter);
-      i = gtk_tree_path_get_indices (path)[0];
-      gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
-
-      g_array_remove_index (articles, i);
-
-      gtk_tree_path_free (path);
-    }
-}
-
-static void
-cell_edited (GtkCellRendererText *cell,
-	     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"));
-
-  gtk_tree_model_get_iter (model, &iter, path);
-
-  switch (column)
-    {
-    case COLUMN_NUMBER:
-      {
-	gint i;
-
-	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);
-      }
-      break;
-
-    case COLUMN_PRODUCT:
-      {
-	gint i;
-	gchar *old_text;
-
-        gtk_tree_model_get (model, &iter, column, &old_text, -1);
-	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);
-
-	gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
-                            g_array_index (articles, Item, i).product, -1);
-      }
-      break;
-    }
-
-  gtk_tree_path_free (path);
-}
-
-static void
-add_columns (GtkTreeView *treeview)
-{
-  GtkCellRenderer *renderer;
-  GtkTreeModel *model = gtk_tree_view_get_model (treeview);
-
-  /* number column */
-  renderer = gtk_cell_renderer_text_new ();
-  g_signal_connect (renderer, "edited",
-		    G_CALLBACK (cell_edited), model);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_NUMBER);
-
-  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-					       -1, "Number", renderer,
-					       "text", COLUMN_NUMBER,
-					       "editable", COLUMN_EDITABLE,
-					       NULL);
-
-  /* product column */
-  renderer = gtk_cell_renderer_text_new ();
-  g_signal_connect (renderer, "edited",
-		    G_CALLBACK (cell_edited), model);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_PRODUCT);
-
-  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-					       -1, "Product", renderer,
-					       "text", COLUMN_PRODUCT,
-					       "editable", COLUMN_EDITABLE,
-					       NULL);
-}
-
-GtkWidget *
-do_editable_cells (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *vbox;
-      GtkWidget *hbox;
-      GtkWidget *sw;
-      GtkWidget *treeview;
-      GtkWidget *button;
-      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);
-
-      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);
-
-      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 model */
-      model = create_model ();
-
-      /* create tree view */
-      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);
-
-      add_columns (GTK_TREE_VIEW (treeview));
-
-      gtk_container_add (GTK_CONTAINER (sw), treeview);
-
-      /* some buttons */
-      hbox = gtk_hbox_new (TRUE, 4);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-
-      button = gtk_button_new_with_label ("Add item");
-      g_signal_connect (button, "clicked",
-			G_CALLBACK (add_item), 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);
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-
-      gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/floppybuddy.gif
+++ b/demos/gtk-demo/floppybuddy.gif
--- a/demos/gtk-demo/geninclude.pl.in
+++ b/demos/gtk-demo/geninclude.pl.in
@@ -1,163 +0,0 @@
-#!@PERL@ -w
-
-print <<EOT;
-typedef	GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);
-
-typedef struct _Demo Demo;
-
-struct _Demo 
-{
-  gchar *title;
-  gchar *filename;
-  GDoDemoFunc func;
-  Demo *children;
-};
-
-EOT
-
-for $file (@ARGV) {
-    my %demo;
-    
-    ($basename = $file) =~ s/\.c$//;
-
-    open INFO_FILE, $file or die "Cannot open '$file'\n";
-    $title = <INFO_FILE>;
-    $title =~ s@^\s*/\*\s*@@;
-    $title =~ s@\s*$@@;
-
-    close INFO_FILE;
-
-    print "GtkWidget *do_$basename (GtkWidget *do_widget);\n";
-
-    push @demos, {"title" => $title, "file" => $file,
-		  "func"  => "do_$basename"};
-}
-
-# generate a list of 'parent names'
-foreach $href (@demos) {
-    if ($href->{"title"} =~ m|^([\w\s]+)/[\w\s]+$|) {
-	my $parent_name = $1;
-	my $do_next = 0;
-
-	# parent detected
-	if (defined @parents) {
-	    foreach $foo (@parents) {
-		if ($foo eq $parent_name) {
-		    $do_next = 1;
-		}
-	    }
-	    
-	    if ($do_next) {
-		next;
-	    }
-	}
-
-	push @parents, $parent_name;
-
-	$tmp = (defined @child_arrays)?($#child_arrays + 1):0;
-	push @child_arrays, "child$tmp";
-
-	push @demos, {"title" => $parent_name, "file" => "NULL",
-		      "func" => "NULL"};
-    }
-}
-
-if (defined @parents) {
-    $i = 0;
-    for ($i = 0; $i <= $#parents; $i++) {
-	$first = 1;
-	
-	print "\nDemo ", $child_arrays[$i], "[] = {\n";
-	
-	$j = 0;
-	for ($j = 0; $j <= $#demos; $j++) {
-	    $href = $demos[$j];
-	    
-	    if (!defined $demos[$j]) {
-		next;
-	    }
-	    
-	    if ($demos[$j]{"title"} =~ m|^$parents[$i]/([\w\s]+)$|) {
-		if ($first) {
-		    $first = 0;
-		} else {
-		    print ",\n";
-		}
-		
-		print qq (  { "$1", "$demos[$j]{file}", $demos[$j]{func}, NULL });
-
-		# hack ... ugly
-		$demos[$j]{"title"} = "foo";
-	    }
-	}
-
-	print ",\n";
-	print qq (  { NULL } );
-	print "\n};\n";
-    }   
-}
-
-# sort @demos
-@demos_old = @demos;
-
-@demos = sort {
-    $a->{"title"} cmp $b->{"title"};
-} @demos_old;
-
-# sort the child arrays
-if (defined @child_arrays) {
-    for ($i = 0; $i <= $#child_arrays; $i++) {
-	@foo_old = @{$child_arrays[$i]};
-
-	@{$child_arrays[$i]} = sort {
-	    $a->{"title"} cmp $b->{"title"};
-	} @foo_old;
-    }
-}
-
-# toplevel
-print "\nDemo testgtk_demos[] = {\n";
-
-$first = 1;
-foreach $href (@demos) {
-    $handled = 0;
-
-    # ugly evil hack
-    if ($href->{title} eq "foo") {
-	next;
-    }
-
-    if ($first) {
-	$first = 0;
-    } else {
-	print ", \n";
-    }
-
-    if (defined @parents) {
-	for ($i = 0; $i <= $#parents; $i++) {
-	    if ($parents[$i] eq $href->{title}) {
-
-		if ($href->{file} eq 'NULL') {
-		    print qq (  { "$href->{title}", NULL, $href->{func}, $child_arrays[$i] });
-		} else {
-		    print qq (  { "$href->{title}", "$href->{file}", $href->{func}, $child_arrays[$i] });
-		}
-		
-		$handled = 1;
-		last;
-	    }
-	}
-    }
-    
-    if ($handled) {
-	next;
-    }
-    
-    print qq (  { "$href->{title}", "$href->{file}", $href->{func}, NULL });
-}
-
-print ",\n";
-print qq (  { NULL } );
-print "\n};\n";
-
-exit 0;
--- a/demos/gtk-demo/gnome-applets.png
+++ b/demos/gtk-demo/gnome-applets.png
--- a/demos/gtk-demo/gnome-calendar.png
+++ b/demos/gtk-demo/gnome-calendar.png
--- a/demos/gtk-demo/gnome-foot.png
+++ b/demos/gtk-demo/gnome-foot.png
--- a/demos/gtk-demo/gnome-gimp.png
+++ b/demos/gtk-demo/gnome-gimp.png
--- a/demos/gtk-demo/gnome-gmush.png
+++ b/demos/gtk-demo/gnome-gmush.png
--- a/demos/gtk-demo/gnome-gsame.png
+++ b/demos/gtk-demo/gnome-gsame.png
--- a/demos/gtk-demo/gnu-keys.png
+++ b/demos/gtk-demo/gnu-keys.png
--- a/demos/gtk-demo/gtk-logo-rgb.gif
+++ b/demos/gtk-demo/gtk-logo-rgb.gif
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -1,318 +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;
-}
-
-gboolean hovering_over_link = FALSE;
-GdkCursor *hand_cursor = NULL;
-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;
-  GtkTextBuffer *buffer;
-  GtkTextIter iter;
-  gboolean hovering = FALSE;
-
-  buffer = gtk_text_view_get_buffer (text_view);
-
-  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 (G_OBJECT (view), "key-press-event", 
-			G_CALLBACK (key_press_event), NULL);
-      g_signal_connect (G_OBJECT (view), "event-after", 
-			G_CALLBACK (event_after), NULL);
-      g_signal_connect (G_OBJECT (view), "motion-notify-event", 
-			G_CALLBACK (motion_notify_event), NULL);
-      g_signal_connect (G_OBJECT (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;
-}
-
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -1,463 +0,0 @@
-/* Images
- *
- * GtkImage is used to display an image; the image can be in a number of formats.
- * Typically, you load an image into a GdkPixbuf, then display the pixbuf.
- *
- * This demo code shows some of the more obscure cases, in the simple
- * case a call to gtk_image_new_from_file() is all you need.
- *
- * If you want to put image data in your program as a C variable,
- * use the make-inline-pixbuf program that comes with GTK+.
- * This way you won't need to depend on loading external files, your
- * application binary can be self-contained.
- */
-
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <errno.h>
-#include "demo-common.h"
-
-static GtkWidget *window = NULL;
-static GdkPixbufLoader *pixbuf_loader = NULL;
-static guint load_timeout = 0;
-static FILE* image_stream = NULL;
-
-static void
-progressive_prepared_callback (GdkPixbufLoader *loader,
-			       gpointer		data)
-{
-  GdkPixbuf *pixbuf;
-  GtkWidget *image;
-
-  image = GTK_WIDGET (data);
-  
-  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-
-  /* Avoid displaying random memory contents, since the pixbuf
-   * isn't filled in yet.
-   */
-  gdk_pixbuf_fill (pixbuf, 0xaaaaaaff);
-  
-  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
-}
-
-static void
-progressive_updated_callback (GdkPixbufLoader *loader,
-                              gint		   x,
-                              gint		   y,
-                              gint		   width,
-                              gint		   height,
-                              gpointer	   data)
-{
-  GtkWidget *image;
-  
-  image = GTK_WIDGET (data);
-
-  /* We know the pixbuf inside the GtkImage has changed, but the image
-   * itself doesn't know this; so queue a redraw.  If we wanted to be
-   * really efficient, we could use a drawing area or something
-   * instead of a GtkImage, so we could control the exact position of
-   * the pixbuf on the display, then we could queue a draw for only
-   * the updated area of the image.
-   */
-  
-  gtk_widget_queue_draw (image);
-}
-
-static gint
-progressive_timeout (gpointer data)
-{
-  GtkWidget *image;
-
-  image = GTK_WIDGET (data);
-  
-  /* This shows off fully-paranoid error handling, so looks scary.
-   * You could factor out the error handling code into a nice separate
-   * function to make things nicer.
-   */
-  
-  if (image_stream)
-    {
-      size_t bytes_read;
-      guchar buf[256];
-      GError *error = NULL;
-      
-      bytes_read = fread (buf, 1, 256, image_stream);
-
-      if (ferror (image_stream))
-	{
-	  GtkWidget *dialog;
-	  
-	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-					   GTK_DIALOG_DESTROY_WITH_PARENT,
-					   GTK_MESSAGE_ERROR,
-					   GTK_BUTTONS_CLOSE,
-					   "Failure reading image file 'alphatest.png': %s",
-					   g_strerror (errno));
-
-	  g_signal_connect (dialog, "response",
-			    G_CALLBACK (gtk_widget_destroy), NULL);
-
-	  fclose (image_stream);
-	  image_stream = NULL;
-
-	  gtk_widget_show (dialog);
-	  
-	  load_timeout = 0;
-
-	  return FALSE; /* uninstall the timeout */
-	}
-
-      if (!gdk_pixbuf_loader_write (pixbuf_loader,
-				    buf, bytes_read,
-				    &error))
-	{
-	  GtkWidget *dialog;
-	  
-	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-					   GTK_DIALOG_DESTROY_WITH_PARENT,
-					   GTK_MESSAGE_ERROR,
-					   GTK_BUTTONS_CLOSE,
-					   "Failed to load image: %s",
-					   error->message);
-
-	  g_error_free (error);
-	  
-	  g_signal_connect (dialog, "response",
-			    G_CALLBACK (gtk_widget_destroy), NULL);
-
-	  fclose (image_stream);
-	  image_stream = NULL;
-	  
-	  gtk_widget_show (dialog);
-
-	  load_timeout = 0;
-
-	  return FALSE; /* uninstall the timeout */
-	}
-
-      if (feof (image_stream))
-	{
-	  fclose (image_stream);
-	  image_stream = NULL;
-
-	  /* Errors can happen on close, e.g. if the image
-	   * file was truncated we'll know on close that
-	   * it was incomplete.
-	   */
-	  error = NULL;
-	  if (!gdk_pixbuf_loader_close (pixbuf_loader,
-					&error))
-	    {
-	      GtkWidget *dialog;
-	      
-	      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-					       GTK_DIALOG_DESTROY_WITH_PARENT,
-					       GTK_MESSAGE_ERROR,
-					       GTK_BUTTONS_CLOSE,
-					       "Failed to load image: %s",
-					       error->message);
-	      
-	      g_error_free (error);
-	      
-	      g_signal_connect (dialog, "response",
-				G_CALLBACK (gtk_widget_destroy), NULL);
-	      
-	      gtk_widget_show (dialog);
-
-	      g_object_unref (pixbuf_loader);
-	      pixbuf_loader = NULL;
-	      
-	      load_timeout = 0;
-	      
-	      return FALSE; /* uninstall the timeout */
-	    }
-	  
-	  g_object_unref (pixbuf_loader);
-	  pixbuf_loader = NULL;
-	}
-    }
-  else
-    {
-      gchar *filename;
-      gchar *error_message = NULL;
-      GError *error = NULL; 
-
-      /* 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.
-       */
-      filename = demo_find_file ("alphatest.png", &error);
-      if (error)
-	{
-	  error_message = g_strdup (error->message);
-	  g_error_free (error);
-	}
-      else
-	{
-	  image_stream = fopen (filename, "r");
-	  g_free (filename);
-
-	  if (!image_stream)
-	    error_message = g_strdup_printf ("Unable to open image file 'alphatest.png': %s",
-					     g_strerror (errno));
-	}
-
-      if (image_stream == NULL)
-	{
-	  GtkWidget *dialog;
-	  
-	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-					   GTK_DIALOG_DESTROY_WITH_PARENT,
-					   GTK_MESSAGE_ERROR,
-					   GTK_BUTTONS_CLOSE,
-					   "%s", error_message);
-	  g_free (error_message);
-
-	  g_signal_connect (dialog, "response",
-			    G_CALLBACK (gtk_widget_destroy), NULL);
-	  
-	  gtk_widget_show (dialog);
-
-	  load_timeout = 0;
-
-	  return FALSE; /* uninstall the timeout */
-	}
-
-      if (pixbuf_loader)
-	{
-	  gdk_pixbuf_loader_close (pixbuf_loader, NULL);
-	  g_object_unref (pixbuf_loader);
-	  pixbuf_loader = NULL;
-	}
-      
-      pixbuf_loader = gdk_pixbuf_loader_new ();
-      
-      g_signal_connect (pixbuf_loader, "area_prepared",
-			G_CALLBACK (progressive_prepared_callback), image);
-      
-      g_signal_connect (pixbuf_loader, "area_updated",
-			G_CALLBACK (progressive_updated_callback), image);
-    }
-
-  /* leave timeout installed */
-  return TRUE;
-}
-
-static void
-start_progressive_loading (GtkWidget *image)
-{
-  /* This is obviously totally contrived (we slow down loading
-   * on purpose to show how incremental loading works).
-   * The real purpose of incremental loading is the case where
-   * you are reading data from a slow source such as the network.
-   * The timeout simply simulates a slow data source by inserting
-   * pauses in the reading process.
-   */
-  load_timeout = g_timeout_add (150,
-				progressive_timeout,
-				image);
-}
-
-static void
-cleanup_callback (GtkObject *object,
-		  gpointer   data)
-{
-  if (load_timeout)
-    {
-      g_source_remove (load_timeout);
-      load_timeout = 0;
-    }
-  
-  if (pixbuf_loader)
-    {
-      gdk_pixbuf_loader_close (pixbuf_loader, NULL);
-      g_object_unref (pixbuf_loader);
-      pixbuf_loader = NULL;
-    }
-
-  if (image_stream)
-    fclose (image_stream);
-  image_stream = NULL;
-}
-
-static void
-toggle_sensitivity_callback (GtkWidget *togglebutton,
-                             gpointer   user_data)
-{
-  GtkContainer *container = user_data;
-  GList *list;
-  GList *tmp;
-  
-  list = gtk_container_get_children (container);
-
-  tmp = list;
-  while (tmp != NULL)
-    {
-      /* don't disable our toggle */
-      if (GTK_WIDGET (tmp->data) != togglebutton)
-        gtk_widget_set_sensitive (GTK_WIDGET (tmp->data),
-                                  !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton)));
-      
-      tmp = tmp->next;
-    }
-
-  g_list_free (list);
-}
-  
-
-GtkWidget *
-do_images (GtkWidget *do_widget)
-{
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *image;
-  GtkWidget *label;
-  GtkWidget *align;
-  GtkWidget *button;
-  GdkPixbuf *pixbuf;
-  GError *error = NULL;
-  char *filename;
-  
-  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",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (cleanup_callback), NULL);
-
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-			    "<u>Image loaded from a file</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      /* The alignment keeps the frame from growing when users resize
-       * the window
-       */
-      align = gtk_alignment_new (0.5, 0.5, 0, 0);
-      gtk_container_add (GTK_CONTAINER (align), frame);
-      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
-
-      /* 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.
-       */
-      pixbuf = NULL;
-      filename = demo_find_file ("gtk-logo-rgb.gif", &error);
-      if (filename)
-	{
-	  pixbuf = gdk_pixbuf_new_from_file (filename, &error);
-	  g_free (filename);
-	}
-
-      if (error)
-	{
-	  /* This code shows off error handling. You can just use
-	   * gtk_image_new_from_file() instead if you don't want to report
-	   * errors to the user. If the file doesn't load when using
-	   * gtk_image_new_from_file(), a "missing image" icon will
-	   * be displayed instead.
-	   */
-	  GtkWidget *dialog;
-	  
-	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-					   GTK_DIALOG_DESTROY_WITH_PARENT,
-					   GTK_MESSAGE_ERROR,
-					   GTK_BUTTONS_CLOSE,
-					   "Unable to open image file 'gtk-logo-rgb.gif': %s",
-					   error->message);
-	  g_error_free (error);
-	  
-	  g_signal_connect (dialog, "response",
-			    G_CALLBACK (gtk_widget_destroy), NULL);
-	  
-	  gtk_widget_show (dialog);
-	}
-	  
-      image = gtk_image_new_from_pixbuf (pixbuf);
-
-      gtk_container_add (GTK_CONTAINER (frame), image);
-
-
-      /* Animation */
-
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-			    "<u>Animation loaded from a file</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      /* The alignment keeps the frame from growing when users resize
-       * the window
-       */
-      align = gtk_alignment_new (0.5, 0.5, 0, 0);
-      gtk_container_add (GTK_CONTAINER (align), frame);
-      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
-
-      filename = demo_find_file ("floppybuddy.gif", NULL);
-      image = gtk_image_new_from_file (filename);
-      g_free (filename);
-
-      gtk_container_add (GTK_CONTAINER (frame), image);
-      
-
-      /* Progressive */
-      
-      
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-			    "<u>Progressive image loading</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      /* The alignment keeps the frame from growing when users resize
-       * the window
-       */
-      align = gtk_alignment_new (0.5, 0.5, 0, 0);
-      gtk_container_add (GTK_CONTAINER (align), frame);
-      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
-
-      /* Create an empty image for now; the progressive loader
-       * will create the pixbuf and fill it in.
-       */
-      image = gtk_image_new_from_pixbuf (NULL);
-      gtk_container_add (GTK_CONTAINER (frame), image);
-
-      start_progressive_loading (image);
-
-      /* Sensitivity control */
-      button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
-      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
-      g_signal_connect (button, "toggled",
-                        G_CALLBACK (toggle_sensitivity_callback),
-                        vbox);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -1,221 +0,0 @@
-/* Tree View/List Store
- *
- * The GtkListStore is used to store data in list form, to be used
- * later on by a GtkTreeView to display it. This demo builds a
- * simple GtkListStore and displays it. See the Stock Browser
- * demo for a more advanced example.
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-typedef struct
-{
-  const gboolean  fixed;
-  const guint     number;
-  const gchar    *severity;
-  const gchar    *description;
-}
-Bug;
-
-enum
-{
-  COLUMN_FIXED,
-  COLUMN_NUMBER,
-  COLUMN_SEVERITY,
-  COLUMN_DESCRIPTION,
-  NUM_COLUMNS
-};
-
-static Bug data[] =
-{
-  { FALSE, 60482, "Normal",     "scrollable notebooks and hidden tabs" },
-  { FALSE, 60620, "Critical",   "gdk_window_clear_area (gdkwindow-win32.c) is not thread-safe" },
-  { FALSE, 50214, "Major",      "Xft support does not clean up correctly" },
-  { TRUE,  52877, "Major",      "GtkFileSelection needs a refresh method. " },
-  { FALSE, 56070, "Normal",     "Can't click button after setting in sensitive" },
-  { TRUE,  56355, "Normal",     "GtkLabel - Not all changes propagate correctly" },
-  { FALSE, 50055, "Normal",     "Rework width/height computations for TreeView" },
-  { FALSE, 58278, "Normal",     "gtk_dialog_set_response_sensitive () doesn't work" },
-  { FALSE, 55767, "Normal",     "Getters for all setters" },
-  { FALSE, 56925, "Normal",     "Gtkcalender size" },
-  { FALSE, 56221, "Normal",     "Selectable label needs right-click copy menu" },
-  { TRUE,  50939, "Normal",     "Add shift clicking to GtkTextView" },
-  { FALSE, 6112,  "Enhancement","netscape-like collapsable toolbars" },
-  { FALSE, 1,     "Normal",     "First bug :=)" },
-};
-
-static GtkTreeModel *
-create_model (void)
-{
-  gint i = 0;
-  GtkListStore *store;
-  GtkTreeIter iter;
-
-  /* create list store */
-  store = gtk_list_store_new (NUM_COLUMNS,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_UINT,
-			      G_TYPE_STRING,
-			      G_TYPE_STRING);
-
-  /* add data to the list store */
-  for (i = 0; i < G_N_ELEMENTS (data); i++)
-    {
-      gtk_list_store_append (store, &iter);
-      gtk_list_store_set (store, &iter,
-			  COLUMN_FIXED, data[i].fixed,
-			  COLUMN_NUMBER, data[i].number,
-			  COLUMN_SEVERITY, data[i].severity,
-			  COLUMN_DESCRIPTION, data[i].description,
-			  -1);
-    }
-
-  return GTK_TREE_MODEL (store);
-}
-
-static void
-fixed_toggled (GtkCellRendererToggle *cell,
-	       gchar                 *path_str,
-	       gpointer               data)
-{
-  GtkTreeModel *model = (GtkTreeModel *)data;
-  GtkTreeIter  iter;
-  GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
-  gboolean fixed;
-
-  /* get toggled iter */
-  gtk_tree_model_get_iter (model, &iter, path);
-  gtk_tree_model_get (model, &iter, COLUMN_FIXED, &fixed, -1);
-
-  /* do something with the value */
-  fixed ^= 1;
-
-  /* set new value */
-  gtk_list_store_set (GTK_LIST_STORE (model), &iter, COLUMN_FIXED, fixed, -1);
-
-  /* clean up */
-  gtk_tree_path_free (path);
-}
-
-static void
-add_columns (GtkTreeView *treeview)
-{
-  GtkCellRenderer *renderer;
-  GtkTreeViewColumn *column;
-  GtkTreeModel *model = gtk_tree_view_get_model (treeview);
-
-  /* column for fixed toggles */
-  renderer = gtk_cell_renderer_toggle_new ();
-  g_signal_connect (renderer, "toggled",
-		    G_CALLBACK (fixed_toggled), model);
-
-  column = gtk_tree_view_column_new_with_attributes ("Fixed?",
-						     renderer,
-						     "active", COLUMN_FIXED,
-						     NULL);
-
-  /* set this column to a fixed sizing (of 50 pixels) */
-  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
-  gtk_tree_view_append_column (treeview, column);
-
-  /* column for bug numbers */
-  renderer = gtk_cell_renderer_text_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Bug number",
-						     renderer,
-						     "text",
-						     COLUMN_NUMBER,
-						     NULL);
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_NUMBER);
-  gtk_tree_view_append_column (treeview, column);
-
-  /* column for severities */
-  renderer = gtk_cell_renderer_text_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Severity",
-						     renderer,
-						     "text",
-						     COLUMN_SEVERITY,
-						     NULL);
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_SEVERITY);
-  gtk_tree_view_append_column (treeview, column);
-
-  /* column for description */
-  renderer = gtk_cell_renderer_text_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Description",
-						     renderer,
-						     "text",
-						     COLUMN_DESCRIPTION,
-						     NULL);
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_DESCRIPTION);
-  gtk_tree_view_append_column (treeview, column);
-}
-
-GtkWidget *
-do_list_store (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *vbox;
-      GtkWidget *label;
-      GtkWidget *sw;
-      GtkTreeModel *model;
-      GtkWidget *treeview;
-
-      /* create window, etc */
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "GtkListStore demo");
-
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
-      gtk_box_pack_start (GTK_BOX (vbox), label, 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_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
-
-      /* create tree model */
-      model = create_model ();
-
-      /* create tree view */
-      treeview = gtk_tree_view_new_with_model (model);
-      gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
-      gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview),
-				       COLUMN_DESCRIPTION);
-
-      g_object_unref (model);
-
-      gtk_container_add (GTK_CONTAINER (sw), treeview);
-
-      /* add columns to the tree view */
-      add_columns (GTK_TREE_VIEW (treeview));
-
-      /* finish & show */
-      gtk_window_set_default_size (GTK_WINDOW (window), 280, 250);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -1,906 +0,0 @@
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.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
-};
-
-typedef struct _CallbackData CallbackData;
-struct _CallbackData
-{
-  GtkTreeModel *model;
-  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
- * @err:  location to store error, or %NULL.
- * 
- * Looks for @base first in the current directory, then in the
- * location GTK+ where it will be installed on make install,
- * returns the first file found.
- * 
- * Return value: the filename, if found or %NULL
- **/
-gchar *
-demo_find_file (const char *base,
-		GError    **err)
-{
-  g_return_val_if_fail (err == NULL || *err == NULL, NULL);
-  
-  if (g_file_test ("gtk-logo-rgb.gif", G_FILE_TEST_EXISTS) &&
-      g_file_test (base, G_FILE_TEST_EXISTS))
-    return g_strdup (base);
-  else
-    {
-      char *filename = g_build_filename (DEMOCODEDIR, base, NULL);
-      if (!g_file_test (filename, G_FILE_TEST_EXISTS))
-	{
-	  g_set_error (err, G_FILE_ERROR, G_FILE_ERROR_NOENT,
-		       "Cannot find demo data file \"%s\"", base);
-	  g_free (filename);
-	  return NULL;
-	}
-      return filename;
-    }
-}
-
-static void
-window_closed_cb (GtkWidget *window, gpointer data)
-{
-  CallbackData *cbdata = data;
-  GtkTreeIter iter;
-  gboolean italic;
-
-  gtk_tree_model_get_iter (cbdata->model, &iter, cbdata->path);
-  gtk_tree_model_get (GTK_TREE_MODEL (cbdata->model), &iter,
-		      ITALIC_COLUMN, &italic,
-		      -1);
-  if (italic)
-    gtk_tree_store_set (GTK_TREE_STORE (cbdata->model), &iter,
-			ITALIC_COLUMN, !italic,
-			-1);
-
-  gtk_tree_path_free (cbdata->path);
-  g_free (cbdata);
-}
-
-gboolean
-read_line (FILE *stream, GString *str)
-{
-  int n_read = 0;
-  
-#ifdef HAVE_FLOCKFILE
-  flockfile (stream);
-#endif
-
-  g_string_truncate (str, 0);
-  
-  while (1)
-    {
-      int c;
-      
-#ifndef G_OS_WIN32
-      c = getc_unlocked (stream);
-#else
-      c = getc (stream);
-#endif
-
-      if (c == EOF)
-	goto done;
-      else
-	n_read++;
-
-      switch (c)
-	{
-	case '\r':
-	case '\n':
-	  {
-#ifdef HAVE_FLOCKFILE
-	    int next_c = getc_unlocked (stream);
-#else
-	    int next_c = getc (stream);
-#endif
-	    
-	    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:
-
-#ifdef HAVE_FLOCKFILE
-  funlockfile (stream);
-#endif
-
-  return n_read > 0;
-}
-
-
-/* Stupid syntax highlighting.
- *
- * No regex was used in the making of this highlighting.
- * It should only work for simple cases.  This is good, as
- * that's all we should have in the demos.
- */
-/* This code should not be used elsewhere, except perhaps as an example of how
- * to iterate through a text buffer.
- */
-enum {
-  STATE_NORMAL,
-  STATE_IN_COMMENT
-};
-
-static gchar *tokens[] =
-{
-  "/*",
-  "\"",
-  NULL
-};
-
-static gchar *types[] =
-{
-  "static",
-  "const ",
-  "void",
-  "gint",
-  "int ",
-  "char ",
-  "gchar ",
-  "gfloat",
-  "float",
-  "gint8",
-  "gint16",
-  "gint32",
-  "guint",
-  "guint8",
-  "guint16",
-  "guint32",
-  "guchar",
-  "glong",
-  "gboolean" ,
-  "gshort",
-  "gushort",
-  "gulong",
-  "gdouble",
-  "gldouble",
-  "gpointer",
-  "NULL",
-  "GList",
-  "GSList",
-  "FALSE",
-  "TRUE",
-  "FILE ",
-  "GtkObject ",
-  "GtkColorSelection ",
-  "GtkWidget ",
-  "GtkButton ",
-  "GdkColor ",
-  "GdkRectangle ",
-  "GdkEventExpose ",
-  "GdkGC ",
-  "GdkPixbufLoader ",
-  "GdkPixbuf ",
-  "GError",
-  "size_t",
-  NULL
-};
-
-static gchar *control[] =
-{
-  " if ",
-  " while ",
-  " else",
-  " do ",
-  " for ",
-  "?",
-  ":",
-  "return ",
-  "goto ",
-  NULL
-};
-void
-parse_chars (gchar     *text,
-	     gchar    **end_ptr,
-	     gint      *state,
-	     gchar    **tag,
-	     gboolean   start)
-{
-  gint i;
-  gchar *next_token;
-
-  /* Handle comments first */
-  if (*state == STATE_IN_COMMENT)
-    {
-      *end_ptr = strstr (text, "*/");
-      if (*end_ptr)
-	{
-	  *end_ptr += 2;
-	  *state = STATE_NORMAL;
-	  *tag = "comment";
-	}
-      return;
-    }
-
-  *tag = NULL;
-  *end_ptr = NULL;
-
-  /* check for comment */
-  if (!strncmp (text, "/*", 2))
-    {
-      *end_ptr = strstr (text, "*/");
-      if (*end_ptr)
-	*end_ptr += 2;
-      else
-	*state = STATE_IN_COMMENT;
-      *tag = "comment";
-      return;
-    }
-
-  /* check for preprocessor defines */
-  if (*text == '#' && start)
-    {
-      *end_ptr = NULL;
-      *tag = "preprocessor";
-      return;
-    }
-
-  /* functions */
-  if (start && * text != '\t' && *text != ' ' && *text != '{' && *text != '}')
-    {
-      if (strstr (text, "("))
-	{
-	  *end_ptr = strstr (text, "(");
-	  *tag = "function";
-	  return;
-	}
-    }
-  /* check for types */
-  for (i = 0; types[i] != NULL; i++)
-    if (!strncmp (text, types[i], strlen (types[i])))
-      {
-	*end_ptr = text + strlen (types[i]);
-	*tag = "type";
-	return;
-      }
-
-  /* check for control */
-  for (i = 0; control[i] != NULL; i++)
-    if (!strncmp (text, control[i], strlen (control[i])))
-      {
-	*end_ptr = text + strlen (control[i]);
-	*tag = "control";
-	return;
-      }
-
-  /* check for string */
-  if (text[0] == '"')
-    {
-      gint maybe_escape = FALSE;
-
-      *end_ptr = text + 1;
-      *tag = "string";
-      while (**end_ptr != '\000')
-	{
-	  if (**end_ptr == '\"' && !maybe_escape)
-	    {
-	      *end_ptr += 1;
-	      return;
-	    }
-	  if (**end_ptr == '\\')
-	    maybe_escape = TRUE;
-	  else
-	    maybe_escape = FALSE;
-	  *end_ptr += 1;
-	}
-      return;
-    }
-
-  /* not at the start of a tag.  Find the next one. */
-  for (i = 0; tokens[i] != NULL; i++)
-    {
-      next_token = strstr (text, tokens[i]);
-      if (next_token)
-	{
-	  if (*end_ptr)
-	    *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-	  else
-	    *end_ptr = next_token;
-	}
-    }
-
-  for (i = 0; types[i] != NULL; i++)
-    {
-      next_token = strstr (text, types[i]);
-      if (next_token)
-	{
-	  if (*end_ptr)
-	    *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-	  else
-	    *end_ptr = next_token;
-	}
-    }
-
-  for (i = 0; control[i] != NULL; i++)
-    {
-      next_token = strstr (text, control[i]);
-      if (next_token)
-	{
-	  if (*end_ptr)
-	    *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-	  else
-	    *end_ptr = next_token;
-	}
-    }
-}
-
-/* While not as cool as c-mode, this will do as a quick attempt at highlighting */
-static void
-fontify ()
-{
-  GtkTextIter start_iter, next_iter, tmp_iter;
-  gint state;
-  gchar *text;
-  gchar *start_ptr, *end_ptr;
-  gchar *tag;
-
-  state = STATE_NORMAL;
-
-  gtk_text_buffer_get_iter_at_offset (source_buffer, &start_iter, 0);
-
-  next_iter = start_iter;
-  while (gtk_text_iter_forward_line (&next_iter))
-    {
-      gboolean start = TRUE;
-      start_ptr = text = gtk_text_iter_get_text (&start_iter, &next_iter);
-
-      do
-	{
-	  parse_chars (start_ptr, &end_ptr, &state, &tag, start);
-
-	  start = FALSE;
-	  if (end_ptr)
-	    {
-	      tmp_iter = start_iter;
-	      gtk_text_iter_forward_chars (&tmp_iter, end_ptr - start_ptr);
-	    }
-	  else
-	    {
-	      tmp_iter = next_iter;
-	    }
-	  if (tag)
-	    gtk_text_buffer_apply_tag_by_name (source_buffer, tag, &start_iter, &tmp_iter);
-
-	  start_iter = tmp_iter;
-	  start_ptr = end_ptr;
-	}
-      while (end_ptr);
-
-      g_free (text);
-      start_iter = next_iter;
-    }
-}
-
-void
-load_file (const gchar *filename)
-{
-  FILE *file;
-  GtkTextIter start, end;
-  char *full_filename;
-  GError *err = NULL;
-  GString *buffer = g_string_new (NULL);
-  int state = 0;
-  gboolean in_para = 0;
-
-  if (current_file && !strcmp (current_file, filename))
-    {
-      g_string_free (buffer, TRUE);
-      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);
-
-  full_filename = demo_find_file (filename, &err);
-  if (!full_filename)
-    {
-      g_warning ("%s", err->message);
-      g_error_free (err);
-      return;
-    }
-
-  file = fopen (full_filename, "r");
-
-  if (!file)
-    g_warning ("Cannot open %s: %s\n", full_filename, g_strerror (errno));
-
-  g_free (full_filename);
-
-  if (!file)
-    return;
-
-  gtk_text_buffer_get_iter_at_offset (info_buffer, &start, 0);
-  while (read_line (file, buffer))
-    {
-      gchar *p = buffer->str;
-      gchar *q;
-      gchar *r;
-      
-      switch (state)
-	{
-	case 0:
-	  /* Reading title */
-	  while (*p == '/' || *p == '*' || g_ascii_isspace (*p))
-	    p++;
-	  r = p;
-	  while (*r != '/' && strlen (r))
-	    r++;
-	  if (strlen (r) > 0)
-	    p = r + 1;
-	  q = p + strlen (p);
-	  while (q > p && g_ascii_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 (g_ascii_isspace (*p))
-	    p++;
-	  if (*p == '*' && *(p + 1) == '/')
-	    {
-	      gtk_text_buffer_get_iter_at_offset (source_buffer, &start, 0);
-	      state++;
-	    }
-	  else
-	    {
-	      int len;
-	      
-	      while (*p == '*' || g_ascii_isspace (*p))
-		p++;
-
-	      len = strlen (p);
-	      while (g_ascii_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 (g_ascii_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 (source_buffer, &start, "\n", 1);
-	  break;
-	}
-    }
-
-  fontify ();
-
-  g_string_free (buffer, TRUE);
-}
-
-void
-row_activated_cb (GtkTreeView       *tree_view,
-                  GtkTreePath       *path,
-		  GtkTreeViewColumn *column)
-{
-  GtkTreeIter iter;
-  gboolean italic;
-  GDoDemoFunc func;
-  GtkWidget *window;
-  GtkTreeModel *model;
-
-  model = gtk_tree_view_get_model (tree_view);
-  
-  gtk_tree_model_get_iter (model, &iter, path);
-  gtk_tree_model_get (GTK_TREE_MODEL (model),
-		      &iter,
-		      FUNC_COLUMN, &func,
-		      ITALIC_COLUMN, &italic,
-		      -1);
-
-  if (func)
-    {
-      gtk_tree_store_set (GTK_TREE_STORE (model),
-			  &iter,
-			  ITALIC_COLUMN, !italic,
-			  -1);
-      window = (func) (gtk_widget_get_toplevel (GTK_WIDGET (tree_view)));
-      
-      if (window != NULL)
-	{
-	  CallbackData *cbdata;
-	  
-	  cbdata = g_new (CallbackData, 1);
-	  cbdata->model = model;
-	  cbdata->path = gtk_tree_path_copy (path);
-	  
-	  g_signal_connect (window, "destroy",
-			    G_CALLBACK (window_closed_cb), cbdata);
-	}
-    }
-}
-
-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);
-  if (g_value_get_string (&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 ();
-  
-  *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);
-
-  gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
-  
-  if (is_source)
-    {
-      font_desc = pango_font_description_from_string ("Courier 12");
-      gtk_widget_modify_font (text_view, font_desc);
-      pango_font_description_free (font_desc);
-
-      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view),
-                                   GTK_WRAP_NONE);
-    }
-  else
-    {
-      /* Make it a bit nicer for text. */
-      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view),
-                                   GTK_WRAP_WORD);
-      gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (text_view),
-                                            2);
-      gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (text_view),
-                                            2);
-    }
-  
-  return scrolled_window;
-}
-
-static GtkWidget *
-create_tree (void)
-{
-  GtkTreeSelection *selection;
-  GtkCellRenderer *cell;
-  GtkWidget *tree_view;
-  GtkTreeViewColumn *column;
-  GtkTreeStore *model;
-  GtkTreeIter iter;
-
-  Demo *d = testgtk_demos;
-
-  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));
-
-  gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection),
-			       GTK_SELECTION_BROWSE);
-  gtk_widget_set_size_request (tree_view, 200, -1);
-
-  /* this code only supports 1 level of children. If we
-   * want more we probably have to use a recursing function.
-   */
-  while (d->title)
-    {
-      Demo *children = d->children;
-
-      gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
-
-      gtk_tree_store_set (GTK_TREE_STORE (model),
-			  &iter,
-			  TITLE_COLUMN, d->title,
-			  FILENAME_COLUMN, d->filename,
-			  FUNC_COLUMN, d->func,
-			  ITALIC_COLUMN, FALSE,
-			  -1);
-
-      d++;
-
-      if (!children)
-	continue;
-      
-      while (children->title)
-	{
-	  GtkTreeIter child_iter;
-
-	  gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter);
-	  
-	  gtk_tree_store_set (GTK_TREE_STORE (model),
-			      &child_iter,
-			      TITLE_COLUMN, children->title,
-			      FILENAME_COLUMN, children->filename,
-			      FUNC_COLUMN, children->func,
-			      ITALIC_COLUMN, FALSE,
-			      -1);
-	  
-	  children++;
-	}
-    }
-
-  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_set", ITALIC_COLUMN,
-						     NULL);
-  
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
-			       GTK_TREE_VIEW_COLUMN (column));
-
-  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_expand_all (GTK_TREE_VIEW (tree_view));
-  return tree_view;
-}
-
-static void
-setup_default_icon (void)
-{
-  GdkPixbuf *pixbuf;
-  char *filename;
-  GError *err;
-
-  err = NULL;
-
-  pixbuf = NULL;
-  filename = demo_find_file ("gtk-logo-rgb.gif", &err);
-  if (filename)
-    {
-      pixbuf = gdk_pixbuf_new_from_file (filename, &err);
-      g_free (filename);
-    }
-
-  /* Ignoring this error (passing NULL instead of &err above)
-   * would probably be reasonable for most apps.  We're just
-   * showing off.
-   */
-  if (err)
-    {
-      GtkWidget *dialog;
-      
-      dialog = gtk_message_dialog_new (NULL, 0,
-				       GTK_MESSAGE_ERROR,
-				       GTK_BUTTONS_CLOSE,
-				       "Failed to read icon file: %s",
-				       err->message);
-      g_error_free (err);
-
-      g_signal_connect (dialog, "response",
-			G_CALLBACK (gtk_widget_destroy), NULL);
-    }
-
-  if (pixbuf)
-    {
-      GList *list;      
-      GdkPixbuf *transparent;
-
-      /* The gtk-logo-rgb icon has a white background, make it transparent */
-      transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
-
-      list = NULL;
-      list = g_list_append (list, transparent);
-      gtk_window_set_default_icon_list (list);
-      g_list_free (list);
-      g_object_unref (pixbuf);
-      g_object_unref (transparent);
-    }
-}
-
-int
-main (int argc, char **argv)
-{
-  GtkWidget *window;
-  GtkWidget *notebook;
-  GtkWidget *hbox;
-  GtkWidget *tree;
-  GtkTextTag *tag;
-
-  /* Most code in gtk-demo is intended to be exemplary, but not
-   * these few lines, which are just a hack so gtk-demo will work
-   * in the GTK tree without installing it.
-   */
-  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);
-    }
-  /* -- End of hack -- */
-  
-  gtk_init (&argc, &argv);
-
-  setup_default_icon ();
-  
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "GTK+ Code Demos");
-  g_signal_connect (window, "destroy",
-		    G_CALLBACK (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_with_mnemonic ("_Info"));
-
-  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", "red",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "type",
-				    "foreground", "ForestGreen",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "string",
-				    "foreground", "RosyBrown",
-				    "weight", PANGO_WEIGHT_BOLD,
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "control",
-				    "foreground", "purple",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "preprocessor",
-				    "style", PANGO_STYLE_OBLIQUE,
- 				    "foreground", "burlywood4",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "function",
-				    "weight", PANGO_WEIGHT_BOLD,
- 				    "foreground", "DarkGoldenrod4",
-                                    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;
-}
--- a/demos/gtk-demo/makefile.msc.in
+++ b/demos/gtk-demo/makefile.msc.in
@@ -1,80 +0,0 @@
-## Makefile for building the gtk test apps with Microsoft C
-## Use: nmake -f makefile.msc
-
-## There is no install target, you have to decide where and 
-## how to install for yourself.
-
-TOP = ..\..\..
-!INCLUDE $(TOP)/glib/build/win32/make.msc
-
-!IFNDEF PERL
-PERL = perl
-!ENDIF
-
-################################################################
-
-# Possibly override versions from build/win32/module.defs
-GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
-GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@
-
-GDK_LIBS = ../../gdk/gdk-win32-$(GTK_VER).lib
-GTK_LIBS = ../../gtk/gtk-win32-$(GTK_VER).lib
-GDK_PIXBUF_LIBS = ../../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
-
-INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ../.. -I ../../gdk -I ../../gdk-pixbuf -I ../../gtk
-DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS)
-LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
-DEFINES = -DG_LOG_DOMAIN=\"GtkDemo\" -DGTK_VERSION=\"$(GTK_VER)\" \
-	-DDEMOCODEDIR=\".\"
-
-TOUCH = copy makefile.msc+nul
-
-all :	\
-	demos.h \
-	gtk-demo.exe
-
-## 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	\
-	button_box.c	\
-	colorsel.c	\
-	dialog.c	\
-	drawingarea.c	\
-	editable_cells.c \
-	images.c	\
-	item_factory.c	\
-	list_store.c	\
-	menus.c		\
-	panes.c		\
-	pixbufs.c	\
-	sizegroup.c	\
-	stock_browser.c	\
-	textview.c	\
-	tree_store.c	\
-
-demos.h: $(DEMOS) geninclude.pl
-	$(PERL) geninclude.pl $(DEMOS) > demos.h
-
-OBJECTS = \
-	appwindow.obj	\
-	button_box.obj	\
-	colorsel.obj	\
-	dialog.obj	\
-	drawingarea.obj	\
-	editable_cells.obj \
-	images.obj	\
-	item_factory.obj	\
-	list_store.obj	\
-	menus.obj		\
-	panes.obj		\
-	pixbufs.obj	\
-	sizegroup.obj	\
-	stock_browser.obj	\
-	textview.obj	\
-	tree_store.obj	\
-	main.obj \
-
-gtk-demo.exe : demos.h $(OBJECTS)
-	$(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -1,154 +0,0 @@
-/* Menus
- *
- * There are several widgets involved in displaying menus. The
- * 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
- * which is a check menu item that's in a mutually exclusive group,
- * GtkSeparatorMenuItem which is a separator bar, GtkTearoffMenuItem
- * which allows a GtkMenu to be torn off, and GtkImageMenuItem which
- * can place a GtkImage or other widget next to the menu text.
- *
- * A GtkMenuItem can have a submenu, which is simply a GtkMenu to pop
- * 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
- * and menus; while you can construct menus manually, most people don't
- * do that. There's a separate demo for GtkUIManager.
- * 
- */
-
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#include <stdio.h>
-
-static GtkWidget *
-create_menu (gint     depth,
-	     gboolean tearoff)
-{
-  GtkWidget *menu;
-  GtkWidget *menuitem;
-  GSList *group;
-  char buf[32];
-  int i, j;
-
-  if (depth < 1)
-    return NULL;
-
-  menu = gtk_menu_new ();
-  group = NULL;
-
-  if (tearoff)
-    {
-      menuitem = gtk_tearoff_menu_item_new ();
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-      gtk_widget_show (menuitem);
-    }
-
-  for (i = 0, j = 1; i < 5; i++, j++)
-    {
-      sprintf (buf, "item %2d - %d", depth, j);
-      menuitem = gtk_radio_menu_item_new_with_label (group, buf);
-      group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-      gtk_widget_show (menuitem);
-      if (i == 3)
-	gtk_widget_set_sensitive (menuitem, FALSE);
-
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (depth - 1, TRUE));
-    }
-
-  return menu;
-}
-
-GtkWidget *
-do_menus (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *box1;
-  GtkWidget *box2;
-  GtkWidget *button;
-  
-  if (!window)
-    {
-      GtkWidget *menubar;
-      GtkWidget *menu;
-      GtkWidget *menuitem;
-      GtkAccelGroup *accel_group;
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_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);
-      
-      accel_group = gtk_accel_group_new ();
-      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-
-      gtk_window_set_title (GTK_WINDOW (window), "menus");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-      
-      
-      box1 = gtk_vbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
-      gtk_widget_show (box1);
-      
-      menubar = gtk_menu_bar_new ();
-      gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE, 0);
-      gtk_widget_show (menubar);
-      
-      menu = create_menu (2, TRUE);
-      
-      menuitem = gtk_menu_item_new_with_label ("test\nline2");
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
-      gtk_widget_show (menuitem);
-      
-      menuitem = gtk_menu_item_new_with_label ("foo");
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (3, TRUE));
-      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
-      gtk_widget_show (menuitem);
-
-      menuitem = gtk_menu_item_new_with_label ("bar");
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4, TRUE));
-      gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
-      gtk_widget_show (menuitem);
-      
-      box2 = gtk_vbox_new (FALSE, 10);
-      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
-      gtk_widget_show (box2);
-
-      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 (button);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -1,194 +0,0 @@
-/* Paned Widgets
- *
- * The GtkHPaned and GtkVPaned Widgets divide their content
- * area into two panes with a divider in between that the
- * user can adjust. A separate child is placed into each
- * pane.
- *
- * There are a number of options that can be set for each pane.
- * This test contains both a horizontal (HPaned) and a vertical
- * (VPaned) widget, and allows you to adjust the options for
- * each side of each widget.
- */
-
-#include <gtk/gtk.h>
-
-void
-toggle_resize (GtkWidget *widget,
-	       GtkWidget *child)
-{
-  GtkPaned *paned = GTK_PANED (child->parent);
-  gboolean is_child1 = (child == paned->child1);
-  gboolean resize, shrink;
-
-  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
-  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
-
-  gtk_widget_ref (child);
-  gtk_container_remove (GTK_CONTAINER (child->parent), child);
-  if (is_child1)
-    gtk_paned_pack1 (paned, child, !resize, shrink);
-  else
-    gtk_paned_pack2 (paned, child, !resize, shrink);
-  gtk_widget_unref (child);
-}
-
-void
-toggle_shrink (GtkWidget *widget,
-	       GtkWidget *child)
-{
-  GtkPaned *paned = GTK_PANED (child->parent);
-  gboolean is_child1 = (child == paned->child1);
-  gboolean resize, shrink;
-
-  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
-  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
-
-  gtk_widget_ref (child);
-  gtk_container_remove (GTK_CONTAINER (child->parent), child);
-  if (is_child1)
-    gtk_paned_pack1 (paned, child, resize, !shrink);
-  else
-    gtk_paned_pack2 (paned, child, resize, !shrink);
-  gtk_widget_unref (child);
-}
-
-GtkWidget *
-create_pane_options (GtkPaned	 *paned,
-		     const gchar *frame_label,
-		     const gchar *label1,
-		     const gchar *label2)
-{
-  GtkWidget *frame;
-  GtkWidget *table;
-  GtkWidget *label;
-  GtkWidget *check_button;
-  
-  frame = gtk_frame_new (frame_label);
-  gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
-  
-  table = gtk_table_new (3, 2, TRUE);
-  gtk_container_add (GTK_CONTAINER (frame), table);
-  
-  label = gtk_label_new (label1);
-  gtk_table_attach_defaults (GTK_TABLE (table), label,
-			     0, 1, 0, 1);
-  
-  check_button = gtk_check_button_new_with_mnemonic ("_Resize");
-  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
-			     0, 1, 1, 2);
-  g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_resize), paned->child1);
-  
-  check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
-  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
-			     0, 1, 2, 3);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
-			       TRUE);
-  g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_shrink), paned->child1);
-  
-  label = gtk_label_new (label2);
-  gtk_table_attach_defaults (GTK_TABLE (table), label,
-			     1, 2, 0, 1);
-  
-  check_button = gtk_check_button_new_with_mnemonic ("_Resize");
-  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
-			     1, 2, 1, 2);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
-			       TRUE);
-  g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_resize), paned->child2);
-  
-  check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
-  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
-			     1, 2, 2, 3);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
-			       TRUE);
-  g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_shrink), paned->child2);
-
-  return frame;
-}
-
-GtkWidget *
-do_panes (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *frame;
-  GtkWidget *hpaned;
-  GtkWidget *vpaned;
-  GtkWidget *button;
-  GtkWidget *vbox;
-
-  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);
-
-      gtk_window_set_title (GTK_WINDOW (window), "Panes");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
-      vbox = gtk_vbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-      
-      vpaned = gtk_vpaned_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
-
-      hpaned = gtk_hpaned_new ();
-      gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_size_request (frame, 60, 60);
-      gtk_paned_add1 (GTK_PANED (hpaned), frame);
-      
-      button = gtk_button_new_with_mnemonic ("_Hi there");
-      gtk_container_add (GTK_CONTAINER(frame), button);
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_size_request (frame, 80, 60);
-      gtk_paned_add2 (GTK_PANED (hpaned), frame);
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_size_request (frame, 60, 80);
-      gtk_paned_add2 (GTK_PANED (vpaned), frame);
-
-      /* Now create toggle buttons to control sizing */
-
-      gtk_box_pack_start (GTK_BOX (vbox),
-			  create_pane_options (GTK_PANED (hpaned),
-					       "Horizontal",
-					       "Left",
-					       "Right"),
-			  FALSE, FALSE, 0);
-
-      gtk_box_pack_start (GTK_BOX (vbox),
-			  create_pane_options (GTK_PANED (vpaned),
-					       "Vertical",
-					       "Top",
-					       "Bottom"),
-			  FALSE, FALSE, 0);
-
-      gtk_widget_show_all (vbox);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/pixbufs.c
+++ b/demos/gtk-demo/pixbufs.c
@@ -1,271 +0,0 @@
-/* Pixbufs
- *
- * A GdkPixbuf represents an image, normally in RGB or RGBA format.
- * Pixbufs are normally used to load files from disk and perform
- * image scaling.
- *
- * This demo is not all that educational, but looks cool. It was written
- * by Extreme Pixbuf Hacker Federico Mena Quintero. It also shows
- * off how to use GtkDrawingArea to do a simple animation.
- *
- * Look at the Image demo for additional pixbuf usage examples.
- *
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include <math.h>
-
-#include "demo-common.h"
-
-#define FRAME_DELAY 50
-
-#define BACKGROUND_NAME "background.jpg"
-
-static const char *image_names[] = {
-  "apple-red.png",
-  "gnome-applets.png",
-  "gnome-calendar.png",
-  "gnome-foot.png",
-  "gnome-gmush.png",
-  "gnome-gimp.png",
-  "gnome-gsame.png",
-  "gnu-keys.png"
-};
-
-#define N_IMAGES G_N_ELEMENTS (image_names)
-
-/* demo window */
-static GtkWidget *window = NULL;
-
-/* Current frame */
-static GdkPixbuf *frame;
-
-/* Background image */
-static GdkPixbuf *background;
-static gint back_width, back_height;
-
-/* Images */
-static GdkPixbuf *images[N_IMAGES];
-
-/* Widgets */
-static GtkWidget *da;
-
-/* Loads the images for the demo and returns whether the operation succeeded */
-static gboolean
-load_pixbufs (GError **error)
-{
-  gint i;
-  char *filename;
-
-  if (background)
-    return TRUE; /* already loaded earlier */
-
-  /* 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.
-   */
-  filename = demo_find_file (BACKGROUND_NAME, error);
-  if (!filename)
-    return FALSE; /* note that "error" was filled in and returned */
-
-  background = gdk_pixbuf_new_from_file (filename, error);
-  g_free (filename);
-  
-  if (!background)
-    return FALSE; /* Note that "error" was filled with a GError */
-
-  back_width = gdk_pixbuf_get_width (background);
-  back_height = gdk_pixbuf_get_height (background);
-
-  for (i = 0; i < N_IMAGES; i++)
-    {
-      filename = demo_find_file (image_names[i], error);
-      if (!filename)
-	return FALSE; /* Note that "error" was filled with a GError */
-      
-      images[i] = gdk_pixbuf_new_from_file (filename, error);
-      g_free (filename);
-      
-      if (!images[i])
-	return FALSE; /* Note that "error" was filled with a GError */
-    }
-
-  return TRUE;
-}
-
-/* Expose callback for the drawing area */
-static gint
-expose_cb (GtkWidget	  *widget,
-	   GdkEventExpose *event,
-	   gpointer	   data)
-{
-  guchar *pixels;
-  int rowstride;
-
-  rowstride = gdk_pixbuf_get_rowstride (frame);
-
-  pixels = gdk_pixbuf_get_pixels (frame) + rowstride * event->area.y + event->area.x * 3;
-
-  gdk_draw_rgb_image_dithalign (widget->window,
-				widget->style->black_gc,
-				event->area.x, event->area.y,
-				event->area.width, event->area.height,
-				GDK_RGB_DITHER_NORMAL,
-				pixels, rowstride,
-				event->area.x, event->area.y);
-
-  return TRUE;
-}
-
-#define CYCLE_LEN 60
-
-static int frame_num;
-
-/* Timeout handler to regenerate the frame */
-static gint
-timeout (gpointer data)
-{
-  double f;
-  int i;
-  double xmid, ymid;
-  double radius;
-
-  gdk_pixbuf_copy_area (background, 0, 0, back_width, back_height,
-			frame, 0, 0);
-
-  f = (double) (frame_num % CYCLE_LEN) / CYCLE_LEN;
-
-  xmid = back_width / 2.0;
-  ymid = back_height / 2.0;
-
-  radius = MIN (xmid, ymid) / 2.0;
-
-  for (i = 0; i < N_IMAGES; i++)
-    {
-      double ang;
-      int xpos, ypos;
-      int iw, ih;
-      double r;
-      GdkRectangle r1, r2, dest;
-      double k;
-
-      ang = 2.0 * G_PI * (double) i / N_IMAGES - f * 2.0 * G_PI;
-
-      iw = gdk_pixbuf_get_width (images[i]);
-      ih = gdk_pixbuf_get_height (images[i]);
-
-      r = radius + (radius / 3.0) * sin (f * 2.0 * G_PI);
-
-      xpos = floor (xmid + r * cos (ang) - iw / 2.0 + 0.5);
-      ypos = floor (ymid + r * sin (ang) - ih / 2.0 + 0.5);
-
-      k = (i & 1) ? sin (f * 2.0 * G_PI) : cos (f * 2.0 * G_PI);
-      k = 2.0 * k * k;
-      k = MAX (0.25, k);
-
-      r1.x = xpos;
-      r1.y = ypos;
-      r1.width = iw * k;
-      r1.height = ih * k;
-
-      r2.x = 0;
-      r2.y = 0;
-      r2.width = back_width;
-      r2.height = back_height;
-
-      if (gdk_rectangle_intersect (&r1, &r2, &dest))
-	gdk_pixbuf_composite (images[i],
-			      frame,
-			      dest.x, dest.y,
-			      dest.width, dest.height,
-			      xpos, ypos,
-			      k, k,
-			      GDK_INTERP_NEAREST,
-			      ((i & 1)
-			       ? MAX (127, fabs (255 * sin (f * 2.0 * G_PI)))
-			       : MAX (127, fabs (255 * cos (f * 2.0 * G_PI)))));
-    }
-
-  gtk_widget_queue_draw (da);
-
-  frame_num++;
-  return TRUE;
-}
-
-static guint timeout_id;
-
-static void
-cleanup_callback (GtkObject *object,
-		  gpointer   data)
-{
-  g_source_remove (timeout_id);
-  timeout_id = 0;
-}
-
-GtkWidget *
-do_pixbufs (GtkWidget *do_widget)
-{
-  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);
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-      g_signal_connect (window, "destroy", G_CALLBACK (cleanup_callback), 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
-	{
-	  gtk_widget_set_size_request (window, back_width, back_height);
-
-	  frame = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, back_width, back_height);
-
-	  da = gtk_drawing_area_new ();
-
-	  g_signal_connect (da, "expose_event",
-			    G_CALLBACK (expose_cb), NULL);
-
-	  gtk_container_add (GTK_CONTAINER (window), da);
-
-	  timeout_id = g_timeout_add (FRAME_DELAY, timeout, NULL);
-	}
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -1,167 +0,0 @@
-/* Size Groups
- *
- * GtkSizeGroup provides a mechanism for grouping a number of
- * widgets together so they all request the same amount of space.
- * This is typically useful when you want a column of widgets to 
- * have the same size, but you can't use a GtkTable widget.
- * 
- * Note that size groups only affect the amount of space requested,
- * not the size that the widgets finally receive. If you want the
- * widgets in a GtkSizeGroup to actually be the same size, you need
- * to pack them in such a way that they get the size they request
- * and not more. For example, if you are packing your widgets
- * into a table, you would not include the GTK_FILL flag.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-/* Convenience function to create a combo box holding a number of strings
- */
-GtkWidget *
-create_combo_box (const char **strings)
-{
-  GtkWidget *combo_box;
-  const char **str;
-
-  combo_box = gtk_combo_box_new_text ();
-  
-  for (str = strings; *str; str++)
-    gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), *str);
-
-  gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
-
-  return combo_box;
-}
-
-static void
-add_row (GtkTable     *table,
-	 int           row,
-	 GtkSizeGroup *size_group,
-	 const char   *label_text,
-	 const char  **options)
-{
-  GtkWidget *combo_box;
-  GtkWidget *label;
-
-  label = gtk_label_new_with_mnemonic (label_text);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 1);
-  gtk_table_attach (GTK_TABLE (table), label,
-		    0, 1,                  row, row + 1,
-		    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,
-		    1, 2,                  row, row + 1,
-		    0,                     0,
-		    0,                     0);
-}
-
-static void
-toggle_grouping (GtkToggleButton *check_button,
-		 GtkSizeGroup    *size_group)
-{
-  GtkSizeGroupMode new_mode;
-
-  /* GTK_SIZE_GROUP_NONE is not generally useful, but is useful
-   * here to show the effect of GTK_SIZE_GROUP_HORIZONTAL by
-   * contrast.
-   */
-  if (gtk_toggle_button_get_active (check_button))
-    new_mode = GTK_SIZE_GROUP_HORIZONTAL;
-  else
-    new_mode = GTK_SIZE_GROUP_NONE;
-  
-  gtk_size_group_set_mode (size_group, new_mode);
-}
-
-GtkWidget *
-do_sizegroup (GtkWidget *do_widget)
-{
-  GtkWidget *table;
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *check_button;
-  GtkSizeGroup *size_group;
-
-  static const char *color_options[] = {
-    "Red", "Green", "Blue", NULL
-  };
-  
-  static const char *dash_options[] = {
-    "Solid", "Dashed", "Dotted", NULL
-  };
-  
-  static const char *end_options[] = {
-    "Square", "Round", "Arrow", NULL
-  };
-  
-  if (!window)
-    {
-      window = gtk_dialog_new_with_buttons ("GtkSizeGroup",
-					    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);
-
-      size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-      
-      /* Create one frame holding color options
-       */
-      frame = gtk_frame_new ("Color Options");
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-
-      table = gtk_table_new (2, 2, FALSE);
-      gtk_container_set_border_width (GTK_CONTAINER (table), 5);
-      gtk_table_set_row_spacings (GTK_TABLE (table), 5);
-      gtk_table_set_col_spacings (GTK_TABLE (table), 10);
-      gtk_container_add (GTK_CONTAINER (frame), table);
-
-      add_row (GTK_TABLE (table), 0, size_group, "_Foreground", color_options);
-      add_row (GTK_TABLE (table), 1, size_group, "_Background", color_options);
-
-      /* And another frame holding line style options
-       */
-      frame = gtk_frame_new ("Line Options");
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-
-      table = gtk_table_new (2, 2, FALSE);
-      gtk_container_set_border_width (GTK_CONTAINER (table), 5);
-      gtk_table_set_row_spacings (GTK_TABLE (table), 5);
-      gtk_table_set_col_spacings (GTK_TABLE (table), 10);
-      gtk_container_add (GTK_CONTAINER (frame), table);
-
-      add_row (GTK_TABLE (table), 0, size_group, "_Dashing", dash_options);
-      add_row (GTK_TABLE (table), 1, size_group, "_Line ends", end_options);
-
-      /* And a check button to turn grouping on and off */
-      check_button = gtk_check_button_new_with_mnemonic ("_Enable grouping");
-      gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE, FALSE, 0);
-      
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
-      g_signal_connect (check_button, "toggled",
-			G_CALLBACK (toggle_grouping), size_group);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/stock_browser.c
+++ b/demos/gtk-demo/stock_browser.c
@@ -1,546 +0,0 @@
-/* Stock Item and Icon Browser
- *
- * This source code for this demo doesn't demonstrate anything
- * particularly useful in applications. The purpose of the "demo" is
- * just to provide a handy place to browse the available stock icons
- * and stock items.
- */
-
-#include <string.h>
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-typedef struct _StockItemInfo StockItemInfo;
-struct _StockItemInfo
-{
-  gchar *id;
-  GtkStockItem item;
-  GdkPixbuf *small_icon;
-  gchar *macro;
-  gchar *accel_str;
-};
-
-/* Make StockItemInfo a boxed type so we can automatically
- * manage memory
- */
-#define STOCK_ITEM_INFO_TYPE stock_item_info_get_type ()
-
-static void
-stock_item_info_free (StockItemInfo *info)
-{
-  g_free (info->id);
-  g_free (info->macro);
-  g_free (info->accel_str);
-  if (info->small_icon)
-    g_object_unref (info->small_icon);
-  
-  g_free (info);
-}
-
-static StockItemInfo*
-stock_item_info_copy (StockItemInfo *src)
-{
-  StockItemInfo *info;
-
-  info = g_new (StockItemInfo, 1);
-  info->id = g_strdup (src->id);
-  info->macro = g_strdup (src->macro);
-  info->accel_str = g_strdup (src->accel_str);
-  
-  info->item = src->item;
-
-  info->small_icon = src->small_icon;
-  if (info->small_icon)
-    g_object_ref (info->small_icon);
-
-  return info;
-}
-
-static GType
-stock_item_info_get_type (void)
-{
-  static GType our_type = 0;
-  
-  if (our_type == 0)
-    our_type = g_boxed_type_register_static ("StockItemInfo",
-                                             (GBoxedCopyFunc) stock_item_info_copy,
-                                             (GBoxedFreeFunc) stock_item_info_free);
-
-  return our_type;
-}
-
-typedef struct _StockItemDisplay StockItemDisplay;
-struct _StockItemDisplay
-{
-  GtkWidget *type_label;
-  GtkWidget *macro_label;
-  GtkWidget *id_label;
-  GtkWidget *label_accel_label;
-  GtkWidget *icon_image;
-};
-
-static gchar*
-id_to_macro (const gchar *id)
-{
-  GString *macro = NULL;
-  const gchar *cp;
-
-  /* gtk-foo-bar -> GTK_STOCK_FOO_BAR */
-
-  macro = g_string_new (NULL);
-  
-  cp = id;
-  
-  if (strncmp (cp, "gtk-", 4) == 0)
-    {
-      g_string_append (macro, "GTK_STOCK_");
-      cp += 4;
-    }
-
-  while (*cp)
-    {
-      if (*cp == '-')
-	g_string_append_c (macro, '_');
-      else if (g_ascii_islower (*cp))
-	g_string_append_c (macro, g_ascii_toupper (*cp));
-      else
-	g_string_append_c (macro, *cp);
-
-      cp++;
-    }
-
-  return g_string_free (macro, FALSE);
-}
-
-static GtkTreeModel*
-create_model (void)
-{
-  GtkListStore *store;
-  GSList *ids;
-  GSList *tmp_list;
-  
-  store = gtk_list_store_new (2, STOCK_ITEM_INFO_TYPE, G_TYPE_STRING);
-
-  ids = gtk_stock_list_ids ();
-  ids = g_slist_sort (ids, (GCompareFunc) strcmp);
-  tmp_list = ids;
-  while (tmp_list != NULL)
-    {
-      StockItemInfo info;
-      GtkStockItem item;
-      GtkTreeIter iter;
-      GtkIconSet *icon_set;
-      
-      info.id = tmp_list->data;
-      
-      if (gtk_stock_lookup (info.id, &item))
-        {
-          info.item = item;
-        }
-      else
-        {
-          info.item.label = NULL;
-          info.item.stock_id = NULL;
-          info.item.modifier = 0;
-          info.item.keyval = 0;
-          info.item.translation_domain = NULL;
-        }
-
-      /* only show icons for stock IDs that have default icons */
-      icon_set = gtk_icon_factory_lookup_default (info.id);
-      if (icon_set)
-        {
-          GtkIconSize *sizes = NULL;
-          gint n_sizes = 0;
-          gint i;
-          GtkIconSize size;
-
-          /* See what sizes this stock icon really exists at */
-          gtk_icon_set_get_sizes (icon_set, &sizes, &n_sizes);
-
-          /* Use menu size if it exists, otherwise first size found */
-          size = sizes[0];
-          i = 0;
-          while (i < n_sizes)
-            {
-              if (sizes[i] == GTK_ICON_SIZE_MENU)
-                {
-                  size = GTK_ICON_SIZE_MENU;
-                  break;
-                }
-              ++i;
-            }
-          g_free (sizes);
-          
-          info.small_icon = gtk_widget_render_icon (window, info.id,
-                                                    size,
-                                                    NULL);
-          
-          if (size != GTK_ICON_SIZE_MENU)
-            {
-              /* Make the result the proper size for our thumbnail */
-              gint w, h;
-              GdkPixbuf *scaled;
-              
-              gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
-              
-              scaled = gdk_pixbuf_scale_simple (info.small_icon,
-                                                w, h,
-                                                GDK_INTERP_BILINEAR);
-
-              g_object_unref (info.small_icon);
-              info.small_icon = scaled;
-            }
-        }
-      else
-        info.small_icon = NULL;
-
-      if (info.item.keyval != 0)
-        {
-          info.accel_str = gtk_accelerator_name (info.item.keyval,
-                                                 info.item.modifier);
-        }
-      else
-        {
-          info.accel_str = g_strdup ("");
-        }
-
-      info.macro = id_to_macro (info.id);
-      
-      gtk_list_store_append (store, &iter);
-      gtk_list_store_set (store, &iter, 0, &info, 1, info.id, -1);
-
-      g_free (info.macro);
-      g_free (info.accel_str);
-      if (info.small_icon)
-        g_object_unref (info.small_icon);
-      
-      tmp_list = g_slist_next (tmp_list);
-    }
-  
-  g_slist_foreach (ids, (GFunc)g_free, NULL);
-  g_slist_free (ids);
-
-  return GTK_TREE_MODEL (store);
-}
-
-/* Finds the largest size at which the given image stock id is
- * available. This would not be useful for a normal application
- */
-static GtkIconSize
-get_largest_size (const char *id)
-{
-  GtkIconSet *set = gtk_icon_factory_lookup_default (id);
-  GtkIconSize *sizes;
-  gint n_sizes, i;
-  GtkIconSize best_size = GTK_ICON_SIZE_INVALID;
-  gint best_pixels = 0;
-
-  gtk_icon_set_get_sizes (set, &sizes, &n_sizes);
-
-  for (i = 0; i < n_sizes; i++)
-    {
-      gint width, height;
-      
-      gtk_icon_size_lookup (sizes[i], &width, &height);
-
-      if (width * height > best_pixels)
-	{
-	  best_size = sizes[i];
-	  best_pixels = width * height;
-	}
-    }
-  
-  g_free (sizes);
-
-  return best_size;
-}
-
-static void
-selection_changed (GtkTreeSelection *selection)
-{
-  GtkTreeView *treeview;
-  StockItemDisplay *display;
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-  
-  treeview = gtk_tree_selection_get_tree_view (selection);
-  display = g_object_get_data (G_OBJECT (treeview), "stock-display");
-
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    {
-      StockItemInfo *info;
-      gchar *str;
-      
-      gtk_tree_model_get (model, &iter,
-                          0, &info,
-                          -1);
-
-      if (info->small_icon && info->item.label)
-        gtk_label_set_text (GTK_LABEL (display->type_label), "Icon and Item");
-      else if (info->small_icon)
-        gtk_label_set_text (GTK_LABEL (display->type_label), "Icon Only");
-      else if (info->item.label)
-        gtk_label_set_text (GTK_LABEL (display->type_label), "Item Only");
-      else
-        gtk_label_set_text (GTK_LABEL (display->type_label), "???????");
-
-      gtk_label_set_text (GTK_LABEL (display->macro_label), info->macro);
-      gtk_label_set_text (GTK_LABEL (display->id_label), info->id);
-
-      if (info->item.label)
-        {
-          str = g_strdup_printf ("%s %s", info->item.label, info->accel_str);
-          gtk_label_set_text_with_mnemonic (GTK_LABEL (display->label_accel_label), str);
-          g_free (str);
-        }
-      else
-        {
-          gtk_label_set_text (GTK_LABEL (display->label_accel_label), "");
-        }
-
-      if (info->small_icon)
-        gtk_image_set_from_stock (GTK_IMAGE (display->icon_image), info->id,
-                                  get_largest_size (info->id));
-      else
-        gtk_image_set_from_pixbuf (GTK_IMAGE (display->icon_image), NULL);
-
-      stock_item_info_free (info);
-    }
-  else
-    {
-      gtk_label_set_text (GTK_LABEL (display->type_label), "No selected item");
-      gtk_label_set_text (GTK_LABEL (display->macro_label), "");
-      gtk_label_set_text (GTK_LABEL (display->id_label), "");
-      gtk_label_set_text (GTK_LABEL (display->label_accel_label), "");
-      gtk_image_set_from_pixbuf (GTK_IMAGE (display->icon_image), NULL);
-    }
-}
-
-static void
-macro_set_func_text (GtkTreeViewColumn *tree_column,
-		     GtkCellRenderer   *cell,
-		     GtkTreeModel      *model,
-		     GtkTreeIter       *iter,
-		     gpointer           data)
-{
-  StockItemInfo *info;
-  
-  gtk_tree_model_get (model, iter,
-                      0, &info,
-                      -1);
-  
-  g_object_set (GTK_CELL_RENDERER (cell),
-                "text", info->macro,
-                NULL);
-  
-  stock_item_info_free (info);
-}
-
-static void
-id_set_func (GtkTreeViewColumn *tree_column,
-             GtkCellRenderer   *cell,
-             GtkTreeModel      *model,
-             GtkTreeIter       *iter,
-             gpointer           data)
-{
-  StockItemInfo *info;
-  
-  gtk_tree_model_get (model, iter,
-                      0, &info,
-                      -1);
-  
-  g_object_set (GTK_CELL_RENDERER (cell),
-                "text", info->id,
-                NULL);
-  
-  stock_item_info_free (info);
-}
-
-static void
-accel_set_func (GtkTreeViewColumn *tree_column,
-                GtkCellRenderer   *cell,
-                GtkTreeModel      *model,
-                GtkTreeIter       *iter,
-                gpointer           data)
-{
-  StockItemInfo *info;
-  
-  gtk_tree_model_get (model, iter,
-                      0, &info,
-                      -1);
-  
-  g_object_set (GTK_CELL_RENDERER (cell),
-                "text", info->accel_str,
-                NULL);
-  
-  stock_item_info_free (info);
-}
-
-static void
-label_set_func (GtkTreeViewColumn *tree_column,
-                GtkCellRenderer   *cell,
-                GtkTreeModel      *model,
-                GtkTreeIter       *iter,
-                gpointer           data)
-{
-  StockItemInfo *info;
-  
-  gtk_tree_model_get (model, iter,
-                      0, &info,
-                      -1);
-  
-  g_object_set (GTK_CELL_RENDERER (cell),
-                "text", info->item.label,
-                NULL);
-  
-  stock_item_info_free (info);
-}
-
-GtkWidget *
-do_stock_browser (GtkWidget *do_widget)
-{  
-  if (!window)
-    {
-      GtkWidget *frame;
-      GtkWidget *vbox;
-      GtkWidget *hbox;
-      GtkWidget *sw;
-      GtkWidget *treeview;
-      GtkWidget *align;
-      GtkTreeModel *model;
-      GtkCellRenderer *cell_renderer;
-      StockItemDisplay *display;
-      GtkTreeSelection *selection;
-      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);
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      hbox = gtk_hbox_new (FALSE, 8);
-      gtk_container_add (GTK_CONTAINER (window), hbox);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_NEVER,
-                                      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE, FALSE, 0);
-
-      model = create_model ();
-      
-      treeview = gtk_tree_view_new_with_model (model);
-
-      g_object_unref (model);
-
-      gtk_container_add (GTK_CONTAINER (sw), treeview);
-      
-      column = gtk_tree_view_column_new ();
-      gtk_tree_view_column_set_title (column, "Macro");
-
-      cell_renderer = gtk_cell_renderer_pixbuf_new ();
-      gtk_tree_view_column_pack_start (column,
-				       cell_renderer,
-				       FALSE);
-      gtk_tree_view_column_set_attributes (column, cell_renderer,
-					   "stock_id", 1, NULL);
-      cell_renderer = gtk_cell_renderer_text_new ();
-      gtk_tree_view_column_pack_start (column,
-				       cell_renderer,
-				       TRUE);
-      gtk_tree_view_column_set_cell_data_func (column, cell_renderer,
-					       macro_set_func_text, NULL, NULL);
-
-      gtk_tree_view_append_column (GTK_TREE_VIEW (treeview),
-				   column);
-
-      cell_renderer = gtk_cell_renderer_text_new ();
-      gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (treeview),
-                                                  -1,
-                                                  "Label",
-                                                  cell_renderer,
-                                                  label_set_func,
-                                                  NULL,
-                                                  NULL);
-
-      cell_renderer = gtk_cell_renderer_text_new ();
-      gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (treeview),
-                                                  -1,
-                                                  "Accel",
-                                                  cell_renderer,
-                                                  accel_set_func,
-                                                  NULL,
-                                                  NULL);
-
-      cell_renderer = gtk_cell_renderer_text_new ();
-      gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (treeview),
-                                                  -1,
-                                                  "ID",
-                                                  cell_renderer,
-                                                  id_set_func,
-                                                  NULL,
-                                                  NULL);
-      
-      align = gtk_alignment_new (0.5, 0.0, 0.0, 0.0);
-      gtk_box_pack_end (GTK_BOX (hbox), align, FALSE, FALSE, 0);
-      
-      frame = gtk_frame_new ("Selected Item");
-      gtk_container_add (GTK_CONTAINER (align), frame);
-
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
-      gtk_container_add (GTK_CONTAINER (frame), vbox);
-
-      display = g_new (StockItemDisplay, 1);
-      g_object_set_data_full (G_OBJECT (treeview),
-                              "stock-display",
-                              display,
-                              g_free); /* free display with treeview */
-      
-      display->type_label = gtk_label_new (NULL);
-      display->macro_label = gtk_label_new (NULL);
-      display->id_label = gtk_label_new (NULL);
-      display->label_accel_label = gtk_label_new (NULL);
-      display->icon_image = gtk_image_new_from_pixbuf (NULL); /* empty image */
-
-      gtk_box_pack_start (GTK_BOX (vbox), display->type_label,
-                          FALSE, FALSE, 0);
-
-      gtk_box_pack_start (GTK_BOX (vbox), display->icon_image,
-                          FALSE, FALSE, 0);
-      
-      gtk_box_pack_start (GTK_BOX (vbox), display->label_accel_label,
-                          FALSE, FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), display->macro_label,
-                          FALSE, FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), display->id_label,
-                          FALSE, FALSE, 0);
-
-      selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
-      gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-      
-      g_signal_connect (selection,
-			"changed",
-			G_CALLBACK (selection_changed),
-			NULL);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {	 
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -1,596 +0,0 @@
-/* Text Widget/Multiple Views
- *
- * The GtkTextView widget displays a GtkTextBuffer. One GtkTextBuffer
- * can be displayed by multiple GtkTextViews. This demo has two views
- * displaying a single buffer, and shows off the widget's text
- * formatting features.
- *
- */
-
-#include <gtk/gtk.h>
-#include <stdlib.h> /* for exit() */
-
-#include "demo-common.h"
-
-static void easter_egg_callback (GtkWidget *button, gpointer data);
-
-#define gray50_width 2
-#define gray50_height 2
-static char gray50_bits[] = {
-  0x02, 0x01
-};
-
-static void
-create_tags (GtkTextBuffer *buffer)
-{
-  GdkBitmap *stipple;
-
-  /* Create a bunch of tags. Note that it's also possible to
-   * create tags with gtk_text_tag_new() then add them to the
-   * tag table for the buffer, gtk_text_buffer_create_tag() is
-   * just a convenience function. Also note that you don't have
-   * to give tags a name; pass NULL for the name to create an
-   * anonymous tag.
-   *
-   * In any real app, another useful optimization would be to create
-   * a GtkTextTagTable in advance, and reuse the same tag table for
-   * all the buffers with the same tag set, instead of creating
-   * new copies of the same tags for every buffer.
-   *
-   * Tags are assigned default priorities in order of addition to the
-   * tag table.	 That is, tags created later that affect the same text
-   * property affected by an earlier tag will override the earlier
-   * tag.  You can modify tag priorities with
-   * gtk_text_tag_set_priority().
-   */
-
-  gtk_text_buffer_create_tag (buffer, "heading",
-			      "weight", PANGO_WEIGHT_BOLD,
-			      "size", 15 * PANGO_SCALE,
-			      NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "italic",
-			      "style", PANGO_STYLE_ITALIC, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "bold",
-			      "weight", PANGO_WEIGHT_BOLD, NULL);  
-  
-  gtk_text_buffer_create_tag (buffer, "big",
-			      /* points times the PANGO_SCALE factor */
-			      "size", 20 * PANGO_SCALE, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "xx-small",
-			      "scale", PANGO_SCALE_XX_SMALL, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "x-large",
-			      "scale", PANGO_SCALE_X_LARGE, NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "monospace",
-			      "family", "monospace", NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "blue_foreground",
-			      "foreground", "blue", NULL);  
-
-  gtk_text_buffer_create_tag (buffer, "red_background",
-			      "background", "red", NULL);
-
-  stipple = gdk_bitmap_create_from_data (NULL,
-					 gray50_bits, gray50_width,
-					 gray50_height);
-  
-  gtk_text_buffer_create_tag (buffer, "background_stipple",
-			      "background_stipple", stipple, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "foreground_stipple",
-			      "foreground_stipple", stipple, NULL);
-
-  g_object_unref (stipple);
-
-  gtk_text_buffer_create_tag (buffer, "big_gap_before_line",
-			      "pixels_above_lines", 30, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "big_gap_after_line",
-			      "pixels_below_lines", 30, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "double_spaced_line",
-			      "pixels_inside_wrap", 10, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "not_editable",
-			      "editable", FALSE, NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "word_wrap",
-			      "wrap_mode", GTK_WRAP_WORD, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "char_wrap",
-			      "wrap_mode", GTK_WRAP_CHAR, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "no_wrap",
-			      "wrap_mode", GTK_WRAP_NONE, NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "center",
-			      "justification", GTK_JUSTIFY_CENTER, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "right_justify",
-			      "justification", GTK_JUSTIFY_RIGHT, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "wide_margins",
-			      "left_margin", 50, "right_margin", 50,
-			      NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "strikethrough",
-			      "strikethrough", TRUE, NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "underline",
-			      "underline", PANGO_UNDERLINE_SINGLE, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "double_underline",
-			      "underline", PANGO_UNDERLINE_DOUBLE, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "superscript",
-			      "rise", 10 * PANGO_SCALE,	  /* 10 pixels */
-			      "size", 8 * PANGO_SCALE,	  /* 8 points */
-			      NULL);
-  
-  gtk_text_buffer_create_tag (buffer, "subscript",
-			      "rise", -10 * PANGO_SCALE,   /* 10 pixels */
-			      "size", 8 * PANGO_SCALE,	   /* 8 points */
-			      NULL);
-
-  gtk_text_buffer_create_tag (buffer, "rtl_quote",
-			      "wrap_mode", GTK_WRAP_WORD,
-			      "direction", GTK_TEXT_DIR_RTL,
-			      "indent", 30,
-			      "left_margin", 20,
-			      "right_margin", 20,
-			      NULL);
-}
-
-static void
-insert_text (GtkTextBuffer *buffer)
-{
-  GtkTextIter iter;
-  GtkTextIter start, end;
-  GdkPixbuf *pixbuf;
-  GdkPixbuf *scaled;
-  GtkTextChildAnchor *anchor;
-  char *filename;
-
-  /* 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.
-   */
-  pixbuf = NULL;
-  filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
-  if (filename)
-    {
-      pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-      g_free (filename);
-    }
-
-  if (pixbuf == NULL)
-    {
-      g_printerr ("Failed to load image file gtk-logo-rgb.gif\n");
-      exit (1);
-    }
-
-  scaled = gdk_pixbuf_scale_simple (pixbuf, 32, 32, GDK_INTERP_BILINEAR);
-  g_object_unref (pixbuf);
-  pixbuf = scaled;
-  
-  /* get start of buffer; each insertion will revalidate the
-   * iterator to point to just after the inserted text.
-   */
-  gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
-
-  gtk_text_buffer_insert (buffer, &iter, "The text widget can display text with all kinds of nifty attributes. It also supports multiple views of the same buffer; this demo is showing the same buffer in two places.\n\n", -1);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Font styles. ", -1,
-					    "heading", NULL);
-  
-  gtk_text_buffer_insert (buffer, &iter, "For example, you can have ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "italic", -1,
-					    "italic", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "bold", -1,
-					    "bold", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", or ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "monospace (typewriter)", -1,
-					    "monospace", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", or ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "big", -1,
-					    "big", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " text. ", -1);
-  gtk_text_buffer_insert (buffer, &iter, "It's best not to hardcode specific text sizes; you can use relative sizes as with CSS, such as ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "xx-small", -1,
-					    "xx-small", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " or ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "x-large", -1,
-					    "x-large", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " to ensure that your program properly adapts if the user changes the default font size.\n\n", -1);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Colors. ", -1,
-					    "heading", NULL);
-  
-  gtk_text_buffer_insert (buffer, &iter, "Colors such as ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a blue foreground", -1,
-					    "blue_foreground", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " or ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a red background", -1,
-					    "red_background", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " or even ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a stippled red background", -1,
-					    "red_background",
-					    "background_stipple",
-					    NULL);
-
-  gtk_text_buffer_insert (buffer, &iter, " or ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a stippled blue foreground on solid red background", -1,
-					    "blue_foreground",
-					    "red_background",
-					    "foreground_stipple",
-					    NULL);
-  gtk_text_buffer_insert (buffer, &iter, " (select that to read it) can be used.\n\n", -1);  
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Underline, strikethrough, and rise. ", -1,
-					    "heading", NULL);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "Strikethrough", -1,
-					    "strikethrough", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "underline", -1,
-					    "underline", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "double underline", -1, 
-					    "double_underline", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "superscript", -1,
-					    "superscript", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", and ", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "subscript", -1,
-					    "subscript", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " are all supported.\n\n", -1);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Images. ", -1,
-					    "heading", NULL);
-  
-  gtk_text_buffer_insert (buffer, &iter, "The buffer can have images in it: ", -1);
-  gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
-  gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
-  gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
-  gtk_text_buffer_insert (buffer, &iter, " for example.\n\n", -1);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Spacing. ", -1,
-					    "heading", NULL);
-
-  gtk_text_buffer_insert (buffer, &iter, "You can adjust the amount of space before each line.\n", -1);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line has a whole lot of space before it.\n", -1,
-					    "big_gap_before_line", "wide_margins", NULL);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "You can also adjust the amount of space after each line; this line has a whole lot of space after it.\n", -1,
-					    "big_gap_after_line", "wide_margins", NULL);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "You can also adjust the amount of space between wrapped lines; this line has extra space between each wrapped line in the same paragraph. To show off wrapping, some filler text: the quick brown fox jumped over the lazy dog. Blah blah blah blah blah blah blah blah blah.\n", -1,
-					    "double_spaced_line", "wide_margins", NULL);
-
-  gtk_text_buffer_insert (buffer, &iter, "Also note that those lines have extra-wide margins.\n\n", -1);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Editability. ", -1,
-					    "heading", NULL);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line is 'locked down' and can't be edited by the user - just try it! You can't delete this line.\n\n", -1,
-					    "not_editable", NULL);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Wrapping. ", -1,
-					    "heading", NULL);
-
-  gtk_text_buffer_insert (buffer, &iter,
-			  "This line (and most of the others in this buffer) is word-wrapped, using the proper Unicode algorithm. Word wrap should work in all scripts and languages that GTK+ supports. Let's make this a long paragraph to demonstrate: blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah\n\n", -1);  
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line has character-based wrapping, and can wrap between any two character glyphs. Let's make this a long paragraph to demonstrate: blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah\n\n", -1,
-					    "char_wrap", NULL);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line has all wrapping turned off, so it makes the horizontal scrollbar appear.\n\n\n", -1,
-					    "no_wrap", NULL);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Justification. ", -1,
-					    "heading", NULL);  
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "\nThis line has center justification.\n", -1,
-					    "center", NULL);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line has right justification.\n", -1,
-					    "right_justify", NULL);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "\nThis line has big wide margins. Text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text.\n", -1,
-					    "wide_margins", NULL);  
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Internationalization. ", -1,
-					    "heading", NULL);
-	  
-  gtk_text_buffer_insert (buffer, &iter,
-			  "You can put all sorts of Unicode text in the buffer.\n\nGerman (Deutsch S\303\274d) Gr\303\274\303\237 Gott\nGreek (\316\225\316\273\316\273\316\267\316\275\316\271\316\272\316\254) \316\223\316\265\316\271\316\254 \317\203\316\261\317\202\nHebrew	\327\251\327\234\327\225\327\235\nJapanese (\346\227\245\346\234\254\350\252\236)\n\nThe widget properly handles bidirectional text, word wrapping, DOS/UNIX/Unicode paragraph separators, grapheme boundaries, and so on using the Pango internationalization framework.\n", -1);  
-
-  gtk_text_buffer_insert (buffer, &iter, "Here's a word-wrapped quote in a right-to-left language:\n", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "\331\210\331\202\330\257 \330\250\330\257\330\243 \330\253\331\204\330\247\330\253 \331\205\331\206 \330\243\331\203\330\253\330\261 \330\247\331\204\331\205\330\244\330\263\330\263\330\247\330\252 \330\252\331\202\330\257\331\205\330\247 \331\201\331\212 \330\264\330\250\331\203\330\251 \330\247\331\203\330\263\331\212\331\210\331\206 \330\250\330\261\330\247\331\205\330\254\331\207\330\247 \331\203\331\205\331\206\330\270\331\205\330\247\330\252 \331\204\330\247 \330\252\330\263\330\271\331\211 \331\204\331\204\330\261\330\250\330\255\330\214 \330\253\331\205 \330\252\330\255\331\210\331\204\330\252 \331\201\331\212 \330\247\331\204\330\263\331\206\331\210\330\247\330\252 \330\247\331\204\330\256\331\205\330\263 \330\247\331\204\331\205\330\247\330\266\331\212\330\251 \330\245\331\204\331\211 \331\205\330\244\330\263\330\263\330\247\330\252 \331\205\330\247\331\204\331\212\330\251 \331\205\331\206\330\270\331\205\330\251\330\214 \331\210\330\250\330\247\330\252\330\252 \330\254\330\262\330\241\330\247 \331\205\331\206 \330\247\331\204\331\206\330\270\330\247\331\205 \330\247\331\204\331\205\330\247\331\204\331\212 \331\201\331\212 \330\250\331\204\330\257\330\247\331\206\331\207\330\247\330\214 \331\210\331\204\331\203\331\206\331\207\330\247 \330\252\330\252\330\256\330\265\330\265 \331\201\331\212 \330\256\330\257\331\205\330\251 \331\202\330\267\330\247\330\271 \330\247\331\204\331\205\330\264\330\261\331\210\330\271\330\247\330\252 \330\247\331\204\330\265\330\272\331\212\330\261\330\251. \331\210\330\243\330\255\330\257 \330\243\331\203\330\253\330\261 \331\207\330\260\331\207 \330\247\331\204\331\205\330\244\330\263\330\263\330\247\330\252 \331\206\330\254\330\247\330\255\330\247 \331\207\331\210 \302\273\330\250\330\247\331\206\331\203\331\210\330\263\331\210\331\204\302\253 \331\201\331\212 \330\250\331\210\331\204\331\212\331\201\331\212\330\247.\n\n", -1,
-						"rtl_quote", NULL);
-      
-  gtk_text_buffer_insert (buffer, &iter, "You can put widgets in the buffer: Here's a button: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
-  gtk_text_buffer_insert (buffer, &iter, " and a menu: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
-  gtk_text_buffer_insert (buffer, &iter, " and a scale: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
-  gtk_text_buffer_insert (buffer, &iter, " and an animation: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
-  gtk_text_buffer_insert (buffer, &iter, " finally a text entry: ", -1);
-  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 (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);
-  gtk_text_buffer_apply_tag_by_name (buffer, "word_wrap", &start, &end);
-
-  g_object_unref (pixbuf);
-}
-
-static gboolean
-find_anchor (GtkTextIter *iter)
-{
-  while (gtk_text_iter_forward_char (iter))
-    {
-      if (gtk_text_iter_get_child_anchor (iter))
-        return TRUE;
-    }
-  return FALSE;
-}
-
-static void
-attach_widgets (GtkTextView *text_view)
-{
-  GtkTextIter iter;
-  GtkTextBuffer *buffer;
-  int i;
-  
-  buffer = gtk_text_view_get_buffer (text_view);
-
-  gtk_text_buffer_get_start_iter (buffer, &iter);
-
-  i = 0;
-  while (find_anchor (&iter))
-    {
-      GtkTextChildAnchor *anchor;
-      GtkWidget *widget;
-      
-      anchor = gtk_text_iter_get_child_anchor (&iter);
-
-      if (i == 0)
-        {
-          widget = gtk_button_new_with_label ("Click Me");
-
-          g_signal_connect (widget, "clicked",
-                            G_CALLBACK (easter_egg_callback),
-                            NULL);
-        }
-      else if (i == 1)
-        {
-          widget = gtk_combo_box_new_text ();
-
-          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");
-        }
-      else if (i == 2)
-        {
-          widget = gtk_hscale_new (NULL);
-          gtk_range_set_range (GTK_RANGE (widget), 0, 100);
-          gtk_widget_set_size_request (widget, 70, -1);
-        }
-      else if (i == 3)
-        {
-	  gchar *filename = demo_find_file ("floppybuddy.gif", NULL);
-	  widget = gtk_image_new_from_file (filename);
-	  g_free (filename);
-        }
-      else if (i == 4)
-        {
-          widget = gtk_entry_new ();
-        }
-      else
-        {
-          widget = NULL; /* avoids a compiler warning */
-          g_assert_not_reached ();
-        }
-
-      gtk_text_view_add_child_at_anchor (text_view,
-                                         widget,
-                                         anchor);
-
-      gtk_widget_show_all (widget);
-
-      ++i;
-    }
-}
-
-GtkWidget *
-do_textview (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *vpaned;
-      GtkWidget *view1;
-      GtkWidget *view2;
-      GtkWidget *sw;
-      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);
-      
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_window_set_title (GTK_WINDOW (window), "TextView");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
-      vpaned = gtk_vpaned_new ();
-      gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
-      gtk_container_add (GTK_CONTAINER (window), vpaned);
-
-      /* For convenience, we just use the autocreated buffer from
-       * the first text view; you could also create the buffer
-       * by itself with gtk_text_buffer_new(), then later create
-       * a view widget.
-       */
-      view1 = gtk_text_view_new ();
-      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view1));
-      view2 = gtk_text_view_new_with_buffer (buffer);
-      
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-				      GTK_POLICY_AUTOMATIC,
-				      GTK_POLICY_AUTOMATIC);
-      gtk_paned_add1 (GTK_PANED (vpaned), sw);
-
-      gtk_container_add (GTK_CONTAINER (sw), view1);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-				      GTK_POLICY_AUTOMATIC,
-				      GTK_POLICY_AUTOMATIC);
-      gtk_paned_add2 (GTK_PANED (vpaned), sw);
-
-      gtk_container_add (GTK_CONTAINER (sw), view2);
-
-      create_tags (buffer);
-      insert_text (buffer);
-
-      attach_widgets (GTK_TEXT_VIEW (view1));
-      attach_widgets (GTK_TEXT_VIEW (view2));
-      
-      gtk_widget_show_all (vpaned);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
-static void
-recursive_attach_view (int                 depth,
-                       GtkTextView        *view,
-                       GtkTextChildAnchor *anchor)
-{
-  GtkWidget *child_view;
-  GtkWidget *event_box;
-  GdkColor color;
-  GtkWidget *align;
-  
-  if (depth > 4)
-    return;
-  
-  child_view = gtk_text_view_new_with_buffer (gtk_text_view_get_buffer (view));
-
-  /* Event box is to add a black border around each child view */
-  event_box = gtk_event_box_new ();
-  gdk_color_parse ("black", &color);
-  gtk_widget_modify_bg (event_box, GTK_STATE_NORMAL, &color);
-
-  align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
-  gtk_container_set_border_width (GTK_CONTAINER (align), 1);
-  
-  gtk_container_add (GTK_CONTAINER (event_box), align);
-  gtk_container_add (GTK_CONTAINER (align), child_view);
-  
-  gtk_text_view_add_child_at_anchor (view, event_box, anchor);
-
-  recursive_attach_view (depth + 1, GTK_TEXT_VIEW (child_view), anchor);
-}
-
-static void
-easter_egg_callback (GtkWidget *button,
-                     gpointer   data)
-{
-  static GtkWidget *window = NULL;
-  GtkTextBuffer *buffer;
-  GtkWidget     *view;
-  GtkTextIter    iter;
-  GtkTextChildAnchor *anchor;
-  GtkWidget *sw;
-
-  if (window)
-    {
-      gtk_window_present (GTK_WINDOW (window));
-      return;
-    }
-  
-  buffer = gtk_text_buffer_new (NULL);
-
-  gtk_text_buffer_get_start_iter (buffer, &iter);
-
-  gtk_text_buffer_insert (buffer, &iter,
-                          "This buffer is shared by a set of nested text views.\n Nested view:\n", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
-  gtk_text_buffer_insert (buffer, &iter,
-                          "\nDon't do this in real applications, please.\n", -1);
-
-  view = gtk_text_view_new_with_buffer (buffer);
-  
-  recursive_attach_view (0, GTK_TEXT_VIEW (view), anchor);
-  
-  g_object_unref (buffer);
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  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);
-
-  g_object_add_weak_pointer (G_OBJECT (window),
-                             (gpointer *) &window);
-
-  gtk_window_set_default_size (GTK_WINDOW (window), 300, 400);
-  
-  gtk_widget_show_all (window);
-}
-
--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -1,450 +0,0 @@
-/* Tree View/Tree Store
- *
- * The GtkTreeStore is used to store data in tree form, to be
- * used later on by a GtkTreeView to display it. This demo builds
- * a simple GtkTreeStore and displays it. If you're new to the
- * GtkTreeView widgets and associates, look into the GtkListStore
- * example first.
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-/* TreeItem structure */
-typedef struct _TreeItem TreeItem;
-struct _TreeItem
-{
-  const gchar    *label;
-  gboolean        alex;
-  gboolean        havoc;
-  gboolean        tim;
-  gboolean        owen;
-  gboolean        dave;
-  gboolean        world_holiday; /* shared by the European hackers */
-  TreeItem       *children;
-};
-
-/* columns */
-enum
-{
-  HOLIDAY_NAME_COLUMN = 0,
-  ALEX_COLUMN,
-  HAVOC_COLUMN,
-  TIM_COLUMN,
-  OWEN_COLUMN,
-  DAVE_COLUMN,
-
-  VISIBLE_COLUMN,
-  WORLD_COLUMN,
-  NUM_COLUMNS
-};
-
-/* tree data */
-static TreeItem january[] =
-{
-  {"New Years Day", TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
-  {"Presidential Inauguration", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
-  {"Martin Luther King Jr. day", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
-  { NULL }
-};
-
-static TreeItem february[] =
-{
-  { "Presidents' Day", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
-  { "Groundhog Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Valentine's Day", FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, NULL },
-  { NULL }
-};
-
-static TreeItem march[] =
-{
-  { "National Tree Planting Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "St Patrick's Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { NULL }
-};
-static TreeItem april[] =
-{
-  { "April Fools' Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { "Army Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Earth Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { "Administrative Professionals' Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { NULL }
-};
-
-static TreeItem may[] =
-{
-  { "Nurses' Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "National Day of Prayer", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Mothers' Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { "Armed Forces Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Memorial Day", TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
-  { NULL }
-};
-
-static TreeItem june[] =
-{
-  { "June Fathers' Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { "Juneteenth (Liberation of Slaves)", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Flag Day", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
-  { NULL }
-};
-
-static TreeItem july[] =
-{
-  { "Parents' Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { "Independence Day", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
-  { NULL }
-};
-
-static TreeItem august[] =
-{
-  { "Air Force Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Coast Guard Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Friendship Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { NULL }
-};
-
-static TreeItem september[] =
-{
-  { "Grandparents' Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { "Citizenship Day or Constitution Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Labor Day", TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
-  { NULL }
-};
-
-static TreeItem october[] =
-{
-  { "National Children's Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Bosses' Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Sweetest Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Mother-in-Law's Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Navy Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Columbus Day", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
-  { "Halloween", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { NULL }
-};
-
-static TreeItem november[] =
-{
-  { "Marine Corps Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Veterans' Day", TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
-  { "Thanksgiving", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
-  { NULL }
-};
-
-static TreeItem december[] =
-{
-  { "Pearl Harbor Remembrance Day", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { "Christmas", TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
-  { "Kwanzaa", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-  { NULL }
-};
-
-
-static TreeItem toplevel[] =
-{
-  {"January", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, january},
-  {"February", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, february},
-  {"March", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, march},
-  {"April", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, april},
-  {"May", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, may},
-  {"June", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, june},
-  {"July", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, july},
-  {"August", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, august},
-  {"September", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, september},
-  {"October", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, october},
-  {"November", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, november},
-  {"December", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, december},
-  {NULL}
-};
-
-
-static GtkTreeModel *
-create_model (void)
-{
-  GtkTreeStore *model;
-  GtkTreeIter iter;
-  TreeItem *month = toplevel;
-
-  /* create tree store */
-  model = gtk_tree_store_new (NUM_COLUMNS,
-			      G_TYPE_STRING,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_BOOLEAN);
-
-  /* add data to the tree store */
-  while (month->label)
-    {
-      TreeItem *holiday = month->children;
-
-      gtk_tree_store_append (model, &iter, NULL);
-      gtk_tree_store_set (model, &iter,
-			  HOLIDAY_NAME_COLUMN, month->label,
-			  ALEX_COLUMN, FALSE,
-			  HAVOC_COLUMN, FALSE,
-			  TIM_COLUMN, FALSE,
-			  OWEN_COLUMN, FALSE,
-			  DAVE_COLUMN, FALSE,
-			  VISIBLE_COLUMN, FALSE,
-			  WORLD_COLUMN, FALSE,
-			  -1);
-
-      /* add children */
-      while (holiday->label)
-	{
-	  GtkTreeIter child_iter;
-
-	  gtk_tree_store_append (model, &child_iter, &iter);
-	  gtk_tree_store_set (model, &child_iter,
-			      HOLIDAY_NAME_COLUMN, holiday->label,
-			      ALEX_COLUMN, holiday->alex,
-			      HAVOC_COLUMN, holiday->havoc,
-			      TIM_COLUMN, holiday->tim,
-			      OWEN_COLUMN, holiday->owen,
-			      DAVE_COLUMN, holiday->dave,
-			      VISIBLE_COLUMN, TRUE,
-			      WORLD_COLUMN, holiday->world_holiday,
-			      -1);
-
-	  holiday++;
-	}
-
-      month++;
-    }
-
-  return GTK_TREE_MODEL (model);
-}
-
-static void
-item_toggled (GtkCellRendererToggle *cell,
-	      gchar                 *path_str,
-	      gpointer               data)
-{
-  GtkTreeModel *model = (GtkTreeModel *)data;
-  GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
-  GtkTreeIter iter;
-  gboolean toggle_item;
-
-  gint *column;
-
-  column = g_object_get_data (G_OBJECT (cell), "column");
-
-  /* get toggled iter */
-  gtk_tree_model_get_iter (model, &iter, path);
-  gtk_tree_model_get (model, &iter, column, &toggle_item, -1);
-
-  /* do something with the value */
-  toggle_item ^= 1;
-
-  /* set new value */
-  gtk_tree_store_set (GTK_TREE_STORE (model), &iter, column,
-		      toggle_item, -1);
-
-  /* clean up */
-  gtk_tree_path_free (path);
-}
-
-static void
-add_columns (GtkTreeView *treeview)
-{
-  gint col_offset;
-  GtkCellRenderer *renderer;
-  GtkTreeViewColumn *column;
-  GtkTreeModel *model = gtk_tree_view_get_model (treeview);
-
-  /* column for holiday names */
-  renderer = gtk_cell_renderer_text_new ();
-  g_object_set (renderer, "xalign", 0.0, NULL);
-
-  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-							    -1, "Holiday",
-							    renderer, "text",
-							    HOLIDAY_NAME_COLUMN,
-							    NULL);
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
-
-  /* alex column */
-  renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)ALEX_COLUMN);
-
-  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
-
-  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-							    -1, "Alex",
-							    renderer,
-							    "active",
-							    ALEX_COLUMN,
-							    "visible",
-							    VISIBLE_COLUMN,
-							    "activatable",
-							    WORLD_COLUMN, NULL);
-
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
-  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
-
-  /* havoc column */
-  renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)HAVOC_COLUMN);
-
-  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
-
-  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-							    -1, "Havoc",
-							    renderer,
-							    "active",
-							    HAVOC_COLUMN,
-							    "visible",
-							    VISIBLE_COLUMN,
-							    NULL);
-
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
-  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
-
-  /* tim column */
-  renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)TIM_COLUMN);
-
-  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
-
-  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-							    -1, "Tim",
-							    renderer,
-							    "active",
-							    TIM_COLUMN,
-							    "visible",
-							    VISIBLE_COLUMN,
-							    "activatable",
-							    WORLD_COLUMN, NULL);
-
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
-  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
-
-  /* owen column */
-  renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)OWEN_COLUMN);
-
-  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
-
-  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-							    -1, "Owen",
-							    renderer,
-							    "active",
-							    OWEN_COLUMN,
-							    "visible",
-							    VISIBLE_COLUMN,
-							    NULL);
-
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
-  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
-
-  /* dave column */
-  renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)DAVE_COLUMN);
-
-  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
-
-  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-							    -1, "Dave",
-							    renderer,
-							    "active",
-							    DAVE_COLUMN,
-							    "visible",
-							    VISIBLE_COLUMN,
-							    NULL);
-
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
-  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
-}
-
-GtkWidget *
-do_tree_store (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *vbox;
-      GtkWidget *sw;
-      GtkWidget *treeview;
-      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), "Card planning sheet");
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      gtk_box_pack_start (GTK_BOX (vbox),
-			  gtk_label_new ("Jonathan's Holiday Card Planning Sheet"),
-			  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_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 model */
-      model = create_model ();
-
-      /* create tree view */
-      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_MULTIPLE);
-
-      add_columns (GTK_TREE_VIEW (treeview));
-
-      gtk_container_add (GTK_CONTAINER (sw), treeview);
-
-      /* expand all rows after the treeview widget has been realized */
-      g_signal_connect (treeview, "realize",
-			G_CALLBACK (gtk_tree_view_expand_all), NULL);
-      gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
-    }
-
-  if (!GTK_WIDGET_VISIBLE (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/ui_manager.c
+++ b/demos/gtk-demo/ui_manager.c
@@ -1,234 +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);
-      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);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/pixbuf-demo.c
+++ b/demos/pixbuf-demo.c
@@ -1,234 +0,0 @@
-/* GdkPixbuf library - Scaling and compositing demo
- *
- * Copyright (C) 1999 The Free Software Foundation
- *
- * Authors: Federico Mena-Quintero <federico@gimp.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include <math.h>
-
-
-
-#define FRAME_DELAY 50
-
-#define BACKGROUND_NAME "background.jpg"
-
-static const char *image_names[] = {
-	"apple-red.png",
-	"gnome-applets.png",
-	"gnome-calendar.png",
-	"gnome-foot.png",
-	"gnome-gmush.png",
-	"gnome-gimp.png",
-	"gnome-gsame.png",
-	"gnu-keys.png"
-};
-
-#define N_IMAGES (sizeof (image_names) / sizeof (image_names[0]))
-
-/* Current frame */
-static GdkPixbuf *frame;
-
-/* Background image */
-static GdkPixbuf *background;
-static int back_width, back_height;
-
-/* Images */
-static GdkPixbuf *images[N_IMAGES];
-
-/* Widgets */
-static GtkWidget *da;
-
-
-
-/* Loads the images for the demo and returns whether the operation succeeded */
-static gboolean
-load_pixbufs (void)
-{
-	int i;
-
-        /* We pass NULL for the error return location, we don't care
-         * about the error message.
-         */
-        
-	background = gdk_pixbuf_new_from_file (BACKGROUND_NAME, NULL);
-	if (!background)
-		return FALSE;
-
-	back_width = gdk_pixbuf_get_width (background);
-	back_height = gdk_pixbuf_get_height (background);
-
-	for (i = 0; i < N_IMAGES; i++) {
-		images[i] = gdk_pixbuf_new_from_file (image_names[i], NULL);
-		if (!images[i])
-			return FALSE;
-	}
-
-	return TRUE;
-}
-
-/* Expose callback for the drawing area */
-static gint
-expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
-	guchar *pixels;
-	int rowstride;
-
-	rowstride = gdk_pixbuf_get_rowstride (frame);
-
-	pixels = gdk_pixbuf_get_pixels (frame) + rowstride * event->area.y + event->area.x * 3;
-		  
-	gdk_draw_rgb_image_dithalign (widget->window,
-				      widget->style->black_gc,
-				      event->area.x, event->area.y,
-				      event->area.width, event->area.height,
-				      GDK_RGB_DITHER_NORMAL,
-				      pixels, rowstride,
-				      event->area.x, event->area.y);
-
-	return TRUE;
-}
-
-#define CYCLE_LEN 60
-
-static int frame_num;
-
-/* Timeout handler to regenerate the frame */
-static gint
-timeout (gpointer data)
-{
-	double f;
-	int i;
-	double xmid, ymid;
-	double radius;
-
-	gdk_pixbuf_copy_area (background, 0, 0, back_width, back_height,
-			      frame, 0, 0);
-
-	f = (double) (frame_num % CYCLE_LEN) / CYCLE_LEN;
-
-	xmid = back_width / 2.0;
-	ymid = back_height / 2.0;
-
-	radius = MIN (xmid, ymid) / 2.0;
-
-	for (i = 0; i < N_IMAGES; i++) {
-		double ang;
-		int xpos, ypos;
-		int iw, ih;
-		double r;
-		GdkRectangle r1, r2, dest;
-		double k;
-
-		ang = 2.0 * G_PI * (double) i / N_IMAGES - f * 2.0 * G_PI;
-
-		iw = gdk_pixbuf_get_width (images[i]);
-		ih = gdk_pixbuf_get_height (images[i]);
-
-		r = radius + (radius / 3.0) * sin (f * 2.0 * G_PI);
-
-		xpos = floor (xmid + r * cos (ang) - iw / 2.0 + 0.5);
-		ypos = floor (ymid + r * sin (ang) - ih / 2.0 + 0.5);
-
-		k = (i & 1) ? sin (f * 2.0 * G_PI) : cos (f * 2.0 * G_PI);
-		k = 2.0 * k * k;
-		k = MAX (0.25, k);
-
-		r1.x = xpos;
-		r1.y = ypos;
-		r1.width = iw * k;
-		r1.height = ih * k;
-
-		r2.x = 0;
-		r2.y = 0;
-		r2.width = back_width;
-		r2.height = back_height;
-
-		if (gdk_rectangle_intersect (&r1, &r2, &dest))
-			gdk_pixbuf_composite (images[i],
-					      frame,
-					      dest.x, dest.y,
-					      dest.width, dest.height,
-					      xpos, ypos,
-					      k, k,
-					      GDK_INTERP_NEAREST,
-					      ((i & 1)
-					       ? MAX (127, fabs (255 * sin (f * 2.0 * G_PI)))
-					       : MAX (127, fabs (255 * cos (f * 2.0 * G_PI)))));
-	}
-
-	gtk_widget_queue_draw (da);
-
-	frame_num++;
-	return TRUE;
-}
-
-static guint timeout_id;
-
-/* Destroy handler for the window */
-static void
-destroy_cb (GtkObject *object, gpointer data)
-{
-	g_source_remove (timeout_id);
-	timeout_id = 0;
-
-	gtk_main_quit ();
-}
-
-extern void pixbuf_init();
-
-int
-main (int argc, char **argv)
-{
-	GtkWidget *window;
-
-	pixbuf_init ();
-	gtk_init (&argc, &argv);
-
-	if (!load_pixbufs ()) {
-		g_message ("main(): Could not load all the pixbufs!");
-		exit (EXIT_FAILURE);
-	}
-
-	frame = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, back_width, back_height);
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	gtk_widget_set_size_request (window, back_width, back_height);
-        gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-	g_signal_connect (window, "destroy",
-			  G_CALLBACK (destroy_cb), NULL);
-
-	da = gtk_drawing_area_new ();
-
-	g_signal_connect (da, "expose_event",
-			  G_CALLBACK (expose_cb), NULL);
-
-	gtk_container_add (GTK_CONTAINER (window), da);
-
-	timeout_id = g_timeout_add (FRAME_DELAY, timeout, NULL);
-
-	gtk_widget_show_all (window);
-	gtk_main ();
-
-	return 0;
-}
--- a/demos/pixbuf-init.c
+++ b/demos/pixbuf-init.c
@@ -1,19 +0,0 @@
-#include <glib.h>
-
-#include <sys/stat.h>
-#include <stdlib.h>
-
-static gboolean
-file_exists (const char *filename)
-{
-  struct stat statbuf;
-
-  return stat (filename, &statbuf) == 0;
-}
-
-void
-pixbuf_init (void)
-{
-  if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
-    g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
-}
--- a/demos/testanimation.c
+++ b/demos/testanimation.c
@@ -1,444 +0,0 @@
-
-/* testpixbuf -- test program for gdk-pixbuf code
- * Copyright (C) 1999 Mark Crichton, Larry Ewing
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <gtk/gtk.h>
-
-typedef struct _LoadContext LoadContext;
-
-struct _LoadContext
-{
-  gchar *filename;
-  GtkWidget *window;
-  GdkPixbufLoader *pixbuf_loader;
-  guint load_timeout;
-  FILE* image_stream;
-};
-
-static void
-destroy_context (gpointer data)
-{
-  LoadContext *lc = data;
-
-  g_free (lc->filename);
-  
-  if (lc->load_timeout)
-    g_source_remove (lc->load_timeout);
-
-  if (lc->image_stream)
-    fclose (lc->image_stream);
-
-  if (lc->pixbuf_loader)
-    {
-      gdk_pixbuf_loader_close (lc->pixbuf_loader, NULL);
-      g_object_unref (lc->pixbuf_loader);
-    }
-  
-  g_free (lc);
-}
-
-static LoadContext*
-get_load_context (GtkWidget *image)
-{
-  LoadContext *lc;
-
-  lc = g_object_get_data (G_OBJECT (image), "lc");
-
-  if (lc == NULL)
-    {
-      lc = g_new0 (LoadContext, 1);
-
-      g_object_set_data_full (G_OBJECT (image),        
-                              "lc",
-                              lc,
-                              destroy_context);
-    }
-
-  return lc;
-}
-
-static void
-progressive_prepared_callback (GdkPixbufLoader* loader,
-                               gpointer         data)
-{
-  GdkPixbuf* pixbuf;
-  GtkWidget* image;
-
-  image = GTK_WIDGET (data);
-    
-  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-
-  /* Avoid displaying random memory contents, since the pixbuf
-   * isn't filled in yet.
-   */
-  gdk_pixbuf_fill (pixbuf, 0xaaaaaaff);
-
-  /* Could set the pixbuf instead, if we only wanted to display
-   * static images.
-   */
-  gtk_image_set_from_animation (GTK_IMAGE (image),
-                                gdk_pixbuf_loader_get_animation (loader));
-}
-
-static void
-progressive_updated_callback (GdkPixbufLoader* loader,
-                              gint x, gint y, gint width, gint height,
-                              gpointer data)
-{
-  GtkWidget* image;
-  
-  image = GTK_WIDGET (data);
-
-  /* We know the pixbuf inside the GtkImage has changed, but the image
-   * itself doesn't know this; so queue a redraw.  If we wanted to be
-   * really efficient, we could use a drawing area or something
-   * instead of a GtkImage, so we could control the exact position of
-   * the pixbuf on the display, then we could queue a draw for only
-   * the updated area of the image.
-   */
-
-  /* We only really need to redraw if the image's animation iterator
-   * is gdk_pixbuf_animation_iter_on_currently_loading_frame(), but
-   * who cares.
-   */
-  
-  gtk_widget_queue_draw (image);
-}
-
-static gint
-progressive_timeout (gpointer data)
-{
-  GtkWidget *image;
-  LoadContext *lc;
-  
-  image = GTK_WIDGET (data);
-  lc = get_load_context (image);
-  
-  /* This shows off fully-paranoid error handling, so looks scary.
-   * You could factor out the error handling code into a nice separate
-   * function to make things nicer.
-   */
-  
-  if (lc->image_stream)
-    {
-      size_t bytes_read;
-      guchar buf[256];
-      GError *error = NULL;
-      
-      bytes_read = fread (buf, 1, 256, lc->image_stream);
-
-      if (ferror (lc->image_stream))
-        {
-          GtkWidget *dialog;
-          
-          dialog = gtk_message_dialog_new (GTK_WINDOW (lc->window),
-                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           "Failure reading image file 'alphatest.png': %s",
-                                           g_strerror (errno));
-
-          g_signal_connect (dialog, "response",
-			    G_CALLBACK (gtk_widget_destroy), NULL);
-
-          fclose (lc->image_stream);
-          lc->image_stream = NULL;
-
-          gtk_widget_show (dialog);
-          
-          lc->load_timeout = 0;
-
-          return FALSE; /* uninstall the timeout */
-        }
-
-      if (!gdk_pixbuf_loader_write (lc->pixbuf_loader,
-                                    buf, bytes_read,
-                                    &error))
-        {
-          GtkWidget *dialog;
-          
-          dialog = gtk_message_dialog_new (GTK_WINDOW (lc->window),
-                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           "Failed to load image: %s",
-                                           error->message);
-
-          g_error_free (error);
-          
-          g_signal_connect (dialog, "response",
-			    G_CALLBACK (gtk_widget_destroy), NULL);
-
-          fclose (lc->image_stream);
-          lc->image_stream = NULL;
-          
-          gtk_widget_show (dialog);
-
-          lc->load_timeout = 0;
-
-          return FALSE; /* uninstall the timeout */
-        }
-
-      if (feof (lc->image_stream))
-        {
-          fclose (lc->image_stream);
-          lc->image_stream = NULL;
-
-          /* Errors can happen on close, e.g. if the image
-           * file was truncated we'll know on close that
-           * it was incomplete.
-           */
-          error = NULL;
-          if (!gdk_pixbuf_loader_close (lc->pixbuf_loader,
-                                        &error))
-            {
-              GtkWidget *dialog;
-              
-              dialog = gtk_message_dialog_new (GTK_WINDOW (lc->window),
-                                               GTK_DIALOG_DESTROY_WITH_PARENT,
-                                               GTK_MESSAGE_ERROR,
-                                               GTK_BUTTONS_CLOSE,
-                                               "Failed to load image: %s",
-                                               error->message);
-              
-              g_error_free (error);
-              
-              g_signal_connect (dialog, "response",
-				G_CALLBACK (gtk_widget_destroy), NULL);
-              
-              gtk_widget_show (dialog);
-
-              g_object_unref (lc->pixbuf_loader);
-              lc->pixbuf_loader = NULL;
-              
-              lc->load_timeout = 0;
-              
-              return FALSE; /* uninstall the timeout */
-            }
-          
-          g_object_unref (lc->pixbuf_loader);
-          lc->pixbuf_loader = NULL;
-        }
-    }
-  else
-    {
-      lc->image_stream = fopen (lc->filename, "r");
-
-      if (lc->image_stream == NULL)
-        {
-          GtkWidget *dialog;
-          
-          dialog = gtk_message_dialog_new (GTK_WINDOW (lc->window),
-                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           "Unable to open image file '%s': %s",
-                                           lc->filename,
-                                           g_strerror (errno));
-
-          g_signal_connect (dialog, "response",
-			    G_CALLBACK (gtk_widget_destroy), NULL);
-          
-          gtk_widget_show (dialog);
-
-          lc->load_timeout = 0;
-
-          return FALSE; /* uninstall the timeout */
-        }
-
-      if (lc->pixbuf_loader)
-        {
-          gdk_pixbuf_loader_close (lc->pixbuf_loader, NULL);
-          g_object_unref (lc->pixbuf_loader);
-          lc->pixbuf_loader = NULL;
-        }
-      
-      lc->pixbuf_loader = gdk_pixbuf_loader_new ();
-      
-      g_signal_connect (lc->pixbuf_loader, "area_prepared",
-			G_CALLBACK (progressive_prepared_callback), image);
-      g_signal_connect (lc->pixbuf_loader, "area_updated",
-			G_CALLBACK (progressive_updated_callback), image);
-    }
-
-  /* leave timeout installed */
-  return TRUE;
-}
-
-static void
-start_progressive_loading (GtkWidget *image)
-{
-  LoadContext *lc;
-
-  lc = get_load_context (image);
-  
-  /* This is obviously totally contrived (we slow down loading
-   * on purpose to show how incremental loading works).
-   * The real purpose of incremental loading is the case where
-   * you are reading data from a slow source such as the network.
-   * The timeout simply simulates a slow data source by inserting
-   * pauses in the reading process.
-   */
-  lc->load_timeout = g_timeout_add (100,
-                                    progressive_timeout,
-                                    image);
-}
-
-static GtkWidget *
-do_image (const char *filename)
-{
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *image;
-  GtkWidget *label;
-  GtkWidget *align;
-  GtkWidget *window;
-  gchar *str, *escaped;
-  LoadContext *lc;
-  
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "Image Loading");
-
-  gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-  vbox = gtk_vbox_new (FALSE, 8);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
-
-  label = gtk_label_new (NULL);
-  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-  escaped = g_markup_escape_text (filename, -1);
-  str = g_strdup_printf ("Progressively loading: <b>%s</b>", escaped);
-  gtk_label_set_markup (GTK_LABEL (label),
-                        str);
-  g_free (escaped);
-  g_free (str);
-  
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
-  frame = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-  /* The alignment keeps the frame from growing when users resize
-   * the window
-   */
-  align = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_container_add (GTK_CONTAINER (align), frame);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);      
-
-  image = gtk_image_new_from_pixbuf (NULL);
-  gtk_container_add (GTK_CONTAINER (frame), image);
-
-  lc = get_load_context (image);
-
-  lc->window = window;
-  lc->filename = g_strdup (filename);
-  
-  start_progressive_loading (image);
-
-  g_signal_connect (window, "destroy",
-		    G_CALLBACK (gtk_main_quit), NULL);
-  
-  g_signal_connect (window, "delete_event",
-		    G_CALLBACK (gtk_main_quit), NULL);
-
-  gtk_widget_show_all (window);
-
-  return window;
-}
-
-static void
-do_nonprogressive (const gchar *filename)
-{
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *image;
-  GtkWidget *label;
-  GtkWidget *align;
-  GtkWidget *window;
-  gchar *str, *escaped;
-  
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "Animation");
-
-  gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-  vbox = gtk_vbox_new (FALSE, 8);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
-
-  label = gtk_label_new (NULL);
-  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-  escaped = g_markup_escape_text (filename, -1);
-  str = g_strdup_printf ("Loaded from file: <b>%s</b>", escaped);
-  gtk_label_set_markup (GTK_LABEL (label),
-                        str);
-  g_free (escaped);
-  g_free (str);
-  
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-      
-  frame = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-  /* The alignment keeps the frame from growing when users resize
-   * the window
-   */
-  align = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_container_add (GTK_CONTAINER (align), frame);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);      
-
-  image = gtk_image_new_from_file (filename);
-  gtk_container_add (GTK_CONTAINER (frame), image);
-
-  g_signal_connect (window, "destroy",
-		    G_CALLBACK (gtk_main_quit), NULL);
-  
-  g_signal_connect (window, "delete_event",
-		    G_CALLBACK (gtk_main_quit), NULL);
-
-  gtk_widget_show_all (window);
-}
-
-int
-main (int    argc,
-      char **argv)
-{
-  gint i;
-  
-  gtk_init (&argc, &argv);
-
-  i = 1;
-  while (i < argc)
-    {
-      do_image (argv[i]);
-      do_nonprogressive (argv[i]);
-      
-      ++i;
-    }
-
-  gtk_main ();
-  
-  return 0;
-}
-
--- a/demos/testgtk/main.c
+++ b/demos/testgtk/main.c
@@ -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;
-}
--- a/demos/testpixbuf-drawable.c
+++ b/demos/testpixbuf-drawable.c
@@ -1,115 +0,0 @@
-#include <config.h>
-#include <gtk/gtk.h>
-
-int
-close_app (GtkWidget *widget, gpointer data)
-{
-   gtk_main_quit ();
-   return TRUE;
-}
-
-int
-expose_cb (GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data)
-{
-   GdkPixbuf *pixbuf;
-         
-   pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
-   if (gdk_pixbuf_get_has_alpha (pixbuf))
-   {
-      gdk_draw_rgb_32_image (drawing_area->window,
-			     drawing_area->style->black_gc,
-			     evt->area.x, evt->area.y,
-			     evt->area.width,
-			     evt->area.height,
-			     GDK_RGB_DITHER_MAX,
-			     gdk_pixbuf_get_pixels (pixbuf) +
-			     (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
-			     (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-			     gdk_pixbuf_get_rowstride (pixbuf));
-   }
-   else
-   {
-      gdk_draw_rgb_image (drawing_area->window, 
-			  drawing_area->style->black_gc, 
-			  evt->area.x, evt->area.y,
-			  evt->area.width,
-			  evt->area.height,  
-			  GDK_RGB_DITHER_NORMAL,
-			  gdk_pixbuf_get_pixels (pixbuf) +
-			  (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
-			  (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-			  gdk_pixbuf_get_rowstride (pixbuf));
-   }
-   return FALSE;
-}
-
-int
-configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
-{
-   GdkPixbuf *pixbuf;
-                           
-   pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
-    
-   g_print ("X:%d Y:%d\n", evt->width, evt->height);
-   if (evt->width != gdk_pixbuf_get_width (pixbuf) || evt->height != gdk_pixbuf_get_height (pixbuf))
-   {
-      GdkWindow *root;
-      GdkPixbuf *new_pixbuf;
-
-      root = gdk_get_default_root_window ();
-      new_pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-						 0, 0, 0, 0, evt->width, evt->height);
-      g_object_set_data (G_OBJECT (drawing_area), "pixbuf", new_pixbuf);
-      g_object_unref (pixbuf);
-   }
-
-   return FALSE;
-}
-
-extern void pixbuf_init ();
-
-int
-main (int argc, char **argv)
-{   
-   GdkWindow     *root;
-   GtkWidget     *window;
-   GtkWidget     *vbox;
-   GtkWidget     *drawing_area;
-   GdkPixbuf     *pixbuf;    
-   
-   pixbuf_init ();
-
-   gtk_init (&argc, &argv);   
-   gdk_rgb_set_verbose (TRUE);
-
-   gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-
-   root = gdk_get_default_root_window ();
-   pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-					  0, 0, 0, 0, 150, 160);
-   
-   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-   g_signal_connect (window, "delete_event",
-		     G_CALLBACK (close_app), NULL);
-   g_signal_connect (window, "destroy",   
-		     G_CALLBACK (close_app), NULL);
-   
-   vbox = gtk_vbox_new (FALSE, 0);
-   gtk_container_add (GTK_CONTAINER (window), vbox);  
-   
-   drawing_area = gtk_drawing_area_new ();
-   gtk_widget_set_size_request (GTK_WIDGET (drawing_area),
-                                gdk_pixbuf_get_width (pixbuf),
-                                gdk_pixbuf_get_height (pixbuf));
-   g_signal_connect (drawing_area, "expose_event",
-		     G_CALLBACK (expose_cb), NULL);
-
-   g_signal_connect (drawing_area, "configure_event",
-		     G_CALLBACK (configure_cb), NULL);
-   g_object_set_data (G_OBJECT (drawing_area), "pixbuf", pixbuf);
-   gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE, 0);
-   
-   gtk_widget_show_all (window);
-   gtk_main ();
-   return 0;
-}
--- a/demos/testpixbuf-save.c
+++ b/demos/testpixbuf-save.c
@@ -1,258 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
-#include "config.h"
-#include <stdio.h>
-
-#include <gtk/gtk.h>
-
-static void
-compare_pixbufs (GdkPixbuf *pixbuf, GdkPixbuf *compare, const gchar *file_type)
-{
-        if ((gdk_pixbuf_get_width (pixbuf) !=
-             gdk_pixbuf_get_width (compare)) ||
-            (gdk_pixbuf_get_height (pixbuf) !=
-             gdk_pixbuf_get_height (compare)) ||
-            (gdk_pixbuf_get_n_channels (pixbuf) !=
-             gdk_pixbuf_get_n_channels (compare)) ||
-            (gdk_pixbuf_get_has_alpha (pixbuf) !=
-             gdk_pixbuf_get_has_alpha (compare)) ||
-            (gdk_pixbuf_get_bits_per_sample (pixbuf) !=
-             gdk_pixbuf_get_bits_per_sample (compare))) {
-                fprintf (stderr,
-                         "saved %s file differs from copy in memory\n",
-                         file_type);
-        } else {
-                guchar *orig_pixels;
-                guchar *compare_pixels;
-                gint    orig_rowstride;
-                gint    compare_rowstride;
-                gint    width;
-                gint    height;
-                gint    bytes_per_pixel;
-                gint    x, y;
-                guchar *p1, *p2;
-                gint    count = 0;
-
-                orig_pixels = gdk_pixbuf_get_pixels (pixbuf);
-                compare_pixels = gdk_pixbuf_get_pixels (compare);
-
-                orig_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-                compare_rowstride = gdk_pixbuf_get_rowstride (compare);
-
-                width = gdk_pixbuf_get_width (pixbuf);
-                height = gdk_pixbuf_get_height (pixbuf);
-
-                /*  well...  */
-                bytes_per_pixel = gdk_pixbuf_get_n_channels (pixbuf);
-
-                p1 = orig_pixels;
-                p2 = compare_pixels;
-
-                for (y = 0; y < height; y++) {
-                        for (x = 0; x < width * bytes_per_pixel; x++)
-                                count += (*p1++ != *p2++);
-
-                        orig_pixels += orig_rowstride;
-                        compare_pixels += compare_rowstride;
-
-                        p1 = orig_pixels;
-                        p2 = compare_pixels;
-                }
-
-                if (count > 0) {
-                        fprintf (stderr,
-                                 "saved %s file differs from copy in memory\n",
-                                 file_type);
-                }
-        }
-}
-
-static void
-keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
-{
-        GdkPixbuf *pixbuf;
-        GtkDrawingArea *da = (GtkDrawingArea*)data;
-        GError *err = NULL;
-        
-        pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (da), "pixbuf");
-
-        if (evt->keyval == 'q')
-                gtk_main_quit ();
-        if (evt->keyval == 's') {
-                if (pixbuf == NULL) {
-                        fprintf (stderr, "PIXBUF NULL\n");
-                        return;
-                }	
-
-                if (!gdk_pixbuf_save (pixbuf, "foo.jpg", "jpeg",
-                                      &err,
-                                      "quality", "100",
-                                      NULL)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        GdkPixbuf *compare;
-
-                        compare = gdk_pixbuf_new_from_file ("foo.jpg", &err);
-
-                        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') {
-                if (pixbuf == NULL) {
-                        fprintf (stderr, "PIXBUF NULL\n");
-                        return;
-                }
-
-                if (!gdk_pixbuf_save (pixbuf, "foo.png", "png", 
-                                      &err,
-                                      "tEXt::Software", "testpixbuf-save",
-                                      NULL)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        GdkPixbuf *compare;
-
-                        compare = gdk_pixbuf_new_from_file ("foo.png", &err);
-
-                        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 == 'a') {
-                if (pixbuf == NULL) {
-                        fprintf (stderr, "PIXBUF NULL\n");
-                        return;
-                } else {
-                        GdkPixbuf *alpha_buf;
-
-                        alpha_buf = gdk_pixbuf_add_alpha (pixbuf,
-                                                          FALSE, 0, 0, 0);
-
-                        g_object_set_data_full (G_OBJECT (da),
-                                                "pixbuf", alpha_buf,
-                                                (GDestroyNotify) g_object_unref);
-                }
-        }
-}
-
-
-static int
-close_app (GtkWidget *widget, gpointer data)
-{
-        gtk_main_quit ();
-        return TRUE;
-}
-
-static int
-expose_cb (GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data)
-{
-        GdkPixbuf *pixbuf;
-         
-        pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area),
-						  "pixbuf");
-        if (gdk_pixbuf_get_has_alpha (pixbuf)) {
-                gdk_draw_rgb_32_image (drawing_area->window,
-                                       drawing_area->style->black_gc,
-                                       evt->area.x, evt->area.y,
-                                       evt->area.width,
-                                       evt->area.height,
-                                       GDK_RGB_DITHER_MAX,
-                                       gdk_pixbuf_get_pixels (pixbuf) +
-                                       (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
-                                       (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-                                       gdk_pixbuf_get_rowstride (pixbuf));
-        } else {
-                gdk_draw_rgb_image (drawing_area->window, 
-                                    drawing_area->style->black_gc, 
-                                    evt->area.x, evt->area.y,
-                                    evt->area.width,
-                                    evt->area.height,  
-                                    GDK_RGB_DITHER_NORMAL,
-                                    gdk_pixbuf_get_pixels (pixbuf) +
-                                    (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
-                                    (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-                                    gdk_pixbuf_get_rowstride (pixbuf));
-        }
-        return FALSE;
-}
-
-static int
-configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
-{
-        GdkPixbuf *pixbuf;
-                           
-        pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area),   
-						  "pixbuf");
-    
-        g_print ("X:%d Y:%d\n", evt->width, evt->height);
-        if (evt->width != gdk_pixbuf_get_width (pixbuf) || evt->height != gdk_pixbuf_get_height (pixbuf)) {
-                GdkWindow *root;
-                GdkPixbuf *new_pixbuf;
-
-                root = gdk_get_default_root_window ();
-                new_pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-                                                           0, 0, 0, 0, evt->width, evt->height);
-                g_object_set_data_full (G_OBJECT (drawing_area), "pixbuf", new_pixbuf,
-                                        (GDestroyNotify) g_object_unref);
-        }
-
-        return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{   
-        GdkWindow     *root;
-        GtkWidget     *window;
-        GtkWidget     *vbox;
-        GtkWidget     *drawing_area;
-        GdkPixbuf     *pixbuf;    
-   
-        gtk_init (&argc, &argv);   
-
-        gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-
-        root = gdk_get_default_root_window ();
-        pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-                                               0, 0, 0, 0, 150, 160);
-   
-        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-        g_signal_connect (window, "delete_event",
-			  G_CALLBACK (close_app), NULL);
-        g_signal_connect (window, "destroy",   
-			  G_CALLBACK (close_app), NULL);
-   
-        vbox = gtk_vbox_new (FALSE, 0);
-        gtk_container_add (GTK_CONTAINER (window), vbox);  
-   
-        drawing_area = gtk_drawing_area_new ();
-        gtk_widget_set_size_request (GTK_WIDGET (drawing_area),
-                                     gdk_pixbuf_get_width (pixbuf),
-                                     gdk_pixbuf_get_height (pixbuf));
-        g_signal_connect (drawing_area, "expose_event",
-			  G_CALLBACK (expose_cb), NULL);
-
-        g_signal_connect (drawing_area, "configure_event",
-			  G_CALLBACK (configure_cb), NULL);
-        g_signal_connect (window, "key_press_event", 
-			  G_CALLBACK (keypress_check), drawing_area);    
-        g_object_set_data_full (G_OBJECT (drawing_area), "pixbuf", pixbuf,
-                                (GDestroyNotify) g_object_unref);
-        gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE, 0);
-   
-        gtk_widget_show_all (window);
-        gtk_main ();
-        return 0;
-}
--- a/demos/testpixbuf-scale.c
+++ b/demos/testpixbuf-scale.c
@@ -1,154 +0,0 @@
-#include <gtk/gtk.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-GdkInterpType interp_type = GDK_INTERP_BILINEAR;
-int overall_alpha = 255;
-GdkPixbuf *pixbuf;
-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))];
-  gtk_widget_queue_draw (darea);
-}
-
-void
-overall_changed_cb (GtkAdjustment *adjustment, gpointer data)
-{
-  if (adjustment->value != overall_alpha)
-    {
-      overall_alpha = adjustment->value;
-      gtk_widget_queue_draw (darea);
-    }
-}
-
-gboolean
-expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
-  GdkPixbuf *dest;
-
-  gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
-  
-  dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, event->area.width, event->area.height);
-
-  gdk_pixbuf_composite_color (pixbuf, dest,
-			      0, 0, event->area.width, event->area.height,
-			      -event->area.x, -event->area.y,
-			      (double) widget->allocation.width / gdk_pixbuf_get_width (pixbuf),
-			      (double) widget->allocation.height / gdk_pixbuf_get_height (pixbuf),
-			      interp_type, overall_alpha,
-			      event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
-
-  gdk_draw_pixbuf (widget->window, widget->style->fg_gc[GTK_STATE_NORMAL], dest,
-		   0, 0, event->area.x, event->area.y,
-		   event->area.width, event->area.height,
-		   GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
-  
-  g_object_unref (dest);
-  
-  return TRUE;
-}
-
-extern void pixbuf_init();
-
-int
-main(int argc, char **argv)
-{
-	GtkWidget *window, *vbox;
-        GtkWidget *combo_box;
-	GtkWidget *alignment;
-	GtkWidget *hbox, *label, *hscale;
-	GtkAdjustment *adjustment;
-	GtkRequisition scratch_requisition;
-        const gchar *creator;
-        GError *error;
-        
-	pixbuf_init ();
-
-	gtk_init (&argc, &argv);
-
-	if (argc != 2) {
-		fprintf (stderr, "Usage: testpixbuf-scale FILE\n");
-		exit (1);
-	}
-
-        error = NULL;
-	pixbuf = gdk_pixbuf_new_from_file (argv[1], &error);
-	if (!pixbuf) {
-		fprintf (stderr, "Cannot load image: %s\n",
-                         error->message);
-                g_error_free (error);
-		exit(1);
-	}
-
-        creator = gdk_pixbuf_get_option (pixbuf, "tEXt::Software");
-        if (creator)
-                g_print ("%s was created by '%s'\n", argv[1], creator);
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	g_signal_connect (window, "destroy",
-			  G_CALLBACK (gtk_main_quit), NULL);
-	
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (window), vbox);
-
-        combo_box = gtk_combo_box_new_text ();
-
-        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");
-
-        gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 1);
-
-        g_signal_connect (combo_box, "changed",
-                          G_CALLBACK (set_interp_type),
-                          NULL);
-	
-	alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.5);
-	gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
-
-	hbox = gtk_hbox_new (FALSE, 4);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-
-	label = gtk_label_new ("Overall Alpha:");
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (overall_alpha, 0, 255, 1, 10, 0));
-	g_signal_connect (adjustment, "value_changed",
-			  G_CALLBACK (overall_changed_cb), NULL);
-	
-	hscale = gtk_hscale_new (adjustment);
-	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_widget_show_all (vbox);
-
-	/* Compute the size without the drawing area, so we know how big to make the default size */
-	gtk_widget_size_request (vbox, &scratch_requisition);
-
-	darea = gtk_drawing_area_new ();
-	gtk_box_pack_start (GTK_BOX (vbox), darea, TRUE, TRUE, 0);
-
-	g_signal_connect (darea, "expose_event",
-			  G_CALLBACK (expose_cb), NULL);
-
-	gtk_window_set_default_size (GTK_WINDOW (window),
-				     gdk_pixbuf_get_width (pixbuf),
-				     scratch_requisition.height + gdk_pixbuf_get_height (pixbuf));
-	
-	gtk_widget_show_all (window);
-
-	gtk_main ();
-
-	return 0;
-}
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -1,638 +0,0 @@
-/* testpixbuf -- test program for gdk-pixbuf code
- * Copyright (C) 1999 Mark Crichton, Larry Ewing
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <gtk/gtk.h>
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
-
-#include "test-inline-pixbufs.h"
-
-typedef struct {
-	FILE             *imagefile;
-	GdkPixbufLoader  *loader;
-	GtkWidget        **rgbwin;
-	guchar           *buf;
-	guint            timeout;
-	guint            readlen;
-} ProgressFileStatus;
-
-
-#define DEFAULT_WIDTH  24
-#define DEFAULT_HEIGHT 24
-
-static const unsigned char default_image[] = {
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xae, 0xb3, 0xb3, 0xc6, 0xc9, 0xcd, 0xd7, 0xd4, 0xdf,
-	0xec, 0xde, 0xf3, 0xe7, 0xcb, 0xe9, 0xd9, 0xb5, 0xd3, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xb1, 0xb7, 0xa5,
-	0xb0, 0xb8, 0xad, 0xb3, 0xb9, 0xb6, 0xc1, 0xc6, 0xc8, 0xd5, 0xd3, 0xdc,
-	0xec, 0xde, 0xf3, 0xe5, 0xca, 0xe6, 0xe0, 0xbb, 0xd7, 0xe1, 0xad, 0xc2,
-	0xe3, 0xac, 0xa3, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xca, 0xc1, 0xa4, 0xc5, 0xc7, 0xac,
-	0xb7, 0xbe, 0xaf, 0xad, 0xb4, 0xaf, 0xbd, 0xc2, 0xc3, 0xd1, 0xd0, 0xd8,
-	0xec, 0xde, 0xf3, 0xe5, 0xc7, 0xe4, 0xe0, 0xb6, 0xd1, 0xe7, 0xa9, 0xb4,
-	0xed, 0xcd, 0xb6, 0xd6, 0xcf, 0xae, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0x00, 0x00, 0x00, 0xdf, 0xa7, 0x9f, 0xdd, 0xbf, 0xaa, 0xcf, 0xc5, 0xa9,
-	0xc1, 0xc4, 0xac, 0xb2, 0xba, 0xaf, 0xb6, 0xbb, 0xbb, 0xcd, 0xce, 0xd4,
-	0xec, 0xde, 0xf3, 0xe4, 0xc4, 0xe1, 0xe0, 0xaf, 0xc7, 0xea, 0xbc, 0xae,
-	0xe1, 0xd6, 0xb6, 0xc7, 0xcc, 0xae, 0xa2, 0xab, 0x9a, 0x00, 0x00, 0x00,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0x00, 0x00, 0x00, 0xe3, 0xab, 0xc0, 0xe6, 0xa3, 0xa7, 0xdf, 0xba, 0xa8,
-	0xcf, 0xc5, 0xa9, 0xbd, 0xc2, 0xae, 0xad, 0xb4, 0xaf, 0xc6, 0xc9, 0xcd,
-	0xec, 0xde, 0xf3, 0xe2, 0xbf, 0xdc, 0xe7, 0xa9, 0xb4, 0xe7, 0xd6, 0xb8,
-	0xc7, 0xcc, 0xae, 0xac, 0xb6, 0xa6, 0x9d, 0xa8, 0x9f, 0x00, 0x00, 0x00,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0xd9, 0xaf, 0xcf, 0xe1, 0xb4, 0xd2, 0xe2, 0xb0, 0xcb, 0xe4, 0xa9, 0xbb,
-	0xe2, 0xb2, 0xa6, 0xcf, 0xc5, 0xa9, 0x6a, 0x6a, 0x6a, 0x0d, 0x0d, 0x0d,
-	0x0d, 0x0d, 0x0d, 0x6a, 0x6a, 0x6a, 0xed, 0xcd, 0xb6, 0xc7, 0xcc, 0xae,
-	0xa6, 0xb1, 0xa3, 0x98, 0xa2, 0x9c, 0x8f, 0x97, 0x96, 0x7e, 0x84, 0x85,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0xe8, 0xc6, 0xe7, 0xe5, 0xc2, 0xe3, 0xe3, 0xbd, 0xdd, 0xe1, 0xb6, 0xd5,
-	0xe2, 0xb0, 0xcb, 0x6a, 0x6a, 0x6a, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x6a, 0x6a, 0x6a, 0x9d, 0xa8, 0x9f,
-	0x8f, 0x97, 0x96, 0x8b, 0x90, 0x92, 0x97, 0x9e, 0xa2, 0xa0, 0xa7, 0xae,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0xe7, 0xd3, 0xed, 0xe8, 0xd1, 0xed, 0xe8, 0xce, 0xec, 0xe9, 0xcc, 0xeb,
-	0xe8, 0xc6, 0xe7, 0x0d, 0x0d, 0x0d, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x0d, 0x0d, 0x0d, 0x97, 0x9e, 0xa2,
-	0xa7, 0xae, 0xb7, 0xb2, 0xb6, 0xc5, 0xba, 0xbc, 0xce, 0xbf, 0xbe, 0xd3,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0,
-	0xe9, 0xdf, 0xf0, 0x0d, 0x0d, 0x0d, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x0d, 0x0d, 0x0d, 0xe1, 0xd2, 0xf7,
-	0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0xca, 0xc7, 0xd2, 0xc5, 0xc4, 0xcd, 0xbf, 0xbf, 0xc7, 0xb8, 0xb9, 0xc0,
-	0xae, 0xaf, 0xb6, 0x6a, 0x6a, 0x6a, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x6a, 0x6a, 0x6a, 0xd5, 0xa8, 0xe1,
-	0xd8, 0xb2, 0xe9, 0xd9, 0xb8, 0xed, 0xdb, 0xbd, 0xf0, 0xdc, 0xbf, 0xf1,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0xa4, 0xa6, 0xac, 0xa8, 0xaa, 0xaf, 0xa0, 0xa6, 0xa8, 0x98, 0x9e, 0x9c,
-	0xa1, 0xa8, 0x9e, 0xb1, 0xb6, 0xa1, 0x6a, 0x6a, 0x6a, 0x0d, 0x0d, 0x0d,
-	0x0d, 0x0d, 0x0d, 0x6a, 0x6a, 0x6a, 0xc0, 0x8c, 0xad, 0xcc, 0x90, 0xb5,
-	0xd3, 0x94, 0xca, 0xd6, 0xa2, 0xdb, 0xd5, 0xa8, 0xe1, 0xcf, 0xa7, 0xdf,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0x00, 0x00, 0x00, 0x98, 0x9f, 0x9b, 0xa1, 0xa8, 0x9e, 0xac, 0xb3, 0xa0,
-	0xb9, 0xb9, 0xa4, 0xd0, 0xb8, 0xa8, 0xc5, 0xb5, 0xb8, 0xb6, 0xbb, 0xad,
-	0xe3, 0xd7, 0xb5, 0xdd, 0xb4, 0xa9, 0xcb, 0x89, 0xac, 0xc0, 0x8c, 0xad,
-	0xc8, 0x91, 0xb5, 0xd1, 0x8d, 0xb7, 0xd3, 0x94, 0xca, 0x00, 0x00, 0x00,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0x00, 0x00, 0x00, 0xa1, 0xa7, 0x98, 0xb1, 0xb6, 0xa1, 0xbd, 0xb9, 0xa5,
-	0xd0, 0xb8, 0xa8, 0xca, 0xb5, 0xb7, 0xb8, 0xb1, 0xb1, 0xc2, 0xc8, 0xb2,
-	0xe3, 0xd7, 0xb5, 0xe1, 0xbf, 0xaf, 0xdb, 0x92, 0x9a, 0xbe, 0x82, 0xa6,
-	0xc0, 0x8c, 0xad, 0xc8, 0x91, 0xb4, 0xc7, 0x8b, 0xb0, 0x00, 0x00, 0x00,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xbc, 0xb6, 0xa1, 0xd0, 0xb8, 0xa8,
-	0xcd, 0xb6, 0xb7, 0xc0, 0xb4, 0xb5, 0xb1, 0xb1, 0xaa, 0xca, 0xd1, 0xb4,
-	0xe3, 0xd7, 0xb5, 0xe2, 0xc1, 0xb0, 0xdb, 0xa8, 0xa3, 0xd2, 0x8a, 0xa9,
-	0xb7, 0x7e, 0xa2, 0xbd, 0x89, 0xa9, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xc9, 0xaf, 0xaf,
-	0xc5, 0xb5, 0xb8, 0xb8, 0xb1, 0xb1, 0xb6, 0xbb, 0xad, 0xd0, 0xd6, 0xb5,
-	0xe3, 0xd7, 0xb5, 0xe2, 0xbf, 0xaf, 0xdd, 0xb4, 0xa9, 0xdb, 0x92, 0x9a,
-	0xc6, 0x84, 0xa7, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xac, 0xaa, 0xa6, 0xbd, 0xc3, 0xb0, 0xd2, 0xd7, 0xb5,
-	0xe3, 0xd7, 0xb5, 0xe2, 0xbf, 0xae, 0xdb, 0xb6, 0xa8, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff
-};
-
-
-static const char * book_open_xpm[] = {
-"16 16 4 1",
-"       c None s None",
-".      c black",
-"X      c #808080",
-"o      c white",
-"                ",
-"  ..            ",
-" .Xo.    ...    ",
-" .Xoo. ..oo.    ",
-" .Xooo.Xooo...  ",
-" .Xooo.oooo.X.  ",
-" .Xooo.Xooo.X.  ",
-" .Xooo.oooo.X.  ",
-" .Xooo.Xooo.X.  ",
-" .Xooo.oooo.X.  ",
-"  .Xoo.Xoo..X.  ",
-"   .Xo.o..ooX.  ",
-"    .X..XXXXX.  ",
-"    ..X.......  ",
-"     ..         ",
-"                "};
-
-static const char * book_closed_xpm[] = {
-"16 16 6 1",
-"       c None s None",
-".      c black",
-"X      c red",
-"o      c yellow",
-"O      c #808080",
-"#      c white",
-"                ",
-"       ..       ",
-"     ..XX.      ",
-"   ..XXXXX.     ",
-" ..XXXXXXXX.    ",
-".ooXXXXXXXXX.   ",
-"..ooXXXXXXXXX.  ",
-".X.ooXXXXXXXXX. ",
-".XX.ooXXXXXX..  ",
-" .XX.ooXXX..#O  ",
-"  .XX.oo..##OO. ",
-"   .XX..##OO..  ",
-"    .X.#OO..    ",
-"     ..O..      ",
-"      ..        ",
-"                "};
-
-static const char * mini_page_xpm[] = {
-"16 16 4 1",
-"       c None s None",
-".      c black",
-"X      c white",
-"o      c #808080",
-"                ",
-"   .......      ",
-"   .XXXXX..     ",
-"   .XoooX.X.    ",
-"   .XXXXX....   ",
-"   .XooooXoo.o  ",
-"   .XXXXXXXX.o  ",
-"   .XooooooX.o  ",
-"   .XXXXXXXX.o  ",
-"   .XooooooX.o  ",
-"   .XXXXXXXX.o  ",
-"   .XooooooX.o  ",
-"   .XXXXXXXX.o  ",
-"   ..........o  ",
-"    oooooooooo  ",
-"                "};
-
-static const char * gtk_mini_xpm[] = {
-"15 20 17 1",
-"       c None",
-".      c #14121F",
-"+      c #278828",
-"@      c #9B3334",
-"#      c #284C72",
-"$      c #24692A",
-"%      c #69282E",
-"&      c #37C539",
-"*      c #1D2F4D",
-"=      c #6D7076",
-"-      c #7D8482",
-";      c #E24A49",
-">      c #515357",
-",      c #9B9C9B",
-"'      c #2FA232",
-")      c #3CE23D",
-"!      c #3B6CCB",
-"               ",
-"      ***>     ",
-"    >.*!!!*    ",
-"   ***....#*=  ",
-"  *!*.!!!**!!# ",
-" .!!#*!#*!!!!# ",
-" @%#!.##.*!!$& ",
-" @;%*!*.#!#')) ",
-" @;;@%!!*$&)'' ",
-" @%.%@%$'&)$+' ",
-" @;...@$'*'*)+ ",
-" @;%..@$+*.')$ ",
-" @;%%;;$+..$)# ",
-" @;%%;@$$$'.$# ",
-" %;@@;;$$+))&* ",
-"  %;;;@+$&)&*  ",
-"   %;;@'))+>   ",
-"    %;@'&#     ",
-"     >%$$      ",
-"      >=       "};
-
-const gchar ** xpms[] = { 
-  book_open_xpm,
-  book_closed_xpm,
-  mini_page_xpm,
-  gtk_mini_xpm,
-  NULL
-};
-
-static void
-quit_func (GtkWidget *widget, gpointer dummy)
-{
-	gtk_main_quit ();
-}
-
-static void
-expose_func (GtkWidget *drawing_area, GdkEventExpose *event, gpointer data)
-{
-	GdkPixbuf *pixbuf;
-
-	pixbuf = (GdkPixbuf *)g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
-
-	if (gdk_pixbuf_get_has_alpha (pixbuf)) {
-		GdkPixbuf *dest;
-	  
-		gdk_window_set_back_pixmap (drawing_area->window, NULL, FALSE);
-	  
-		dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, event->area.width, event->area.height);
-		
-		gdk_pixbuf_composite_color (pixbuf, dest,
-					    0, 0, event->area.width, event->area.height,
-					    -event->area.x, -event->area.y,
-					    (double) drawing_area->allocation.width / gdk_pixbuf_get_width (pixbuf),
-					    (double) drawing_area->allocation.height / gdk_pixbuf_get_height (pixbuf),
-					    GDK_INTERP_BILINEAR, 255,
-					    event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
-		
-		gdk_draw_pixbuf (drawing_area->window, drawing_area->style->fg_gc[GTK_STATE_NORMAL], dest,
-				 0, 0, event->area.x, event->area.y,
-				 event->area.width, event->area.height,
-				 GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
-		
-		g_object_unref (dest);
-	} else {
-		gdk_draw_rgb_image (drawing_area->window,
-				    drawing_area->style->white_gc,
-				    event->area.x, event->area.y, 
-				    event->area.width, 
-				    event->area.height,
-				    GDK_RGB_DITHER_NORMAL,
-				    gdk_pixbuf_get_pixels (pixbuf)
-				    + (event->area.y * gdk_pixbuf_get_rowstride (pixbuf))
-				    + (event->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-				    gdk_pixbuf_get_rowstride (pixbuf));
-	}
-}
-
-static void
-config_func (GtkWidget *drawing_area, GdkEventConfigure *event, gpointer data)
-{
-	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);
-#endif
-}
-
-static GtkWidget*
-new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)
-{
-	GtkWidget *window;
-	GtkWidget *vbox;
-	GtkWidget *temp_box;
-	GtkWidget *button;
-	GtkWidget *drawing_area;
-	gint w, h;
-
-        g_return_val_if_fail (pixbuf != NULL, NULL);
-	w = gdk_pixbuf_get_width (pixbuf);
-	h = gdk_pixbuf_get_height (pixbuf);
-
-	window = gtk_widget_new (gtk_window_get_type (),
-				 "GtkObject::user_data", NULL,
-				 "GtkWindow::type", GTK_WINDOW_TOPLEVEL,
-				 "GtkWindow::title", title ? title : "testrgb",
-				 "GtkWindow::allow_shrink", TRUE,
-				 NULL);
-	g_signal_connect (window, "destroy",
-			  G_CALLBACK (quit_func), NULL);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-
-	if (title)
-		gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (title),
-				    TRUE, TRUE, 0);
-
-	drawing_area = gtk_drawing_area_new ();
-
-	temp_box = gtk_hbox_new (FALSE, 0);
-	gtk_widget_set_size_request (GTK_WIDGET (drawing_area), w, h);
-	gtk_box_pack_start (GTK_BOX (temp_box), drawing_area, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), temp_box, FALSE, FALSE, 0);
-	
-
-	g_signal_connect (drawing_area, "expose_event",
-			  G_CALLBACK (expose_func), NULL);
-	g_signal_connect (drawing_area, "configure_event",
-			  G_CALLBACK (config_func), NULL);
-
-	g_object_set_data (G_OBJECT (drawing_area), "pixbuf", pixbuf);
-
-	gtk_widget_show (drawing_area);
-
-	button = gtk_button_new_with_label ("Quit");
-	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-	g_signal_connect_swapped (button, "clicked",
-				  G_CALLBACK (gtk_widget_destroy), window);
-
-	gtk_widget_show (button);
-
-	gtk_container_add (GTK_CONTAINER (window), vbox);
-	gtk_widget_show_all (vbox);
-
-	gtk_widget_show (window);
-
-        return window;
-}
-
-
-static gint
-update_timeout (gpointer data)
-{
-        ProgressFileStatus *status = data;
-	gboolean done;
-        GError *error;
-        
-	done = FALSE;
-        error = NULL;
-
-	if (!feof (status->imagefile)) {
-		gint nbytes;
-                
-		nbytes = fread (status->buf, 1, status->readlen, 
-			       status->imagefile);
-
-
-                if (!gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes, &error)) {
-                        g_warning ("Error writing to loader: %s",
-                                   error->message);
-                        g_error_free (error);
-                        done = TRUE;
-                }
-                        
-                        
-        } 
-	else 
-                done = TRUE;
-	  
-	if (done) {
-                /* ignoring errors, we should not do that. */
-		gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader), NULL);
-		gtk_widget_queue_draw (*status->rgbwin);
-		g_object_unref (status->loader);
-		fclose (status->imagefile);
-		g_free (status->buf);
-	}
-
-	return !done;
-}
-
-
-static void
-progressive_prepared_callback (GdkPixbufLoader* loader, gpointer data)
-{
-        GtkWidget** retloc = data;
-        GdkPixbuf* pixbuf;
-
-        pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-
-        g_assert (pixbuf != NULL);
-
-        g_object_ref (pixbuf); /* for the RGB window */
-
-        *retloc = new_testrgb_window (pixbuf, "Progressive");
-
-        return;
-}
-
-
-static void
-progressive_updated_callback (GdkPixbufLoader* loader, guint x, guint y, guint width, guint height, gpointer data)
-{
-        GtkWidget** window_loc = data;
-
-        if (*window_loc != NULL)
-                gtk_widget_queue_draw_area (*window_loc,
-					   x, y, width, height);
-        return;
-}
-
-static int readlen = 4096;
-
-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);
-}
-
-
-int
-main (int argc, char **argv)
-{
-	int i;
-	int found_valid = FALSE;
-
-	GdkPixbuf *pixbuf;
-	GdkPixbufLoader *pixbuf_loader;
-
-	pixbuf_init ();
-
-	gtk_init (&argc, &argv);
-
-	gdk_rgb_set_verbose (TRUE);
-
-	gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-
-	{
-		char *tbf_readlen = getenv ("TBF_READLEN");
-		if (tbf_readlen) readlen = atoi (tbf_readlen);
-	}
-
-	{
-		char *tbf_bps = getenv ("TBF_KBPS");
-		guint bps;
-
-		if (tbf_bps) {
-			bps = atoi (tbf_bps);
-			g_print ("Simulating %d kBytes/sec\n", bps);
-			readlen = (bps*1024)/10;
-		}
-	}
-
-	i = 1;
-	if (argc == 1) {
-                const gchar*** xpmp;
-                GError *error = NULL;
-		
-		pixbuf = gdk_pixbuf_new_from_data (default_image, GDK_COLORSPACE_RGB, FALSE, 8,
-						   DEFAULT_WIDTH, DEFAULT_HEIGHT, DEFAULT_WIDTH * 3,
-						   NULL, NULL);
-		new_testrgb_window (pixbuf, NULL);
-
-                xpmp = xpms;
-                while (*xpmp) {
-                        pixbuf = gdk_pixbuf_new_from_xpm_data (*xpmp);
-                        new_testrgb_window (pixbuf, NULL);
-                        ++xpmp;
-                }
-
-                /* Test loading from inline data. */
-                pixbuf = gdk_pixbuf_new_from_inline (-1, apple_red, FALSE, &error);
-		if (!pixbuf)
-		  {
-		    fprintf (stderr, "failed to construct \"red apple\" pixbuf: %s\n",
-			     error->message);
-		    g_error_free (error);
-		  }
-		else
-		  new_testrgb_window (pixbuf, "Red apple from inlined RLE data");
-
-                pixbuf = gdk_pixbuf_new_from_inline (sizeof (gnome_foot), gnome_foot, TRUE, NULL);
-                new_testrgb_window (pixbuf, "GNOME Foot from inlined RLE data");
-                
-		found_valid = TRUE;
-	} else {
-		for (i = 1; i < argc; i++) {
-                        GError *error;
-
-                        error = NULL;
-			pixbuf = gdk_pixbuf_new_from_file (argv[i], &error);
-
-                        if (pixbuf == NULL) {
-                                g_warning ("Error loading image: %s",
-                                           error->message);
-                                g_error_free (error);
-                        }
-                        
-#if 0
-			pixbuf = gdk_pixbuf_rotate (pixbuf, 10.0);
-#endif
-
-			if (pixbuf) {
-				new_testrgb_window (pixbuf, "File");
-				found_valid = TRUE;
-			}
-		}
-#if 1	
-                {
-                        GtkWidget* rgb_window = NULL;
-			ProgressFileStatus   status;
-
-                        pixbuf_loader = gdk_pixbuf_loader_new ();
-			status.loader = pixbuf_loader;
-
-			status.rgbwin = &rgb_window;
-
-			status.buf = g_malloc (readlen);
-
-			g_signal_connect (pixbuf_loader, "size_prepared", 
-					  G_CALLBACK (size_func), NULL);
-
-                        g_signal_connect (pixbuf_loader, "area_prepared",
-					  G_CALLBACK (progressive_prepared_callback),
-					  &rgb_window);
-                        g_signal_connect (pixbuf_loader, "area_updated",
-					  G_CALLBACK (progressive_updated_callback),
-					  &rgb_window);
-			
-                        status.imagefile = fopen (argv[1], "r");
-                        g_assert (status.imagefile != NULL);
-
-			status.readlen = readlen;
-
-                        status.timeout = g_timeout_add (100, update_timeout, &status);
-                }
-#endif
-	}
-
-	if (found_valid)
-		gtk_main ();
-
-	return 0;
-}
--- a/docs/.cvsignore
+++ b/docs/.cvsignore
@@ -1,6 +1,7 @@
 Makefile
 Makefile.in
 *.html
+*.info*
 *.dvi
 *.ps
 *.pg
@@ -17,5 +18,4 @@ Makefile.in
 *.vrs
 html
 text
-texinfo.tex
 gtk-config.1
--- a/docs/Changes-1.2.txt
+++ b/docs/Changes-1.2.txt
@@ -0,0 +1,274 @@
+Incompatible Changes from GTK+-1.0 to GTK+-1.2:
+
+* GtkAcceleratorTable has been replaced with GtkAccelGroup
+
+* GtkMenuFactory has been replaced with GtkItemFactory, although
+  a version of GtkMenuFactory is currently still provided to ease
+  the migration phase.
+
+* The GtkTypeInfo structures used in the gtk_*_type_init() functions have
+  changed a bit, the old format:  
+      GtkTypeInfo bin_info =
+      {
+        "GtkBin",
+        sizeof (GtkBin),
+        sizeof (GtkBinClass),
+        (GtkClassInitFunc) gtk_bin_class_init,
+        (GtkObjectInitFunc) gtk_bin_init,
+        (GtkArgSetFunc) NULL,
+        (GtkArgGetFunc) NULL,
+      };
+
+  needs to be converted to:
+
+      static const GtkTypeInfo bin_info =
+      {
+        "GtkBin",
+        sizeof (GtkBin),
+        sizeof (GtkBinClass),
+        (GtkClassInitFunc) gtk_bin_class_init,
+        (GtkObjectInitFunc) gtk_bin_init,
+        /* reserved_1 */ NULL,
+        /* reserved_2 */ NULL,
+        (GtkClassInitFunc) NULL,
+      };
+
+  the GtkArgSetFunc and GtkArgGetFunc functions are not supported from the
+  type system anymore, and you should make sure that your code only fills
+  in these fields with NULL and doesn't use the deprecated function typedefs
+  (GtkArgSetFunc) and (GtkArgGetFunc) anymore.
+
+* A number of Gtk functions were renamed. For compatibility, gtkcompat.h
+  #define's the old 1.0.x function names in terms of the new names.
+  To assure your Gtk program doesn't rely on outdated function
+  variants, compile your program with -DGTK_DISABLE_COMPAT_H to disable
+  the compatibility aliases.
+
+  Here is the list of the old names and replacements:
+
+  Old:				      Replacement:
+
+  gtk_accel_label_accelerator_width   gtk_accel_label_get_accel_width
+  gtk_check_menu_item_set_state	      gtk_check_menu_item_set_active
+  gtk_container_border_width	      gtk_container_set_border_width
+  gtk_label_set  	              gtk_label_set_text
+  gtk_notebook_current_page           gtk_notebook_get_current_page
+  gtk_packer_configure                gtk_packer_set_child_packing
+  gtk_paned_gutter_size	              gtk_paned_set_gutter_size
+  gtk_paned_handle_size		      gtk_paned_set_handle_size
+  gtk_scale_value_width               gtk_scale_get_value_width
+  gtk_style_apply_default_pixmap      gtk_style_apply_default_background (1)
+  gtk_toggle_button_set_state         gtk_toggle_button_set_active
+  gtk_window_position		      gtk_window_set_position
+ 
+  (1) gtk_style_apply_default_background() has an additional
+      argument, gboolean set_bg. This parameter should be FALSE if
+      the background is being set for a NO_WINDOW widget, otherwise
+      true.
+
+* During the development phase of the 1.1.x line of Gtk certain functions
+  were deprecated and later removed. Functions affected are:
+
+  Removed:                          Replacement:
+  gtk_clist_set_border		    gtk_clist_set_shadow_type
+  gtk_container_block_resize	    gtk_container_set_resize_mode
+  gtk_container_unblock_resize	    gtk_container_set_resize_mode
+  gtk_container_need_resize	    gtk_container_check_resize
+  gtk_ctree_show_stub		    gtk_ctree_set_show_stub
+  gtk_ctree_set_reorderable	    gtk_clist_set_reorderable
+  gtk_ctree_set_use_drag_icons	    gtk_clist_set_use_drag_icons
+  gtk_entry_adjust_scroll	    (1)
+  gtk_object_class_add_user_signal  gtk_object_class_user_signal_new
+  gtk_preview_put_row		    gtk_preview_put
+  gtk_progress_bar_construct	    gtk_progress_set_adjustment
+  gtk_scrolled_window_construct	    gtk_scrolled_window_set_{h|v}adjustment
+  gtk_spin_button_construct	    gtk_spin_button_configure
+  gtk_widget_thaw_accelerators	    gtk_widget_unlock_accelerators
+  gtk_widget_freeze_accelerators    gtk_widget_lock_accelerators
+
+(1) This function is no longer needed as GtkEntry should automatically
+    keep the scroll adjusted properly.
+
+* Additionally, all gtk_*_interp functions were removed.
+  gtk_*_full versions were provided as of GTK+-1.0 and should
+  be used instead.
+
+* GtkButton has been changed to derive from GtkBin.
+  To access a button's child, use GTK_BIN (button)->child, instead
+  of the old GTK_BUTTON (button)->child.
+
+* The selection API has been slightly modified:
+
+ gtk_selection_add_handler() and gtk_selection_add_handler_full() 
+ have been removed. To supply the selection, one now register
+ the targets one is interested in with:
+
+  void gtk_selection_add_target (GtkWidget           *widget, 
+	  	                 GdkAtom              selection,
+			         GdkAtom              target,
+			         guint                info);
+
+ or:
+  
+  void gtk_selection_add_targets (GtkWidget           *widget, 
+	  			  GdkAtom              selection,
+				  GtkTargetEntry      *targets,
+				  guint                ntargets);
+
+ When a request for a selection is received, the new "selection_get"
+ signal will be called:
+
+   void  "selection_get"           (GtkWidget          *widget,
+				    GtkSelectionData   *selection_data,
+				    guint               info,
+				    guint               time);
+
+ A "time" parameter has also been added to the "selection_received"
+ signal.
+
+  void  "selection_received"       (GtkWidget          *widget,
+				    GtkSelectionData   *selection_data,
+				    guint               time);
+
+* The old drag and drop API has been completely removed and replaced.
+  See the reference documentation for details on the new API.
+
+* Support for Themes has been added. In general, this does
+  not affect application code, however, a few new rules should
+  be observed:
+
+   - To set a shape for a window, you must use 
+     gtk_widget_shape_combine_mask() instead of 
+     gdk_window_shape_combine_mask(), or the shape will be
+     reset when switching themes.
+
+   - It is no longer permissable to draw directly on an arbitrary
+     widget, or to set an arbitrary widget's background pixmap.
+     If you need to do that, use a GtkDrawingArea or (for a 
+     toplevel) the new GtkDrawWindow widget.
+
+* The ScrolledWindow widget no longer creates a Viewport
+  automatically. Instead, it has been generalized to accept
+  any "self-scrolling" widget.
+
+  The self-scrolling widgets in the Gtk+ core are GtkViewport,
+  GtkCList, GtkCTree, GtkText, and GtkLayout. All of these widgets can
+  be added to a scrolled window as normal children with
+  gtk_container_add() and scrollbars will be set up automatically.
+
+  To add scrollbars to a non self-scrolling widget, (such as a GtkList),
+  first add it to a viewport, then add the viewport to a scrolled window.
+  The scrolled window code provides a convenience function to do this:
+
+  void gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrollwin,
+					      GtkWidget         *child);
+
+  This does exactly what it says - it creates a Viewport, adds the child
+  widget to it, then adds the Viewport to the scrolled window.
+
+  The scrollbars have been removed from the GtkCList and GtkCTree,
+  because they are now scrolled by simply adding them to a Scrolled
+  Window. The scrollbar policy is set on the scrolled window with
+  gtk_scrolled_window_set_policy() and not on the child widgets
+  (e.g. GtkCList's gtk_clist_set_policy() was removed).
+  
+* The "main loop" of GTK+ has been moved to GLib. This should not
+  affect existing programs, since compatibility functions have
+  been provided. However, you may want to consider migrating
+  your code to use the GLib main loop directly.
+
+* the GTK_BASIC flag was removed, and with it the corresponding
+  macro and function GTK_WIDGET_BASIC() and gtk_widget_basic().
+  
+* All freeze/thaw methods are now recursive - that is, if you
+  freeze a widget n times, you must also thaw it n times.
+
+  Therefore, if you have code like:
+
+  gboolean frozen;
+  frozen = GTK_CLIST_FROZEN (clist);
+  gtk_clist_freeze (clist);
+  [...]
+  if (!frozen)
+    gtk_clist_thaw (clist);
+
+  it will not work anymore. It must be, simply:
+
+  gtk_clist_freeze (clist);
+  [...]
+  gtk_clist_thaw (clist);
+
+* The thread safety in GTK+ 1.2 is slightly different than
+  that which appeared in early versions in the 1.1
+  development track. The main difference is that it relies on 
+  the thread primitives in GLib, and on the thread-safe 
+  GLib main loop.
+
+  This means:
+
+   - You must call g_thread_init() before executing any
+     other GTK+ or GDK functions in a threaded GTK+ program.
+
+   - Idles, timeouts, and input functions are executed outside 
+     of the main GTK+ lock. So, if you need to call GTK+ 
+     inside of such a callback, you must surround the callback
+     with a gdk_threads_enter()/gdk_threads_leave() pair.
+
+     [ However, signals are still executed within the main
+       GTK+ lock ]
+
+     In particular, this means, if you are writing widgets
+     that might be used in threaded programs, you _must_
+     surround timeouts and idle functions in this matter.
+
+     As always, you must also surround any calls to GTK+
+     not made within a signal handler with a 
+     gdk_threads_enter()/gdk_threads_leave() pair.
+    
+   - There is no longer a special --with-threads configure
+     option for GTK+. To use threads in a GTK+ program, you
+     must:
+
+      a) If you want to use the native thread implementation,
+         make sure GLib found this in configuration, otherwise,
+         call you must provide a thread implementation to
+	 g_thread_init().
+   
+      b) Link with the libraries returned by:
+ 
+           gtk-config --libs gthread
+
+         and use the cflags from:
+
+            gtk-config --cflags gthread
+
+     You can get these CFLAGS and LIBS by passing gthread
+     as the fourth parameter to the AM_PATH_GTK automake
+     macro.
+
+* Prior to GTK+-1.2, there were two conflicting interpretations
+  of widget->requistion. It was either taken to be
+  the size that the widget requested, or that size
+  modified by calls to gtk_widget_set_usize(). In GTK+-1.2,
+  it is always interpreted the first way.
+
+  Container widgets are affected in two ways by this:
+
+   1) Container widgets should not pass widget->requisition
+      as the second parameter to gtk_widget_size_request().
+      Instead they should call it like:
+   
+      GtkRequisition child_requisition;
+      gtk_widget_size_request (widget, &child_requisition);
+
+   2) Container widgets should not access child->requisition
+      directly. Either they should use the values returned
+      by gtk_widget_size_request(), or they should call
+      the new function:
+
+    void gtk_widget_get_child_requisition (GtkWidget      *widget,
+					   GtkRequisition *requisition);
+
+      which returns the requisition of the given widget, modified
+      by calls to gtk_widget_set_usize().
+
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,20 +1,197 @@
 ## Process this file with automake to produce Makefile.in

-SUBDIRS = tutorial faq reference
+info_TEXINFOS = gdk.texi gtk.texi 

-EXTRA_DIST = \
-	defsformat.txt			\
-	developers.txt			\
-	dnd_internals.txt		\
-	make-todo			\
-	refcounting.txt			\
-	sizing-test.txt			\
-	styles.txt			\
-	text_widget.txt 		\
-	text_widget_internals.txt	\
-	tree-column-sizing.txt		\
-	widget_geometry.txt		\
-	widget_system.txt 		\
-	generation.txt			\
-	gtkdocs_fix			\
-	RELEASE-HOWTO
+man_MANS = gtk-config.1
+
+TUTORIAL_FR_FILES=html/gtk_tut_fr-1.html   	\
+html/gtk_tut_fr-2.html   	\
+html/gtk_tut_fr-3.html   	\
+html/gtk_tut_fr-4.html   	\
+html/gtk_tut_fr-5.html   	\
+html/gtk_tut_fr-6.html   	\
+html/gtk_tut_fr-7.html   	\
+html/gtk_tut_fr-8.html   	\
+html/gtk_tut_fr-9.html   	\
+html/gtk_tut_fr-10.html  	\
+html/gtk_tut_fr-11.html  	\
+html/gtk_tut_fr-12.html  	\
+html/gtk_tut_fr-13.html  	\
+html/gtk_tut_fr-14.html  	\
+html/gtk_tut_fr-15.html  	\
+html/gtk_tut_fr-16.html  	\
+html/gtk_tut_fr-17.html  	\
+html/gtk_tut_fr-18.html  	\
+html/gtk_tut_fr-19.html  	\
+html/gtk_tut_fr-20.html  	\
+html/gtk_tut_fr-21.html  	\
+html/gtk_tut_fr-22.html  	\
+html/gtk_tut_fr-23.html  	\
+html/gtk_tut_fr-24.html  	\
+html/gtk_tut_fr.html text/gtk_tut_fr.txt
+
+TUTORIAL_FILES=text/gtk_tut.txt html/gtk_tut.html \
+html/gtk_tut.html        	\
+html/gtk_tut-1.html      	\
+html/gtk_tut-2.html      	\
+html/gtk_tut-3.html      	\
+html/gtk_tut-4.html      	\
+html/gtk_tut-5.html      	\
+html/gtk_tut-6.html      	\
+html/gtk_tut-7.html      	\
+html/gtk_tut-8.html      	\
+html/gtk_tut-9.html      	\
+html/gtk_tut-10.html     	\
+html/gtk_tut-11.html     	\
+html/gtk_tut-12.html     	\
+html/gtk_tut-13.html     	\
+html/gtk_tut-14.html     	\
+html/gtk_tut-15.html     	\
+html/gtk_tut-16.html     	\
+html/gtk_tut-17.html     	\
+html/gtk_tut-18.html     	\
+html/gtk_tut-19.html     	\
+html/gtk_tut-20.html     	\
+html/gtk_tut-21.html     	\
+html/gtk_tut-22.html     	\
+html/gtk_tut-23.html     	\
+html/gtk_tut-24.html     	\
+html/gtk_tut-25.html     	\
+html/gtk_tut-26.html     	\
+html/gtk_tut-27.html     	\
+html/gtk_tut-28.html     	\
+html/gtk_tut-29.html     	\
+html/gtk_tut-30.html     	\
+html/gtk_tut-31.html
+
+TUTORIAL_IT_FILES=	html/gtk_tut_it.html     	\
+	html/gtk_tut_it-1.html   	\
+	html/gtk_tut_it-2.html   	\
+	html/gtk_tut_it-3.html   	\
+	html/gtk_tut_it-4.html   	\
+	html/gtk_tut_it-5.html   	\
+	html/gtk_tut_it-6.html   	\
+	html/gtk_tut_it-7.html   	\
+	html/gtk_tut_it-8.html   	\
+	html/gtk_tut_it-9.html   	\
+	html/gtk_tut_it-10.html  	\
+	html/gtk_tut_it-11.html  	\
+	html/gtk_tut_it-12.html  	\
+	html/gtk_tut_it-13.html  	\
+	html/gtk_tut_it-14.html  	\
+	html/gtk_tut_it-15.html  	\
+	html/gtk_tut_it-16.html  	\
+	html/gtk_tut_it-17.html  	\
+	html/gtk_tut_it-18.html  	\
+	html/gtk_tut_it-19.html  	\
+	html/gtk_tut_it-20.html  	\
+	html/gtk_tut_it-21.html  	\
+	html/gtk_tut_it-22.html  	\
+	html/gtk_tut_it-23.html  	\
+	html/gtk_tut_it-24.html		\
+	text/gtk_tut_it.txt
+
+FAQ_FILES=html/gtkfaq.html		\
+	html/gtkfaq-1.html       	\
+	html/gtkfaq-2.html       	\
+	html/gtkfaq-3.html       	\
+	html/gtkfaq-4.html       	\
+	html/gtkfaq-5.html       	\
+	html/gtkfaq-6.html       	\
+	html/gtkfaq-7.html		\
+	text/gtkfaq.txt
+
+EXTRA_DIST =	\
+	gtk-config.1.in		\
+	texinfo.tex 		\
+	macros.texi		\
+	gtkdocs_fix		\
+	gtkfaq.sgml		\
+        gtk-config.txt          \
+	gtk_tut.sgml		\
+	gtk_tut_it.sgml		\
+	gtk_tut_fr.sgml		\
+	debugging.txt		\
+	developers.txt		\
+	refcounting.txt		\
+	styles.txt		\
+	text_widget.txt 	\
+	widget_system.txt 	\
+	gtk_tut_packbox1.gif 	\
+	gtk_tut_packbox2.gif 	\
+	html/gtk_tut_table.gif	\
+	html/gtk_tut_packbox1.gif 	\
+	html/gtk_tut_packbox2.gif 	\
+	gtk_tut_table.gif	\
+	html/gdk.html            	\
+	html/gdk_toc.html        	\
+	html/gtk.html            	\
+	html/gtk_toc.html        	\
+	$(TUTORIAL_FILES)		\
+	$(TUTORIAL_FR_FILES)		\
+	$(TUTORIAL_IT_FILES)		\
+	$(FAQ_FILES)
+
+.PHONY: html htmldir faq tutorial tutorial_it tutorial_fr files
+
+distdocs: gdk.html gtk.html faq tutorial tutorial_it tutorial_fr
+
+htmldir:
+	(cd $(srcdir); mkdir -p html; cp gtk_tut*gif html)
+
+textdir:
+	mkdir -p $(srcdir)/text
+
+gdk.html gdk_toc.html: gdk.texi
+	(cd $(srcdir); texi2html gdk.texi)
+
+gtk.html gtk_toc.html: gtk.texi
+	(cd $(srcdir); texi2html gtk.texi)
+
+html/gdk.html html/gdk_toc.html: htmldir gdk.html gdk_toc.html
+	(cd $(srcdir); cp gdk.html gdk_toc.html html/)
+
+html/gtk.html html/gtk_toc.html: htmldir gtk.html gtk_toc.html
+	(cd $(srcdir); cp gtk.html gtk_toc.html html/)
+
+$(FAQ_FILES): faq
+
+faq: htmldir textdir
+	(cd $(srcdir); sgml2html gtkfaq.sgml; \
+	perl gtkdocs_fix gtkfaq*html; \
+	mv gtkfaq*html html/; \
+	sgml2txt gtkfaq.sgml; \
+	mv gtkfaq.txt text/)
+
+$(TUTORIAL_FILES): tutorial
+
+$(TUTORIAL_FR_FILES): tutorial_fr
+
+$(TUTORIAL_IT_FILES): tutorial_it
+
+tutorial: htmldir textdir
+	(cd $(srcdir); sgml2html gtk_tut.sgml; \
+	perl gtkdocs_fix gtk_tut*html; \
+	mv gtk_tut*html html/; \
+	sgml2txt gtk_tut.sgml; \
+	mv gtk_tut.txt text/)
+
+tutorial_it: htmldir textdir
+	(cd $(srcdir); sgml2html --language=it gtk_tut_it.sgml; \
+	perl gtkdocs_fix gtk_tut_it*html; \
+	mv gtk_tut_it*html html/; \
+	sgml2txt --language=it gtk_tut_it.sgml; \
+	mv gtk_tut_it.txt text/)
+
+tutorial_fr: htmldir textdir
+	(cd $(srcdir); sgml2html --language=fr gtk_tut_fr.sgml; \
+	perl gtkdocs_fix gtk_tut_fr*html; \
+	mv gtk_tut_fr*html html/; \
+	sgml2txt --language=fr gtk_tut_fr.sgml; \
+	mv gtk_tut_fr.txt text/)
+
+
+files:
+	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
+	  echo $$p; \
+	done
--- a/docs/README.linux-fb
+++ b/docs/README.linux-fb
@@ -1,157 +0,0 @@
-
-
-
-
-THIS FILE IS OBSOLETE - use docs/reference/gtk/framebuffer.sgml
-
-
-
-
-
-
-
-About GtkFB:
------------
-The linux-fb port of Gtk+, also known as GtkFB is an implementation of
-gdk (and therefor gtk) that runs on the linux framebuffer. It runs in
-a single process that doesn't need X. It should run most Gtk+ programs
-without any changes to the source.
-
-Build requirements:
-------------------
-To run GtkFB programs you will need glib, pango and gtk from cvs
-HEAD. Make sure you update these at the same time, since changes to
-glib and pango often forces changes in gtk+. Pango optionally depends
-on libfribidi, but for normal GtkFB usage that can be ignored.
-
-You also need freetype 2, I recommend that you use freetype 2.0.1 or
-later, as there was some problems with freetype-config in 2.0.
-Make sure that you install freetype before pango, since pango also
-needs it.
-Freetype can be found at ftp://ftp.freetype.org
-
-Hardware requirements:
----------------------
-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.
-
-Building and installing:
------------------------
-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 ususal: make; make install
-
-Fonts:
------
-Since GtkFB uses freetype 2 to render fonts it can render truetype and
-postscript type 1 antialiased fonts.
-
-At startup it scans some directories looking for fonts. By default
-it looks in $prefix/lib/ft2fonts, and if you want to change this you
-must add something like:
-
-[PangoFT2]
-FontPath = /usr/share/fonts/default/Type1:/usr/share/fonts/default/TrueType
-
-To your $prefix/etc/pango/pangorc or ~/.pangorc.
-
-You must also set up font aliases for the fonts Sans, Serif and Monotype.
-This is done by creating a $prefix/etc/pango/pangoft2.aliases or
-~/.pangoft2_aliases file. You can also set the name of this file using the
-key AliasFiles in the PangoFT2 section in pangorc.
-
-An example of a font alias file for the urw fontset is:
-sans normal normal normal normal "urw gothic l"
-serif normal normal normal normal "urw palladio l"
-monospace normal normal normal normal "nimbus mono l"
-
-And one using the Windows truetype fonts is:
-sans normal normal normal normal "arial"
-serif normal normal normal normal "times new roman"
-monospace normal normal normal normal "courier new"
-
-A more detailed example can be found in examples/pangoft2.aliases in the
-pango distribution.
-
-Running:
--------
-To run a program you should only need to start it, but there are some
-things that can cause problems, and some things that can be controlled
-by environment variables. Try testgtk distributed with gtk+ to test
-if things work.
-
-If you use a ps2 mouse, make sure that /dev/psaux is readable and
-writable.
-
-Make sure gpm is not running.
-
-If you don't specify anything GtkFB will start up in the current
-virtual console in the current resolution and bit-depth. This can be
-changed by specifying environment variables:
-
-GDK_VT:
- unset means open on the current VT.
- 0-9: open on the specified VT. Make sure you have read/write rights
-      there.
- new: Allocate a new VT after the last currently used one.
-
-GDK_DISPLAY_MODE:
- Specifies the name of a mode in /etc/fb.modes that you want to use.
-
-GDK_DISPLAY_DEPTH:
- Specify the desired bit depth of the framebuffer.
- 
-GDK_DISPLAY_WIDTH:
- Specify the desired width of the framebuffer.
- 
-GDK_DISPLAY_HEIGHT:
- Specify the desired height of the framebuffer.
-
-GDK_DISPLAY:
- Specify the framebuffer device to use. Default is /dev/fb0
-
-GDK_MOUSE_TYPE:
- Specify mouse type. Currently supported is:
-  ps2 - PS/2 mouse
-  imps2 - PS/2 intellimouse (wheelmouse)
-  ms - Microsoft serial mouse
-  fidmour - touch screen
- Default is ps2.
-
-GDK_KEYBOARD_TYPE:
- 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,
-    but should not be used in "production" use.
-  raw - read from the tty in RAW mode.
-    Sets the keyboard in RAW mode and handles all the keycodes. This
-    gives correct handling of modifiers and key up/down events. You
-    must be root to use this. If you use this for development or
-    debugging it is recommended to enable magic sysrq handling in the
-    kernel. Then you can use ALT-SysRQ-r to turn the keyboard back to
-    normal mode.
- Default is xlate.
-
-HACKING:
--------
-
-Pressing Ctrl-Alt-Return repaints the whole screen.
-Unfortunately this cannot be pressed when using the xlate keyboard
-driver, so instead you can use shift-F1 instead when using this
-driver.
-
-Pressing Ctrl-Alt-BackSpace kills the GtkFB program. (Can't be pressed
-in the xlate driver.
-
-More to be written.
-
-   - Alexander Larsson <alexl@redhat.com>
-     2000/12/06
-
-   
--- a/docs/RELEASE-HOWTO
+++ b/docs/RELEASE-HOWTO
@@ -1,36 +0,0 @@
-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):
-* gtk-doc
-* linuxdoc-tools
-* docbook-utils
-
-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 ChangeLog
-3) Update version in configure.in, increase micro and interface age by 1.
-(Note that this is critical, a slip-up here will cause the soname to change).
-4) Add === Released 2.x.y === 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 :).
-8) If 7) fails because someone else committed inbetween, curse, cvs up
-fix conflicts and go to 5)
-9) type 'cvs tag GTK_2_x_y' in the toplevel directory
-10) You now have the tarball, and the CVS tag, now upload the tarball to
-gnome.org and gtk.org
-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.
-12) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
-gtk-devel-list. Set reply-to to gnome-hackers.
--- a/docs/debugging.txt
+++ b/docs/debugging.txt
@@ -0,0 +1,97 @@
+The GLIB, GDK, and GTK libraries have extensive support for
+debugging the library and your programs.
+
+The amount of debugging being done can be determined both
+at run time and compile time.
+
+COMPILE TIME OPTIONS
+--------------------
+
+At compile time, the amount of debugging support included is
+determined by four macros:
+
+G_ENABLE_DEBUG
+  If set, enable support for runtime checking.
+
+G_DISABLE_ASSERT
+  If set, disable g_assert macros
+
+G_DISABLE_CHECKS
+  If set, disable the g_return_if_fail and g_return_val_if_fail macros
+
+GTK_NO_CHECK_CASTS
+  If set, don't check casts between different object types
+
+
+Whether these macros are defined is controlled at configuration
+time by the --enable-debug option.
+
+--enable-debug=minimum [default]
+  Enable only inexpensive sanity checking 
+    sets GTK_NO_CHECK_CASTS
+
+--enable-debug=yes
+  Enable all debugging support
+    sets G_ENABLE_DEBUG
+
+--enable-debug=no (or --disable-debug)
+  Disable all debugging support (fastest)
+    sets G_DISABLE_ASSERT, G_DISABLE_CHECKS, and GTK_NO_CHECK_CASTS
+
+
+RUN TIME OPTIONS
+----------------
+
+At run time, if GTK+ was compiled with debugging enabled, different
+types of debugging information can be printed out. This is controlled
+by the:
+ 
+  GTK_DEBUG and GDK_DEBUG environment variables
+  --gtk-debug and --gdk-debug command line options
+  --gtk-no-debug and --gdk-no-debug command line options
+
+First the environment variables are applied, then the command line
+options are applied in the order given on the command line.
+
+Each of these can either be the special value 'all', or a sequence of
+':' separated options. (case is ignored). The environment variables
+and the --gtk-debug and --gdk-debug options add debugging options and
+the --gtk-no-debug and --gdk-no-debug options remove them.
+
+As noted below, some of these are useful in application debugging, but
+most are only interested to those debugging the libraries
+
+For instance:
+
+  GDK_DEBUG_FLAGS=misc:dnd testgtk --gdk-no-debug dnd --gdk-debug events
+
+runs testgtk with the 'misc' and 'events' debugging options.
+
+ GTK_DEBUG
+ ---------
+
+ Application relevant options:
+
+ 'objects' - Trace the creation and destruction of objects, print
+             out a summary at program termination
+
+ Options only interesting to library maintainers:
+
+ GDK_DEBUG
+ ---------
+
+ Application relevant options:
+
+ 'events' - Show all events received by GTK
+
+ Options only interesting to library maintainers:
+
+ 'misc'          - Miscellaneous information
+ 'dnd'           - Information about drag-and-drop
+ 'color-context' - Information about the internal workings of 
+                   GdkColorContext
+ 'xim'           - Information about X Input Method support
+
+
+                                    - Owen Taylor <owt1@cornell.edu>
+                                      98/02/19
--- a/Show More
+++ b/Show More