2.7.1

2005-07-01  Matthias Clasen  <mclasen@redhat.com>

	* gdk-pixbuf-io.c (gdk_pixbuf_new_from_file_at_scale): Allow
	-1 for width/height and interpret them as "not constrained".
	(#309258, Mark McLoughlin)

AUTHORS

@@ -30,3 +30,24 @@ Owen Taylor       <otaylor@gtk.org>
 
 There are many others who have contributed patches; we thank them,
 GTK+ is much better because of them.
+
+
+Over time, TK+ has incorporated some pieces of software which 
+started as independent projects. We list the original authors here:
+
+
+MS-Windows theme engine
+-----------------------
+Raymond Penners
+Dom Lachowicz
+
+
+Pixbuf theme engine
+-------------------
+Owen Taylor
+
+
+IME input method
+----------------
+Takuro Ashie
+Kazuki IWAMOTO

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.3.0.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.3.0			   # change to the toplevel directory
+  % gzip -cd gtk+-2.7.1.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.7.1			   # change to the toplevel directory
   % ./configure				   # run the `configure' script
   % make				   # build GTK
   [ Become root if necessary ]

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
 ========================

Makefile.am

@@ -1,7 +1,7 @@
 ## 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.7
@@ -13,6 +13,9 @@ 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		\
@@ -20,7 +23,6 @@ EXTRA_DIST =			\
 	gtk-zip.sh.in		\
 	sanitize-la.sh		\
 	po/README.translators	\
-	po/makefile.mingw	\
 	po/po2tbl.sed.in	\
 	examples/aspectframe/Makefile  \
 	examples/aspectframe/aspectframe.c  \

README

@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is GTK+ version 2.3.0. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.7.1. 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,73 +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.3 now requires version 2 of Xft; old fashioned core X
-  fonts are no longer supported.
-
-* There is a bug in the Xft library in XFree86-4.1 and possibly previous
-  versions that causes random crashes when using the Pango Xft
-  backend. If you want to use Xft fonts, you should upgrade to
-  at least XFree86-4.2.
-
-* The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
-  is provided on a as-is basis and has not been tested at all. No
-  guarantees about the degree of workingness or about future
+* 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
 ==================
 
@@ -114,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
@@ -139,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,73 +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.3 now requires version 2 of Xft; old fashioned core X
-  fonts are no longer supported.
-
-* There is a bug in the Xft library in XFree86-4.1 and possibly previous
-  versions that causes random crashes when using the Pango Xft
-  backend. If you want to use Xft fonts, you should upgrade to
-  at least XFree86-4.2.
-
-* The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
-  is provided on a as-is basis and has not been tested at all. No
-  guarantees about the degree of workingness or about future
+* 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
 ==================
 
@@ -114,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
@@ -139,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,26 +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
-=======
-
-Before building GTK+ you must also have GNU gettext. Get prebuilt
-binaries of gettext-runtime (0.12.1 or newer) from your nearest GNU
-ftp mirror. If you use gcc, you will also have to edit the libintl.h
-file from gettext a tiny bit: Change the
-
-# if __GNUC__ >= 2 && !defined __APPLE_CC__ && (defined __STDC__ || defined __cplusplus)
-
-line to
-
-# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && (defined __STDC__ || defined __cplusplus)
-
-around line 102.
-
-If you use libtool, you will also have to copy intl.lib to libintl.a
-so that libtool will find them. Alternatively, use pexports and
-dlltool to generate a gcc import library.
-
 ActiveIMM
 =========
 
@@ -92,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

autogen.sh

@@ -91,19 +91,21 @@ if test -z "$ACLOCAL_FLAGS"; then
 	done
 fi
 
-$ACLOCAL $ACLOCAL_FLAGS || exit 1
+rm -rf autom4te.cache
 
-libtoolize --force || exit 1
-gtkdocize || exit 1
+$ACLOCAL $ACLOCAL_FLAGS || exit $?
 
-autoheader || exit 1
+libtoolize --force || exit $?
+gtkdocize || exit $?
 
-$AUTOMAKE --add-missing || exit 1
-autoconf || exit 1
-cd $ORIGDIR
+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."

configure.in

@@ -11,30 +11,33 @@ AC_PREREQ(2.54)
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [3])
-m4_define([gtk_micro_version], [0])
+m4_define([gtk_minor_version], [7])
+m4_define([gtk_micro_version], [1])
 m4_define([gtk_version],
           [gtk_major_version.gtk_minor_version.gtk_micro_version])
 m4_define([gtk_interface_age], [0])
-m4_define([gtk_binary_age], [300])
+m4_define([gtk_binary_age],
+          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 # This is the X.Y used in -lgtk-FOO-X.Y
 m4_define([gtk_api_version], [2.0])
 
 # Define a string for the earliest version that this release has
-# forward/backwards binary compatibility with. This is used for module
-# locations. (Should this be backwards-compat instead?)
+# backwards binary compatibility with for all interfaces a module
+# might. Unless we add module-only API with lower stability
+# guarantees, this should be unchanged until we break binary compat
+# for GTK+.
 #
 #GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
-m4_define([gtk_binary_version], [2.2.0])
+m4_define([gtk_binary_version], [2.4.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.3.0])
-m4_define([pango_required_version], [1.2.0])
+m4_define([glib_required_version], [2.7.1])
+m4_define([pango_required_version], [1.9.0])
 m4_define([atk_required_version], [1.0.1])
 
 
 AC_INIT([gtk+], [gtk_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk+],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B],
 	[gtk+])
 
 AC_CONFIG_SRCDIR([gdk/gdktypes.h])
@@ -47,6 +50,7 @@ AM_CONFIG_HEADER(config.h)
 
 #
 # For each of the libraries we build, we define the following
+ 
 # substituted variables:
 #
 # foo_PACKAGES:     pkg-config packages this library requires
@@ -106,32 +110,8 @@ GETTEXT_PACKAGE=gtk20
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
 
-
-dnl Initialize libtool
-AC_PROG_CC
-AM_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-
-AM_PROG_AS
-
-dnl Initialize maintainer mode
-AM_MAINTAINER_MODE
-
 AC_CANONICAL_HOST
 
-AC_MSG_CHECKING([for some Win32 platform])
-case "$host" in
-  *-*-mingw*|*-*-cygwin*)
-    platform_win32=yes
-    ;;
-  *)
-    platform_win32=no
-    ;;
-esac
-AC_MSG_RESULT([$platform_win32])
-AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
-
 MATH_LIB=-lm
 AC_MSG_CHECKING([for native Win32])
 case "$host" in
@@ -144,8 +124,54 @@ case "$host" in
     ;;
 esac
 AC_MSG_RESULT([$os_win32])
+
+case $host in
+  *-*-linux*)
+    os_linux=yes
+    ;;
+esac
+dnl Initialize libtool
+AC_PROG_CC
+AM_DISABLE_STATIC
+
+if test "$os_win32" = "yes"; then
+  if test x$enable_static = xyes -o x$enable_static = x; then
+    AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
+    enable_static=no
+  fi
+  if test x$enable_shared = xno; then
+    AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
+  fi
+  enable_shared=yes
+fi
+
+AC_LIBTOOL_WIN32_DLL
+AM_PROG_LIBTOOL
+
+# Make sure we use 64-bit versions of various file stuff.
+AC_SYS_LARGEFILE
+
+AM_PROG_AS
+AC_PATH_PROG(NM, nm, nm)
+
+dnl Initialize maintainer mode
+AM_MAINTAINER_MODE
+
+AC_MSG_CHECKING([for some Win32 platform])
+case "$host" in
+  *-*-mingw*|*-*-cygwin*)
+    platform_win32=yes
+    ;;
+  *)
+    platform_win32=no
+    ;;
+esac
+AC_MSG_RESULT([$platform_win32])
+AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+
 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
 AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
+AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes")
 
 if test "$os_win32" = "yes"; then
   AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
@@ -164,10 +190,6 @@ AC_ARG_ENABLE(shm,
               [AC_HELP_STRING([--enable-shm],
                               [support shared memory if available [default=yes]])],,
               [enable_shm="yes"])
-AC_ARG_ENABLE(ansi,
-              [AC_HELP_STRING([--enable-ansi],
-                              [turn on strict ansi [default=no]])],,
-              [enable_ansi=no])
 AC_ARG_ENABLE(xkb,
               [AC_HELP_STRING([--enable-xkb],
                               [support XKB [default=maybe]])],,
@@ -176,6 +198,10 @@ AC_ARG_ENABLE(rebuilds,
               [AC_HELP_STRING([--disable-rebuilds],
                               [disable all source autogeneration rules])],,
               [enable_rebuilds=yes])
+AC_ARG_ENABLE(visibility,
+              [AC_HELP_STRING([--disable-visibility],
+                              [don't use ELF visibility attributes])],,
+              [enable_visibility=yes])
 
 AC_ARG_WITH(xinput,
             [AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])])
@@ -187,15 +213,13 @@ AC_ARG_WITH(ie55,
             [AC_HELP_STRING([--with-ie55=DIRECTORY],
                             [IE5.5 libs and headers (for Active IMM)])])
 
-GLIB_AC_DIVERT_BEFORE_HELP([
 if test "$platform_win32" = yes; then
   gdktarget=win32
 else
   gdktarget=x11
 fi
-])
 
-AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/linux-fb/win32]] select GDK target [default=$gdktarget]],
+AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/linux-fb/win32]] select non-default GDK target],
 	gdktarget=$with_gdktarget)
 
 AC_SUBST(gdktarget)
@@ -231,6 +255,11 @@ else
   fi
 fi
 
+if test "x$enable_visibility" = "xno"; then
+  GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY"
+fi
+
+
 AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}")
 
 			
@@ -369,6 +398,18 @@ AC_SUBST(REBUILD)
 
 AC_CHECK_FUNCS(lstat mkstemp flockfile)
 
+# _NL_TIME_FIRST_WEEKDAY is an enum and not a define
+AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
+AC_TRY_LINK([#include <langinfo.h>], [
+char c;
+c = *((unsigned char *)  nl_langinfo(_NL_TIME_FIRST_WEEKDAY));
+], gtk_ok=yes, gtk_ok=no)
+AC_MSG_RESULT($gtk_ok)
+if test "$gtk_ok" = "yes"; then
+  AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1],
+	    [Define if _NL_TIME_FIRST_WEEKDAY is available])
+fi
+
 # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
 AC_MSG_CHECKING(for sigsetjmp)
 AC_TRY_LINK([#include <setjmp.h>], [
@@ -380,25 +421,18 @@ if test "$gtk_ok" = "yes"; then
   AC_DEFINE(HAVE_SIGSETJMP)
 fi
 
-AC_MSG_CHECKING(whether make is GNU Make)
-STRIP_BEGIN=
-STRIP_END=
-if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
-	STRIP_BEGIN='$(strip $(STRIP_DUMMY)'
-	STRIP_END=')'
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(no)
-fi
-STRIP_DUMMY=
-AC_SUBST(STRIP_DUMMY)
-AC_SUBST(STRIP_BEGIN)
-AC_SUBST(STRIP_END)
-
 # i18n stuff
-ALL_LINGUAS="am ar az be bg ca cs cy da de el en_GB es et eu fa fi fr ga gl he hi hr hu ia id it ja ko li lt lv mk ml mn ms ne nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk uz uz@Cyrl vi wa yi zh_CN zh_TW"
+# TRANSLATORS:  Please note that gtk+ has both po/ and po-properties/
+# directories.  If you add a new language to ALL_LINGUAS, please make
+# sure that both po/ and po-properties/ have .po files that correspond
+# to your language.  If you only add one to po/, the build will break
+# in po-properties/.
+ALL_LINGUAS="af am ar az az_IR be bg bn br bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu ia id is it ja ko li lt lv mi mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@ije sr@Latn sv ta th tk tr uk uz uz@Latn vi wa xh yi zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 LIBS="$LIBS $INTLLIBS"
+AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*)
+        sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile
+      esac])
 
 AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR)
 
@@ -453,13 +487,13 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
 # Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
 # 
 
-GLIB_PACKAGES="gobject-2.0 gmodule-2.0"
+GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0"
 
 AM_PATH_GLIB_2_0(glib_required_version, :,
   AC_MSG_ERROR([
 *** GLIB glib_required_version or better is required. The latest version of 
 *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
-  gobject gmodule gthread)
+  gobject gmodule-no-export gthread)
 
 dnl
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
@@ -553,6 +587,7 @@ AC_C_CONST
 AC_TYPE_SIGNAL
 AC_FUNC_MMAP
 
+AC_CHECK_FUNCS(mallinfo)
 AC_CHECK_FUNCS(getresuid)
 AC_TYPE_UID_T
 
@@ -620,6 +655,14 @@ fi
 AC_MSG_RESULT($gdk_working_wctype)
 AC_SUBST(GDK_WLIBS)
 
+# Check for uxtheme.h (for MS-Windows Engine)
+AC_MSG_CHECKING(for uxtheme.h)
+AC_TRY_CPP([#include <uxtheme.h>], gtk_uxtheme_h=yes, gtk_uxtheme_h=no)
+if test $gtk_uxtheme_h = yes; then
+   AC_DEFINE(HAVE_UXTHEME_H,1,[Have uxtheme.h include file])
+fi
+AC_MSG_RESULT($gtk_uxtheme_h)
+
 
 ##################################################
 # Checks for gdk-pixbuf
@@ -653,7 +696,7 @@ else
     AC_MSG_RESULT(yes)
     AC_MSG_CHECKING(whether dynamic modules work)
     ## for loop is to strip newline 
-    tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-2.0`
+    tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0`
     for I in $tmp; do
         dynworks=$I
     done
@@ -707,7 +750,7 @@ dnl Test for libtiff
           [AC_CHECK_HEADER(tiffio.h,
             TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
             AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
-        AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
+        AC_MSG_WARN(*** TIFF loader will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
   fi
 
   if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
@@ -940,7 +983,7 @@ fi
 
 AC_SUBST(REBUILD_PNGS)
 
-GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0"
+GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0"
 GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB"
 GDK_PIXBUF_EXTRA_CFLAGS= 
 GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
@@ -1013,7 +1056,7 @@ if test "x$gdktarget" = "xx11"; then
       AC_MSG_ERROR([Xft Pango backend found but did not find freetype libraries])
     fi
   else
-    AC_MSG_ERROR([Pango 1.2.0 and Xft backend is required for x11 target])
+    AC_MSG_ERROR([Xft Pango backend is required for x11 target])
   fi
 
   if $PKG_CONFIG --exists xft ; then : ; else
@@ -1042,7 +1085,7 @@ if test "x$gdktarget" = "xx11"; then
   
   if test $pango_omitted_x_deps = yes ; then
     # Old versions of Xft didn't necessarily include -lX11 in the output
-    x_libs="`pkg-config --libs xft` -lX11 $X_EXTRA_LIBS"
+    x_libs="`$PKG_CONFIG --libs xft` -lX11 $X_EXTRA_LIBS"
   fi    	
 
   ## Strip the .la files
@@ -1091,12 +1134,15 @@ if test "x$gdktarget" = "xx11"; then
           # Check for solaris
 	  use_solaris_xinerama=yes
 	  AC_CHECK_LIB(Xext, XineramaGetInfo,
-			use_solaris_xinerama=yes, use_solaris_xinerama=no)
+			use_solaris_xinerama=yes, 
+			use_solaris_xinerama=no,
+			-lXext $x_libs_for_checks)
 	  if test "x$use_solaris_xinerama" = "xyes"; then
 	      AC_CHECK_HEADER(X11/extensions/xinerama.h,
 	        [GTK_ADD_LIB(x_extra_libs,Xext)
 		AC_DEFINE(HAVE_SOLARIS_XINERAMA)
-		AC_DEFINE(HAVE_XINERAMA)], use_solaris_xinerama=no, -lXext $x_libs_for_checks)
+		AC_DEFINE(HAVE_XINERAMA)], 
+		use_solaris_xinerama=no,[#include <X11/Xlib.h>])
 	  fi	
 	  AC_MSG_CHECKING(for Xinerama support on Solaris)
 	  AC_MSG_RESULT($use_solaris_xinerama);
@@ -1120,6 +1166,26 @@ if test "x$gdktarget" = "xx11"; then
 
   CPPFLAGS="$gtk_save_cppflags"
 
+  # Check for xReply
+
+  gtk_save_cppflags="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+
+  AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply])
+  AC_TRY_COMPILE([#include <X11/Xlibint.h>],
+      [xReply *rep;],
+      [AC_MSG_RESULT([no])],
+      [AC_TRY_COMPILE([#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>],
+           [xReply *rep;],
+           [AC_MSG_RESULT([yes])
+            AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], 1,
+                [Define if <X11/extensions/XIproto.h> needed for xReply])],
+           [AC_MSG_RESULT([unknown])
+            AC_MSG_ERROR([xReply type unavailable. X11 is too old])])])
+
+  CPPFLAGS="$gtk_save_cppflags"
+
   # Check for shaped window extension
 
   AC_CHECK_LIB(Xext, XShapeCombineMask,
@@ -1135,10 +1201,18 @@ if test "x$gdktarget" = "xx11"; then
       ,
       $x_libs_for_checks)
 
+  # Check for XInternAtoms (X11R6 specific)
+
+  AC_CHECK_LIB(X11, XInternAtoms,
+      AC_DEFINE([HAVE_XINTERNATOMS], 1,
+          [Define to 1 if you have the `XInternAtoms' function.]),
+      ,
+      $x_libs_for_checks)
+
   # Generic X11R6 check needed for XIM support; we could
   # probably use this to replace the above, but we'll
-  # leave the separate XConvertCase check for clarity
-
+  # leave the separate checks for XConvertCase and XInternAtoms 
+  # for clarity
   have_x11r6=false
   AC_CHECK_LIB(X11, XAddConnectionWatch,
       have_x11r6=true,
@@ -1196,9 +1270,27 @@ if test "x$gdktarget" = "xx11"; then
 
   if $have_xcursor ; then
     AC_DEFINE(HAVE_XCURSOR, 1, Have the Xcursor library)
-    XCURSOR_PACKAGES="xcursor"
-  else
-    XCURSOR_PACKAGES=
+    GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags xcursor` $GDK_EXTRA_CFLAGS"
+    GDK_EXTRA_LIBS="`$PKG_CONFIG --libs xcursor` $GDK_EXTRA_LIBS"
+  fi
+
+  # X SYNC check
+  AC_CHECK_LIB(Xext, XSyncQueryExtension,
+      [AC_CHECK_HEADER(X11/extensions/sync.h,
+          [GTK_ADD_LIB(x_extra_libs, Xext)
+	  AC_DEFINE(HAVE_XSYNC, 1, Have the SYNC extension library)],
+	  :, [#include <X11/Xlib.h>])], : ,
+       $X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
+
+  # Checks for XFixes extension
+  
+  have_xfixes=false
+  PKG_CHECK_MODULES(XFIXES, xfixes, have_xfixes=true, :)
+
+  if $have_xfixes ; then
+    AC_DEFINE(HAVE_XFIXES, 1, Have the XFIXES X extension)
+    GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags xfixes` $GDK_EXTRA_CFLAGS"
+    GDK_EXTRA_LIBS="`$PKG_CONFIG --libs xfixes` $GDK_EXTRA_LIBS"
   fi
     
   # Xshm checks
@@ -1233,7 +1325,6 @@ if test "x$gdktarget" = "xx11"; then
     fi
   fi
 
-  GDK_EXTRA_CFLAGS=
   if test $pango_omitted_x_deps = yes ; then
     GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs $x_libs $GDK_EXTRA_LIBS"
   else
@@ -1297,7 +1388,6 @@ if test "x$gdktarget" = "xlinux-fb"; then
     AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
   fi
   
-  GDK_EXTRA_CFLAGS=""
   if test $pango_omitted_ft2_deps = yes ; then
     GDK_EXTRA_LIBS="$FREETYPE_LIBS $GDK_EXTRA_LIBS"
   fi
@@ -1313,7 +1403,7 @@ fi
 #
 
 if test "x$gdktarget" = "xx11"; then
-        PANGO_PACKAGES=pangoxft
+        PANGO_PACKAGES="pangoxft pangocairo"
 	
         # We no longer use pangox, but if we find it, we link to it 
 	# for binary compatibility.
@@ -1321,11 +1411,11 @@ if test "x$gdktarget" = "xx11"; then
 		PANGO_PACKAGES="$PANGO_PACKAGES pangox"
 	fi
 elif test "x$gdktarget" = "xwin32"; then
-        PANGO_PACKAGES=pangowin32
+        PANGO_PACKAGES="pangowin32 pangocairo"
 elif test "x$gdktarget" = "xlinux-fb"; then
-        PANGO_PACKAGES=pangoft2
+        PANGO_PACKAGES="pangoft2 pangocairo"
 else
-        PANGO_PACKAGES=pango
+        PANGO_PACKAGES="pango pangocairo"
 fi
 
 # Check for Pango flags
@@ -1338,10 +1428,8 @@ if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
         AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS)
 else
         AC_MSG_ERROR([
-*** Pango not found. Pango is required to build GTK+.
-*** See http://www.pango.org for Pango information.
-*** For the framebuffer target, you will need to build 
-*** Pango with freetype support.
+*** Pango not found. Pango built with Cairo support is required
+*** to build GTK+. See http://www.pango.org for Pango information.
 ])
 fi
 
@@ -1361,7 +1449,7 @@ fi
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
-GDK_PACKAGES="$XCURSOR_PACKAGES $PANGO_PACKAGES"
+GDK_PACKAGES="$PANGO_PACKAGES"
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
 GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
 
@@ -1409,12 +1497,16 @@ else
         LIBS="$gtk_save_LIBS"
 fi
 
-GTK_PACKAGES=atk
+GTK_PACKAGES="atk cairo"
 GTK_EXTRA_LIBS=
 GTK_EXTRA_CFLAGS= 
 GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
 GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
 
+if test x"$os_win32" = xyes; then
+  GTK_EXTRA_CFLAGS="$msnative_struct"
+fi
+
 AC_SUBST(GTK_PACKAGES)
 AC_SUBST(GTK_EXTRA_LIBS)
 AC_SUBST(GTK_EXTRA_CFLAGS)
@@ -1425,11 +1517,33 @@ AC_SUBST(GTK_DEP_CFLAGS)
 AC_SUBST(GTK_DEBUG_FLAGS)
 AC_SUBST(GTK_XIM_FLAGS)
 
+################################################################
+# Strip -export-dynamic from the link lines of various libraries
+################################################################
+
+#
+# pkg-config --libs gmodule includes the "export_dynamic" flag,
+#  but this flag is only meaningful for executables. For libraries
+#  the effect is undefined; what it causes on Linux is that the
+#  export list from -export-symbols-regex is ignored and everything
+#  is exported
+#
+# We are using gmodule-no-export now, but I'm leaving the stripping
+# code in place for now, since pango and atk still require gmodule.
+export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+if test -n "$export_dynamic"; then
+  GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
+  GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
+  GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
+  GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
+fi
+
+
 ##################################################
 # Checks for gtk-doc and docbook-tools
 ##################################################
 
-GTK_DOC_CHECK([1.0])
+GTK_DOC_CHECK([1.4])
 
 AC_CHECK_PROG(DB2HTML, db2html, true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
@@ -1439,21 +1553,25 @@ AC_ARG_ENABLE(man,
                               [regenerate man pages from Docbook [default=no]])],enable_man=yes,
               enable_man=no)
 
-dnl
-dnl Check for xsltproc
-dnl
-AC_PATH_PROG([XSLTPROC], [xsltproc])
-if test -z "$XSLTPROC"; then
-  enable_man=no
+if test "${enable_man}" != no; then
+  dnl
+  dnl Check for xsltproc
+  dnl
+  AC_PATH_PROG([XSLTPROC], [xsltproc])
+  if test -z "$XSLTPROC"; then
+    enable_man=no
+  fi
+
+  dnl check for DocBook DTD and stylesheets in the local catalog.
+  JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
+     [DocBook XML DTD V4.1.2],,enable_man=no)
+  JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
+     [DocBook XSL Stylesheets],,enable_man=no)
 fi
 
-dnl check for DocBook DTD and stylesheets in the local catalog.
-JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
-   [DocBook XML DTD V4.1.2],,enable_man=no)
-JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
-   [DocBook XSL Stylesheets],,enable_man=no)
 AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
 
+
 ##################################################
 # Output commands
 ##################################################
@@ -1525,9 +1643,6 @@ fi
 
 ])
 
-AC_PATH_PROG(SGML2HTML, sgml2html, no)
-AM_CONDITIONAL(HAVE_SGML2HTML, test x$SGML2HTML != xno)
-
 AC_CONFIG_FILES([
 config.h.win32
 gtk-zip.sh
@@ -1540,6 +1655,7 @@ gdk-2.0-uninstalled.pc
 gtk+-2.0-uninstalled.pc
 m4macros/Makefile
 po/Makefile.in
+po-properties/Makefile.in
 build/Makefile
 build/win32/Makefile
 build/win32/dirent/Makefile
@@ -1556,6 +1672,7 @@ docs/reference/gdk/version.xml
 docs/reference/gtk/Makefile
 docs/reference/gtk/version.xml
 docs/faq/Makefile
+docs/tools/Makefile
 docs/tutorial/Makefile
 gdk-pixbuf/Makefile
 gdk-pixbuf/gdk_pixbuf.rc
@@ -1576,9 +1693,23 @@ gtk/theme-bits/Makefile
 gtk/xdgmime/Makefile
 modules/Makefile
 modules/input/Makefile
+modules/engines/Makefile
+modules/engines/pixbuf/Makefile
+modules/engines/ms-windows/Makefile
+modules/engines/ms-windows/Theme/Makefile
+modules/engines/ms-windows/Theme/gtk-2.0/Makefile
 contrib/Makefile
 contrib/gdk-pixbuf-xlib/Makefile
 contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc
 ])
 
 AC_OUTPUT
+
+echo "configuration:
+        target: $gdktarget"
+
+if test "x$gdktarget" = "xlinux-fb"; then
+  echo "Warning: The linux-fb GDK target is unmaintained"
+  echo "         and may not work or even compile"
+fi
+

contrib/gdk-pixbuf-xlib/ChangeLog

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

contrib/gdk-pixbuf-xlib/Makefile.am

@@ -13,6 +13,7 @@ libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
 	-version-info $(LT_VERSION_INFO)
 
 libgdk_pixbuf_xlib_2_0_la_LIBADD = \
+        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
 	$(GDK_PIXBUF_XLIB_DEP_LIBS)
 
 libgdk_pixbuf_xlib_2_0_la_SOURCES =         \

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-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/gtk-demo/Makefile.am

@@ -8,16 +8,23 @@ demos =						\
 	appwindow.c				\
 	button_box.c				\
 	changedisplay.c				\
+	clipboard.c				\
 	colorsel.c				\
+	combobox.c				\
 	dialog.c				\
 	drawingarea.c				\
 	editable_cells.c			\
+	entry_completion.c			\
+	expander.c  				\
 	hypertext.c				\
+	iconview.c				\
 	images.c				\
 	list_store.c				\
 	menus.c					\
 	panes.c					\
+	pickers.c				\
 	pixbufs.c				\
+	rotated_text.c				\
 	sizegroup.c				\
 	stock_browser.c				\
 	textview.c				\
@@ -70,12 +77,14 @@ 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)
 

demos/gtk-demo/appwindow.c

@@ -1,6 +1,6 @@
 /* Application main window
  *
- * Demonstrates a typical application window, with menubar, toolbar, statusbar.
+ * Demonstrates a typical application window with menubar, toolbar, statusbar.
  */
 
 #include <gtk/gtk.h>
@@ -61,9 +61,115 @@ activate_radio_action (GtkAction *action, GtkRadioAction *current)
     }
 }
 
+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);
+}
+
+typedef struct 
+{
+  GtkAction action;
+} ToolMenuAction;
+
+typedef struct 
+{
+  GtkActionClass parent_class;
+} ToolMenuActionClass;
+
+G_DEFINE_TYPE(ToolMenuAction, tool_menu_action, GTK_TYPE_ACTION);
+
+static void
+tool_menu_action_class_init (ToolMenuActionClass *class)
+{
+  GTK_ACTION_CLASS (class)->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON;
+}
+
+static void
+tool_menu_action_init (ToolMenuAction *action)
+{
+}
 
 static GtkActionEntry entries[] = {
   { "FileMenu", NULL, "_File" },               /* name, stock id, label */
+  { "OpenMenu", NULL, "_Open" },               /* name, stock id, label */
   { "PreferencesMenu", NULL, "_Preferences" }, /* name, stock id, label */
   { "ColorMenu", NULL, "_Color"  },            /* name, stock id, label */
   { "ShapeMenu", NULL, "_Shape" },             /* name, stock id, label */
@@ -72,9 +178,9 @@ static GtkActionEntry entries[] = {
     "_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 */
+  { "File1", NULL,                             /* name, stock id */
+    "File1", NULL,                             /* label, accelerator */     
+    "Open first file",                         /* tooltip */
     G_CALLBACK (activate_action) }, 
   { "Save", GTK_STOCK_SAVE,                    /* name, stock id */
     "_Save","<control>S",                      /* label, accelerator */     
@@ -91,7 +197,7 @@ static GtkActionEntry entries[] = {
   { "About", NULL,                             /* name, stock id */
     "_About", "<control>A",                    /* label, accelerator */     
     "About",                                   /* tooltip */  
-    G_CALLBACK (activate_action) },
+    G_CALLBACK (about_cb) },
   { "Logo", "demo-gtk-logo",                   /* name, stock id */
      NULL, NULL,                               /* label, accelerator */     
     "GTK+",                                    /* tooltip */
@@ -131,7 +237,7 @@ static guint n_color_entries = G_N_ELEMENTS (color_entries);
 enum {
   SHAPE_SQUARE,
   SHAPE_RECTANGLE,
-  SHAPE_OVAL,
+  SHAPE_OVAL
 };
 
 static GtkRadioActionEntry shape_entries[] = {
@@ -175,8 +281,12 @@ static const gchar *ui_info =
 "      <menuitem action='About'/>"
 "    </menu>"
 "  </menubar>"
-"  <toolbar  name='ToolBar'>"
-"    <toolitem action='Open'/>"
+"  <toolbar name='ToolBar'>"
+"    <toolitem action='Open'>"
+"      <menu action='OpenMenu'>"
+"        <menuitem action='File1'/>"
+"      </menu>"  
+"    </toolitem>"
 "    <toolitem action='Quit'/>"
 "    <separator action='Sep1'/>"
 "    <toolitem action='Logo'/>"
@@ -311,6 +421,7 @@ do_appwindow (GtkWidget *do_widget)
       GtkWidget *bar;
       GtkTextBuffer *buffer;
       GtkActionGroup *action_group;
+      GtkAction *open_action;
       GtkUIManager *merge;
       GError *error = NULL;
 
@@ -323,6 +434,7 @@ do_appwindow (GtkWidget *do_widget)
       gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Application Window");
+      gtk_window_set_icon_name (GTK_WINDOW (window), "gtk-open");
 
       /* NULL window variable when window is closed */
       g_signal_connect (window, "destroy",
@@ -337,9 +449,16 @@ do_appwindow (GtkWidget *do_widget)
        */
       
       action_group = gtk_action_group_new ("AppWindowActions");
+      open_action = g_object_new (tool_menu_action_get_type (), 
+				  "name", "Open",
+				  "label", "_Open",
+				  "tooltip", "Open a file",
+				  "stock-id", GTK_STOCK_OPEN,
+				  NULL);
+      gtk_action_group_add_action (action_group, open_action);
       gtk_action_group_add_actions (action_group, 
 				    entries, n_entries, 
-				    NULL);
+				    window);
       gtk_action_group_add_toggle_actions (action_group, 
 					   toggle_entries, n_toggle_entries, 
 					   NULL);

demos/gtk-demo/clipboard.c

@@ -0,0 +1,321 @@
+/* Clipboard
+ *
+ * GtkClipboard is used for clipboard handling. This demo shows how to
+ * copy and paste text to and from the clipboard. 
+ *
+ * It also shows how to transfer images via the clipboard or via 
+ * drag-and-drop, and how to make clipboard contents persist after
+ * the application exits. Clipboard persistence requires a clipboard
+ * manager to run.
+ */
+
+#include <gtk/gtk.h>
+#include <string.h>
+
+static GtkWidget *window = NULL;
+
+void
+copy_button_clicked (GtkWidget *button,
+                     gpointer   user_data)
+{
+  GtkWidget *entry;
+  GtkClipboard *clipboard;
+
+  entry = GTK_WIDGET (user_data);
+  
+  /* Get the clipboard object */
+  clipboard = gtk_widget_get_clipboard (entry,
+                                        GDK_SELECTION_CLIPBOARD);
+
+  /* Set clipboard text */
+  gtk_clipboard_set_text (clipboard, gtk_entry_get_text (GTK_ENTRY (entry)), -1);
+}
+
+void
+paste_received (GtkClipboard *clipboard,
+                const gchar  *text,
+                gpointer      user_data)
+{
+  GtkWidget *entry;
+
+  entry = GTK_WIDGET (user_data);
+  
+  /* Set the entry text */
+  gtk_entry_set_text (GTK_ENTRY (entry), text);
+}
+
+void
+paste_button_clicked (GtkWidget *button,
+                     gpointer   user_data)
+{
+  GtkWidget *entry;
+  GtkClipboard *clipboard;
+
+  entry = GTK_WIDGET (user_data);
+  
+  /* Get the clipboard object */
+  clipboard = gtk_widget_get_clipboard (entry,
+                                        GDK_SELECTION_CLIPBOARD);
+
+  /* Request the contents of the clipboard, contents_received will be
+     called when we do get the contents.
+   */
+  gtk_clipboard_request_text (clipboard,
+                              paste_received, entry);
+}
+
+static GdkPixbuf *
+get_image_pixbuf (GtkImage *image)
+{
+  gchar *stock_id;
+  GtkIconSize size;
+
+  switch (gtk_image_get_storage_type (image))
+    {
+    case GTK_IMAGE_PIXBUF:
+      return g_object_ref (gtk_image_get_pixbuf (image));
+    case GTK_IMAGE_STOCK:
+      gtk_image_get_stock (image, &stock_id, &size);
+      return gtk_widget_render_icon (GTK_WIDGET (image),
+                                     stock_id, size, NULL);
+    default:
+      g_warning ("Image storage type %d not handled", 
+                 gtk_image_get_storage_type (image));
+      return NULL;
+    }
+}
+
+static void
+drag_begin (GtkWidget      *widget,
+            GdkDragContext *context,
+            gpointer        data)
+{
+  GdkPixbuf *pixbuf;
+
+  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
+  gtk_drag_set_icon_pixbuf (context, pixbuf, -2, -2);
+  g_object_unref (pixbuf);
+}
+
+void  
+drag_data_get  (GtkWidget        *widget,
+                GdkDragContext   *context,
+                GtkSelectionData *selection_data,
+                guint             info,
+                guint             time,
+                gpointer          data)
+{
+  GdkPixbuf *pixbuf;
+
+  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
+  gtk_selection_data_set_pixbuf (selection_data, pixbuf);
+  g_object_unref (pixbuf);
+}
+
+static void
+drag_data_received (GtkWidget        *widget,
+                    GdkDragContext   *context,
+                    gint              x,
+                    gint              y,
+                    GtkSelectionData *selection_data,
+                    guint             info,
+                    guint32           time,
+                    gpointer          data)
+{
+  GdkPixbuf *pixbuf;
+
+  if (selection_data->length > 0)
+    {
+      pixbuf = gtk_selection_data_get_pixbuf (selection_data);
+      gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);
+      g_object_unref (pixbuf);
+    }
+}
+
+static void
+copy_image (GtkMenuItem *item,
+            gpointer     data)
+{
+  GtkClipboard *clipboard;
+  GdkPixbuf *pixbuf;
+
+  clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
+
+  gtk_clipboard_set_image (clipboard, pixbuf);
+  g_object_unref (pixbuf);
+}
+
+static void
+paste_image (GtkMenuItem *item,
+             gpointer     data)
+{
+  GtkClipboard *clipboard;
+  GdkPixbuf *pixbuf;
+
+  clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+  pixbuf = gtk_clipboard_wait_for_image (clipboard);
+
+  if (pixbuf)
+    {
+      gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);
+      g_object_unref (pixbuf);
+    }
+}
+
+static gboolean
+button_press (GtkWidget      *widget,
+              GdkEventButton *button,
+              gpointer        data)
+{
+  GtkWidget *menu;
+  GtkWidget *item;
+  
+  if (button->button != 3)
+    return FALSE;
+
+  menu = gtk_menu_new ();
+  
+  item = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL);
+  g_signal_connect (item, "activate", G_CALLBACK (copy_image), data);
+  gtk_widget_show (item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PASTE, NULL);
+  g_signal_connect (item, "activate", G_CALLBACK (paste_image), data);
+  gtk_widget_show (item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 3, button->time);
+  return TRUE;
+}
+
+GtkWidget *
+do_clipboard (GtkWidget *do_widget)
+{
+  if (!window)
+    {
+      GtkWidget *vbox, *hbox;
+      GtkWidget *label;
+      GtkWidget *entry, *button;
+      GtkWidget *ebox, *image;
+      GtkClipboard *clipboard;
+      
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      vbox = gtk_vbox_new (FALSE, 0);
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
+      
+      gtk_container_add (GTK_CONTAINER (window), vbox);
+
+      label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");
+      
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+      hbox = gtk_hbox_new (FALSE, 4);
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+
+      /* Create the first entry */
+      entry = gtk_entry_new ();
+      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+      
+      /* Create the button */
+      button = gtk_button_new_from_stock (GTK_STOCK_COPY);
+      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (copy_button_clicked), entry);
+
+      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+      hbox = gtk_hbox_new (FALSE, 4);
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+
+      /* Create the second entry */
+      entry = gtk_entry_new ();
+      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+      
+      /* Create the button */
+      button = gtk_button_new_from_stock (GTK_STOCK_PASTE);
+      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (paste_button_clicked), entry);
+      
+      label = gtk_label_new ("Images can be transferred via the clipboard, too");
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+      hbox = gtk_hbox_new (FALSE, 4);
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+
+      /* Create the first image */
+      image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, 
+                                        GTK_ICON_SIZE_BUTTON);
+      ebox = gtk_event_box_new ();
+      gtk_container_add (GTK_CONTAINER (ebox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), ebox);
+
+      /* make ebox a drag source */
+      gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
+      gtk_drag_source_add_image_targets (ebox);
+      g_signal_connect (ebox, "drag_begin", 
+                        G_CALLBACK (drag_begin), image);
+      g_signal_connect (ebox, "drag_data_get", 
+                        G_CALLBACK (drag_data_get), image);
+      
+      /* accept drops on ebox */
+      gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL, 
+                         NULL, 0, GDK_ACTION_COPY);
+      gtk_drag_dest_add_image_targets (ebox);
+      g_signal_connect (ebox, "drag_data_received", 
+                        G_CALLBACK (drag_data_received), image);
+      
+      /* context menu on ebox */
+      g_signal_connect (ebox, "button_press_event", 
+                        G_CALLBACK (button_press), image);
+
+      /* Create the second image */
+      image = gtk_image_new_from_stock (GTK_STOCK_STOP, 
+                                        GTK_ICON_SIZE_BUTTON);
+      ebox = gtk_event_box_new ();
+      gtk_container_add (GTK_CONTAINER (ebox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), ebox);
+
+      /* make ebox a drag source */
+      gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
+      gtk_drag_source_add_image_targets (ebox);
+      g_signal_connect (ebox, "drag_begin", 
+                        G_CALLBACK (drag_begin), image);
+      g_signal_connect (ebox, "drag_data_get", 
+                        G_CALLBACK (drag_data_get), image);
+      
+      /* accept drops on ebox */
+      gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL, 
+                         NULL, 0, GDK_ACTION_COPY);
+      gtk_drag_dest_add_image_targets (ebox);
+      g_signal_connect (ebox, "drag_data_received", 
+                        G_CALLBACK (drag_data_received), image);
+      
+      /* context menu on ebox */
+      g_signal_connect (ebox, "button_press_event", 
+                        G_CALLBACK (button_press), image);
+      
+      /* tell the clipboard manager to make the data persistent */
+      clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+      gtk_clipboard_set_can_store (clipboard, NULL, 0);
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show_all (window);
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

demos/gtk-demo/combobox.c

@@ -0,0 +1,371 @@
+/* Combo boxes 
+ *
+ * The ComboBox widget allows to select one option out of a list.
+ * The ComboBoxEntry additionally allows the user to enter a value
+ * that is not in the list of options. 
+ *
+ * How the options are displayed is controlled by cell renderers.
+ */
+
+#include <gtk/gtk.h>
+
+enum 
+{
+  PIXBUF_COL,
+  TEXT_COL
+};
+
+static gchar *
+strip_underscore (const gchar *text)
+{
+  gchar *p, *q;
+  gchar *result;
+  
+  result = g_strdup (text);
+  p = q = result;
+  while (*p) 
+    {
+      if (*p != '_')
+	{
+	  *q = *p;
+	  q++;
+	}
+      p++;
+    }
+  *q = '\0';
+
+  return result;
+}
+
+static GtkTreeModel *
+create_stock_icon_store (void)
+{
+  gchar *stock_id[6] = {
+    GTK_STOCK_DIALOG_WARNING,
+    GTK_STOCK_STOP,
+    GTK_STOCK_NEW,
+    GTK_STOCK_CLEAR,
+    NULL,
+    GTK_STOCK_OPEN    
+  };
+
+  GtkStockItem item;
+  GdkPixbuf *pixbuf;
+  GtkWidget *cellview;
+  GtkTreeIter iter;
+  GtkListStore *store;
+  gchar *label;
+  gint i;
+
+  cellview = gtk_cell_view_new ();
+  
+  store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
+
+  for (i = 0; i < G_N_ELEMENTS (stock_id); i++)
+    {
+      if (stock_id[i])
+	{
+	  pixbuf = gtk_widget_render_icon (cellview, stock_id[i],
+					   GTK_ICON_SIZE_BUTTON, NULL);
+	  gtk_stock_lookup (stock_id[i], &item);
+	  label = strip_underscore (item.label);
+	  gtk_list_store_append (store, &iter);
+	  gtk_list_store_set (store, &iter,
+			      PIXBUF_COL, pixbuf,
+			      TEXT_COL, label,
+			      -1);
+	  g_free (label);
+	}
+      else
+	{
+	  gtk_list_store_append (store, &iter);
+	  gtk_list_store_set (store, &iter,
+			      PIXBUF_COL, NULL,
+			      TEXT_COL, "separator",
+			      -1);
+	}
+    }
+
+  gtk_widget_destroy (cellview);
+  
+  return GTK_TREE_MODEL (store);
+}
+
+/* A GtkCellLayoutDataFunc that demonstrates how one can control
+ * sensitivity of rows. This particular function does nothing 
+ * useful and just makes the second row insensitive.
+ */
+static void
+set_sensitive (GtkCellLayout   *cell_layout,
+	       GtkCellRenderer *cell,
+	       GtkTreeModel    *tree_model,
+	       GtkTreeIter     *iter,
+	       gpointer         data)
+{
+  GtkTreePath *path;
+  gint *indices;
+  gboolean sensitive;
+
+  path = gtk_tree_model_get_path (tree_model, iter);
+  indices = gtk_tree_path_get_indices (path);
+  sensitive = indices[0] != 1;
+  gtk_tree_path_free (path);
+
+  g_object_set (cell, "sensitive", sensitive, NULL);
+}
+
+/* A GtkTreeViewRowSeparatorFunc that demonstrates how rows can be
+ * rendered as separators. This particular function does nothing 
+ * useful and just turns the fourth row into a separator.
+ */
+static gboolean
+is_separator (GtkTreeModel *model,
+	      GtkTreeIter  *iter,
+	      gpointer      data)
+{
+  GtkTreePath *path;
+  gboolean result;
+
+  path = gtk_tree_model_get_path (model, iter);
+  result = gtk_tree_path_get_indices (path)[0] == 4;
+  gtk_tree_path_free (path);
+
+  return result;
+}
+
+static GtkTreeModel *
+create_capital_store (void)
+{
+  struct {
+    gchar *group;
+    gchar *capital;
+  } capitals[] = {
+    { "A - B", NULL }, 
+    { NULL, "Albany" },
+    { NULL, "Annapolis" },
+    { NULL, "Atlanta" },
+    { NULL, "Augusta" }, 
+    { NULL, "Austin" },
+    { NULL, "Baton Rouge" },
+    { NULL, "Bismarck" },
+    { NULL, "Boise" },
+    { NULL, "Boston" },
+    { "C - D", NULL },
+    { NULL, "Carson City" },
+    { NULL, "Charleston" },
+    { NULL, "Cheyenne" },
+    { NULL, "Columbia" },
+    { NULL, "Columbus" },
+    { NULL, "Concord" },
+    { NULL, "Denver" },
+    { NULL, "Des Moines" },
+    { NULL, "Dover" },
+    { "E - J", NULL },
+    { NULL, "Frankfort" },
+    { NULL, "Harrisburg" },
+    { NULL, "Hartford" },
+    { NULL, "Helena" },
+    { NULL, "Honolulu" },
+    { NULL, "Indianapolis" },
+    { NULL, "Jackson" },
+    { NULL, "Jefferson City" },
+    { NULL, "Juneau" },
+    { "K - O" },
+    { NULL, "Lansing" },
+    { NULL, "Lincoln" },
+    { NULL, "Little Rock" },
+    { NULL, "Madison" },
+    { NULL, "Montgomery" },
+    { NULL, "Montpelier" },
+    { NULL, "Nashville" },
+    { NULL, "Oklahoma City" },
+    { NULL, "Olympia" },
+    { NULL, "P - S" },
+    { NULL, "Phoenix" },
+    { NULL, "Pierre" },
+    { NULL, "Providence" },
+    { NULL, "Raleigh" },
+    { NULL, "Richmond" },
+    { NULL, "Sacramento" },
+    { NULL, "Salem" },
+    { NULL, "Salt Lake City" },
+    { NULL, "Santa Fe" },
+    { NULL, "Springfield" },
+    { NULL, "St. Paul" },
+    { "T - Z", NULL },
+    { NULL, "Tallahassee" },
+    { NULL, "Topeka" },
+    { NULL, "Trenton" },
+    { NULL, NULL }
+  };
+  
+  GtkTreeIter iter, iter2;
+  GtkTreeStore *store;
+  gint i;
+
+  store = gtk_tree_store_new (1, G_TYPE_STRING);
+  
+  for (i = 0; capitals[i].group || capitals[i].capital; i++)
+    {
+      if (capitals[i].group)
+	{
+	  gtk_tree_store_append (store, &iter, NULL);
+	  gtk_tree_store_set (store, &iter, 0, capitals[i].group, -1);
+	}
+      else if (capitals[i].capital)
+	{
+	  gtk_tree_store_append (store, &iter2, &iter);
+	  gtk_tree_store_set (store, &iter2, 0, capitals[i].capital, -1);
+	}
+    }
+  
+  return GTK_TREE_MODEL (store);
+}
+
+static void
+is_capital_sensitive (GtkCellLayout   *cell_layout,
+		      GtkCellRenderer *cell,
+		      GtkTreeModel    *tree_model,
+		      GtkTreeIter     *iter,
+		      gpointer         data)
+{
+  gboolean sensitive;
+
+  sensitive = !gtk_tree_model_iter_has_child (tree_model, iter);
+
+  g_object_set (cell, "sensitive", sensitive, NULL);
+}
+
+static void
+fill_combo_entry (GtkWidget *entry)
+{
+  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "One");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "Two");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "2\302\275");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "Three");
+}
+
+GtkWidget *
+do_combobox (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *vbox, *frame, *box, *combo;
+  GtkTreeModel *model;
+  GtkCellRenderer *renderer;
+  GtkTreePath *path;
+  GtkTreeIter iter;
+
+  if (!window)
+  {
+    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_screen (GTK_WINDOW (window),
+                           gtk_widget_get_screen (do_widget));
+    gtk_window_set_title (GTK_WINDOW (window), "Combo boxes");
+   
+    g_signal_connect (window, "destroy",
+                      G_CALLBACK (gtk_widget_destroyed),
+                      &window);
+    
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
+
+    vbox = gtk_vbox_new (FALSE, 2);
+    gtk_container_add (GTK_CONTAINER (window), vbox);
+
+    /* A combobox demonstrating cell renderers, separators and
+     *  insensitive rows 
+     */
+    frame = gtk_frame_new ("Some stock icons");
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+    
+    box = gtk_vbox_new (FALSE, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
+    gtk_container_add (GTK_CONTAINER (frame), box);
+    
+    model = create_stock_icon_store ();
+    combo = gtk_combo_box_new_with_model (model);
+    g_object_unref (model);
+    gtk_container_add (GTK_CONTAINER (box), combo);
+    
+    renderer = gtk_cell_renderer_pixbuf_new ();
+    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
+    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
+				    "pixbuf", PIXBUF_COL, 
+				    NULL);
+
+    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
+					renderer,
+					set_sensitive,
+					NULL, NULL);
+    
+    renderer = gtk_cell_renderer_text_new ();
+    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
+    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
+				    "text", TEXT_COL,
+				    NULL);
+
+    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
+					renderer,
+					set_sensitive,
+					NULL, NULL);
+
+    gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo), 
+					  is_separator, NULL, NULL);
+    
+    gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
+    
+    /* A combobox demonstrating trees.
+     */
+    frame = gtk_frame_new ("Where are we ?");
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+
+    box = gtk_vbox_new (FALSE, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
+    gtk_container_add (GTK_CONTAINER (frame), box);
+    
+    model = create_capital_store ();
+    combo = gtk_combo_box_new_with_model (model);
+    g_object_unref (model);
+    gtk_container_add (GTK_CONTAINER (box), combo);
+
+    renderer = gtk_cell_renderer_text_new ();
+    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
+    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
+				    "text", 0,
+				    NULL);
+    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
+					renderer,
+					is_capital_sensitive,
+					NULL, NULL);
+
+    path = gtk_tree_path_new_from_indices (0, 8, -1);
+    gtk_tree_model_get_iter (model, &iter, path);
+    gtk_tree_path_free (path);
+    gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);
+
+    /* A GtkComboBoxEntry 
+     */
+    frame = gtk_frame_new ("Editable");
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+    
+    box = gtk_vbox_new (FALSE, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
+    gtk_container_add (GTK_CONTAINER (frame), box);
+    
+    combo = gtk_combo_box_entry_new_text ();
+    fill_combo_entry (combo);
+    gtk_container_add (GTK_CONTAINER (box), combo);
+    
+  }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    {
+      gtk_widget_show_all (window);
+    }
+  else
+    {    
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

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++;

demos/gtk-demo/editable_cells.c

@@ -2,8 +2,12 @@
  *
  * This demo demonstrates the use of editable cells in a GtkTreeView. If
  * you're new to the GtkTreeView widgets and associates, look into
- * the GtkListStore example first.
+ * the GtkListStore example first. It also shows how to use the
+ * GtkCellRenderer::editing-started signal to do custom setup of the
+ * editable widget.
  *
+ * The cell renderers used in this demo are GtkCellRendererText, 
+ * GtkCellRendererCombo and GtkCellRendererProgress.
  */
 
 #include <gtk/gtk.h>
@@ -14,18 +18,24 @@ static GtkWidget *window = NULL;
 
 typedef struct
 {
-  gint     number;
-  gchar   *product;
-  gboolean editable;
+  gint   number;
+  gchar *product;
+  gint   yummy;
 }
 Item;
 
 enum
 {
-  COLUMN_NUMBER,
-  COLUMN_PRODUCT,
-  COLUMN_EDITABLE,
-  NUM_COLUMNS
+  COLUMN_ITEM_NUMBER,
+  COLUMN_ITEM_PRODUCT,
+  COLUMN_ITEM_YUMMY,
+  NUM_ITEM_COLUMNS
+};
+
+enum
+{
+  COLUMN_NUMBER_TEXT,
+  NUM_NUMBER_COLUMNS
 };
 
 static GArray *articles = NULL;
@@ -39,32 +49,32 @@ add_items (void)
 
   foo.number = 3;
   foo.product = g_strdup ("bottles of coke");
-  foo.editable = TRUE;
+  foo.yummy = 20;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 5;
   foo.product = g_strdup ("packages of noodles");
-  foo.editable = TRUE;
+  foo.yummy = 50;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 2;
   foo.product = g_strdup ("packages of chocolate chip cookies");
-  foo.editable = TRUE;
+  foo.yummy = 90;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 1;
   foo.product = g_strdup ("can vanilla ice cream");
-  foo.editable = TRUE;
+  foo.yummy = 60;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 6;
   foo.product = g_strdup ("eggs");
-  foo.editable = TRUE;
+  foo.yummy = 10;
   g_array_append_vals (articles, &foo, 1);
 }
 
 static GtkTreeModel *
-create_model (void)
+create_items_model (void)
 {
   gint i = 0;
   GtkListStore *model;
@@ -76,8 +86,8 @@ create_model (void)
   add_items ();
 
   /* create list store */
-  model = gtk_list_store_new (NUM_COLUMNS, G_TYPE_INT, G_TYPE_STRING,
-			      G_TYPE_BOOLEAN);
+  model = gtk_list_store_new (NUM_ITEM_COLUMNS, G_TYPE_INT, G_TYPE_STRING,
+                              G_TYPE_INT, G_TYPE_BOOLEAN);
 
   /* add items */
   for (i = 0; i < articles->len; i++)
@@ -85,18 +95,46 @@ create_model (void)
       gtk_list_store_append (model, &iter);
 
       gtk_list_store_set (model, &iter,
-			  COLUMN_NUMBER,
-			  g_array_index (articles, Item, i).number,
-			  COLUMN_PRODUCT,
-			  g_array_index (articles, Item, i).product,
-			  COLUMN_EDITABLE,
-			  g_array_index (articles, Item, i).editable,
-			  -1);
+                          COLUMN_ITEM_NUMBER,
+                          g_array_index (articles, Item, i).number,
+                          COLUMN_ITEM_PRODUCT,
+                          g_array_index (articles, Item, i).product,
+                          COLUMN_ITEM_YUMMY,
+                          g_array_index (articles, Item, i).yummy,
+                          -1);
     }
 
   return GTK_TREE_MODEL (model);
 }
 
+static GtkTreeModel *
+create_numbers_model (void)
+{
+#define N_NUMBERS 10
+  gint i = 0;
+  GtkListStore *model;
+  GtkTreeIter iter;
+
+  /* create list store */
+  model = gtk_list_store_new (NUM_NUMBER_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
+
+  /* add numbers */
+  for (i = 0; i < N_NUMBERS; i++)
+    {
+      char str[2] = { '0' + i, '\0' };
+
+      gtk_list_store_append (model, &iter);
+
+      gtk_list_store_set (model, &iter,
+                          COLUMN_NUMBER_TEXT, str,
+                          -1);
+    }
+
+  return GTK_TREE_MODEL (model);
+
+#undef N_NUMBERS
+}
+
 static void
 add_item (GtkWidget *button, gpointer data)
 {
@@ -108,15 +146,15 @@ add_item (GtkWidget *button, gpointer data)
 
   foo.number = 0;
   foo.product = g_strdup ("Description here");
-  foo.editable = TRUE;
+  foo.yummy = 50;
   g_array_append_vals (articles, &foo, 1);
 
   gtk_list_store_append (GTK_LIST_STORE (model), &iter);
   gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-		      COLUMN_NUMBER, foo.number,
-		      COLUMN_PRODUCT, foo.product,
-		      COLUMN_EDITABLE, foo.editable,
-		      -1);
+                      COLUMN_ITEM_NUMBER, foo.number,
+                      COLUMN_ITEM_PRODUCT, foo.product,
+                      COLUMN_ITEM_YUMMY, foo.yummy,
+                      -1);
 }
 
 static void
@@ -142,11 +180,37 @@ remove_item (GtkWidget *widget, gpointer data)
     }
 }
 
+static gboolean
+separator_row (GtkTreeModel *model,
+               GtkTreeIter  *iter,
+               gpointer      data)
+{
+  GtkTreePath *path;
+  gint idx;
+
+  path = gtk_tree_model_get_path (model, iter);
+  idx = gtk_tree_path_get_indices (path)[0];
+
+  gtk_tree_path_free (path);
+
+  return idx == 5;
+}
+
+static void
+editing_started (GtkCellRenderer *cell,
+                 GtkCellEditable *editable,
+                 const gchar     *path,
+                 gpointer         data)
+{
+  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (editable), 
+                                        separator_row, NULL, NULL);
+}
+
 static void
 cell_edited (GtkCellRendererText *cell,
-	     const gchar         *path_string,
-	     const gchar         *new_text,
-	     gpointer             data)
+             const gchar         *path_string,
+             const gchar         *new_text,
+             gpointer             data)
 {
   GtkTreeModel *model = (GtkTreeModel *)data;
   GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
@@ -158,31 +222,31 @@ cell_edited (GtkCellRendererText *cell,
 
   switch (column)
     {
-    case COLUMN_NUMBER:
+    case COLUMN_ITEM_NUMBER:
       {
-	gint i;
+        gint i;
 
-	i = gtk_tree_path_get_indices (path)[0];
-	g_array_index (articles, Item, i).number = atoi (new_text);
+        i = gtk_tree_path_get_indices (path)[0];
+        g_array_index (articles, Item, i).number = atoi (new_text);
 
-	gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
-			    g_array_index (articles, Item, i).number, -1);
+        gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
+                            g_array_index (articles, Item, i).number, -1);
       }
       break;
 
-    case COLUMN_PRODUCT:
+    case COLUMN_ITEM_PRODUCT:
       {
-	gint i;
-	gchar *old_text;
+        gint i;
+        gchar *old_text;
 
         gtk_tree_model_get (model, &iter, column, &old_text, -1);
-	g_free (old_text);
+        g_free (old_text);
 
-	i = gtk_tree_path_get_indices (path)[0];
-	g_free (g_array_index (articles, Item, i).product);
-	g_array_index (articles, Item, i).product = g_strdup (new_text);
+        i = gtk_tree_path_get_indices (path)[0];
+        g_free (g_array_index (articles, Item, i).product);
+        g_array_index (articles, Item, i).product = g_strdup (new_text);
 
-	gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
+        gtk_list_store_set (GTK_LIST_STORE (model), &iter, column,
                             g_array_index (articles, Item, i).product, -1);
       }
       break;
@@ -192,34 +256,55 @@ cell_edited (GtkCellRendererText *cell,
 }
 
 static void
-add_columns (GtkTreeView *treeview)
+add_columns (GtkTreeView  *treeview, 
+             GtkTreeModel *items_model,
+             GtkTreeModel *numbers_model)
 {
   GtkCellRenderer *renderer;
-  GtkTreeModel *model = gtk_tree_view_get_model (treeview);
 
   /* number column */
-  renderer = gtk_cell_renderer_text_new ();
+  renderer = gtk_cell_renderer_combo_new ();
+  g_object_set (renderer,
+                "model", numbers_model,
+                "text-column", COLUMN_NUMBER_TEXT,
+                "has-entry", FALSE,
+                "editable", TRUE,
+                NULL);
   g_signal_connect (renderer, "edited",
-		    G_CALLBACK (cell_edited), model);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_NUMBER);
+                    G_CALLBACK (cell_edited), items_model);
+  g_signal_connect (renderer, "editing-started",
+                    G_CALLBACK (editing_started), NULL);
+  g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (COLUMN_ITEM_NUMBER));
 
   gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-					       -1, "Number", renderer,
-					       "text", COLUMN_NUMBER,
-					       "editable", COLUMN_EDITABLE,
-					       NULL);
+                                               -1, "Number", renderer,
+                                               "text", COLUMN_ITEM_NUMBER,
+                                               NULL);
 
   /* product column */
   renderer = gtk_cell_renderer_text_new ();
+  g_object_set (renderer,
+                "editable", TRUE,
+                NULL);
   g_signal_connect (renderer, "edited",
-		    G_CALLBACK (cell_edited), model);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_PRODUCT);
+                    G_CALLBACK (cell_edited), items_model);
+  g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (COLUMN_ITEM_PRODUCT));
 
   gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-					       -1, "Product", renderer,
-					       "text", COLUMN_PRODUCT,
-					       "editable", COLUMN_EDITABLE,
-					       NULL);
+                                               -1, "Product", renderer,
+                                               "text", COLUMN_ITEM_PRODUCT,
+                                               NULL);
+
+  /* yummy column */
+  renderer = gtk_cell_renderer_progress_new ();
+  g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (COLUMN_ITEM_YUMMY));
+
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
+                                               -1, "Yummy", renderer,
+                                               "value", COLUMN_ITEM_YUMMY,
+                                               NULL);
+  
+
 }
 
 GtkWidget *
@@ -232,43 +317,47 @@ do_editable_cells (GtkWidget *do_widget)
       GtkWidget *sw;
       GtkWidget *treeview;
       GtkWidget *button;
-      GtkTreeModel *model;
+      GtkTreeModel *items_model;
+      GtkTreeModel *numbers_model;
 
       /* create window, etc */
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Shopping list");
       gtk_container_set_border_width (GTK_CONTAINER (window), 5);
       g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_vbox_new (FALSE, 5);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       gtk_box_pack_start (GTK_BOX (vbox),
-			  gtk_label_new ("Shopping list (you can edit the cells!)"),
-			  FALSE, FALSE, 0);
+                          gtk_label_new ("Shopping list (you can edit the cells!)"),
+                          FALSE, FALSE, 0);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-					   GTK_SHADOW_ETCHED_IN);
+                                           GTK_SHADOW_ETCHED_IN);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-				      GTK_POLICY_AUTOMATIC,
-				      GTK_POLICY_AUTOMATIC);
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_AUTOMATIC);
       gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
 
-      /* create model */
-      model = create_model ();
+      /* create models */
+      items_model = create_items_model ();
+      numbers_model = create_numbers_model ();
 
       /* create tree view */
-      treeview = gtk_tree_view_new_with_model (model);
-      g_object_unref (model);
+      treeview = gtk_tree_view_new_with_model (items_model);
       gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
       gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
-				   GTK_SELECTION_SINGLE);
+                                   GTK_SELECTION_SINGLE);
 
-      add_columns (GTK_TREE_VIEW (treeview));
+      add_columns (GTK_TREE_VIEW (treeview), items_model, numbers_model);
+
+      g_object_unref (numbers_model);
+      g_object_unref (items_model);
 
       gtk_container_add (GTK_CONTAINER (sw), treeview);
 
@@ -278,12 +367,12 @@ do_editable_cells (GtkWidget *do_widget)
 
       button = gtk_button_new_with_label ("Add item");
       g_signal_connect (button, "clicked",
-			G_CALLBACK (add_item), model);
+                        G_CALLBACK (add_item), items_model);
       gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
 
       button = gtk_button_new_with_label ("Remove item");
       g_signal_connect (button, "clicked",
-			G_CALLBACK (remove_item), treeview);
+                        G_CALLBACK (remove_item), treeview);
       gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
 
       gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);

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/hypertext.c

@@ -280,13 +280,13 @@ do_hypertext (GtkWidget *do_widget)
 
       view = gtk_text_view_new ();
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
-      g_signal_connect (G_OBJECT (view), "key-press-event", 
+      g_signal_connect (view, "key-press-event", 
 			G_CALLBACK (key_press_event), NULL);
-      g_signal_connect (G_OBJECT (view), "event-after", 
+      g_signal_connect (view, "event-after", 
 			G_CALLBACK (event_after), NULL);
-      g_signal_connect (G_OBJECT (view), "motion-notify-event", 
+      g_signal_connect (view, "motion-notify-event", 
 			G_CALLBACK (motion_notify_event), NULL);
-      g_signal_connect (G_OBJECT (view), "visibility-notify-event", 
+      g_signal_connect (view, "visibility-notify-event", 
 			G_CALLBACK (visibility_notify_event), NULL);
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));

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 correspond to the text
+	   * and pixbuf of each item
+	   */
+	  gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), COL_DISPLAY_NAME);
+	  gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_view), COL_PIXBUF);
+
+	  /* Connect to the "item_activated" signal */
+	  g_signal_connect (icon_view, "item_activated",
+			    G_CALLBACK (item_activated), store);
+	  gtk_container_add (GTK_CONTAINER (sw), icon_view);
+
+	  gtk_widget_grab_focus (icon_view);
+	}
+    }
+  
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show_all (window);
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}
+

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)

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>
 
@@ -122,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);
@@ -385,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;
@@ -464,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));
@@ -664,7 +666,7 @@ create_text (GtkTextBuffer **buffer,
   
   if (is_source)
     {
-      font_desc = pango_font_description_from_string ("Courier 12");
+      font_desc = pango_font_description_from_string ("monospace");
       gtk_widget_modify_font (text_view, font_desc);
       pango_font_description_free (font_desc);
 
@@ -694,6 +696,7 @@ create_tree (void)
   GtkTreeViewColumn *column;
   GtkTreeStore *model;
   GtkTreeIter iter;
+  GtkWidget *box, *label, *scrolled_window;
 
   Demo *d = testgtk_demos;
 
@@ -761,11 +764,29 @@ create_tree (void)
   gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
 			       GTK_TREE_VIEW_COLUMN (column));
 
+  gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter);
+  gtk_tree_selection_select_iter (GTK_TREE_SELECTION (selection), &iter);
+
   g_signal_connect (selection, "changed", G_CALLBACK (selection_cb), model);
   g_signal_connect (tree_view, "row_activated", G_CALLBACK (row_activated_cb), model);
 
-  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
-  return tree_view;
+  gtk_tree_view_collapse_all (GTK_TREE_VIEW (tree_view));
+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
+  				    
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+				  GTK_POLICY_NEVER,
+				  GTK_POLICY_AUTOMATIC);
+  gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
+
+  label = gtk_label_new ("Widget (double click for demo)");
+
+  box = gtk_notebook_new ();
+  gtk_notebook_append_page (GTK_NOTEBOOK (box), scrolled_window, label);
+
+  gtk_widget_grab_focus (tree_view);
+
+  return box;
 }
 
 static void

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/pickers.c

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

demos/gtk-demo/pixbufs.c

@@ -12,7 +12,6 @@
  *
  */
 
-#include <config.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <math.h>
@@ -265,6 +264,7 @@ do_pixbufs (GtkWidget *do_widget)
     {
       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/ui_manager.c

@@ -88,7 +88,7 @@ static guint n_color_entries = G_N_ELEMENTS (color_entries);
 enum {
   SHAPE_SQUARE,
   SHAPE_RECTANGLE,
-  SHAPE_OVAL,
+  SHAPE_OVAL
 };
 
 static GtkRadioActionEntry shape_entries[] = {

demos/pixbuf-init.c

@@ -1,3 +1,4 @@
+#include <config.h>
 #include <glib.h>
 
 #include <sys/stat.h>

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>

demos/testpixbuf.c

@@ -427,7 +427,7 @@ new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)
 
 	gtk_widget_show (window);
 
-        return window;
+        return drawing_area;
 }
 
 
@@ -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

@@ -15,22 +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 and interface age by 1.
-(Note that this is critical, a slip-up here will cause the soname to change).
-4) Add === Released 2.x.y === at the top of the ChangeLog
-5) make mydistcheck
-6) Fix broken stuff found by 4) repeat
-7) cvs commit; you'll have a bunch of po file changes, and maybe some
+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) 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_x_y' 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/gtk-faq.sgml

@@ -2,7 +2,7 @@
 <book>
 
 <bookinfo>
-  <date>November 24th 2003</date>
+  <date>January 14th 2004</date>
   <title>GTK+ FAQ</title>
   <authorgroup>
     <author>
@@ -429,7 +429,7 @@ in which they need to be installed:</para>
 
 <itemizedlist spacing=compact>
 <listitem><simpara> pkg-config
-(<ulink url="http://www.freedesktop.org/software/pkgconfig/">
+(<ulink url="http://www.freedesktop.org/software/pkgconfig">
 pkg-config Site</ulink>)</simpara>
 </listitem>
 
@@ -976,7 +976,7 @@ url="ftp://ftp.gnu.org/gnu/make/">ftp://ftp.gnu.org/gnu/make/</ulink>).</para>
 
 <sect1>
 <title>I want to add some configure stuff, how could I do
-this?</title>
+this? <emphasis>[GTK 2.x]</emphasis></title>
 
 <para>To use autoconf/automake, you must first install the
 relevant packages. These are:</para>
@@ -985,10 +985,10 @@ relevant packages. These are:</para>
 <listitem><simpara>the m4 preprocessor v1.4 or better</simpara>
 </listitem>
 
-<listitem><simpara>autoconf v2.13 or better</simpara>
+<listitem><simpara>autoconf v2.54 or better</simpara>
 </listitem>
 
-<listitem><simpara>automake v1.4 or better</simpara>
+<listitem><simpara>automake v1.7 or better suggested</simpara>
 </listitem>
 </itemizedlist>
 
@@ -1003,20 +1003,20 @@ you must create a configure.in which may look like:</para>
 dnl Process this file with autoconf to produce a configure script.
 dnl configure.in for a GTK+ based program
 
-AC_INIT(myprg.c)dnl
-AM_INIT_AUTOMAKE(mypkgname,0.0.1)dnl
-AM_CONFIG_HEADER(config.h)dnl
+AC_INIT(myprg.c)
+AM_INIT_AUTOMAKE(mypkgname, 0.0.1)
+AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
 AC_PROG_CC dnl check for the c compiler
 dnl you should add CFLAGS="" here, 'cos it is set to -g by PROG_CC
 
 dnl Checks for libraries.
-AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(mypkgname 0.1 needs GTK))dnl
+AM_PATH_GTK_2_0(2.2.0,,AC_MSG_ERROR(mypkgname 0.1 needs GTK+ 2.2.0))
 
 AC_OUTPUT(
 	Makefile
-)dnl
+)
 </programlisting>
 
 <para>You must add a Makefile.am file:</para>
@@ -1469,7 +1469,7 @@ in a priority of G_PRIORITY_HIGH.</para>
 
 <sect1>
 <title>Why does this strange 'x io error' occur when I
-<literal>fork()</literal> in my GTK+ app?</title>
+<literal>fork()</literal> in my GTK+ app? <emphasis>[GTK 2.x]</emphasis></title>
 
 <para>This is not really a GTK+ problem, and the problem is
 not related to <literal>fork()</literal> either. If the 'x io
@@ -1490,13 +1490,15 @@ illustrate handling fork() and exit().</para>
 <programlisting role="C">
 /*-------------------------------------------------------------------------
  * Filename:      gtk-fork.c
- * Version:       0.99.1
+ * Version:       0.99.2
  * Copyright:     Copyright (C) 1999, Erik Mouw
  * Author:        Erik Mouw &lt;J.A.K.Mouw@its.tudelft.nl&gt;
  * Description:   GTK+ fork example
  * Created at:    Thu Sep 23 21:37:55 1999
  * Modified by:   Erik Mouw &lt;J.A.K.Mouw@its.tudelft.nl&gt;
  * Modified at:   Thu Sep 23 22:39:39 1999
+ * Modified by:   Tony Gale &lt;gale@gtk.org&gt;
+ * Modified at:   Wed Jan 14 12:38:00 2004
  *-----------------------------------------------------------------------*/
 /*
  * Compile with:
@@ -1525,7 +1527,7 @@ void sigchld_handler(int num)
   sigprocmask(SIG_BLOCK, &amp;set, &amp;oldset);
 
   /* wait for child */
-  while((pid = waitpid((pid_t)-1, &amp;status, WNOHANG)) > 0)
+  while((pid = waitpid((pid_t)-1, &amp;status, WNOHANG)) &gt; 0)
     {
       if(WIFEXITED(status))
 	{
@@ -1622,13 +1624,13 @@ int main(int argc, char *argv[])
    */
   window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
-  gtk_signal_connect(GTK_OBJECT (window), "delete_event",
-		     GTK_SIGNAL_FUNC(delete_event), NULL);
+  g_signal_connect(G_OBJECT (window), "delete_event",
+		     G_CALLBACK(delete_event), NULL);
           
-  gtk_signal_connect(GTK_OBJECT (window), "destroy",
-		     GTK_SIGNAL_FUNC(destroy), NULL);
+  g_signal_connect(G_OBJECT (window), "destroy",
+		     G_CALLBACK(destroy), NULL);
 
-#if (GTK_MAJOR_VERSION == 1) && (GTK_MINOR_VERSION == 0)
+#if (GTK_MAJOR_VERSION == 1) &amp;&amp; (GTK_MINOR_VERSION == 0)
   gtk_container_border_width(GTK_CONTAINER (window), 10);
 #else  
   gtk_container_set_border_width(GTK_CONTAINER (window), 10);
@@ -1637,8 +1639,8 @@ int main(int argc, char *argv[])
   /* add a button to do something usefull */
   button = gtk_button_new_with_label("Fork me!");
           
-  gtk_signal_connect(GTK_OBJECT (button), "clicked",
-		     GTK_SIGNAL_FUNC(fork_me), NULL);
+  g_signal_connect(G_OBJECT (button), "clicked",
+		     G_CALLBACK(fork_me), NULL);
 
   gtk_container_add(GTK_CONTAINER(window), button);
           
@@ -1663,7 +1665,7 @@ int main(int argc, char *argv[])
 
 <sect1>
 <title>Why don't the contents of a button move when the button
-is pressed? Here's a patch to make it work that way...</title>
+is pressed? Here's a patch to make it work that way... <emphasis>[GTK 2.x]</emphasis></title>
 
 <para>From: Peter Mattis</para>
 
@@ -1689,12 +1691,12 @@ and determined it didn't look good and removed it.</quote></para>
 
 <sect1>
 <title>How do I identifiy a widgets top level window or other
-ancestor?</title>
+ancestor? <emphasis>[GTK 2.x]</emphasis></title>
 
 <para>There are a couple of ways to find the top level parent
-of a widget. The easier way is to call the
+of a widget. The easiest way is to call the
 <literal>gtk_widget_get_toplevel()</literal> function that
-returns pointer to a GtkWidget that is the top level
+returns a pointer to a GtkWidget that is the top level
 window.</para>
 
 <para>A more complicated way to do this (but less limited, as
@@ -1718,12 +1720,16 @@ widget (entry, label, etc. To find the master hbox using the
       hbox = gtk_widget_get_ancestor(w, GTK_TYPE_HBOX);
 </programlisting>
 
+<para>You can also follow the a widgets ancestry by using the function
+<literal>gtk_widget_get_parent()</literal> that returns a pointer
+to a widgets parent widget.</para>
+
 </sect1>
 
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>How do I get the Window ID of a GtkWindow?</title>
+<title>How do I get the Window ID of a GtkWindow? <emphasis>[GTK 2.x]</emphasis></title>
 
 <para>The actual Gdk/X window will be created when the widget
 gets realized. You can get the Window ID with:</para>
@@ -1738,8 +1744,7 @@ Window xwin = GDK_WINDOW_XWINDOW (GTK_WIDGET (my_window)->window);
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>How do I catch a double click event (in a list widget,
-for example)?</title>
+<title>How do I catch a double click event? <emphasis>[GTK 2.x]</emphasis></title>
 
 <para>Tim Janik wrote to gtk-list (slightly modified):</para>
 
@@ -1749,10 +1754,10 @@ for example)?</title>
 gint
 signal_handler_event(GtkWidget *widget, GdkEventButton *event, gpointer func_data)
 {
-  if (GTK_IS_LIST_ITEM(widget) &&
+  if (GTK_IS_BUTTON(widget) &&
        (event->type==GDK_2BUTTON_PRESS ||
         event->type==GDK_3BUTTON_PRESS) ) {
-    printf("I feel %s clicked on button %d\n",
+    printf("I feel %s clicked with button %d\n",
            event->type==GDK_2BUTTON_PRESS ? "double" : "triple",
            event->button);
   }
@@ -1764,18 +1769,18 @@ signal_handler_event(GtkWidget *widget, GdkEventButton *event, gpointer func_dat
 
 <programlisting role="C">
 {
-  /* list, list item init stuff */     
+  /* button init stuff */     
 
-  gtk_signal_connect(GTK_OBJECT(list_item),
+  g_signal_connect(G_OBJECT(button),
                      "button_press_event",
-                     GTK_SIGNAL_FUNC(signal_handler_event),
+                     G_CALLBACK(signal_handler_event),
                      NULL);
 
   /* and/or */
 
-  gtk_signal_connect(GTK_OBJECT(list_item),
+  g_signal_connect(G_OBJECT(button),
                      "button_release_event",
-                     GTK_SIGNAL_FUNC(signal_handler_event),
+                     G_CALLBACK(signal_handler_event),
                      NULL);
 
   /* something else */
@@ -2870,7 +2875,7 @@ be:</para>
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>How do I validate/limit/filter the input to a GtkEntry?</title>
+<title>How do I validate/limit/filter the input to a GtkEntry? <emphasis>[GTK 2.x]</emphasis></title>
 
 <para>If you want to validate the text that a user enters into
 a GtkEntry widget you can attach to the "insert_text" signal
@@ -2901,16 +2906,16 @@ void insert_text_handler (GtkEntry    *entry,
   }
   
   if (count > 0) {
-    gtk_signal_handler_block_by_func (GTK_OBJECT (editable),
-				      GTK_SIGNAL_FUNC (insert_text_handler),
-				      data);
+    g_signal_handlers_block_by_func (G_OBJECT (editable),
+                                     G_CALLBACK (insert_text_handler),
+                                     data);
     gtk_editable_insert_text (editable, result, count, position);
-    gtk_signal_handler_unblock_by_func (GTK_OBJECT (editable),
-					GTK_SIGNAL_FUNC (insert_text_handler),
-					data);
+    g_signal_handlers_unblock_by_func (G_OBJECT (editable),
+                                       G_CALLBACK (insert_text_handler),
+                                       data);
   }
-  gtk_signal_emit_stop_by_name (GTK_OBJECT (editable), "insert_text");
-  
+  g_signal_stop_emission_by_name (G_OBJECT (editable), "insert_text");
+
   g_free (result);
 }
 
@@ -2925,12 +2930,13 @@ int main (int   argc,
   /* create a new window */
   window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title(GTK_WINDOW (window), "GTK Entry");
-  gtk_signal_connect(GTK_OBJECT (window), "delete_event",
-		     (GtkSignalFunc) gtk_exit, NULL);
-  
+  g_signal_connect (G_OBJECT (window), "destroy",
+                    G_CALLBACK (gtk_main_quit),
+                    NULL);
+
   entry = gtk_entry_new();
-  gtk_signal_connect(GTK_OBJECT(entry), "insert_text",
-		     GTK_SIGNAL_FUNC(insert_text_handler),
+  g_signal_connect(G_OBJECT(entry), "insert_text",
+		     G_CALLBACK(insert_text_handler),
 		     NULL);
   gtk_container_add(GTK_CONTAINER (window), entry);
   gtk_widget_show(entry);

docs/focus_tracking.txt

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

docs/iconcache.txt

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

docs/reference/gdk-pixbuf/Makefile.am

@@ -21,12 +21,14 @@ CFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.c $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.
 # Header files to ignore when scanning
 IGNORE_HFILES=				\
 	pixops				\
+	gdk-pixbuf-alias.h		\
 	gdk-pixbuf-marshal.h		\
 	gdk-pixbuf-xlib-private.h 	\
 	gdk-pixbuf-i18n.h 		\
 	gdk-pixbuf-private.h		\
 	io-gif-animation.h		\
 	io-ani-animation.h		\
+	xpm-color-table.h		\
 	test-images.h
 
 INCLUDES = 			\
@@ -57,7 +59,7 @@ content_files =				\
 	gdk-pixbuf-query-loaders.xml
 
 # Images to copy into HTML directory
-HTML_IMAGES = 
+HTML_IMAGES = composite.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=
@@ -65,7 +67,12 @@ FIXXREF_OPTIONS=
 include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += version.xml.in \
+	composite.png \
+	composite.dia \
+	apple-red-1a.png \
+	apple-red-2c.png \
+	gnome-gmush-1.png
 
 ########################################################################
 

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

@@ -21,77 +21,81 @@
 .SH NAME
 gdk-pixbuf-csource \- C code generation utility for GdkPixbuf images
 .SH "SYNOPSIS"
-
-.nf
-\fBgdk-pixbuf-csource\fR [options] [image]
-.fi
-
-.nf
-\fBgdk-pixbuf-csource\fR [options] --build-list [[name] [image]...]
-.fi
+.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\&.
+ \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\&.
+ \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
+\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)\&.
+\fB\-\-struct\fR
+Generate GdkPixdata structure (needs the GdkPixdata structure definition from \fIgdk\-pixdata\&.h\fR)\&.
 
 .TP
-\fB--macros\fR
+\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)\&.
+\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\&.
+\fB\-\-raw\fR
+Disables run\-length encoding for the generated pixel data\&.
 
 .TP
-\fB--extern\fR
+\fB\-\-extern\fR
 Generate extern symbols\&.
 
 .TP
-\fB--static\fR
+\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\&.
+\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)\&.
+\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
+\fB\-\-build\-list\fR
 Enables (\fIname\fR, \fIimage\fR) pair parsing mode\&.
 
 .TP
-\fB-h\fR, \fB--help\fR
+\fB\-h\fR, \fB\-\-help\fR
 Print brief help and exit\&.
 
 .TP
-\fB-v\fR, \fB--version\fR
+\fB\-v\fR, \fB\-\-version\fR
 Print version and exit\&.
 
 .TP
-\fB--g-fatal-warnings\fR
+\fB\-\-g\-fatal\-warnings\fR
 Make warnings fatal (causes the program to abort)\&.
 
 .SH "SEE ALSO"
@@ -102,12 +106,12 @@ The GdkPixbuf documentation, shipped with the Gtk+ distribution, available from
 .SH "BUGS"
 
 .PP
-None known yet\&.
+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>\&.
+ \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

@@ -154,7 +154,9 @@ Gtk+ distribution, available from <ulink url="http://www.gtk.org">www.gtk.org</u
 
 <refsect1><title>Bugs</title>
 <para>
-None known yet.
+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>
 

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>
@@ -57,12 +63,19 @@ GdkPixbufDestroyNotify
 <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>
@@ -101,6 +114,8 @@ gdk_pixbuf_fill
 <FILE>animation</FILE>
 GdkPixbufAnimation
 GdkPixbufAnimationIter
+GdkPixbufAnimation
+GdkPixbufAnimationIter
 gdk_pixbuf_animation_new_from_file
 gdk_pixbuf_animation_ref
 gdk_pixbuf_animation_unref
@@ -114,6 +129,11 @@ gdk_pixbuf_animation_iter_get_delay_time
 gdk_pixbuf_animation_iter_on_currently_loading_frame
 gdk_pixbuf_animation_iter_get_pixbuf
 
+<SUBSECTION>
+GdkPixbufSimpleAnim
+gdk_pixbuf_simple_anim_new
+gdk_pixbuf_simple_anim_add_frame
+
 <SUBSECTION Standard>
 GDK_PIXBUF_ANIMATION
 GDK_TYPE_PIXBUF_ANIMATION
@@ -122,11 +142,22 @@ GDK_IS_PIXBUF_ANIMATION_ITER
 GDK_PIXBUF_ANIMATION_ITER
 GDK_TYPE_PIXBUF_ANIMATION_ITER
 
+GDK_PIXBUF_SIMPLE_ANIM_GET_CLASS
+GDK_IS_PIXBUF_SIMPLE_ANIM
+GDK_PIXBUF_SIMPLE_ANIM_CLASS
+GDK_IS_PIXBUF_SIMPLE_ANIM_CLASS
+GDK_TYPE_PIXBUF_SIMPLE_ANIM
+GDK_PIXBUF_SIMPLE_ANIM
+GdkPixbufSimpleAnimClass
+
 <SUBSECTION Private>
 gdk_pixbuf_non_anim_new
 
 gdk_pixbuf_animation_get_type
 gdk_pixbuf_animation_iter_get_type
+
+gdk_pixbuf_simple_anim_get_type
+gdk_pixbuf_simple_anim_iter_get_type
 </SECTION>
 
 <SECTION>
@@ -137,12 +168,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>
@@ -180,6 +216,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
@@ -228,6 +268,7 @@ XlibRgbCmap
 XlibRgbDither
 xlib_rgb_init
 xlib_rgb_init_with_depth
+xlib_rgb_xpixel_from_rgb
 xlib_rgb_gc_set_foreground
 xlib_rgb_gc_set_background
 xlib_draw_rgb_image

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

@@ -130,7 +130,21 @@
     &gdk-pixbuf-query-loaders;
   </reference>
 
-  <index/>
+  <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;
 

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

@@ -20,16 +20,30 @@ Animated images.
     #GdkPixbufLoader
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkPixbufAnimation ##### -->
-  <para>
-    This object describes an animation.
-  </para>
+<para>
+
+</para>
 
 
 <!-- ##### STRUCT GdkPixbufAnimationIter ##### -->
 <para>
-A #GdkPixbufAnimationIter provides the necessary functionality to
-display an animation. See gdk_pixbuf_animation_get_iter().
+
+</para>
+
+
+<!-- ##### STRUCT GdkPixbufAnimation ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT GdkPixbufAnimationIter ##### -->
+<para>
+
 </para>
 
 
@@ -143,3 +157,29 @@ display an animation. See gdk_pixbuf_animation_get_iter().
 @Returns: 
 
 
+<!-- ##### STRUCT GdkPixbufSimpleAnim ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gdk_pixbuf_simple_anim_new ##### -->
+<para>
+
+</para>
+
+@width: 
+@height: 
+@rate: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_simple_anim_add_frame ##### -->
+<para>
+
+</para>
+
+@animation: 
+@pixbuf: 
+
+

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>
 
@@ -52,3 +55,29 @@ End:
 @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

@@ -6,7 +6,11 @@ Saving a pixbuf to a file.
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-
+These functions allow to save a #GdkPixbuf in a number of 
+file formats. The formatted data can be written to a file
+or to a memory buffer. &gdk-pixbuf; can also call a user-defined
+callback on the data, which allows to e.g. write the image 
+to a socket or store it in a database.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -14,6 +18,9 @@ Saving a pixbuf to a file.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_savev ##### -->
 <para>
 
@@ -41,3 +48,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
@@ -78,65 +81,33 @@ fields.
 
 <!-- ##### 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.
+@gdkpixbufloader: 
 
 <!-- ##### 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.
+@gdkpixbufloader: 
 @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
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
--->
+@gdkpixbufloader: 
 
 <!-- ##### 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.
+@gdkpixbufloader: 
 @arg1: 
 @arg2: 
-<!-- # Unused Parameters # -->
-@width: the original width of the image
-@height: the original height of the image
 
 <!-- ##### FUNCTION gdk_pixbuf_loader_new ##### -->
 <para>
@@ -224,4 +195,11 @@ End:
 @error: 
 @Returns: 
 
+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+
 

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.
@@ -62,6 +65,15 @@ displays.
 @prefDepth: 
 
 
+<!-- ##### FUNCTION xlib_rgb_xpixel_from_rgb ##### -->
+<para>
+
+</para>
+
+@rgb: 
+@Returns: 
+
+
 <!-- ##### FUNCTION xlib_rgb_gc_set_foreground ##### -->
 <para>
 

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;
@@ -76,6 +154,46 @@ In the future it will do full alpha compositing.
   </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>
 
@@ -163,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

@@ -5,15 +5,23 @@ Inline data
 Functions for inlined pixbuf handling.
 
 <!-- ##### SECTION Long_Description ##### -->
-  <para>
-
-  </para>
+<para>
+Using #GdkPixdata, images can be compiled into an application,
+making it unnecessary to refer to external image files at runtime.
+&gdk-pixbuf; includes a utility named gdk-pixbuf-csource, which 
+can be used to convert image files into #GdkPixdata structures suitable
+for inclusion in C sources. To convert the #GdkPixdata structures back 
+into #GdkPixbuf<!-- -->s, use gdk_pixbuf_from_pixdata.
+</para>
 
 <!-- ##### SECTION See_Also ##### -->
   <para>
 
   </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkPixdata ##### -->
   <para>
 

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

@@ -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,6 +195,10 @@ 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 ##### -->
@@ -220,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
@@ -288,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: saves a #GdkPixbuf by calling the given #GdkPixbufSaveFunc.
 
 <!-- ##### 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/Makefile.am

@@ -20,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		\
@@ -27,6 +28,7 @@ IGNORE_HFILES=			\
 	gdkprivate.h		\
 	gdkpoly-generic.h	\
 	gdkregion-generic.h	\
+	keyname-table.h		\
 	linux-fb 		\
 	nanox 			\
 	win32 			\
@@ -58,6 +60,8 @@ content_files = 		\
 
 # Images to copy into HTML directory
 HTML_IMAGES =				\
+	images/rotated-text.png		\
+					\
 	images/X_cursor.png 		\
 	images/arrow.png 		\
 	images/based_arrow_down.png 	\

docs/reference/gdk/gdk-docs.sgml

@@ -15,6 +15,7 @@
 <!ENTITY gdk-Selections SYSTEM "xml/selections.xml">
 <!ENTITY gdk-Properties-and-Atoms SYSTEM "xml/properties.xml">
 <!ENTITY gdk-Pango-Interaction SYSTEM "xml/pango_interaction.xml">
+<!ENTITY gdk-Cairo-Interaction SYSTEM "xml/cairo_interaction.xml">
 <!ENTITY gdk-Points-Rectangles-and-Regions SYSTEM "xml/regions.xml">
 <!ENTITY gdk-Threads SYSTEM "xml/threads.xml">
 <!ENTITY gdk-Keys SYSTEM "xml/keys.xml">
@@ -81,10 +82,27 @@
     &gdk-Input-Devices;
 
     &gdk-Pango-Interaction;
-
+    &gdk-Cairo-Interaction;
     &gdk-X-Window-System-Interaction;
   </reference>
 
-  <index/>
+  <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>  
+  <index role="2.6">
+    <title>Index of new symbols in 2.8</title>
+  </index>  
 
 </book>

docs/reference/gdk/gdk-sections.txt

@@ -61,8 +61,6 @@ GDK_TYPE_GRAB_STATUS
 
 <SUBSECTION Private>
 GDK_TYPE_STATUS
-
-<SUBSECTION Private>
 GdkStatus
 GDKVAR
 gdk_axis_use_get_type
@@ -110,6 +108,10 @@ gdk_window_type_get_type
 gdk_window_type_hint_get_type
 gdk_wm_decoration_get_type
 gdk_wm_function_get_type
+gdk_pointer_grab_info_libgtk_only
+gdk_keyboard_grab_info_libgtk_only
+gdk_add_option_entries_libgtk_only
+gdk_pre_parse_libgtk_only
 </SECTION>
 
 <SECTION>
@@ -135,15 +137,21 @@ gdk_display_peek_event
 gdk_display_put_event
 gdk_display_add_client_message_filter
 gdk_display_set_double_click_time
+gdk_display_set_double_click_distance
 gdk_display_get_pointer
 gdk_display_get_window_at_pointer
 GdkDisplayPointerHooks
 gdk_display_set_pointer_hooks
+gdk_display_warp_pointer
 gdk_display_supports_cursor_color
 gdk_display_supports_cursor_alpha
 gdk_display_get_default_cursor_size
 gdk_display_get_maximal_cursor_size
-
+gdk_display_get_default_group
+gdk_display_supports_selection_notification
+gdk_display_request_selection_notification
+gdk_display_supports_clipboard_persistence
+gdk_display_store_clipboard
 <SUBSECTION Standard>
 GDK_DISPLAY_OBJECT
 GDK_IS_DISPLAY
@@ -189,6 +197,8 @@ gdk_screen_get_system_colormap
 gdk_screen_get_system_visual
 gdk_screen_get_rgb_colormap
 gdk_screen_get_rgb_visual
+gdk_screen_get_rgba_colormap
+gdk_screen_get_rgba_visual
 gdk_screen_get_root_window
 gdk_screen_get_display
 gdk_screen_get_number
@@ -205,6 +215,11 @@ gdk_screen_get_monitor_at_point
 gdk_screen_get_monitor_at_window
 gdk_screen_broadcast_client_message
 gdk_screen_get_setting
+<SUBSECTION Spawning>
+gdk_spawn_on_screen
+gdk_spawn_on_screen_with_pipes
+gdk_spawn_command_line_on_screen
+
 <SUBSECTION Standard>
 GDK_SCREEN
 GDK_IS_SCREEN
@@ -313,6 +328,7 @@ gdk_rgb_get_visual
 gdk_rgb_get_colormap
 gdk_rgb_get_cmap
 gdk_rgb_ditherable
+gdk_rgb_colormap_ditherable
 gdk_rgb_set_verbose
 
 <SUBSECTION Standard>
@@ -451,7 +467,10 @@ GdkSegment
 gdk_draw_rectangle
 gdk_draw_arc
 gdk_draw_polygon
+gdk_draw_trapezoids
+GdkTrapezoid
 gdk_draw_glyphs
+gdk_draw_glyphs_transformed
 gdk_draw_layout_line
 gdk_draw_layout_line_with_colors
 gdk_draw_layout
@@ -624,6 +643,7 @@ gdk_window_move
 gdk_window_resize
 gdk_window_move_resize
 gdk_window_scroll
+gdk_window_move_region
 gdk_window_reparent
 gdk_window_clear
 gdk_window_clear_area
@@ -653,10 +673,14 @@ gdk_window_process_all_updates
 gdk_window_process_updates
 gdk_window_set_debug_updates
 gdk_window_get_internal_paint_info
+gdk_window_enable_synchronized_configure
+gdk_window_configure_finished
 
 <SUBSECTION>
 gdk_window_set_user_data
 gdk_window_set_override_redirect
+gdk_window_set_accept_focus
+gdk_window_set_focus_on_map
 gdk_window_add_filter
 gdk_window_remove_filter
 GdkFilterFunc
@@ -682,6 +706,7 @@ gdk_window_set_modal_hint
 gdk_window_set_type_hint
 gdk_window_set_skip_taskbar_hint
 gdk_window_set_skip_pager_hint
+gdk_window_set_urgency_hint
 gdk_window_get_position
 gdk_window_get_root_origin
 gdk_window_get_frame_extents
@@ -704,6 +729,7 @@ gdk_window_set_icon_name
 gdk_window_set_transient_for
 gdk_window_set_role
 gdk_window_set_group
+gdk_window_get_group
 gdk_window_set_decorations
 gdk_window_get_decorations
 GdkWMDecoration
@@ -808,6 +834,14 @@ GDK_TYPE_PROP_MODE
 <SECTION>
 <TITLE>Pango Interaction</TITLE>
 <FILE>pango_interaction</FILE>
+GdkPangoRenderer
+GdkPangoRendererClass
+gdk_pango_renderer_new
+gdk_pango_renderer_get_default
+gdk_pango_renderer_set_drawable
+gdk_pango_renderer_set_gc
+gdk_pango_renderer_set_stipple
+gdk_pango_renderer_set_override_color
 gdk_pango_context_get
 gdk_pango_context_get_for_screen
 gdk_pango_context_set_colormap
@@ -817,6 +851,27 @@ gdk_pango_attr_embossed_new
 gdk_pango_attr_stipple_new
 gdk_pango_layout_get_clip_region
 gdk_pango_layout_line_get_clip_region
+<SUBSECTION Standard>
+GDK_TYPE_PANGO_RENDERER
+GDK_PANGO_RENDERER
+GDK_IS_PANGO_RENDERER
+GDK_PANGO_RENDERER_CLASS
+GDK_IS_PANGO_RENDERER_CLASS
+GDK_PANGO_RENDERER_GET_CLASS
+
+<SUBSECTION Private>
+gdk_pango_renderer_get_type
+GdkPangoRendererPrivate
+</SECTION>
+
+<SECTION>
+<TITLE>Cairo Interaction</TITLE>
+<FILE>cairo_interaction</FILE>
+gdk_cairo_create
+gdk_cairo_set_source_color
+gdk_cairo_set_source_pixbuf
+gdk_cairo_rectangle
+gdk_cairo_region
 </SECTION>
 
 <SECTION>
@@ -878,6 +933,11 @@ gdk_threads_init
 gdk_threads_enter
 gdk_threads_leave
 gdk_threads_mutex
+gdk_threads_set_lock_functions
+
+<SUBSECTION Private>
+gdk_threads_lock
+gdk_threads_unlock
 </SECTION>
 
 <SECTION>
@@ -1040,6 +1100,8 @@ GdkEventClient
 GdkEventNoExpose
 GdkEventWindowState
 GdkEventSetting
+GdkEventOwnerChange
+GdkEventGrabBroken
 
 <SUBSECTION>
 GdkScrollDirection
@@ -1049,6 +1111,7 @@ GdkNotifyType
 GdkPropertyState
 GdkWindowState
 GdkSettingAction
+GdkOwnerChange
 
 <SUBSECTION Standard>
 GDK_TYPE_CROSSING_MODE
@@ -1059,9 +1122,11 @@ GDK_TYPE_SCROLL_DIRECTION
 GDK_TYPE_SETTING_ACTION
 GDK_TYPE_VISIBILITY_STATE
 GDK_TYPE_WINDOW_STATE
+GDK_TYPE_OWNER_CHANGE
 
 <SUBSECTION Private>
 gdk_event_get_type
+gdk_owner_change_get_type
 </SECTION>
 
 <SECTION>
@@ -1072,8 +1137,10 @@ GdkCursorType
 gdk_cursor_new
 gdk_cursor_new_from_pixmap
 gdk_cursor_new_from_pixbuf
+gdk_cursor_new_from_name
 gdk_cursor_new_for_display
 gdk_cursor_get_display
+gdk_cursor_get_image
 gdk_cursor_ref
 gdk_cursor_unref
 gdk_cursor_destroy
@@ -1121,6 +1188,7 @@ gdk_drag_context_unref
 GdkDragContext
 GdkDragAction
 gdk_drag_status
+gdk_drag_drop_succeeded
 
 <SUBSECTION Standard>
 GDK_DRAG_CONTEXT
@@ -1138,6 +1206,7 @@ gdk_drag_context_get_type
 </SECTION>
 
 <SECTION>
+<INCLUDE>gdk/gdkx.h</INCLUDE>
 <TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_ROOT_WINDOW
@@ -1186,6 +1255,8 @@ gdk_net_wm_supports
 gdk_x11_screen_supports_net_wm_hint
 gdk_x11_screen_get_window_manager_name
 gdk_x11_screen_lookup_visual
+gdk_x11_window_set_user_time
+gdk_x11_display_get_user_time
 gdk_x11_colormap_foreign_new
 gdk_x11_colormap_get_xcolormap
 gdk_x11_colormap_get_xdisplay
@@ -1194,6 +1265,8 @@ gdk_x11_cursor_get_xdisplay
 gdk_x11_display_get_xdisplay
 gdk_x11_display_grab
 gdk_x11_display_ungrab
+gdk_x11_display_set_cursor_theme
+gdk_x11_register_standard_event_type
 gdk_x11_drawable_get_xdisplay
 gdk_x11_drawable_get_xid
 gdk_x11_font_get_name

docs/reference/gdk/gdk.types

@@ -5,6 +5,7 @@ gdk_display_manager_get_type
 gdk_screen_get_type
 gdk_drawable_get_type
 gdk_window_object_get_type
+gdk_pango_renderer_get_type
 gdk_pixmap_get_type
 gdk_gc_get_type
 gdk_keymap_get_type

docs/reference/gdk/tmpl/cairo_interaction.sgml

@@ -0,0 +1,76 @@
+<!-- ##### SECTION Title ##### -->
+Cairo Interaction
+
+<!-- ##### SECTION Short_Description ##### -->
+Functions to support using Cairo
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+<link href="http://cairographics.org">Cairo</link> is a graphics 
+library that supports vector graphics and image compositing that
+can be used with GDK. Since 2.8, GTK+ does most of its drawing
+using Cairo. 
+</para>
+
+<para>
+GDK does not wrap the Cairo API, instead it allows to create Cairo 
+contexts which can be used to draw on GDK drawables. Additional
+functions allow to convert GDK's rectangles and regions into
+Cairo paths and to use pixbufs as sources for drawing operations.
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### FUNCTION gdk_cairo_create ##### -->
+<para>
+
+</para>
+
+@drawable: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_cairo_set_source_color ##### -->
+<para>
+
+</para>
+
+@cr: 
+@color: 
+
+
+<!-- ##### FUNCTION gdk_cairo_set_source_pixbuf ##### -->
+<para>
+
+</para>
+
+@cr: 
+@pixbuf: 
+@pixbuf_x: 
+@pixbuf_y: 
+
+
+<!-- ##### FUNCTION gdk_cairo_rectangle ##### -->
+<para>
+
+</para>
+
+@cr: 
+@rectangle: 
+
+
+<!-- ##### FUNCTION gdk_cairo_region ##### -->
+<para>
+
+</para>
+
+@cr: 
+@region: 
+
+

docs/reference/gdk/tmpl/colors.sgml

@@ -43,6 +43,9 @@ gdk_color_change() will probably become aliases.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkColor ##### -->
 <para>
 The #GdkColor structure is used to describe an 
@@ -62,7 +65,6 @@ allocated or unallocated color.
 The colormap structure contains the following public fields.
 </para>
 
-@parent_instance: 
 @size: For pseudo-color colormaps, the number of colors
   in the colormap.
 @colors: An array containing the current values in the

docs/reference/gdk/tmpl/cursors.sgml

@@ -6,7 +6,21 @@ Standard and pixmap cursors
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-
+These functions are used to create and destroy cursors.
+There is a number of standard cursors, but it is also
+possible to construct new cursors from pixmaps and
+pixbufs. There may be limitations as to what kinds of
+cursors can be constructed on a given display, see
+gdk_display_supports_cursor_alpha(), 
+gdk_display_supports_cursor_color(),
+gdk_display_get_default_cursor_size() and
+gdk_display_get_maximal_cursor_size().
+</para>
+<para>
+Cursors by themselves are not very interesting, they must be be
+bound to a window for users to see them. This is done with 
+gdk_window_set_cursor() or by setting the cursor member of the
+#GdkWindowAttr struct passed to gdk_window_new().
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -14,13 +28,15 @@ Standard and pixmap cursors
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkCursor ##### -->
 <para>
 A <type>GdkCursor</type> structure represents a cursor.
 </para>
 
-@type: 
-@ref_count: 
+@type: the #GdkCursorType of the cursor
 
 <!-- ##### ENUM GdkCursorType ##### -->
 <para>
@@ -104,9 +120,9 @@ The standard cursors available.
 @GDK_UR_ANGLE: <inlinegraphic format="PNG" fileref="ur_angle.png"></inlinegraphic>
 @GDK_WATCH: <inlinegraphic format="PNG" fileref="watch.png"></inlinegraphic>
 @GDK_XTERM: <inlinegraphic format="PNG" fileref="xterm.png"></inlinegraphic>
-@GDK_LAST_CURSOR: 
+@GDK_LAST_CURSOR: last cursor type
 @GDK_CURSOR_IS_PIXMAP: type of cursors constructed with 
-    gdk_cursor_new_from_pixmap().
+gdk_cursor_new_from_pixmap() or gdk_cursor_new_from_pixbuf()
 
 <!-- ##### FUNCTION gdk_cursor_new ##### -->
 <para>
@@ -142,6 +158,16 @@ The standard cursors available.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_cursor_new_from_name ##### -->
+<para>
+
+</para>
+
+@display: 
+@name: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_cursor_new_for_display ##### -->
 <para>
 
@@ -161,6 +187,15 @@ The standard cursors available.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_cursor_get_image ##### -->
+<para>
+
+</para>
+
+@cursor: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_cursor_ref ##### -->
 <para>
 

docs/reference/gdk/tmpl/dnd.sgml

@@ -22,6 +22,9 @@ the GTK+ documentation for more information.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_drag_get_selection ##### -->
 <para>
 </para>
@@ -176,7 +179,7 @@ A <structname>GdkDragContext</structname> holds information about a
 drag in progress. It is used on both source and destination sides.
 </para>
 
-@parent_instance: 
+@parent_instance: the parent instance
 @protocol: the DND protocol which governs this drag.
 @is_source: %TRUE if the context is used on the source side.
 @source_window: the source of this drag.
@@ -194,7 +197,7 @@ Used in #GdkDragContext to indicate what the destination
 should do with the dropped data.
 </para>
 
-@GDK_ACTION_DEFAULT: 
+@GDK_ACTION_DEFAULT: Means nothing, and should not be used.
 @GDK_ACTION_COPY: Copy the data.
 @GDK_ACTION_MOVE: Move the data, i.e. first copy it, then delete
   it from the source using the DELETE target of the X selection protocol.
@@ -213,3 +216,12 @@ should do with the dropped data.
 @time_: 
 
 
+<!-- ##### FUNCTION gdk_drag_drop_succeeded ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+

docs/reference/gdk/tmpl/drawing.sgml

@@ -31,6 +31,9 @@ gtk_widget_create_pango_layout().
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkDrawable ##### -->
 <para>
 An opaque structure representing an object that can be
@@ -285,6 +288,31 @@ function.
 @npoints: 
 
 
+<!-- ##### FUNCTION gdk_draw_trapezoids ##### -->
+<para>
+
+</para>
+
+@drawable: 
+@gc: 
+@trapezoids: 
+@n_trapezoids: 
+
+
+<!-- ##### STRUCT GdkTrapezoid ##### -->
+<para>
+Specifies a trapezpoid for use by the gdk_draw_trapezoids().
+The trapezoids used here have parallel, horizontal top and 
+bottom edges. 
+</para>
+
+@y1: the y coordinate of the start point.
+@x11: the x coordinate of the top left corner
+@x21: the x coordinate of the top right corner
+@y2: the y coordinate of the end point.
+@x12: the x coordinate of the bottom left corner
+@x22: the x coordinate of the bottom right corner
+
 <!-- ##### FUNCTION gdk_draw_glyphs ##### -->
 <para>
 
@@ -298,6 +326,20 @@ function.
 @glyphs: 
 
 
+<!-- ##### FUNCTION gdk_draw_glyphs_transformed ##### -->
+<para>
+
+</para>
+
+@drawable: 
+@gc: 
+@matrix: 
+@font: 
+@x: 
+@y: 
+@glyphs: 
+
+
 <!-- ##### FUNCTION gdk_draw_layout_line ##### -->
 <para>
 
@@ -440,3 +482,19 @@ Draws a pixmap, or a part of a pixmap, onto another drawable.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_drawable_copy_to_image ##### -->
+<para>
+
+</para>
+
+@drawable: 
+@image: 
+@src_x: 
+@src_y: 
+@dest_x: 
+@dest_y: 
+@width: 
+@height: 
+@Returns: 
+
+

docs/reference/gdk/tmpl/event_structs.sgml

@@ -20,6 +20,9 @@ required events are received. See gtk_widget_set_events().
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### UNION GdkEvent ##### -->
 <para>
 The #GdkEvent struct contains a union of all of the event structs,
@@ -88,7 +91,8 @@ Describes a key press or key release event.
 @time: the time of the event in milliseconds.
 @state: a bit-mask representing the state of the modifier keys (e.g. Control,
 Shift and Alt) and the pointer buttons. See #GdkModifierType.
-@keyval: the key that was pressed or released. See the <filename>&lt;gdk/gdkkeysym.h&gt;</filename>
+@keyval: the key that was pressed or released. See the 
+<filename>&lt;gdk/gdkkeysyms.h&gt;</filename>
 header file for a complete list of GDK key codes.
 @length: the length of @string.
 @string: a string containing the an approximation of the text that
@@ -404,6 +408,43 @@ Generated when a setting is modified.
   %GDK_SETTING_ACTION_CHANGED or %GDK_SETTING_ACTION_DELETED).
 @name: the name of the setting.
 
+<!-- ##### STRUCT GdkEventOwnerChange ##### -->
+<para>
+Generated when the owner of a selection changes. On X11, this information is
+only available if the X server supports the XFIXES extension.
+</para>
+
+@type: the type of the event (%GDK_OWNER_CHANGE).
+@window: the window which received the event
+@send_event: %TRUE if the event was sent explicitly (e.g. using <function>XSendEvent</function>).
+@owner: the new owner of the selection
+@reason: the reason for the ownership change as a #GdkOwnerChange value
+@selection: the atom identifying the selection
+@time: the timestamp of the event
+@selection_time: the time at which the selection ownership was taken over
+@Since: 2.6
+
+<!-- ##### STRUCT GdkEventGrabBroken ##### -->
+<para>
+Generated when a pointer or keyboard grab is broken. On X11, this happens
+when the grab window becomes unviewable (i.e. it or one of its ancestors 
+is unmapped), or if the same application grabs the pointer or keyboard
+again. Note that implicit grabs (which are initiated by button presses)
+can also cause #GdkEventGrabBroken events.
+</para>
+
+@type: the type of the event (%GDK_GRAB_BROKEN)
+@window: the window which received the event, i.e. the window
+ that previously owned the grab
+@send_event: %TRUE if the event was sent explicitly (e.g. using <function>XSendEvent</function>).
+@keyboard: %TRUE if a keyboard grab was broken, %FALSE if a pointer 
+  grab was broken
+@implicit: %TRUE if the broken grab was implicit
+@grab_window: If this event is caused by another grab in the same 
+  application, @grab_window contains the new grab window. Otherwise
+  @grab_window id %NULL.
+@Since: 2.8
+
 <!-- ##### ENUM GdkScrollDirection ##### -->
 <para>
 Specifies the direction for #GdkEventScroll. 
@@ -453,7 +494,7 @@ full details of crossing event generation.
    which are not ancestors of each other and the window is part of
    the ancestor chain between one of these windows and their least
    common ancestor.
-@GDK_NOTIFY_UNKNOWN: 
+@GDK_NOTIFY_UNKNOWN: an unknown type of enter/leave event occurred.
 
 <!-- ##### ENUM GdkPropertyState ##### -->
 <para>
@@ -485,3 +526,12 @@ Specifies the kind of modification applied to a setting in a #GdkEventSetting.
 @GDK_SETTING_ACTION_CHANGED: a setting was changed.
 @GDK_SETTING_ACTION_DELETED: a setting was deleted.
 
+<!-- ##### ENUM GdkOwnerChange ##### -->
+<para>
+Specifies why a selection ownership was changed.
+</para>
+
+@GDK_OWNER_CHANGE_NEW_OWNER: some other app claimed the ownership
+@GDK_OWNER_CHANGE_DESTROY: the window was destroyed
+@GDK_OWNER_CHANGE_CLOSE: the client was closed
+

docs/reference/gdk/tmpl/events.sgml

@@ -27,6 +27,9 @@ The structs used for each type of event.
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM GdkEventType ##### -->
 <para>
 Specifies the type of the event.
@@ -81,9 +84,14 @@ has changed.
 @GDK_VISIBILITY_NOTIFY: the window visibility status has changed.
 @GDK_NO_EXPOSE: indicates that the source region was completely available
 when parts of a drawable were copied. This is not very useful.
-@GDK_SCROLL: 
-@GDK_WINDOW_STATE: 
-@GDK_SETTING: 
+@GDK_SCROLL: the scroll wheel was turned
+@GDK_WINDOW_STATE: the state of a window has changed. See #GdkWindowState
+for the possible window states
+@GDK_SETTING: a setting has been modified.
+@GDK_OWNER_CHANGE: the owner of a selection has changed. This event type
+  was added in 2.6
+@GDK_GRAB_BROKEN: a pointer or keyboard grab was broken. This event type
+  was added in 2.8.
 
 <!-- ##### ENUM GdkEventMask ##### -->
 <para>
@@ -97,32 +105,33 @@ number of %GDK_MOTION_NOTIFY events received. Normally a %GDK_MOTION_NOTIFY
 event is received each time the mouse moves. However, if the application
 spends a lot of time processing the event (updating the display, for example),
 it can easily lag behind the position of the mouse. When using the
-%GDK_POINTER_MOTION_HINT_MASK the server will only send a single %GDK_MOTION_NOTIFY
-event (which is marked as a hint) until the application asks for more, by calling 
-gdk_window_get_pointer().
+%GDK_POINTER_MOTION_HINT_MASK the server will only send a single 
+%GDK_MOTION_NOTIFY event (which is marked as a hint) until the application 
+asks for more, by calling gdk_window_get_pointer().
 </para>
 
-@GDK_EXPOSURE_MASK: 
-@GDK_POINTER_MOTION_MASK: 
-@GDK_POINTER_MOTION_HINT_MASK: 
-@GDK_BUTTON_MOTION_MASK: 
-@GDK_BUTTON1_MOTION_MASK: 
-@GDK_BUTTON2_MOTION_MASK: 
-@GDK_BUTTON3_MOTION_MASK: 
-@GDK_BUTTON_PRESS_MASK: 
-@GDK_BUTTON_RELEASE_MASK: 
-@GDK_KEY_PRESS_MASK: 
-@GDK_KEY_RELEASE_MASK: 
-@GDK_ENTER_NOTIFY_MASK: 
-@GDK_LEAVE_NOTIFY_MASK: 
-@GDK_FOCUS_CHANGE_MASK: 
-@GDK_STRUCTURE_MASK: 
-@GDK_PROPERTY_CHANGE_MASK: 
-@GDK_VISIBILITY_NOTIFY_MASK: 
-@GDK_PROXIMITY_IN_MASK: 
-@GDK_PROXIMITY_OUT_MASK: 
-@GDK_SUBSTRUCTURE_MASK: 
-@GDK_SCROLL_MASK: 
+@GDK_EXPOSURE_MASK: receive expose events
+@GDK_POINTER_MOTION_MASK: receive all pointer motion events
+@GDK_POINTER_MOTION_HINT_MASK: see the explanation above
+@GDK_BUTTON_MOTION_MASK: receive pointer motion events while any button is pressed
+@GDK_BUTTON1_MOTION_MASK: receive pointer motion events while 1 button is pressed
+@GDK_BUTTON2_MOTION_MASK: receive pointer motion events while 2 button is pressed
+@GDK_BUTTON3_MOTION_MASK: receive pointer motion events while 3 button is pressed
+@GDK_BUTTON_PRESS_MASK: receive button press events
+@GDK_BUTTON_RELEASE_MASK: receive button release events
+@GDK_KEY_PRESS_MASK: receive key press events
+@GDK_KEY_RELEASE_MASK: receive key release events
+@GDK_ENTER_NOTIFY_MASK: receive window enter events
+@GDK_LEAVE_NOTIFY_MASK: receive window leave events
+@GDK_FOCUS_CHANGE_MASK: receive focus change events
+@GDK_STRUCTURE_MASK: receive events about window configuration change
+@GDK_PROPERTY_CHANGE_MASK: receive property change events
+@GDK_VISIBILITY_NOTIFY_MASK: receive visibility change events
+@GDK_PROXIMITY_IN_MASK: receive proximity in events
+@GDK_PROXIMITY_OUT_MASK: receive proximity out events
+@GDK_SUBSTRUCTURE_MASK: receive events about window configuration changes of 
+  child windows
+@GDK_SCROLL_MASK: receive scroll events
 @GDK_ALL_EVENTS_MASK: the combination of all the above event masks.
 
 <!-- ##### MACRO GDK_CURRENT_TIME ##### -->

docs/reference/gdk/tmpl/fonts.sgml

@@ -261,6 +261,9 @@ here).
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkFont ##### -->
 <para>
 The <structname>GdkFont</structname> structure represents a font or fontset. It

docs/reference/gdk/tmpl/gcs.sgml

@@ -30,6 +30,9 @@ be set by the latter method.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkGC ##### -->
 <para>
 The #GdkGC structure represents a graphics context.
@@ -44,8 +47,10 @@ The #GdkGCValues structure holds a set of values used
 to create or modify a graphics context.
 </para>
 
-@foreground: the foreground color.
-@background: the background color.
+@foreground: the foreground color. Note that gdk_gc_get_values()
+  only sets the pixel value.
+@background: the background color. Note that gdk_gc_get_values()
+  only sets the pixel value.
 @font: the default font.
 @function: the bitwise operation used when drawing.
 @fill: the fill style.
@@ -117,25 +122,21 @@ useful. For bitmaps, %GDK_AND and %GDK_OR are also useful.
 
 <!-- ##### FUNCTION gdk_gc_new ##### -->
 <para>
-Create a new graphics context with default values. 
 </para>
 
-@drawable: a #GdkDrawable. The created GC must always be used
- with drawables of the same depth as this one.
-@Returns: the new graphics context.
+@drawable: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_gc_new_with_values ##### -->
 <para>
-Create a new GC with the given initial values.
+
 </para>
 
-@drawable: a #GdkDrawable. The created GC must always be used
- with drawables of the same depth as this one.
-@values: a structure containing initial values for the GC.
-@values_mask: a bit mask indicating which fields in @values
-   are set.
-@Returns: the new graphics context.
+@drawable: 
+@values: 
+@values_mask: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_gc_get_screen ##### -->
@@ -166,10 +167,10 @@ Create a new GC with the given initial values.
 
 <!-- ##### MACRO gdk_gc_destroy ##### -->
 <para>
-Identical to gdk_gc_unref(). This function is obsolete
-and should not be used.
+This function is obsolete and should not be used.
 </para>
 
+@Deprecated: Use gdk_object_unref() instead
 <!-- # Unused Parameters # -->
 @gc: a #GdkGC.
 
@@ -186,29 +187,29 @@ and should not be used.
 
 <!-- ##### FUNCTION gdk_gc_get_values ##### -->
 <para>
-Retrieves the current values from a graphics context.
+
 </para>
 
-@gc: a #GdkGC.
-@values: the #GdkGCValues structure in which to store the results.
+@gc: 
+@values: 
 
 
 <!-- ##### FUNCTION gdk_gc_set_foreground ##### -->
 <para>
-Sets the foreground color for a graphics context.
+
 </para>
 
-@gc: a #GdkGC.
-@color: the new foreground color.
+@gc: 
+@color: 
 
 
 <!-- ##### FUNCTION gdk_gc_set_background ##### -->
 <para>
-Sets the background color for a graphics context.
+
 </para>
 
-@gc: a #GdkGC.
-@color: the new background color.
+@gc: 
+@color: 
 
 
 <!-- ##### FUNCTION gdk_gc_set_rgb_fg_color ##### -->
@@ -231,34 +232,29 @@ Sets the background color for a graphics context.
 
 <!-- ##### FUNCTION gdk_gc_set_font ##### -->
 <para>
-Sets the font for a graphics context. (Note that
-all text-drawing functions in GDK take a @font
-argument; the value set here is used when that
-argument is %NULL.)
+
 </para>
 
-@gc: a #GdkGC.
-@font: the new font.
+@gc: 
+@font: 
 
 
 <!-- ##### FUNCTION gdk_gc_set_function ##### -->
 <para>
-Determines how the current pixel values and the
-pixel values being drawn are combined to produce
-the final pixel values.
+
 </para>
 
-@gc: a #GdkGC.
+@gc: 
 @function: 
 
 
 <!-- ##### FUNCTION gdk_gc_set_fill ##### -->
 <para>
-Set the fill mode for a graphics context.
+
 </para>
 
-@gc: a #GdkGC.
-@fill: the new fill mode.
+@gc: 
+@fill: 
 
 
 <!-- ##### ENUM GdkFill ##### -->
@@ -279,93 +275,75 @@ Determines how primitives are drawn.
 
 <!-- ##### FUNCTION gdk_gc_set_tile ##### -->
 <para>
-Set a tile pixmap for a graphics context.
-This will only be used if the fill mode
-is %GDK_TILED.
+
 </para>
 
-@gc: a #GdkGC.
-@tile: the new tile pixmap.
+@gc: 
+@tile: 
 
 
 <!-- ##### FUNCTION gdk_gc_set_stipple ##### -->
 <para>
-Set the stipple bitmap for a graphics context. The
-stipple will only be used if the fill mode is
-%GDK_STIPPLED or %GDK_OPAQUE_STIPPLED.
+
 </para>
 
-@gc: a #GdkGC.
-@stipple: the new stipple bitmap.
+@gc: 
+@stipple: 
 
 
 <!-- ##### FUNCTION gdk_gc_set_ts_origin ##### -->
 <para>
-Set the origin when using tiles or stipples with
-the GC. The tile or stipple will be aligned such
-that the upper left corner of the tile or stipple
-will coincide with this point.
+
 </para>
 
-@gc: a #GdkGC.
-@x: the x-coordinate of the origin.
-@y: the y-coordinate of the origin.
+@gc: 
+@x: 
+@y: 
 
 
 <!-- ##### FUNCTION gdk_gc_set_clip_origin ##### -->
 <para>
-Sets the origin of the clip mask. The coordinates are
-interpreted relative to the upper-left corner of
-the destination drawable of the current operation.
+
 </para>
 
-@gc: a #GdkGC.
-@x: the x-coordinate of the origin.
-@y: the y-coordinate of the origin.
+@gc: 
+@x: 
+@y: 
 
 
 <!-- ##### FUNCTION gdk_gc_set_clip_mask ##### -->
 <para>
-Sets the clip mask for a graphics context from a bitmap.
-The clip mask is interpreted relative to the clip
-origin. (See gdk_gc_set_clip_origin()).
+
 </para>
 
-@gc: the #GdkGC.
-@mask: a bitmap.
+@gc: 
+@mask: 
 
 
 <!-- ##### FUNCTION gdk_gc_set_clip_rectangle ##### -->
 <para>
-Sets the clip mask for a graphics context from a
-rectangle. The clip mask is interpreted relative to the clip
-origin. (See gdk_gc_set_clip_origin()).
-
 </para>
 
-@gc: a #GdkGC.
-@rectangle: the rectangle to clip to.
+@gc: 
+@rectangle: 
 
 
 <!-- ##### FUNCTION gdk_gc_set_clip_region ##### -->
 <para>
-Sets the clip mask for a graphics context from a region structure.
-The clip mask is interpreted relative to the clip origin. (See
-gdk_gc_set_clip_origin()).
+
 </para>
 
-@gc: a #GdkGC.
-@region: the #GdkRegion.
+@gc: 
+@region: 
 
 
 <!-- ##### FUNCTION gdk_gc_set_subwindow ##### -->
 <para>
-Sets how drawing with this GC on a window will affect child
-windows of that window. 
+
 </para>
 
-@gc: a #GdkGC.
-@mode: the subwindow mode.
+@gc: 
+@mode: 
 
 
 <!-- ##### ENUM GdkSubwindowMode ##### -->
@@ -379,28 +357,23 @@ windows of that window.
 
 <!-- ##### FUNCTION gdk_gc_set_exposures ##### -->
 <para>
-Sets whether copying non-visible portions of a drawable
-using this graphics context generate exposure events
-for the corresponding regions of the destination
-drawable. (See gdk_draw_drawable()).
+
 </para>
 
-@gc: a #GdkGC.
-@exposures: if %TRUE, exposure events will be generated.
+@gc: 
+@exposures: 
 
 
 <!-- ##### FUNCTION gdk_gc_set_line_attributes ##### -->
 <para>
-Sets various attributes of how lines are drawn. See
-the corresponding members of #GdkGCValues for full
-explanations of the arguments.
+
 </para>
 
-@gc: a #GdkGC.
-@line_width: the width of lines.
-@line_style: the dash-style for lines.
-@cap_style: the manner in which the ends of lines are drawn.
-@join_style: the in which lines are joined together.
+@gc: 
+@line_width: 
+@line_style: 
+@cap_style: 
+@join_style: 
 
 
 <!-- ##### ENUM GdkLineStyle ##### -->
@@ -440,28 +413,22 @@ Determines how the joins between segments of a polygon are drawn.
 
 <!-- ##### FUNCTION gdk_gc_set_dashes ##### -->
 <para>
-Sets the way dashed-lines are drawn. Lines will be
-drawn with alternating on and off segments of the
-lengths specified in @dash_list. The manner in
-which the on and off segments are drawn is determined
-by the @line_style value of the GC. (This can
-be changed with gdk_gc_set_line_attributes())
+
 </para>
 
-@gc: a #GdkGC.
-@dash_offset: the
-@dash_list: an array of dash lengths.
-@n: the number of elements in @dash_list.
+@gc: 
+@dash_offset: 
+@dash_list: 
+@n: 
 
 
 <!-- ##### FUNCTION gdk_gc_copy ##### -->
 <para>
-Copy the set of values from one graphics context
-onto another graphics context.
+
 </para>
 
-@dst_gc: the destination graphics context.
-@src_gc: the source graphics context.
+@dst_gc: 
+@src_gc: 
 
 
 <!-- ##### FUNCTION gdk_gc_set_colormap ##### -->

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

@@ -895,6 +895,16 @@ they will be ignored.
 @display_name: 
 @Returns: 
 
+<!-- ##### FUNCTION gdk_pixbuf_set_as_cairo_source ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@cr: 
+@pixbuf_x: 
+@pixbuf_y: 
+
 <!-- ##### VARIABLE gdk_progclass ##### -->
 <para>
 

docs/reference/gdk/tmpl/gdkdisplay.sgml

@@ -28,6 +28,9 @@ Controls the keyboard/mouse pointer grabs and a set of <type>GdkScreen</type>s
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkDisplay ##### -->
 <para>
 The <structname>GdkDisplay</structname> struct is the GDK representation
@@ -213,6 +216,15 @@ of an X display. All its fields are private and should not be accessed directly.
 @msec: 
 
 
+<!-- ##### FUNCTION gdk_display_set_double_click_distance ##### -->
+<para>
+
+</para>
+
+@display: 
+@distance: 
+
+
 <!-- ##### FUNCTION gdk_display_get_pointer ##### -->
 <para>
 
@@ -269,6 +281,17 @@ Applications should never have any reason to use this facility
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_display_warp_pointer ##### -->
+<para>
+
+</para>
+
+@display: 
+@screen: 
+@x: 
+@y: 
+
+
 <!-- ##### FUNCTION gdk_display_supports_cursor_color ##### -->
 <para>
 
@@ -306,3 +329,52 @@ Applications should never have any reason to use this facility
 @height: 
 
 
+<!-- ##### FUNCTION gdk_display_get_default_group ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_display_supports_selection_notification ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_display_request_selection_notification ##### -->
+<para>
+
+</para>
+
+@display: 
+@selection: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_display_supports_clipboard_persistence ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_display_store_clipboard ##### -->
+<para>
+
+</para>
+
+@display: 
+@clipboard_window: 
+@time_: 
+@targets: 
+@n_targets: 
+
+

docs/reference/gdk/tmpl/gdkdisplaymanager.sgml

@@ -16,6 +16,9 @@ changes.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkDisplayManager ##### -->
 <para>
 The <structname>GdkDisplayManager</structname> struct has no interesting 

docs/reference/gdk/tmpl/gdkscreen.sgml

@@ -22,6 +22,9 @@ form a large screen area.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkScreen ##### -->
 <para>
 This is a currently just a placeholder typedef for the first argument of 
@@ -100,6 +103,24 @@ when GDK gets multihead support.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_screen_get_rgba_colormap ##### -->
+<para>
+
+</para>
+
+@screen: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_screen_get_rgba_visual ##### -->
+<para>
+
+</para>
+
+@screen: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_screen_get_root_window ##### -->
 <para>
 
@@ -254,3 +275,51 @@ when GDK gets multihead support.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_spawn_on_screen ##### -->
+<para>
+
+</para>
+
+@screen: 
+@working_directory: 
+@argv: 
+@envp: 
+@flags: 
+@child_setup: 
+@user_data: 
+@child_pid: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_spawn_on_screen_with_pipes ##### -->
+<para>
+
+</para>
+
+@screen: 
+@working_directory: 
+@argv: 
+@envp: 
+@flags: 
+@child_setup: 
+@user_data: 
+@child_pid: 
+@standard_input: 
+@standard_output: 
+@standard_error: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_spawn_command_line_on_screen ##### -->
+<para>
+
+</para>
+
+@screen: 
+@command_line: 
+@error: 
+@Returns: 
+
+

docs/reference/gdk/tmpl/general.sgml

@@ -15,6 +15,9 @@ utility functions.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_init ##### -->
 <para>
 Initializes the GDK library and connects to the X server.
@@ -220,7 +223,8 @@ events for this application are reported as normal, but pointer events outside
 this application are reported with respect to @window and only if selected by
 @event_mask. In either mode, unreported events are discarded.
 @event_mask: specifies the event mask, which is used in accordance with
-@owner_events.
+@owner_events. Note that only pointer events (i.e. button and motion events) 
+    may be selected.
 @confine_to: If non-%NULL, the pointer will be confined to this
 window during the grab. If the pointer is outside @confine_to, it will
 automatically be moved to the closest edge of @confine_to and enter

docs/reference/gdk/tmpl/images.sgml

@@ -55,12 +55,15 @@ displays.
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkImage ##### -->
 <para>
 The #GdkImage struct contains information on the image and the pixel data.
 </para>
 
-@parent_instance: 
+@parent_instance: the parent instance
 @type: the type of the image.
 @visual: the visual.
 @byte_order: the byte order.
@@ -69,10 +72,9 @@ The #GdkImage struct contains information on the image and the pixel data.
 @depth: the depth of the image, i.e. the number of bits per pixel.
 @bpp: the number of bytes per pixel.
 @bpl: the number of bytes per line of the image.
-@bits_per_pixel: 
+@bits_per_pixel: the number of bits per pixel.
 @mem: the pixel data.
-@colormap: 
-@windowing_data: 
+@colormap: the #GdkColormap associated with the image
 
 <!-- ##### FUNCTION gdk_image_new ##### -->
 <para>

docs/reference/gdk/tmpl/input.sgml

@@ -31,6 +31,9 @@ callbacks.</para></listitem>
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gdk_input_add_full ##### -->
 <para>
 Establish a callback when a condition becomes true on

docs/reference/gdk/tmpl/input_devices.sgml

@@ -89,6 +89,9 @@ and <structfield>ytilt</structfield>.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkDevice ##### -->
 <para>
 A <structname>GdkDevice</structname> structure contains
@@ -98,7 +101,7 @@ gdk_device_set_mode(), gdk_device_set_key() and gdk_device_set_axis_use()
 to configure various aspects of the device.
 </para>
 
-@parent_instance: 
+@parent_instance: the parent instance
 @name: the name of this device.
 @source: the type of this device.
 @mode: the mode of this device

docs/reference/gdk/tmpl/keys.sgml

@@ -80,6 +80,9 @@ gdk_keymap_translate_keyboard_state() just to get the keyval.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GdkKeymap ##### -->
 <para>
 A <structname>GdkKeymap</structname> defines the translation from keyboard state