Released 1.3.4

Tue Apr 17 18:05:34 2001 Owen Taylor <otaylor@redhat.com> * Released 1.3.4 * NEWS: Updated * gtk/gtktextview.c (gtk_text_view_class_init): Fix to not use GTK_TYPE_ENUM.
Don't put -lgthread in GLIB_LIBS, GLIB_DEPLIBS
2001-04-17 23:21:18 +00:00 · 2001-04-17 19:19:09 +00:00 · 2001-04-17 18:12:46 +00:00 · 2001-04-16 20:33:03 +00:00 · 2001-04-16 12:46:02 +00:00 · 2001-04-13 23:56:19 +00:00
1183 changed files with 424428 additions and 116756 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,12 +9,22 @@ Makefile
 Makefile.in
 aclocal.m4
 configure
-gtk-config
+config.h.win32
+gtk-config-2.0
 config.cache
 ABOUT-NLS
 intl
 stamp-h.in
 gtk+.spec
+gtk+-2.0.pc
+gtk+-linux-fb-2.0.pc
+gtk+-nanox-2.0.pc
+gtk+-x11-2.0.pc
+gdk-2.0.pc
+gdk-linux-fb-2.0.pc
+gdk-nanox-2.0.pc
+gdk-x11-2.0.pc
+gdk-pixbuf-2.0.pc
 missing
 install-sh
 mkinstalldirs
--- a/10572
+++ b/10572
--- 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/17
+++ b/17
@@ -41,16 +41,15 @@ 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.gimp.org:/debian/home/gnomecvs'
+   $ export CVSROOT=':pserver:anonymous@cvs.gnome.org:/cvs/gnome'
   $ cvs login
     (there is no password, just hit return)
-   $ cvs -z9 checkout glib
-   $ cvs -z9 checkout gtk+
+   $ cvs -z3 checkout glib
+   $ 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.

-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/55
+++ b/55
@@ -1,14 +1,35 @@
 Prerequisites
 =============

-GTK+ requires the GLIB library, available at the same location as
-you got this package.
+GTK+ requires the following packages:
+
+ - The GLIB library, available at the same location as GTK+
+
+ - The Pango library, available from:
+
+      http://www.pango.org/download.shtml
+
+   Pango also requires the FriBidi library, available from:
+
+      http://imagic.weizmann.ac.il/~dov/freesw/FriBidi/
+
+ - 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+-1.3.0.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-1.3.0			   # change to the toplevel directory
+  % gzip -cd gtk+-1.3.4.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-1.3.4			   # change to the toplevel directory
  % ./configure				   # run the `configure' script
  % make				   # build GTK
  [ Become root if necessary ]
@@ -37,11 +58,15 @@ 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.
+  gxi   : Use generic XInput support (not recommended)

-For more information, follow the link from http://www.gtk.org
+The XInput support is not known to work with any other XServer than
+XFree86. For more information about XInput, see:
+
+ http://www.gtk.org/~otaylor/xinput/howto/index.html
+ http://www.lepied.com/xfree86/

 *  --disable-nls           do not use Native Language Support

@@ -111,24 +136,6 @@ NLS manually to get GTK+ to compile. You can do this
 by specifying the --disable-nls flag when configuring
 GTK+.

-Using an uninstalled copy of GLIB [ Unsupported ]
-=================================================
-
-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.3.0
-
-This, however, will not work if you built GLIB with different
-source and build directories.
-
-It is recommended that you install GLIB before compiling
-GTK+. The --with-glib option is not regularly tested
-and may not function correctly. In addition, 
-inter-library dependencies won't be generated when
-using --with-glib=.
-
 Installation directories
 ========================

--- a/INSTALL.in
+++ b/INSTALL.in
@@ -1,8 +1,29 @@
 Prerequisites
 =============

-GTK+ requires the GLIB library, available at the same location as
-you got this package.
+GTK+ requires the following packages:
+
+ - The GLIB library, available at the same location as GTK+
+
+ - The Pango library, available from:
+
+      http://www.pango.org/download.shtml
+
+   Pango also requires the FriBidi library, available from:
+
+      http://imagic.weizmann.ac.il/~dov/freesw/FriBidi/
+
+ - 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
 ========================
@@ -37,11 +58,15 @@ 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.
+  gxi   : Use generic XInput support (not recommended)

-For more information, follow the link from http://www.gtk.org
+The XInput support is not known to work with any other XServer than
+XFree86. For more information about XInput, see:
+
+ http://www.gtk.org/~otaylor/xinput/howto/index.html
+ http://www.lepied.com/xfree86/

 *  --disable-nls           do not use Native Language Support

@@ -111,24 +136,6 @@ NLS manually to get GTK+ to compile. You can do this
 by specifying the --disable-nls flag when configuring
 GTK+.

-Using an uninstalled copy of GLIB [ Unsupported ]
-=================================================
-
-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-@GTK_VERSION@
-
-This, however, will not work if you built GLIB with different
-source and build directories.
-
-It is recommended that you install GLIB before compiling
-GTK+. The --with-glib option is not regularly tested
-and may not function correctly. In addition, 
-inter-library dependencies won't be generated when
-using --with-glib=.
-
 Installation directories
 ========================

--- a/Makefile.am
+++ b/Makefile.am
@@ -1,33 +1,44 @@
 ## Makefile.am for GTK+

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

 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.4

-EXTRA_DIST =	\
-	HACKING		\
-	gtk+.spec.in	\
-        gtk.m4          \
-	makecopyright	\
-	TODO		\
-	NEWS.pre-1-0	\
+EXTRA_DIST =			\
+	HACKING			\
+	gtk+.spec.in		\
+        gtk-2.0.m4          	\
+	makecopyright		\
+	TODO			\
+	TODO.xml		\
+	NEWS.pre-1-0		\
 	ChangeLog.pre-1-0	\
+	ChangeLog.pre-1-2	\
 	README.cvs-commits	\
-	README.win32	\
+	README.win32		\
+	README.nanox		\
+	config.h.win32		\
 	intl/libgettext.h	\
 	intl/po2tbl.sed.in	\
+	po/README.tools		\
+	po/README.translators	\
+	po/desk.pl		\
+	po/makefile.mingw	\
+	po/update.pl		\
 	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  \
@@ -49,6 +60,8 @@ 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  \
@@ -74,6 +87,8 @@ 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  \
@@ -101,6 +116,27 @@ 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
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
+
+## symlink gdk-2.0.pc and gtk+-2.0.pc to default target for the platform 
+DEFAULT_GDKTARGET=x11
+install-data-local:
+	(cd $(DESTDIR)$(pkgconfigdir) && \
+	 $(LN_S) -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
+         $(LN_S) -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc)
+
 dist-hook: gtk+.spec
 	if test -e $(srcdir)/INSTALL.in && test -e $(srcdir)/README.in ; then \
 	     CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
@@ -111,7 +147,7 @@ dist-hook: gtk+.spec
 	&& cp gtk+.spec $(distdir)

 m4datadir = $(datadir)/aclocal
-m4data_DATA = gtk.m4
+m4data_DATA = gtk-2.0.m4

 .PHONY: files release sanity snapshot

@@ -135,4 +171,4 @@ sanity:


 snapshot:
-	$(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
+	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
--- a/137
+++ b/137
@@ -1,3 +1,140 @@
+Overview of Changes in GTK+ 1.3.4
+=================================
+
+* Win32 fixes
+* GtkTreeView improvements and fixes
+* Fix glib-2.0.m4
+* Miscellaneous bug fixes
+
+Overview of Changes in GTK+ 1.3.3
+=================================
+
+[ 5600 lines of ChangeLog ]
+
+* API cleanups
+* Win32 work (Tor, Hans Breuer)
+* Focus improvements (Owen)
+* Frame buffer improvements (Alex)
+* Work on GtkTextView (Havoc)
+* Much work on GtkTreeView (Jonathan)
+* Selectable labels (Havoc)
+* Converted many arguments to properties (Lee Mallabone, John Margaglione)
+* Add exact regions to GdkExposeEvent, propagate it. (Alex)
+* Added ability to have resize grips in status bars (etc.) using
+  _NET_WM_MOVERESIZE protocol. (Havoc)
+* Added mnemnonic mechanism to make setting underline accelerators
+  much easier. (Alex)
+* Add per-style property mechanism to allow themes to change 
+  geometry parameters. (Tim)
+* Added global settings mechanisms for settings such as double-click
+  time. (Tim, Owen)
+* Various support functions for new and old WM properties (Havoc, Alex)
+* Add TRUE-stops-returns for boolean-returning signals (Ron Steinke)
+
+Overview of Changes in GTK+ 1.3.2
+=================================
+
+GTK Core:
+
+* New stock-icon and stock-item system. Use themeable pixbufs in
+  dialogs, buttons, etc. [Havoc]
+* Theme engines reworked to use derivation and new object system. [Owen]
+* Added GtkClipboard object for simple selection handling. [Owen]
+* Make GtkEditable an interface, move implementation to GtkOldEditable for
+  compat. [Owen]
+* Better handling of default directionality. [Robert]
+* Use GSignal as backend for GtkSignal and other GObject stuff. [Tim]
+* Move theme engines to GTypePlugin. [Owen]
+
+GDK:
+
+* Beginning of implementation of client parts of new window manager spec. [Owen]
+* Make gdk_drawable_get_image() work with backing store. [Havoc]
+
+Widgets:
+
+* New text widget [Havoc]
+  - Adjustable tab handling.
+  - Ability to have scrolling side areas in new text widget for tabs/line numbers.
+  - Many cleanups and small improvements.
+* Improvements to submenu navigation [Nils Barth/David Santiago] and
+  scrolling menus. [Alex]
+* Simplification of progress bar API. [Havoc]
+* Make GtkImage a generic image-display widget. [Havoc]
+* New GtkTreeView tree widget. Model/view architecture, flexible renderering,
+  large datasets, etc. [Jonathan]
+* New GtkMessageBox widget for message display. [Havoc]
+* Allow labels to have contents set from XML-like markup language. [Havoc]
+* Make dialogs derive from GtkDialog and use stock buttons. [Havoc]
+
+Internationalization:
+
+* Proper character set conversion for clipboard/selection. [Owen]
+* New input method system via loadable modules; support on-the-spot
+  preedit in GtkEntry and new text widget; allow switchin input methods
+  on the fly; include modules for XIM and demo Cyrillic-tranliteration 
+  module. [Owen]
+* VIQR, Thai, and Inuktitut input methods. [Robert]
+* Convert po files to UTF-8. [Robert]
+
+gdk-pixbuf:
+
+* Full-alpha compositing for gdk-pixbuf on drawable. [Havoc]
+* Add simple saving to gdk-pixbuf. [David Welton/Havoc]
+* Add improved error handling with GError to gdk-pixbuf. [Havoc]
+
+Ports:
+
+* Much work on Win32 Port. [Tor/Hans]
+* Much work on Linux-FB Port. [Elliot/Alex]
+
+Misc:
+
+* Start of new gtk-demo demo program. [Owen/Jonathan]
+* Bug fixes and more bug fixes.
+
+
+Overview of Changes in GTK+ 1.3.1:
+
+* GTK+ now uses the Pango library for text manipulation. All
+  strings in GTK+ now are in Unicode, languages written
+  from right-to-left, and complex-text languages are now supported.
+* The gdk-pixbuf library for image loading and manipulation is 
+  has been integrated with GTK+.
+* The GTK+ object system has mostly been moved to GLib, separating
+  it from the GUI code. Many significant enhancements have been
+  made as part of this.
+* A new text widget is now included. This started as a port
+  of the Tk text widget, and includes such features of the Tk
+  text widget as tags, marks, and unicode text support. It
+  has been enhanced to support model-view operation and the
+  full power of Pango.
+* The GDK library has been extensively revised to support multiple
+  windowing systems. The only fully functional backend in 1.3.1
+  is the X11 backend, however, ports to Win32, Linux-framebuffer,
+  Nano-X, BeOS, and MacOS exist in various states of completion,
+  and at least some of these will be finished and integrated in 
+  before the final GTK+-2.0 release.
+* 32-bit coordinates are now supported throughout GDK and GTK+
+  (they are emulated where not supported by the windowing system.)
+* Many minor bug fixes and enhancements. Incompatible changes
+  are documented in docs/Changes-2.0.txt
+
+Overview of Changes in GTK+ 1.2.8:
+
+* GNU Make 3.79 bug workaround
+* FAQ and tutorial updates and improvements
+* Miscellaneous bug fixes: CList, Calendar, rc-files, FontSelection
+
+Overview of Changes in GTK+ 1.2.7:
+
+* More header cleanups.
+* Fixed activation bug for insensitive widgets.
+* Locale fixes to RC file parsing code.
+* Miscellaneous bugfixes for Item Factory, CList, CTree, X Selections,
+  HScale, VScale, Pixmap, Viewport, OptionMenu, Entry and Notebook.
+* Upgrade to libtool 1.3.4.
+
 Overview of Changes in GTK+ 1.2.6:

 * container queue_resize fixes
--- a/71
+++ b/71
@@ -1,7 +1,7 @@
 General Information
 ===================

-This is GTK+ version 1.3.0. GTK+, which stands for the Gimp ToolKit, 
+This is GTK+ version 1.3.4. 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.
@@ -12,11 +12,8 @@ The official ftp site is:
 The official web site is:
  http://www.gtk.org/

-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")
+Information about mailing lists can be found at
+  http://www.gtk.org/mailinglists.html

 Installation
 ============
@@ -26,24 +23,12 @@ See the file 'INSTALL'
 How to report bugs
 ==================

-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.3.0
-
-[ Please substitute 1.3.0 with the version of GTK+ that
-  you have installed ]
-
-Then describe the bug. Include:
-
+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
@@ -60,11 +45,6 @@ Then describe the bug. Include:
  As a last resort, you can also provide a pointer to a larger piece 
  of software that can be downloaded.

-  (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)
-
 * If the bug was a crash, the exact text that was printed out
  when the crash occured.

@@ -74,28 +54,19 @@ Then describe the bug. Include:
  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.3.0
-
-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 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.
+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.

-If the patch fixes a bug, it is usually a good idea to include
-all the information described in "How to Report Bugs".
+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.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 18 months, we'd like
+about GTK+ that has been built up over the last 4 years, we'd like
 to ask people commiting to GTK+ to follow a few rules:

 0) Ask first. If your changes are major, or could possibly break existing
@@ -14,15 +14,10 @@ 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@redhat.com. (Subscription address:  
-   gtk-devel-list-request@redhat.com.) This is a good place to ask
+   to gtk-devel-list@gnome.org. (Subscription address:  
+   gtk-devel-list-request@gnome.org.) 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
@@ -56,8 +51,4 @@ Notes:

 Owen Taylor
 13 Aug 1998
-
-
-
-
-
+17 Apr 2001
--- a/README.in
+++ b/README.in
@@ -12,11 +12,8 @@ The official ftp site is:
 The official web site is:
  http://www.gtk.org/

-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")
+Information about mailing lists can be found at
+  http://www.gtk.org/mailinglists.html

 Installation
 ============
@@ -26,24 +23,12 @@ See the file 'INSTALL'
 How to report bugs
 ==================

-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: @GTK_VERSION@
-
-[ Please substitute @GTK_VERSION@ with the version of GTK+ that
-  you have installed ]
-
-Then describe the bug. Include:
-
+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
@@ -60,11 +45,6 @@ Then describe the bug. Include:
  As a last resort, you can also provide a pointer to a larger piece 
  of software that can be downloaded.

-  (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)
-
 * If the bug was a crash, the exact text that was printed out
  when the crash occured.

@@ -74,28 +54,19 @@ Then describe the bug. Include:
  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: @GTK_VERSION@
-
-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 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.
+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.

-If the patch fixes a bug, it is usually a good idea to include
-all the information described in "How to Report Bugs".
+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.nanox
+++ b/README.nanox
@@ -0,0 +1,32 @@
+Gtk port to nano-X
+
+STATUS
+
+Once upon a time I got a few apps working, then started merging
+the new features added by Owen (32 bit sizes for windows and buffering).
+Since then I haven't found the time to work on it:-/
+
+
+TODO
+
+Finish internal window manager abstraction or add proper support in nano-X.
+Fix event polling.
+Implement GdkImage, GdkRgb stuff.
+Put generic region code in generic gdk and/or use the region code from nano-X.
+Fix ugly automake stuff for make dist.
+
+TODO in nano-X
+
+We need to be able to clip and change the background of windows at runtime
+for apps to not look so ugly!
+Fonts: wait for better nano-X font implementation.
+Properties on windows.
+Provide a pango module.
+
+If you want to work on this port or get additional informnation, get in 
+touch with me.
+Configure gtk with the --with-gdktarget=nanox to compile with nano-X support.
+
+Paolo Molaro
+lupus@linuxcare.com
+
--- a/README.win32
+++ b/README.win32
@@ -1,18 +1,29 @@
 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, see http://www.gimp.org/tml/gimp/win32/ or
+port, see http://www.gimp.org/win32/ or
 http://www.iki.fi/tml/gimp/win32/ .

-To build GTk+ on Win32, you need either the Microsoft compiler and
-tools, or gcc-2.95 or later running under cygwin-b20.1 or
-later. Compile in gdk\win32, gdk and gtk with `nmake -f makefile.msc` or
-`make -f makefile.cygwin`.
+This (CVS HEAD) version of the Win32 backend does *not* necessarily
+even compile properly. There is a gtk-1-3-win32-production branch 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 the CVS HEAD version is useable. (But note, the Win32 backend
+has never been claimed to be "production quality", although it works
+surprisingly well for the GIMP.)
+
+To build GTk+ on Win32, you need either gcc-2.95 or later, or the
+Microsoft compiler and tools. The mingw setup of gcc is preferred, but
+you can run gcc also under cygwin-b20.1 or later. Compile in
+gdk\win32, gdk and gtk with `make -f makefile.mingw` (gcc) or `nmake
+-f makefile.msc` (MSVC). The name makefile.mingw needs an explanation:
+It refers to the target, not the build environment. As build
+envíronment, only cygwin is tested. GNU Make is definitely needed.

 See the README.win32 file in the GLib distribution for instructions
 how to build with gcc.

-To use GTk+ on Win32, you also need either of the above mentioned
-compilers. Other compilers might work, but don't count on it.  The
+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. The
 same instructions on how to set up a correct version of gcc should
 also be followed if you want to build applications that use GTk+ with
 gcc.
@@ -31,7 +42,7 @@ undefine ENABLE_NLS, HAVE_GETTEXT and HAVE_LIBINTL in the
 config.h.win32 file, and remove references to the gnu-intl library
 from the makefiles.

-Note that while the GNU gettext package is under the GPL, the "intl"
-part of it as distributed with GNU libc is under the LGPL (like GTk+
-or GLib). We want the LGPL one, even if they are the same, more or
-less.
+Note that while the GNU gettext package is under the GPL license, the
+"intl" part of it is also distributed as part of the GNU C library
+(glibc) where it is under the LGPL license (as is GTk+ or GLib). We
+want the LGPL licensed version. The code is more or less the same.
--- a/TODO.xml
+++ b/TODO.xml
@@ -12,7 +12,7 @@
  <section>
    <title>GDK</title>
    
-    <entry size="medium" status="70%" target="1.4">
+    <entry size="medium" status="90%" target="2.0">
      <title>Add backing store support</title>
      <description>
 	<p>
@@ -39,7 +39,7 @@
      <contact>Owen Taylor &lt;otaylor@redhat.com&gt;</contact>
    </entry>

-    <entry size="medium" status="70%" target="1.4">
+    <entry size="medium" status="90%" target="2.0">
      <title>32 Bit Coordinates</title>
      <description>
 	<p>
@@ -60,7 +60,7 @@
      <contact>Owen Taylor &lt;otaylor@redhat.com&gt;</contact>
    </entry>

-    <entry size="small" status="0%" target="1.4">
+    <entry size="small" status="0%" target="2.0">
      <title>Customizable double-click timeout</title>
      <description>
 	<p>
@@ -69,13 +69,26 @@
 	  customizable
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
      <bugs>#3958</bugs>
    </entry>

+    <entry size="small" status="0%" target="2.0">
+      <title>Make color handling more convenient</title>
+      <description>
+	<p>
+          Add some color convenience functions; such as a way to get an
+          allocated GdkColor from GdkRGB, and export functions from gtkstyle.c
+          that lighten/darken a given color, and set a color from HSV in
+          addition to RGB. Also, consider having static variables that contain
+          preallocated common colors (gdk_blue, gdk_red, etc.), the problem
+          being colormap issues.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>

-
-    <entry size="small" status="0%" target="1.4">
+    <entry size="small" status="0%" target="2.0">
      <title>Cursors</title>
      <description>
 	<p>
@@ -89,10 +102,10 @@
          looking at for this task.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="medium" status="0%" target="1.4">
+    <entry size="medium" status="100%" target="2.0">
      <title>Make GdkRGB work on any visual</title>
      <description>
 	<p>
@@ -102,7 +115,7 @@
          friends, though.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

  </section> <!-- GDK -->
@@ -110,7 +123,7 @@
  <section>
    <title>Internationalization</title>
    
-    <entry size="big" status="0%" target="1.4">
+    <entry size="big" status="90%" target="2.0">
      <title>Integrate Pango</title>
      <description>
 	<p>
@@ -123,7 +136,7 @@
      <contact>gtk-i18n-list@redhat.com</contact>
    </entry>

-    <entry size="medium" status="20%" target="1.4">
+    <entry size="medium" status="90%" target="2.0">
      <title>Switch to using UTF-8</title>
      <description>
 	<p>
@@ -145,11 +158,11 @@
      <contact>gtk-i18n-list@redhat.com</contact>
    </entry>

-    <entry size="big" status="0%" target="1.4">
+    <entry size="big" status="60%" target="2.0">
      <title>Rewrite Input Method Support</title>
      <description>
 	<p>
-	  Current support for Input Methods is done via XIM, with
+	  Support for Input Methods is GTK+-1.2 is done via XIM, with
 	  supported styles being over-the-spot and the root-window
 	  styles. However, the over-the-spot style is not going to
 	  work well with the Pango integration, since it relies on the
@@ -159,8 +172,9 @@
 	  set of callbacks that are invoked by the input methods.
 	</p>
 	<p>
-	  While adding the above support, it may be desirable to
-	  generalize the input-method support to the point where 
+	  GTK+-2.0 will have a new system with loadable input method
+	  modules. These modules can either be implemented using XIM,
+	  or written from scratch.
 	</p>
      </description>
      <contact>gtk-i18n-list@redhat.com</contact>
@@ -170,7 +184,7 @@
  <section>
    <title>GTK+ Core</title>

-    <entry size="big" status="5%" target="1.4">
+    <entry size="big" status="60%" target="2.0">
      <title>GLib based object and type system</title>
      <description>
 	<p>
@@ -183,7 +197,7 @@
      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
    </entry>

-    <entry size="big" status="1%" target="1.4">
+    <entry size="big" status="1%" target="2.0">
      <title>Overall callback improvements</title>
      <description>
 	<p>
@@ -196,10 +210,10 @@
 	  "GLib based object and type system").
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="big" status="0%" target="1.4">
+    <entry size="big" status="0%" target="2.0">
      <title>State change notification</title>
      <description>
 	<p>
@@ -219,7 +233,7 @@
      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
    </entry>

-    <entry size="big" status="5%" target="1.4">
+    <entry size="big" status="5%" target="2.0">
      <title>Widget as sensitivity/grab state machine</title>
      <description>
 	<p>
@@ -239,7 +253,7 @@
      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
    </entry>

-    <entry size="big" status="0%" target="1.4">
+    <entry size="big" status="0%" target="2.0">
      <title>Allow argument customization</title>
      <description>
 	<p>
@@ -255,7 +269,7 @@
      </description>
    </entry>

-    <entry size="medium" status="0%" target="1.4">
+    <entry size="medium" status="0%" target="2.0">
      <title>Allow global customization</title>
      <description>
 	<p>
@@ -272,7 +286,7 @@
      </description>
    </entry>

-    <entry size="small" status="0%" target="1.4">
+    <entry size="small" status="0%" target="2.0">
      <title>Gtk+ Modules installation directory</title>
      <description>
 	<p>
@@ -283,26 +297,11 @@
 	  code (especially on AIX).
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>


-    <entry size="small" status="0%" target="1.4">
-      <title>Make color handling more convenient</title>
-      <description>
-	<p>
-          Add some color convenience functions; such as a way to get an
-          allocated GdkColor from GdkRGB, and export functions from gtkstyle.c
-          that lighten/darken a given color, and set a color from HSV in
-          addition to RGB. Also, consider having static variables that contain
-          preallocated common colors (gtk_blue, gtk_red, etc.), the problem
-          being colormap issues.
-	</p>
-      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
-    </entry>
-
-    <entry size="small" status="0%" target="1.4">
+    <entry size="small" status="20%" target="2.0">
      <title>Convenient widget setup</title>
      <description>
 	<p>
@@ -320,10 +319,10 @@
        </p>

      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="medium" status="0%" target="> 1.4">
+    <entry size="medium" status="0%" target="> 2.0">
      <title>Make selections/clipboard more convenient</title>
      <description>
 	<p>
@@ -331,11 +330,11 @@
          Consider a GtkClipboard object to simplify cut-and-paste handling.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>


-    <entry size="small" status="50%" target="1.4">
+    <entry size="small" status="80%" target="2.0">
      <title>Stock label/icon system</title>
      <description>
 	<p>
@@ -348,7 +347,7 @@
    </entry>


-    <entry size="big" status="0%" target="> 1.4">
+    <entry size="big" status="0%" target="> 2.0">
      <title>Session Management</title>
      <description>
 	<p>
@@ -357,25 +356,25 @@
          GTK+ API for this.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="big" status="0%" target="> 1.4">
+    <entry size="big" status="0%" target="> 2.0">
      <title>Online help enhancements</title>
      <description>
 	<p>
          Look at a small "What's This" popup widget, 
          and a What's This system in general (this part 
-          could maybe be done for 1.4). A more difficult, probably 
-          a post-1.4 task, is to integrate a very simple little
+          could maybe be done for 2.0). A more difficult, probably 
+          a post-2.0 task, is to integrate a very simple little
          help browser gizmo into GTK.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>


-    <entry size="medium" status="0%" target="1.4">
+    <entry size="medium" status="0%" target="2.0">
      <title>GUI-editable means of user configuration</title>
      <description>
 	<p>
@@ -383,7 +382,7 @@
          blink, etc., from a control panel type of deal.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

  </section> <!-- Core -->
@@ -391,7 +390,7 @@
  <section>
    <title>GTK+ Widgets</title>

-    <entry size="small" status="0%" target="1.4">
+    <entry size="small" status="100%" target="2.0">
      <title>Make GtkFrame use a label</title>
      <description>
 	<p>
@@ -403,31 +402,31 @@
 	  in that slot.)
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="big" status="50%" target="1.4">
+    <entry size="big" status="90%" target="2.0">
      <title>Replace GtkText Widget</title>
      <description>
 	<p>
-	  The GtkText widget is badly in need of replacement, since it is
-	  buggy and insufficiently feature rich. There are a number
-	  of possible candidates for a replacement, with the most
-	  promising at the current time being Havoc Pennington's
-	  (hp@redhat.com) port of the Tk Text widget.
+	  The GtkText widget is badly in need of replacement, since it
+	  is buggy and insufficiently feature rich. This is being done
+	  using Havoc Pennington's port of the Tk Text widget.
 	</p>
 	<p>
-	  As part of this job it will be necessary to add
-	  <a href="http://www.pango.org">Pango</a> support to the
-	  replacement. The structure of the Tk text widget port seems
-	  suited to this as it works paragraph-by-paragraph, and
-	  Pango works at a sub-paragraph scale.
+	  As part of this job <a href="http://www.pango.org">Pango</a>
+	  support is being added to the replacement. The structure of
+	  the Tk text widget port is suited to this as it works
+	  paragraph-by-paragraph, and Pango works at a sub-paragraph
+	  scale. The main remaining tasks here are to implement
+	  incremental reflow to make performance acceptable and to
+	  implement embedded pixmaps and widgets.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="small" status="0%" target="1.4">
+    <entry size="small" status="20%" target="2.0">
      <title>Improve Radio/Checkbutton Look</title>
      <description>
 	<p>
@@ -439,10 +438,10 @@
 	  will fit in with well with the rest of the GTK+ look.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="small" status="0%" target="1.4">
+    <entry size="small" status="99%" target="2.0">
      <title>Improve Submenu Navigation</title>
      <description>
 	<p>
@@ -455,10 +454,10 @@
 	  side of the submenu.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="small" status="0%" target="1.4 ?">
+    <entry size="small" status="0%" target="2.0 ?">
      <title>Improve Spinbutton Look</title>
      <description>
 	<p>
@@ -476,23 +475,23 @@
 	  windowing systems.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="big" status="90%" target="1.4">
+    <entry size="big" status="90%" target="2.0">
      <title>Supply horizontable/vertical wrapping boxes</title>
      <description>
 	<p>
 	  An often requested feature are wrapping containers, at this
 	  point, gimp's development version already uses such widgets:
-	  horizontable/vertical wrap boxes, that need to go into 1.4
+	  horizontable/vertical wrap boxes, that need to go into 2.0
 	  proper at some point.
 	</p>
      </description>
      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
    </entry>

-    <entry size="medium" status="90%" target="1.4">
+    <entry size="medium" status="90%" target="2.0">
      <title>Improved generic combo support</title>
      <description>
 	<p>
@@ -505,7 +504,7 @@
      <contact>Tim Janik &lt;timj@gtk.org&gt;</contact>
    </entry>

-    <entry size="big" status="0%" target="> 1.4">
+    <entry size="big" status="40%" target="2.0?">
      <title>Add unified set of List/Tree/Grid widgets</title>
      <description>
 	<p>
@@ -527,11 +526,11 @@
 	  both the simplicity and power of the interfaces.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="small" status="0%" target="1.4">
-      <title>GtkPixbuf</title>
+    <entry size="small" status="0%" target="2.0">
+      <title>GtkImage</title>
      <description>
 	<p>
          gdk-pixbuf is moving to become a GTK+ dependency, a new image-display
@@ -541,7 +540,7 @@
      <contact>hp@redhat.com</contact>
    </entry>

-    <entry size="small" status="0%" target="1.4">
+    <entry size="small" status="0%" target="2.0">
      <title>Attempt to fix GtkStatusbar</title>
      <description>
 	<p>
@@ -551,10 +550,10 @@
          don't have to use gtk_statusbar_get_context_id().
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>
    
-    <entry size="small" status="95%" target="1.4">
+    <entry size="small" status="95%" target="2.0">
      <title>Decruft GtkProgress, GtkProgressbar</title>
      <description>
        <p>UPDATE: this is done, just need to apply the patch.
@@ -572,7 +571,7 @@
      <contact>hp@redhat.com</contact>
    </entry>

-    <entry size="small" status="0%" target="1.4">
+    <entry size="small" status="0%" target="2.0">
      <title>Entry validation hooks</title>
      <description>
 	<p>
@@ -584,10 +583,10 @@
          see GtkSpinButton where these are already implemented.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="big" status="0%" target="> 1.4">
+    <entry size="big" status="0%" target="> 2.0">
      <title>pseudo-MDI Widget</title>
      <description>
 	<p>
@@ -605,10 +604,10 @@
          (Havoc has a proposed interface for this, mail hp@redhat.com)
        </p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="medium" status="0%" target="> 1.4">
+    <entry size="medium" status="0%" target="> 2.0">
      <title>Icon List Widget</title>
      <description>
 	<p>
@@ -616,10 +615,10 @@
          the like.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="medium" status="0%" target="> 1.4">
+    <entry size="medium" status="0%" target="> 2.0">
      <title>Dock widget</title>
      <description>
 	<p>
@@ -629,20 +628,20 @@
          saving the current positions of the various docked bars.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="big" status="0%" target="> 1.4">
+    <entry size="big" status="0%" target="> 2.0">
      <title>Canvas widget</title>
      <description>
 	<p>
          Figure out how to get GnomeCanvas or a derived work into GTK+ itself.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="medium" status="0%" target="1.4">
+    <entry size="medium" status="57%" target="2.0">
      <title>Menu scroll</title>
      <description>
 	<p>
@@ -650,10 +649,10 @@
          as on the Mac.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="medium" status="0%" target="1.4">
+    <entry size="medium" status="20%" target="2.0">
      <title>Toolbar/menubar wrap</title>
      <description>
 	<p>
@@ -661,10 +660,10 @@
          wrapping or drop-down deal. (See Windows/Mac apps for examples.)
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="small" status="0%" target="1.4">
+    <entry size="small" status="0%" target="2.0">
      <title>Blink cursor in GtkEntry</title>
      <description>
 	<p>
@@ -675,17 +674,17 @@
      <contact>otaylor@redhat.com</contact>
    </entry>

-    <entry size="small" status="0%" target="1.4">
+    <entry size="small" status="100%" target="2.0">
      <title>Don't highlight first menu item when menus come up</title>
      <description>
 	<p>
          Keep GtkMenu from prelighting the first menu item.
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="small" status="0%" target="1.4">
+    <entry size="small" status="100%" target="2.0">
      <title>Integrate new color selector</title>
      <description>
 	<p>
@@ -695,10 +694,10 @@
          still called GtkColorSelector).
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

-    <entry size="medium" status="0%" target="1.4">
+    <entry size="medium" status="70%" target="2.0">
      <title>Write new font selector</title>
      <description>
 	<p>
@@ -708,7 +707,31 @@
          it makes sense (like gnome-terminal probably).
 	</p>
      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
+      <contact>gtk-devel-list@gnome.org</contact>
+    </entry>
+
+    <entry size="small" status="0%" target="2.0">
+      <title>Stack Widget</title>
+      <description>
+	<p>
+          Jonathan has a widget like a tabless/frameless notebook, used for
+          something like the GNOME control center where you want to toggle which
+          widget is visible to the user. Needs to be cleaned up and considered
+          for GTK.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org, jrb@redhat.com</contact>
+    </entry>
+
+    <entry size="small" status="0%" target="2.0">
+      <title>Clean up GtkNotebook</title>
+      <description>
+	<p>
+          GtkNotebook currently breaks GTK invariants about
+          mapping/visibility/etc., needs fixing.
+	</p>
+      </description>
+      <contact>gtk-devel-list@gnome.org</contact>
    </entry>

  </section> <!-- GTK+ -->
--- a/acconfig.h
+++ b/acconfig.h
@@ -23,6 +23,7 @@
 #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
@@ -31,14 +32,24 @@
 #undef HAVE_SYS_SELECT_H
 #undef HAVE_SYS_TIME_H
 #undef HAVE_XCONVERTCASE
+#undef HAVE_XFT

 #undef NO_FD_SET

 #undef RESOURCE_BASE

+#undef USE_GMODULE
+#undef USE_MMX
+
 /* Define to use X11R6 additions to XIM */
 #undef USE_X11R6_XIM

+/* Define to use XKB extension */
+#undef HAVE_XKB
+
+/* Define to use shadowfb in the linux-fb port */
+#undef ENABLE_SHADOW_FB
+
 #undef XINPUT_NONE
 #undef XINPUT_GXI
 #undef XINPUT_XFREE
@@ -49,6 +60,8 @@
 /* Most machines will be happy with int or void.  IRIX requires '...' */
 #undef SIGNAL_ARG_TYPE

+#undef GETTEXT_PACKAGE
+
 /* #undef PACKAGE */
 /* #undef VERSION */

--- a/autogen.sh
+++ b/autogen.sh
@@ -49,7 +49,7 @@ esac
 if test -z "$ACLOCAL_FLAGS"; then

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

 	for file in $m4list
 	do
@@ -71,6 +71,12 @@ echo "Running gettextize...  Ignore non-fatal messages."
 # while making dist.
 echo "no" | gettextize --copy --force

+#
+# Really bad hack
+echo "Munging po/Makefile.in.in"
+sed s%@PACKAGE@%@GETTEXT_PACKAGE@% < po/Makefile.in.in > po/Makefile.in.in.new
+mv po/Makefile.in.in.new po/Makefile.in.in
+
 aclocal $ACLOCAL_FLAGS

 # optionally feature autoheader
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -1,4 +1,4 @@
-/* config.h.win32.  Handcrafted for Microsoft C and gcc -mno-cygwin */
+/* config.h.win32.  Handcrafted for Microsoft C or mingw */

 #if ! (defined(_MSC_VER) || defined(__GNUC__))
 #error Unrecognized Win32 compiler, edit config.h.win32 by hand
@@ -16,10 +16,12 @@

 /* Define if you have alloca, as a function or macro.  */
 #define HAVE_ALLOCA 1
-#ifdef _MSC_VER
-#define alloca _alloca
-#elif defined (__GNUC__)
-#define alloca __builtin_alloca
+#ifndef alloca
+  #ifdef _MSC_VER
+    #define alloca _alloca
+  #elif defined (__GNUC__)
+    #define alloca __builtin_alloca
+  #endif
 #endif

 /* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
@@ -190,3 +192,12 @@
 * (available in the Platform SDK)
 */
 /* #define HAVE_DIMM_H 1 */
+
+#ifndef _MSC_VER
+#define USE_GMODULE 1
+#define USE_MMX 1
+#endif
+
+/* #undef HAVE_SIGSETJMP */
+
+#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
--- a/configure.in
+++ b/configure.in
--- a/contrib/.cvsignore
+++ b/contrib/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -0,0 +1,8 @@
+
+if USE_X11
+XDIRS=gdk-pixbuf-xlib
+else
+XDIRS=
+endif
+
+SUBDIRS=$(XDIRS)
--- a/contrib/gdk-pixbuf-xlib/.cvsignore
+++ b/contrib/gdk-pixbuf-xlib/.cvsignore
@@ -0,0 +1,7 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+.libs
+.deps
+gdk-pixbuf-xlib-2.0.pc
--- a/contrib/gdk-pixbuf-xlib/ChangeLog
+++ b/contrib/gdk-pixbuf-xlib/ChangeLog
@@ -0,0 +1,61 @@
+Mon Jan  8 11:41:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (INCLUDES): Add @x_cflags@ (#36310)
+
+2001-01-02  Havoc Pennington  <hp@redhat.com>
+
+	* gdk-pixbuf-xlib-2.0.pc.in (Description): fix up description a bit.
+
+2000-10-06  Havoc Pennington  <hp@redhat.com>
+
+	* gdk-pixbuf-xlib.c: Put display/screen here, instead of in 
+	the main gdk-pixbuf library as it was in 1.0; since the io-xpm 
+	loader doesn't use these variables anymore it should be OK
+
+2000-09-26  Federico Mena Quintero  <federico@helixcode.com>
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-drawable.c
+	(gdk_pixbuf_xlib_get_from_drawable): Do not use
+	gdk_screen_{width,height}().  Thanks to John Harper for pointing
+	this out.
+
+2000-08-26  Federico Mena Quintero  <federico@helixcode.com>
+
+	* gdk-pixbuf/gdk-pixbuf-xlibrgb.c: Added API reference docs.
+
+2000-08-25  Federico Mena Quintero  <federico@helixcode.com>
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-drawable.c (handle_x_error): Return
+	0.
+	(xlib_window_is_viewable): Return FALSE in the last case.
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-render.c: Updated the inline docs.
+
+	* gdk-pixbuf/gdk-pixbuf-xlib.c: Added API docs.
+
+2000-08-25  John Harper  <john@dcs.warwick.ac.uk>
+
+	Work to create an Xlib version of gdk-pixbuf (with the Xlib
+	port of GdkRGB for rendering):
+
+	* configure.in: check for X libraries, set and substitute
+	GDK_PIXBUF_XLIB_{LIBDIR,INCLUDEDIR,LIBS} variables
+
+	* gdk_pixbuf_xlibConf.sh.in: new file -- gnome-config details
+	for the gdk-pixbuf-xlib library
+	* Makefile.am: build and install gdk_pixbuf_xlibConf.sh
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-render.c,
+	gdk-pixbuf/gdk-pixbuf-xlib.c, gdk-pixbuf/gdk-pixbuf-xlib.h,
+	gdk-pixbuf/gdk-pixbuf-xlib-private.h,
+	gdk-pixbuf/gdk-pixbuf-xlib-drawable.c: new files, ported the
+	GDK dependent parts of gdk-pixbuf to use Xlib. Functions that
+	were called gdk_pixbuf_FOO are now gdk_pixbuf_xlib_FOO
+
+	* gdk-pixbuf/gdk-pixbuf-xlibrgb.c,
+	gdk-pixbuf/gdk-pixbuf-xlibrgb.h: added Chris Blizzard's Xlib
+	port of GdkRGB (from Mozilla CVS)
+
+	* gdk-pixbuf/Makefile.am: build a library libgdk_pixbuf_xlib.la
+	including the non-GDK dependent objects from libgdk_pixbuf.la
+	plus the Xlib ports and xlibrgb
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -0,0 +1,32 @@
+
+lib_LTLIBRARIES=libgdk_pixbuf_xlib-1.3.la
+
+INCLUDES = -I$(top_srcdir) -I$(top_builddir) 	\
+	-I$(top_srcdir)/gdk-pixbuf 		\
+	-I$(top_srcdir)/contrib 		\
+	$(GLIB_CFLAGS)				\
+	@x_cflags@ 
+LDADDS = @STRIP_BEGIN@ 	\
+	@x_ldflags@	\
+	@x_libs@	\
+	@GLIB_LIBS@	\
+	-lm		\
+@STRIP_END@
+
+libgdk_pixbuf_xlib_1_3_la_LDFLAGS =         \
+	-export-dynamic
+
+libgdk_pixbuf_xlib_1_3_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
+
+
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: GdkPixbuf Xlib
+Description: GdkPixbuf rendering for Xlib
+Version: @VERSION@
+Requires: gobject-2.0,gmodule-2.0,gdk-pixbuf-2.0
+Libs: -L${libdir} -lgdk_pixbuf_xlib-1.3
+Cflags: -I${includedir}
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-private.h
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-private.h
@@ -0,0 +1,30 @@
+/* GdkPixbuf library - Xlib header file
+ *
+ * Authors: John Harper <john@dcs.warwick.ac.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef GDK_PIXBUF_XLIB_PRIVATE_H
+#define GDK_PIXBUF_XLIB_PRIVATE_H
+
+#include "gdk-pixbuf-xlib.h"
+#include <X11/Xlib.h>
+
+extern Display *gdk_pixbuf_dpy;
+extern int gdk_pixbuf_screen;
+
+#endif
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c
@@ -0,0 +1,398 @@
+/* GdkPixbuf library - Rendering functions
+ *
+ * Copyright (C) 1999 The Free Software Foundation
+ *
+ * Author: Federico Mena-Quintero <federico@gimp.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/* Trivially ported to Xlib(RGB) by John Harper. */
+
+#include <config.h>
+#include "gdk-pixbuf-private.h"
+#include "gdk-pixbuf-xlib-private.h"
+
+
+
+/**
+ * gdk_pixbuf_xlib_render_threshold_alpha:
+ * @pixbuf: A pixbuf.
+ * @bitmap: Bitmap where the bilevel mask will be painted to.
+ * @src_x: Source X coordinate.
+ * @src_y: source Y coordinate.
+ * @dest_x: Destination X coordinate.
+ * @dest_y: Destination Y coordinate.
+ * @width: Width of region to threshold.
+ * @height: Height of region to threshold.
+ * @alpha_threshold: Opacity values below this will be painted as zero; all
+ * other values will be painted as one.
+ *
+ * Takes the opacity values in a rectangular portion of a pixbuf and thresholds
+ * them to produce a bi-level alpha mask that can be used as a clipping mask for
+ * a drawable.
+ *
+ **/
+void
+gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap,
+					int src_x, int src_y,
+					int dest_x, int dest_y,
+					int width, int height,
+					int alpha_threshold)
+{
+	GC gc;
+	XColor color;
+	int x, y;
+	guchar *p;
+	int start, start_status;
+	int status;
+	XGCValues gcv;
+
+	g_return_if_fail (pixbuf != NULL);
+	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
+	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
+	g_return_if_fail (pixbuf->bits_per_sample == 8);
+
+	g_return_if_fail (bitmap != 0);
+	g_return_if_fail (width >= 0 && height >= 0);
+	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
+	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+
+	g_return_if_fail (alpha_threshold >= 0 && alpha_threshold <= 255);
+
+	if (width == 0 || height == 0)
+		return;
+
+	gc = XCreateGC (gdk_pixbuf_dpy, bitmap, 0, &gcv);
+
+	if (!pixbuf->has_alpha) {
+		color.pixel = (alpha_threshold == 255) ? 0 : 1;
+		XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
+		XFillRectangle (gdk_pixbuf_dpy, bitmap, gc,
+				dest_x, dest_y, width, height);
+		XFreeGC (gdk_pixbuf_dpy, gc);
+		return;
+	}
+
+	color.pixel = 0;
+	XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
+	XFillRectangle (gdk_pixbuf_dpy, bitmap, gc,
+			dest_x, dest_y, width, height);
+
+	color.pixel = 1;
+	XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
+
+	for (y = 0; y < height; y++) {
+		p = (pixbuf->pixels + (y + src_y) * pixbuf->rowstride + src_x * pixbuf->n_channels
+		     + pixbuf->n_channels - 1);
+
+		start = 0;
+		start_status = *p < alpha_threshold;
+
+		for (x = 0; x < width; x++) {
+			status = *p < alpha_threshold;
+
+			if (status != start_status) {
+				if (!start_status)
+					XDrawLine (gdk_pixbuf_dpy, bitmap, gc,
+						   start + dest_x, y + dest_y,
+						   x - 1 + dest_x, y + dest_y);
+
+				start = x;
+				start_status = status;
+			}
+
+			p += pixbuf->n_channels;
+		}
+
+		if (!start_status)
+			XDrawLine (gdk_pixbuf_dpy, bitmap, gc,
+				   start + dest_x, y + dest_y,
+				   x - 1 + dest_x, y + dest_y);
+	}
+
+	XFreeGC (gdk_pixbuf_dpy, gc);
+}
+
+
+
+/* Creates a buffer by stripping the alpha channel of a pixbuf */
+static guchar *
+remove_alpha (GdkPixbuf *pixbuf, int x, int y, int width, int height, int *rowstride)
+{
+	guchar *buf;
+	int xx, yy;
+	guchar *src, *dest;
+
+	g_assert (pixbuf->n_channels == 4);
+	g_assert (pixbuf->has_alpha);
+	g_assert (width > 0 && height > 0);
+	g_assert (x >= 0 && x + width <= pixbuf->width);
+	g_assert (y >= 0 && y + height <= pixbuf->height);
+
+	*rowstride = 4 * ((width * 3 + 3) / 4);
+
+	buf = g_new (guchar, *rowstride * height);
+
+	for (yy = 0; yy < height; yy++) {
+		src = pixbuf->pixels + pixbuf->rowstride * (yy + y) + x * pixbuf->n_channels;
+		dest = buf + *rowstride * yy;
+
+		for (xx = 0; xx < width; xx++) {
+			*dest++ = *src++;
+			*dest++ = *src++;
+			*dest++ = *src++;
+			src++;
+		}
+	}
+
+	return buf;
+}
+
+/**
+ * gdk_pixbuf_xlib_render_to_drawable:
+ * @pixbuf: A pixbuf.
+ * @drawable: Destination drawable.
+ * @gc: GC used for rendering.
+ * @src_x: Source X coordinate within pixbuf.
+ * @src_y: Source Y coordinate within pixbuf.
+ * @dest_x: Destination X coordinate within drawable.
+ * @dest_y: Destination Y coordinate within drawable.
+ * @width: Width of region to render, in pixels.
+ * @height: Height of region to render, in pixels.
+ * @dither: Dithering mode for XlibRGB.
+ * @x_dither: X offset for dither.
+ * @y_dither: Y offset for dither.
+ *
+ * Renders a rectangular portion of a pixbuf to a drawable while using the
+ * specified GC.  This is done using XlibRGB, so the specified drawable must
+ * have the XlibRGB visual and colormap.  Note that this function will ignore
+ * the opacity information for images with an alpha channel; the GC must already
+ * have the clipping mask set if you want transparent regions to show through.
+ *
+ * For an explanation of dither offsets, see the XlibRGB documentation.  In
+ * brief, the dither offset is important when re-rendering partial regions of an
+ * image to a rendered version of the full image, or for when the offsets to a
+ * base position change, as in scrolling.  The dither matrix has to be shifted
+ * for consistent visual results.  If you do not have any of these cases, the
+ * dither offsets can be both zero.
+ **/
+void
+gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
+				    Drawable drawable, GC gc,
+				    int src_x, int src_y,
+				    int dest_x, int dest_y,
+				    int width, int height,
+				    XlibRgbDither dither,
+				    int x_dither, int y_dither)
+{
+	guchar *buf;
+	int rowstride;
+
+	g_return_if_fail (pixbuf != NULL);
+	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
+	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
+	g_return_if_fail (pixbuf->bits_per_sample == 8);
+
+	g_return_if_fail (drawable != 0);
+	g_return_if_fail (gc != 0);
+
+	g_return_if_fail (width >= 0 && height >= 0);
+	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
+	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+
+	if (width == 0 || height == 0)
+		return;
+
+	/* This will have to be modified once we support other image types.
+	 * Also, GdkRGB does not have gdk_draw_rgb_32_image_dithalign(), so we
+	 * have to pack the buffer first.  Sigh.
+	 */
+
+	if (pixbuf->has_alpha)
+		buf = remove_alpha (pixbuf, src_x, src_y, width, height, &rowstride);
+	else {
+		buf = pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 3;
+		rowstride = pixbuf->rowstride;
+	}
+
+	xlib_draw_rgb_image_dithalign (drawable, gc,
+				       dest_x, dest_y,
+				       width, height,
+				       dither,
+				       buf, rowstride,
+				       x_dither, y_dither);
+
+	if (pixbuf->has_alpha)
+		g_free (buf);
+}
+
+
+
+/**
+ * gdk_pixbuf_xlib_render_to_drawable_alpha:
+ * @pixbuf: A pixbuf.
+ * @drawable: Destination drawable.
+ * @src_x: Source X coordinate within pixbuf.
+ * @src_y: Source Y coordinates within pixbuf.
+ * @dest_x: Destination X coordinate within drawable.
+ * @dest_y: Destination Y coordinate within drawable.
+ * @width: Width of region to render, in pixels.
+ * @height: Height of region to render, in pixels.
+ * @alpha_mode: If the image does not have opacity information, this is ignored.
+ * Otherwise, specifies how to handle transparency when rendering.
+ * @alpha_threshold: If the image does have opacity information and @alpha_mode
+ * is GDK_PIXBUF_ALPHA_BILEVEL, specifies the threshold value for opacity
+ * values.
+ * @dither: Dithering mode for XlibRGB.
+ * @x_dither: X offset for dither.
+ * @y_dither: Y offset for dither.
+ *
+ * Renders a rectangular portion of a pixbuf to a drawable.  This is done using
+ * XlibRGB, so the specified drawable must have the XlibRGB visual and colormap.
+ *
+ * When used with #GDK_PIXBUF_ALPHA_BILEVEL, this function has to create a bitmap
+ * out of the thresholded alpha channel of the image and, it has to set this
+ * bitmap as the clipping mask for the GC used for drawing.  This can be a
+ * significant performance penalty depending on the size and the complexity of
+ * the alpha channel of the image.  If performance is crucial, consider handling
+ * the alpha channel yourself (possibly by caching it in your application) and
+ * using gdk_pixbuf_xlib_render_to_drawable() or GdkRGB directly instead.
+ **/
+void
+gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, Drawable drawable,
+					  int src_x, int src_y,
+					  int dest_x, int dest_y,
+					  int width, int height,
+					  GdkPixbufAlphaMode alpha_mode,
+					  int alpha_threshold,
+					  XlibRgbDither dither,
+					  int x_dither, int y_dither)
+{
+	Pixmap bitmap = 0;
+	GC gc;
+	XGCValues gcv;
+
+	g_return_if_fail (pixbuf != NULL);
+	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
+	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
+	g_return_if_fail (pixbuf->bits_per_sample == 8);
+
+	g_return_if_fail (drawable != 0);
+	g_return_if_fail (width >= 0 && height >= 0);
+	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
+	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+
+	if (width == 0 || height == 0)
+		return;
+
+	gc = XCreateGC (gdk_pixbuf_dpy, drawable, 0, &gcv);
+
+	if (pixbuf->has_alpha) {
+		/* Right now we only support GDK_PIXBUF_ALPHA_BILEVEL, so we
+		 * unconditionally create the clipping mask.
+		 */
+
+		bitmap = XCreatePixmap (gdk_pixbuf_dpy,
+					RootWindow (gdk_pixbuf_dpy,
+						    gdk_pixbuf_screen),
+					width, height, 1);
+		gdk_pixbuf_xlib_render_threshold_alpha (pixbuf, bitmap,
+							src_x, src_y,
+							0, 0,
+							width, height,
+							alpha_threshold);
+
+		XSetClipMask (gdk_pixbuf_dpy, gc, bitmap);
+		XSetClipOrigin (gdk_pixbuf_dpy, gc, dest_x, dest_y);
+	}
+
+	gdk_pixbuf_xlib_render_to_drawable (pixbuf, drawable, gc,
+					    src_x, src_y,
+					    dest_x, dest_y,
+					    width, height,
+					    dither,
+					    x_dither, y_dither);
+
+	if (bitmap)
+	        XFreePixmap (gdk_pixbuf_dpy, bitmap);
+
+	XFreeGC (gdk_pixbuf_dpy, gc);
+}
+
+/**
+ * gdk_pixbuf_xlib_render_pixmap_and_mask:
+ * @pixbuf: A pixbuf.
+ * @pixmap_return: Return value for the created pixmap.
+ * @mask_return: Return value for the created mask.
+ * @alpha_threshold: Threshold value for opacity values.
+ *
+ * Creates a pixmap and a mask bitmap which are returned in the @pixmap_return
+ * and @mask_return arguments, respectively, and renders a pixbuf and its
+ * corresponding tresholded alpha mask to them.  This is merely a convenience
+ * function; applications that need to render pixbufs with dither offsets or to
+ * given drawables should use gdk_pixbuf_xlib_render_to_drawable_alpha() or
+ * gdk_pixbuf_xlib_render_to_drawable(), and
+ * gdk_pixbuf_xlib_render_threshold_alpha().
+ *
+ * If the pixbuf does not have an alpha channel, then *@mask_return will be set
+ * to None.
+ **/
+void
+gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
+					Pixmap *pixmap_return,
+					Pixmap *mask_return,
+					int alpha_threshold)
+{
+        g_return_if_fail (pixbuf != NULL);
+
+	if (pixmap_return) {
+		GC gc;
+		XGCValues gcv;
+
+		*pixmap_return = XCreatePixmap (gdk_pixbuf_dpy,
+						RootWindow (gdk_pixbuf_dpy,
+							    gdk_pixbuf_screen),
+						pixbuf->width,
+						pixbuf->height,
+						xlib_rgb_get_depth ());
+		gc = XCreateGC (gdk_pixbuf_dpy, *pixmap_return, 0, &gcv);
+		gdk_pixbuf_xlib_render_to_drawable (pixbuf, *pixmap_return, gc,
+						    0, 0, 0, 0,
+						    pixbuf->width,
+						    pixbuf->height,
+						    XLIB_RGB_DITHER_NORMAL,
+						    0, 0);
+		XFreeGC (gdk_pixbuf_dpy, gc);
+	}
+
+	if (mask_return) {
+		if (pixbuf->has_alpha) {
+		    *mask_return = XCreatePixmap (gdk_pixbuf_dpy,
+						  RootWindow (gdk_pixbuf_dpy,
+							      gdk_pixbuf_screen),
+						  pixbuf->width,
+						  pixbuf->height, 1);
+		    gdk_pixbuf_xlib_render_threshold_alpha (pixbuf,
+							    *mask_return,
+							    0, 0, 0, 0,
+							    pixbuf->width,
+							    pixbuf->height,
+							    alpha_threshold);
+		} else
+			*mask_return = 0;
+	}
+}
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c
@@ -0,0 +1,63 @@
+/* GdkPixbuf library - Initialization functions
+ *
+ * Author: John Harper <john@dcs.warwick.ac.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <config.h>
+#include <X11/Xlib.h>
+#include <gdk-pixbuf/gdk-pixbuf-private.h>
+#include "gdk-pixbuf-xlib-private.h"
+
+Display *gdk_pixbuf_dpy = NULL;
+int gdk_pixbuf_screen = -1;
+
+/**
+ * gdk_pixbuf_xlib_init:
+ * @display: X display to use.
+ * @screen_num: Screen number.
+ * 
+ * Initializes the gdk-pixbuf Xlib machinery by calling xlib_rgb_init().  This
+ * function should be called near the beginning of your program, or before using
+ * any of the gdk-pixbuf-xlib functions.
+ **/
+void
+gdk_pixbuf_xlib_init (Display *display, int screen_num)
+{
+    xlib_rgb_init (display, ScreenOfDisplay (display, screen_num));
+    gdk_pixbuf_dpy = display;
+    gdk_pixbuf_screen = screen_num;
+}
+
+/**
+ * gdk_pixbuf_xlib_init_with_depth:
+ * @display: X display to use.
+ * @screen_num: Screen number.
+ * @prefDepth: Preferred depth for XlibRGB.
+ * 
+ * Similar to gdk_pixbuf_xlib_init(), but also lets you specify the preferred
+ * depth for XlibRGB if you do not want it to use the default depth it picks.
+ **/
+void
+gdk_pixbuf_xlib_init_with_depth (Display *display,
+				 int screen_num, int prefDepth)
+{
+    xlib_rgb_init_with_depth (display, ScreenOfDisplay (display, screen_num),
+			      prefDepth);
+    gdk_pixbuf_dpy = display;
+    gdk_pixbuf_screen = screen_num;
+}
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
@@ -0,0 +1,82 @@
+/* GdkPixbuf library - Xlib header file
+ *
+ * Authors: John Harper <john@dcs.warwick.ac.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef GDK_PIXBUF_XLIB_H
+#define GDK_PIXBUF_XLIB_H
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
+#include <X11/Xlib.h>
+
+
+
+/* init */
+
+void gdk_pixbuf_xlib_init (Display *display, int screen_num);
+
+void gdk_pixbuf_xlib_init_with_depth (Display *display, int screen_num,
+				      int prefDepth);
+
+
+
+/* render */
+
+void gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap,
+					     int src_x, int src_y,
+					     int dest_x, int dest_y,
+					     int width, int height,
+					     int alpha_threshold);
+
+void gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
+					 Drawable drawable, GC gc,
+					 int src_x, int src_y,
+					 int dest_x, int dest_y,
+					 int width, int height,
+					 XlibRgbDither dither,
+					 int x_dither, int y_dither);
+
+
+void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
+					       Drawable drawable,
+					       int src_x, int src_y,
+					       int dest_x, int dest_y,
+					       int width, int height,
+					       GdkPixbufAlphaMode alpha_mode,
+					       int alpha_threshold,
+					       XlibRgbDither dither,
+					       int x_dither, int y_dither);
+
+void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
+					     Pixmap *pixmap_return,
+					     Pixmap *mask_return,
+					     int alpha_threshold);
+
+
+
+/* drawable */
+
+GdkPixbuf *gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest,
+					      Drawable src,
+					      Colormap cmap, Visual *visual,
+					      int src_x, int src_y,
+					      int dest_x, int dest_y,
+					      int width, int height);
+
+#endif /* GDK_PIXBUF_XLIB_H */
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
@@ -0,0 +1,195 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "MPL"); you may not use this file except in
+ * compliance with the MPL.  You may obtain a copy of the MPL at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the MPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL
+ * for the specific language governing rights and limitations under the
+ * MPL.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU Library General Public License (the "LGPL"), in
+ * which case the provisions of the LGPL are applicable instead of
+ * those above.  If you wish to allow use of your version of this file
+ * only under the terms of the LGPL and not to allow others to use
+ * your version of this file under the MPL, indicate your decision by
+ * deleting the provisions above and replace them with the notice and
+ * other provisions required by the LGPL.  If you do not delete the
+ * provisions above, a recipient may use your version of this file
+ * under either the MPL or the LGPL.
+ */
+
+/*
+ * This code is derived from GdkRgb.
+ * For more information on GdkRgb, see http://www.levien.com/gdkrgb/
+ * Raph Levien <raph@acm.org>
+ */
+
+/* Ported by Christopher Blizzard to Xlib.  With permission from the
+ * original authors of this file, the contents of this file are also
+ * redistributable under the terms of the Mozilla Public license.  For
+ * information about the Mozilla Public License, please see the
+ * license information at http://www.mozilla.org/MPL/
+ */
+
+/* This code is copyright the following authors:
+ * Raph Levien          <raph@acm.org>
+ * Manish Singh         <manish@gtk.org>
+ * Tim Janik            <timj@gtk.org>
+ * Peter Mattis         <petm@xcf.berkeley.edu>
+ * Spencer Kimball      <spencer@xcf.berkeley.edu>
+ * Josh MacDonald       <jmacd@xcf.berkeley.edu>
+ * Christopher Blizzard <blizzard@redhat.com>
+ * Owen Taylor          <otaylor@redhat.com>
+ * Shawn T. Amundson    <amundson@gtk.org>
+*/
+
+
+#ifndef __XLIB_RGB_H__
+#define __XLIB_RGB_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xos.h>
+#include <X11/Intrinsic.h>
+
+#include <glib.h>
+
+typedef struct _XlibRgbCmap XlibRgbCmap;
+
+struct _XlibRgbCmap {
+  unsigned int colors[256];
+  unsigned char lut[256]; /* for 8-bit modes */
+};
+
+void
+xlib_rgb_init (Display *display, Screen *screen);
+void
+xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth);
+
+unsigned long
+xlib_rgb_xpixel_from_rgb (guint32 rgb);
+
+void
+xlib_rgb_gc_set_foreground (GC gc, guint32 rgb);
+
+void
+xlib_rgb_gc_set_background (GC gc, guint32 rgb);
+
+typedef enum
+{
+  XLIB_RGB_DITHER_NONE,
+  XLIB_RGB_DITHER_NORMAL,
+  XLIB_RGB_DITHER_MAX
+} XlibRgbDither;
+
+void
+xlib_draw_rgb_image (Drawable drawable,
+		     GC gc,
+		     int x,
+		     int y,
+		     int width,
+		     int height,
+		     XlibRgbDither dith,
+		     unsigned char *rgb_buf,
+		     int rowstride);
+
+void
+xlib_draw_rgb_image_dithalign (Drawable drawable,
+			       GC gc,
+			       int x,
+			       int y,
+			       int width,
+			       int height,
+			       XlibRgbDither dith,
+			       unsigned char *rgb_buf,
+			       int rowstride,
+			       int xdith,
+			       int ydith);
+
+void
+xlib_draw_rgb_32_image (Drawable drawable,
+			GC gc,
+			int x,
+			int y,
+			int width,
+			int height,
+			XlibRgbDither dith,
+			unsigned char *buf,
+			int rowstride);
+
+void
+xlib_draw_gray_image (Drawable drawable,
+		      GC gc,
+		      int x,
+		      int y,
+		      int width,
+		      int height,
+		      XlibRgbDither dith,
+		      unsigned char *buf,
+		      int rowstride);
+
+XlibRgbCmap *
+xlib_rgb_cmap_new (guint32 *colors, int n_colors);
+
+void
+xlib_rgb_cmap_free (XlibRgbCmap *cmap);
+
+void
+xlib_draw_indexed_image (Drawable drawable,
+                         GC gc,
+                         int x,
+                         int y,
+                         int width,
+                         int height,
+                         XlibRgbDither dith,
+                         unsigned char *buf,
+                         int rowstride,
+                         XlibRgbCmap *cmap);
+
+/* Below are some functions which are primarily useful for debugging
+   and experimentation. */
+Bool
+xlib_rgb_ditherable (void);
+
+void
+xlib_rgb_set_verbose (Bool verbose);
+
+/* experimental colormap stuff */
+void
+xlib_rgb_set_install (Bool install);
+
+void
+xlib_rgb_set_min_colors (int min_colors);
+
+Colormap
+xlib_rgb_get_cmap (void);
+
+Visual *
+xlib_rgb_get_visual (void);
+
+XVisualInfo *
+xlib_rgb_get_visual_info (void);
+
+int
+xlib_rgb_get_depth (void);
+
+Display *
+xlib_rgb_get_display (void);
+
+Screen *
+xlib_rgb_get_screen (void);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __XLIB_RGB_H__ */
--- a/demos/.cvsignore
+++ b/demos/.cvsignore
@@ -0,0 +1,11 @@
+Makefile
+Makefile.in
+.libs
+.deps
+testanimation
+test-inline-pixbufs.h
+testpixbuf-drawable
+testpixbuf-scale
+testpixbuf-save
+testpixbuf
+pixbuf-demo
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -0,0 +1,81 @@
+## Makefile.am for gtk+/demos
+
+SUBDIRS = gtk-demo
+
+INCLUDES = @STRIP_BEGIN@ \
+	-I$(top_srcdir) 				\
+	-I$(top_builddir)/gdk				\
+	-DGTK_DISABLE_COMPAT_H				\
+	-DGTK_DISABLE_DEPRECATED			\
+	@GTK_DEBUG_FLAGS@				\
+	@GTK_XIM_FLAGS@					\
+	@GTK_LOCALE_FLAGS@				\
+	@PANGO_CFLAGS@					\
+	@GLIB_CFLAGS@					\
+	@more_cflags@					\
+@STRIP_END@
+
+DEPS = \
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la	\
+	$(top_builddir)/gdk/@gdktargetlib@ 		\
+	$(top_builddir)/gtk/@gtktargetlib@
+
+LDADDS = @STRIP_BEGIN@ 					\
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la	\
+	$(top_builddir)/gdk/@gdktargetlib@        	\
+	$(top_builddir)/gtk/@gtktargetlib@ 		\
+	@more_ldflags@					\
+	@more_libs@					\
+	@GDK_WLIBS@					\
+	@PANGO_LIBS@					\
+	@GLIB_LIBS@					\
+	@GTK_LIBS_EXTRA@				\
+	-lm						\
+@STRIP_END@
+
+noinst_PROGRAMS = 		\
+	testpixbuf 		\
+	testpixbuf-drawable 	\
+	testanimation 		\
+	testpixbuf-save		\
+	testpixbuf-scale 	\
+	pixbuf-demo
+
+BUILT_SOURCES=test-inline-pixbufs.h
+
+test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/make-inline-pixbuf apple-red.png gnome-foot.png
+	(topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \
+         cd $(srcdir) &&				     \
+            GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/make-inline-pixbuf $$curdir/test-inline-pixbufs.h  apple_red apple-red.png gnome_foot gnome-foot.png)
+
+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
--- 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
@@ -0,0 +1,7 @@
+Makefile
+Makefile.in
+.libs
+.deps
+gtk-demo
+demos.h
+
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -0,0 +1,66 @@
+## Makefile.am for gtk+/demos
+
+democodedir=$(datadir)/gtk-2.0/demo
+
+demos = @STRIP_BEGIN@	\
+	button_box.c	\
+	item_factory.c	\
+	menus.c		\
+	panes.c		\
+	dialog.c	\
+	textview.c	\
+@STRIP_END@
+
+INCLUDES = @STRIP_BEGIN@ \
+	-DDEMOCODEDIR="\"$(democodedir)\""		\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir)/gdk				\
+	-DGDK_DISABLE_COMPAT_H				\
+	-DGDK_DISABLE_DEPRECATED			\
+	-DGTK_DISABLE_COMPAT_H				\
+	-DGTK_DISABLE_DEPRECATED 			\
+	@GTK_DEBUG_FLAGS@				\
+	@GTK_XIM_FLAGS@					\
+	@GTK_LOCALE_FLAGS@				\
+	@PANGO_CFLAGS@					\
+	@GLIB_CFLAGS@					\
+	@more_cflags@					\
+@STRIP_END@
+
+DEPS = \
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la	\
+	$(top_builddir)/gdk/@gdktargetlib@ 		\
+	$(top_builddir)/gtk/@gtktargetlib@
+
+LDADDS = @STRIP_BEGIN@ 					\
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la	\
+	$(top_builddir)/gdk/@gdktargetlib@        	\
+	$(top_builddir)/gtk/@gtktargetlib@ 		\
+	@more_ldflags@					\
+	@more_libs@					\
+	@GDK_WLIBS@					\
+	@PANGO_LIBS@					\
+	@GLIB_LIBS@					\
+	@GTK_LIBS_EXTRA@				\
+	-lm						\
+@STRIP_END@
+
+bin_PROGRAMS = gtk-demo
+
+BUILT_SOURCES = demos.h
+
+EXTRA_DIST = \
+	geninclude.pl
+
+demos.h: $(demos) geninclude.pl
+	(cd $(srcdir) && ./geninclude.pl $(demos) > demos.h)
+
+gtk_demo_SOURCES = 		\
+	$(demos)		\
+	main.c			\
+	demos.h
+
+gtk_demo_DEPENDENCIES = $(DEPS)
+gtk_demo_LDADD = $(LDADDS)
+
+democode_DATA = $(demos)
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -0,0 +1,126 @@
+/* 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_BUTTON_OK);
+  gtk_container_add (GTK_CONTAINER (bbox), button);
+  
+  button = gtk_button_new_from_stock (GTK_STOCK_BUTTON_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 (void)
+{
+  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_title (GTK_WINDOW (window), "Button Boxes");
+    
+    gtk_signal_connect (GTK_OBJECT (window), "destroy",
+			GTK_SIGNAL_FUNC(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/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -0,0 +1,174 @@
+/* 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_BUTTON_OK,
+					GTK_RESPONSE_OK,
+					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 (void)
+{
+  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_title (GTK_WINDOW (window), "Dialogs");
+
+      gtk_signal_connect (GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC (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");
+      gtk_signal_connect (GTK_OBJECT (button), "clicked",
+			  GTK_SIGNAL_FUNC (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");
+      gtk_signal_connect (GTK_OBJECT (button), "clicked",
+			  GTK_SIGNAL_FUNC (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/geninclude.pl
+++ b/demos/gtk-demo/geninclude.pl
@@ -0,0 +1,42 @@
+#!/usr/bin/perl -w
+
+print <<EOT;
+typedef	GtkWidget *(*GDoDemoFunc) (void);
+
+typedef struct _Demo Demo;
+
+struct _Demo 
+{
+  gchar *title;
+  gchar *filename;
+  GDoDemoFunc func;
+};
+
+EOT
+
+$array = "";
+$first = 1;
+for $file (@ARGV) {
+    
+    ($basename = $file) =~ s/\.c$//;
+
+    if ($first) {
+	$first = 0;
+    } else {
+	$array .= ",\n";
+    }
+
+    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 (void);\n";
+    $array .= qq(  { "$title", "$file", do_$basename });
+}
+
+print "\nDemo testgtk_demos[] = {";
+print $array;
+print "\n};\n";
--- a/demos/gtk-demo/geninclude.pl.in
+++ b/demos/gtk-demo/geninclude.pl.in
@@ -0,0 +1,42 @@
+#!/usr/bin/perl -w
+
+print <<EOT;
+typedef	GtkWidget *(*GDoDemoFunc) (void);
+
+typedef struct _Demo Demo;
+
+struct _Demo 
+{
+  gchar *title;
+  gchar *filename;
+  GDoDemoFunc func;
+};
+
+EOT
+
+$array = "";
+$first = 1;
+for $file (@ARGV) {
+    
+    ($basename = $file) =~ s/\.c$//;
+
+    if ($first) {
+	$first = 0;
+    } else {
+	$array .= ",\n";
+    }
+
+    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 (void);\n";
+    $array .= qq(  { "$title", "$file", do_$basename });
+}
+
+print "\nDemo testgtk_demos[] = {";
+print $array;
+print "\n};\n";
--- a/demos/gtk-demo/item_factory.c
+++ b/demos/gtk-demo/item_factory.c
@@ -0,0 +1,123 @@
+/* Item Factory
+ *
+ * The GtkItemFactory object allows the easy creation of menus
+ * from an array of descriptions of menu items.
+ */
+
+#include <gtk/gtk.h>
+
+static void
+gtk_ifactory_cb (gpointer             callback_data,
+		 guint                callback_action,
+		 GtkWidget           *widget)
+{
+  g_message ("ItemFactory: activated \"%s\"", gtk_item_factory_path_from_widget (widget));
+}
+
+static GtkItemFactoryEntry menu_items[] =
+{
+  { "/_File",            NULL,         0,                     0, "<Branch>" },
+  { "/File/tearoff1",    NULL,         gtk_ifactory_cb,       0, "<Tearoff>" },
+  { "/File/_New",        "<control>N", gtk_ifactory_cb,       0 },
+  { "/File/_Open",       "<control>O", gtk_ifactory_cb,       0 },
+  { "/File/_Save",       "<control>S", gtk_ifactory_cb,       0 },
+  { "/File/Save _As...", NULL,         gtk_ifactory_cb,       0 },
+  { "/File/sep1",        NULL,         gtk_ifactory_cb,       0, "<Separator>" },
+  { "/File/_Quit",       "<control>Q", gtk_ifactory_cb,       0 },
+
+  { "/_Preferences",     		NULL, 0,               0, "<Branch>" },
+  { "/_Preferences/_Color", 		NULL, 0,               0, "<Branch>" },
+  { "/_Preferences/Color/_Red",      	NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
+  { "/_Preferences/Color/_Green",   	NULL, gtk_ifactory_cb, 0, "/Preferences/Color/Red" },
+  { "/_Preferences/Color/_Blue",        NULL, gtk_ifactory_cb, 0, "/Preferences/Color/Red" },
+  { "/_Preferences/_Shape", 		NULL, 0,               0, "<Branch>" },
+  { "/_Preferences/Shape/_Square",      NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
+  { "/_Preferences/Shape/_Rectangle",   NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Square" },
+  { "/_Preferences/Shape/_Oval",        NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Rectangle" },
+
+  { "/_Help",            NULL,         0,                     0, "<LastBranch>" },
+  { "/Help/_About",      NULL,         gtk_ifactory_cb,       0 },
+};
+
+static int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
+
+GtkWidget *
+do_item_factory (void)
+{
+  static GtkWidget *window = NULL;
+  
+  if (!window)
+    {
+      GtkWidget *box1;
+      GtkWidget *box2;
+      GtkWidget *separator;
+      GtkWidget *label;
+      GtkWidget *button;
+      GtkAccelGroup *accel_group;
+      GtkItemFactory *item_factory;
+      
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      
+      gtk_signal_connect (GTK_OBJECT (window), "destroy",
+			  GTK_SIGNAL_FUNC(gtk_widget_destroyed),
+			  &window);
+      gtk_signal_connect (GTK_OBJECT (window), "delete-event",
+			  GTK_SIGNAL_FUNC (gtk_true),
+			  NULL);
+      
+      accel_group = gtk_accel_group_new ();
+      item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
+      gtk_object_set_data_full (GTK_OBJECT (window),
+				"<main>",
+				item_factory,
+				(GtkDestroyNotify) gtk_object_unref);
+      gtk_accel_group_attach (accel_group, GTK_OBJECT (window));
+      gtk_window_set_title (GTK_WINDOW (window), "Item Factory");
+      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
+      gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, NULL);
+
+      /* preselect /Preferences/Shape/Oval over the other radios
+       */
+      gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory,
+										      "/Preferences/Shape/Oval")),
+				      TRUE);
+
+      box1 = gtk_vbox_new (FALSE, 0);
+      gtk_container_add (GTK_CONTAINER (window), box1);
+      
+      gtk_box_pack_start (GTK_BOX (box1),
+			  gtk_item_factory_get_widget (item_factory, "<main>"),
+			  FALSE, FALSE, 0);
+
+      label = gtk_label_new ("Type\n<alt>\nto start");
+      gtk_widget_set_usize (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");
+      gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
+				 GTK_SIGNAL_FUNC(gtk_widget_destroy),
+				 GTK_OBJECT (window));
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+      gtk_widget_grab_default (button);
+
+      gtk_widget_show_all (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -0,0 +1,500 @@
+#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
+};
+
+typedef struct _CallbackData CallbackData;
+struct _CallbackData
+{
+  GtkTreeModel *model;
+  GtkTreePath *path;
+};
+
+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;
+  
+  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))
+    {
+      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);
+
+  file = fopen (filename, "r");
+
+  if (!file)
+    {
+      char *installed = g_strconcat (DEMOCODEDIR,
+                                     G_DIR_SEPARATOR_S,
+                                     filename,
+                                     NULL);
+
+      file = fopen (installed, "r");
+
+      g_free (installed);
+    }
+  
+  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);
+
+  g_string_free (buffer, TRUE);
+}
+
+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,
+                                     NULL,
+				     NULL);
+
+      if (path)
+	{
+	  GtkTreeIter iter;
+	  gboolean italic;
+	  GDoDemoFunc func;
+	  GtkWidget *window;
+
+	  gtk_tree_model_get_iter (model, &iter, path);
+	  gtk_tree_model_get (GTK_TREE_MODEL (model),
+			      &iter,
+			      FUNC_COLUMN, &func,
+			      ITALIC_COLUMN, &italic,
+			      -1);
+	  gtk_tree_store_set (GTK_TREE_STORE (model),
+			      &iter,
+			      ITALIC_COLUMN, !italic,
+			      -1);
+	  window = (func) ();
+	  if (window != NULL)
+	    {
+	      CallbackData *cbdata;
+
+	      cbdata = g_new (CallbackData, 1);
+	      cbdata->model = model;
+	      cbdata->path = path;
+
+	      gtk_signal_connect (GTK_OBJECT (window),
+                                  "destroy",
+                                  window_closed_cb,
+                                  cbdata);
+	    }
+	  else
+	    {
+	      gtk_tree_path_free (path);
+	    }
+	}
+
+      gtk_signal_emit_stop_by_name (GTK_OBJECT (tree_view),
+				    "button_press_event");
+      return TRUE;
+    }
+  
+  return FALSE;
+}
+
+gboolean
+row_activated_cb (GtkTreeView       *tree_view,
+		  GtkTreePath       *path,
+		  GtkTreeViewColumn *column,
+		  GtkTreeModel      *model)
+{
+  GtkTreeIter iter;
+  gboolean italic;
+  GDoDemoFunc func;
+  GtkWidget *window;
+  
+  gtk_tree_model_get_iter (model, &iter, path);
+  gtk_tree_model_get (GTK_TREE_MODEL (model),
+		      &iter,
+		      FUNC_COLUMN, &func,
+		      ITALIC_COLUMN, &italic,
+		      -1);
+  gtk_tree_store_set (GTK_TREE_STORE (model),
+		      &iter,
+		      ITALIC_COLUMN, !italic,
+		      -1);
+  window = (func) ();
+  if (window != NULL)
+    {
+      CallbackData *cbdata;
+      
+      cbdata = g_new (CallbackData, 1);
+      cbdata->model = model;
+      cbdata->path = gtk_tree_path_copy (path);
+      
+      gtk_signal_connect (GTK_OBJECT (window),
+			  "destroy",
+			  window_closed_cb,
+			  cbdata);
+    }
+  else
+    {
+      gtk_tree_path_free (path);
+    }
+}
+
+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_mode (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 ();
+
+  g_object_set (G_OBJECT (cell),
+                "style", PANGO_STYLE_ITALIC,
+                NULL);
+  
+  column = gtk_tree_view_column_new_with_attributes ("Widget (double click for demo)",
+						     cell,
+						     "text", TITLE_COLUMN,
+						     "style_set", 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), "row_activated", GTK_SIGNAL_FUNC (row_activated_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_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 (info_buffer, "source",
+                                    "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/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -0,0 +1,198 @@
+/* Menus
+ *
+ * GTK+ includes a number of widgets for menus of actions.
+ * GtkMenu is a drop-down menu, GtkMenuBar a horizontal menu bar.
+ * Each of these widgets can hold various types of menuitem.
+ * As well as the base type, GtkMenuItem, there are GtkCheckMenuItem,
+ * GtkRadioMenuItem and GtkTearoffMenuItem.
+ */
+
+#include <stdio.h>
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.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_group (GTK_RADIO_MENU_ITEM (menuitem));
+      if (depth % 2)
+	gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (menuitem), TRUE);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+      gtk_widget_show (menuitem);
+      if (i == 3)
+	gtk_widget_set_sensitive (menuitem, FALSE);
+
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (depth - 1, TRUE));
+    }
+
+  return menu;
+}
+
+GtkWidget *
+do_menus (void)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *box1;
+  GtkWidget *box2;
+  GtkWidget *button;
+  GtkWidget *optionmenu;
+  GtkWidget *separator;
+  
+  if (!window)
+    {
+      GtkWidget *menubar;
+      GtkWidget *menu;
+      GtkWidget *menuitem;
+      GtkAccelGroup *accel_group;
+      
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      
+      gtk_signal_connect (GTK_OBJECT (window), "destroy",
+			  GTK_SIGNAL_FUNC(gtk_widget_destroyed),
+			  &window);
+      gtk_signal_connect (GTK_OBJECT (window), "delete-event",
+			  GTK_SIGNAL_FUNC (gtk_true),
+			  NULL);
+      
+      accel_group = gtk_accel_group_new ();
+      gtk_accel_group_attach (accel_group, GTK_OBJECT (window));
+
+      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_bar_append (GTK_MENU_BAR (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_bar_append (GTK_MENU_BAR (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_right_justify (GTK_MENU_ITEM (menuitem));
+      gtk_menu_bar_append (GTK_MENU_BAR (menubar), menuitem);
+      gtk_widget_show (menuitem);
+      
+      box2 = gtk_vbox_new (FALSE, 10);
+      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
+      gtk_widget_show (box2);
+      
+      menu = create_menu (1, FALSE);
+      gtk_menu_set_accel_group (GTK_MENU (menu), accel_group);
+      
+      menuitem = gtk_separator_menu_item_new ();
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+      gtk_widget_show (menuitem);
+      
+      menuitem = gtk_check_menu_item_new_with_label ("Accelerate Me");
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+      gtk_widget_show (menuitem);
+      gtk_widget_add_accelerator (menuitem,
+				  "activate",
+				  accel_group,
+				  GDK_F1,
+				  0,
+				  GTK_ACCEL_VISIBLE | GTK_ACCEL_SIGNAL_VISIBLE);
+      menuitem = gtk_check_menu_item_new_with_label ("Accelerator Locked");
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+      gtk_widget_show (menuitem);
+      gtk_widget_add_accelerator (menuitem,
+				  "activate",
+				  accel_group,
+				  GDK_F2,
+				  0,
+				  GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED);
+      menuitem = gtk_check_menu_item_new_with_label ("Accelerators Frozen");
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+      gtk_widget_show (menuitem);
+      gtk_widget_add_accelerator (menuitem,
+				  "activate",
+				  accel_group,
+				  GDK_F2,
+				  0,
+				  GTK_ACCEL_VISIBLE);
+      gtk_widget_add_accelerator (menuitem,
+				  "activate",
+				  accel_group,
+				  GDK_F3,
+				  0,
+				  GTK_ACCEL_VISIBLE);
+      gtk_widget_lock_accelerators (menuitem);
+      
+      optionmenu = gtk_option_menu_new ();
+      gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
+      gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), 3);
+      gtk_box_pack_start (GTK_BOX (box2), optionmenu, TRUE, TRUE, 0);
+      gtk_widget_show (optionmenu);
+
+      separator = gtk_hseparator_new ();
+      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+      gtk_widget_show (separator);
+
+      box2 = gtk_vbox_new (FALSE, 10);
+      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
+      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
+      gtk_widget_show (box2);
+
+      button = gtk_button_new_with_label ("close");
+      gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
+				 GTK_SIGNAL_FUNC(gtk_widget_destroy),
+				 GTK_OBJECT (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
@@ -0,0 +1,195 @@
+/* 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);
+  gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
+		      GTK_SIGNAL_FUNC (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);
+  gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
+		      GTK_SIGNAL_FUNC (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);
+  gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
+		      GTK_SIGNAL_FUNC (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);
+  gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
+		      GTK_SIGNAL_FUNC (toggle_shrink),
+		      paned->child2);
+
+  return frame;
+}
+
+GtkWidget *
+do_panes (void)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *frame;
+  GtkWidget *hpaned;
+  GtkWidget *vpaned;
+  GtkWidget *button;
+  GtkWidget *vbox;
+
+  if (!window)
+    {
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+      gtk_signal_connect (GTK_OBJECT (window), "destroy",
+			  GTK_SIGNAL_FUNC(gtk_widget_destroyed),
+			  &window);
+
+      gtk_window_set_title (GTK_WINDOW (window), "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_usize (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_usize (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_usize (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/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -0,0 +1,408 @@
+/* Text Widget
+ *
+ * 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>
+
+/* Don't copy this bad example; inline RGB data is always a better
+ * idea than inline XPMs.
+ */
+static char  *book_closed_xpm[] = {
+"16 16 6 1",
+"       c None s None",
+".      c black",
+"X      c red",
+"o      c yellow",
+"O      c #808080",
+"#      c white",
+"                ",
+"       ..       ",
+"     ..XX.      ",
+"   ..XXXXX.     ",
+" ..XXXXXXXX.    ",
+".ooXXXXXXXXX.   ",
+"..ooXXXXXXXXX.  ",
+".X.ooXXXXXXXXX. ",
+".XX.ooXXXXXX..  ",
+" .XX.ooXXX..#O  ",
+"  .XX.oo..##OO. ",
+"   .XX..##OO..  ",
+"    .X.#OO..    ",
+"     ..O..      ",
+"      ..        ",
+"                "
+};
+
+
+#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", 20 * 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", 30 * PANGO_SCALE, 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 (G_OBJECT (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;
+
+  pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) book_closed_xpm);
+  
+  /* 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.\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üd) Grüß Gott\nGreek (Ελληνικά) Γειά σας\nHebrew   שלום\nJapanese (日本語)\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, "وقد بدأ ثلاث من أكثر المؤسسات تقدما في شبكة اكسيون برامجها كمنظمات لا تسعى للربح، ثم تحولت في السنوات الخمس الماضية إلى مؤسسات مالية منظمة، وباتت جزءا من النظام المالي في بلدانها، ولكنها تتخصص في خدمة قطاع المشروعات الصغيرة. وأحد أكثر هذه المؤسسات نجاحا هو »بانكوسول« في بوليفيا.\n\n", -1,
+                                                "rtl_quote", NULL);
+  
+  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 (G_OBJECT (pixbuf));
+}
+
+GtkWidget *
+do_textview (void)
+{
+  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_default_size (GTK_WINDOW (window),
+                                   450, 450);
+      
+      gtk_signal_connect (GTK_OBJECT (window), "destroy",
+			  GTK_SIGNAL_FUNC(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);
+      
+      gtk_widget_show_all (vpaned);
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    {
+      gtk_widget_show (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}
+
--- a/demos/pixbuf-demo.c
+++ b/demos/pixbuf-demo.c
@@ -0,0 +1,234 @@
+/* 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;
+int back_width, back_height;
+
+/* Images */
+static GdkPixbuf *images[N_IMAGES];
+
+/* Widgets */
+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 * M_PI * (double) i / N_IMAGES - f * 2.0 * M_PI;
+
+		iw = gdk_pixbuf_get_width (images[i]);
+		ih = gdk_pixbuf_get_height (images[i]);
+
+		r = radius + (radius / 3.0) * sin (f * 2.0 * M_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 * M_PI) : cos (f * 2.0 * M_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 * M_PI)))
+					       : MAX (127, fabs (255 * cos (f * 2.0 * M_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)
+{
+	gtk_timeout_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);
+	gdk_rgb_init ();
+
+	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_usize (window, back_width, back_height);
+	gtk_window_set_policy (GTK_WINDOW (window), FALSE, FALSE, FALSE);
+
+	gtk_signal_connect (GTK_OBJECT (window), "destroy",
+			    GTK_SIGNAL_FUNC (destroy_cb), NULL);
+
+	da = gtk_drawing_area_new ();
+
+	gtk_signal_connect (GTK_OBJECT (da), "expose_event",
+			    GTK_SIGNAL_FUNC (expose_cb), NULL);
+
+	gtk_container_add (GTK_CONTAINER (window), da);
+
+	timeout_id = gtk_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
@@ -0,0 +1,19 @@
+#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 ()
+{
+  if (file_exists ("../gdk-pixbuf/.libs/libpixbufloader-pnm.so"))
+    putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf/.libs");
+}
--- a/demos/testanimation.c
+++ b/demos/testanimation.c
@@ -0,0 +1,488 @@
+
+/* 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>
+
+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 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 *)gtk_object_get_data(GTK_OBJECT(drawing_area), "pixbuf");
+
+	if (gdk_pixbuf_get_has_alpha (pixbuf)) {
+		gdk_draw_rgb_32_image (drawing_area->window,
+				       drawing_area->style->black_gc,
+				       event->area.x, event->area.y, 
+				       event->area.width, 
+				       event->area.height,
+				       GDK_RGB_DITHER_MAX, 
+				       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));
+	} 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 *)gtk_object_get_data(GTK_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;
+ 
+	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", "testrgb",
+				 "GtkWindow::allow_shrink", TRUE,
+				 NULL);
+	gtk_signal_connect (GTK_OBJECT (window), "destroy",
+			    (GtkSignalFunc) 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_usize (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);
+	
+
+	gtk_signal_connect (GTK_OBJECT(drawing_area), "expose_event",
+			    GTK_SIGNAL_FUNC(expose_func), NULL);
+	gtk_signal_connect (GTK_OBJECT(drawing_area), "configure_event",
+			    GTK_SIGNAL_FUNC (config_func), NULL);
+
+	gtk_object_set_data (GTK_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);
+	gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
+				   (GtkSignalFunc) gtk_widget_destroy,
+				   GTK_OBJECT (window));
+
+	gtk_widget_show (button);
+
+	gtk_container_add (GTK_CONTAINER (window), vbox);
+	gtk_widget_show_all (vbox);
+
+	gtk_widget_show (window);
+
+        return window;
+}
+
+#if 0
+
+static gint
+update_timeout(gpointer data)
+{
+        ProgressFileStatus *status = data;
+	gboolean done;
+
+	done = TRUE;
+	if (!feof(status->imagefile)) {
+		gint nbytes;
+
+		nbytes = fread(status->buf, 1, status->readlen, 
+			       status->imagefile);
+
+		done = !gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes);
+			
+	}
+
+	if (done) {
+                gtk_widget_queue_draw(*status->rgbwin);
+		gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader));
+		g_object_destroy (G_OBJECT(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);
+
+        gdk_pixbuf_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;
+
+/*  	g_print ("progressive_updated_callback:\n\t%d\t%d\t%d\t%d\n", x, y, width, height); */
+
+        if (*window_loc != NULL)
+                gtk_widget_queue_draw_area(*window_loc,
+					   x, y, width, height);
+
+        return;
+}
+
+#endif
+
+static int readlen = 4096;
+
+extern void pixbuf_init();
+
+int
+main (int argc, char **argv)
+{
+	int i;
+	int found_valid = FALSE;
+
+	GdkPixbufAnimation *animation;
+
+	pixbuf_init ();
+
+	gtk_init (&argc, &argv);
+
+	gdk_rgb_set_verbose (TRUE);
+
+	gdk_rgb_init ();
+
+	gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
+
+	{
+		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) {
+		g_print ("USAGE:  testanimation FILE1 ...\n");
+		return 0;
+	} else {
+		for (i = 1; i < argc; i++) {
+                        GError *error;
+
+                        error = NULL;
+			animation = gdk_pixbuf_animation_new_from_file (argv[i],
+                                                                        &error);
+
+                        if (animation == NULL) {
+                                g_warning ("Failed to load animation: %s",
+                                           error->message);
+                                g_error_free (error);
+                        }
+                        
+			if (animation) {
+				gint i = 0;
+				GList *listptr;
+				for (listptr = gdk_pixbuf_animation_get_frames (animation);
+				     listptr;
+				     listptr = listptr->next) {
+					GdkPixbufFrame *frame;
+					GdkPixbuf *pixbuf;
+					gchar *title;
+
+					frame = listptr->data;
+					pixbuf = gdk_pixbuf_frame_get_pixbuf (frame);
+
+					title = g_strdup_printf ("Frame %d", i);
+					g_print ("Frame %d  x:%d y:%d width:%d height:%d\n",
+						 i,
+						 gdk_pixbuf_frame_get_x_offset (frame),
+						 gdk_pixbuf_frame_get_y_offset (frame),
+						 gdk_pixbuf_get_width (pixbuf),
+						 gdk_pixbuf_get_height (pixbuf));
+					new_testrgb_window (pixbuf, title);
+					g_free (title);
+					i++;
+				}
+				found_valid = TRUE;
+			}
+		}
+#if 0
+                {
+                        GtkWidget* rgb_window = NULL;
+			ProgressFileStatus   status;
+			GdkPixbufLoader *pixbuf_loader;
+
+                        pixbuf_loader = gdk_pixbuf_loader_new ();
+			status.loader = pixbuf_loader;
+
+			status.rgbwin = &rgb_window;
+
+			status.buf = g_malloc (readlen);
+                        g_signal_connect_data(G_OBJECT(pixbuf_loader),
+                                              "area_prepared",
+                                              GTK_SIGNAL_FUNC(progressive_prepared_callback),
+                                              &rgb_window,
+                                              NULL, FALSE, FALSE);
+
+                        g_signal_connect_data(G_OBJECT(pixbuf_loader),
+                                              "area_updated",
+                                              GTK_SIGNAL_FUNC(progressive_updated_callback),
+                                              &rgb_window,
+                                              NULL, FALSE, FALSE);
+
+			
+                        status.imagefile = fopen (argv[1], "r");
+                        g_assert (status.imagefile != NULL);
+
+			status.readlen = readlen;
+
+                        status.timeout = gtk_timeout_add(100, update_timeout, &status);
+                }
+#endif
+	}
+
+	if (found_valid)
+		gtk_main ();
+
+	return 0;
+}
--- a/demos/testgtk/main.c
+++ b/demos/testgtk/main.c
@@ -0,0 +1,392 @@
+#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
@@ -0,0 +1,119 @@
+#include <config.h>
+#include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_X11
+#include <gdk/x11/gdkx.h>
+#elif defined (GDK_WINDOWING_WIN32)
+#include <gdk/win32/gdkwin32.h>
+#endif
+
+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 *) gtk_object_get_data(GTK_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 *) gtk_object_get_data(GTK_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_ROOT_PARENT();
+      new_pixbuf = gdk_pixbuf_get_from_drawable(NULL, root, NULL,
+						0, 0, 0, 0, evt->width, evt->height);
+      gtk_object_set_data(GTK_OBJECT(drawing_area), "pixbuf", new_pixbuf);
+      gdk_pixbuf_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);
+   gdk_rgb_init();
+
+   gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
+
+   root = GDK_ROOT_PARENT();
+   pixbuf = gdk_pixbuf_get_from_drawable(NULL, root, NULL,
+					 0, 0, 0, 0, 150, 160);
+   
+   window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+   gtk_signal_connect(GTK_OBJECT(window), "delete_event",
+                      GTK_SIGNAL_FUNC(close_app), NULL);
+   gtk_signal_connect(GTK_OBJECT(window), "destroy",   
+                      GTK_SIGNAL_FUNC(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_usize(GTK_WIDGET(drawing_area),
+                        gdk_pixbuf_get_width (pixbuf),
+                        gdk_pixbuf_get_height (pixbuf));
+   gtk_signal_connect(GTK_OBJECT(drawing_area), "expose_event",
+                      GTK_SIGNAL_FUNC(expose_cb), NULL);
+
+   gtk_signal_connect(GTK_OBJECT(drawing_area), "configure_event",
+                      GTK_SIGNAL_FUNC(configure_cb), NULL);
+   gtk_object_set_data(GTK_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
@@ -0,0 +1,154 @@
+
+#include <config.h>
+/* if building outside GTK, remove /x11 part */
+#include <gdk/x11/gdkx.h>
+#include <gtk/gtk.h>
+#include <stdio.h>
+
+
+void
+keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
+{
+        GdkPixbuf *pixbuf;
+        GtkDrawingArea *da = (GtkDrawingArea*)data;
+        GError *err = NULL;
+        
+        pixbuf = (GdkPixbuf *) gtk_object_get_data (GTK_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 if (evt->keyval == 'p') {
+                if (pixbuf == NULL) {
+                        fprintf (stderr, "PIXBUF NULL\n");
+                        return;
+                }
+
+                if (!gdk_pixbuf_save (pixbuf, "foo.png", "png", &err, NULL)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                }
+        }
+}
+
+
+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 *) gtk_object_get_data (GTK_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 *) gtk_object_get_data (GTK_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_ROOT_PARENT ();
+                new_pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
+                                                           0, 0, 0, 0, evt->width, evt->height);
+                gtk_object_set_data (GTK_OBJECT (drawing_area), "pixbuf", new_pixbuf);
+                gdk_pixbuf_unref (pixbuf);
+        }
+
+        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_cmap ());
+
+        root = GDK_ROOT_PARENT ();
+        pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
+                                               0, 0, 0, 0, 150, 160);
+   
+        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+        gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+                            GTK_SIGNAL_FUNC (close_app), NULL);
+        gtk_signal_connect (GTK_OBJECT (window), "destroy",   
+                            GTK_SIGNAL_FUNC (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_usize (GTK_WIDGET (drawing_area),
+                              gdk_pixbuf_get_width (pixbuf),
+                              gdk_pixbuf_get_height (pixbuf));
+        gtk_signal_connect (GTK_OBJECT (drawing_area), "expose_event",
+                            GTK_SIGNAL_FUNC (expose_cb), NULL);
+
+        gtk_signal_connect (GTK_OBJECT (drawing_area), "configure_event",
+                            GTK_SIGNAL_FUNC (configure_cb), NULL);
+        gtk_signal_connect (GTK_OBJECT (window), "key_press_event", 
+                            GTK_SIGNAL_FUNC (keypress_check), drawing_area);    
+        gtk_object_set_data (GTK_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-scale.c
+++ b/demos/testpixbuf-scale.c
@@ -0,0 +1,163 @@
+#include <gtk/gtk.h>
+
+#include <stdio.h>
+
+GdkInterpType interp_type = GDK_INTERP_BILINEAR;
+int overall_alpha = 255;
+GdkPixbuf *pixbuf;
+GtkWidget *darea;
+  
+void
+set_interp_type (GtkWidget *widget, gpointer data)
+{
+  interp_type = GPOINTER_TO_UINT (data);
+  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_pixbuf_render_to_drawable (dest, widget->window, widget->style->fg_gc[GTK_STATE_NORMAL],
+				 0, 0, event->area.x, event->area.y,
+				 event->area.width, event->area.height,
+				 GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
+  
+  gdk_pixbuf_unref (dest);
+  
+  return TRUE;
+}
+
+extern void pixbuf_init();
+
+int
+main(int argc, char **argv)
+{
+	GtkWidget *window, *vbox;
+	GtkWidget *menuitem, *optionmenu, *menu;
+	GtkWidget *alignment;
+	GtkWidget *hbox, *label, *hscale;
+	GtkAdjustment *adjustment;
+	GtkRequisition scratch_requisition;
+        GError *error;
+        
+	pixbuf_init ();
+
+	gtk_init (&argc, &argv);
+	gdk_rgb_init ();
+
+	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);
+	}
+
+	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	gtk_signal_connect (GTK_OBJECT (window), "destroy",
+			    GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+	
+	vbox = gtk_vbox_new (FALSE, 0);
+	gtk_container_add (GTK_CONTAINER (window), vbox);
+
+	menu = gtk_menu_new ();
+	
+	menuitem = gtk_menu_item_new_with_label ("NEAREST");
+	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
+			    GTK_SIGNAL_FUNC (set_interp_type),
+			    GUINT_TO_POINTER (GDK_INTERP_NEAREST));
+	gtk_widget_show (menuitem);
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+	
+	menuitem = gtk_menu_item_new_with_label ("BILINEAR");
+	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
+			    GTK_SIGNAL_FUNC (set_interp_type),
+			    GUINT_TO_POINTER (GDK_INTERP_BILINEAR));
+	gtk_widget_show (menuitem);
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+	
+	menuitem = gtk_menu_item_new_with_label ("TILES");
+	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
+			    GTK_SIGNAL_FUNC (set_interp_type),
+			    GUINT_TO_POINTER (GDK_INTERP_TILES));
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+
+	menuitem = gtk_menu_item_new_with_label ("HYPER");
+	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
+			    GTK_SIGNAL_FUNC (set_interp_type),
+			    GUINT_TO_POINTER (GDK_INTERP_HYPER));
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+
+	optionmenu = gtk_option_menu_new ();
+	gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
+	gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), 1);
+	
+	alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.5);
+	gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
+
+	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));
+	gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
+			    GTK_SIGNAL_FUNC (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), optionmenu);
+	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);
+
+	gtk_signal_connect (GTK_OBJECT (darea), "expose_event",
+			    GTK_SIGNAL_FUNC (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
@@ -0,0 +1,627 @@
+/* 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 *)gtk_object_get_data(GTK_OBJECT(drawing_area), "pixbuf");
+
+	if (gdk_pixbuf_get_has_alpha (pixbuf)) {
+		gdk_draw_rgb_32_image (drawing_area->window,
+				       drawing_area->style->black_gc,
+				       event->area.x, event->area.y, 
+				       event->area.width, 
+				       event->area.height,
+				       GDK_RGB_DITHER_MAX, 
+				       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));
+	} 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 *)gtk_object_get_data(GTK_OBJECT(drawing_area), "pixbuf");
+
+	g_print("X:%d Y:%d\n", event->width, event->height);
+
+#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);
+	gtk_signal_connect (GTK_OBJECT (window), "destroy",
+			    (GtkSignalFunc) 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_usize (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);
+	
+
+	gtk_signal_connect (GTK_OBJECT(drawing_area), "expose_event",
+			    GTK_SIGNAL_FUNC(expose_func), NULL);
+	gtk_signal_connect (GTK_OBJECT(drawing_area), "configure_event",
+			    GTK_SIGNAL_FUNC (config_func), NULL);
+
+	gtk_object_set_data (GTK_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);
+	gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
+				   (GtkSignalFunc) gtk_widget_destroy,
+				   GTK_OBJECT (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 = FALSE;
+	if (!feof(status->imagefile)) {
+		gint nbytes;
+                
+		nbytes = fread(status->buf, 1, status->readlen, 
+			       status->imagefile);
+
+
+                error = NULL;
+                if (!gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes, &error)) {
+                        g_warning ("Error writing to loader: %s",
+                                   error->message);
+                        g_error_free (error);
+                        done = TRUE;
+                }
+                        
+                        
+        } else { /* Really done */ 
+
+                GdkPixbuf *pixbuf = gdk_pixbuf_loader_get_pixbuf (status->loader); 
+                new_testrgb_window (pixbuf, "After progressive load"); 
+                done = TRUE; 
+
+        }
+
+	if (done) {
+                gtk_widget_queue_draw(*status->rgbwin);
+                /* ignoring errors, we should not do that. */
+		gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader), NULL);
+		g_object_unref (G_OBJECT(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);
+
+        gdk_pixbuf_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;
+
+/*  	g_print ("progressive_updated_callback:\n\t%d\t%d\t%d\t%d\n", x, y, width, height); */
+
+        if (*window_loc != NULL)
+                gtk_widget_queue_draw_area(*window_loc,
+					   x, y, width, height);
+
+        return;
+}
+
+static int readlen = 4096;
+
+extern void pixbuf_init();
+
+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);
+
+	gdk_rgb_init ();
+
+	gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
+
+	{
+		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;
+                
+		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 (apple_red, FALSE, -1, NULL);
+                new_testrgb_window (pixbuf, "Red apple from inline data");
+
+                pixbuf = gdk_pixbuf_new_from_inline (gnome_foot, TRUE, sizeof (gnome_foot), NULL);
+                new_testrgb_window (pixbuf, "Foot from inline 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_data (G_OBJECT(pixbuf_loader),
+                                               "area_prepared",
+                                               GTK_SIGNAL_FUNC(progressive_prepared_callback),
+                                               &rgb_window,
+                                               NULL, FALSE, FALSE);
+
+                        g_signal_connect_data (G_OBJECT(pixbuf_loader),
+                                               "area_updated",
+                                               GTK_SIGNAL_FUNC(progressive_updated_callback),
+                                               &rgb_window,
+                                               NULL, FALSE, FALSE);
+
+			
+                        status.imagefile = fopen (argv[1], "r");
+                        g_assert (status.imagefile != NULL);
+
+			status.readlen = readlen;
+
+                        status.timeout = gtk_timeout_add(100, update_timeout, &status);
+                }
+#endif
+	}
+
+	if (found_valid)
+		gtk_main ();
+
+	return 0;
+}
--- a/docs/.cvsignore
+++ b/docs/.cvsignore
@@ -1,7 +1,6 @@
 Makefile
 Makefile.in
 *.html
-*.info*
 *.dvi
 *.ps
 *.pg
--- a/docs/Changes-1.4.txt
+++ b/docs/Changes-1.4.txt
@@ -1,36 +0,0 @@
-Incompatible Changes from GTK+-1.2 to GTK+-1.4:
-
- The gdk_time* functions have been removed. This functionality
-  has been unused since the main loop was moved into GLib
-  prior to 1.2. 
-
- The signature for GtkPrintFunc (used for gtk_item_factory_dump_items)
-  has been changed to take a 'const gchar *' instead of 'gchar *', to
-  match what we do for glib, and other similar cases.
-
- The detail arguments in the GtkStyleClass structure are now 'const gchar *'.
-
- gtk_paned_set_gutter_size() has been removed, since the small handle tab
-  has been changed to include the entire area previously occupied by
-  the gutter.
-
- GDK no longer selects OwnerGrabButtonMask for button presses. This means  
-  that the automatic grab that occurs when the user presses a button
-  will have owner_events = FALSE, so all events are redirected to the
-  grab window, even events that would normally go to  other windows of the
-  window's owner.
-
- The detail arguments in the GtkStyleClass structure are now 'const gchar *'.
-
- Inserting and deleting text in GtkEntry though functions such
-  as gtk_entry_insert_text() now leave the cursor at its original
-  position in the text instead of moving it to the location of
-  the insertion/deletion.
-
- The ->label field of GtkFrame widgets has been removed. (As part of
-  a change to allow the arbitrary widgets in the title position.) The
-  text can now be retrieved with the new function gtk_frame_get_text().
-
- The 'font' and 'font_set' declarations in RC files are now ignored. There
-  is a new 'font_name' field that holds the string form of a Pango font
-  description.
--- a/docs/Changes-2.0.txt
+++ b/docs/Changes-2.0.txt
@@ -0,0 +1,320 @@
+Incompatible Changes from GTK+-1.2 to GTK+-2.0:
+
+* gtk_container_get_toplevels() was removed and replaced with
+  gtk_window_list_toplevels(), which has different memory management 
+  on the return value (gtk_window_list_toplevels() copies the GList
+  and also references each widget in the list, so you have to
+  g_list_free() the list after first unref'ing each list member).
+
+* The gdk_time* functions have been removed. This functionality
+  has been unused since the main loop was moved into GLib
+  prior to 1.2. 
+
+* The signature for GtkPrintFunc (used for gtk_item_factory_dump_items)
+  has been changed to take a 'const gchar *' instead of 'gchar *', to
+  match what we do for glib, and other similar cases.
+
+* The detail arguments in the GtkStyleClass structure are now 'const gchar *'.
+
+* gtk_paned_set_gutter_size() has been removed, since the small handle tab
+  has been changed to include the entire area previously occupied by
+  the gutter.
+
+* GDK no longer selects OwnerGrabButtonMask for button presses. This means  
+  that the automatic grab that occurs when the user presses a button
+  will have owner_events = FALSE, so all events are redirected to the
+  grab window, even events that would normally go to  other windows of the
+  window's owner.
+
+* GtkColorSelectionDialog has now been moved into it's own set of files,
+  gtkcolorseldialog.c and gtkcolorseldialog.h.
+
+* gtk_widget_shape_combine_mask() now keeps a reference count on the 
+  mask pixmap that is passed in.
+
+* the GtkPatternSpec has been moved to glib as GPatternSpec, the pattern
+  arguments to gtk_item_factory_dump_items() and gtk_item_factory_dump_rc()
+  have thusly been changed to take a GPatternSpec instead of GtkPatternSpec.
+  
+* Type system changes:
+  - GTK_TYPE_OBJECT is not a fundamental type anymore. Type checks of the
+    style (GTK_FUNDAMENTAL_TYPE (some_type) == GTK_TYPE_OBJECT)
+    will not work anymore. As a replacement, (GTK_TYPE_IS_OBJECT (some_type))
+    can be used now.
+  - The following types vanished: GTK_TYPE_ARGS, GTK_TYPE_CALLBACK,
+    GTK_TYPE_C_CALLBACK, GTK_TYPE_FOREIGN. The corresponding GtkArg
+    fields and field access macros are also gone.
+  - The following type aliases vanished: GTK_TYPE_FLAT_FIRST,
+    GTK_TYPE_FLAT_LAST, GTK_TYPE_STRUCTURED_FIRST, GTK_TYPE_STRUCTURED_LAST.
+  - The type macros GTK_TYPE_MAKE() and GTK_TYPE_SEQNO() vanished, use of
+    GTK_FUNDAMENTAL_TYPE() is discouraged. Instead, the corresponding GType
+    API should be used: G_TYPE_FUNDAMENTAL(), G_TYPE_DERIVE_ID(),
+    G_TYPE_BRANCH_SEQNO(). Note that the GLib type system doesn't build new
+    type ids based on a global incremental sequential number anymore, but
+    numbers new type ids sequentially per fundamental type branch.
+  - The following type functions vanished/were replaced:
+    Old Function		 Replacement
+    gtk_type_query()		 - being investigated -
+    gtk_type_set_varargs_type()	 -
+    gtk_type_get_varargs_type()	 -
+    gtk_type_check_object_cast() g_type_check_instance_cast()
+    gtk_type_check_class_cast()	 g_type_check_class_cast()
+    gtk_type_describe_tree()	 -
+    gtk_type_describe_heritage() -
+    gtk_type_free()		 -
+    gtk_type_children_types()	 g_type_children()
+    gtk_type_set_chunk_alloc()	 GTypeInfo.n_preallocs
+    gtk_type_register_enum()	 g_enum_register_static()
+    gtk_type_register_flags()	 g_flags_register_static()
+    gtk_type_parent_class()	 g_type_parent() / g_type_class_peek_parent()
+    Use of g_type_class_ref() / g_type_class_unref() and g_type_class_peek()
+    is recommended over usage of gtk_type_class().
+    Use of g_type_register_static() / g_type_register_dynamic() is recommended
+    over usage of gtk_type_unique().
+
+* Object system changes:
+  GtkObject derives from GObject, so is not the basic object type anymore.
+  This imposes the following source incompatible changes:
+  - GtkObject has no klass field anymore, an object's class can be retrived
+    with the object's coresponding GTK_<OBJECT>_GET_CLASS (object) macro.
+  - GtkObjectClass has no type field anymore, a class's type can be retrived
+    with the GTK_CLASS_TYPE (class) macro.
+  - GtkObjectClass does not introduce the finalize() and shutdown() methods
+    anymore. While shutdown() is intended for GTK+ internal use only, finalize()
+    is required by a variety of object implementations. GObjectClass.finalize
+    should be overriden here, e.g.:
+    static void gtk_label_finalize (GObject *gobject)
+    {
+      GtkLabel *label = GTK_LABEL (gobject);
+      
+      G_OBJECT_CLASS (parent_class)->finalize (object);
+    }
+    static void gtk_label_class_init (GtkLabelClass *class)
+    {
+      GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+      
+      gobject_class->finalize = gtk_label_finalize;
+    }
+
+  - the GtkObject::destroy signal can now be emitted multiple times on an object.
+    ::destroy implementations should check that make sure that they take this
+    into account, by checking to make sure that resources are there before
+    freeing them. For example:
+    if (object->foo_data)
+      { 
+        g_free (object->foo_data);
+        object->foo_data = NULL;
+      }
+
+    Also, ::destroy implementations have to release object references that
+    the object holds. Code in finalize implementations such as:
+    if (object->adjustment)
+      {
+        gtk_object_unref (object->adjustment);
+        object->adjustment = NULL;
+      }
+    have to be moved into the ::destroy implementations. The reason for doing
+    this is that all object reference cycles should be broken at destruction 
+    time.
+    
+* Signal system changes:
+  The Gtk 2.0 signal merly proxies the GSignal system now.
+  For future usage, direct use of the GSignal API is recommended,
+  this avoids significant performance hits where GtkArg structures
+  have to be converted into GValues. For language bindings,
+  GSignal+GClosure provide a much more flexible and convenient
+  mechanism to hook into signal emissions or install class default
+  handlers, so the old GtkSignal API for language bindings is not
+  supported anymore.
+  Functions that got removed in the Gtk signal API:
+  gtk_signal_n_emissions(), gtk_signal_n_emissions_by_name(),
+  gtk_signal_set_funcs(), gtk_signal_handler_pending_by_id(),
+  gtk_signal_add_emission_hook(), gtk_signal_add_emission_hook_full(),
+  gtk_signal_remove_emission_hook(), gtk_signal_query().
+  Also, the GtkCallbackMarshal argument to gtk_signal_connect_full() is
+  not supported anymore.
+  For many of the removed functions, similar variants are available
+  in the g_signal_* namespace.
+
+* Inserting and deleting text in GtkEntry though functions such
+  as gtk_entry_insert_text() now leave the cursor at its original
+  position in the text instead of moving it to the location of
+  the insertion/deletion.
+
+* The ->label field of GtkFrame widgets has been removed. (As part of
+  a change to allow the arbitrary widgets in the title position.) The
+  text can now be retrieved with the new function gtk_frame_get_text().
+
+* The 'font' and 'font_set' declarations in RC files are now ignored. There
+  is a new 'font_name' field that holds the string form of a Pango font
+
+* A number of types in GDK have become subclasses of GObject. For the
+  most part, this should not break anyone's code. However, it's now 
+  possible/encouraged to use g_object_ref()/g_object_unref() and other
+  GObject features with these GDK types. The converted types are:
+  GdkWindow, GdkDrawable, GdkPixmap, GdkImage, GdkGC, GdkDragContext,
+  GdkColormap
+
+* All drawables including pixmaps used to have a type tag, the 
+  GdkWindowType enumeration, which included GDK_WINDOW_PIXMAP.
+  GdkWindowType is now a property of GdkWindow _only_, and there is
+  no GDK_WINDOW_PIXMAP. You can use the GDK_IS_PIXMAP() macro to see 
+  if you have a pixmap, if you need to know that.
+
+* GtkStyle and GtkRcStyle are now subclasses of GObject as well.  This
+  requires fairly extensive changes to theme engines quite badly, but
+  shouldn't affect most other code.
+
+* xthickness/ythickness have moved from GtkStyleClass to GtkStyle
+  (from class to instance). This gives themes a bit more flexibility
+  and is generally more of the Right Thing. You can trivially fix
+  your code with s/style->klass->xthickness/style->xthickness/g and 
+  same for ythickness.
+
+* Some GtkStyle draw_ methods have been removed (cross, oval, ramp) 
+  and others have been added (expander, layout). This will require
+  changes to theme engines.
+
+* If you were using private GDK types, they have been rearranged
+  significantly. You shouldn't use private types. ;-) 
+
+* The visual for a widget, and also the default visual is now derived
+  from the colormap for the widget and the default colormap. 
+  gtk_widget_set_visual(), gtk_widget_set_default_visual(), gtk_widget_push_visual() 
+  and gtk_widget_pop_visual() now do nothing. Since the visual always
+  had to match that of the colormap, it is safe to simply delete
+  all references to these functions.
+
+* A number of functions in GDK have been renamed for consistency and
+  clarity. #defines to provide backwards compatibility have been
+  included, but can be disabled by defineing GDK_DISABLE_COMPAT_H.
+
+  #define gdk_draw_pixmap                gdk_draw_drawable
+  #define gdk_draw_bitmap                gdk_draw_drawable
+
+  #define gdk_window_get_size            gdk_drawable_get_size
+  #define gdk_window_get_type            gdk_window_get_window_type
+  #define gdk_window_get_colormap        gdk_drawable_get_colormap
+  #define gdk_window_set_colormap        gdk_drawable_set_colormap
+  #define gdk_window_get_visual          gdk_drawable_get_visual
+
+  #define gdk_window_ref                 gdk_drawable_ref
+  #define gdk_window_unref               gdk_drawable_unref
+  #define gdk_bitmap_ref                 gdk_drawable_ref
+  #define gdk_bitmap_unref               gdk_drawable_unref
+  #define gdk_pixmap_ref                 gdk_drawable_ref
+  #define gdk_pixmap_unref               gdk_drawable_unref
+
+  #define gdk_gc_destroy                 gdk_gc_unref
+  #define gdk_image_destroy              gdk_image_unref
+  #define gdk_cursor_destroy             gdk_cursor_unref
+
+  (Note that g_object_ref() and g_object_unref() may be used for all of
+  the above _ref and _unref functions.)
+
+  #define gdk_window_copy_area(drawable,gc,x,y,source_drawable,source_x,source_y,width,height) \
+     gdk_draw_pixmap(drawable,gc,source_drawable,source_x,source_y,x,y,width,height)
+
+  #define gdk_rgb_get_cmap               gdk_rgb_get_colormap
+  
+  gtk_widget_popup() was removed, it was only usable for GtkWindows, and
+  there the same effect can be achived by gtk_widget_set_uposition() and
+  gtk_widget_show().
+
+* gdk_pixmap_foreign_new() no longer calls XFreePixmap() on the 
+  pixmap when the GdkPixmap is finalized. This change corresponds
+  to the behavior of gdk_window_foreign_new(), and fixes a lot
+  of problems with code where the pixmap wasn't supposed to be
+  freed. If XFreePixmap() is needed, it can be done using the
+  destroy-notification facilities of g_object_set_data().
+
+* GtkProgress/GtkProgressBar had serious problems in GTK 1.2.
+  - Only 3 or 4 functions are really needed for 95% of progress  
+    interfaces; GtkProgress[Bar] had about 25 functions, and 
+    didn't even include these 3 or 4.
+  - In activity mode, the API involves setting the adjustment 
+    to any random value, just to have the side effect of 
+    calling the progress bar update function - the adjustment
+    is totally ignored in activity mode
+  - You set the activity step as a pixel value, which means to 
+    set the activity step you basically need to connect to 
+    size_allocate
+  - There are ctree_set_expander_style()-functions, to randomly 
+    change look-and-feel for no good reason
+  - The split between GtkProgress and GtkProgressBar makes no sense 
+    to me whatsoever.
+  This was a big wart on GTK and made people waste lots of time,
+  both learning and using the interface.
+  So, we have added what we feel is the correct API, and marked all the
+  rest deprecated. However, the changes are 100% backward-compatible and
+  should break no existing code.
+  The following 5 functions are the new programming interface and you 
+  should consider changing your code to use them:
+  void       gtk_progress_bar_pulse                (GtkProgressBar *pbar);
+  void       gtk_progress_bar_set_text             (GtkProgressBar *pbar,
+                                                    const gchar    *text);
+  void       gtk_progress_bar_set_fraction         (GtkProgressBar *pbar,
+                                                    gfloat          fraction);
+
+  void       gtk_progress_bar_set_pulse_step       (GtkProgressBar *pbar,
+                                                    gfloat          fraction);
+  void       gtk_progress_bar_set_orientation      (GtkProgressBar *pbar,
+						    GtkProgressBarOrientation orientation);
+
+* The GtkNotebookPage structure has been removed from the public header files;
+  this was never meant to be a public structure, and all functionality that
+  could be done by accessing the struct fields of this structure should be 
+  accesible otherwise.
+
+* GtkMenuPositionFunc has a new parameter push_in which controls how
+  menus placed outside the screen is handled. If this is set to true and
+  part of the menu is outside the screen then Gtk+ pushes it into the visible
+  area. Otherwise the menu is cut of at the end of the visible screen area.
+
+  Regardles of what happens to the size of the menu, the result is always
+  that the items are placed in the same place as if the menu was placed
+  outside the screen, using menu scrolling if necessary.
+  
+* The "draw" signal and virtual method on GtkWidget has been removed.
+  All drawing should now occur by invalidating a region of the widget
+  (call gdk_window_invalidate_rect() or gtk_widget_queue_draw() for
+  example to invalidate a region). GTK+ merges all invalid regions,
+  and sends expose events to the widget in an idle handler for the
+  invalid regions. gtk_widget_draw() is deprecated but still works; it
+  adds the passed-in area to the invalid region and immediately sends
+  expose events for the current invalid region. 
+  Most widgets will work fine if you just delete their "draw"
+  implementation, since they will already have working expose_event
+  implementations. The draw method was rarely called in practice
+  anyway.
+
+* The GdkExposeEvent has a new region field. This can be used instead
+  of the area field if you want a more exact representation of the
+  area to update.
+
+* Sending synthetic exposes using gtk_widget_event is no longer allowed.
+  If you just need an expose call you should use gdk_window_invalidate_rect()
+  or gdk_window_invalidate_region() instead. For the case of container
+  widgets that need to propagate expose events to NO_WINDOW children
+  you can either use gtk_container_propagate_expose(), or chain to the
+  default container expose handler.
+ 
+* The draw_default and draw_focus methods/signals on GtkWidget are
+  gone; simply draw things in your expose handler. 
+  gtk_widget_draw_focus() and gtk_widget_draw_default() wrapper
+  functions are also gone; just queue a draw on the widget,  
+  or the part affected by the focus/default anyway.
+  Also, GtkWidget now has default implementations for focus_in_event
+  and focus_out_event. These set/unset GTK_HAS_FOCUS, and queue a
+  draw. So if your focus in/out handler just does that, you can delete
+  it.
+
+* GtkText and GtkTree are buggy and broken. We don't recommend using
+  them, and changing old code to avoid them is a good idea. The
+  recommended alternatives are GtkTextView and GtkTreeView.  The
+  broken widgets are not declared in the headers by default; to use
+  them, define the symbol GTK_ENABLE_BROKEN during compilation.  In
+  some future release, these widgets will be removed from GTK+.
+
+* GdkColorContext is gone; you probably weren't using it anyway.
+  Use GdkColormap and the gdk_rgb_* functions instead.
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,205 +1,24 @@
 ## Process this file with automake to produce Makefile.in

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

 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
-
-html/gtk_tut_table.gif: gdk.html gtk.html
-
-.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
-
 EXTRA_DIST += \
 	Changes-1.2.txt			\
+	Changes-2.0.txt			\
 	debugging.txt			\
+	defsformat.txt			\
 	developers.txt			\
+	dnd_internals.txt		\
+	make-todo			\
 	refcounting.txt			\
 	styles.txt			\
 	text_widget.txt 		\
 	widget_system.txt 		\
 	generation.txt			\
+        README.linux-fb  	        \
        gtk-config.txt  	        \
 	gtk-config.1.in			\
-	texinfo.tex 			\
-	macros.texi			\
-	gtkdocs_fix			\
-	gtkfaq.sgml			\
-	gtk_tut.sgml			\
-	gtk_tut_it.sgml			\
-	gtk_tut_fr.sgml			\
-	gtk_tut_packbox1.gif 		\
-	gtk_tut_packbox2.gif 		\
-	gtk_tut_table.gif
+	gtkdocs_fix

-if HAVE_SGML2HTML
-dist-hook: faq tutorial tutorial_it tutorial_fr
-	mkdir $(distdir)/html
-	cp -p $(srcdir)/html/*.html $(distdir)/html
-	cp -p $(srcdir)/html/*.gif $(distdir)/html
-	mkdir $(distdir)/text
-	cp -p $(srcdir)/text/*.txt $(distdir)/text
-else
-dist-hook:
-	echo "***"
-	echo "*** Warning: Tutorial and faq not built"
-	echo "*** DISTRIBUTION IS INCOMPLETE"
-	echo "***"
-endif
--- a/docs/README.linux-fb
+++ b/docs/README.linux-fb
@@ -0,0 +1,140 @@
+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/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 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/faq/.cvsignore
+++ b/docs/faq/.cvsignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.html
+*.dvi
+*.ps
+*.pg
+*.ky
+*.cp
+*.fn
+*.tp
+*.vr
+*.log
+*.aux
+*.toc
+*.cps
+*.fns
+*.vrs
+html
+text
--- a/docs/faq/Makefile.am
+++ b/docs/faq/Makefile.am
@@ -0,0 +1,42 @@
+.PHONY: htmldir textdir faq
+
+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
+
+$(FAQ_FILES): faq
+
+htmldir:
+	mkdir -p $(srcdir)/html
+
+textdir:
+	mkdir -p $(srcdir)/text
+
+faq: htmldir textdir
+	(cd $(srcdir); sgml2html gtkfaq.sgml;            \
+	perl $(top_srcdir)/docs/gtkdocs_fix gtkfaq*html; \
+	mv gtkfaq*html html/;                            \
+	sgml2txt gtkfaq.sgml;                            \
+	mv gtkfaq.txt text/)
+
+EXTRA_DIST += gtkfaq.sgml gtk-faq.sgml
+
+if HAVE_SGML2HTML
+dist-hook: faq
+	mkdir $(distdir)/html
+	cp -p $(srcdir)/html/*.html $(distdir)/html
+	mkdir $(distdir)/text
+	cp -p $(srcdir)/text/*.txt $(distdir)/text
+else
+dist-hook:
+	echo "***"
+	echo "*** Warning: FAQ not built"
+	echo "*** DISTRIBUTION IS INCOMPLETE"
+	echo "***"
+endif
--- a/docs/faq/gtk-faq.sgml
+++ b/docs/faq/gtk-faq.sgml
--- a/docs/faq/gtkfaq.sgml
+++ b/docs/faq/gtkfaq.sgml
@@ -1617,7 +1617,7 @@ placed on a queue, which is processed within <tt/gtk_main()/. You can
 force the drawing queue to be processed using something like:

 <tscreen><verb>
-while (gtk_main_iteration(FALSE));
+while (g_main_iteration(FALSE));
 </verb></tscreen>

 inside you're function that changes the widget.
--- a/docs/gdk.sgml
+++ b/docs/gdk.sgml
@@ -1,198 +0,0 @@
-<!doctype linuxdoc system>
-
-<article>
-
-<!-- Title information -->
-
-<title>The GTK+ Drawing Kit Programming Manual
-<author>Shawn T. Amundson, Peter Mattis
-<date>July 26, 1998
-
-<abstract>
-This document aims at teaching user how to effectively program in
-GDK, the GTK+ Drawing Kit, and to serve as a reference guide to 
-more experienced GTK+ programmers.  It is a work in progress.
-
-<!-- Table of contents -->
-<toc>
-
-<!-- Begin the document -->
-
-<!-- ***************************************************************** -->
-<sect>Introduction
-
-<p>
-GDK is designed as a wrapper library that lies on top of Xlib. It
-performs many common and desired operations for a programmer instead
-of the programmer having to explicitly ask for such functionality from
-Xlib directly. For example, GDK provides a common interface to both
-regular and shared memory XImage types. By doing so, an application
-can nearly transparently use the fastest image type available. GDK
-also provides routines for determining the best available color depth
-and the best available visual which is not always the default visual
-for a screen.
-
-GDK is distributed and developed with GTK+, and is licensed under the 
-GNU Library General Public Licence (LGPL).
-
-<sect>Getting Started
-
-<sect1>Initialization
-<p>
-Initialization of GDK is easy.  Simply call gdk_init() passing 
-in the argc and argv parameters.
-
-<tscreen><verb>
-int main (int argc, char *argv[])
-{
-    /* Initialize GDK. */
-    gdk_init (&amp;argc, &amp;argv);
-
-    /* Cleanup of GDK is done automatically when the program exits. */
-    return 0;
-}
-</verb></tscreen>
-
-Generally, GDK initialization is done by gtk_init() in GTK+.  This means 
-that when using GTK+, you do not need to directly call gdk_init().
-
-<sect1>An Example using GDK with GTK+ 
-<p>
-This example demonstrates drawing a line using the foreground
-color of the GtkDrawArea widget it is drawn inside.  The example 
-will end when you click inside the window, which is filled by the
-GtkDrawingArea widget.
-
-The line is drawn during the expose event so that when the window 
-drawing is done whenever it is needed.
-
-<tscreen><verb>
-#include <gtk/gtk.h>
-
-/* The expose callback does the drawing of the line */
-int
-expose_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
-    GdkGC *gc;
-
-    printf("expose...\n");
-
-
-    /* The GC is the Graphics Context.  Here it is borrowed from the widget */
-    gc = widget->style->fg_gc[GTK_STATE_NORMAL];
-
-    gdk_draw_line (widget->window,  /* GDK Window of GtkDrawingArea widget */
-                   gc,              /* Graphics Context */
-                   0,               /* x1, left */
-                   0,               /* y1, top */
-                   200,             /* x2, right */
-                   200);            /* y2, bottom */
-}
-
-/* This quits GTK+ */
-void destroy (GtkWidget *widget, gpointer data)
-{
-    gtk_main_quit ();
-}
-
-int main (int argc, char *argv[])
-{
-    GtkWidget *window;
-    GtkWidget *darea;
-    int events;
-
-    /* This initializes both GTK+ and GDK */
-    gtk_init (&amp;argc, &amp;argv);
-
-    /* Create a window */
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_signal_connect (GTK_OBJECT (window), "destroy",
-                        GTK_SIGNAL_FUNC (destroy), NULL);
-
-    /* Create a drawing area widget. This widget actually is just a 
-       simple widget which provides us an GDK window to draw on and 
-       takes care of all the toolkit integration, like providing the
-       ability to add it to the window with gtk_contianer_add() */
-    darea = gtk_drawing_area_new ();
-    gtk_container_add (GTK_CONTAINER (window), darea);
-
-    /* Set the width and height (arguments are in that order) */
-    gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 200, 200);
-
-    /* Drawing in the expose event is important to keep the 
-       draw line always on the GDK window */
-    gtk_signal_connect (GTK_OBJECT (darea), "expose_event",
-                        GTK_SIGNAL_FUNC (expose_callback), NULL);
-
-    /* We get the events, then add in button press.  If we did not
-       do this, we would not be notified of button press events in
-       the GtkDrawingArea widget */
-    events = gtk_widget_get_events (darea);
-    gtk_widget_set_events (darea, events | GDK_BUTTON_PRESS_MASK);
-
-    /* If we click on the darea, the application will exit */
-    gtk_signal_connect_object (GTK_OBJECT (darea), "button_press_event",
-                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                               GTK_OBJECT (window));
-
-    gtk_widget_show (darea);
-    gtk_widget_show (window);
-
-    /* The GTK+ main idle loop */
-    gtk_main();
-
-    /* Cleanup of GDK is done automatically when the program exits. */
-    return 0;
-}
-</verb></tscreen>
-
-<sect>The Graphics Context 
-<p>
-The Graphics Context, or GC, defines how things should be drawn, 
-including color, font, fill, tile, stipple, clipping mask, line 
-width, line style, and join style.
-
-<sect1>Color
-<p>
-Changing color is done by changing the forground or background color 
-of the GC.
-
-<sect>Drawing Commands
-<sect>Event Handling
-<sect>Understanding and Using Visuals
-<sect>Creating and Using New Windows
-<sect>Pixmaps
-<sect>Images
-<sect>Fonts
-<sect>
-
-<sect>About this Document
-<sect1>History
-<P>
-This document was originially written by Peter Mattis and entitled
-"The General Drawing Kit".  It was meant as a reference guide.
-
-This version of the document has been renamed and is meant as a general
-programming guide.
-
-<sect1>Copying
-<p>
-Copyright (c) 1996 Peter Mattis
-<p>
-Copyright (c) 1998 Shawn T. Amundson
-
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation
-approved by Peter Mattis.
-
-</article>
--- a/docs/gdk.texi
+++ b/docs/gdk.texi
@@ -1,334 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-@c %**start of header
-@setfilename gdk.info
-@settitle GDK
-@setchapternewpage odd
-@c %**end of header
-
-@set edition 1.0
-@set update-date 16 May 1996
-@set update-month May 1996
-
-@ifinfo
-This file documents GDK, the General Drawing Kit
-
-Copyright (C) 1996 Peter Mattis
-
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies
-
-@ignore
-Permission is granted to process this file throught TeX and print the
-results, provided the printed document carries copying permission notice
-identical to this one except for the removal of this paragraph (this
-paragraph not being relevant to the printed manual).
-
-@end ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation
-approved by Peter Mattis.
-@end ifinfo
-
-@titlepage
-@title The General Drawing Kit
-@subtitle Version 1.0
-@subtitle @value{update-month}
-@author by Peter Mattis
-
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1996 Peter Mattis
-
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation
-approved by Peter Mattis.
-@end titlepage
-
-@dircategory User Interface Toolkit
-@direntry
-* GDK: (gdk).		The General Drawing Kit
-@end direntry
-
-@node Top, Copying, (dir), (dir)
-@top The General Drawing Kit
-@ifinfo
-This is edition @value{edition} of the GDK documentation,
-@w{@value{update-date}}.
-@end ifinfo
-
-@menu
-* Copying::                     Your rights.
-* Overview::                    What is GDK?
-* Initialization::              Initialization and exit.
-* Events::                      Event handling.
-* Visuals::                     Understanding and using visuals.
-* Windows::                     Creating and using windows.
-* Graphics Contexts::           Creating and modifying GCs.
-* Pixmaps::                     Creating pixmaps.
-* Images::                      Creating images.
-* Color::                       Specifying color.
-* Fonts::                       Creating fonts.
-* Drawing::                     Drawing commands.
-* XInput Support::              Using extended devices.
-* Miscellany::                  Other stuff.
-* Examples::                    Using GDK.
-* Function Index::              Index of functions
-* Concept Index::               Index of concepts
-@end menu
-
-@node Copying, Overview, Top, Top
-@comment node-name, next, previous, up
-@chapter Copying
-
-GDK is @dfn{free}; this means that everyone is free to use it and free
-to redestribute it on a free basis. GDK is not in the public domain; it
-is copyrighted and there are restrictions on its distribution, but these
-restrictions are designed to permit everything that a good cooperating
-citizen would want to do. What is not allowed is to try to prevent
-others from further sharing any version of GDK that they might get from
-you.
-
-Specifically, we want to make sure that you have the right to give away
-copies of GDK, that you receive source code or else can get it if you
-want it, that you can change GDK or use pieces of it in new free
-programs, and that you know you can do these things.
-
-To make sure that everyone has such rights, we have to forbid you to
-deprive anyone else of these rights. For example, if you distribute
-copies of GDK, you must give the recipients all the rights that you
-have. You must make sure that they, too, receive or can get the source
-code. And you must tell them their rights.
-
-Also, for my own protection, we must make certain that everyone finds
-out that there is no warranty for GDK. If GDK is modified by someone
-else and passed on, we want their recipients to know that what they have
-is not what we distributed, so that any problems introduced by others
-will no reflect on our reputation.
-
-The precise conditions of the licenses for GDK are found in the General
-Public Licenses that accompanies it.
-
-
-@node Overview, Initialization, Copying, Top
-@comment node-name, next, previous, up
-@chapter What is GDK?
-@cindex Overview
-
-GDK is designed as a wrapper library that lies on top of Xlib. It
-performs many common and desired operations for a programmer instead
-of the programmer having to explicitly ask for such functionality from
-Xlib directly. For example, GDK provides a common interface to both
-regular and shared memory XImage types. By doing so, an application
-can nearly transparently use the fastest image type available. GDK
-also provides routines for determining the best available color depth
-and the best available visual which is not always the default visual
-for a screen.
-
-@node Initialization, Events, Overview, Top
-@comment node-name, next, previous, up
-@chapter Initialization and exit
-@cindex Initialization
-@cindex Exit
-
-Initializing GDK is easy. Simply call @code{gdk_init} passing in the
-@var{argc} and @var{argv} parameters. Exit is similarly easy. Just
-call @code{gdk_exit}.
-
-@deftypefun void gdk_init (int *@var{argc}, char ***@var{argv})
-Initializes the GDK library. The arguments @var{argc} and @var{argv}
-are scanned and any arguments that GDK recognizes are handled and
-removed. The @var{argc} and @var{argv} parameters are the values
-passed to @code{main} upon program invocation.
-@end deftypefun
-
-@deftypefun void gdk_exit (int @var{errorcode})
-Exit GDK and perform any necessary cleanup. @code{gdk_exit} will call
-the systems @code{exit} function passing @var{errorcode} as the
-parameter.
-@end deftypefun
-
-@example
-int
-main (int argc, char *argv[])
-@{
-  /* Initialize GDK. */
-  gdk_init (&argc, &argv);
-
-  /* Exit from GDK...this call will never return. */
-  gdk_exit (0);
-
-  /* Keep compiler from issuing a warning */
-  return 0;
-@}
-@end example
-
-
-@node Events, Visuals, Initialization, Top
-@comment node-name, next, previous, up
-@chapter Event handling
-@cindex Events
-
-Events are the means by which GDK lets the programmer know of user
-interaction. An event is normally a button or key press or some other
-indirect user action, such as a the mouse cursor entering or leaving a
-window.
-
-There exist only a few functions for getting events and event
-information. These are @code{gdk_events_pending},
-@code{gdk_event_get}, @code{gdk_events_record} and
-@code{gdk_events_playback}. The latter two functions are useful for
-automatic testing of a software package and should normally not be
-needed in a program.
-
-@deftypefun gint gdk_events_pending (void)
-Returns the number of events pending on the event queue.
-@end deftypefun
-
-@deftypefun gint gdk_event_get (GdkEvent *@var{event})
-Return the next available event in the @var{event}
-structure. @code{gdk_event_get} will return @code{TRUE} on success and
-@code{FALSE} on failure. Success and failure is determined by whether
-an event arrived before the timeout period expired.
-@end deftypefun
-
-@deftypefun void gdk_events_record (char *@var{filename})
-Turn on recording of events. User events and certain system events will
-be saved in the file named by the variable @var{filename}. This stream
-of events can later be played back and ``should'' produce the same
-results as when the original events were handled. However, the
-programmer does need to be careful in that the state of the program must
-be the same when @code{gdk_events_record} is called and when
-@code{gdk_events_playback} is called. For this reason,
-@code{gdk_events_record} is normally not called directly, but is instead
-invoked indirectly by specifying the ``-record'' command line option.
-@end deftypefun
-
-@deftypefun void gdk_events_playback (char *@var{filename})
-Start playback of events from a file. (See the above description of
-@code{gdk_events_record}). Normally this function is not called directly
-but is invoked by the ``-playback'' command line option.
-@end deftypefun
-
-@deftypefun void gdk_events_stop (void)
-Stop recording and playback of events.
-@end deftypefun
-
-@example
-void
-handle_event ()
-@{
-  GdkEvent event;
-
-  if (gdk_event_get (&event))
-    @{
-      switch (event.type)
-       @{
-         @dots{}
-       @}
-    @}
-@}
-@end example
-
-
-@node Visuals, Windows, Events, Top
-@comment node-name, next, previous, up
-@chapter Understanding and using visuals
-@cindex Visuals
-
-@node Windows, Graphics Contexts, Visuals, Top
-@comment node-name, next, previous, up
-@chapter Creating and using windows
-@cindex Windows
-
-@node Graphics Contexts, Pixmaps, Windows, Top
-@comment node-name, next, previous, up
-@chapter Creating and modifying GCs
-@cindex Graphics Contexts
-@cindex GC
-
-@node Pixmaps, Images, Graphics Contexts, Top
-@comment node-name, next, previous, up
-@chapter Creating pixmaps
-@cindex Pixmaps
-
-@node Images, Color, Pixmaps, Top
-@comment node-name, next, previous, up
-@chapter Creating images
-@cindex Images
-
-@node Color, Fonts, Images, Top
-@comment node-name, next, previous, up
-@chapter Specifying color
-@cindex Color
-
-@node Fonts, Drawing, Color, Top
-@comment node-name, next, previous, up
-@chapter Creating Fonts
-@cindex Fonts
-
-@node Drawing, XInput Support, Fonts, Top
-@comment node-name, next, previous, up
-@chapter Drawing Commands
-@cindex Drawing
-
-@node XInput Support, Miscellany, Drawing, Top
-@comment node-name, next, previous, up
-@chapter Using extended devices
-@cindex Overview
-@cindex Using extended device capabilities
-@cindex Controlling extended devices
-
-@node Miscellany, Examples, XInput Support, Top
-@comment node-name, next, previous, up
-@chapter Other stuff
-@cindex Timers
-@cindex Debugging
-@cindex Miscellaneous
-
-
-@node Examples, Function Index, Miscellany, Top
-@comment node-name, next, previous, up
-@chapter Using GDK
-@cindex Examples
-
-
-@node Function Index, Concept Index, Examples, Top
-@comment node-name, next, previous, up
-@unnumbered Variable Index
-
-@printindex fn
-
-@node Concept Index, , Function Index, Top
-@comment node-name, next, previous, up
-@unnumbered Concept Index
-
-@printindex cp
-
-@summarycontents
-@contents
-@bye
-
-
-
-
-
-
-
-
--- a/docs/gtk.texi
+++ b/docs/gtk.texi
--- a/docs/gtk_tut_fr.sgml
+++ b/docs/gtk_tut_fr.sgml
--- a/docs/gtk_tut_it.sgml
+++ b/docs/gtk_tut_it.sgml
--- a/docs/gtk_tut_packbox1.gif
+++ b/docs/gtk_tut_packbox1.gif
--- a/docs/gtk_tut_packbox2.gif
+++ b/docs/gtk_tut_packbox2.gif
--- a/docs/gtk_tut_table.gif
+++ b/docs/gtk_tut_table.gif
--- a/docs/gtkfaq.sgml
+++ b/docs/gtkfaq.sgml
--- a/docs/macros.texi
+++ b/docs/macros.texi
@@ -1,18 +0,0 @@
-@macro gtkstdmacros {p, q}
-
-@deftypefun Gtk\p\* GTK_\q\ (gpointer @var{obj})
-Cast a generic pointer to @code{Gtk\p\*}. @xref{Standard Macros}, for
-more info.
-@end deftypefun
-
-@deftypefun Gtk\p\Class* GTK_\q\_CLASS (gpointer @var{class})
-Cast a generic pointer to @code{Gtk\p\Class*}. @xref{Standard Macros},
-for more info.
-@end deftypefun
-
-@deftypefun gint GTK_IS_\q\ (gpointer @var{obj})
-Determine if a generic pointer refers to a @code{Gtk\p\}
-object. @xref{Standard Macros}, for more info.
-@end deftypefun
-
-@end macro
--- a/docs/make-todo
+++ b/docs/make-todo
@@ -196,7 +196,7 @@ class TodoParser (xmllib.XMLParser):
            
    def start_contact(self,attributes):
        if not self.entry:
-            raise ParseError, "<contact> tag must be in <contact>"
+            raise ParseError, "<contact> tag must be in <entry>"
        if self.in_data:
            raise ParseError, "Unexpected <contact> tag in content"
        self.in_data = 1
--- a/docs/man/gtk_button.pod
+++ b/docs/man/gtk_button.pod
@@ -1,242 +0,0 @@
-
-=head1 NAME
-
-gtk_button - GTK+ push button widget
-
-=head1 SYNOPSIS
-
- #include <gtk/gtkbutton.h>
-
- GtkType        gtk_button_get_type       (void);
- GtkWidget*     gtk_button_new            (void);
- GtkWidget*     gtk_button_new_with_label (const gchar *label);
- void           gtk_button_pressed        (GtkButton *button);
- void           gtk_button_released       (GtkButton *button);
- void           gtk_button_clicked        (GtkButton *button);
- void           gtk_button_enter          (GtkButton *button);
- void           gtk_button_leave          (GtkButton *button);
- void           gtk_button_set_relief     (GtkButton *button,
-                                           GtkReliefStyle style);
- GtkReliefStyle gtk_button_get_relief     (GtkButton *button);
-
-=head1 DESCRIPTION
-
-This widget is a standard push button widget.  Push button widgets
-are generally used for allowing the user to click on them to initiate
-a command.
-
-This widget is a container widget which contains one child.
-
-=head1 OBJECT HIERARCHY
-
- gtk_object
- gtk_widget
- gtk_container 
- gtk_button
-
-=head1 SIGNAL PROTOTYPES
-
- "clicked"	void user_function (GtkWidget *widget, gpointer data);
- "pressed"	void user_function (GtkWidget *widget, gpointer data);
- "released"	void user_function (GtkWidget *widget, gpointer data);
- "enter" 	void user_function (GtkWidget *widget, gpointer data);
- "leave" 	void user_function (GtkWidget *widget, gpointer data);
-
-=head1 USAGE
-
-=head2 Creation
-
-The most common way to create a button is with a label in it, which
-contains text for the user to read.  The child of the button will then 
-be a L<gtk_label(3)> widget with the text you passwd in.  You can 
-do this in one command:
-
-	GtkWidget *button;
-	button = gtk_button_new_with_label ("This is a button");
-
-To create a gtk_button widget which does not already have a child, 
-use gtk_button_new():
-
-	GtkWidget *button;
-	button = gtk_button_new ();
-
-After you have created a button you can then add a widget to the
-button (such as a label or pixmap) using gtk_container_add().  See
-L<gtk_container(3)> for more information on adding widgets to
-containers.
-
-=head2 Creating a pixmap in a button in a window
-
-After we have an empty gtk_button, such as above, and we have a gtk_pixmap,
-we can simply add the gtk_pixmap to the gtk_button with gtk_container_add().
-
-The following code will open the file "gimp.xpm" and place it in a
-button.
-
-	#include <gtk/gtk.h>
-
-	int main (int argc, char *argv[])
-	{
-	    GtkWidget *window;
-	    GtkWidget *button;
-	    GtkWidget *pixmap;
-	    GtkStyle *style;
-	    GdkPixmap *gdkpixmap;
-	    GdkBitmap *mask;
-	    char *filename = "gimp.xpm";
-
-	    gtk_init (&argc, &argv);
-
-	    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	    button = gtk_button_new ();
-	    gtk_container_add (GTK_CONTAINER (window), button);
-
-	    /* The button is realized now, which creates button->window
-	       used below to create the pixmap. */
-	    gtk_widget_realize (button);
-
-	    style = gtk_widget_get_style (button);
-	    gdkpixmap = gdk_pixmap_create_from_xpm (button->window, &mask,
-	                                   &style->bg[GTK_STATE_NORMAL],
-					   filename);
-	    pixmap = gtk_pixmap_new (gdkpixmap, mask);
-
-	    gtk_container_add (GTK_CONTAINER (button), pixmap);
-
-	    gtk_widget_show (pixmap);
-	    gtk_widget_show (button);
-	    gtk_widget_show (window);
-
-	    gtk_main ();
-	    return 0;
-	}
-
-=head2 Different reliefs
-
-Reliefs affect how the shadowing of the button is drawn.  The different
-types of relief styles are: 
-
-	GTK_RELIEF_NORMAL
-	GTK_RELIEF_HALF
-	GTK_RELIEF_NONE
-
-When set to a normal relief, the widget looks and acts like a normal
-button.  When half or none relief is used, shadowing is only drawn when the 
-mouse cursor is over the widget.
-
-To set the relief, use gtk_button_set_relief(), like:
-
-	gtk_button_set_relief (button, GTK_RELIEF_HALF);
-
-To get the current relief of a button, use gtk_button_get_relief():
-
-	GtkReliefStyle relief;
-	relief = gtk_button_get_relief (GTK_BUTTON (button));
-
-=head2 Executing a command when the button is pressed
-
-To execute a function when a button is pressed, use
-gtk_signal_connect() to connect to the "clicked" signal.
-
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-	                    GTK_SIGNAL_FUNC (user_function),
-			    NULL);
-
-user_function is a user defined function, like the following:
-
-	void user_function (GtkWidget *button, gpointer data)
-	{
-	    printf("clicked\n");
-	}
-
-=head1 FUNCTIONS
-
-GtkType gtk_button_get_type (void);
-
-	This function returns the GtkType which is assigned to the
-	object class for gtk_button.
-
-GtkWidget* gtk_button_new (void);
-
-	This functions returns a new button widget which can then be
-	used as a container for another widget.
-
-GtkWidget* gtk_button_new_with_label (const gchar *label);
-
-	This function returns a new button widget with a label widget
-	as a child.   The label widget will have the text passed into
-	the commant.
-
-void gtk_button_pressed (GtkButton *button);
-
-	This function sends a "pressed" signal to the button.
-
-void gtk_button_released (GtkButton *button);
-
-	This function sends a "released" signal to the button.
-
-void gtk_button_clicked (GtkButton *button);
-
-	This function sends a "clicked" signal to the button.
-
-void gtk_button_enter (GtkButton *button);
-
-	This function sends a "enter" signal to the button.
-
-void gtk_button_leave (GtkButton *button);
-
-	This function sends a "leave" signal to the button.
-
-void gtk_button_set_relief (GtkButton *button, GtkReliefStyle style);
-
-	This function is sets the GtkReliefStyle of the button.  The
-	relief style is one of: GTK_RELIEF_NORMAL, GTK_RELIEF_HALF,
-	or GTK_RELIEF_NONE.  The relief determines when the shadow of
-	the button is drawn.
-
-GtkReliefStyle gtk_button_get_relief (GtkButton *button);
-
-	This function returns the current relief of the button.
-
-=head1 SIGNALS
-
-"clicked"
-
-	void user_function (GtkWidget *widget, gpointer data);
-
-	Gets emitted when the button is clicked. A click is 
-	a press and release of the button when the cursor is
-	inside the button on release.  
-
-"pressed"
-
-	void user_function (GtkWidget *widget, gpointer data);
-
-	Gets emitted when the left mouse button is pressed.
-
-"released"
-
-	void user_function (GtkWidget *widget, gpointer data);
-
-	Gets emitted when the left mouse button is released and
-	the widget was previously pressed.
-
-"enter"
-
-	void user_function (GtkWidget *widget, gpointer data);
-
-	Emitted when the mouse cursor enters the button.
-
-"leave"
-
-	void user_function (GtkWidget *widget, gpointer data);
-
-	Emitted when the mouse cursor leaves the button.
-
-=head1 AUTHORS
-
-The author of this man page is Shawn T. Amundson E<lt>amundson@gtk.orgE<gt>.
-For the authors of GTK+, see the AUTHORS file in the GTK+ distribution.
-
-
--- a/docs/package_tutorial.sh
+++ b/docs/package_tutorial.sh
@@ -1,99 +0,0 @@
-#! /bin/sh
-# package_tutorial.sh - Package up the tutorial into various formats
-# Copyright (C) Tony Gale 1999
-# Contact: gale@gtk.org
-#
-# NOTE: This script requires the following to be installed:
-#            o SGML Tools
-#            o Latex
-#            o DVI tools
-
-TARGET=`pwd`/gtk_tut.sgml
-GIFS="`pwd`/*.gif"
-EXAMPLES=`pwd`/../examples
-
-PATH=`pwd`:$PATH
-
-DATE=`date '+%y%m%d'`
-
-# Check top level directory
-if [ ! -d gtk_tutorial ]; then
-  if [ -e gtk_tutorial ]; then
-    echo "ERROR: gtk_tutorial is not a directory"
-    exit
-  fi
-  mkdir gtk_tutorial.$DATE
-fi 
-
-cd gtk_tutorial.$DATE
-
-# SGML Format
-echo -n "Copy SGML and GIF's.... "
-if [ ! -d sgml ]; then
-  if [ -e sgml ]; then
-    echo "ERROR: html is not a directory"
-    exit
-  fi
-  mkdir sgml
-fi
-
-(cd sgml ; cp $TARGET . ; cp $GIFS .)
-echo "done"
-
-# HTML Format
-echo -n "Formatting into HTML.... " 
-if [ ! -d html ]; then
-  if [ -e html ]; then
-    echo "ERROR: html is not a directory"
-    exit
-  fi
-  mkdir html
-fi
-
-(cd html ; sgml2html $TARGET ; cp $GIFS .)
-echo "done"
-
-# Text Format
-echo -n "Formatting into Text.... "
-if [ ! -d txt ]; then
-  if [ -e txt ]; then
-    echo "ERROR: txt is not a directory"
-    exit
-  fi
-  mkdir txt
-fi
-
-(cd txt ; sgml2txt -f $TARGET 2>&1 > /dev/null )
-echo "done"
-
-# PS and DVI Format
-echo -n "Formatting into PS and DVI.... "
-if [ ! -d ps ]; then
-  if [ -e ps ]; then
-    echo "ERROR: ps is not a directory"
-    exit
-  fi
-  mkdir ps
-fi
-
-(cd ps ; sgml2latex --output=ps $TARGET > /dev/null)
-(cd ps ; sgml2latex $TARGET > /dev/null)
-echo "done"
-
-# Copy examples
-echo -n "Copying examples"
-cp -R $EXAMPLES .
-(cd examples ; make clean ; rm -rf CVS */CVS)
-echo "done"
-
-# Package it all up
-echo -n "Creating packages.... "
-cd ..
-tar cvfz gtk_tutorial.$DATE.tar.gz gtk_tutorial.$DATE
-echo "done"
-
-rm -rf gtk_tutorial.$DATE
-
-echo
-echo Package gtk_tutorial.$DATE.tar.gz created.
-echo
--- a/docs/reference/.cvsignore
+++ b/docs/reference/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
--- a/docs/reference/AUTHORS
+++ b/docs/reference/AUTHORS
@@ -0,0 +1,7 @@
+Damon Chaplin <damon@karuna.freeserve.co.uk> and others.
+
+See:
+
+ http://www.gtk.org/rdp/status.html
+
+for a complete list.
--- a/docs/reference/COPYING
+++ b/docs/reference/COPYING
@@ -0,0 +1,30 @@
+This work may be reproduced and distributed in whole or in part, in
+any medium, physical or electronic, so as long as this copyright
+notice remains intact and unchanged on all copies.  Commercial
+redistribution is permitted and encouraged, but you may not
+redistribute, in whole or in part, under terms more restrictive than
+those under which you received it. If you redistribute a modified or
+translated version of this work, you must also make the source code to
+the modified or translated version available in electronic form
+without charge.  However, mere aggregation as part of a larger work
+shall not count as a modification for this purpose.
+
+All code examples in this work are placed into the public domain,
+and may be used, modified and redistributed without restriction.
+
+BECAUSE THIS WORK IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE WORK, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE WORK "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  SHOULD THE WORK PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY REPAIR OR CORRECTION.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE WORK AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+WORK, EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGES.
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -0,0 +1,547 @@
+Tue Apr 17 10:59:13 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/Makefile.am (GTKDOC_CFLAGS): Remove -DGTK_DISABLE_COMPAT
+	add -DGTK_ENABLE_BROKEN
+
+	* {gtk/gtk,gdk/gdk}-sections.txt: Updated
+
+Fri Apr 13 10:41:10 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* */Makefile.am: Add $(top_builddir) to includes as necessary,
+	Run gtkdoc-scangobj from builddir, not srcdir, don't distribute
+	foo-doc.{top,bottom}, recomment in code to distribute HTML
+	images, with shell fixes.
+
+	* gtk/gtk.hierarchy gdk-pixbuf/gdk-pixbuf.{args,signals,hierarchy}:
+	Remove generated files.
+	
+Wed Apr  4 01:26:04 2001  Tim Janik  <timj@gtk.org>
+
+        * gdk-pixbuf/Makefile.am: disabled "for i in $(HTML_IMAGES) ;"
+	dist-hook because $(HTML_IMAGES) is empty.
+	* gtk/Makefile.am: same here.
+	* gdk/Makefile.am: same here. touched gdk.types since make rules
+	require it ;(
+
+2001-03-29  Mike Kestner  <mkestner@ameritech.net>
+
+	* gtk/tmpl/gtkspinbutton.html: killed function docs that are now
+	inline.
+
+2001-03-23  Havoc Pennington  <hp@redhat.com>
+
+	* gdk/gdk-sections.txt: updates
+
+	* gtk/gtk-sections.txt: updates
+
+	* gtk/gtk-docs.sgml: mop up TreeModelSimple entity
+
+	* gdk/gdk-docs.sgml: remove input method
+	and input context docs
+
+2001-03-22  Havoc Pennington  <hp@redhat.com>
+
+	* gdk/tmpl/keys.sgml: docs on GdkKeymap
+
+2001-03-16  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/gtk-docs.sgml: remove GtkData entity usage
+
+2001-03-14  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/gtk-docs.sgml: remove gtkdata, gtktreemodelsimple
+
+	* gtk/gtk.types: remove gtk_data_get_type
+
+Wed Mar  7 23:58:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/tmpl/gtkwidget.sgml: Document ::hierarchy-changed.
+
+Wed Mar  7 00:27:13 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gdk-pixbuf/Makefile.am (scan-build.stamp): add --nogtkinit.
+
+Sat Mar  3 17:20:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* */Makefile.am (scan-build.stamp): You can't use
+	+ as a metacharacter for basic regular expressions.
+	(This was the "all objects disappear")
+
+	* gdk/gdk-sections.txt gdk-pixbuf/gdk-pixbuf-sections.txt
+
+	* */*-unused.sgml: Remove a lot of empty stuff. (No
+	point in saving old docs when there aren't any.)
+
+2001-02-20  Havoc Pennington  <hp@pobox.com>
+
+	* gdk/tmpl/rgb.sgml: fix these docs to reflect the current state
+	of affairs
+
+2001-02-19  Havoc Pennington  <hp@pobox.com>
+
+	* gdk/Makefile.am (SCAN_OPTIONS): add --deprecated-guards
+
+	* gdk/gdk-sections.txt: update
+
+	* gdk/gdk-docs.sgml: update
+
+2001-02-18  Havoc Pennington  <hp@pobox.com>
+
+	* gdk-pixbuf/Makefile.am (IGNORE_HFILES): add gdk-pixbuf-marshal.h
+
+	* gdk-pixbuf/gdk-pixbuf-sections.txt: fixes
+
+Sun Feb 11 22:16:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* */Makefile.am: Use the new snazzy mother-of-all-gtk-doc-makefiles.
+
+	* gdk/tmpl/* gdk-pixbuf/tmpl/*: Recover a bunch of docs that were 
+	lost at one point.
+
+2001-02-08  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/windows.sgml: windows (file is blank)
+
+	* gtk/framebuffer.sgml: framebuffer (file is blank)
+
+	* gtk/compiling.sgml: how to use pkg-config, etc. (file is 
+	blank for now)
+
+2001-02-03  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/tmpl/gtkfixed.sgml: Add the intro docs section
+
+2001-02-01  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/gtk-sections.txt: updated
+
+	* gtk/gtk-docs.sgml: Move the below from "Deprecated" section to
+	"special-purpose" section; move GtkItem out of deprecated section,
+	since GtkMenuItem uses it, though probably the GtkItem signals
+	should just migrate down to GtkMenuItem someday it won't happen
+	for 2.0
+
+	* gtk/tmpl/gtkgamma.sgml: add note about eventual removal
+
+	* gtk/tmpl/gtkcurve.sgml: add note about eventual removal
+
+	* gtk/tmpl/gtkruler.sgml: add note about eventual removal
+
+	* gtk/tmpl/gtkhruler.sgml: add note about eventual removal
+
+	* gtk/tmpl/gtkvruler.sgml: add note about eventual removal
+
+	* gtk/tmpl/gtkinputdialog.sgml: add note about eventual removal
+
+2001-01-30  Havoc Pennington  <hp@pobox.com>
+
+        Also committed a bunch of automatic changes made by gtk-doc, 
+	after reviewing for correctness.
+	
+	* gtk/tmpl/gtktext.sgml: add warning about deprecation and note
+	about what to use instead
+
+	* gtk/tmpl/gtktree.sgml: ditto
+
+	* gtk/Makefile.am (scan): pass --deprecated-guards option to
+	gtk-doc
+
+	* gtk/gtk-docs.sgml: move GtkText to the deprecated section 
+	instead of the GtkTextView section. Oops.
+
+Tue Jan 30 16:01:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/tmpl/gtkclist.sgml: Added note explaining how
+	the @button parameter is off by 1. (#6739)
+
+Mon Jan  8 15:21:15 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (SUBDIRS): Restore build.
+
+	* gdk/gdk-sections.txt gdk/gdk-docs.sgml 
+	  gdk-pixbuf/gdk-pixbuf-sections.txt 
+	  gtk/gtk-sections.txt gtk/gtk-docs.sgml: : Update.
+
+	* */tmpl/*: Changes from update.
+
+Wed Oct 25 15:19:40 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/tmpl/gtknotebook.sgml: Moved function docs into .c
+	file, fairly extensive rewriting.
+
+Thu Nov 30 00:53:45 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/tmpl/gtkfilesel.sgml: Fix to say that file_selection_complete()
+	filters both files and directories.
+
+	* gtk/tmpl/gtktogglebutton.sgml: Fix description
+	of gtk_toggle_button_toggled().
+
+Fri Nov 17 17:31:30 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/Makefile.am (content_files): Add a couple
+	of files.
+
+Mon Nov 13 16:58:43 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* {gtk,gdk,gdk-pixbuf}/Makefile.am: cd to srcdir before
+	calling gtkdoc-fixref, distribute index.sgml.
+
+	* gtk/gtk-docs.sgml gtk/Makefile.am gtk/gtk-sections.txt
+	gtk/gtk.types: Update
+
+2000-11-05  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/tmpl/gtktexttag.sgml: documented some of the object args
+
+	* gtk/text_widget.sgml: fixups
+
+2000-11-04  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtk-sections.txt: Added a bunch of stuff from unused
+
+2000-11-01  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/tmpl/gtkmessagedialog.sgml: Check in these docs, I seem to
+	have written them a while ago then forgotten about them.
+
+2000-11-01  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtk-sections.txt: Add new label functions
+
+Sun Oct 29 02:59:50 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* **: Updates to new gtk-doc, gsignal, causing quite
+	a bit of diffs but little real changes.
+
+2000-10-24  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/text_widget.sgml: add note about UTF-8
+
+2000-10-23  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/gtk-sections.txt: remove GtkTextBTree
+
+	* gtk/text_widget.sgml: Overview of the text widget
+
+	* gtk/gtk-docs.sgml: Change to using categories for the toplevel 
+	organization of the reference entries. We'll add an alphabetical 
+	index eventually. The category way is a lot easier for people who
+	aren't familiar with the widgets. Removed objects_grouped.sgml 
+	from gtk-docs.sgml for now, it doesn't seem useful anymore.
+
+	* gtk/objects_grouped.sgml: Add a section for deprecated
+	objects; add a section for the TextView object collection
+
+Wed Oct 18 11:01:12 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/Makefile.am gdk-pixbuf/Makefile.am: Fix typo
+
+2000-10-20  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/gtk-sections.txt: Add dialog docs
+
+2000-10-18  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/gtk-sections.txt: Some updates
+
+	* gdk/gdk-sections.txt: remove GdkPixbufAlphaMode
+
+	* gdk-pixbuf/gdk-pixbuf-sections.txt: Add new API, remove 
+	GdkPixbufClass/GdkAnimationClass since those are private
+
+	* gdk-pixbuf/Makefile.am (IGNORE_HFILES): ignore more headers
+
+2000-10-06  Havoc Pennington  <hp@redhat.com>
+
+        * gdk-pixbuf/*.sgml, gdk-pixbuf/tmpl/*.sgml: copy in from 1.0
+	
+	* gdk-pixbuf/gdk-pixbuf-sections.txt: add Xlib sections from 1.0
+	tree
+
+	* gdk-pixbuf/Makefile.am: add stuff from 1.0 tree
+
+	* gdk-pixbuf/compiling.sgml: copy from 1.0 tree
+
+2000-09-26  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/tmpl/gtkrc.sgml: Document stock icon stuff
+
+Thu Sep  7 14:15:03 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gdk/* gtk/*: Move gtk-reference files into GTK+ tree proper.
+
+	* Update sections.txt files to correspond to current code,
+	tweak .sgml files and Makefiles to correspond.
+
+	* gtk/tmpl/gtkradiomenuitem.sgml (this): Remove extra <para>
+
+2000-06-14  Damon Chaplin  <damon@helixcode.com>
+
+	* gtk/tmpl/gtktooltips.sgml: added a note about no-window widgets.
+
+Mon Jun  5 11:17:25 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/tmpl/general.sgml: Fix gdk_pointer_grab description
+	as pointed out by Dave Morse.
+
+Sun May 28 12:16:01 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/tmpl/gtkaspectframe.sgml: Fix typo
+	pointed out by Gregory McLean.
+
+2000-05-28  Damon Chaplin  <damon@helixcode.com>
+
+	* gdk/tmpl/event_structs.sgml: typo.
+
+2000-04-22  Damon Chaplin  <damon@helixcode.com>
+
+	* gtk/tmpl/gtkenums.sgml: update from Lee Mallabone
+	<lee0@callnetuk.com>
+
+2000-04-09  Damon Chaplin  <damon@helixcode.com>
+
+	* gtk/tmpl/gtkmain.sgml: update from Torsten Landschoff
+	<t.landschoff@gmx.net>
+
+	* gdk/tmpl/input_methods.sgml: 
+	* gdk/tmpl/general.sgml: fixed typos.
+
+Tue Mar 14 14:17:46 2000  Raph Levien  <raph@acm.org>
+
+	* gdk/tmpl/rgb.sgml: Better explanation of gdk_rgb_set_min_colors.
+	Thanks to Stric for spotting it.
+
+2000-03-07  Damon Chaplin  <damon@helixcode.com>
+
+	* gtk/tmpl/gtkclist.sgml: fix to gtk_clist_set_reorderable(). It
+	reorders rows, not columns. From Guy Harris <gharris@flashcom.net>.
+
+2000-02-29  Damon Chaplin  <damon@helixcode.com>
+
+	* gtk/tmpl/gtkmenuitem.sgml: minor fix from Nicolas GEORGE
+	<nicolas.george@ens.fr>.
+
+2000-02-28  Damon Chaplin  <damon@helixcode.com>
+
+	* gtk/tmpl/gtkradiomenuitem.sgml: 
+	* gtk/tmpl/gtkmenuitem.sgml: 
+	* gtk/tmpl/gtknotebook.sgml: new menu item sections and minor update to
+	notebook section from Nicolas GEORGE <nicolas.george@ens.fr>.
+
+2000-02-18  Damon Chaplin  <damon@helixcode.com>
+
+	* gtk/tmpl/gtktooltips.sgml: patch from
+	David Benson <daveb@idealab.com> to note that gtk_tooltips_set_colors()
+	does not work.
+
+2000-02-09  Damon Chaplin  <damon@helixcode.com>
+
+	* gdk/tmpl/input_methods.sgml: minor fix.
+
+2000-02-03  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gdk/gdk-sections.txt: rearranged a bit.
+
+	* gdk/tmpl/event_structs.sgml: updated.
+
+	* gtk/gtk-sections.txt: added INCLUDE tag for Private Info section.
+
+	* gdk/tmpl/color_contexts.sgml: added note saying it is deprecated.
+	* gdk/tmpl/dnd.sgml: added note saying read the GTK+ DnD docs.
+
+2000-02-02  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gdk/tmpl/*.sgml: ran make templates.
+
+	* gdk/gdk-docs.sgml: rearranged sections.
+
+	* gdk/tmpl/events.sgml: documented.
+
+	* gdk/tmpl/general.sgml: documented.
+
+	* gdk/tmpl/rgb.sgml: fixed a few '@' -> '#'.
+
+	* gdk/gdk-sections.txt: rearranged a few bits, including moving
+	GdkWChar and related functions from the input method section to the
+	font section, and GdkCapStyle etc. from Drawing Primitives to GCs.
+
+	* gdk/tmpl/images.sgml: documented.
+
+	* gdk/tmpl/drawing.sgml: updated.
+
+	* gdk/tmpl/regions.sgml: updated.
+
+	* gdk/tmpl/input_contexts.sgml: documented.
+
+	* gdk/tmpl/input_methods.sgml: documented.
+
+	* gdk/tmpl/selections.sgml: changed xref to a link since Jade says
+	a xref to a RefEntry is not supported.
+
+2000-01-19  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/tmpl/gtkscrollbar.sgml: Started.
+
+2000-01-08  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/tmpl/gtkclist.sgml: update from Paul Schifferer
+	<isengard@geocities.com>
+
+Wed Jan  5 10:23:41 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/tmpl/gtkprogress.sgml: Missing </listitem>, remove extra <para>
+	* gtk/tmpl/gtkobject.sgml: dos2unix
+	* gtk/tmpl/gtkcurve.sgml: missing </para>
+	* gtk/tmpl/gtkarg.sgml: dos2unix, missing </para>
+	* gtk/tmpl/gtkcolorsel.sgml: Missing </listitem>'s
+	* gtk/tmpl/gtksignal.sgml (signal): dos2unix, missing </para>'s
+	* gtk/tmpl/gtkmarshal.sgml: Missing </refsect2>
+
+1999-11-16  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/tmpl/gtkmenubar.sgml: fixed minor error - using <em>.
+
+	* gtk/tmpl/gtknotebook.sgml: 
+	* gtk/tmpl/gtklist.sgml: new sections from
+	Nicolas George <george@clipper.ens.fr>, with help from
+	"Bob Springett"	<bobspringett@claranet.fr>.
+
+	* gtk/tmpl/gtkobject.sgml: 
+	* gtk/tmpl/gtkarg.sgml: new sections from
+	David Benson <daveb@idealab.com>.
+
+	* gtk/tmpl/gtkvbox.sgml: 
+	* gtk/tmpl/gtkhbox.sgml: fixed line endings.
+
+	* gtk/tmpl/gtkvbbox.sgml: update from Lee Mallabone
+	<lee0@callnetuk.com>
+
+	* gdk/tmpl/drawing.sgml: fixed error in gdk_draw_arc() @angle2 param
+	- it is relative to @angle1 rather than from the 3 o'clock position.
+
+	* gtk/tmpl/gtkfontseldlg.sgml: changed enums to use @ fields.
+
+	* gtk/tmpl/gtkcolorsel.sgml: 
+	* gtk/tmpl/gtkcolorseldlg.sgml: 
+	* gtk/tmpl/gtkprogress.sgml: 
+	* gtk/tmpl/gtkprogressbar.sgml: new sections from Tom Martone
+	<tom@martoneconsulting.com>
+
+	* gtk/tmpl/gtkclist.sgml: partially written documentation from
+	Paul Schifferer <isengard@geocities.com> who won't be able to finish it
+
+1999-09-22  Martin Norbäck  <d95mback@dtek.chalmers.se>
+	
+	* gtk/tmpl/gtkclist.sgml: Added information about the sorting functions
+
+Tue Oct 26 16:50:15 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/tmpl/gtkrc.sgml: Added information about widget
+	paths and pattern matching.
+
+1999-09-22  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/tmpl/*.sgml: ran make templates, to fix problems with structs.
+
+	* gtk/gtk-sections.txt: rearranged GtkCombo section.
+
+	* gtk/tmpl/gtkvseparator.sgml: 
+	* gtk/tmpl/gtkhseparator.sgml: 
+	* gtk/tmpl/gtkgc.sgml: 
+	* gtk/tmpl/gtkfeatures.sgml: 
+	* gtk/tmpl/gtktipsquery.sgml: 
+	* gtk/tmpl/gtkitem.sgml: 
+	* gtk/tmpl/gtkinvisible.sgml: 
+	* gtk/tmpl/gtkgamma.sgml: 
+	* gtk/tmpl/gtkdata.sgml: 
+	* gtk/tmpl/gtkcurve.sgml: 
+	* gtk/tmpl/gtkcombo.sgml: 
+	* gtk/tmpl/gtkaccellabel.sgml: documented.
+
+1999-09-20  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/gtk-docs.sgml: added role="no-toc" to the GTK+ Widgets & Objects
+	chapter since we've created our own special contents page.
+
+1999-09-19  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/tmpl/gtkmarshal.sgml: 
+	* gtk/tmpl/gtksignal.sgml: new sections from 
+         David Benson <daveb@idealab.com>.
+
+	* gtk/gtk-sections.txt: rearranged signal sections, and made most
+	marshallers private. Moved GtkSignalRunType to signals section.
+
+	* gtk/tmpl/gtkradiobutton.sgml: new section from Lee Mallabone.
+
+1999-09-17  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/gtk-docs.sgml: removed menu factory and debugging sections.
+
+	* gtk/gtk-sections.txt: made menu factory stuff private since it is
+	deprecated. Also made debugging stuff private since it is only useful
+	within GTK+.
+
+1999-09-14  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/tmpl/gtkfilesel.sgml: fixed mismatched parentheses.
+
+1999-09-02  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gdk/tmpl/event_structs.sgml: 
+	* gdk/tmpl/drawing.sgml: minor fixes.
+
+1999-09-20  David C. Mason  <dcm@redhat.com>
+
+	* gtk/tmpl/gtkimage.sgml: first pass at gtkimage... not complete
+
+1999-08-28  Damon Chaplin  <damon@karuna.freeserve.co.uk>
+
+	* gtk/tmpl/gtkbbox.sgml: new section from Lee Mallabone.
+
+	* gdk/gdk-sections.txt: rearranged rgb, regions, and drawing sections.
+
+	* gdk/tmpl/rgb.sgml: new section from Raph Levien, with a few changes
+	by me, including a little example app.
+
+	* gdk/tmpl/regions.sgml: 
+	* gdk/tmpl/event_structs.sgml: 
+	* gdk/tmpl/drawing.sgml: my first attempt.
+	* gdk/tmpl/cursors.sgml: tiny changes.
+
+Tue Aug 17 09:14:01 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/tmpl/gtktypeutils.sgml: Fix corrupted end tag.
+
+	* gtk/tmpl/gtkselection.sgml gtk/tmpl/gtkrc.sgml
+	  gtk/tmpl/gtkdnd.sgml gtk/tmpl/gtkarrow.sgml
+	  gtk/tmpl/gtkpaned.sgml gtk/tmpl/gtkmisc.sgml
+	  gtk/tmpl/gtkhandlebox.sgml gtk/tmpl/gtkctree.sgml:
+	Added missing close tags.
+
+Thu Aug 19 14:43:08 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/tmpl/gcs.sgml gdk/gdk-sections.txt: Added section. 
+	  (Written a while ago but fell through the cracks)
+
+	* gtk/gtk-docs.sgml: Add a &hash; entity here as a
+	  temporary hack. (There is no standard entity
+	  for '#', and no way of escaping '#' in gtk-doc)
+
+	* gtk/tmpl/gtkrc.sgml: Use the above to fix up #rrggbb
+	  string literals.
+
+	* gtk/tmpl/gtkdrawingarea.sgml: Fixed a couple
+	  of errors in the example. (pointed out by
+	  Nick Lamb)
+
+Mon Aug 16 6:60:53 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/tmpl/properties.sgml
+	  gdk/tmpl/selections.sgml
+	  gdk/tmpl/input_devices.sgml: Documented
+
+	* gdk/gdk-sections.txt: Moved around types for
+	  input devices properties and selections, marked
+	  a few functions as private.
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -0,0 +1,4 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = gdk-pixbuf gdk gtk
+
--- a/docs/reference/README
+++ b/docs/reference/README
@@ -0,0 +1,62 @@
+This package contains the reference documentation
+for GTK+. For more information about GTK+
+see:
+
+ http://www.gtk.org
+
+For information about contributing to the
+GLib/GTK+ reference documentation project, see:
+
+ http://www.gtk.org/rdp/
+
+The GTK+ reference documentation is freely redistributable,
+see the file COPYING for details.
+
+
+REQUIREMENTS
+============
+
+To build the documentation, you must have the gtk-doc
+package installed. To rebuild the template files,
+you must have the current version of the GTK+
+header files installed.
+
+
+BUILD
+=====
+
+First, run configure to generate the makefiles for this
+module. There is one option specific to this package
+
+  --with-html-dir=DIR   top of installed HTML documentation tree
+
+
+The Makefiles in the gdk/ and gtk/ subdirs each define three targets:
+
+ templates:
+  
+  Scan the headers and merge the results with the current 
+  template files
+
+ sgml:
+
+  Generate SGML files using the DocBook DTD from
+  the template files
+
+ html:
+
+  Generate HTML from the SGML files.
+
+To build the documentation, do:
+
+ make sgml
+ make html
+
+You should only run the 'make templates' step if you
+need to regenerate the templates for a more recent
+version of the GTK+ sources.
+
+INSTALLATION
+============
+
+ make install
--- a/docs/reference/README.cvs-commits
+++ b/docs/reference/README.cvs-commits
@@ -0,0 +1,39 @@
+Before making any changes to this module, please
+contact:
+
+  Damon Chaplin <damon@karuna.freeserve.co.uk>
+
+This will ensure that duplicate work does not occur,
+and also make sure we know who has written what
+parts of the documentation. See 
+
+ http://www.gtk.org/rdp/
+
+for more information.
+
+By contributing work to the Reference Documentation
+Project, you agree that it will be covered under the
+license terms described in the file COPYING
+included in this directory.
+
+
+Other notes:
+
+- Do not run 'make templates' unless you have
+  the latest cvs version of the gtk-1-2
+  branch of GTK+ and the latest CVS version
+  of gtk-doc.
+
+  (This is very important. Otherwise, the template
+  files may be come corrupted.)
+
+  Make sure that gtk-config --prefix points
+  to the correct version of GTK+.
+
+- As always, ChangeLog entries should be made for
+  each commit. These can be really brief
+  "documented GHashTable"; but if you are editing
+  something someone else wrote, please be specific.
+  (Or better, send the changes to them for their
+  approval, first)
+
--- a/docs/reference/gdk-pixbuf/.cvsignore
+++ b/docs/reference/gdk-pixbuf/.cvsignore
@@ -0,0 +1,13 @@
+Makefile
+Makefile.in
+html
+sgml
+gdk-pixbuf.args
+gdk-pixbuf.hierarchy
+gdk-pixbuf.signals
+gdk-pixbuf-decl.txt
+gdk-pixbuf-decl-list.txt
+gdk-pixbuf-unused.txt
+*.stamp
+*.lo
+.libs
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -0,0 +1,206 @@
+## Process this file with automake to produce Makefile.in
+
+# The name of the module.
+DOC_MODULE=gdk-pixbuf
+
+# The top-level SGML file.
+DOC_MAIN_SGML_FILE=gdk-pixbuf.sgml
+
+# The directory containing the source code. Relative to $(srcdir)
+DOC_SOURCE_DIR=../../../gdk-pixbuf
+
+# Extra options to supply to gtkdoc-scan
+SCAN_OPTIONS=--source-dir=../../../contrib/gdk-pixbuf-xlib
+
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS=--source-dir=../../../contrib/gdk-pixbuf-xlib
+
+# Extra options to supply to gtkdoc-fixref
+FIXXREF_OPTIONS=
+
+# Used for dependencies
+HFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.h $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.h
+CFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.c $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.c
+
+# Header files to ignore when scanning
+IGNORE_HFILES=				\
+	pixops				\
+	gdk-pixbuf-marshal.h		\
+	gdk-pixbuf-xlib-private.h 	\
+	gdk-pixbuf-i18n.h 		\
+	gdk-pixbuf-private.h
+
+# Extra files to add when scanning
+EXTRA_HFILES=
+
+# Images to copy into HTML directory
+HTML_IMAGES = 
+
+# Extra SGML files that are included by DOC_MAIN_SGML_FILE
+content_files =				\
+	compiling.sgml			\
+	gdk-pixbuf.sgml			\
+	porting-from-imlib.sgml
+
+# Other files to distribute
+extra_files =
+
+# CFLAGS and LDFLAGS for compiling scan program. Only needed
+# if $(DOC_MODULE).types is non-empty.
+GTKDOC_CFLAGS = @STRIP_BEGIN@ 				\
+	@CFLAGS@					\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir) 				\
+	-I$(top_builddir)/gdk				\
+	-DGTK_DISABLE_COMPAT_H				\
+	@GTK_DEBUG_FLAGS@				\
+	@GTK_XIM_FLAGS@					\
+	@GTK_LOCALE_FLAGS@				\
+	@PANGO_CFLAGS@					\
+	@GLIB_CFLAGS@					\
+	@more_cflags@					\
+@STRIP_END@
+
+GTKDOC_LIBS = @STRIP_BEGIN@ 				\
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la	\
+	$(top_builddir)/gdk/@gdktargetlib@        	\
+	$(top_builddir)/gtk/@gtktargetlib@ 		\
+	@more_ldflags@					\
+	@more_libs@					\
+	@GDK_WLIBS@					\
+	@PANGO_LIBS@					\
+	@GLIB_LIBS@					\
+	@GTK_LIBS_EXTRA@				\
+	-lm						\
+@STRIP_END@
+
+GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
+GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
+
+
+####################################
+# Everything below here is generic #
+####################################
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+EXTRA_DIST = 				\
+	$(content_files)		\
+	$(extra_files)			\
+	$(HTML_IMAGES)			\
+	$(DOC_MAIN_SGML_FILE)		\
+	$(DOC_MODULE).types		\
+	$(DOC_MODULE)-sections.txt	\
+	$(DOC_MODULE)-overrides.txt
+
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+SCANOBJ_FILES = 		\
+	$(DOC_MODULE).args 	\
+	$(DOC_MODULE).hierarchy \
+	$(DOC_MODULE).signals
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB)
+	@echo '*** Scanning header files ***'
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	else \
+	    cd $(srcdir) ; \
+	    for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+	    done \
+	fi
+	cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+	@true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+	@echo '*** Rebuilding template files ***'
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+	touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+	@true
+
+#### sgml ####
+
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
+	@echo '*** Building SGML ***'
+	cd $(srcdir) && \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
+	touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+	@true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo '*** Building HTML ***'
+	test -d $(srcdir)/html || mkdir $(srcdir)/html
+	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@echo '-- Fixing Crossreferences' 
+	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	touch html-build.stamp
+endif
+
+##############
+
+clean-local:
+	rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
+
+maintainer-clean-local: clean
+	cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
+	(installfiles=`echo $(srcdir)/html/*.html`; \
+	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+	then echo '-- Nothing to install' ; \
+	else \
+	  for i in $$installfiles; do \
+	    echo '-- Installing '$$i ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+	  done; \
+	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
+	fi)
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+	@false
+endif
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+	mkdir $(distdir)/tmpl
+	mkdir $(distdir)/sgml
+	mkdir $(distdir)/html
+	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
+	-cp $(srcdir)/html/index.sgml $(distdir)/html
+	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
+
+	images=$(HTML_IMAGES) ;    	      \
+	for i in $$images ; do		      \
+	  cp $(srcdir)/$$i $(distdir)/html ;  \
+	done
+
+.PHONY : dist-hook-local
--- a/docs/reference/gdk-pixbuf/compiling.sgml
+++ b/docs/reference/gdk-pixbuf/compiling.sgml
@@ -0,0 +1,103 @@
+  <appendix id="compiling">
+    <title>Compiling the &gdk-pixbuf; library</title>
+
+    <para>
+      This appendix describes the special options you can use while
+      compiling the &gdk-pixbuf; library.
+    </para>
+
+    <sect1 id="building">
+      <title>Building the Library</title>
+      <para>
+	The &gdk-pixbuf; library uses the standard GNU build system,
+	using <application>autoconf</application> for package
+	configuration and resolving portability issues,
+	<application>automake</application> for building makefiles
+	that comply with the GNU Coding Standards, and
+	<application>libtool</application> for building shared
+	libraries on multiple platforms.  The normal sequence for
+	compiling and installing the &gdk-pixbuf; library is thus:
+
+	<literallayout>
+	  <userinput>./configure</userinput>
+	  <userinput>make</userinput>
+	  <userinput>make install</userinput>
+	</literallayout>
+      </para>
+
+      <para>
+	The standard options provided by <application>GNU
+	autoconf</application> may be passed to the
+	<command>configure</command> script.  Please see the
+	<application>autoconf</application> documentation or run
+	<command>./configure --help</command> for information about
+	the standard options.
+      </para>
+    </sect1>
+
+    <sect1 id="extra-configuration-options">
+      <title>Extra Configuration Options</title>
+
+      <para>
+	In addition to the normal options, the
+	<command>configure</command> script in the &gdk-pixbuf;
+	library supports these additional arguments:
+
+	<cmdsynopsis>
+	  <command>configure</command>
+
+	  <group>
+	    <arg>--disable-modules</arg>
+	    <arg>--enable-modules</arg>
+	  </group>
+
+	  <group>
+	    <arg>--disable-gtk-doc</arg>
+	    <arg>--enable-gtk-doc</arg>
+	  </group>
+	</cmdsynopsis>
+      </para>
+
+      <formalpara>
+	<title><systemitem>--disable-modules</systemitem> and
+	  <systemitem>--enable-modules</systemitem></title>
+
+	<para>
+	  Normally &gdk-pixbuf; will try to build the image file
+	  format loaders as little shared libraries that are loaded on
+	  demand.  The <systemitem>--disable-modules</systemitem>
+	  argument indicates that they should all be built statically
+	  into the &gdk-pixbuf; library instead.  This is useful for
+	  people who need to produce statically-linked binaries.  If
+	  neither <systemitem>--disable-modules</systemitem> nor
+	  <systemitem>--enable-modules</systemitem> is specified, then
+	  the <command>configure</command> script will try to
+	  auto-detect whether shared modules work on your system.
+	</para>
+      </formalpara>
+
+      <formalpara>
+	<title><systemitem>--disable-gtk-doc</systemitem> and
+	  <systemitem>--enable-gtk-doc</systemitem></title>
+
+	<para>
+	  By default the <command>configure</command> script will try
+	  to auto-detect whether the
+	  <application>gtk-doc</application> package is installed.  If
+	  it is, then it will use it to extract and build the
+	  documentation for the &gdk-pixbuf; library.  These options
+	  can be used to explicitly control whether gtk-doc should be
+	  used or not.  If it is not used, the distributed,
+	  pre-generated HTML files will be installed instead of
+	  building them on your machine.
+	</para>
+      </formalpara>
+    </sect1>
+  </appendix>
+
+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("gdk-pixbuf.sgml" "book" "book" "")
+End:
+-->
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-overrides.txt
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-overrides.txt
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
@@ -0,0 +1,193 @@
+<INCLUDE>gdk-pixbuf/gdk-pixbuf.h</INCLUDE>
+
+<SECTION>
+<TITLE>Versioning</TITLE>
+<FILE>initialization_versions</FILE>
+
+<SUBSECTION>
+gdk_pixbuf_version
+GDK_PIXBUF_VERSION
+GDK_PIXBUF_MAJOR
+GDK_PIXBUF_MINOR
+GDK_PIXBUF_MICRO
+</SECTION>
+
+<SECTION>
+<FILE>gdk-pixbuf</FILE>
+GdkPixbufError
+GDK_PIXBUF_ERROR
+GdkColorspace
+GdkPixbufAlphaMode
+GdkPixbuf
+gdk_pixbuf_get_colorspace
+gdk_pixbuf_get_n_channels
+gdk_pixbuf_get_has_alpha
+gdk_pixbuf_get_bits_per_sample
+gdk_pixbuf_get_pixels
+gdk_pixbuf_get_width
+gdk_pixbuf_get_height
+gdk_pixbuf_get_rowstride
+
+<SUBSECTION Standard>
+GDK_PIXBUF
+GDK_TYPE_PIXBUF
+GDK_IS_PIXBUF
+
+<SUBSECTION Private>
+gdk_pixbuf_get_type
+gdk_pixbuf_error_quark
+</SECTION>
+
+<SECTION>
+<FILE>refcounting</FILE>
+GdkPixbufDestroyNotify
+gdk_pixbuf_ref
+gdk_pixbuf_unref
+</SECTION>
+
+<SECTION>
+<FILE>file-loading</FILE>
+gdk_pixbuf_new_from_file
+</SECTION>
+
+<SECTION>
+<FILE>file-saving</FILE>
+gdk_pixbuf_savev
+gdk_pixbuf_save
+</SECTION>
+
+<SECTION>
+<FILE>creating</FILE>
+gdk_pixbuf_new
+gdk_pixbuf_new_from_data
+gdk_pixbuf_new_from_xpm_data
+gdk_pixbuf_new_from_inline
+gdk_pixbuf_new_subpixbuf
+gdk_pixbuf_copy
+</SECTION>
+
+<SECTION>
+<FILE>util</FILE>
+gdk_pixbuf_add_alpha
+gdk_pixbuf_copy_area
+gdk_pixbuf_saturate_and_pixelate
+</SECTION>
+
+<SECTION>
+<FILE>animation</FILE>
+GdkPixbufFrameAction
+GdkPixbufFrame
+GdkPixbufAnimation
+gdk_pixbuf_animation_new_from_file
+gdk_pixbuf_animation_ref
+gdk_pixbuf_animation_unref
+gdk_pixbuf_animation_get_frames
+gdk_pixbuf_animation_get_width
+gdk_pixbuf_animation_get_num_frames
+gdk_pixbuf_animation_get_height
+gdk_pixbuf_frame_copy
+gdk_pixbuf_frame_free
+gdk_pixbuf_frame_get_pixbuf
+gdk_pixbuf_frame_get_action
+gdk_pixbuf_frame_get_y_offset
+gdk_pixbuf_frame_get_delay_time
+gdk_pixbuf_frame_get_x_offset
+
+<SUBSECTION Standard>
+GDK_PIXBUF_ANIMATION
+GDK_TYPE_PIXBUF_ANIMATION
+GDK_IS_PIXBUF_ANIMATION
+GDK_TYPE_PIXBUF_FRAME
+
+<SUBSECTION Private>
+gdk_pixbuf_frame_get_type
+gdk_pixbuf_animation_get_type
+</SECTION>
+
+<SECTION>
+<FILE>scaling</FILE>
+GdkInterpType
+gdk_pixbuf_scale
+gdk_pixbuf_composite
+gdk_pixbuf_composite_color
+gdk_pixbuf_scale_simple
+gdk_pixbuf_composite_color_simple
+</SECTION>
+
+<SECTION>
+<FILE>gdk-pixbuf-loader</FILE>
+<TITLE>GdkPixbufLoader</TITLE>
+gdk_pixbuf_loader_new
+gdk_pixbuf_loader_new_with_type
+gdk_pixbuf_loader_write
+gdk_pixbuf_loader_get_pixbuf
+gdk_pixbuf_loader_get_animation
+gdk_pixbuf_loader_close
+<SUBSECTION Standard>
+GDK_PIXBUF_LOADER
+GDK_PIXBUF_LOADER_GET_CLASS
+GDK_TYPE_PIXBUF_LOADER
+GDK_IS_PIXBUF_LOADER
+GDK_PIXBUF_LOADER_CLASS
+GDK_IS_PIXBUF_LOADER_CLASS
+<SUBSECTION Private>
+GdkPixbufLoader
+gdk_pixbuf_loader_get_type
+</SECTION>
+
+<SECTION>
+<TITLE>Module Interface</TITLE>
+<FILE>module_interface</FILE>
+ModuleFillVtableFunc
+ModulePreparedNotifyFunc
+ModuleUpdatedNotifyFunc
+ModuleFrameDoneNotifyFunc
+ModuleAnimationDoneNotifyFunc
+GdkPixbufModule
+</SECTION>
+
+<SECTION>
+<FILE>gdk-pixbuf-xlib-init</FILE>
+gdk_pixbuf_xlib_init
+gdk_pixbuf_xlib_init_with_depth
+</SECTION>
+
+<SECTION>
+<FILE>gdk-pixbuf-xlib-rendering</FILE>
+gdk_pixbuf_xlib_render_threshold_alpha
+gdk_pixbuf_xlib_render_to_drawable
+gdk_pixbuf_xlib_render_to_drawable_alpha
+gdk_pixbuf_xlib_render_pixmap_and_mask
+</SECTION>
+
+<SECTION>
+<FILE>gdk-pixbuf-xlib-from-drawables</FILE>
+gdk_pixbuf_xlib_get_from_drawable
+</SECTION>
+
+<SECTION>
+<FILE>gdk-pixbuf-xlib-rgb</FILE>
+XlibRgbCmap
+XlibRgbDither
+xlib_rgb_init
+xlib_rgb_init_with_depth
+xlib_rgb_gc_set_foreground
+xlib_rgb_gc_set_background
+xlib_draw_rgb_image
+xlib_draw_rgb_image_dithalign
+xlib_draw_rgb_32_image
+xlib_draw_gray_image
+xlib_rgb_cmap_new
+xlib_rgb_cmap_free
+xlib_draw_indexed_image
+xlib_rgb_ditherable
+xlib_rgb_set_verbose
+xlib_rgb_set_install
+xlib_rgb_set_min_colors
+xlib_rgb_get_cmap
+xlib_rgb_get_visual
+xlib_rgb_get_visual_info
+xlib_rgb_get_depth
+xlib_rgb_get_display
+xlib_rgb_get_screen
+</SECTION>
--- a/Show More
+++ b/Show More