2.6.7

2005-04-12  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose):
	Revert the changes to display broken images, since there
	are applications which rely on the old behaviour.

INSTALL

@@ -12,18 +12,14 @@ GTK+ requires the following packages:
    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.
+    http://www.libpng.org/
+    http://www.ijg.org/
 
 Simple install procedure
 ========================
 
-  % gzip -cd gtk+-2.2.0.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.2.0			   # change to the toplevel directory
+  % gzip -cd gtk+-2.6.7.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.6.7			   # change to the toplevel directory
   % ./configure				   # run the `configure' script
   % make				   # build GTK
   [ Become root if necessary ]
@@ -35,7 +31,7 @@ The Details
 Complete information about installing GTK+ and related libraries can be found 
 in the file:
 
- docs/reference/gtk/docs/reference/gtk/html/gtk-building.html
+ docs/reference/gtk/html/gtk-building.html
 
 Or online at:
 

INSTALL.in

@@ -12,12 +12,8 @@ GTK+ requires the following packages:
    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.
+    http://www.libpng.org/
+    http://www.ijg.org/
 
 Simple install procedure
 ========================
@@ -35,7 +31,7 @@ The Details
 Complete information about installing GTK+ and related libraries can be found 
 in the file:
 
- docs/reference/gtk/docs/reference/gtk/html/gtk-building.html
+ docs/reference/gtk/html/gtk-building.html
 
 Or online at:
 

Makefile.am

@@ -1,10 +1,10 @@
 ## Makefile.am for GTK+
 
 SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
+SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
 
 # require automake 1.4
-AUTOMAKE_OPTIONS = 1.4
+AUTOMAKE_OPTIONS = 1.7
 
 EXTRA_DIST =			\
 	HACKING			\
@@ -13,13 +13,16 @@ EXTRA_DIST =			\
 	ChangeLog.pre-1-0	\
 	ChangeLog.pre-1-2	\
 	ChangeLog.pre-2-0	\
+	ChangeLog.pre-2-2	\
+	ChangeLog.pre-2-4	\
+	ChangeLog.pre-2-6	\
 	README.cvs-commits	\
 	README.win32		\
 	config.h.win32		\
+	makefile.msc	\
 	gtk-zip.sh.in		\
 	sanitize-la.sh		\
 	po/README.translators	\
-	po/makefile.mingw	\
 	po/po2tbl.sed.in	\
 	examples/aspectframe/Makefile  \
 	examples/aspectframe/aspectframe.c  \
@@ -148,6 +151,10 @@ install-data-hook:
 	 rm -f gdk-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
 	 rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
 
+uninstall-local:
+	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-2.0.pc
+	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-2.0.pc
+
 dist-hook:
 	if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
 	     CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
@@ -181,26 +188,4 @@ snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
 
-# This is a version of the automake-1.4 distcheck rule modified
-# to pass --enable-gtk-doc to ./configure
-#
-mydistcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc

README

@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is GTK+ version 2.2.0. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.6.7. GTK+ is a multi-platform toolkit for
 creating graphical user interfaces. Offering a complete set of widgets,
 GTK+ is suitable for projects ranging from small one-off projects to
 complete application suites.
@@ -28,91 +28,86 @@ See the file 'INSTALL'
 Release notes
 =============
 
-* As compared to GTK+-1.2, the default configuration of GTK+-2 has been 
-  stream-lined to reduce confusion on the part of new users or users 
-  coming from other environments.  Users used to older versions of 
-  GTK+ may want to make some adjustments to the default configuration.
+* GTK+ 2.6 supports clipboard persistency. To make use of this feature,
+  a clipboard manager following the specification at
+  http://www.freedesktop.org/wiki/Standards/clipboard-manager-spec
+  must be running. A sample implementation of such a clipboard manager
+  is available at 
+  http://people.imendio.com/andersca/archives/clipboard-manager-0.3.tar.gz
+  Applications can use the function gdk_display_supports_clipboard_persistence() 
+  to find out if clipboard persistence is available.
 
-   - Emacs keybindings such as Control-A and Control-E to move to the
-     ends of lines are not enabled by default in the editing widgets. To
-     turn on Emacs keybindings, add the line:
+* Notification on clipboard ownership changes via GdkOwnerChange events 
+  requires the XFIXES X extension. Applications can use the function
+  gdk_display_supports_selection_notification() to find out if ownerchip
+  change notification is available.
 
-      gtk-key-theme-name = "Emacs"
-   
-     To your ~/.gtkrc-2.0
+* The icon theme code in GTK+ 2.6 follows the freedesktop.org icon theme 
+  specification. Setting the XDG_DATA_DIRS environtment variable may be 
+  necessary if your icons aren't installed in the default location 
+  /usr/share/icons.
 
-   - Editing of menu accelerators by pressing an accelerator over the
-     menu item is disabled by default. To enable, it, add:
+* The icon theme code in GTK+ 2.6 can make use of mmap()able cache files
+  to avoid a lot of disk searching overhead. GTK+ includes a utility named
+  gtk-update-icon-cache to generate these cache files. For further details,
+  see the gtk-update-icon-cache man page or the GTK+ documentation.
 
-      gtk-can-change-accels = 1
+* To reduce code size and improve efficiency, GTK+, when compiled 
+  with the GNU toolchain, has separate internal and external entry 
+  points for exported functions. The internal names, which begin with 
+  IA__, may be seen when debugging a GTK+ program.
 
-     to your ~/.gtkrc-2.0
+* The following functions have been deprecated in GTK+ 2.6:
+  gdk_pango_context_set_colormap
+  gtk_cell_renderer_editing_canceled
 
-   - To improve useability for keyboard operation, GTK+ now selects the
-     contents of an entry when tabbing into it or when it is focused on
-     initial window map. To disable this behavior, add:
-
-      gtk-entry-select-on-focus = 0
- 
-     to your ~/.gtkrc-2.0
+* The new GtkFileChooser widget emphasizes simplicity and thus does 
+  not provide a navigation entry by default when opening files. 
+  Experienced command line users will likely want to make heavy use of
+  the location dialog brought up by the Control-L key shortcut.
 
 * The GTK+ libraries use an '_' prefix to indicate private symbols that
   must not be used by applications. On some platforms, symbols beginning 
   with prefixes such as _gtk, _gdk, and _pango will be exported
   from the library, on others not. In no case can applications
-  use these private symbols.
+  use these private symbols. In addition to that, GTK+ 2.6 makes several
+  symbols private which were not in any installed header files and
+  were never intended to be exported.
 
-* GTK+-2.2 can be build either with Pango-1.0 and version 1 of
-  the Xft library or Pango-1.2 and version 2 of the Xft library
-  (Xft is used to to display anti-aliased fonts) By default, GTK+ and 
-  Pango are built so that applications will not have explicit dependencies 
-  on either version of Xft. To make sure that your application will be 
-  binary compatible with future versions of GTK+:
-
-    - Do not configure Pango or GTK+ with the --enable-static or
-      --enable-explicit-deps options, since they will cause dependencies 
-      on the particular version of Xft.
-
-    - Do not use Xft version 1 directly in your applications.
-
-* There is a bug in the Xft library in XFree86-4.1 and possibly previous
-  versions that causes random crashes when using the Pango Xft
-  backend. If you want to use Xft fonts, you should upgrade to
-  XFree86-4.2.
-
-* Xft support is on by default when using Xft2 but off by
-  default when using Xft1. To change this default, set the
-  variable GDK_USE_XFT to '1' or '0'. For instance, to 
-  turn on Xft fonts when Xft1.
-
-   GDK_USE_XFT=1
-   export GDK_USE_XFT
-
-* The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
-  is provided on a as-is basis and has not been tested at all. No
-  guarantees about the degree of workingness or about future
+* The gdk_pixbuf_xlib library included in the contrib/ directory 
+  and the framebuffer GDK backend included in the gdk/linux-fb directory
+  of GTK+ are provided on an as-is basis and have not been tested at all. 
+  No guarantees about the degree of workingness or about future
   compatibility are provided.
 
-* While efforts have been made to make gdk-pixbuf robust against
-  invalid images, using gdk-pixbuf to load untrusted data 
-  is not recommended, due to the likelyhood that there are
-  additional problems where an invalid image could cause
-  gdk-pixbuf to crash or worse.
-
-* The assumption of GLib and GTK+ by default is that filenames on the
-  filesystem are encoded in UTF-8 rather than the encoding of the locale;
-  The GTK+ developers consider that having filenames whose interpretation
+* On Unix, the assumption of GLib and GTK+ by default is that filenames on 
+  the filesystem are encoded in UTF-8 rather than the encoding of the locale;
+  the GTK+ developers consider that having filenames whose interpretation
   depends on the current locale is fundamentally a bad idea.
 
-  If you have filenames encoded in the encoding of your locale, then
-  you may want to set the G_BROKEN_FILENAMES environment variable:
+  If you have filenames encoded in the encoding of your locale, then you 
+  may want to set the G_FILENAME_ENCODING environment variable:
   
-   G_BROKEN_FILENAMES=1
-   export G_BROKEN_FILENAMES
+   G_FILENAME_ENCODING=@locale
+   export G_FILENAME_ENCODING
 
-  Best integration of GTK+-2.2 with the environment is achieved by 
+  (Earlier versions of GLib 2.x required a different environment variable
+  setting; G_BROKEN_FILENAMES=1 to achieve the same effect; this 
+  is still supported, but G_FILENAME_ENCODING is preferred.)
+  Best integration of GTK+ 2.6 with the environment is achieved by 
   using a UTF-8 locale.
 
+  On Windows, filenames passed to GTK+ should always be in UTF-8, as
+  in GLib 2.6. This is different than in previous versions of GTK+
+  where the system codepage was used. As in GLib, for DLL ABI
+  stability, applications built against previous versions of GTK+ will
+  use entry points providing the old semantics.
+
+  When compiling against GTK+ 2.6, applications intended to be
+  portable to Windows must take the UTF-8 file name encoding into
+  consideration, and use the gstdio wrappers to access files whose 
+  names have been constructed from strings returned from GTK+ or GLib.
+
 How to report bugs
 ==================
 
@@ -132,10 +127,10 @@ In the bug report please include:
 
 * How to reproduce the bug. 
 
-  If you can reproduce it with the testgtk program that is built in the
-  gtk/ subdirectory, that will be most convenient.  Otherwise, please
-  include a short test program that exhibits the behavior.  As a last
-  resort, you can also provide a pointer to a larger piece of software
+  If you can reproduce it with one of the tests or demos built with GTK+, 
+  such as demos/gtk-demo/gtk-demo, that would be most convenient. Otherwise, 
+  please include a short test program that exhibits the behavior. As a 
+  last resort, you can also provide a pointer to a larger piece of software 
   that can be downloaded.
 
 * If the bug was a crash, the exact text that was printed out when the
@@ -157,7 +152,7 @@ Otherwise, enter a new bug report that describes the patch, and attach
 the patch to that bug report.
 
 Bug reports containing patches should include the PATCH keyword in their
-keyword fields. If the patch adds to or changes the GTK programming
+keyword fields. If the patch adds to or changes the GTK+ programming
 interface, the API keyword should also be included.
   
 Patches should be in unified diff form. (The -u option to GNU diff.)

README.cvs-commits

@@ -18,10 +18,10 @@ to ask people commiting to GTK+ to follow a few rules:
    gtk-devel-list-request@gnome.org.) This is a good place to ask
    about intended changes. 
 
-   #gimp on byxnet (irc.gimp.org, irc2.gimp.org, irc3.gimp.org, 
-   irc.germany.gimp.org...)s also a good place to find GTK+ developers to
-   discuss changes with, however, email to gtk-devel-list is the most
-   certain and preferred method.
+   #gtk+ on GIMPNet (irc.gimp.org, irc.us.gimp.org, irc.eu.gimp.org, ...)
+   is also a good place to find GTK+ developers to discuss changes with,
+   however, email to gtk-devel-list is the most certain and preferred
+   method.
 
 1) Ask _first_.
 

README.in

@@ -28,91 +28,86 @@ See the file 'INSTALL'
 Release notes
 =============
 
-* As compared to GTK+-1.2, the default configuration of GTK+-2 has been 
-  stream-lined to reduce confusion on the part of new users or users 
-  coming from other environments.  Users used to older versions of 
-  GTK+ may want to make some adjustments to the default configuration.
+* GTK+ 2.6 supports clipboard persistency. To make use of this feature,
+  a clipboard manager following the specification at
+  http://www.freedesktop.org/wiki/Standards/clipboard-manager-spec
+  must be running. A sample implementation of such a clipboard manager
+  is available at 
+  http://people.imendio.com/andersca/archives/clipboard-manager-0.3.tar.gz
+  Applications can use the function gdk_display_supports_clipboard_persistence() 
+  to find out if clipboard persistence is available.
 
-   - Emacs keybindings such as Control-A and Control-E to move to the
-     ends of lines are not enabled by default in the editing widgets. To
-     turn on Emacs keybindings, add the line:
+* Notification on clipboard ownership changes via GdkOwnerChange events 
+  requires the XFIXES X extension. Applications can use the function
+  gdk_display_supports_selection_notification() to find out if ownerchip
+  change notification is available.
 
-      gtk-key-theme-name = "Emacs"
-   
-     To your ~/.gtkrc-2.0
+* The icon theme code in GTK+ 2.6 follows the freedesktop.org icon theme 
+  specification. Setting the XDG_DATA_DIRS environtment variable may be 
+  necessary if your icons aren't installed in the default location 
+  /usr/share/icons.
 
-   - Editing of menu accelerators by pressing an accelerator over the
-     menu item is disabled by default. To enable, it, add:
+* The icon theme code in GTK+ 2.6 can make use of mmap()able cache files
+  to avoid a lot of disk searching overhead. GTK+ includes a utility named
+  gtk-update-icon-cache to generate these cache files. For further details,
+  see the gtk-update-icon-cache man page or the GTK+ documentation.
 
-      gtk-can-change-accels = 1
+* To reduce code size and improve efficiency, GTK+, when compiled 
+  with the GNU toolchain, has separate internal and external entry 
+  points for exported functions. The internal names, which begin with 
+  IA__, may be seen when debugging a GTK+ program.
 
-     to your ~/.gtkrc-2.0
+* The following functions have been deprecated in GTK+ 2.6:
+  gdk_pango_context_set_colormap
+  gtk_cell_renderer_editing_canceled
 
-   - To improve useability for keyboard operation, GTK+ now selects the
-     contents of an entry when tabbing into it or when it is focused on
-     initial window map. To disable this behavior, add:
-
-      gtk-entry-select-on-focus = 0
- 
-     to your ~/.gtkrc-2.0
+* The new GtkFileChooser widget emphasizes simplicity and thus does 
+  not provide a navigation entry by default when opening files. 
+  Experienced command line users will likely want to make heavy use of
+  the location dialog brought up by the Control-L key shortcut.
 
 * The GTK+ libraries use an '_' prefix to indicate private symbols that
   must not be used by applications. On some platforms, symbols beginning 
   with prefixes such as _gtk, _gdk, and _pango will be exported
   from the library, on others not. In no case can applications
-  use these private symbols.
+  use these private symbols. In addition to that, GTK+ 2.6 makes several
+  symbols private which were not in any installed header files and
+  were never intended to be exported.
 
-* GTK+-2.2 can be build either with Pango-1.0 and version 1 of
-  the Xft library or Pango-1.2 and version 2 of the Xft library
-  (Xft is used to to display anti-aliased fonts) By default, GTK+ and 
-  Pango are built so that applications will not have explicit dependencies 
-  on either version of Xft. To make sure that your application will be 
-  binary compatible with future versions of GTK+:
-
-    - Do not configure Pango or GTK+ with the --enable-static or
-      --enable-explicit-deps options, since they will cause dependencies 
-      on the particular version of Xft.
-
-    - Do not use Xft version 1 directly in your applications.
-
-* There is a bug in the Xft library in XFree86-4.1 and possibly previous
-  versions that causes random crashes when using the Pango Xft
-  backend. If you want to use Xft fonts, you should upgrade to
-  XFree86-4.2.
-
-* Xft support is on by default when using Xft2 but off by
-  default when using Xft1. To change this default, set the
-  variable GDK_USE_XFT to '1' or '0'. For instance, to 
-  turn on Xft fonts when Xft1.
-
-   GDK_USE_XFT=1
-   export GDK_USE_XFT
-
-* The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
-  is provided on a as-is basis and has not been tested at all. No
-  guarantees about the degree of workingness or about future
+* The gdk_pixbuf_xlib library included in the contrib/ directory 
+  and the framebuffer GDK backend included in the gdk/linux-fb directory
+  of GTK+ are provided on an as-is basis and have not been tested at all. 
+  No guarantees about the degree of workingness or about future
   compatibility are provided.
 
-* While efforts have been made to make gdk-pixbuf robust against
-  invalid images, using gdk-pixbuf to load untrusted data 
-  is not recommended, due to the likelyhood that there are
-  additional problems where an invalid image could cause
-  gdk-pixbuf to crash or worse.
-
-* The assumption of GLib and GTK+ by default is that filenames on the
-  filesystem are encoded in UTF-8 rather than the encoding of the locale;
-  The GTK+ developers consider that having filenames whose interpretation
+* On Unix, the assumption of GLib and GTK+ by default is that filenames on 
+  the filesystem are encoded in UTF-8 rather than the encoding of the locale;
+  the GTK+ developers consider that having filenames whose interpretation
   depends on the current locale is fundamentally a bad idea.
 
-  If you have filenames encoded in the encoding of your locale, then
-  you may want to set the G_BROKEN_FILENAMES environment variable:
+  If you have filenames encoded in the encoding of your locale, then you 
+  may want to set the G_FILENAME_ENCODING environment variable:
   
-   G_BROKEN_FILENAMES=1
-   export G_BROKEN_FILENAMES
+   G_FILENAME_ENCODING=@locale
+   export G_FILENAME_ENCODING
 
-  Best integration of GTK+-2.2 with the environment is achieved by 
+  (Earlier versions of GLib 2.x required a different environment variable
+  setting; G_BROKEN_FILENAMES=1 to achieve the same effect; this 
+  is still supported, but G_FILENAME_ENCODING is preferred.)
+  Best integration of GTK+ 2.6 with the environment is achieved by 
   using a UTF-8 locale.
 
+  On Windows, filenames passed to GTK+ should always be in UTF-8, as
+  in GLib 2.6. This is different than in previous versions of GTK+
+  where the system codepage was used. As in GLib, for DLL ABI
+  stability, applications built against previous versions of GTK+ will
+  use entry points providing the old semantics.
+
+  When compiling against GTK+ 2.6, applications intended to be
+  portable to Windows must take the UTF-8 file name encoding into
+  consideration, and use the gstdio wrappers to access files whose 
+  names have been constructed from strings returned from GTK+ or GLib.
+
 How to report bugs
 ==================
 
@@ -132,10 +127,10 @@ In the bug report please include:
 
 * How to reproduce the bug. 
 
-  If you can reproduce it with the testgtk program that is built in the
-  gtk/ subdirectory, that will be most convenient.  Otherwise, please
-  include a short test program that exhibits the behavior.  As a last
-  resort, you can also provide a pointer to a larger piece of software
+  If you can reproduce it with one of the tests or demos built with GTK+, 
+  such as demos/gtk-demo/gtk-demo, that would be most convenient. Otherwise, 
+  please include a short test program that exhibits the behavior. As a 
+  last resort, you can also provide a pointer to a larger piece of software 
   that can be downloaded.
 
 * If the bug was a crash, the exact text that was printed out when the
@@ -157,7 +152,7 @@ Otherwise, enter a new bug report that describes the patch, and attach
 the patch to that bug report.
 
 Bug reports containing patches should include the PATCH keyword in their
-keyword fields. If the patch adds to or changes the GTK programming
+keyword fields. If the patch adds to or changes the GTK+ programming
 interface, the API keyword should also be included.
   
 Patches should be in unified diff form. (The -u option to GNU diff.)

README.win32

@@ -1,33 +1,47 @@
-The Win32 port of GTK+ is a work in progress, and not as stable or
-correct as the Unix/X11 version. For more information about the Win32
-port, and prebuilt runtime and developer packages see
-http://www.gimp.org/win32/ .
+The Win32 backend in GTK+ is not as stable or correct as the X11
+one. 
 
-There is a gtk-1-3-win32-production branch of GTK+ that was branched
-off from before the addition of the no-flicker and other recent
-functionality. That is what should be used by "production" code until
-this CVS HEAD (2.0) version is useable. (But note, the Win32 backend
-has never been claimed to be "production quality", although it works
-surprisingly well for the GIMP.)
+For prebuilt runtime and developer packages see
+http://www.gimp.org/win32/downloads.html .
+
+There is also a gtk-1-3-win32-production branch of GTK+ that was
+branched off from before the addition of the no-flicker and other
+functionality that was new in GTK+ 2.0.0. The vesion number used for
+that branch is 1.3.0. It corresponds most closely to GTK 1.2.7 on
+Unix. For new code, you shouldn't be using that.
 
 Building GTK+ on Win32
 ======================
 
-There are two ways to build GTK+ for win32:
+There are two ways to build GTK+ for win32.
 
 1) Use the autoconf-generated configure script, and the resulting
 Makefiles (which use libtool and gcc to do the compilation). I use
-this myself, but it might be hell to setup correctly. 
+this myself, but it can be hard to setup correctly.
 
 Personally I run configure with:
-CC='gcc -mpentium -fnative-struct' CPPFLAGS='-I/target/include' CFLAGS=-O2 LDFLAGS='-L/target/lib' ./configure --disable-static --prefix=/target --with-gdktarget=win32 --with-wintab=/src/wtkit126 --with-ie55=/src/workshop/ie55_lib --host=i386-pc-mingw32 --enable-maintainer-mode
+CC='gcc -mpentium -fnative-struct' CPPFLAGS='-I/target/include' CFLAGS=-O2 LDFLAGS='-L/target/lib' ./configure --disable-static --prefix=/target --with-gdktarget=win32 --with-wintab=/src/wtkit126 --with-ie55=/src/workshop/ie55_lib --host=i386-pc-mingw32
 
-It might well be that in order for this to work, you will have to get
-a bleeding-edge version of libtool for Win32, run libtoolize yourself,
-and then run autoconf to generate the configure script.
+Then, in theory, you can just say "make", like on Unix. In reality,
+there are a few hickups that require manual intervention, and it's
+best to run make separately in each subdirectory. At least for me,
+when libtool creates an .exe file, it puts the real .exe in the .libs
+directory, and leaves a wrapper .exe in the work directory. For some
+reason that wrapper doesn't work for me, it doesn't do anything. So, I
+always do a "cp .libs/*.exe ." after running a make that has produced
+some exes.
+
+Another issue is with the gdk-pixbuf.loaders file. It's probably best
+to do a "make install" in the gdk-pixbuf directory, and let that set
+up a mostly correct gdk-pixbuf.loaders in the target directory. Then
+copy that back to the source directory. It's needed in gtk/stock-icons
+where make runs gdk-pixbuf-csource.
+
+Etc, you get the idea. It can be a bit of a pain.
 
 2) Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
-makefile.msc in gdk and gtk.
+makefile.msc in gdk and gtk. Be prepared to manually edit various
+makefile.msc files, and the makefile snippets in build/win32.
 
 Alternative 1 also generates Microsoft import libraries (.lib), if you
 have lib.exe available. It might also work for cross-compilation from
@@ -50,10 +64,10 @@ above website.
 Multi-threaded use of GTK+ on Win32
 ===================================
 
-Multi-threaded GTK+ programs might work in special simple cases, but
-not in general. Sorry. If you have all GTK+ and GDK calls in the same
-thread, it might work. Otherwise, probably not at all. Possible ways
-to fix this are being investigated.
+Multi-threaded GTK+ programs might work on Windows in special simple
+cases, but not in general. Sorry. If you have all GTK+ and GDK calls
+in the same thread, it might work. Otherwise, probably not at
+all. Possible ways to fix this are being investigated.
 
 Wintab
 ======
@@ -64,17 +78,6 @@ flag to configure if you use that. If you use nmake and you don't care
 for Wintab, undefine HAVE_WINTAB in config.h.win32 and remove
 references to the wntab32x library from the makefile before building.
 
-Libintl
-=======
-
-GTK wants to be built with the GNU "intl" library for
-internationalisation (i18n). Get the version ported to Win32 (not a
-very big deal) from the web site mentioned above. The "intl" library
-as gets built as a DLL called libintl-1.dll. If you don't want any
-i18n stuff, undefine ENABLE_NLS, HAVE_GETTEXT and HAVE_LIBINTL in the
-config.h.win32 file, and remove references to the intl library from
-the makefiles.
-
 ActiveIMM
 =========
 
@@ -83,7 +86,7 @@ Manager for non-EastAsia locales that can be used on Win9x/NT4), you
 need the dimm.h header file. That is somewhat difficult to find, but
 http://msdn.microsoft.com/downloads/samples/internet/wizard/ seems to
 be a good place to look nowadays. If you use "autoconfiscated" build,
-pass the --with-ie55 flag to configure specifyin the location of the
+pass the --with-ie55 flag to configure specifying the location of the
 ie55_lib directory created by downloading the IE5.5 headers and libs
 from the above URL.
 

acconfig.h

@@ -34,7 +34,6 @@
 #undef HAVE_SYS_TIME_H
 #undef HAVE_XFREE_XINERAMA
 #undef HAVE_XINERAMA
-#undef HAVE_WINSOCK_H
 #undef HAVE_WINTAB
 #undef HAVE_XCONVERTCASE
 #undef HAVE_XFT

acinclude.m4

@@ -10,3 +10,70 @@ AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP],
               [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 $1
 AC_DIVERT_POP()])])])
+
+# GTK_ADD_LIB(VAR,LIBNAME)
+# ---------------------------------
+# Helper macro to add a -lBlah to a variable, avoiding repeats
+# Note that this needs to be quoted when used in an enclosing macro
+AC_DEFUN([GTK_ADD_LIB],
+[ case "$$1 " in
+    *-l$2[[\ \	]]*)               ;;
+    *)               $1="-l$2 $$1" ;;
+  esac
+])
+
+
+# Checks the location of the XML Catalog
+# Usage:
+#   JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# Defines XMLCATALOG and XML_CATALOG_FILE substitutions
+AC_DEFUN([JH_PATH_XML_CATALOG],
+[
+  # check for the presence of the XML catalog
+  AC_ARG_WITH([xml-catalog],
+              AC_HELP_STRING([--with-xml-catalog=CATALOG],
+                             [path to xml catalog to use]),,
+              [with_xml_catalog=/etc/xml/catalog])
+  jh_found_xmlcatalog=true
+  XML_CATALOG_FILE="$with_xml_catalog"
+  AC_SUBST([XML_CATALOG_FILE])
+  AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)])
+  if test -f "$XML_CATALOG_FILE"; then
+    AC_MSG_RESULT([found])
+  else
+    jh_found_xmlcatalog=false
+    AC_MSG_RESULT([not found])
+  fi
+
+  # check for the xmlcatalog program
+  AC_PATH_PROG(XMLCATALOG, xmlcatalog, no)
+  if test "x$XMLCATALOG" = xno; then
+    jh_found_xmlcatalog=false
+  fi
+
+  if $jh_found_xmlcatalog; then
+    ifelse([$1],,[:],[$1])
+  else
+    ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2])
+  fi
+])
+
+# Checks if a particular URI appears in the XML catalog
+# Usage:
+#   JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+AC_DEFUN([JH_CHECK_XML_CATALOG],
+[
+  AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+  AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+  if $jh_found_xmlcatalog && \
+     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
+    AC_MSG_RESULT([found])
+    ifelse([$3],,,[$3
+])dnl
+  else
+    AC_MSG_RESULT([not found])
+    ifelse([$4],,
+       [AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],
+       [$4])
+  fi
+])

autogen.sh

@@ -13,10 +13,10 @@ FILE=gdk
 DIE=0
 
 have_libtool=false
-if libtool --version < /dev/null > /dev/null 2>&1 ; then
-	libtool_version=`libtoolize --version |  libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
+	libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 	case $libtool_version in
-	    1.4*)
+	    1.4*|1.5*)
 		have_libtool=true
 		;;
 	esac
@@ -25,34 +25,34 @@ if $have_libtool ; then : ; else
 	echo
 	echo "You must have libtool 1.4 installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
 	DIE=1
 fi
 
+(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have gtk-doc installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
+	DIE=1
+}
+
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
-	echo "libtool the appropriate package for your distribution,"
-	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
 	DIE=1
 }
 
-have_automake=false
-if automake-1.4 --version < /dev/null > /dev/null 2>&1 ; then
-	automake_version=`automake-1.4 --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
-	case $automake_version in
-	   1.2*|1.3*|1.4) 
-		;;
-	   *)
-		have_automake=true
-		;;
-	esac
-fi
-if $have_automake ; then : ; else
+if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.7
+    ACLOCAL=aclocal-1.7
+else
 	echo
-	echo "You must have automake 1.4-p6 installed to compile $PROJECT."
-	echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.4-p6.tar.gz"
-	echo "(or a newer version if it is available)"
+	echo "You must have automake 1.7.x installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
 	DIE=1
 fi
 
@@ -72,13 +72,9 @@ if test -z "$AUTOGEN_SUBDIR_MODE"; then
         fi
 fi
 
-case $CC in
-*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
-esac
-
 if test -z "$ACLOCAL_FLAGS"; then
 
-	acdir=`aclocal-1.4 --print-ac-dir`
+	acdir=`$ACLOCAL --print-ac-dir`
         m4list="glib-2.0.m4 glib-gettext.m4"
 
 	for file in $m4list
@@ -95,18 +91,22 @@ if test -z "$ACLOCAL_FLAGS"; then
 	done
 fi
 
-aclocal-1.4 $ACLOCAL_FLAGS
+rm -rf autom4te.cache
 
-# optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+$ACLOCAL $ACLOCAL_FLAGS || exit $?
 
-automake-1.4 -a $am_opt
-autoconf
-cd $ORIGDIR
+libtoolize --force || exit $?
+gtkdocize || exit $?
+
+autoheader || exit $?
+
+$AUTOMAKE --add-missing || exit $?
+autoconf || exit $?
+cd $ORIGDIR || exit $?
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then
-        $srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@"
+        $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
 
         echo 
         echo "Now type 'make' to compile $PROJECT."
-fi
+fi

contrib/Makefile.am

@@ -1,8 +1,5 @@
 
+SUBDIRS =
 if USE_X11
-XDIRS=gdk-pixbuf-xlib
-else
-XDIRS=
+SUBDIRS += gdk-pixbuf-xlib
 endif
-
-SUBDIRS=$(XDIRS)

contrib/gdk-pixbuf-xlib/ChangeLog

@@ -1,3 +1,90 @@
+2005-04-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Releases 2.6.7 ====
+
+2005-04-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.6 ===
+
+2005-04-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.5 ===
+
+2005-03-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.4 ===
+
+2005-02-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.3 ===
+
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.2 ===
+
+2005-01-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.1 ===
+	
+2004-12-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.0 ===
+
+2004-12-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.6 ===
+
+2004-11-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.5 ===
+
+2004-10-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.4 ===
+
+2004-09-19  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.3 ===
+
+2004-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.2 ===
+
+2004-08-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.1 ===
+
+Tue Jul 20 23:26:10 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk-pixbuf-xlibrgb.c:  Include config.h first.  (#148034)
+
+Sun Jul 18 20:17:41 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* === released 2.5.0 ==
+
+Tue Mar  9 09:33:54 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 2.3.6 ===
+
+Wed Mar  3 15:50:28 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (libgdk_pixbuf_xlib_2_0_la_LIBADD): Add 
+	a shared library dependency on libgdk-pixbuf (#124687)
+
+Tue Feb 24 14:45:03 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 2.3.3 ===
+
+Fri Feb 13 10:32:09 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk-pixbuf-xlibrgb.h: Remove a couple of unneeded
+	#includes. Isn't unsupported code fun?
+	(133833, Gregory Merchan)
+
+Tue Oct  7 23:30:00 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk-pixbuf-xlib.h: Add C++ guards. (123955, Harring Figueiredo)
+
 2002-08-06  jacob berkman  <jacob@ximian.com>
 
 	* Makefile.am (lib_LTLIBRARIES): link against xlibs

contrib/gdk-pixbuf-xlib/Makefile.am

@@ -1,20 +1,20 @@
 lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
 
-INCLUDES = @STRIP_BEGIN@			\
+INCLUDES = \
 	-I$(top_srcdir) -I$(top_builddir) 	\
 	-I$(top_srcdir)/gdk-pixbuf 		\
 	-I$(top_srcdir)/contrib 		\
 	-DG_DISABLE_DEPRECATED			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
-	@GDK_PIXBUF_XLIB_DEP_CFLAGS@		\
-@STRIP_END@
+	$(GDK_PIXBUF_XLIB_DEP_CFLAGS)
 
 libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
 	-export-dynamic						\
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+	-version-info $(LT_VERSION_INFO)
 
 libgdk_pixbuf_xlib_2_0_la_LIBADD = \
-	@GDK_PIXBUF_XLIB_DEP_LIBS@
+        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+	$(GDK_PIXBUF_XLIB_DEP_LIBS)
 
 libgdk_pixbuf_xlib_2_0_la_SOURCES =         \
 	gdk-pixbuf-xlib-private.h	\

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c

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

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h

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

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c

@@ -47,8 +47,6 @@
  * Shawn T. Amundson    <amundson@gtk.org>
 */
 
-#include <math.h>
-
 #if HAVE_CONFIG_H
 #  include <config.h>
 #  if STDC_HEADERS
@@ -61,6 +59,8 @@
 #  include <stdlib.h>
 #endif
 
+#include <math.h>
+
 #define ENABLE_GRAYSCALE
 
 /* include this before so that we can get endian definitions if
@@ -821,7 +821,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)
 
       image_info->stage_buf = NULL;
 
-      image_info->own_gc = 0;
+      image_info->own_gc = NULL;
       
       image_info->red_shift = 0;
       image_info->red_prec = 0;
@@ -908,7 +908,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)
 					 image_info->x_visual_info->visual,
 					 1,
 					 XYBitmap,
-					 0, 0, IMAGE_WIDTH, IMAGE_HEIGHT,
+					 0, NULL, IMAGE_WIDTH, IMAGE_HEIGHT,
 					 8,
 					 0);
 	  static_image[i]->data = malloc(IMAGE_WIDTH * IMAGE_HEIGHT >> 3);
@@ -920,7 +920,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)
 					 image_info->x_visual_info->visual,
 					 (unsigned int)image_info->x_visual_info->depth,
 					 ZPixmap,
-					 0, 0,
+					 0, NULL,
 					 IMAGE_WIDTH,
 					 IMAGE_HEIGHT,
 					 32, 0);
@@ -3651,7 +3651,7 @@ xlib_rgb_get_visual (void)
   if (image_info)
     return image_info->x_visual_info->visual;
   else
-    return 0;
+    return NULL;
 }
 
 /**
@@ -3668,7 +3668,7 @@ xlib_rgb_get_visual_info (void)
   if (image_info)
     return image_info->x_visual_info;
   else
-    return 0;
+    return NULL;
 }
 
 /**

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h

@@ -57,8 +57,6 @@ extern "C" {
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/Xos.h>
-#include <X11/Intrinsic.h>
 
 #include <glib.h>
 

demos/Makefile.am

@@ -2,47 +2,53 @@
 
 SUBDIRS = gtk-demo
 
-INCLUDES = @STRIP_BEGIN@ \
+INCLUDES = 						\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir)/gdk				\
 	-DG_DISABLE_DEPRECATED	 			\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	-DGTK_DISABLE_DEPRECATED			\
-	@GTK_DEBUG_FLAGS@				\
-	@GTK_DEP_CFLAGS@				\
-@STRIP_END@
+	$(GTK_DEBUG_FLAGS)				\
+	$(GTK_DEP_CFLAGS)
 
-DEPS = \
+DEPS = 									\
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/@gdktargetlib@ 				\
-	$(top_builddir)/gtk/@gtktargetlib@
+	$(top_builddir)/gdk/$(gdktargetlib) 				\
+	$(top_builddir)/gtk/$(gtktargetlib)
 
-LDADDS = @STRIP_BEGIN@ 							\
+LDADDS = 								\
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/@gdktargetlib@        			\
-	$(top_builddir)/gtk/@gtktargetlib@ 				\
-@STRIP_END@
+	$(top_builddir)/gdk/$(gdktargetlib)        			\
+	$(top_builddir)/gtk/$(gtktargetlib)
 
 noinst_PROGRAMS = 		\
-	testpixbuf 		\
 	testpixbuf-drawable 	\
 	testanimation 		\
 	testpixbuf-save		\
 	testpixbuf-scale 	\
 	pixbuf-demo
 
-if CROSS_COMPILING
-pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
-else
-pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$$topdir/gdk-pixbuf/gdk-pixbuf.loaders $$topdir/gdk-pixbuf/gdk-pixbuf-csource
+# Need to build test-inline-pixbufs.h for testpixbuf
+if HAVE_PNG
+noinst_PROGRAMS += testpixbuf
+BUILT_SOURCES = test-inline-pixbufs.h
 endif
 
-test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders apple-red.png gnome-foot.png
-	(topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \
-	  cd $(srcdir) &&				     \
-	      $(pixbuf_csource) --build-list \
-	        apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h || (rm -f $$curdir/test-inline-pixbufs.h && false))
+if CROSS_COMPILING
+pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
+pixbuf_csource_deps=
+else
+pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
+pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders 
+endif
+
+test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
+	$(pixbuf_csource) --raw --build-list		\
+	        apple_red  $(srcdir)/apple-red.png	\
+                gnome_foot $(srcdir)/gnome-foot.png	\
+        > test-inline-pixbufs.h				\
+	|| (rm -f test-inline-pixbufs.h && false)
 
 testpixbuf_DEPENDENCIES = $(DEPS)
 testpixbuf_drawable_DEPENDENCIES = $(DEPS)
@@ -59,7 +65,6 @@ testanimation_LDADD = $(LDADDS)
 pixbuf_demo_LDADD = $(LDADDS)
 
 testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c
-$(testpixbuf_OBJECTS): test-inline-pixbufs.h
 testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c
 testpixbuf_save_SOURCES = testpixbuf-save.c
 testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
@@ -76,3 +81,5 @@ EXTRA_DIST =			\
 	gnome-gmush.png		\
 	gnome-gsame.png		\
 	gnu-keys.png
+
+DISTCLEANFILES = test-inline-pixbufs.h

demos/gtk-demo/.cvsignore

@@ -4,4 +4,4 @@ Makefile.in
 .deps
 gtk-demo
 demos.h
-
+geninclude.pl

demos/gtk-demo/Makefile.am

@@ -4,27 +4,32 @@ democodedir=$(datadir)/gtk-2.0/demo
 
 ## These should be in the order you want them to appear in the 
 ## demo app, which means alphabetized by demo title, not filename
-demos = @STRIP_BEGIN@	\
-	appwindow.c	\
-	button_box.c	\
-	changedisplay.c	\
-	colorsel.c	\
-	dialog.c	\
-	drawingarea.c	\
-	editable_cells.c \
-	images.c	\
-	item_factory.c	\
-	list_store.c	\
-	menus.c		\
-	panes.c		\
-	pixbufs.c	\
-	sizegroup.c	\
-	stock_browser.c	\
-	textview.c	\
-	tree_store.c	\
-@STRIP_END@
+demos =						\
+	appwindow.c				\
+	button_box.c				\
+	changedisplay.c				\
+	clipboard.c				\
+	colorsel.c				\
+	dialog.c				\
+	drawingarea.c				\
+	editable_cells.c			\
+	entry_completion.c			\
+	expander.c  				\
+	hypertext.c				\
+	iconview.c				\
+	images.c				\
+	list_store.c				\
+	menus.c					\
+	panes.c					\
+	pixbufs.c				\
+	rotated_text.c				\
+	sizegroup.c				\
+	stock_browser.c				\
+	textview.c				\
+	tree_store.c				\
+	ui_manager.c
 
-INCLUDES = @STRIP_BEGIN@ \
+INCLUDES = \
 	-DDEMOCODEDIR="\"$(democodedir)\""		\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir)/gdk				\
@@ -32,31 +37,28 @@ INCLUDES = @STRIP_BEGIN@ \
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	-DGTK_DISABLE_DEPRECATED 			\
-	@GTK_DEBUG_FLAGS@				\
-	@GTK_DEP_CFLAGS@				\
-@STRIP_END@
+	$(GTK_DEBUG_FLAGS)				\
+	$(GTK_DEP_CFLAGS)
 
 DEPS = \
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/@gdktargetlib@ 				\
-	$(top_builddir)/gtk/@gtktargetlib@
+	$(top_builddir)/gdk/$(gdktargetlib) 				\
+	$(top_builddir)/gtk/$(gtktargetlib)
 
-LDADDS = @STRIP_BEGIN@ 							\
+LDADDS = \
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/@gdktargetlib@        			\
-	$(top_builddir)/gtk/@gtktargetlib@ 				\
-@STRIP_END@
+	$(top_builddir)/gdk/$(gdktargetlib)        			\
+	$(top_builddir)/gtk/$(gtktargetlib)
 
 bin_PROGRAMS = gtk-demo
 
 BUILT_SOURCES = demos.h
 
 EXTRA_DIST = 		\
-	geninclude.pl	\
 	$(IMAGEFILES)
 
-demos.h: $(demos) geninclude.pl
-	(cd $(srcdir) && $(PERL) ./geninclude.pl $(demos) > demos.h)
+demos.h: @REBUILD@ $(demos) geninclude.pl
+	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
 
 gtk_demo_SOURCES = 		\
 	$(demos)		\
@@ -73,11 +75,15 @@ IMAGEFILES=	alphatest.png		\
 		floppybuddy.gif		\
 		gnome-applets.png	\
 		gnome-calendar.png	\
+		gnome-fs-directory.png	\
+		gnome-fs-regular.png	\
 		gnome-foot.png		\
 		gnome-gimp.png		\
 		gnome-gmush.png		\
 		gnome-gsame.png		\
 		gnu-keys.png		\
-		gtk-logo-rgb.gif
+		gtk-logo-rgb.gif		
 
 democode_DATA = $(demos) $(IMAGEFILES)
+
+DISTCLEANFILES = demos.h

demos/gtk-demo/appwindow.c

@@ -8,20 +8,20 @@
 
 static GtkWidget *window = NULL;
 
-
 static void
-menuitem_cb (gpointer             callback_data,
-             guint                callback_action,
-             GtkWidget           *widget)
+activate_action (GtkAction *action)
 {
+  const gchar *name = gtk_action_get_name (action);
+  const gchar *typename = G_OBJECT_TYPE_NAME (action);
+
   GtkWidget *dialog;
   
-  dialog = gtk_message_dialog_new (GTK_WINDOW (callback_data),
+  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                    GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_INFO,
                                    GTK_BUTTONS_CLOSE,
-                                   "You selected or toggled the menu item: \"%s\"",
-                                    gtk_item_factory_path_from_widget (widget));
+                                   "You activated action: \"%s\" of type \"%s\"",
+                                    name, typename);
 
   /* Close dialog on user response */
   g_signal_connect (dialog,
@@ -32,54 +32,241 @@ menuitem_cb (gpointer             callback_data,
   gtk_widget_show (dialog);
 }
 
-
-static GtkItemFactoryEntry menu_items[] =
+static void
+activate_radio_action (GtkAction *action, GtkRadioAction *current)
 {
-  { "/_File",            NULL,         0,                     0, "<Branch>" },
-  { "/File/_New",        "<control>N", menuitem_cb,       0, "<StockItem>", GTK_STOCK_NEW },
-  { "/File/_Open",       "<control>O", menuitem_cb,       0, "<StockItem>", GTK_STOCK_OPEN },
-  { "/File/_Save",       "<control>S", menuitem_cb,       0, "<StockItem>", GTK_STOCK_SAVE },
-  { "/File/Save _As...", NULL,         menuitem_cb,       0, "<StockItem>", GTK_STOCK_SAVE },
-  { "/File/sep1",        NULL,         menuitem_cb,       0, "<Separator>" },
-  { "/File/_Quit",       "<control>Q", menuitem_cb,       0, "<StockItem>", GTK_STOCK_QUIT },
+  const gchar *name = gtk_action_get_name (GTK_ACTION (current));
+  const gchar *typename = G_OBJECT_TYPE_NAME (GTK_ACTION (current));
+  gboolean active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current));
+  gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));
 
-  { "/_Preferences",                    NULL, 0,               0, "<Branch>" },
-  { "/_Preferences/_Color",             NULL, 0,               0, "<Branch>" },
-  { "/_Preferences/Color/_Red",         NULL, menuitem_cb, 0, "<RadioItem>" },
-  { "/_Preferences/Color/_Green",       NULL, menuitem_cb, 0, "/Preferences/Color/Red" },
-  { "/_Preferences/Color/_Blue",        NULL, menuitem_cb, 0, "/Preferences/Color/Red" },
-  { "/_Preferences/_Shape",             NULL, 0,               0, "<Branch>" },
-  { "/_Preferences/Shape/_Square",      NULL, menuitem_cb, 0, "<RadioItem>" },
-  { "/_Preferences/Shape/_Rectangle",   NULL, menuitem_cb, 0, "/Preferences/Shape/Square" },
-  { "/_Preferences/Shape/_Oval",        NULL, menuitem_cb, 0, "/Preferences/Shape/Rectangle" },
+  if (active) 
+    {
+      GtkWidget *dialog;
+  
+      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+				       GTK_DIALOG_DESTROY_WITH_PARENT,
+				       GTK_MESSAGE_INFO,
+				       GTK_BUTTONS_CLOSE,
+				       "You activated radio action: \"%s\" of type \"%s\".\nCurrent value: %d",
+				       name, typename, value);
 
-  /* If you wanted this to be right justified you would use "<LastBranch>", not "<Branch>".
-   * Right justified help menu items are generally considered a bad idea now days.
-   */
-  { "/_Help",            NULL,         0,                     0, "<Branch>" },
-  { "/Help/_About",      NULL,         menuitem_cb,       0 },
+      /* Close dialog on user response */
+      g_signal_connect (dialog,
+			"response",
+			G_CALLBACK (gtk_widget_destroy),
+			NULL);
+      
+      gtk_widget_show (dialog);
+    }
+}
+
+static void 
+activate_email (GtkAboutDialog *about,
+		const gchar    *link,
+		gpointer        data)
+{
+  g_print ("send mail to %s\n", link);
+}
+
+static void 
+activate_url (GtkAboutDialog *about,
+	      const gchar    *link,
+	      gpointer        data)
+{
+  g_print ("show url %s\n", link);
+}
+
+static void
+about_cb (GtkAction *action,
+	  GtkWidget *window)
+{
+  GdkPixbuf *pixbuf, *transparent;
+  gchar *filename;
+
+  const gchar *authors[] = {
+    "Peter Mattis",
+    "Spencer Kimball",
+    "Josh MacDonald",
+    "and many more...",
+    NULL
+  };
+
+  const gchar *documentors[] = {
+    "Owen Taylor",
+    "Tony Gale",
+    "Matthias Clasen <mclasen@redhat.com>",
+    "and many more...",
+    NULL
+  };
+
+  const gchar *license =
+    "This library is free software; you can redistribute it and/or\n"
+    "modify it under the terms of the GNU Library General Public License as\n"
+    "published by the Free Software Foundation; either version 2 of the\n"
+    "License, or (at your option) any later version.\n"
+    "\n"
+    "This library is distributed in the hope that it will be useful,\n"
+    "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
+    "Library General Public License for more details.\n"
+    "\n"
+    "You should have received a copy of the GNU Library General Public\n"
+    "License along with the Gnome Library; see the file COPYING.LIB.  If not,\n"
+    "write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
+    "Boston, MA 02111-1307, USA.\n";
+
+  pixbuf = NULL;
+  transparent = NULL;
+  filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
+  if (filename)
+    {
+      pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+      g_free (filename);
+      transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
+      g_object_unref (pixbuf);
+    }
+
+  gtk_about_dialog_set_email_hook (activate_email, NULL, NULL);
+  gtk_about_dialog_set_url_hook (activate_url, NULL, NULL);
+  gtk_show_about_dialog (GTK_WINDOW (window),
+			 "name", "GTK+ Code Demos",
+			 "version", "2.4.3",
+			 "copyright", "(C) 1997-2004 The GTK+ Team",
+			 "license", license,
+			 "website", "http://www.gtk.org",
+			 "comments", "Program to demonstrate GTK+ functions.",
+			 "authors", authors,
+			 "documenters", documentors,
+			 "logo", transparent,
+			 NULL);
+
+  g_object_unref (transparent);
+}
+
+
+static GtkActionEntry entries[] = {
+  { "FileMenu", NULL, "_File" },               /* name, stock id, label */
+  { "PreferencesMenu", NULL, "_Preferences" }, /* name, stock id, label */
+  { "ColorMenu", NULL, "_Color"  },            /* name, stock id, label */
+  { "ShapeMenu", NULL, "_Shape" },             /* name, stock id, label */
+  { "HelpMenu", NULL, "_Help" },               /* name, stock id, label */
+  { "New", GTK_STOCK_NEW,                      /* name, stock id */
+    "_New", "<control>N",                      /* label, accelerator */
+    "Create a new file",                       /* tooltip */ 
+    G_CALLBACK (activate_action) },      
+  { "Open", GTK_STOCK_OPEN,                    /* name, stock id */
+    "_Open","<control>O",                      /* label, accelerator */     
+    "Open a file",                             /* tooltip */
+    G_CALLBACK (activate_action) }, 
+  { "Save", GTK_STOCK_SAVE,                    /* name, stock id */
+    "_Save","<control>S",                      /* label, accelerator */     
+    "Save current file",                       /* tooltip */
+    G_CALLBACK (activate_action) },
+  { "SaveAs", GTK_STOCK_SAVE,                  /* name, stock id */
+    "Save _As...", NULL,                       /* label, accelerator */     
+    "Save to a file",                          /* tooltip */
+    G_CALLBACK (activate_action) },
+  { "Quit", GTK_STOCK_QUIT,                    /* name, stock id */
+    "_Quit", "<control>Q",                     /* label, accelerator */     
+    "Quit",                                    /* tooltip */
+    G_CALLBACK (activate_action) },
+  { "About", NULL,                             /* name, stock id */
+    "_About", "<control>A",                    /* label, accelerator */     
+    "About",                                   /* tooltip */  
+    G_CALLBACK (about_cb) },
+  { "Logo", "demo-gtk-logo",                   /* name, stock id */
+     NULL, NULL,                               /* label, accelerator */     
+    "GTK+",                                    /* tooltip */
+    G_CALLBACK (activate_action) },
+};
+static guint n_entries = G_N_ELEMENTS (entries);
+
+
+static GtkToggleActionEntry toggle_entries[] = {
+  { "Bold", GTK_STOCK_BOLD,                    /* name, stock id */
+     "_Bold", "<control>B",                    /* label, accelerator */     
+    "Bold",                                    /* tooltip */
+    G_CALLBACK (activate_action), 
+    TRUE },                                    /* is_active */
+};
+static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);
+
+enum {
+  COLOR_RED,
+  COLOR_GREEN,
+  COLOR_BLUE
 };
 
-static void
-toolbar_cb (GtkWidget *button,
-            gpointer   data)
-{
-  GtkWidget *dialog;
-  
-  dialog = gtk_message_dialog_new (GTK_WINDOW (data),
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_CLOSE,
-                                   "You selected a toolbar button");
+static GtkRadioActionEntry color_entries[] = {
+  { "Red", NULL,                               /* name, stock id */
+    "_Red", "<control>R",                      /* label, accelerator */     
+    "Blood", COLOR_RED },                      /* tooltip, value */
+  { "Green", NULL,                             /* name, stock id */
+    "_Green", "<control>G",                    /* label, accelerator */     
+    "Grass", COLOR_GREEN },                    /* tooltip, value */
+  { "Blue", NULL,                              /* name, stock id */
+    "_Blue", "<control>B",                     /* label, accelerator */     
+    "Sky", COLOR_BLUE },                       /* tooltip, value */
+};
+static guint n_color_entries = G_N_ELEMENTS (color_entries);
+
+enum {
+  SHAPE_SQUARE,
+  SHAPE_RECTANGLE,
+  SHAPE_OVAL
+};
+
+static GtkRadioActionEntry shape_entries[] = {
+  { "Square", NULL,                            /* name, stock id */
+    "_Square", "<control>S",                   /* label, accelerator */     
+    "Square",  SHAPE_SQUARE },                 /* tooltip, value */
+  { "Rectangle", NULL,                         /* name, stock id */
+    "_Rectangle", "<control>R",                /* label, accelerator */     
+    "Rectangle", SHAPE_RECTANGLE },            /* tooltip, value */
+  { "Oval", NULL,                              /* name, stock id */
+    "_Oval", "<control>O",                     /* label, accelerator */     
+    "Egg", SHAPE_OVAL },                       /* tooltip, value */  
+};
+static guint n_shape_entries = G_N_ELEMENTS (shape_entries);
+
+static const gchar *ui_info = 
+"<ui>"
+"  <menubar name='MenuBar'>"
+"    <menu action='FileMenu'>"
+"      <menuitem action='New'/>"
+"      <menuitem action='Open'/>"
+"      <menuitem action='Save'/>"
+"      <menuitem action='SaveAs'/>"
+"      <separator/>"
+"      <menuitem action='Quit'/>"
+"    </menu>"
+"    <menu action='PreferencesMenu'>"
+"      <menu action='ColorMenu'>"
+"	<menuitem action='Red'/>"
+"	<menuitem action='Green'/>"
+"	<menuitem action='Blue'/>"
+"      </menu>"
+"      <menu action='ShapeMenu'>"
+"        <menuitem action='Square'/>"
+"        <menuitem action='Rectangle'/>"
+"        <menuitem action='Oval'/>"
+"      </menu>"
+"      <menuitem action='Bold'/>"
+"    </menu>"
+"    <menu action='HelpMenu'>"
+"      <menuitem action='About'/>"
+"    </menu>"
+"  </menubar>"
+"  <toolbar  name='ToolBar'>"
+"    <toolitem action='Open'/>"
+"    <toolitem action='Quit'/>"
+"    <separator action='Sep1'/>"
+"    <toolitem action='Logo'/>"
+"  </toolbar>"
+"</ui>";
+
 
-  /* Close dialog on user response */
-  g_signal_connect (dialog,
-                    "response",
-                    G_CALLBACK (gtk_widget_destroy),
-                    NULL);
-  
-  gtk_widget_show (dialog);
-}
 
 /* This function registers our custom toolbar icons, so they can be themed.
  *
@@ -185,19 +372,30 @@ mark_set_callback (GtkTextBuffer     *buffer,
   update_statusbar (buffer, GTK_STATUSBAR (data));
 }
 
+static void
+update_resize_grip (GtkWidget           *widget,
+		    GdkEventWindowState *event,
+		    GtkStatusbar        *statusbar)
+{
+  if (event->changed_mask & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))
+    gtk_statusbar_set_has_resize_grip (statusbar, !(event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)));
+}
+		    
+
 GtkWidget *
-do_appwindow (void)
+do_appwindow (GtkWidget *do_widget)
 {  
   if (!window)
     {
       GtkWidget *table;
-      GtkWidget *toolbar;
       GtkWidget *statusbar;
       GtkWidget *contents;
       GtkWidget *sw;
+      GtkWidget *bar;
       GtkTextBuffer *buffer;
-      GtkAccelGroup *accel_group;      
-      GtkItemFactory *item_factory;
+      GtkActionGroup *action_group;
+      GtkUIManager *merge;
+      GError *error = NULL;
 
       register_stock_icons ();
       
@@ -205,6 +403,8 @@ do_appwindow (void)
        */
       
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Application Window");
 
       /* NULL window variable when window is closed */
@@ -216,66 +416,53 @@ do_appwindow (void)
       
       gtk_container_add (GTK_CONTAINER (window), table);
       
-      /* Create the menubar
+      /* Create the menubar and toolbar
        */
       
-      accel_group = gtk_accel_group_new ();
-      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-      g_object_unref (accel_group);
+      action_group = gtk_action_group_new ("AppWindowActions");
+      gtk_action_group_add_actions (action_group, 
+				    entries, n_entries, 
+				    window);
+      gtk_action_group_add_toggle_actions (action_group, 
+					   toggle_entries, n_toggle_entries, 
+					   NULL);
+      gtk_action_group_add_radio_actions (action_group, 
+					  color_entries, n_color_entries, 
+					  COLOR_RED,
+					  G_CALLBACK (activate_radio_action), 
+					  NULL);
+      gtk_action_group_add_radio_actions (action_group, 
+					  shape_entries, n_shape_entries, 
+					  SHAPE_SQUARE,
+					  G_CALLBACK (activate_radio_action), 
+					  NULL);
+
+      merge = gtk_ui_manager_new ();
+      g_object_set_data_full (G_OBJECT (window), "ui-manager", merge, g_object_unref);
+      gtk_ui_manager_insert_action_group (merge, action_group, 0);
+      gtk_window_add_accel_group (GTK_WINDOW (window), 
+				  gtk_ui_manager_get_accel_group (merge));
       
-      item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
-
-      /* Set up item factory to go away with the window */
-      g_object_ref (item_factory);
-      gtk_object_sink (GTK_OBJECT (item_factory));
-      g_object_set_data_full (G_OBJECT (window),
-                              "<main>",
-                              item_factory,
-                              (GDestroyNotify) g_object_unref);
-
-      /* create menu items */
-      gtk_item_factory_create_items (item_factory, G_N_ELEMENTS (menu_items),
-                                     menu_items, window);
+      if (!gtk_ui_manager_add_ui_from_string (merge, ui_info, -1, &error))
+	{
+	  g_message ("building menus failed: %s", error->message);
+	  g_error_free (error);
+	}
 
+      bar = gtk_ui_manager_get_widget (merge, "/MenuBar");
+      gtk_widget_show (bar);
       gtk_table_attach (GTK_TABLE (table),
-			gtk_item_factory_get_widget (item_factory, "<main>"),
+			bar, 
                         /* X direction */          /* Y direction */
                         0, 1,                      0, 1,
                         GTK_EXPAND | GTK_FILL,     0,
                         0,                         0);
 
-      /* Create the toolbar
-       */
-      toolbar = gtk_toolbar_new ();
-
-      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
-                                GTK_STOCK_OPEN,
-                                "This is a demo button with an 'open' icon",
-                                NULL,
-                                G_CALLBACK (toolbar_cb),
-                                window, /* user data for callback */
-                                -1);  /* -1 means "append" */
-
-      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
-                                GTK_STOCK_QUIT,
-                                "This is a demo button with a 'quit' icon",
-                                NULL,
-                                G_CALLBACK (toolbar_cb),
-                                window, /* user data for callback */
-                                -1);  /* -1 means "append" */
-
-      gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
-
-      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
-                                "demo-gtk-logo",
-                                "This is a demo button with a 'gtk' icon",
-                                NULL,
-                                G_CALLBACK (toolbar_cb),
-                                window, /* user data for callback */
-                                -1);  /* -1 means "append" */
-
+      bar = gtk_ui_manager_get_widget (merge, "/ToolBar");
+      gtk_toolbar_set_tooltips (GTK_TOOLBAR (bar), TRUE);
+      gtk_widget_show (bar);
       gtk_table_attach (GTK_TABLE (table),
-                        toolbar,
+			bar, 
                         /* X direction */       /* Y direction */
                         0, 1,                   1, 2,
                         GTK_EXPAND | GTK_FILL,  0,
@@ -304,7 +491,8 @@ do_appwindow (void)
                                    200, 200);
       
       contents = gtk_text_view_new ();
-
+      gtk_widget_grab_focus (contents);
+      
       gtk_container_add (GTK_CONTAINER (sw),
                          contents);
 
@@ -332,6 +520,12 @@ do_appwindow (void)
                                G_CALLBACK (mark_set_callback),
                                statusbar,
                                0);
+
+      g_signal_connect_object (window, 
+			       "window_state_event", 
+			       G_CALLBACK (update_resize_grip),
+			       statusbar,
+			       0);
       
       update_statusbar (buffer, GTK_STATUSBAR (statusbar));
     }

demos/gtk-demo/button_box.c

@@ -41,7 +41,7 @@ create_bbox (gint  horizontal,
 }
 
 GtkWidget *
-do_button_box (void)
+do_button_box (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GtkWidget *main_vbox;
@@ -53,6 +53,8 @@ do_button_box (void)
   if (!window)
   {
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_screen (GTK_WINDOW (window),
+			   gtk_widget_get_screen (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Button Boxes");
     
     g_signal_connect (window, "destroy",

demos/gtk-demo/changedisplay.c

@@ -577,7 +577,7 @@ destroy_cb (GtkObject          *object,
  * it. Otherwise, destroys it.
  */
 GtkWidget *
-do_changedisplay (void)
+do_changedisplay (GtkWidget *do_widget)
 {
   static ChangeDisplayInfo *info = NULL;
 
@@ -589,7 +589,7 @@ do_changedisplay (void)
       info = g_new0 (ChangeDisplayInfo, 1);
 
       info->window = gtk_dialog_new_with_buttons ("Change Screen or display",
-					    NULL, /* parent */
+					    GTK_WINDOW (do_widget), 
 					    GTK_DIALOG_NO_SEPARATOR,
 					    GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
 					    "Change",         GTK_RESPONSE_OK,

demos/gtk-demo/clipboard.c

@@ -0,0 +1,123 @@
+/* Clipboard
+ *
+ * GtkClipboard is used for clipboard handling. This demo shows how to
+ * copy and paste text to and from the clipboard.
+ */
+
+#include <gtk/gtk.h>
+#include <string.h>
+
+static GtkWidget *window = NULL;
+
+void
+copy_button_clicked (GtkWidget *button,
+		     gpointer   user_data)
+{
+  GtkWidget *entry;
+  GtkClipboard *clipboard;
+
+  entry = GTK_WIDGET (user_data);
+  
+  /* Get the clipboard object */
+  clipboard = gtk_widget_get_clipboard (entry,
+					GDK_SELECTION_CLIPBOARD);
+
+  /* Set clipboard text */
+  gtk_clipboard_set_text (clipboard, gtk_entry_get_text (GTK_ENTRY (entry)), -1);
+}
+
+void
+paste_received (GtkClipboard *clipboard,
+		const gchar  *text,
+		gpointer      user_data)
+{
+  GtkWidget *entry;
+
+  entry = GTK_WIDGET (user_data);
+  
+  /* Set the entry text */
+  gtk_entry_set_text (GTK_ENTRY (entry), text);
+}
+
+void
+paste_button_clicked (GtkWidget *button,
+		     gpointer   user_data)
+{
+  GtkWidget *entry;
+  GtkClipboard *clipboard;
+
+  entry = GTK_WIDGET (user_data);
+  
+  /* Get the clipboard object */
+  clipboard = gtk_widget_get_clipboard (entry,
+					GDK_SELECTION_CLIPBOARD);
+
+  /* Request the contents of the clipboard, contents_received will be
+     called when we do get the contents.
+   */
+  gtk_clipboard_request_text (clipboard,
+			      paste_received, entry);
+}
+
+GtkWidget *
+do_clipboard (GtkWidget *do_widget)
+{
+  if (!window)
+    {
+      GtkWidget *vbox, *hbox;
+      GtkWidget *label;
+      GtkWidget *entry, *button;
+      
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      vbox = gtk_vbox_new (FALSE, 0);
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
+      
+      gtk_container_add (GTK_CONTAINER (window), vbox);
+
+      label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");
+      
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+      hbox = gtk_hbox_new (FALSE, 4);
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+
+      /* Create the first entry */
+      entry = gtk_entry_new ();
+      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+      
+      /* Create the button */
+      button = gtk_button_new_from_stock (GTK_STOCK_COPY);
+      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+      g_signal_connect (button, "clicked",
+			G_CALLBACK (copy_button_clicked), entry);
+
+      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+      hbox = gtk_hbox_new (FALSE, 4);
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+
+      /* Create the second entry */
+      entry = gtk_entry_new ();
+      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+      
+      /* Create the button */
+      button = gtk_button_new_from_stock (GTK_STOCK_PASTE);
+      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+      g_signal_connect (button, "clicked",
+			G_CALLBACK (paste_button_clicked), entry);
+      
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show_all (window);
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

demos/gtk-demo/colorsel.c

@@ -65,7 +65,7 @@ change_color_callback (GtkWidget *button,
 }
 
 GtkWidget *
-do_colorsel (void)
+do_colorsel (GtkWidget *do_widget)
 {
   GtkWidget *vbox;
   GtkWidget *button;
@@ -78,6 +78,8 @@ do_colorsel (void)
       color.green = 0;
       
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Color Selection");
 
       g_signal_connect (window, "destroy",

demos/gtk-demo/dialog.c

@@ -21,8 +21,9 @@ message_dialog_clicked (GtkButton *button,
 				   GTK_MESSAGE_INFO,
 				   GTK_BUTTONS_OK,
 				   "This message box has been popped up the following\n"
-				   "number of times:\n\n"
-				   "%d", i);
+				   "number of times:");
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                            "%d", i);
   gtk_dialog_run (GTK_DIALOG (dialog));
   gtk_widget_destroy (dialog);
   i++;
@@ -93,7 +94,7 @@ interactive_dialog_clicked (GtkButton *button,
 }
 
 GtkWidget *
-do_dialog (void)
+do_dialog (GtkWidget *do_widget)
 {
   GtkWidget *frame;
   GtkWidget *vbox;
@@ -106,6 +107,8 @@ do_dialog (void)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Dialogs");
 
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/drawingarea.c

@@ -219,7 +219,7 @@ checkerboard_expose (GtkWidget	    *da,
 }
 
 GtkWidget *
-do_drawingarea (void)
+do_drawingarea (GtkWidget *do_widget)
 {
   GtkWidget *frame;
   GtkWidget *vbox;
@@ -229,6 +229,8 @@ do_drawingarea (void)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Drawing Area");
 
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/editable_cells.c

@@ -152,13 +152,11 @@ cell_edited (GtkCellRendererText *cell,
   GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
   GtkTreeIter iter;
 
-  gint *column;
-
-  column = g_object_get_data (G_OBJECT (cell), "column");
+  gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column"));
 
   gtk_tree_model_get_iter (model, &iter, path);
 
-  switch (GPOINTER_TO_INT (column))
+  switch (column)
     {
     case COLUMN_NUMBER:
       {
@@ -225,7 +223,7 @@ add_columns (GtkTreeView *treeview)
 }
 
 GtkWidget *
-do_editable_cells (void)
+do_editable_cells (GtkWidget *do_widget)
 {
   if (!window)
     {
@@ -238,6 +236,8 @@ do_editable_cells (void)
 
       /* create window, etc */
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Shopping list");
       gtk_container_set_border_width (GTK_CONTAINER (window), 5);
       g_signal_connect (window, "destroy",

demos/gtk-demo/entry_completion.c

@@ -0,0 +1,97 @@
+/* Entry Completion
+ *
+ * GtkEntryCompletion provides a mechanism for adding support for
+ * completion in GtkEntry.
+ *
+ */
+
+#include <gtk/gtk.h>
+
+static GtkWidget *window = NULL;
+
+/* Creates a tree model containing the completions */
+GtkTreeModel *
+create_completion_model (void)
+{
+  GtkListStore *store;
+  GtkTreeIter iter;
+  
+  store = gtk_list_store_new (1, G_TYPE_STRING);
+
+  /* Append one word */
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "GNOME", -1);
+
+  /* Append another word */
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "total", -1);
+
+  /* And another word */
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "totally", -1);
+  
+  return GTK_TREE_MODEL (store);
+}
+
+
+GtkWidget *
+do_entry_completion (GtkWidget *do_widget)
+{
+  GtkWidget *vbox;
+  GtkWidget *label;
+  GtkWidget *entry;
+  GtkEntryCompletion *completion;
+  GtkTreeModel *completion_model;
+  
+  if (!window)
+  {
+    window = gtk_dialog_new_with_buttons ("GtkEntryCompletion",
+					  GTK_WINDOW (do_widget),
+					  0,
+					  GTK_STOCK_CLOSE,
+					  GTK_RESPONSE_NONE,
+					  NULL);
+    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+
+    g_signal_connect (window, "response",
+		      G_CALLBACK (gtk_widget_destroy), NULL);
+    g_signal_connect (window, "destroy",
+		      G_CALLBACK (gtk_widget_destroyed), &window);
+
+    vbox = gtk_vbox_new (FALSE, 5);
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+
+    label = gtk_label_new (NULL);
+    gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
+    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+    /* Create our entry */
+    entry = gtk_entry_new ();
+    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+
+    /* Create the completion object */
+    completion = gtk_entry_completion_new ();
+
+    /* Assign the completion to the entry */
+    gtk_entry_set_completion (GTK_ENTRY (entry), completion);
+    g_object_unref (completion);
+    
+    /* Create a tree model and use it as the completion model */
+    completion_model = create_completion_model ();
+    gtk_entry_completion_set_model (completion, completion_model);
+    g_object_unref (completion_model);
+    
+    /* Use model column 0 as the text column */
+    gtk_entry_completion_set_text_column (completion, 0);
+  }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show_all (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}
+
+

demos/gtk-demo/expander.c

@@ -0,0 +1,58 @@
+/* Expander
+ *
+ * GtkExpander allows to provide additional content that is initially hidden.
+ * This is also known as "disclosure triangle".
+ *
+ */
+
+#include <gtk/gtk.h>
+
+static GtkWidget *window = NULL;
+
+
+GtkWidget *
+do_expander (GtkWidget *do_widget)
+{
+  GtkWidget *vbox;
+  GtkWidget *label;
+  GtkWidget *expander;
+  
+  if (!window)
+  {
+    window = gtk_dialog_new_with_buttons ("GtkExpander",
+					  GTK_WINDOW (do_widget),
+					  0,
+					  GTK_STOCK_CLOSE,
+					  GTK_RESPONSE_NONE,
+					  NULL);
+    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+
+    g_signal_connect (window, "response",
+		      G_CALLBACK (gtk_widget_destroy), NULL);
+    g_signal_connect (window, "destroy",
+		      G_CALLBACK (gtk_widget_destroyed), &window);
+
+    vbox = gtk_vbox_new (FALSE, 5);
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+
+    label = gtk_label_new ("Expander demo. Click on the triangle for details.");
+    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+    /* Create the expander */
+    expander = gtk_expander_new ("Details");
+    gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
+
+    label = gtk_label_new ("Details can be shown or hidden.");
+    gtk_container_add (GTK_CONTAINER (expander), label);
+  }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show_all (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}
+
+

demos/gtk-demo/geninclude.pl

@@ -1,163 +0,0 @@
-#!/usr/bin/perl -w
-
-print <<EOT;
-typedef	GtkWidget *(*GDoDemoFunc) (void);
-
-typedef struct _Demo Demo;
-
-struct _Demo 
-{
-  gchar *title;
-  gchar *filename;
-  GDoDemoFunc func;
-  Demo *children;
-};
-
-EOT
-
-for $file (@ARGV) {
-    my %demo;
-    
-    ($basename = $file) =~ s/\.c$//;
-
-    open INFO_FILE, $file or die "Cannot open '$file'\n";
-    $title = <INFO_FILE>;
-    $title =~ s@^\s*/\*\s*@@;
-    $title =~ s@\s*$@@;
-
-    close INFO_FILE;
-
-    print "GtkWidget *do_$basename (void);\n";
-
-    push @demos, {"title" => $title, "file" => $file,
-		  "func"  => "do_$basename"};
-}
-
-# generate a list of 'parent names'
-foreach $href (@demos) {
-    if ($href->{"title"} =~ m|^([\w\s]+)/[\w\s]+$|) {
-	my $parent_name = $1;
-	my $do_next = 0;
-
-	# parent detected
-	if (defined @parents) {
-	    foreach $foo (@parents) {
-		if ($foo eq $parent_name) {
-		    $do_next = 1;
-		}
-	    }
-	    
-	    if ($do_next) {
-		next;
-	    }
-	}
-
-	push @parents, $parent_name;
-
-	$tmp = (defined @child_arrays)?($#child_arrays + 1):0;
-	push @child_arrays, "child$tmp";
-
-	push @demos, {"title" => $parent_name, "file" => "NULL",
-		      "func" => "NULL"};
-    }
-}
-
-if (defined @parents) {
-    $i = 0;
-    for ($i = 0; $i <= $#parents; $i++) {
-	$first = 1;
-	
-	print "\nDemo ", $child_arrays[$i], "[] = {\n";
-	
-	$j = 0;
-	for ($j = 0; $j <= $#demos; $j++) {
-	    $href = $demos[$j];
-	    
-	    if (!defined $demos[$j]) {
-		next;
-	    }
-	    
-	    if ($demos[$j]{"title"} =~ m|^$parents[$i]/([\w\s]+)$|) {
-		if ($first) {
-		    $first = 0;
-		} else {
-		    print ",\n";
-		}
-		
-		print qq (  { "$1", "$demos[$j]{file}", $demos[$j]{func}, NULL });
-
-		# hack ... ugly
-		$demos[$j]{"title"} = "foo";
-	    }
-	}
-
-	print ",\n";
-	print qq (  { NULL } );
-	print "\n};\n";
-    }   
-}
-
-# sort @demos
-@demos_old = @demos;
-
-@demos = sort {
-    $a->{"title"} cmp $b->{"title"};
-} @demos_old;
-
-# sort the child arrays
-if (defined @child_arrays) {
-    for ($i = 0; $i <= $#child_arrays; $i++) {
-	@foo_old = @{$child_arrays[$i]};
-
-	@{$child_arrays[$i]} = sort {
-	    $a->{"title"} cmp $b->{"title"};
-	} @foo_old;
-    }
-}
-
-# toplevel
-print "\nDemo testgtk_demos[] = {\n";
-
-$first = 1;
-foreach $href (@demos) {
-    $handled = 0;
-
-    # ugly evil hack
-    if ($href->{title} eq "foo") {
-	next;
-    }
-
-    if ($first) {
-	$first = 0;
-    } else {
-	print ", \n";
-    }
-
-    if (defined @parents) {
-	for ($i = 0; $i <= $#parents; $i++) {
-	    if ($parents[$i] eq $href->{title}) {
-
-		if ($href->{file} eq 'NULL') {
-		    print qq (  { "$href->{title}", NULL, $href->{func}, $child_arrays[$i] });
-		} else {
-		    print qq (  { "$href->{title}", "$href->{file}", $href->{func}, $child_arrays[$i] });
-		}
-		
-		$handled = 1;
-		last;
-	    }
-	}
-    }
-    
-    if ($handled) {
-	next;
-    }
-    
-    print qq (  { "$href->{title}", "$href->{file}", $href->{func}, NULL });
-}
-
-print ",\n";
-print qq (  { NULL } );
-print "\n};\n";
-
-exit 0;

demos/gtk-demo/geninclude.pl.in

@@ -1,7 +1,7 @@
 #!@PERL@ -w
 
 print <<EOT;
-typedef	GtkWidget *(*GDoDemoFunc) (void);
+typedef	GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);
 
 typedef struct _Demo Demo;
 
@@ -27,7 +27,7 @@ for $file (@ARGV) {
 
     close INFO_FILE;
 
-    print "GtkWidget *do_$basename (void);\n";
+    print "GtkWidget *do_$basename (GtkWidget *do_widget);\n";
 
     push @demos, {"title" => $title, "file" => $file,
 		  "func"  => "do_$basename"};

demos/gtk-demo/hypertext.c

@@ -0,0 +1,318 @@
+/* Text Widget/Hypertext
+ *
+ * Usually, tags modify the appearance of text in the view, e.g. making it 
+ * bold or colored or underlined. But tags are not restricted to appearance. 
+ * They can also affect the behavior of mouse and key presses, as this demo 
+ * shows.
+ */
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+/* Inserts a piece of text into the buffer, giving it the usual
+ * appearance of a hyperlink in a web browser: blue and underlined.
+ * Additionally, attaches some data on the tag, to make it recognizable
+ * as a link. 
+ */
+static void 
+insert_link (GtkTextBuffer *buffer, 
+	     GtkTextIter   *iter, 
+	     gchar         *text, 
+	     gint           page)
+{
+  GtkTextTag *tag;
+  
+  tag = gtk_text_buffer_create_tag (buffer, NULL, 
+				    "foreground", "blue", 
+				    "underline", PANGO_UNDERLINE_SINGLE, 
+				    NULL);
+  g_object_set_data (G_OBJECT (tag), "page", GINT_TO_POINTER (page));
+  gtk_text_buffer_insert_with_tags (buffer, iter, text, -1, tag, NULL);
+}
+
+/* Fills the buffer with text and interspersed links. In any real
+ * hypertext app, this method would parse a file to identify the links.
+ */
+static void
+show_page (GtkTextBuffer *buffer, 
+	   gint           page)
+{
+  GtkTextIter iter;
+
+  gtk_text_buffer_set_text (buffer, "", 0);
+  gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
+  if (page == 1)
+    {
+      gtk_text_buffer_insert (buffer, &iter, "Some text to show that simple ", -1);
+      insert_link (buffer, &iter, "hypertext", 3);
+      gtk_text_buffer_insert (buffer, &iter, " can easily be realized with ", -1);
+      insert_link (buffer, &iter, "tags", 2);
+      gtk_text_buffer_insert (buffer, &iter, ".", -1);
+    }
+  else if (page == 2)
+    {
+      gtk_text_buffer_insert (buffer, &iter, 
+			      "A tag is an attribute that can be applied to some range of text. "
+			      "For example, a tag might be called \"bold\" and make the text inside "
+			      "the tag bold. However, the tag concept is more general than that; "
+			      "tags don't have to affect appearance. They can instead affect the "
+			      "behavior of mouse and key presses, \"lock\" a range of text so the "
+			      "user can't edit it, or countless other things.\n", -1);
+      insert_link (buffer, &iter, "Go back", 1);
+    }
+  else if (page == 3) 
+    {
+      GtkTextTag *tag;
+  
+      tag = gtk_text_buffer_create_tag (buffer, NULL, 
+					"weight", PANGO_WEIGHT_BOLD, 
+					NULL);
+      gtk_text_buffer_insert_with_tags (buffer, &iter, "hypertext:\n", -1, tag, NULL);
+      gtk_text_buffer_insert (buffer, &iter, 
+			      "machine-readable text that is not sequential but is organized "
+			      "so that related items of information are connected.\n", -1);
+      insert_link (buffer, &iter, "Go back", 1);
+    }
+}
+
+/* Looks at all tags covering the position of iter in the text view, 
+ * and if one of them is a link, follow it by showing the page identified
+ * by the data attached to it.
+ */
+static void
+follow_if_link (GtkWidget   *text_view, 
+		GtkTextIter *iter)
+{
+  GSList *tags = NULL, *tagp = NULL;
+
+  tags = gtk_text_iter_get_tags (iter);
+  for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
+    {
+      GtkTextTag *tag = tagp->data;
+      gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
+
+      if (page != 0)
+        {
+	  show_page (gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)), page);
+	  break;
+        }
+    }
+
+  if (tags) 
+    g_slist_free (tags);
+}
+
+/* Links can be activated by pressing Enter.
+ */
+static gboolean
+key_press_event (GtkWidget *text_view,
+		 GdkEventKey *event)
+{
+  GtkTextIter iter;
+  GtkTextBuffer *buffer;
+
+  switch (event->keyval)
+    {
+      case GDK_Return: 
+      case GDK_KP_Enter:
+        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
+        gtk_text_buffer_get_iter_at_mark (buffer, &iter, 
+                                          gtk_text_buffer_get_insert (buffer));
+        follow_if_link (text_view, &iter);
+        break;
+
+      default:
+        break;
+    }
+
+  return FALSE;
+}
+
+/* Links can also be activated by clicking.
+ */
+static gboolean
+event_after (GtkWidget *text_view,
+	     GdkEvent  *ev)
+{
+  GtkTextIter start, end, iter;
+  GtkTextBuffer *buffer;
+  GdkEventButton *event;
+  gint x, y;
+
+  if (ev->type != GDK_BUTTON_RELEASE)
+    return FALSE;
+
+  event = (GdkEventButton *)ev;
+
+  if (event->button != 1)
+    return FALSE;
+
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
+
+  /* we shouldn't follow a link if the user has selected something */
+  gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
+  if (gtk_text_iter_get_offset (&start) != gtk_text_iter_get_offset (&end))
+    return FALSE;
+
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
+                                         GTK_TEXT_WINDOW_WIDGET,
+                                         event->x, event->y, &x, &y);
+
+  gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (text_view), &iter, x, y);
+
+  follow_if_link (text_view, &iter);
+
+  return FALSE;
+}
+
+gboolean hovering_over_link = FALSE;
+GdkCursor *hand_cursor = NULL;
+GdkCursor *regular_cursor = NULL;
+
+/* Looks at all tags covering the position (x, y) in the text view, 
+ * and if one of them is a link, change the cursor to the "hands" cursor
+ * typically used by web browsers.
+ */
+static void
+set_cursor_if_appropriate (GtkTextView    *text_view,
+                           gint            x,
+                           gint            y)
+{
+  GSList *tags = NULL, *tagp = NULL;
+  GtkTextBuffer *buffer;
+  GtkTextIter iter;
+  gboolean hovering = FALSE;
+
+  buffer = gtk_text_view_get_buffer (text_view);
+
+  gtk_text_view_get_iter_at_location (text_view, &iter, x, y);
+  
+  tags = gtk_text_iter_get_tags (&iter);
+  for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
+    {
+      GtkTextTag *tag = tagp->data;
+      gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
+
+      if (page != 0) 
+        {
+          hovering = TRUE;
+          break;
+        }
+    }
+
+  if (hovering != hovering_over_link)
+    {
+      hovering_over_link = hovering;
+
+      if (hovering_over_link)
+        gdk_window_set_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), hand_cursor);
+      else
+        gdk_window_set_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), regular_cursor);
+    }
+
+  if (tags) 
+    g_slist_free (tags);
+}
+
+/* Update the cursor image if the pointer moved. 
+ */
+static gboolean
+motion_notify_event (GtkWidget      *text_view,
+		     GdkEventMotion *event)
+{
+  gint x, y;
+
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
+                                         GTK_TEXT_WINDOW_WIDGET,
+                                         event->x, event->y, &x, &y);
+
+  set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y);
+
+  gdk_window_get_pointer (text_view->window, NULL, NULL, NULL);
+  return FALSE;
+}
+
+/* Also update the cursor image if the window becomes visible
+ * (e.g. when a window covering it got iconified).
+ */
+static gboolean
+visibility_notify_event (GtkWidget          *text_view,
+			 GdkEventVisibility *event)
+{
+  gint wx, wy, bx, by;
+  
+  gdk_window_get_pointer (text_view->window, &wx, &wy, NULL);
+  
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
+                                         GTK_TEXT_WINDOW_WIDGET,
+                                         wx, wy, &bx, &by);
+
+  set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), bx, by);
+
+  return FALSE;
+}
+
+GtkWidget *
+do_hypertext (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkWidget *view;
+      GtkWidget *sw;
+      GtkTextBuffer *buffer;
+
+      hand_cursor = gdk_cursor_new (GDK_HAND2);
+      regular_cursor = gdk_cursor_new (GDK_XTERM);
+      
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
+      gtk_window_set_default_size (GTK_WINDOW (window),
+				   450, 450);
+      
+      g_signal_connect (window, "destroy",
+			G_CALLBACK (gtk_widget_destroyed), &window);
+
+      gtk_window_set_title (GTK_WINDOW (window), "Hypertext");
+      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
+
+      view = gtk_text_view_new ();
+      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
+      g_signal_connect (view, "key-press-event", 
+			G_CALLBACK (key_press_event), NULL);
+      g_signal_connect (view, "event-after", 
+			G_CALLBACK (event_after), NULL);
+      g_signal_connect (view, "motion-notify-event", 
+			G_CALLBACK (motion_notify_event), NULL);
+      g_signal_connect (view, "visibility-notify-event", 
+			G_CALLBACK (visibility_notify_event), NULL);
+
+      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+      
+      sw = gtk_scrolled_window_new (NULL, NULL);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+				      GTK_POLICY_AUTOMATIC,
+				      GTK_POLICY_AUTOMATIC);
+      gtk_container_add (GTK_CONTAINER (window), sw);
+      gtk_container_add (GTK_CONTAINER (sw), view);
+
+      show_page (buffer, 1);
+
+      gtk_widget_show_all (sw);
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    {
+      gtk_widget_show (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}
+

demos/gtk-demo/iconview.c

@@ -0,0 +1,359 @@
+/* Icon View
+ *
+ * The GtkIconView widget is used to display and manipulate icons.  It
+ * uses a GtkTreeModel for data storage, so the list store example
+ * might be helpful.
+ */
+
+#include <gtk/gtk.h>
+#include <string.h>
+#include "demo-common.h"
+
+static GtkWidget *window = NULL;
+
+#define FOLDER_NAME "gnome-fs-directory.png"
+#define FILE_NAME "gnome-fs-regular.png"
+
+enum
+{
+  COL_PATH,
+  COL_DISPLAY_NAME,
+  COL_PIXBUF,
+  COL_IS_DIRECTORY,
+  NUM_COLS
+};
+
+
+static GdkPixbuf *file_pixbuf, *folder_pixbuf;
+gchar *parent;
+GtkToolItem *up_button;
+
+/* Loads the images for the demo and returns whether the operation succeeded */
+static gboolean
+load_pixbufs (GError **error)
+{
+  char *filename;
+
+  if (file_pixbuf)
+    return TRUE; /* already loaded earlier */
+
+  /* demo_find_file() looks in the the current directory first,
+   * so you can run gtk-demo without installing GTK, then looks
+   * in the location where the file is installed.
+   */
+  filename = demo_find_file (FILE_NAME, error);
+  if (!filename)
+    return FALSE; /* note that "error" was filled in and returned */
+
+  file_pixbuf = gdk_pixbuf_new_from_file (filename, error);
+  g_free (filename);
+  
+  if (!file_pixbuf)
+    return FALSE; /* Note that "error" was filled with a GError */
+  
+  filename = demo_find_file (FOLDER_NAME, error);
+  if (!filename)
+    return FALSE; /* note that "error" was filled in and returned */
+
+  folder_pixbuf = gdk_pixbuf_new_from_file (filename, error);
+  g_free (filename);
+
+  return TRUE;
+}
+
+static void
+fill_store (GtkListStore *store)
+{
+  GDir *dir;
+  const gchar *name;
+  GtkTreeIter iter;
+  
+  /* First clear the store */
+  gtk_list_store_clear (store);
+
+  /* Now go through the directory and extract all the file
+   * information */
+  dir = g_dir_open (parent, 0, NULL);
+  if (!dir)
+    return;
+
+  name = g_dir_read_name (dir);
+  while (name != NULL)
+    {
+      gchar *path, *display_name;
+      gboolean is_dir;
+      
+      /* We ignore hidden files that start with a '.' */
+      if (name[0] != '.')
+	{
+	  path = g_build_filename (parent, name, NULL);
+
+	  is_dir = g_file_test (path, G_FILE_TEST_IS_DIR);
+	  
+	  display_name = g_filename_to_utf8 (name, -1, NULL, NULL, NULL);
+
+	  gtk_list_store_append (store, &iter);
+	  gtk_list_store_set (store, &iter,
+			      COL_PATH, path,
+			      COL_DISPLAY_NAME, display_name,
+			      COL_IS_DIRECTORY, is_dir,
+			      COL_PIXBUF, is_dir ? folder_pixbuf : file_pixbuf,
+			      -1);
+	  g_free (path);
+	  g_free (display_name);
+	}
+
+      name = g_dir_read_name (dir);      
+    }
+}
+
+static gint
+sort_func (GtkTreeModel *model,
+	   GtkTreeIter  *a,
+	   GtkTreeIter  *b,
+	   gpointer      user_data)
+{
+  gboolean is_dir_a, is_dir_b;
+  gchar *name_a, *name_b;
+  int ret;
+
+  /* We need this function because we want to sort
+   * folders before files.
+   */
+
+  
+  gtk_tree_model_get (model, a,
+		      COL_IS_DIRECTORY, &is_dir_a,
+		      COL_DISPLAY_NAME, &name_a,
+		      -1);
+
+  gtk_tree_model_get (model, b,
+		      COL_IS_DIRECTORY, &is_dir_b,
+		      COL_DISPLAY_NAME, &name_b,
+		      -1);
+
+  if (!is_dir_a && is_dir_b)
+    ret = 1;
+  else if (is_dir_a && !is_dir_b)
+    ret = -1;
+  else
+    {
+      ret = g_utf8_collate (name_a, name_b);
+    }
+
+  g_free (name_a);
+  g_free (name_b);
+
+  return ret;
+}
+
+GtkListStore *
+create_store (void)
+{
+  GtkListStore *store;
+
+  store = gtk_list_store_new (NUM_COLS,
+			      G_TYPE_STRING, 
+			      G_TYPE_STRING, 
+			      GDK_TYPE_PIXBUF,
+			      G_TYPE_BOOLEAN);
+
+  /* Set sort column and function */ 
+  gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store),
+					   sort_func,
+					   NULL, NULL);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
+					GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+					GTK_SORT_ASCENDING);
+
+  return store;
+}
+
+static void
+item_activated (GtkIconView *icon_view,
+		GtkTreePath *tree_path,
+		gpointer     user_data)
+{
+  GtkListStore *store;
+  gchar *path;
+  GtkTreeIter iter;
+  gboolean is_dir;
+  
+  store = GTK_LIST_STORE (user_data);
+
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (store),
+			   &iter, tree_path);
+  gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
+		      COL_PATH, &path,
+		      COL_IS_DIRECTORY, &is_dir,
+		      -1);
+
+  if (!is_dir)
+    {
+      g_free (path);
+      return;
+    }
+  
+  /* Replace parent with path and re-fill the model*/
+  g_free (parent);
+  parent = path;
+
+  fill_store (store);
+
+  /* Sensitize the up button */
+  gtk_widget_set_sensitive (GTK_WIDGET (up_button), TRUE);
+}
+
+static void
+up_clicked (GtkToolItem *item,
+	    gpointer     user_data)
+{
+  GtkListStore *store;
+  gchar *dir_name;
+
+  store = GTK_LIST_STORE (user_data);
+
+  dir_name = g_path_get_dirname (parent);
+  g_free (parent);
+  
+  parent = dir_name;
+
+  fill_store (store);
+
+  /* Maybe de-sensitize the up button */
+  gtk_widget_set_sensitive (GTK_WIDGET (up_button),
+			    strcmp (parent, "/") != 0);
+}
+
+static void
+home_clicked (GtkToolItem *item,
+	      gpointer     user_data)
+{
+  GtkListStore *store;
+
+  store = GTK_LIST_STORE (user_data);
+
+  g_free (parent);
+  parent = g_strdup (g_get_home_dir ());
+
+  fill_store (store);
+
+  /* Sensitize the up button */
+  gtk_widget_set_sensitive (GTK_WIDGET (up_button),
+			    TRUE);
+}
+
+GtkWidget *
+do_iconview (GtkWidget *do_widget)
+{
+  if (!window)
+    {
+      GError *error;
+            
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
+      
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "GtkIconView demo");
+
+      g_signal_connect (window, "destroy",
+			G_CALLBACK (gtk_widget_destroyed), &window);
+
+      error = NULL;
+      if (!load_pixbufs (&error))
+	{
+	  GtkWidget *dialog;
+
+	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					   GTK_DIALOG_DESTROY_WITH_PARENT,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   "Failed to load an image: %s",
+					   error->message);
+
+	  g_error_free (error);
+
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);
+
+	  gtk_widget_show (dialog);
+	}
+      else
+	{
+	  GtkWidget *sw;
+	  GtkWidget *icon_view;
+	  GtkListStore *store;
+	  GtkWidget *vbox;
+	  GtkWidget *tool_bar;
+	  GtkToolItem *home_button;
+	  
+	  vbox = gtk_vbox_new (FALSE, 0);
+	  gtk_container_add (GTK_CONTAINER (window), vbox);
+
+	  tool_bar = gtk_toolbar_new ();
+	  gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE, 0);
+	  
+	  up_button = gtk_tool_button_new_from_stock (GTK_STOCK_GO_UP);
+	  gtk_tool_item_set_is_important (up_button, TRUE);
+	  gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
+	  gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), up_button, -1);
+
+	  home_button = gtk_tool_button_new_from_stock (GTK_STOCK_HOME);
+	  gtk_tool_item_set_is_important (home_button, TRUE);
+	  gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), home_button, -1);
+	  
+	  
+	  sw = gtk_scrolled_window_new (NULL, NULL);
+	  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
+					       GTK_SHADOW_ETCHED_IN);
+	  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+					  GTK_POLICY_AUTOMATIC,
+					  GTK_POLICY_AUTOMATIC);
+	  
+	  gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
+	  
+	  /* Create the store and fill it with the contents of '/' */
+	  parent = g_strdup ("/");
+	  store = create_store ();
+	  fill_store (store);
+
+	  icon_view = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store));
+	  gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
+					    GTK_SELECTION_MULTIPLE);
+	  g_object_unref (store);
+	  
+	  /* Connect to the "clicked" signal of the "Up" tool button */
+	  g_signal_connect (up_button, "clicked",
+			    G_CALLBACK (up_clicked), store);
+
+	  /* Connect to the "clicked" signal of the "Home" tool button */
+	  g_signal_connect (home_button, "clicked",
+			    G_CALLBACK (home_clicked), store);
+	  
+	  /* We now set which model columns that correspont to the text
+	   * and pixbuf of each item
+	   */
+	  gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), COL_DISPLAY_NAME);
+	  gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_view), COL_PIXBUF);
+
+	  /* Connect to the "item_activated" signal */
+	  g_signal_connect (icon_view, "item_activated",
+			    G_CALLBACK (item_activated), store);
+	  gtk_container_add (GTK_CONTAINER (sw), icon_view);
+
+	  gtk_widget_grab_focus (icon_view);
+	}
+    }
+  
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show_all (window);
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}
+

demos/gtk-demo/images.c

@@ -13,6 +13,7 @@
  */
 
 #include <gtk/gtk.h>
+#include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>
 #include "demo-common.h"
@@ -195,7 +196,7 @@ progressive_timeout (gpointer data)
 	}
       else
 	{
-	  image_stream = fopen (filename, "r");
+	  image_stream = g_fopen (filename, "rb");
 	  g_free (filename);
 
 	  if (!image_stream)
@@ -307,7 +308,7 @@ toggle_sensitivity_callback (GtkWidget *togglebutton,
   
 
 GtkWidget *
-do_images (void)
+do_images (GtkWidget *do_widget)
 {
   GtkWidget *frame;
   GtkWidget *vbox;
@@ -322,6 +323,8 @@ do_images (void)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Images");
 
       g_signal_connect (window, "destroy",

demos/gtk-demo/item_factory.c

@@ -1,120 +0,0 @@
-/* Item Factory
- *
- * The GtkItemFactory object allows the easy creation of menus
- * from an array of descriptions of menu items.
- */
-
-#include <gtk/gtk.h>
-
-static void
-gtk_ifactory_cb (gpointer   callback_data,
-		 guint      callback_action,
-		 GtkWidget *widget)
-{
-  g_message ("ItemFactory: activated \"%s\"",
-	     gtk_item_factory_path_from_widget (widget));
-}
-
-static GtkItemFactoryEntry menu_items[] =
-{
-  { "/_File",		 NULL,	       0,		      0, "<Branch>" },
-  { "/File/tearoff1",	 NULL,	       gtk_ifactory_cb,	      0, "<Tearoff>" },
-  { "/File/_New",	 "<control>N", gtk_ifactory_cb,	      0 },
-  { "/File/_Open",	 "<control>O", gtk_ifactory_cb,	      0 },
-  { "/File/_Save",	 "<control>S", gtk_ifactory_cb,	      0 },
-  { "/File/Save _As...", NULL,	       gtk_ifactory_cb,	      0 },
-  { "/File/sep1",	 NULL,	       gtk_ifactory_cb,	      0, "<Separator>" },
-  { "/File/_Quit",	 "<control>Q", gtk_ifactory_cb,	      0 },
-
-  { "/_Preferences",			NULL, 0,	       0, "<Branch>" },
-  { "/_Preferences/_Color",		NULL, 0,	       0, "<Branch>" },
-  { "/_Preferences/Color/_Red",		NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
-  { "/_Preferences/Color/_Green",	NULL, gtk_ifactory_cb, 0, "/Preferences/Color/Red" },
-  { "/_Preferences/Color/_Blue",	NULL, gtk_ifactory_cb, 0, "/Preferences/Color/Red" },
-  { "/_Preferences/_Shape",		NULL, 0,	       0, "<Branch>" },
-  { "/_Preferences/Shape/_Square",	NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
-  { "/_Preferences/Shape/_Rectangle",	NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Square" },
-  { "/_Preferences/Shape/_Oval",	NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Rectangle" },
-
-  { "/_Help",		 NULL,	       0,		      0, "<LastBranch>" },
-  { "/Help/_About",	 NULL,	       gtk_ifactory_cb,	      0 },
-};
-
-static int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
-
-GtkWidget *
-do_item_factory (void)
-{
-  static GtkWidget *window = NULL;
-  
-  if (!window)
-    {
-      GtkWidget *box1;
-      GtkWidget *box2;
-      GtkWidget *separator;
-      GtkWidget *label;
-      GtkWidget *button;
-      GtkAccelGroup *accel_group;
-      GtkItemFactory *item_factory;
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-      g_signal_connect (window, "delete-event",
-			G_CALLBACK (gtk_true), NULL);
-      
-      accel_group = gtk_accel_group_new ();
-      item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
-      g_object_set_data_full (G_OBJECT (window), "<main>",
-			      item_factory, (GDestroyNotify) g_object_unref);
-      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-      gtk_window_set_title (GTK_WINDOW (window), "Item Factory");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-      gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, NULL);
-
-      /* preselect /Preferences/Shape/Oval over the other radios
-       */
-      gtk_check_menu_item_set_active
-	(GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory,
-							 "/Preferences/Shape/Oval")),
-	 TRUE);
-
-      box1 = gtk_vbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
-      
-      gtk_box_pack_start (GTK_BOX (box1),
-			  gtk_item_factory_get_widget (item_factory, "<main>"),
-			  FALSE, FALSE, 0);
-
-      label = gtk_label_new ("Type\n<alt>\nto start");
-      gtk_widget_set_size_request (label, 200, 200);
-      gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
-      gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);
-
-
-      separator = gtk_hseparator_new ();
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
-
-
-      box2 = gtk_vbox_new (FALSE, 10);
-      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
-
-      button = gtk_button_new_with_label ("close");
-      g_signal_connect_swapped (button, "clicked",
-				G_CALLBACK (gtk_widget_destroy), window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-      gtk_widget_grab_default (button);
-
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/list_store.c

@@ -155,7 +155,7 @@ add_columns (GtkTreeView *treeview)
 }
 
 GtkWidget *
-do_list_store (void)
+do_list_store (GtkWidget *do_widget)
 {
   if (!window)
     {
@@ -167,6 +167,8 @@ do_list_store (void)
 
       /* create window, etc */
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "GtkListStore demo");
 
       g_signal_connect (window, "destroy",

demos/gtk-demo/main.c

@@ -1,9 +1,11 @@
+#include <config.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <demos.h>
 
@@ -28,6 +30,31 @@ struct _CallbackData
   GtkTreePath *path;
 };
 
+#ifdef G_OS_WIN32
+
+#undef DEMOCODEDIR
+
+static char *
+get_democodedir (void)
+{
+  static char *result = NULL;
+
+  if (result == NULL)
+    {
+      result = g_win32_get_package_installation_directory (NULL, NULL);
+      if (result == NULL)
+	result = "unknown-location";
+
+      result = g_strconcat (result, "\\share\\gtk-2.0\\demo", NULL);
+    }
+
+  return result;
+}
+
+#define DEMOCODEDIR get_democodedir ()
+
+#endif
+
 /**
  * demo_find_file:
  * @base: base filename
@@ -45,7 +72,8 @@ demo_find_file (const char *base,
 {
   g_return_val_if_fail (err == NULL || *err == NULL, NULL);
   
-  if (g_file_test (base, G_FILE_TEST_EXISTS))
+  if (g_file_test ("gtk-logo-rgb.gif", G_FILE_TEST_EXISTS) &&
+      g_file_test (base, G_FILE_TEST_EXISTS))
     return g_strdup (base);
   else
     {
@@ -96,7 +124,7 @@ read_line (FILE *stream, GString *str)
     {
       int c;
       
-#ifndef G_OS_WIN32
+#ifdef HAVE_FLOCKFILE
       c = getc_unlocked (stream);
 #else
       c = getc (stream);
@@ -359,7 +387,7 @@ parse_chars (gchar     *text,
 
 /* While not as cool as c-mode, this will do as a quick attempt at highlighting */
 static void
-fontify ()
+fontify (void)
 {
   GtkTextIter start_iter, next_iter, tmp_iter;
   gint state;
@@ -438,7 +466,7 @@ load_file (const gchar *filename)
       return;
     }
 
-  file = fopen (full_filename, "r");
+  file = g_fopen (full_filename, "r");
 
   if (!file)
     g_warning ("Cannot open %s: %s\n", full_filename, g_strerror (errno));
@@ -578,7 +606,7 @@ row_activated_cb (GtkTreeView       *tree_view,
 			  &iter,
 			  ITALIC_COLUMN, !italic,
 			  -1);
-      window = (func) ();
+      window = (func) (gtk_widget_get_toplevel (GTK_WIDGET (tree_view)));
       
       if (window != NULL)
 	{
@@ -811,8 +839,8 @@ main (int argc, char **argv)
   if (g_file_test ("../../gdk-pixbuf/libpixbufloader-pnm.la",
                    G_FILE_TEST_EXISTS))
     {
-      putenv ("GDK_PIXBUF_MODULE_FILE=../../gdk-pixbuf/gdk-pixbuf.loaders");
-      putenv ("GTK_IM_MODULE_FILE=../../modules/input/gtk.immodules");
+      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
+      g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/gtk.immodules", TRUE);
     }
   /* -- End of hack -- */
   

demos/gtk-demo/makefile.msc.in

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

demos/gtk-demo/menus.c

@@ -19,12 +19,9 @@
  * up when the menu item is selected. Typically, all menu items in a menu bar
  * have submenus.
  *
- * The GtkOptionMenu widget is a button that pops up a GtkMenu when clicked.
- * It's used inside dialogs and such.
- *
- * GtkItemFactory provides a higher-level interface for creating menu bars
+ * GtkUIManager provides a higher-level interface for creating menu bars
  * and menus; while you can construct menus manually, most people don't
- * do that. There's a separate demo for GtkItemFactory.
+ * do that. There's a separate demo for GtkUIManager.
  * 
  */
 
@@ -74,14 +71,12 @@ create_menu (gint     depth,
 }
 
 GtkWidget *
-do_menus (void)
+do_menus (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GtkWidget *box1;
   GtkWidget *box2;
   GtkWidget *button;
-  GtkWidget *optionmenu;
-  GtkWidget *separator;
   
   if (!window)
     {
@@ -91,7 +86,8 @@ do_menus (void)
       GtkAccelGroup *accel_group;
       
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
 			G_CALLBACK(gtk_widget_destroyed), &window);
       g_signal_connect (window, "delete-event",
@@ -130,62 +126,6 @@ do_menus (void)
       gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
       
-      box2 = gtk_vbox_new (FALSE, 10);
-      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
-      gtk_widget_show (box2);
-      
-      menu = create_menu (1, FALSE);
-      gtk_menu_set_accel_group (GTK_MENU (menu), accel_group);
-      
-      menuitem = gtk_separator_menu_item_new ();
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-      gtk_widget_show (menuitem);
-      
-      menuitem = gtk_check_menu_item_new_with_label ("Accelerate Me");
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-      gtk_widget_show (menuitem);
-      gtk_widget_add_accelerator (menuitem,
-				  "activate",
-				  accel_group,
-				  GDK_F1,
-				  0,
-				  GTK_ACCEL_VISIBLE);
-      menuitem = gtk_check_menu_item_new_with_label ("Accelerator Locked");
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-      gtk_widget_show (menuitem);
-      gtk_widget_add_accelerator (menuitem,
-				  "activate",
-				  accel_group,
-				  GDK_F2,
-				  0,
-				  GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED);
-      menuitem = gtk_check_menu_item_new_with_label ("Accelerators Frozen");
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-      gtk_widget_show (menuitem);
-      gtk_widget_add_accelerator (menuitem,
-				  "activate",
-				  accel_group,
-				  GDK_F2,
-				  0,
-				  GTK_ACCEL_VISIBLE);
-      gtk_widget_add_accelerator (menuitem,
-				  "activate",
-				  accel_group,
-				  GDK_F3,
-				  0,
-				  GTK_ACCEL_VISIBLE);
-      
-      optionmenu = gtk_option_menu_new ();
-      gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
-      gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), 3);
-      gtk_box_pack_start (GTK_BOX (box2), optionmenu, TRUE, TRUE, 0);
-      gtk_widget_show (optionmenu);
-
-      separator = gtk_hseparator_new ();
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
-      gtk_widget_show (separator);
-
       box2 = gtk_vbox_new (FALSE, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);

demos/gtk-demo/panes.c

@@ -112,7 +112,7 @@ create_pane_options (GtkPaned	 *paned,
 }
 
 GtkWidget *
-do_panes (void)
+do_panes (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GtkWidget *frame;
@@ -124,6 +124,8 @@ do_panes (void)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
 
       g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/pixbufs.c

@@ -12,7 +12,6 @@
  *
  */
 
-#include <config.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <math.h>
@@ -205,14 +204,15 @@ cleanup_callback (GtkObject *object,
 }
 
 GtkWidget *
-do_pixbufs (void)
+do_pixbufs (GtkWidget *do_widget)
 {
   if (!window)
     {
       GError *error;
 
-
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Pixbufs");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
@@ -264,6 +264,7 @@ do_pixbufs (void)
     {
       gtk_widget_destroy (window);
       window = NULL;
+      g_object_unref (frame);
     }
 
   return window;

demos/gtk-demo/rotated_text.c

@@ -0,0 +1,142 @@
+/* Rotated Text
+ *
+ * This demo shows how to use GDK and Pango to draw rotated and transformed
+ * text. The use of GdkPangoRenderer in this example is a somewhat advanced
+ * technique; most applications can simply use gdk_draw_layout(). We use
+ * it here mostly because that allows us to work in user coordinates - that is,
+ * coordinates prior to the application of the transformation matrix, rather
+ * than device coordinates.
+ *
+ * As of GTK+-2.6, the ability to draw transformed and anti-aliased graphics
+ * as shown in this example is only present for text. With GTK+-2.8, a new
+ * graphics system called "Cairo" will be introduced that provides these
+ * capabilities and many more for all types of graphics.
+ */
+#include <math.h>
+#include <gtk/gtk.h>
+
+static GtkWidget *window = NULL;
+
+static gboolean
+rotated_text_expose_event (GtkWidget      *widget,
+			   GdkEventExpose *event,
+			   gpointer	   data)
+{
+#define RADIUS 150
+#define N_WORDS 10
+#define FONT "Sans Bold 27"
+  
+  PangoRenderer *renderer;
+  PangoMatrix matrix = PANGO_MATRIX_INIT;
+  PangoContext *context;
+  PangoLayout *layout;
+  PangoFontDescription *desc;
+
+  int width = widget->allocation.width;
+  int height = widget->allocation.height;
+  double device_radius;
+  int i;
+
+  /* Get the default renderer for the screen, and set it up for drawing  */
+  renderer = gdk_pango_renderer_get_default (gtk_widget_get_screen (widget));
+  gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), widget->window);
+  gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), widget->style->black_gc);
+
+  /* Set up a transformation matrix so that the user space coordinates for
+   * the centered square where we draw are [-RADIUS, RADIUS], [-RADIUS, RADIUS]
+   * We first center, then change the scale */
+  device_radius = MIN (width, height) / 2.;
+  pango_matrix_translate (&matrix,
+			  device_radius + (width - 2 * device_radius) / 2,
+			  device_radius + (height - 2 * device_radius) / 2);
+  pango_matrix_scale (&matrix, device_radius / RADIUS, device_radius / RADIUS);
+
+  /* Create a PangoLayout, set the font and text */
+  context = gtk_widget_create_pango_context (widget);
+  layout = pango_layout_new (context);
+  pango_layout_set_text (layout, "Text", -1);
+  desc = pango_font_description_from_string (FONT);
+  pango_layout_set_font_description (layout, desc);
+  pango_font_description_free (desc);
+
+  /* Draw the layout N_WORDS times in a circle */
+  for (i = 0; i < N_WORDS; i++)
+    {
+      GdkColor color;
+      PangoMatrix rotated_matrix = matrix;
+      int width, height;
+      double angle = (360. * i) / N_WORDS;
+
+      /* Gradient from red at angle == 60 to blue at angle == 300 */
+      color.red   = 65535 * (1 + cos ((angle - 60) * G_PI / 180.)) / 2;
+      color.green = 0;
+      color.blue  = 65535  - color.red;
+    
+      gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
+					     PANGO_RENDER_PART_FOREGROUND, &color);
+                                             
+      pango_matrix_rotate (&rotated_matrix, angle);
+
+      pango_context_set_matrix (context, &rotated_matrix);
+    
+      /* Inform Pango to re-layout the text with the new transformation matrix */
+      pango_layout_context_changed (layout);
+    
+      pango_layout_get_size (layout, &width, &height);
+      pango_renderer_draw_layout (renderer, layout,
+				  - width / 2, - RADIUS * PANGO_SCALE);
+    }
+
+  /* Clean up default renderer, since it is shared */
+  gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
+					 PANGO_RENDER_PART_FOREGROUND, NULL);
+  gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), NULL);
+  gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), NULL);
+
+  /* free the objects we created */
+  g_object_unref (layout);
+  g_object_unref (context);
+  
+  return FALSE;
+}
+
+GtkWidget *
+do_rotated_text (GtkWidget *do_widget)
+{
+  GtkWidget *drawing_area;
+  
+  if (!window)
+    {
+      const GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
+      
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Rotated Text");
+
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
+
+      drawing_area = gtk_drawing_area_new ();
+      gtk_container_add (GTK_CONTAINER (window), drawing_area);
+
+      /* This overrides the background color from the theme */
+      gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, &white);
+
+      g_signal_connect (drawing_area, "expose-event",
+			G_CALLBACK (rotated_text_expose_event), NULL);
+
+      gtk_window_set_default_size (GTK_WINDOW (window), 2 * RADIUS, 2 * RADIUS);
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    {
+      gtk_widget_show_all (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

demos/gtk-demo/sizegroup.c

@@ -17,29 +17,22 @@
 
 static GtkWidget *window = NULL;
 
-/* Convenience function to create an option menu holding a number of strings
+/* Convenience function to create a combo box holding a number of strings
  */
 GtkWidget *
-create_option_menu (const char **strings)
+create_combo_box (const char **strings)
 {
-  GtkWidget *menu;
-  GtkWidget *option_menu;
+  GtkWidget *combo_box;
   const char **str;
 
-  menu = gtk_menu_new ();
+  combo_box = gtk_combo_box_new_text ();
   
   for (str = strings; *str; str++)
-    {
-      GtkWidget *menu_item = gtk_menu_item_new_with_label (*str);
-      gtk_widget_show (menu_item);
+    gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), *str);
 
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-    }
+  gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
 
-  option_menu = gtk_option_menu_new ();
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
-
-  return option_menu;
+  return combo_box;
 }
 
 static void
@@ -49,7 +42,7 @@ add_row (GtkTable     *table,
 	 const char   *label_text,
 	 const char  **options)
 {
-  GtkWidget *option_menu;
+  GtkWidget *combo_box;
   GtkWidget *label;
 
   label = gtk_label_new_with_mnemonic (label_text);
@@ -59,10 +52,10 @@ add_row (GtkTable     *table,
 		    GTK_EXPAND | GTK_FILL, 0,
 		    0,                     0);
   
-  option_menu = create_option_menu (options);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), option_menu);
-  gtk_size_group_add_widget (size_group, option_menu);
-  gtk_table_attach (GTK_TABLE (table), option_menu,
+  combo_box = create_combo_box (options);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo_box);
+  gtk_size_group_add_widget (size_group, combo_box);
+  gtk_table_attach (GTK_TABLE (table), combo_box,
 		    1, 2,                  row, row + 1,
 		    0,                     0,
 		    0,                     0);
@@ -87,7 +80,7 @@ toggle_grouping (GtkToggleButton *check_button,
 }
 
 GtkWidget *
-do_sizegroup (void)
+do_sizegroup (GtkWidget *do_widget)
 {
   GtkWidget *table;
   GtkWidget *frame;
@@ -110,7 +103,8 @@ do_sizegroup (void)
   if (!window)
     {
       window = gtk_dialog_new_with_buttons ("GtkSizeGroup",
-					    NULL, 0,
+					    GTK_WINDOW (do_widget),
+					    0,
 					    GTK_STOCK_CLOSE,
 					    GTK_RESPONSE_NONE,
 					    NULL);

demos/gtk-demo/stock_browser.c

@@ -400,7 +400,7 @@ label_set_func (GtkTreeViewColumn *tree_column,
 }
 
 GtkWidget *
-do_stock_browser (void)
+do_stock_browser (GtkWidget *do_widget)
 {  
   if (!window)
     {
@@ -417,6 +417,8 @@ do_stock_browser (void)
       GtkTreeViewColumn *column;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Stock Icons and Items");
       gtk_window_set_default_size (GTK_WINDOW (window), -1, 500);
 

demos/gtk-demo/textview.c

@@ -1,4 +1,4 @@
-/* Text Widget
+/* Text Widget/Multiple Views
  *
  * The GtkTextView widget displays a GtkTextBuffer. One GtkTextBuffer
  * can be displayed by multiple GtkTextViews. This demo has two views
@@ -399,21 +399,11 @@ attach_widgets (GtkTextView *text_view)
         }
       else if (i == 1)
         {
-          GtkWidget *menu_item;
-          GtkWidget *menu;
+          widget = gtk_combo_box_new_text ();
 
-          menu = gtk_menu_new ();
-          
-          widget = gtk_option_menu_new ();
-
-          menu_item = gtk_menu_item_new_with_label ("Option 1");
-          gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-          menu_item = gtk_menu_item_new_with_label ("Option 2");
-          gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-          menu_item = gtk_menu_item_new_with_label ("Option 3");
-          gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-
-          gtk_option_menu_set_menu (GTK_OPTION_MENU (widget), menu);
+          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 1");
+          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 2");
+          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 3");
         }
       else if (i == 2)
         {
@@ -448,7 +438,7 @@ attach_widgets (GtkTextView *text_view)
 }
 
 GtkWidget *
-do_textview (void)
+do_textview (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
 
@@ -461,6 +451,8 @@ do_textview (void)
       GtkTextBuffer *buffer;
       
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window),
 				   450, 450);
       

demos/gtk-demo/tree_store.c

@@ -385,7 +385,7 @@ add_columns (GtkTreeView *treeview)
 }
 
 GtkWidget *
-do_tree_store (void)
+do_tree_store (GtkWidget *do_widget)
 {
   if (!window)
     {
@@ -396,6 +396,8 @@ do_tree_store (void)
 
       /* create window, etc */
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet");
       g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/ui_manager.c

@@ -0,0 +1,234 @@
+/* UI Manager
+ *
+ * The GtkUIManager object allows the easy creation of menus
+ * from an array of actions and a description of the menu hierarchy.
+ */
+
+#include <gtk/gtk.h>
+
+static void
+activate_action (GtkAction *action)
+{
+  g_message ("Action \"%s\" activated", gtk_action_get_name (action));
+}
+
+static void
+activate_radio_action (GtkAction *action, GtkRadioAction *current)
+{
+  g_message ("Radio action \"%s\" selected", 
+	     gtk_action_get_name (GTK_ACTION (current)));
+}
+
+static GtkActionEntry entries[] = {
+  { "FileMenu", NULL, "_File" },               /* name, stock id, label */
+  { "PreferencesMenu", NULL, "_Preferences" }, /* name, stock id, label */
+  { "ColorMenu", NULL, "_Color"  },            /* name, stock id, label */
+  { "ShapeMenu", NULL, "_Shape" },             /* name, stock id, label */
+  { "HelpMenu", NULL, "_Help" },               /* name, stock id, label */
+  { "New", GTK_STOCK_NEW,                      /* name, stock id */
+    "_New", "<control>N",                      /* label, accelerator */
+    "Create a new file",                       /* tooltip */ 
+    G_CALLBACK (activate_action) },      
+  { "Open", GTK_STOCK_OPEN,                    /* name, stock id */
+    "_Open","<control>O",                      /* label, accelerator */     
+    "Open a file",                             /* tooltip */
+    G_CALLBACK (activate_action) }, 
+  { "Save", GTK_STOCK_SAVE,                    /* name, stock id */
+    "_Save","<control>S",                      /* label, accelerator */     
+    "Save current file",                       /* tooltip */
+    G_CALLBACK (activate_action) },
+  { "SaveAs", GTK_STOCK_SAVE,                  /* name, stock id */
+    "Save _As...", NULL,                       /* label, accelerator */     
+    "Save to a file",                          /* tooltip */
+    G_CALLBACK (activate_action) },
+  { "Quit", GTK_STOCK_QUIT,                    /* name, stock id */
+    "_Quit", "<control>Q",                     /* label, accelerator */     
+    "Quit",                                    /* tooltip */
+    G_CALLBACK (activate_action) },
+  { "About", NULL,                             /* name, stock id */
+    "_About", "<control>A",                    /* label, accelerator */     
+    "About",                                   /* tooltip */  
+    G_CALLBACK (activate_action) },
+  { "Logo", "demo-gtk-logo",                   /* name, stock id */
+     NULL, NULL,                               /* label, accelerator */     
+    "GTK+",                                    /* tooltip */
+    G_CALLBACK (activate_action) },
+};
+static guint n_entries = G_N_ELEMENTS (entries);
+
+
+static GtkToggleActionEntry toggle_entries[] = {
+  { "Bold", GTK_STOCK_BOLD,                    /* name, stock id */
+     "_Bold", "<control>B",                    /* label, accelerator */     
+    "Bold",                                    /* tooltip */
+    G_CALLBACK (activate_action), 
+    TRUE },                                    /* is_active */
+};
+static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);
+
+enum {
+  COLOR_RED,
+  COLOR_GREEN,
+  COLOR_BLUE
+};
+
+static GtkRadioActionEntry color_entries[] = {
+  { "Red", NULL,                               /* name, stock id */
+    "_Red", "<control>R",                      /* label, accelerator */     
+    "Blood", COLOR_RED },                      /* tooltip, value */
+  { "Green", NULL,                             /* name, stock id */
+    "_Green", "<control>G",                    /* label, accelerator */     
+    "Grass", COLOR_GREEN },                    /* tooltip, value */
+  { "Blue", NULL,                              /* name, stock id */
+    "_Blue", "<control>B",                     /* label, accelerator */     
+    "Sky", COLOR_BLUE },                       /* tooltip, value */
+};
+static guint n_color_entries = G_N_ELEMENTS (color_entries);
+
+enum {
+  SHAPE_SQUARE,
+  SHAPE_RECTANGLE,
+  SHAPE_OVAL
+};
+
+static GtkRadioActionEntry shape_entries[] = {
+  { "Square", NULL,                            /* name, stock id */
+    "_Square", "<control>S",                   /* label, accelerator */     
+    "Square",  SHAPE_SQUARE },                 /* tooltip, value */
+  { "Rectangle", NULL,                         /* name, stock id */
+    "_Rectangle", "<control>R",                /* label, accelerator */     
+    "Rectangle", SHAPE_RECTANGLE },            /* tooltip, value */
+  { "Oval", NULL,                              /* name, stock id */
+    "_Oval", "<control>O",                     /* label, accelerator */     
+    "Egg", SHAPE_OVAL },                       /* tooltip, value */  
+};
+static guint n_shape_entries = G_N_ELEMENTS (shape_entries);
+
+static const gchar *ui_info = 
+"<ui>"
+"  <menubar name='MenuBar'>"
+"    <menu action='FileMenu'>"
+"      <menuitem action='New'/>"
+"      <menuitem action='Open'/>"
+"      <menuitem action='Save'/>"
+"      <menuitem action='SaveAs'/>"
+"      <separator/>"
+"      <menuitem action='Quit'/>"
+"    </menu>"
+"    <menu action='PreferencesMenu'>"
+"      <menu action='ColorMenu'>"
+"	<menuitem action='Red'/>"
+"	<menuitem action='Green'/>"
+"	<menuitem action='Blue'/>"
+"      </menu>"
+"      <menu action='ShapeMenu'>"
+"        <menuitem action='Square'/>"
+"        <menuitem action='Rectangle'/>"
+"        <menuitem action='Oval'/>"
+"      </menu>"
+"      <menuitem action='Bold'/>"
+"    </menu>"
+"    <menu action='HelpMenu'>"
+"      <menuitem action='About'/>"
+"    </menu>"
+"  </menubar>"
+"  <toolbar  name='ToolBar'>"
+"    <toolitem action='Open'/>"
+"    <toolitem action='Quit'/>"
+"    <separator action='Sep1'/>"
+"    <toolitem action='Logo'/>"
+"  </toolbar>"
+"</ui>";
+
+GtkWidget *
+do_ui_manager (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  
+  if (!window)
+    {
+      GtkWidget *box1;
+      GtkWidget *box2;
+      GtkWidget *separator;
+      GtkWidget *label;
+      GtkWidget *button;
+      GtkUIManager *ui;
+      GtkActionGroup *actions;
+      GError *error = NULL;
+
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
+      
+      g_signal_connect (window, "destroy",
+			G_CALLBACK (gtk_widget_destroyed), &window);
+      g_signal_connect (window, "delete-event",
+			G_CALLBACK (gtk_true), NULL);
+
+      actions = gtk_action_group_new ("Actions");
+      gtk_action_group_add_actions (actions, entries, n_entries, NULL);
+      gtk_action_group_add_toggle_actions (actions, 
+					   toggle_entries, n_toggle_entries, 
+					   NULL);
+      gtk_action_group_add_radio_actions (actions, 
+					  color_entries, n_color_entries, 
+					  COLOR_RED,
+					  G_CALLBACK (activate_radio_action), 
+					  NULL);
+      gtk_action_group_add_radio_actions (actions, 
+					  shape_entries, n_shape_entries, 
+					  SHAPE_OVAL,
+					  G_CALLBACK (activate_radio_action), 
+					  NULL);
+
+      ui = gtk_ui_manager_new ();
+      gtk_ui_manager_insert_action_group (ui, actions, 0);
+      gtk_window_add_accel_group (GTK_WINDOW (window), 
+				  gtk_ui_manager_get_accel_group (ui));
+      gtk_window_set_title (GTK_WINDOW (window), "UI Manager");
+      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
+      
+      if (!gtk_ui_manager_add_ui_from_string (ui, ui_info, -1, &error))
+	{
+	  g_message ("building menus failed: %s", error->message);
+	  g_error_free (error);
+	}
+
+      box1 = gtk_vbox_new (FALSE, 0);
+      gtk_container_add (GTK_CONTAINER (window), box1);
+      
+      gtk_box_pack_start (GTK_BOX (box1),
+			  gtk_ui_manager_get_widget (ui, "/MenuBar"),
+			  FALSE, FALSE, 0);
+
+      label = gtk_label_new ("Type\n<alt>\nto start");
+      gtk_widget_set_size_request (label, 200, 200);
+      gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
+      gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);
+
+
+      separator = gtk_hseparator_new ();
+      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+
+
+      box2 = gtk_vbox_new (FALSE, 10);
+      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
+      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
+
+      button = gtk_button_new_with_label ("close");
+      g_signal_connect_swapped (button, "clicked",
+				G_CALLBACK (gtk_widget_destroy), window);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+      gtk_widget_grab_default (button);
+
+      gtk_widget_show_all (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

demos/pixbuf-init.c

@@ -1,3 +1,4 @@
+#include <config.h>
 #include <glib.h>
 
 #include <sys/stat.h>
@@ -15,5 +16,5 @@ void
 pixbuf_init (void)
 {
   if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
-    putenv ("GDK_PIXBUF_MODULE_FILE=../gdk-pixbuf/gdk-pixbuf.loaders");
+    g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
 }

demos/testgtk/main.c

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

demos/testpixbuf-save.c

@@ -67,18 +67,96 @@ compare_pixbufs (GdkPixbuf *pixbuf, GdkPixbuf *compare, const gchar *file_type)
         }
 }
 
+static gboolean
+save_to_loader (const gchar *buf, gsize count, GError **err, gpointer data)
+{
+        GdkPixbufLoader *loader = data;
+
+        return gdk_pixbuf_loader_write (loader, buf, count, err);
+}
+
+static GdkPixbuf *
+buffer_to_pixbuf (const gchar *buf, gsize count, GError **err)
+{
+        GdkPixbufLoader *loader;
+        GdkPixbuf *pixbuf;
+
+        loader = gdk_pixbuf_loader_new ();
+        if (gdk_pixbuf_loader_write (loader, buf, count, err) && 
+            gdk_pixbuf_loader_close (loader, err)) {
+                pixbuf = g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader));
+                g_object_unref (loader);
+                return pixbuf;
+        } else {
+                return NULL;
+        }
+}
+
+static void
+do_compare (GdkPixbuf *pixbuf, GdkPixbuf *compare, GError *err)
+{
+        if (compare == NULL) {
+                fprintf (stderr, "%s", err->message);
+                g_error_free (err);
+        } else {
+                compare_pixbufs (pixbuf, compare, "jpeg");
+                g_object_unref (compare);
+        }
+}
+
 static void
 keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
 {
         GdkPixbuf *pixbuf;
         GtkDrawingArea *da = (GtkDrawingArea*)data;
         GError *err = NULL;
-        
+        gchar *buffer;
+        gsize count;
+        GdkPixbufLoader *loader;
+
         pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (da), "pixbuf");
 
         if (evt->keyval == 'q')
                 gtk_main_quit ();
-        if (evt->keyval == 's') {
+
+        if (evt->keyval == 's' && (evt->state & GDK_CONTROL_MASK)) {
+                /* save to callback */
+                if (pixbuf == NULL) {
+                        fprintf (stderr, "PIXBUF NULL\n");
+                        return;
+                }	
+
+                loader = gdk_pixbuf_loader_new ();
+                if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "jpeg",
+                                                  &err,
+                                                  "quality", "100",
+                                                  NULL) ||
+                    !gdk_pixbuf_loader_close (loader, &err)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                } else {
+                        do_compare (pixbuf,
+                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
+                                    err);
+                        g_object_unref (loader);
+                }
+        }
+        else if (evt->keyval == 'S') {
+                /* save to buffer */
+                if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "jpeg",
+                                                &err,
+                                                "quality", "100",
+                                                NULL)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                } else {
+                        do_compare (pixbuf,
+                                    buffer_to_pixbuf (buffer, count, &err),
+                                    err);
+                }
+        }
+        else if (evt->keyval == 's') {
+                /* save normally */
                 if (pixbuf == NULL) {
                         fprintf (stderr, "PIXBUF NULL\n");
                         return;
@@ -91,20 +169,49 @@ keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
                         fprintf (stderr, "%s", err->message);
                         g_error_free (err);
                 } else {
-                        GdkPixbuf *compare;
-
-                        compare = gdk_pixbuf_new_from_file ("foo.jpg", &err);
-
-                        if (!compare) {
-                                fprintf (stderr, "%s", err->message);
-                                g_error_free (err);
-                        } else {
-                                compare_pixbufs (pixbuf, compare, "jpeg");
-                                g_object_unref (compare);
-                        }
-                                        
+                        do_compare (pixbuf,
+                                    gdk_pixbuf_new_from_file ("foo.jpg", &err),
+                                    err);
                 }
-        } else if (evt->keyval == 'p') {
+        }
+
+        if (evt->keyval == 'p' && (evt->state & GDK_CONTROL_MASK)) {
+                /* save to callback */
+                if (pixbuf == NULL) {
+                        fprintf (stderr, "PIXBUF NULL\n");
+                        return;
+                }
+
+                loader = gdk_pixbuf_loader_new ();
+                if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "png",
+                                                  &err,
+                                                  "tEXt::Software", "testpixbuf-save",
+                                                  NULL)
+                    || !gdk_pixbuf_loader_close (loader, &err)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                } else {
+                        do_compare (pixbuf,
+                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
+                                    err);
+                        g_object_unref (loader);
+                }
+        }
+        else if (evt->keyval == 'P') {
+                /* save to buffer */
+                if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "png",
+                                                &err,
+                                                "tEXt::Software", "testpixbuf-save",
+                                                NULL)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                } else {
+                        do_compare (pixbuf,
+                                    buffer_to_pixbuf (buffer, count, &err),
+                                    err);
+                }
+        }
+        else if (evt->keyval == 'p') {
                 if (pixbuf == NULL) {
                         fprintf (stderr, "PIXBUF NULL\n");
                         return;
@@ -117,20 +224,65 @@ keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
                         fprintf (stderr, "%s", err->message);
                         g_error_free (err);
                 } else {
-                        GdkPixbuf *compare;
-
-                        compare = gdk_pixbuf_new_from_file ("foo.png", &err);
-
-                        if (!compare) {
-                                fprintf (stderr, "%s", err->message);
-                                g_error_free (err);
-                        } else {
-                                compare_pixbufs (pixbuf, compare, "png");
-                                g_object_unref (compare);
-                        }
-                                        
+                        do_compare(pixbuf,
+                                   gdk_pixbuf_new_from_file ("foo.png", &err),
+                                   err);
                 }
-        } else if (evt->keyval == 'a') {
+        }
+
+        if (evt->keyval == 'i' && (evt->state & GDK_CONTROL_MASK)) {
+                /* save to callback */
+                if (pixbuf == NULL) {
+                        fprintf (stderr, "PIXBUF NULL\n");
+                        return;
+                }
+
+                loader = gdk_pixbuf_loader_new ();
+                if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "ico",
+                                                  &err,
+                                                  NULL)
+                    || !gdk_pixbuf_loader_close (loader, &err)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                } else {
+                        do_compare (pixbuf,
+                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
+                                    err);
+                        g_object_unref (loader);
+                }
+        }
+        else if (evt->keyval == 'I') {
+                /* save to buffer */
+                if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "ico",
+                                                &err,
+                                                NULL)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                } else {
+                        do_compare (pixbuf,
+                                    buffer_to_pixbuf (buffer, count, &err),
+                                    err);
+                }
+        }
+        else if (evt->keyval == 'i') {
+                if (pixbuf == NULL) {
+                        fprintf (stderr, "PIXBUF NULL\n");
+                        return;
+                }
+
+                if (!gdk_pixbuf_save (pixbuf, "foo.ico", "ico", 
+                                      &err,
+                                      NULL)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                } else {
+                        do_compare(pixbuf,
+                                   gdk_pixbuf_new_from_file ("foo.ico", &err),
+                                   err);
+                }
+        }
+
+        if (evt->keyval == 'a') {
                 if (pixbuf == NULL) {
                         fprintf (stderr, "PIXBUF NULL\n");
                         return;

demos/testpixbuf-scale.c

@@ -1,3 +1,4 @@
+#include <config.h>
 #include <gtk/gtk.h>
 
 #include <stdio.h>
@@ -11,7 +12,12 @@ GtkWidget *darea;
 void
 set_interp_type (GtkWidget *widget, gpointer data)
 {
-  interp_type = GPOINTER_TO_UINT (data);
+  guint types[] = { GDK_INTERP_NEAREST,
+                    GDK_INTERP_BILINEAR,
+                    GDK_INTERP_TILES,
+                    GDK_INTERP_HYPER };
+
+  interp_type = types[gtk_combo_box_get_active (GTK_COMBO_BOX (widget))];
   gtk_widget_queue_draw (darea);
 }
 
@@ -58,7 +64,7 @@ int
 main(int argc, char **argv)
 {
 	GtkWidget *window, *vbox;
-	GtkWidget *menuitem, *optionmenu, *menu;
+        GtkWidget *combo_box;
 	GtkWidget *alignment;
 	GtkWidget *hbox, *label, *hscale;
 	GtkAdjustment *adjustment;
@@ -95,37 +101,18 @@ main(int argc, char **argv)
 	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");
-	g_signal_connect (menuitem, "activate",
-			  G_CALLBACK (set_interp_type),
-			  GUINT_TO_POINTER (GDK_INTERP_NEAREST));
-	gtk_widget_show (menuitem);
-	gtk_container_add (GTK_CONTAINER (menu), menuitem);
-	
-	menuitem = gtk_menu_item_new_with_label ("BILINEAR");
-	g_signal_connect (menuitem, "activate",
-			  G_CALLBACK (set_interp_type),
-			  GUINT_TO_POINTER (GDK_INTERP_BILINEAR));
-	gtk_widget_show (menuitem);
-	gtk_container_add (GTK_CONTAINER (menu), menuitem);
-	
-	menuitem = gtk_menu_item_new_with_label ("TILES");
-	g_signal_connect (menuitem, "activate",
-			  G_CALLBACK (set_interp_type),
-			  GUINT_TO_POINTER (GDK_INTERP_TILES));
-	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+        combo_box = gtk_combo_box_new_text ();
 
-	menuitem = gtk_menu_item_new_with_label ("HYPER");
-	g_signal_connect (menuitem, "activate",
-			  G_CALLBACK (set_interp_type),
-			  GUINT_TO_POINTER (GDK_INTERP_HYPER));
-	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "NEAREST");
+        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "BILINEAR");
+        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "TILES");
+        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "HYPER");
 
-	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);
+        gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 1);
+
+        g_signal_connect (combo_box, "changed",
+                          G_CALLBACK (set_interp_type),
+                          NULL);
 	
 	alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
@@ -144,7 +131,7 @@ main(int argc, char **argv)
 	gtk_scale_set_digits (GTK_SCALE (hscale), 0);
 	gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE, TRUE, 0);
 
-	gtk_container_add (GTK_CONTAINER (alignment), optionmenu);
+	gtk_container_add (GTK_CONTAINER (alignment), combo_box);
 	gtk_widget_show_all (vbox);
 
 	/* Compute the size without the drawing area, so we know how big to make the default size */

demos/testpixbuf.c

@@ -427,7 +427,7 @@ new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)
 
 	gtk_widget_show (window);
 
-        return window;
+        return drawing_area;
 }
 
 
@@ -439,7 +439,8 @@ update_timeout (gpointer data)
         GError *error;
         
 	done = FALSE;
-        error = FALSE;
+        error = NULL;
+
 	if (!feof (status->imagefile)) {
 		gint nbytes;
                 
@@ -447,7 +448,6 @@ update_timeout (gpointer data)
 			       status->imagefile);
 
 
-                error = NULL;
                 if (!gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes, &error)) {
                         g_warning ("Error writing to loader: %s",
                                    error->message);
@@ -458,7 +458,7 @@ update_timeout (gpointer data)
                         
         } 
 	else 
-	  done = TRUE;
+                done = TRUE;
 	  
 	if (done) {
                 /* ignoring errors, we should not do that. */
@@ -508,7 +508,7 @@ extern void pixbuf_init ();
 
 void size_func (GdkPixbufLoader *loader, gint width, gint height, gpointer data)
 {
-  gdk_pixbuf_loader_set_size (loader, width*2, height*2);
+        gdk_pixbuf_loader_set_size (loader, width*2, height*2);
 }
 
 
@@ -525,7 +525,7 @@ main (int argc, char **argv)
 
 	gtk_init (&argc, &argv);
 
-	gdk_rgb_set_verbose (TRUE);
+	/*	gdk_rgb_set_verbose (TRUE); */
 
 	gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
 
@@ -611,8 +611,10 @@ main (int argc, char **argv)
 
 			status.buf = g_malloc (readlen);
 
+#if 0
 			g_signal_connect (pixbuf_loader, "size_prepared", 
 					  G_CALLBACK (size_func), NULL);
+#endif
 
                         g_signal_connect (pixbuf_loader, "area_prepared",
 					  G_CALLBACK (progressive_prepared_callback),

docs/Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = tutorial faq reference
+SUBDIRS = tutorial faq reference tools
 
 EXTRA_DIST = \
 	defsformat.txt			\

docs/RELEASE-HOWTO

@@ -4,8 +4,8 @@ How to do a GTK+ release?
 Make sure you have Owen's special autoconf and libtool RPMs, available at:
 http://people.redhat.com/otaylor/gtk/autotools/.
 
-Also make sure you have the following packages installed (I used the RPM
-package names from RedHat 8.0):
+Also make sure you have the following packages installed with all their
+dependencies (I used the RPM package names from RedHat 9):
 * gtk-doc
 * linuxdoc-tools
 * docbook-utils
@@ -15,23 +15,31 @@ Without those packages make distcheck will *not* pass.
 
 0) Blow away your gtk+ directory, check a new version out
 1) autogen and build it, make sure to enable docs.
-2) Update NEWS based on ChangeLog
-3) Update version in configure.in, increase MICRO, interface and binary
-age by 1. (Note that this is critical, a slip-up here will cause the soname
+2) Update NEWS based on the various ChangeLog files
+3) Verify that the version in configure.in has been bumped after the last
+release. (Note that this is critical, a slip-up here will cause the soname 
 to change).
-4) Add === Released 2.0.x === at the top of the ChangeLog
-5) make mydistcheck
-6) Fix broken stuff found by 4) repeat
-7) cvs commit; you'll have a bunch of po file changes, and maybe some
+4) Make sure that make check is happy (If you don't do it here, make distcheck
+will also catch it, but it is kind of disheartening to see make distcheck fail
+due to an extraneous symbol after watching it build the docs for an hour...)
+5) Add === Released 2.x.y === at the top of all ChangeLog files
+6) make distcheck
+7) Fix broken stuff found by 5) repeat
+8) cvs commit; you'll have a bunch of po file changes, and maybe some
 doc changes too (NOTE: be sure to use cvs with compression, else you'll
 end up waiting for a long time :).
-8) If 7) fails because someone else committed inbetween, curse, cvs up
+9) If 7) fails because someone else committed inbetween, curse, cvs up,
 fix conflicts and go to 5)
-9) type 'cvs tag GTK_2_0_9' in the toplevel directory
-10) You now have the tarball, and the CVS tag, now upload the tarball to
+10) type 'cvs tag GTK_2_x_y' in the toplevel directory
+11) You now have the tarball, and the CVS tag, now upload the tarball to
 gnome.org and gtk.org
-11) Go to the gnome-announce list archives, find the last announce message,
+12) Go to the gnome-announce list archives, find the last announce message,
 create a new message in the same form, replacing version numbers, commentary
 at the top about "what this release is about" and the Summary of changes.
-12) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
+13) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
 gtk-devel-list. Set reply-to to gnome-hackers.
+14) Bump the version number in configure.in. 
+15) Create a new milestone in bugzilla and move the remaining bugs from the
+2.x.y milestone over to the new one.
+16) Add a link to the release announcement to www.gtk.org which lives in
+the gtk-web cvs module.

docs/faq/Makefile.am

@@ -2,14 +2,18 @@ EXTRA_DIST = 			\
 	gtk-faq.sgml
 
 if HAVE_DOCBOOK
-html: 
-	(cd $(srcdir); \
-	 db2html gtk-faq.sgml; \
-	 test -d html && rm -r html; \
-	 mv gtk-faq html)
+html:
+	if test -w $(srcdir); then \
+	  (cd $(srcdir); \
+	   db2html gtk-faq.sgml; \
+	   test -d html && rm -r html; \
+	   mv gtk-faq html); \
+	fi
 
 pdf:
-	(cd $(srcdir); db2pdf gtk-faq.sgml)
+	if test -w $(srcdir); then \
+	  (cd $(srcdir); db2pdf gtk-faq.sgml); \
+	fi
 
 dist-hook: html
 	cp -Rp $(srcdir)/html $(distdir)
@@ -26,7 +30,7 @@ pdf:
 
 dist-hook:
 	echo "***"
-	echo "*** Warning: Tutorial not built"
+	echo "*** Warning: FAQ not built"
 	echo "*** DISTRIBUTION IS INCOMPLETE"
 	echo "***"
 endif

docs/reference/gdk-pixbuf/.cvsignore

@@ -9,6 +9,7 @@ gdk-pixbuf.hierarchy
 gdk-pixbuf.interfaces
 gdk-pixbuf.prerequisites
 gdk-pixbuf.signals
+deprecated
 html
 xml
 *.stamp

docs/reference/gdk-pixbuf/Makefile.am

@@ -1,22 +1,18 @@
 ## Process this file with automake to produce Makefile.in
 
+AUTOMAKE_OPTIONS = 1.6
+
 # The name of the module.
 DOC_MODULE=gdk-pixbuf
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gdk-pixbuf.sgml
 
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../gdk-pixbuf
-
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS=--source-dir=../../../contrib/gdk-pixbuf-xlib --deprecated-guards="GDK_PIXBUF_ENABLE_BROKEN|GDK_PIXBUF_DISABLE_DEPRECATED"
 
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml
-
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=
+# The directory containing the source code. Relative to $(srcdir)
+DOC_SOURCE_DIR=../../../gdk-pixbuf
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.h $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.h
@@ -25,6 +21,7 @@ CFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.c $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.
 # Header files to ignore when scanning
 IGNORE_HFILES=				\
 	pixops				\
+	gdk-pixbuf-alias.h		\
 	gdk-pixbuf-marshal.h		\
 	gdk-pixbuf-xlib-private.h 	\
 	gdk-pixbuf-i18n.h 		\
@@ -33,11 +30,22 @@ IGNORE_HFILES=				\
 	io-ani-animation.h		\
 	test-images.h
 
-# Extra files to add when scanning
-EXTRA_HFILES=
+INCLUDES = 			\
+	-I$(top_srcdir) 	\
+	-I$(top_builddir) 	\
+	-I$(top_builddir)/gdk	\
+	$(GTK_DEBUG_FLAGS)	\
+	$(GTK_DEP_CFLAGS)
 
-# Images to copy into HTML directory
-HTML_IMAGES = 
+GTKDOC_LIBS = \
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+	$(top_builddir)/gdk/$(gdktargetlib)        			\
+	$(top_builddir)/gtk/$(gtktargetlib) 				\
+	$(GTK_DEP_LIBS)
+
+
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml
 
 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files =				\
@@ -45,160 +53,41 @@ content_files =				\
 	gdk-pixbuf-from-drawables.sgml	\
 	gdk-pixbuf-rendering.sgml	\
 	gdk-pixbuf.sgml			\
-	porting-from-imlib.sgml
+	porting-from-imlib.sgml		\
+	gdk-pixbuf-csource.xml		\
+	gdk-pixbuf-query-loaders.xml
+
+# Images to copy into HTML directory
+HTML_IMAGES = composite.png
+
+# Extra options to supply to gtkdoc-fixref
+FIXXREF_OPTIONS=
+
+include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
-extra_files = version.xml.in
+EXTRA_DIST += version.xml.in \
+	composite.png \
+	composite.dia \
+	apple-red-1a.png \
+	apple-red-2c.png \
+	gnome-gmush-1.png
 
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-GTKDOC_CFLAGS = @STRIP_BEGIN@ 				\
-	@CFLAGS@					\
-	-I$(top_srcdir) 				\
-	-I$(top_builddir) 				\
-	-I$(top_builddir)/gdk				\
-	@GTK_DEBUG_FLAGS@				\
-	@GTK_DEP_CFLAGS@				\
-@STRIP_END@
+########################################################################
 
-GTKDOC_LIBS = @STRIP_BEGIN@ 						\
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/@gdktargetlib@        			\
-	$(top_builddir)/gtk/@gtktargetlib@ 				\
-	@GTK_DEP_LIBS@							\
-@STRIP_END@
+man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 
 
-GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
-GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
+if ENABLE_MAN
 
+%.1 : %.xml 
+	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-####################################
-# Everything below here is generic #
-####################################
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-EXTRA_DIST = 				\
-	$(content_files)		\
-	$(extra_files)			\
-	$(HTML_IMAGES)			\
-	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE).types		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
-
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES = 		 \
-	$(DOC_MODULE).args 	 \
-	$(DOC_MODULE).hierarchy  \
-	$(DOC_MODULE).interfaces \
-	$(DOC_MODULE).prerequisites \
-	$(DOC_MODULE).signals
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
-
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB)
-	@echo '*** Scanning header files ***'
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-	else \
-	    cd $(srcdir) ; \
-	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
-	    done \
-	fi
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
-	@true
-
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '*** Rebuilding template files ***'
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-	touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-#### sgml ####
-
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
-	@echo '*** Building SGML ***'
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
-	touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-	@true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '*** Building HTML ***'
-	rm -rf $(srcdir)/html 
-	mkdir $(srcdir)/html
-	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo '-- Fixing Crossreferences' 
-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	touch html-build.stamp
 endif
 
-##############
+BUILT_EXTRA_DIST = $(man_MANS)
 
-clean-local:
-	rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	(installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-	fi)
-
-#
-# Require gtk-doc when making dist
-#
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
-else
-dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-	@false
-endif
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
-	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
-	-cp $(srcdir)/html/* $(distdir)/html
-
-.PHONY : dist-hook-local
+dist-hook-local: $(BUILT_EXTRA_DIST)
+	files='$(BUILT_EXTRA_DIST)';				\
+	for f in $$files; do					\
+	  if test -f $$f; then d=.; else d=$(srcdir); fi;	\
+	  cp $$d/$$f $(distdir) || exit 1; done

docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1

@@ -0,0 +1,118 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Ip \" List item
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.TH "GDK-PIXBUF-CSOURCE" 1 "" "" ""
+.SH NAME
+gdk-pixbuf-csource \- C code generation utility for GdkPixbuf images
+.SH "SYNOPSIS"
+.ad l
+.hy 0
+.HP 19
+\fBgdk\-pixbuf\-csource\fR [options] [image]
+.ad
+.hy
+.ad l
+.hy 0
+.HP 19
+\fBgdk\-pixbuf\-csource\fR [options] \-\-build\-list [[name]\ [image]...]
+.ad
+.hy
+
+.SH "DESCRIPTION"
+
+.PP
+ \fBgdk\-pixbuf\-csource\fR is a small utility that generates C code containing images, useful for compiling images directly into programs\&.
+
+.SH "INVOCATION"
+
+.PP
+ \fBgdk\-pixbuf\-csource\fR either takes as input one image file name to generate code for, or, using the \fB\-\-build\-list\fR option, a list of (\fIname\fR, \fIimage\fR) pairs to generate code for a list of images into named variables\&.
+
+.SS "Options"
+
+.TP
+\fB\-\-stream\fR
+Generate pixbuf data stream (a single string containing a serialized GdkPixdata structure in network byte order)\&.
+
+.TP
+\fB\-\-struct\fR
+Generate GdkPixdata structure (needs the GdkPixdata structure definition from \fIgdk\-pixdata\&.h\fR)\&.
+
+.TP
+\fB\-\-macros\fR
+Generate *_ROWSTRIDE, *_WIDTH, *_HEIGHT, *_BYTES_PER_PIXEL and *_RLE_PIXEL_DATA or *_PIXEL_DATA macro definitions for the image\&.
+
+.TP
+\fB\-\-rle\fR
+Enables run\-length encoding for the generated pixel data (default)\&.
+
+.TP
+\fB\-\-raw\fR
+Disables run\-length encoding for the generated pixel data\&.
+
+.TP
+\fB\-\-extern\fR
+Generate extern symbols\&.
+
+.TP
+\fB\-\-static\fR
+Generate static symbols (default)\&.
+
+.TP
+\fB\-\-decoder\fR
+Provide a *_RUN_LENGTH_DECODE(image_buf, rle_data, size, bpp) macro definition to decode run\-length encoded image data\&.
+
+.TP
+\fB\-\-name=identifier\fR
+Specifies the identifier name (prefix) for the generated variables or macros (useful only if \fB\-\-build\-list\fR was not specified)\&.
+
+.TP
+\fB\-\-build\-list\fR
+Enables (\fIname\fR, \fIimage\fR) pair parsing mode\&.
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print brief help and exit\&.
+
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Print version and exit\&.
+
+.TP
+\fB\-\-g\-fatal\-warnings\fR
+Make warnings fatal (causes the program to abort)\&.
+
+.SH "SEE ALSO"
+
+.PP
+The GdkPixbuf documentation, shipped with the Gtk+ distribution, available from www\&.gtk\&.org: \fIhttp://www.gtk.org\fR\&.
+
+.SH "BUGS"
+
+.PP
+The runlength encoder gets out of sync with the pixel boundaries, since it includes the rowstride padding in the encoded stream\&. Furthermore, it generates pixbufs with suboptimal rowstride in some cases\&.
+
+.SH "AUTHOR"
+
+.PP
+ \fBgdk\-pixbuf\-csource\fR was written by Tim Janik <timj@gtk\&.org>\&.
+
+.PP
+This manual page was provided by Tim Janik <timj@gtk\&.org>\&.
+

docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml

@@ -0,0 +1,173 @@
+<refentry id="gdk-pixbuf-csource">
+
+<refmeta>
+<refentrytitle>gdk-pixbuf-csource</refentrytitle>
+<manvolnum>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+<refname>gdk-pixbuf-csource</refname>
+<refpurpose>C code generation utility for GdkPixbuf images</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gdk-pixbuf-csource</command>
+<arg choice="opt">options</arg>
+<arg choice="opt">image</arg>
+</cmdsynopsis>
+<cmdsynopsis>
+<command>gdk-pixbuf-csource</command>
+<arg choice="opt">options</arg>
+<arg choice="plain">--build-list</arg>
+<arg rep="repeat">
+  <arg>name</arg>
+  <arg>image</arg>
+</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gdk-pixbuf-csource</command> is a small utility that generates C code
+containing images, useful for compiling images directly into programs.
+</para>
+</refsect1>
+
+<refsect1><title>Invocation</title>
+<para>
+<command>gdk-pixbuf-csource</command> either takes as input one image file name
+to generate code for, or, using the <option>--build-list</option> option, a 
+list of (<replaceable>name</replaceable>, <replaceable>image</replaceable>)
+pairs to generate code for a list of images into named variables.
+</para>
+<refsect2><title>Options</title>
+<variablelist>
+
+<varlistentry>
+<term><option>--stream</option></term>
+<listitem><para>
+Generate pixbuf data stream (a single string containing a serialized
+<structname>GdkPixdata</structname> structure in network byte order).
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--struct</option></term>
+<listitem><para>
+Generate GdkPixdata structure (needs the <structname>GdkPixdata</structname>
+structure definition from <filename>gdk-pixdata.h</filename>).
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--macros</option></term>
+<listitem><para>
+Generate *_ROWSTRIDE, *_WIDTH, *_HEIGHT, *_BYTES_PER_PIXEL and
+*_RLE_PIXEL_DATA or *_PIXEL_DATA macro definitions for the image.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--rle</option></term>
+<listitem><para>
+Enables run-length encoding for the generated pixel data (default).
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--raw</option></term>
+<listitem><para>
+Disables run-length encoding for the generated pixel data.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--extern</option></term>
+<listitem><para>
+Generate extern symbols.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--static</option></term>
+<listitem><para>
+Generate static symbols (default).
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--decoder</option></term>
+<listitem><para>
+Provide a *_RUN_LENGTH_DECODE(image_buf, rle_data, size, bpp) macro definition
+to decode run-length encoded image data.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--name=identifier</option></term>
+<listitem><para>
+Specifies the identifier name (prefix) for the generated variables or
+macros (useful only if <option>--build-list</option> was not specified).
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--build-list</option></term>
+<listitem><para>
+Enables (<replaceable>name</replaceable>, <replaceable>image</replaceable>)
+pair parsing mode.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>-h</option>, <option>--help</option></term>
+<listitem><para>
+Print brief help and exit.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>-v</option>, <option>--version</option></term>
+<listitem><para>
+Print version and exit.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--g-fatal-warnings</option></term>
+<listitem><para>
+Make warnings fatal (causes the program to abort).
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+</refsect2>
+</refsect1>
+
+<refsect1><title>See also</title>
+<para>
+The <structname>GdkPixbuf</structname> documentation, shipped with the 
+Gtk+ distribution, available from <ulink url="http://www.gtk.org">www.gtk.org</ulink>.
+</para>
+</refsect1>
+
+<refsect1><title>Bugs</title>
+<para>
+The runlength encoder gets out of sync with the pixel boundaries, since
+it includes the rowstride padding in the encoded stream. Furthermore, it
+generates pixbufs with suboptimal rowstride in some cases.
+</para>
+</refsect1>
+
+<refsect1><title>Author</title>
+<para>
+<command>gdk-pixbuf-csource</command> was written by Tim Janik
+<email>timj@gtk.org</email>. 
+</para>
+<para>
+This manual page was provided by Tim Janik <email>timj@gtk.org</email>. 
+</para>
+</refsect1>
+</refentry>
+

docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.1

@@ -0,0 +1,49 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Ip \" List item
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.TH "GDK-PIXBUF-QUERY" 1 "" "" ""
+.SH NAME
+gdk-pixbuf-query-loaders \- GdkPixbuf loader registration utility
+.SH "SYNOPSIS"
+
+.nf
+\fBgdk-pixbuf-query-loaders\fR [module...]
+.fi
+
+.SH "DESCRIPTION"
+
+.PP
+ \fBgdk-pixbuf-query-loaders\fR collects information about loadable modules for gdk-pixbuf and writes it to \fIstdout\fR\&.
+
+.PP
+If called without arguments, it looks for modules in the gdk-pixbuf loader directory\&.
+
+.PP
+If called with arguments, it looks for the specified modules\&. The arguments may be absolute or relative paths\&.
+
+.SH "ENVIRONMENT"
+
+.PP
+The environment variable \fBGDK_PIXBUF_MODULEDIR\fR can be used to specify a different loader directory\&. The default gdk-pixbuf loader directory is \fI\fIlibdir\fR/gtk-2\&.0/\fIversion\fR/loaders\fR\&.
+
+.SH "BUGS"
+
+.PP
+None known yet\&.
+

docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml

@@ -0,0 +1,51 @@
+<refentry id="gdk-pixbuf-query-loaders">
+
+<refmeta>
+<refentrytitle>gdk-pixbuf-query-loaders</refentrytitle>
+<manvolnum>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+<refname>gdk-pixbuf-query-loaders</refname>
+<refpurpose>GdkPixbuf loader registration utility</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gdk-pixbuf-query-loaders</command>
+<arg choice="opt" rep="repeat">module</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gdk-pixbuf-query-loaders</command> collects information about loadable
+modules for <application>gdk-pixbuf</application> and writes it to <filename>stdout</filename>. 
+</para>
+<para>
+If called without arguments, it looks for modules in the
+<application>gdk-pixbuf</application> loader directory.  
+</para>
+<para>
+If called with arguments, it looks for the specified modules. The arguments
+may be absolute or relative paths.
+</para>
+</refsect1>
+
+<refsect1><title>Environment</title>
+<para>
+The environment variable <envar>GDK_PIXBUF_MODULEDIR</envar> can be used
+to specify a different loader directory. The default <application>gdk-pixbuf</application> loader
+directory is <filename><replaceable>libdir</replaceable>/gtk-2.0/<replaceable>version</replaceable>/loaders</filename>.
+</para>
+</refsect1>
+
+<refsect1><title>Bugs</title>
+<para>
+None known yet.
+</para>
+</refsect1>
+
+</refentry>
+
+

docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt

@@ -6,10 +6,16 @@
 
 <SUBSECTION>
 gdk_pixbuf_version
+gdk_pixbuf_major_version
+gdk_pixbuf_minor_version
+gdk_pixbuf_micro_version
 GDK_PIXBUF_VERSION
 GDK_PIXBUF_MAJOR
 GDK_PIXBUF_MINOR
 GDK_PIXBUF_MICRO
+
+<SUBSECTION Private>
+GDK_PIXBUF_VAR
 </SECTION>
 
 <SECTION>
@@ -56,12 +62,20 @@ GdkPixbufDestroyNotify
 <SECTION>
 <FILE>file-loading</FILE>
 gdk_pixbuf_new_from_file
+gdk_pixbuf_new_from_file_at_size
+gdk_pixbuf_new_from_file_at_scale
+gdk_pixbuf_get_file_info
 </SECTION>
 
 <SECTION>
 <FILE>file-saving</FILE>
 gdk_pixbuf_savev
 gdk_pixbuf_save
+GdkPixbufSaveFunc
+gdk_pixbuf_save_to_callback
+gdk_pixbuf_save_to_callbackv
+gdk_pixbuf_save_to_buffer
+gdk_pixbuf_save_to_bufferv
 </SECTION>
 
 <SECTION>
@@ -136,12 +150,17 @@ gdk_pixbuf_scale
 gdk_pixbuf_composite_color_simple
 gdk_pixbuf_composite
 gdk_pixbuf_composite_color
+GdkPixbufRotation
+gdk_pixbuf_rotate_simple
+gdk_pixbuf_flip
 
 <SUBSECTION Standard>
 GDK_TYPE_INTERP_TYPE
+GDK_TYPE_PIXBUF_ROTATION
 
 <SUBSECTION Private>
 gdk_interp_type_get_type
+gdk_pixbuf_rotation_get_type
 </SECTION>
 
 <SECTION>
@@ -150,6 +169,7 @@ gdk_interp_type_get_type
 GdkPixbufLoader
 gdk_pixbuf_loader_new
 gdk_pixbuf_loader_new_with_type
+gdk_pixbuf_loader_new_with_mime_type
 gdk_pixbuf_loader_get_format
 gdk_pixbuf_loader_write
 gdk_pixbuf_loader_set_size
@@ -164,6 +184,7 @@ GDK_IS_PIXBUF_LOADER
 GDK_PIXBUF_LOADER_CLASS
 GDK_IS_PIXBUF_LOADER_CLASS
 <SUBSECTION Private>
+GdkPixbufLoaderClass
 gdk_pixbuf_loader_get_type
 </SECTION>
 
@@ -177,6 +198,10 @@ gdk_pixbuf_format_get_description
 gdk_pixbuf_format_get_mime_types
 gdk_pixbuf_format_get_extensions
 gdk_pixbuf_format_is_writable
+gdk_pixbuf_format_is_scalable
+gdk_pixbuf_format_is_disabled
+gdk_pixbuf_format_set_disabled
+gdk_pixbuf_format_get_license
 GdkPixbufFormat
 GdkPixbufFormatFlags
 GdkPixbufModulePattern

docs/reference/gdk-pixbuf/gdk-pixbuf.sgml

@@ -25,6 +25,8 @@
 <!ENTITY gdk-pixbuf "<application>gdk-pixbuf</application>">
 <!ENTITY Imlib "<application>Imlib</application>">
 <!ENTITY version SYSTEM "version.xml">
+<!ENTITY gdk-pixbuf-csource SYSTEM "gdk-pixbuf-csource.xml">
+<!ENTITY gdk-pixbuf-query-loaders SYSTEM "gdk-pixbuf-query-loaders.xml">
 ]>
 
 <book id="index">
@@ -114,6 +116,36 @@
     &gdk-pixbuf-gdk-pixbuf-xlib-rgb;
   </reference>
 
+  <reference>
+    <title>Tools Reference</title>
+
+    <partintro>
+      <para>
+	This part presents the tools which are shipped with the
+	&gdk-pixbuf; library.  
+      </para>
+    </partintro>
+
+    &gdk-pixbuf-csource;
+    &gdk-pixbuf-query-loaders;
+  </reference>
+
+  <index>
+    <title>Index</title>
+  </index>
+  <index role="deprecated">
+    <title>Index of deprecated symbols</title>
+  </index>
+  <index role="2.2">
+    <title>Index of new symbols in 2.2</title>
+  </index>
+  <index role="2.4">
+    <title>Index of new symbols in 2.4</title>
+  </index>  
+  <index role="2.6">
+    <title>Index of new symbols in 2.6</title>
+  </index>  
+
   &Porting-From-Imlib;
 
   <!-- License -->

docs/reference/gdk-pixbuf/tmpl/animation.sgml

@@ -20,6 +20,9 @@ Animated images.
     #GdkPixbufLoader
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkPixbufAnimation ##### -->
   <para>
     This object describes an animation.

docs/reference/gdk-pixbuf/tmpl/creating.sgml

@@ -43,6 +43,9 @@ Creating a pixbuf from image data that is already in memory.
     gdk_pixbuf_finalize().
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_new ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/file-loading.sgml

@@ -25,6 +25,9 @@ Loading a pixbuf from a file.
     #GdkPixbufLoader.
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_new_from_file ##### -->
 <para>
 
@@ -40,3 +43,41 @@ End:
 -->
 
 
+<!-- ##### FUNCTION gdk_pixbuf_new_from_file_at_size ##### -->
+<para>
+
+</para>
+
+@filename: 
+@width: 
+@height: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_new_from_file_at_scale ##### -->
+<para>
+
+</para>
+
+@filename: 
+@width: 
+@height: 
+@preserve_aspect_ratio: 
+@error: 
+@Returns: 
+<!-- # Unused Parameters # -->
+@keep_aspect_ratio: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_get_file_info ##### -->
+<para>
+
+</para>
+
+@filename: 
+@width: 
+@height: 
+@Returns: 
+
+

docs/reference/gdk-pixbuf/tmpl/file-saving.sgml

@@ -14,6 +14,9 @@ Saving a pixbuf to a file.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_savev ##### -->
 <para>
 
@@ -41,3 +44,79 @@ Saving a pixbuf to a file.
 @Returns: 
 
 
+<!-- ##### USER_FUNCTION GdkPixbufSaveFunc ##### -->
+<para>
+Specifies the type of the function passed to
+gdk_pixbuf_save_to_callback().  It is called once for each block of
+bytes that is "written" by gdk_pixbuf_save_to_callback().  If
+successful it should return %TRUE.  If an error occurs it should set
+@error and return %FALSE, in which case gdk_pixbuf_save_to_callback()
+will fail with the same error.
+</para>
+
+@buf: bytes to be written.
+@count: number of bytes in @buf.
+@error: A location to return an error.
+@data: user data passed to gdk_pixbuf_save_to_callback().
+@Returns: %TRUE if successful, %FALSE (with @error set) if failed.
+@Since: 2.4
+
+
+<!-- ##### FUNCTION gdk_pixbuf_save_to_callback ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@save_func: 
+@user_data: 
+@type: 
+@error: 
+@Varargs: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_save_to_callbackv ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@save_func: 
+@user_data: 
+@type: 
+@option_keys: 
+@option_values: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_save_to_buffer ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@buffer: 
+@buffer_size: 
+@type: 
+@error: 
+@Varargs: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_save_to_bufferv ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@buffer: 
+@buffer_size: 
+@type: 
+@option_keys: 
+@option_values: 
+@error: 
+@Returns: 
+
+

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml

@@ -69,6 +69,9 @@ Application-driven progressive image loading.
     gdk_pixbuf_new_from_file(), gdk_pixbuf_animation_new_from_file()
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkPixbufLoader ##### -->
 <para>
 The <structname>GdkPixbufLoader</structname> struct contains only private
@@ -76,6 +79,36 @@ fields.
 </para>
 
 
+<!-- ##### SIGNAL GdkPixbufLoader::area-prepared ##### -->
+  <para>
+  </para>
+
+@gdkpixbufloader: 
+
+<!-- ##### SIGNAL GdkPixbufLoader::area-updated ##### -->
+  <para>
+  </para>
+
+@gdkpixbufloader: 
+@arg1: 
+@arg2: 
+@arg3: 
+@arg4: 
+
+<!-- ##### SIGNAL GdkPixbufLoader::closed ##### -->
+  <para>
+  </para>
+
+@gdkpixbufloader: 
+
+<!-- ##### SIGNAL GdkPixbufLoader::size-prepared ##### -->
+  <para>
+  </para>
+
+@gdkpixbufloader: 
+@arg1: 
+@arg2: 
+
 <!-- ##### FUNCTION gdk_pixbuf_loader_new ##### -->
 <para>
 
@@ -94,6 +127,16 @@ fields.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_pixbuf_loader_new_with_mime_type ##### -->
+<para>
+
+</para>
+
+@mime_type: 
+@error: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_pixbuf_loader_get_format ##### -->
 <para>
 
@@ -152,46 +195,6 @@ fields.
 @error: 
 @Returns: 
 
-
-<!-- ##### SIGNAL GdkPixbufLoader::area-prepared ##### -->
-  <para>
-    This signal is emitted when the pixbuf loader has allocated the pixbuf
-    in the desired size.  After this signal is emitted, applications can 
-    call gdk_pixbuf_loader_get_pixbuf() to fetch the partially-loaded pixbuf.
-  </para>
-
-@gdkpixbufloader: the object which received the signal.
-
-<!-- ##### SIGNAL GdkPixbufLoader::area-updated ##### -->
-  <para>
-    This signal is emitted when a significant area of the image being
-    loaded has been updated.  Normally it means that a complete
-    scanline has been read in, but it could be a different area as
-    well.  Applications can use this signal to know when to repaint
-    areas of an image that is being loaded.
-  </para>
-
-@gdkpixbufloader: Loader which emitted the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@arg4: 
-<!-- # Unused Parameters # -->
-@x: X offset of upper-left corner of the updated area.
-@y: Y offset of upper-left corner of the updated area.
-@width: Width of updated area.
-@height: Height of updated area.
-
-<!-- ##### SIGNAL GdkPixbufLoader::closed ##### -->
-  <para>
-    This signal is emitted when gdk_pixbuf_loader_close() is called.
-    It can be used by different parts of an application to receive
-    notification when an image loader is closed by the code that
-    drives it.
-  </para>
-
-@gdkpixbufloader: the object which received the signal.
-
 <!--
 Local variables:
 mode: sgml
@@ -199,19 +202,4 @@ sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
 End:
 -->
 
-<!-- ##### SIGNAL GdkPixbufLoader::size-prepared ##### -->
-  <para>
-    This signal is emitted when the pixbuf loader has been fed the
-    initial amount of data that is required to figure out the size
-    of the image that it will create.  Applications can call  
-    gdk_pixbuf_loader_set_size() in response to this signal to set
-    the desired size to which the image should be scaled.
-  </para>
-
-@gdkpixbufloader: the object which received the signal.
-@arg1: 
-@arg2: 
-<!-- # Unused Parameters # -->
-@width: the original width of the image
-@height: the original height of the image
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml

@@ -22,6 +22,10 @@ Getting parts of a drawable's image data into a pixbuf.
 Drawables to Pixbufs
 
 
+<!-- ##### SECTION ./tmpl/gdk-pixbuf-unused.sgml:Stability_Level ##### -->
+
+
+
 <!-- ##### SECTION ./tmpl/gnome-canvas-pixbuf.sgml:Long_Description ##### -->
   <para>
     This canvas item displays #GdkPixbuf images.  It handles full

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml

@@ -23,6 +23,9 @@ Getting parts of an X drawable's image data into a pixbuf.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_xlib_get_from_drawable ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml

@@ -20,6 +20,9 @@ Initializing the &gdk-pixbuf; Xlib library.
     XlibRGB
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_xlib_init ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml

@@ -21,6 +21,9 @@ Rendering a pixbuf to an X drawable.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_xlib_render_threshold_alpha ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml

@@ -17,6 +17,9 @@ Rendering RGB buffers to X drawables.
     GdkRGB
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT XlibRgbCmap ##### -->
   <para>
     FIXME: Describe this.

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml

@@ -11,10 +11,88 @@ Information that describes an image.
     information that describes an image in memory.
   </para>
 
+  <section id="image-data">
+    <title>Image Data</title>
+
+    <para>
+      Image data in a pixbuf is stored in memory in uncompressed,
+      packed format.  Rows in the image are stored top to bottom, and
+      in each row pixels are stored from left to right.  There may be
+      padding at the end of a row.  The "rowstride" value of a pixbuf,
+      as returned by gdk_pixbuf_get_rowstride(), indicates the number
+      of bytes between rows.
+    </para>
+
+    <example id="put-pixel">
+      <title>put_pixel(<!-- -->) example</title>
+
+      <para>
+	The following code illustrates a simple put_pixel(<!-- -->)
+	function for RGB pixbufs with 8 bits per channel with an alpha
+	channel.  It is not included in the gdk-pixbuf library for
+	performance reasons; rather than making several function calls
+	for each pixel, your own code can take shortcuts.
+      </para>
+
+      <programlisting>
+static void
+put_pixel (GdkPixbuf *pixbuf, int x, int y, guchar red, guchar green, guchar blue, guchar alpha)
+{
+  int width, height, rowstride, n_channels;
+  guchar *pixels, *p;
+
+  n_channels = gdk_pixbuf_get_n_channels (pixbuf);
+
+  g_assert (gdk_pixbuf_get_colorspace (pixbuf) == GDK_COLORSPACE_RGB);
+  g_assert (gdk_pixbuf_get_bits_per_sample (pixbuf) == 8);
+  g_assert (gdk_pixbuf_get_has_alpha (pixbuf));
+  g_assert (n_channels == 4);
+
+  width = gdk_pixbuf_get_width (pixbuf);
+  height = gdk_pixbuf_get_height (pixbuf);
+
+  g_assert (x &gt;= 0 &amp;&amp; x &lt; width);
+  g_assert (y &gt;= 0 &amp;&amp; y &lt; height);
+
+  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+  pixels = gdk_pixbuf_get_pixels (pixbuf);
+
+  p = pixels + y * rowstride + x * n_channels;
+  p[0] = red;
+  p[1] = green;
+  p[2] = blue;
+  p[3] = alpha;
+}
+      </programlisting>
+
+      <para>
+	This function will not work for pixbufs with images that are
+	other than 8 bits per sample or channel, but it will work for
+	most of the pixbufs that GTK+ uses.
+      </para>
+    </example>
+
+    <note>
+      <para>
+	If you are doing memcpy() of raw pixbuf data, note that the
+	last row in the pixbuf may not be as wide as the full
+	rowstride, but rather just as wide as the pixel data needs to
+	be.  That is, it is unsafe to do <literal>memcpy (dest,
+	pixels, rowstride * height)</literal> to copy a whole pixbuf.
+	Use gdk_pixbuf_copy() instead, or compute the width in bytes
+	of the last row as <literal>width * ((n_channels *
+	bits_per_sample + 7) / 8)</literal>.
+      </para>
+    </note>
+  </section>
+
 <!-- ##### SECTION See_Also ##### -->
   <para>
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM GdkPixbufError ##### -->
 <para>
 An error code in the #GDK_PIXBUF_ERROR domain. Many &gdk-pixbuf;
@@ -51,7 +129,7 @@ information on error domains and error codes.
   <para>
     These values can be passed to
     gdk_pixbuf_render_to_drawable_alpha() to control how the alpha
-    chanel of an image should be handled.  This function can create a
+    channel of an image should be handled.  This function can create a
     bilevel clipping mask (black and white) and use it while painting
     the image.  In the future, when the X Window System gets an alpha
     channel extension, it will be possible to do full alpha
@@ -71,10 +149,51 @@ In the future it will do full alpha compositing.
     This is the main structure in the &gdk-pixbuf; library.  It is
     used to represent images.  It contains information about the
     image's pixel data, its color space, bits per sample, width and
-    height, and the rowstride or number of bytes between rows.
+    height, and the rowstride (the number of bytes between the start of
+    one row and the start of the next). 
   </para>
 
 
+<!-- ##### ARG GdkPixbuf:bits-per-sample ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GdkPixbuf:colorspace ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GdkPixbuf:has-alpha ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GdkPixbuf:height ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GdkPixbuf:n-channels ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GdkPixbuf:pixels ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GdkPixbuf:rowstride ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GdkPixbuf:width ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gdk_pixbuf_get_colorspace ##### -->
 <para>
 
@@ -162,3 +281,11 @@ End:
 @Returns: 
 
 
+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2")
+End:
+-->
+
+

docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml

@@ -16,6 +16,9 @@ you're linking against.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### VARIABLE gdk_pixbuf_version ##### -->
 <para>
 Contains the full version of the &gdk-pixbuf; library as a string.
@@ -23,6 +26,48 @@ This is the version currently in use by a running program.
 </para>
 
 
+<!-- ##### VARIABLE gdk_pixbuf_major_version ##### -->
+<para>
+The major version number of the &gdk-pixbuf; library.  (e.g. in 
+&gdk-pixbuf; version 1.2.5 this is 1.) 
+</para>
+
+<para>
+This variable is in the library, so represents the
+&gdk-pixbuf; library you have linked against. Contrast with the
+#GDK_PIXBUF_MAJOR macro, which represents the major version of the
+&gdk-pixbuf; headers you have included.
+</para>
+
+
+<!-- ##### VARIABLE gdk_pixbuf_minor_version ##### -->
+<para>
+The minor version number of the &gdk-pixbuf; library.  (e.g. in 
+&gdk-pixbuf; version 1.2.5 this is 2.) 
+</para>
+
+<para>
+This variable is in the library, so represents the
+&gdk-pixbuf; library you have linked against. Contrast with the
+#GDK_PIXBUF_MINOR macro, which represents the minor version of the
+&gdk-pixbuf; headers you have included.
+</para>
+
+
+<!-- ##### VARIABLE gdk_pixbuf_micro_version ##### -->
+<para>
+The micro version number of the &gdk-pixbuf; library.  (e.g. in 
+&gdk-pixbuf; version 1.2.5 this is 5.) 
+</para>
+
+<para>
+This variable is in the library, so represents the
+&gdk-pixbuf; library you have linked against. Contrast with the
+#GDK_PIXBUF_MICRO macro, which represents the micro version of the
+&gdk-pixbuf; headers you have included.
+</para>
+
+
 <!-- ##### MACRO GDK_PIXBUF_VERSION ##### -->
 <para>
 Contains the full version of the &gdk-pixbuf; header as a string.

docs/reference/gdk-pixbuf/tmpl/inline.sgml

@@ -14,6 +14,9 @@ Functions for inlined pixbuf handling.
 
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkPixdata ##### -->
   <para>
 

docs/reference/gdk-pixbuf/tmpl/module_interface.sgml

@@ -18,8 +18,8 @@ a #GdkPixbufModuleFillVtableFunc function named
 In order to make format-checking work before actually loading the modules
 (which may require dlopening image libraries), modules export their 
 signatures (and other information) via the <function>fill_info</function>
-function. An external utility, <command>gdk-pixbuf-query-loaders</command>, uses
-this to create a text file containing a list of all available loaders and 
+function. An external utility, <command>gdk-pixbuf-query-loaders</command>, 
+uses this to create a text file containing a list of all available loaders and 
 their signatures. This file is then read at runtime by &gdk-pixbuf; to obtain
 the list of available loaders and their signatures. 
 </para>
@@ -65,6 +65,9 @@ They are not covered by the same stability guarantees as the regular
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_set_option ##### -->
 <para>
 
@@ -129,6 +132,42 @@ They are not covered by the same stability guarantees as the regular
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_pixbuf_format_is_scalable ##### -->
+<para>
+
+</para>
+
+@format: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_format_is_disabled ##### -->
+<para>
+
+</para>
+
+@format: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_format_set_disabled ##### -->
+<para>
+
+</para>
+
+@format: 
+@disabled: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_format_get_license ##### -->
+<para>
+
+</para>
+
+@format: 
+@Returns: 
+
+
 <!-- ##### STRUCT GdkPixbufFormat ##### -->
 <para>
 A #GdkPixbufFormat contains information about the image format accepted by a
@@ -144,6 +183,9 @@ use the <function>gdk_pixbuf_format_*</function> functions.
 @extensions: a %NULL-terminated array of typical filename extensions for the
 image format.
 @flags: a combination of #GdkPixbufFormatFlags.
+@disabled: a boolean determining whether the loader is disabled.
+@license: a string containing license information, typically set to 
+ shorthands like "GPL", "LGPL", etc.
 @Since: 2.2
 
 <!-- ##### ENUM GdkPixbufFormatFlags ##### -->
@@ -153,23 +195,39 @@ operations.
 </para>
 
 @GDK_PIXBUF_FORMAT_WRITABLE: the module can write out images in the format.
+@GDK_PIXBUF_FORMAT_SCALABLE: the image format is scalable
+@GDK_PIXBUF_FORMAT_THREADSAFE: the module is threadsafe. If this flag is not
+  set, &gdk-pixbuf; will use a lock to prevent multiple threads from using
+  this module at the same time. (Since 2.6)
 @Since: 2.2
 
 <!-- ##### STRUCT GdkPixbufModulePattern ##### -->
 <para>
 The signature of a module is a set of prefixes. Prefixes are encoded as
-pairs of ordinary strings, where the second string, if not %NULL,
-may contain ' ', '!', 'x', 'z', and 'n' to indicate bytes that must be 
-matched, not matched, "don't-care"-bytes, zeros and non-zeros.
+pairs of ordinary strings, where the second string, if not %NULL, must be
+of the same length as the first one and may contain ' ', '!', 'x', 'z', 
+and 'n' to indicate bytes that must be matched, not matched, 
+"don't-care"-bytes, zeros and non-zeros.
 Each prefix has an associated integer that describes the relevance of 
 the prefix, with 0 meaning a mismatch and 100 a "perfect match".
 </para>
 
 <para>
 The signature of a module is stored as an array of 
-#GdkPixbufModulePattern<!-- -->s. 
+#GdkPixbufModulePattern<!-- -->s. The array is terminated by a pattern
+where the @prefix is %NULL.
 </para>
 
+<informalexample><programlisting>
+GdkPixbufModulePattern *signature[] = {
+  { "abcdx", " !x z", 100 },
+  { "bla", NULL,  90 },
+  { NULL, NULL, 0 }
+};
+</programlisting>
+The example matches e.g. "auud\0" with relevance 100, and "blau" with 
+relevance 90.</informalexample>
+
 @prefix: the prefix for this pattern
 @mask: mask containing bytes which modify how the prefix is matched against
   test data
@@ -208,6 +266,12 @@ way to achieve the desired scaling during the loading of the image, it may
 either ignore the size request, or only approximate it -- &gdk-pixbuf; will
 then perform the required scaling on the completely loaded image. 
 </para>
+<para>
+If the function sets @width or @height to zero, the module should interpret
+this as a hint that it will be closed soon and shouldn't allocate further 
+resources. This convention is used to implement gdk_pixbuf_get_file_info()
+efficiently.
+</para>
 
 @width: pointer to a location containing the current image width
 @height: pointer to a location containing the current image height
@@ -276,6 +340,7 @@ is loaded and must set the function pointers of the #GdkPixbufModule.
 @load_increment: continues an incremental load.
 @load_animation: loads an animation from a file.
 @save: saves a #GdkPixbuf to a file.
+@save_to_callback: 
 
 <!-- ##### STRUCT GdkPixbufAnimationClass ##### -->
 <para>

docs/reference/gdk-pixbuf/tmpl/refcounting.sgml

@@ -45,6 +45,9 @@ Functions for reference counting and memory management on pixbufs.
     #GdkPixbuf, gdk_pixbuf_new_from_data().
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_ref ##### -->
   <para>
 

docs/reference/gdk-pixbuf/tmpl/scaling.sgml

@@ -71,6 +71,9 @@ expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
     <link linkend="gdk-GdkRGB">GdkRGB</link>.
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM GdkInterpType ##### -->
   <para>
     This enumeration describes the different interpolation modes that
@@ -200,3 +203,34 @@ End:
 @color2: 
 
 
+<!-- ##### ENUM GdkPixbufRotation ##### -->
+<para>
+The possible rotations which can be passed to gdk_pixbuf_rotate_simple().
+To make them easier to use, their numerical values are the actual degrees.
+</para>
+
+@GDK_PIXBUF_ROTATE_NONE: No rotation.
+@GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE: Rotate by 90 degrees.
+@GDK_PIXBUF_ROTATE_UPSIDEDOWN: Rotate by 180 degrees.
+@GDK_PIXBUF_ROTATE_CLOCKWISE: Rotate by 270 degrees.
+
+<!-- ##### FUNCTION gdk_pixbuf_rotate_simple ##### -->
+<para>
+
+</para>
+
+@src: 
+@angle: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_flip ##### -->
+<para>
+
+</para>
+
+@src: 
+@horizontal: 
+@Returns: 
+
+

docs/reference/gdk-pixbuf/tmpl/util.sgml

@@ -17,6 +17,9 @@ Utility and miscellaneous convenience functions.
     #GdkPixbuf
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_add_alpha ##### -->
 <para>
 

docs/reference/gdk/.cvsignore

@@ -9,6 +9,7 @@ gdk.hierarchy
 gdk.interfaces
 gdk.prerequisites
 gdk.signals
+deprecated
 html
 xml
 *.stamp

docs/reference/gdk/Makefile.am

@@ -1,22 +1,18 @@
 ## Process this file with automake to produce Makefile.in
 
+AUTOMAKE_OPTIONS = 1.6
+
 # The name of the module.
 DOC_MODULE=gdk
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gdk-docs.sgml
 
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../gdk
-
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS=--deprecated-guards="GDK_ENABLE_BROKEN|GDK_DISABLE_DEPRECATED"
 
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html
+# The directory containing the source code. Relative to $(srcdir)
+DOC_SOURCE_DIR=../../../gdk
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gdk/*.h $(top_srcdir)/gdk/x11/gdkx.h
@@ -24,6 +20,7 @@ CFILE_GLOB=$(top_srcdir)/gdk/*.c
 
 # Header files to ignore when scanning
 IGNORE_HFILES=			\
+	gdkalias.h		\
 	gdkintl.h		\
 	gdkmarshalers.h		\
 	gdkkeysyms.h		\
@@ -40,8 +37,30 @@ IGNORE_HFILES=			\
 EXTRA_HFILES=			\
 	../../../gdk/x11/gdkx.h 
 
+# CFLAGS and LDFLAGS for compiling scan program. Only needed
+# if $(DOC_MODULE).types is non-empty.
+INCLUDES = \
+	-I$(top_srcdir) 	\
+	-I$(top_builddir) 	\
+	-I$(top_builddir)/gdk 	\
+	$(GTK_DEBUG_FLAGS)	\
+	$(GDK_DEP_CFLAGS)
+
+GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib)
+
+
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS=--sgml-mode --output-format=xml
+
+# Extra SGML files that are included by DOC_MAIN_SGML_FILE
+content_files = 		\
+	version.xml		\
+	multihead.sgml
+
 # Images to copy into HTML directory
 HTML_IMAGES =				\
+	images/rotated-text.png		\
+					\
 	images/X_cursor.png 		\
 	images/arrow.png 		\
 	images/based_arrow_down.png 	\
@@ -120,161 +139,10 @@ HTML_IMAGES =				\
 	images/watch.png 		\
 	images/xterm.png 
 
-# Extra SGML files that are included by DOC_MAIN_SGML_FILE
-content_files = 		\
-	version.xml		\
-	multihead.sgml
+# Extra options to supply to gtkdoc-fixref
+FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html
+
+include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
-extra_files = version.xml.in
-
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-GTKDOC_CFLAGS = @STRIP_BEGIN@ 				\
-	@CFLAGS@					\
-	-I$(top_srcdir) 				\
-	-I$(top_builddir) 				\
-	-I$(top_builddir)/gdk 				\
-	@GTK_DEBUG_FLAGS@				\
-	@GDK_DEP_CFLAGS@				\
-@STRIP_END@
-
-GTKDOC_LIBS = @STRIP_BEGIN@ 						\
-	$(top_builddir)/gdk/@gdktargetlib@        			\
-@STRIP_END@
-
-# Commands for compiling and linking 
-GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
-GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
-
-
-####################################
-# Everything below here is generic #
-####################################
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-EXTRA_DIST = 				\
-	$(content_files)		\
-	$(extra_files)			\
-	$(HTML_IMAGES)			\
-	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE).types		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
-
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES = 		 \
-	$(DOC_MODULE).args 	 \
-	$(DOC_MODULE).hierarchy  \
-	$(DOC_MODULE).interfaces \
-	$(DOC_MODULE).prerequisites \
-	$(DOC_MODULE).signals
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
-
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB)
-	@echo '*** Scanning header files ***'
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-	else \
-	    cd $(srcdir) ; \
-	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
-	    done \
-	fi
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
-	@true
-
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '*** Rebuilding template files ***'
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-	touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-#### sgml ####
-
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
-	@echo '*** Building SGML ***'
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
-	touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-	@true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '*** Building HTML ***'
-	rm -rf $(srcdir)/html 
-	mkdir $(srcdir)/html
-	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo '-- Fixing Crossreferences' 
-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	touch html-build.stamp
-endif
-
-##############
-
-clean-local:
-	rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	(installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-	fi)
-
-#
-# Require gtk-doc when making dist
-#
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
-else
-dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-	@false
-endif
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
-	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
-	-cp $(srcdir)/html/* $(distdir)/html
-
-.PHONY : dist-hook-local
+EXTRA_DIST += version.xml.in

docs/reference/gdk/gdk-docs.sgml

@@ -84,4 +84,21 @@
 
     &gdk-X-Window-System-Interaction;
   </reference>
+
+  <index>
+    <title>Index</title>
+  </index>
+  <index role="deprecated">
+    <title>Index of deprecated symbols</title>
+  </index>
+  <index role="2.2">
+    <title>Index of new symbols in 2.2</title>
+  </index>
+  <index role="2.4">
+    <title>Index of new symbols in 2.4</title>
+  </index>  
+  <index role="2.6">
+    <title>Index of new symbols in 2.6</title>
+  </index>  
+
 </book>