Released GTK+ 2.2.4.

Thu Sep  4 19:11:23 2003  Kristian Rietveld  <kris@gtk.org>

	* docs/RELEASE-HOWTO: updates.

INSTALL

@@ -22,8 +22,8 @@ GTK+ requires the following packages:
 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.2.4.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.2.4			   # change to the toplevel directory
   % ./configure				   # run the `configure' script
   % make				   # build GTK
   [ Become root if necessary ]
@@ -35,7 +35,7 @@ The Details
 Complete information about installing GTK+ and related libraries can be found 
 in the file:
 
- docs/reference/gtk/html/gtk-building.html
+ docs/reference/gtk/docs/reference/gtk/html/gtk-building.html
 
 Or online at:
 

INSTALL.in

@@ -35,7 +35,7 @@ The Details
 Complete information about installing GTK+ and related libraries can be found 
 in the file:
 
- docs/reference/gtk/html/gtk-building.html
+ docs/reference/gtk/docs/reference/gtk/html/gtk-building.html
 
 Or online at:
 

Makefile.am

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

NEWS

@@ -1,134 +1,3 @@
-Overview of Changes from GTK+-2.2.x to GTK+-2.3.0
-=================================================
-
-* New Widgets
- - GtkFileChooser: a replacement for GtkFileSelection with 
-   replaceable backends, many new API features, better user
-   interface (UI is still a work in progress) [Owen Taylor, 
-   Federico Mena Quintero]
- - New combo box widgets: GtkComboBox, GtkComboBoxEntry [Kristian Rietveld]
- - New "disclosure triangle" widget: GtkExpander [Marc McLoughlin]
- - "Picker button" widgets based on code from libgnomeui: 
-   GtkFontButton, GtkColorButton [Matthias Clasen]
-
-* Widget improvements:
- - Autocompletion for entries: GtkEntryCompletion [Kristian]
- - Add separate padding for all 4 sides of GtkAlignment [Murray Cumming]
- - Add input-only event boxes for trapping events [Alex Larsson]
- - Support RTL flipping for GtkHPaned, tab navigation [Soeren, Matthias]
- - Support up to four scroll arrows on GtkNotebook and make which
-   ones are displayed themeable. [Matthias]
- - GtkCalendar improvements: make the arrows spin, support RTL flipping,
-   automatic week start selection, DND support, improve API 
-   for setting options [Matthias]; mousewheel support [Abigail Brady]
- - New properties: GtkButton::focus_on_click, GtkCheckMenuItem::draw_as_radio
-   [Soeren, Matthias]
- - New functions: gtk_window_set_default_icon(), 
-   gtk_message_dialog_add_buttons(), gtk_button_box_get_child_secondary()
-   [Matthias]
- - Add missing "role", "decorated", "gravity" properties for GtkWindow,
-   "has_resize_grip" for GtkStatusBar. [Matthias]
- - Add child properties for GtkPaned [Matthias, Soeren]
-
-* Menus
- - New action-based menu API: GtkUIManager, GtkActionGroup, 
-   GtkAction, etc. [James Henstridge, Matthias, Soeren Sandmann,
-   Marco Pesenti Gritti, Philip Langdale]
- - Support for tabular menus [Kristian]
- - New positioning algorithm for popup menus [Soeren]
-
-* GtkTextView [Matthias]
- - Add properties "accepts_tab" [Soeren], "overwrite" property 
-   [Jeroen Zwarepoorte], "buffer"
- - Add gtk_text_buffer_select_range()
- - Implement drag-selection by words/lines (also for Gtkentry)
- - Some fixes to invisible text handling
- - Add support for GTK_WRAP_WORD_CHAR [David Brigada]
- - Clean up handling of horizontal paging
- - Fix scrolling with non-visible cursor
- - Add internals documentation [Havoc Pennington]
-
-* GtkToolbar [Soeren]
- - Add a more constistent and extensible toolbar API; preserve
-   old API for backwards compatibility [James, Anders Carlsson, Owen]
- - Support for sliding buttons like OS X
- - Keyboard navigation
- - Support "priority text"
- - Overflow menu
- - Better handling of really wide buttons [David Bordoley]
- - Drawing improvements
- - Support context menu
-
-* GtkTreeView [Kristian Rietveld]
- - Handle RTL [Matthias, Jonathan]
- - Add expand flag to column packing parameters [Jonathan, Kristian]
- - gtk_tree_path_free now silently returns on NULL paths
- - Move row reference updating code to closures
- - Fix TreeView DnD: make TreeStore DnD work, make drops on empty views work,
-   get rid of gtk-tree-model-drop-append.
- - Add a filtering tree model: GtkTreeModelFilter [Kristian]
-
-* gdk-pixbuf
- - Add a loader for PCX files [Josh Beam]
- - Improve calculation of filter weights for scaling [Brian Cameron, Owen]
- - Support TGA files with arbitrary origins [Matthias]
- - Add gdk_pixbuf_loader_new_with_mime_type() [Dom Lachowicz]
-   gdk_pixbuf_new_from_file_at_size() [Dom, Owen, Matthias]
- - Add saving support for ICO and CUR
- - Improve handling of GIFs with oversized frames [Matthias]
-
-* GDK:
- - Support for full-color / alpha-channel cursors [Matthias]
- - Remove support for non-X fonts and for pango-1.0; always require Xft2 [Owen]
- - Fix handling of recursive calls to gdk_window_begin_paint() [Soeren]
- - Many small changes to reduce round trips on startup; 
-   add gdk_display_flush() [Owen]
- - Use Xlib asynchronous APIs to reduce roundtrips on startup
-   and during DND [Owen]
- - Other changes to improve DND for large-latency connections [Owen]
- - Add support for EWMH "above" and "below" states [Manuel Clos] (also
-   in GtkWindow)
- - Add Add GDK_MOUSE_DEVICE envvar for linux-fb backend [Marc Welz]
- - Other small linux-fb fixes [Eric Warmenhoven]
-
-* Miscellaneous
- - Add support for named themable icons; use this facility to 
-   provide the default stock icon images [Owen Taylor, based
-   on code by Alex Larsson]
- - Add gtk_widget_queue_resize_no_redraw() for more efficient
-   resizing; use for GtkTextView. Redraw less on focus changes. [Soeren]
- - Add gtk_widget_queue_resize_no_redraw() [Soeren]
- - Default theme improvements, especially for menus. Add some
-   more style properties. [Soeren]
- - Add authentication stock icon [Matthias, art by Jakub Steiner]
- - Allow "none" to be set for input method GtkSettings [Hidetoshi Tajima]
- - Convert build system to automake-1.7; many cleanups and
-   improvements. [James Henstridge, Owen]
- - Win32 fixes for new widgets [Hans Breuer]
- - Add right-to-left variants of some stock icons [Matthias]
-
-* Documentation
- - Use XML source for man pages; add man pages for tools that didn't
-   have them before [Matthias]
- - Tutorial improvements [Sebasitian Rittau, Tony Gale, Roger Leigh, Matthias]
- - FAQ improvements [Tony, Gonzalo Odiard, Owen]
- - Misc documentation improvements [Matthias, Frederic Lespez, Tomas Ogren, 
-   Martin Pool, Mariano Suarez-Alvarez]
-
-* Deprecations
- - GtkItemFactory [Replaced by GtkUIManager]
- - GtkCombo, GtkOptionMenu [Replaced by GtkComboBox]
- - Miscellaneous functions that were renamed in 
-   GTK+-2.0 and GTK+-2.2 [Matthias, Manish Singh, Soeren]
-
-Other contributors: Krasimir Angelov, Archit Baweja, Sebastien Bacher,
-  Steve Chaplin, John Darrington, Daniel Elstner, Marco Pesenti Gritti, 
-  Jody Goldberg, David Hampton, Richard Kinder, Christian Persch, 
-  Roozbeh Pournader, Christian Reis, Christian Rose, Joe Shaw, 
-  Vasilis Vasaitis, Morten Welinder
-
-----------------------------------------------------------------------
-
 Overview of Changes in GTK+ 2.2.4
 =================================
 * Revert TreeView fix which broke context menus in different applications
@@ -313,8 +182,6 @@ Overview of Changes in GTK+ 2.2.1
   Tommi Komulainen, Thomas Leonard, Ian Peters, Arvind Samptur, 
   Soeren Sandmann, Hidetoshi Tajima, Owen]
 
-----------------------------------------------------------------------
-
 Overview of Changes in GTK+ 2.2.0
 =================================
 * Fix problem with the DND code and event filters [Bolian Yin, Owen Taylor]

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.2.4. 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.
@@ -62,13 +62,31 @@ Release notes
   from the library, on others not. In no case can applications
   use these private symbols.
 
-* GTK+-2.3 now requires version 2 of Xft; old fashioned core X
-  fonts are no longer supported.
+* GTK+-2.2 can be build either with Pango-1.0 and version 1 of
+  the Xft library or Pango-1.2 and version 2 of the Xft library
+  (Xft is used to to display anti-aliased fonts) By default, GTK+ and 
+  Pango are built so that applications will not have explicit dependencies 
+  on either version of Xft. To make sure that your application will be 
+  binary compatible with future versions of GTK+:
+
+    - Do not configure Pango or GTK+ with the --enable-static or
+      --enable-explicit-deps options, since they will cause dependencies 
+      on the particular version of Xft.
+
+    - Do not use Xft version 1 directly in your applications.
 
 * There is a bug in the Xft library in XFree86-4.1 and possibly previous
   versions that causes random crashes when using the Pango Xft
   backend. If you want to use Xft fonts, you should upgrade to
-  at least XFree86-4.2.
+  XFree86-4.2.
+
+* Xft support is on by default when using Xft2 but off by
+  default when using Xft1. To change this default, set the
+  variable GDK_USE_XFT to '1' or '0'. For instance, to 
+  turn on Xft fonts when Xft1.
+
+   GDK_USE_XFT=1
+   export GDK_USE_XFT
 
 * The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
   is provided on a as-is basis and has not been tested at all. No

README.in

@@ -62,13 +62,31 @@ Release notes
   from the library, on others not. In no case can applications
   use these private symbols.
 
-* GTK+-2.3 now requires version 2 of Xft; old fashioned core X
-  fonts are no longer supported.
+* GTK+-2.2 can be build either with Pango-1.0 and version 1 of
+  the Xft library or Pango-1.2 and version 2 of the Xft library
+  (Xft is used to to display anti-aliased fonts) By default, GTK+ and 
+  Pango are built so that applications will not have explicit dependencies 
+  on either version of Xft. To make sure that your application will be 
+  binary compatible with future versions of GTK+:
+
+    - Do not configure Pango or GTK+ with the --enable-static or
+      --enable-explicit-deps options, since they will cause dependencies 
+      on the particular version of Xft.
+
+    - Do not use Xft version 1 directly in your applications.
 
 * There is a bug in the Xft library in XFree86-4.1 and possibly previous
   versions that causes random crashes when using the Pango Xft
   backend. If you want to use Xft fonts, you should upgrade to
-  at least XFree86-4.2.
+  XFree86-4.2.
+
+* Xft support is on by default when using Xft2 but off by
+  default when using Xft1. To change this default, set the
+  variable GDK_USE_XFT to '1' or '0'. For instance, to 
+  turn on Xft fonts when Xft1.
+
+   GDK_USE_XFT=1
+   export GDK_USE_XFT
 
 * The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
   is provided on a as-is basis and has not been tested at all. No

acinclude.m4

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

autogen.sh

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

configure.in

@@ -1,49 +1,8 @@
+# require autoconf 2.52
+AC_PREREQ(2.52)
+
 # Process this file with autoconf to produce a configure script.
-# require autoconf 2.54
-AC_PREREQ(2.54)
-
-# Making releases:
-#   GTK_MICRO_VERSION += 1;
-#   GTK_INTERFACE_AGE += 1;
-#   GTK_BINARY_AGE += 1;
-# if any functions have been added, set GTK_INTERFACE_AGE to 0.
-# if backwards compatibility has been broken,
-# 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_version],
-          [gtk_major_version.gtk_minor_version.gtk_micro_version])
-m4_define([gtk_interface_age], [0])
-m4_define([gtk_binary_age], [300])
-# 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?)
-#
-#GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
-m4_define([gtk_binary_version], [2.2.0])
-
-# required versions of other packages
-m4_define([glib_required_version], [2.3.0])
-m4_define([pango_required_version], [1.2.0])
-m4_define([atk_required_version], [1.0.1])
-
-
-AC_INIT([gtk+], [gtk_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk+],
-	[gtk+])
-
-AC_CONFIG_SRCDIR([gdk/gdktypes.h])
-
-# Save this value here, since automake will set cflags later
-cflags_set=${CFLAGS+set}
-
-AM_INIT_AUTOMAKE(no-define)
-AM_CONFIG_HEADER(config.h)
+AC_INIT(gdk/gdktypes.h)
 
 #
 # For each of the libraries we build, we define the following
@@ -56,14 +15,44 @@ AM_CONFIG_HEADER(config.h)
 # foo_DEP_CFLAGS:   All cflags this module requires
 
 
+# Save this value here, since automake will set cflags later
+cflags_set=${CFLAGS+set}
+
+dnl we to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
+dnl are available for $ac_help expansion (don't we all *love* autoconf?)
+#
+# Making releases:
+#   GTK_MICRO_VERSION += 1;
+#   GTK_INTERFACE_AGE += 1;
+#   GTK_BINARY_AGE += 1;
+# if any functions have been added, set GTK_INTERFACE_AGE to 0.
+# if backwards compatibility has been broken,
+# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
+#
+m4_define([gtk_major_version], [2])
+m4_define([gtk_minor_version], [2])
+m4_define([gtk_micro_version], [4])
+m4_define([gtk_interface_age], [4])
+
+# if the minor version number is odd, then we want debugging.  Otherwise
+# we only want minimal debugging support.
+m4_define([gtk_debug_default],
+          [m4_if(m4_eval(gtk_minor_version % 2), [1], [yes], [minimum])])dnl
+
 GTK_MAJOR_VERSION=gtk_major_version
 GTK_MINOR_VERSION=gtk_minor_version
 GTK_MICRO_VERSION=gtk_micro_version
 GTK_INTERFACE_AGE=gtk_interface_age
-GTK_BINARY_AGE=gtk_binary_age
-GTK_VERSION=gtk_version
-GTK_API_VERSION=gtk_api_version
-GTK_BINARY_VERSION=gtk_binary_version
+GTK_BINARY_AGE=`expr 100 '*' $GTK_MINOR_VERSION + $GTK_MICRO_VERSION`
+GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
+dnl This is the X.Y used in -lgtk-FOO-X.Y
+GTK_API_VERSION=2.0
+
+# if the minor version number is odd, then we want debugging.  Otherwise
+# we only want minimal debugging support.
+m4_define([glib_debug_default],
+          [m4_if(m4_eval(glib_minor_version % 2), [1], [yes], [minimum])])dnl
+
 AC_SUBST(GTK_MAJOR_VERSION)
 AC_SUBST(GTK_MINOR_VERSION)
 AC_SUBST(GTK_MICRO_VERSION)
@@ -71,7 +60,6 @@ AC_SUBST(GTK_INTERFACE_AGE)
 AC_SUBST(GTK_BINARY_AGE)
 AC_SUBST(GTK_API_VERSION)
 AC_SUBST(GTK_VERSION)
-AC_SUBST(GTK_BINARY_VERSION)
 
 # libtool versioning
 #LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
@@ -80,32 +68,59 @@ AC_SUBST(GTK_BINARY_VERSION)
 #LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
 #LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 
-m4_define([lt_current], [m4_eval(100 * gtk_minor_version + gtk_micro_version - gtk_interface_age)])
-m4_define([lt_revision], [gtk_interface_age])
-m4_define([lt_age], [m4_eval(gtk_binary_age - gtk_interface_age)])
-LT_VERSION_INFO="lt_current:lt_revision:lt_age"
-LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
-AC_SUBST(LT_VERSION_INFO)
+LT_RELEASE=$GTK_MAJOR_VERSION.0
+LT_CURRENT=`expr 100 '*' $GTK_MINOR_VERSION + $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
+LT_REVISION=$GTK_INTERFACE_AGE
+LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
+LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
+AC_SUBST(LT_RELEASE)
+AC_SUBST(LT_CURRENT)
+AC_SUBST(LT_REVISION)
+AC_SUBST(LT_AGE)
 AC_SUBST(LT_CURRENT_MINUS_AGE)
 
+# 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?)
+#
+#GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
+GTK_BINARY_VERSION=2.2.0
+AC_SUBST(GTK_BINARY_VERSION)
 
 #
 # gdk-pixbuf gets versioned separately, and for now, using standard
 # libtool versioning, not GTK+-style versioning
 #
-GDK_PIXBUF_MAJOR=gtk_major_version
-GDK_PIXBUF_MINOR=gtk_minor_version
-GDK_PIXBUF_MICRO=gtk_micro_version
+GDK_PIXBUF_MAJOR=$GTK_MAJOR_VERSION
+GDK_PIXBUF_MINOR=$GTK_MINOR_VERSION
+GDK_PIXBUF_MICRO=$GTK_MICRO_VERSION
 GDK_PIXBUF_VERSION="${GDK_PIXBUF_MAJOR}.${GDK_PIXBUF_MINOR}.${GDK_PIXBUF_MICRO}"
 AC_SUBST(GDK_PIXBUF_MAJOR)
 AC_SUBST(GDK_PIXBUF_MINOR)
 AC_SUBST(GDK_PIXBUF_MICRO)
 AC_SUBST(GDK_PIXBUF_VERSION)
 
+## Versions of dependencies
+GLIB_REQUIRED_VERSION=2.1.4
+PANGO_REQUIRED_VERSION=1.0.1
+ATK_REQUIRED_VERSION=1.0.1
+
+# For automake.
+VERSION=$GTK_VERSION
+PACKAGE=gtk+
+
 GETTEXT_PACKAGE=gtk20
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
 
+# Save this value here, since automake will set cflags later
+cflags_set=${CFLAGS+set}
+
+dnl Initialize automake stuff
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
+
+# Specify a configuration file
+AM_CONFIG_HEADER(config.h)
 
 dnl Initialize libtool
 AC_PROG_CC
@@ -113,7 +128,16 @@ AM_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
-AM_PROG_AS
+dnl XXXX Hack: Set AS and ASFLAGS so that automake 1.5 will be happy
+AS="\${CC}"
+ASFLAGS="\${CFLAGS}"
+AC_SUBST(AS)
+AC_SUBST(ASFLAGS)
+dnl XXXX Hack: Set CCAS and CCASFLAGS so that automake 1.6 will be happy
+CCAS="\${CC}"
+CCASFLAGS="\${CFLAGS}"
+AC_SUBST(CCAS)
+AC_SUBST(CCASFLAGS)
 
 dnl Initialize maintainer mode
 AM_MAINTAINER_MODE
@@ -145,47 +169,26 @@ case "$host" in
 esac
 AC_MSG_RESULT([$os_win32])
 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
-AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
 
 if test "$os_win32" = "yes"; then
   AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
 fi
 AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
 
-m4_define([debug_default],
-          m4_if(m4_eval(gtk_minor_version % 2), [1], [yes], [minimum]))
-
 dnl declare --enable-* args and collect ac_help strings
-AC_ARG_ENABLE(debug,
-              AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
-                             [turn on debugging @<:@default=debug_default@:>@]),,
-              enable_debug=debug_default)
-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]])],,
-              [enable_xkb="maybe"])
-AC_ARG_ENABLE(rebuilds,
-              [AC_HELP_STRING([--disable-rebuilds],
-                              [disable all source autogeneration rules])],,
-              [enable_rebuilds=yes])
+AC_ARG_ENABLE(debug, [  --enable-debug=[no/minimum/yes] turn on debugging @<:@default=gtk_debug_default@:>@],,enable_debug=gtk_debug_default)
+AC_ARG_ENABLE(shm, [  --enable-shm            support shared memory if available [default=yes]],
+		   echo $enable_shm, enable_shm="yes")
+AC_ARG_ENABLE(ansi, [  --enable-ansi           turn on strict ansi [default=no]],
+		    , enable_ansi=no)
+AC_ARG_ENABLE(xkb, [  --enable-xkb            support XKB [default=maybe]],
+			, enable_xkb="maybe")
+AC_ARG_ENABLE(rebuilds, [  --disable-rebuilds      disable all source autogeneration rules],,enable_rebuilds=yes)
 
-AC_ARG_WITH(xinput,
-            [AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])])
+AC_ARG_WITH(xinput, [  --with-xinput=[no/yes]  support XInput ])
 
-AC_ARG_WITH(wintab,
-            [AC_HELP_STRING([--with-wintab=DIRECTORY],
-                            [use Wintab API with win32 backend])])
-AC_ARG_WITH(ie55,
-            [AC_HELP_STRING([--with-ie55=DIRECTORY],
-                            [IE5.5 libs and headers (for Active IMM)])])
+AC_ARG_WITH(wintab, [  --with-wintab=DIRECTORY use Wintab API with win32 backend])
+AC_ARG_WITH(ie55, [  --with-ie55=DIRECTORY IE5.5 libs and headers (for Active IMM)])
 
 GLIB_AC_DIVERT_BEFORE_HELP([
 if test "$platform_win32" = yes; then
@@ -210,15 +213,9 @@ gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
 AC_SUBST(gdktargetlib)
 AC_SUBST(gtktargetlib)
 
-AC_ARG_ENABLE(shadowfb,
-              [AC_HELP_STRING([--disable-shadowfb],
-                              [disable shadowfb support for linux-fb])],,
-              [enable_shadowfb=yes])
+AC_ARG_ENABLE(shadowfb, [  --disable-shadowfb      disable shadowfb support for linux-fb],,enable_shadowfb=yes)
 
-AC_ARG_ENABLE(fbmanager,
-              [AC_HELP_STRING([--enable-fbmanager],
-                              [enable framebuffer manager support (GtkFB)])],,
-              enable_fbmanager=no)
+AC_ARG_ENABLE(fbmanager, [  --enable-fbmanager      enable framebuffer manager support (GtkFB)],enable_fbmanager=yes,enable_fbmanager=no)
 	
 if test "x$enable_debug" = "xyes"; then
   test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
@@ -308,10 +305,7 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 ## calls. Oh, also the later pkg-config calls don't include 
 ## the version requirements since those make the module lists 
 ## annoying to construct
-PKG_CHECK_MODULES(BASE_DEPENDENCIES,
-  [glib-2.0 >= glib_required_version dnl
-   atk >= atk_required_version dnl
-   pango >= pango_required_version])
+PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION atk >= $ATK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION)
 
 if test "$os_win32" != yes; then
     # libtool option to control which symbols are exported
@@ -328,9 +322,9 @@ dnl * See whether to include shared library dependencies *
 dnl ******************************************************
 
 AC_ARG_ENABLE(explicit-deps, 
-              [AC_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@],
-                              [use explicit dependencies in .pc files [default=auto]])],,
-              [enable_explicit_deps=auto])
+              [  --enable-explicit-deps=[yes/no/auto]    use explicit dependencies in .pc files [default=auto]],
+              enable_explicit_deps="$enableval", 
+              enable_explicit_deps=auto)
 
 AC_MSG_CHECKING([Whether to write dependencies into .pc files])
 case $enable_explicit_deps in
@@ -396,7 +390,7 @@ 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"
+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 is it ja ko 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 vi wa yi zh_TW zh_CN"
 AM_GLIB_GNU_GETTEXT
 LIBS="$LIBS $INTLLIBS"
 
@@ -455,10 +449,10 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
 
 GLIB_PACKAGES="gobject-2.0 gmodule-2.0"
 
-AM_PATH_GLIB_2_0(glib_required_version, :,
+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/.]),
+*** GLIB $GLIB_REQUIRED_VERSION or better is required. The latest version of 
+*** GLIB is always available from ftp://ftp.gtk.org/.]),
   gobject gmodule gthread)
 
 dnl
@@ -641,9 +635,7 @@ fi
 
 AC_MSG_CHECKING(whether to build gmodulized gdk-pixbuf)
 
-AC_ARG_ENABLE(modules,
-              [AC_HELP_STRING([--disable-modules],
-                              [disable dynamic module loading])])
+AC_ARG_ENABLE(modules, [  --disable-modules       disable dynamic module loading])
 
 dynworks=false
 deps=
@@ -683,15 +675,9 @@ fi
 dnl We allow people to disable image loaders explicitely, but if they don't we error
 dnl out so that people don't accidentally build without them.
 
-AC_ARG_WITH(libpng,
-            [AC_HELP_STRING([--without-libpng],
-                            [disable PNG loader for gdk-pixbuf])])
-AC_ARG_WITH(libjpeg,
-            [AC_HELP_STRING([--without-libjpeg],
-                            [disable JPEG loader for gdk-pixbuf])])
-AC_ARG_WITH(libtiff,
-            [AC_HELP_STRING([--without-libtiff],
-                            [disable TIFF loader for gdk-pixbuf])])
+AC_ARG_WITH(libpng,  [  --without-libpng	  disable PNG loader for gdk-pixbuf])
+AC_ARG_WITH(libjpeg, [  --without-libjpeg	  disable JPEG loader for gdk-pixbuf])
+AC_ARG_WITH(libtiff, [  --without-libtiff	  disable TIFF loader for gdk-pixbuf])
 
 dnl Test for libtiff
   if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
@@ -804,14 +790,7 @@ AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks)
 #
 AC_MSG_CHECKING(pixbuf loaders to build)
 
-dnl due to an autoconf bug, commas in the first arg to
-dnl AC_HELP_STRING cause problems.
-dnl AC_HELP_STRING([--with-included-loaders=LOADER1 LOADER2 ...],
-dnl                [build the specified loaders into gdk-pixbuf (only used if module loading disabled)])
-AC_ARG_WITH(included_loaders,
-[  --with-included-loaders=LOADER1,LOADER2,...
-                          build the specified loaders into gdk-pixbuf (only
-                          used if module loading disabled)])
+AC_ARG_WITH(included_loaders, [  --with-included-loaders=LOADER1,LOADER2,...  build the specified loaders into gdk-pixbuf (only used if module loading disabled)])
 
 if $dynworks; then 
         :
@@ -822,7 +801,7 @@ else
    fi
 fi
 
-all_loaders="png,bmp,wbmp,gif,ico,ani,jpeg,pnm,ras,tiff,xpm,tga,pcx"
+all_loaders="png,bmp,wbmp,gif,ico,ani,jpeg,pnm,ras,tiff,xpm,tga"
 included_loaders=""
 # If no loaders specified, include all
 if test "x$with_included_loaders" = xyes ; then
@@ -984,8 +963,7 @@ if test "x$gdktarget" = "xlinux-fb" || test "x$gdktarget" = "xx11" ; then
 
       AC_MSG_CHECKING([For sufficiently new FreeType (at least 2.0.1)])
       AC_TRY_COMPILE([
-#include <ft2build.h>
-#include FT_FREETYPE_H
+#include <freetype/freetype.h>
 #include FT_ERRORS_H
     ],
 	             [(void)1;],:,have_freetype=false)
@@ -1005,44 +983,89 @@ fi
 if test "x$gdktarget" = "xx11"; then
   # We start off with the libraries from Pango
 
-  ## be sure we also have Pango built with Xft2 support
-  if $PKG_CONFIG --exists 'pangoxft >= 1.2.0' ; then
+  if $PKG_CONFIG --exists pangox ; then : ; else
+    AC_MSG_ERROR([pangox Pango backend is required for x11 target])
+  fi
+    
+  ## be sure we also have Pango built with xft support
+  if $PKG_CONFIG --exists pangoxft ; then
+    PANGO_PACKAGES="pangoxft pangox"
+    have_xft=true
+    AC_DEFINE(HAVE_XFT)
     if $have_freetype ; then
       :
     else
-      AC_MSG_ERROR([Xft Pango backend found but did not find freetype libraries])
+      AC_MSG_ERROR([pangoxft 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])
+    PANGO_PACKAGES="pangox"
+    have_xft=false
   fi
 
-  if $PKG_CONFIG --exists xft ; then : ; else
-    AC_MSG_ERROR([Xft version 2 is required for x11 target])
+  AM_CONDITIONAL(HAVE_XFT, $have_xft)
+
+  if $have_xft; then
+    if $PKG_CONFIG --exists xft ; then
+      AC_DEFINE(HAVE_XFT2, 1, [Define if we have Xft, version 2])
+    fi
   fi
 
   #
   # If Pango included the shared library dependencies from X11 in
   # the pkg-config output, then we use that (to avoid duplicates).
-  # but if they were omitted to avoid binary compatibility problems,
+  # but if they were omitted to avoid binary compatibility problems
   # then we need to repeat the checks.
   #
-  x_libs="`$PKG_CONFIG --libs pangoxft`"
+  x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`"
   case "$x_libs" in
     *-lX11*) pango_omitted_x_deps=no ;;
     *)       pango_omitted_x_deps=yes ;;
   esac
 
-  x_cflags="`$PKG_CONFIG --cflags pangoxft`"
+  x_cflags="`$PKG_CONFIG --cflags $PANGO_PACKAGES`"
   x_extra_libs=
 
   AC_PATH_XTRA
   if test x$no_x = xyes ; then
     AC_MSG_ERROR([X development libraries not found])
   fi
-  
+
   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="$X_LIBS -lX11 $X_EXTRA_LIBS"
+
+    #
+    # Checks for Xft/XRender
+    #
+    if test $have_xft = true ; then
+      have_xft=false
+
+      if pkg-config --exists pangoxft '>=' 1.1.0 ; then
+        x_libs="`pkg-config --libs xft` -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS"
+        have_xft=true
+      else
+        gtk_save_cppflags="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $x_cflags"
+      
+        AC_CHECK_LIB(Xrender, XRenderFindFormat, 
+	  [AC_CHECK_LIB(Xft, XftFontOpen,
+	    [AC_CHECK_HEADER(X11/Xft/XftFreetype.h,
+	      have_xft=true,:)],
+	    :,-lXrender -lXext $x_libs $FREETYPE_LIBS)]
+	  ,:,-lXext $x_libs)
+	  
+        if $have_xft ; then
+	  x_libs="$X_LIBS -lXft -lXrender -lXext -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS"
+        fi
+
+        CPPFLAGS="$gtk_save_cppflags"
+      fi
+
+      if $have_xft ; then
+        :
+      else
+        AC_MSG_ERROR([pangoxft Pango backend found, but Xft not found])
+      fi
+    fi
   fi    	
 
   ## Strip the .la files
@@ -1063,18 +1086,22 @@ if test "x$gdktarget" = "xx11"; then
   if test "x$enable_shm" = "xyes"; then
     # Check for the Xext library (needed for XShm extention)
     AC_CHECK_LIB(Xext, XShmAttach,
-        [GTK_ADD_LIB(x_extra_libs,Xext)],
+        if test -z "`echo $x_libs | grep "\-lXext" 2> /dev/null`"; then
+          x_extra_libs="-lXext"
+        fi,
         # On AIX, it is in XextSam instead, but we still need -lXext
-        [AC_CHECK_LIB(XextSam, XShmAttach, 
-            [GTK_ADD_LIB(x_extra_libs,Xext)
-             GTK_ADD_LIB(x_extra_libs,XextSam)
-            ], , -lXext $x_libs_for_checks)],
+        AC_CHECK_LIB(XextSam, XShmAttach, 
+            if test -z "`echo $x_libs | grep "\-lXext" 2> /dev/null`"; then
+               x_extra_libs="-lXextSam -lXext"
+            else
+               x_extra_libs="-lXextSam"
+            fi, , $x_libs_for_checks),
         $x_libs_for_checks)
   fi
 
   GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags"
   # Don't ever pull in the pangoxft libraries for gdk-pixbuf-x11
-  GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $x_extra_libs $X_EXTRA_LIBS"
+  GDK_PIXBUF_XLIB_EXTRA_LIBS="$x_extra_libs $x_libs"
 
   # GTK+ uses some X calls, so needs to link against X directly
   if test $enable_explicit_deps != yes ; then
@@ -1094,9 +1121,11 @@ if test "x$gdktarget" = "xx11"; then
 			use_solaris_xinerama=yes, use_solaris_xinerama=no)
 	  if test "x$use_solaris_xinerama" = "xyes"; then
 	      AC_CHECK_HEADER(X11/extensions/xinerama.h,
-	        [GTK_ADD_LIB(x_extra_libs,Xext)
+		if test -z "`echo $x_extra_libs $x_libs | grep "\-lXext" 2> /dev/null`"; then
+		    x_extra_libs="-lXext $x_extra_libs"
+		fi
 		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, -lXext $x_libs_for_checks)
 	  fi	
 	  AC_MSG_CHECKING(for Xinerama support on Solaris)
 	  AC_MSG_RESULT($use_solaris_xinerama);
@@ -1106,10 +1135,12 @@ if test "x$gdktarget" = "xx11"; then
 	  use_xfree_xinerama=yes
 	  AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
 	      [AC_CHECK_HEADER(X11/extensions/Xinerama.h, 
-	          [GTK_ADD_LIB(x_extra_libs,Xext)
-	          GTK_ADD_LIB(x_extra_libs,Xinerama)
+		  x_extra_libs="-lXinerama $x_extra_libs"   
+		  if test -z "`echo $x_extra_libs $x_libs | grep "\-lXext" 2> /dev/null`"; then
+		      x_extra_libs="-lXext $x_extra_libs"
+		  fi
 		  AC_DEFINE(HAVE_XFREE_XINERAMA)
-		  AC_DEFINE(HAVE_XINERAMA)], 
+		  AC_DEFINE(HAVE_XINERAMA), 
 		  use_xfree_xinerama=no,
                   [#include <X11/Xlib.h>])],
 	      use_xfree_xinerama=no, -lXext $x_libs_for_checks)
@@ -1123,8 +1154,10 @@ if test "x$gdktarget" = "xx11"; then
   # Check for shaped window extension
 
   AC_CHECK_LIB(Xext, XShapeCombineMask,
-      [GTK_ADD_LIB(x_extra_libs,Xext)
-       AC_DEFINE(HAVE_SHAPE_EXT)],
+      if test -z "`echo $x_extra_libs $x_libs | grep "\-lXext" 2> /dev/null`"; then
+           x_extra_libs="-lXext $x_extra_libs"
+      fi
+      AC_DEFINE(HAVE_SHAPE_EXT),
       ,
       $x_libs_for_checks)
 
@@ -1171,7 +1204,7 @@ if test "x$gdktarget" = "xx11"; then
 
   if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
     AC_DEFINE(XINPUT_XFREE)
-    GTK_ADD_LIB(x_extra_libs, Xi)
+    x_extra_libs="-lXi $x_extra_libs"
   else
     AC_DEFINE(XINPUT_NONE)
   fi
@@ -1183,24 +1216,14 @@ if test "x$gdktarget" = "xx11"; then
   AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
       [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
           # RANDR requires RENDER
-          [GTK_ADD_LIB(x_extra_libs, Xrender)
-          GTK_ADD_LIB(x_extra_libs, Xrandr)
-	  AC_DEFINE(HAVE_RANDR, 1, Have the Xrandr extension library)],
+	  if test -z "`echo $x_extra_libs $x_libs | grep "\-lXrender" 2> /dev/null`"; then
+	      x_extra_libs="-lXrender $x_extra_libs"
+	  fi
+	  x_extra_libs="-lXrandr $x_extra_libs"
+	  AC_DEFINE(HAVE_RANDR, 1, Have the Xrandr extension library),
 	  :, [#include <X11/Xlib.h>])], : ,
        $X_LIBS -lXrandr -lXrender -lX11 $X_EXTRA_LIBS)
 
-  # Checks for Xcursor library
-  
-  have_xcursor=false
-  PKG_CHECK_MODULES(XCURSOR, xcursor, have_xcursor=true, :)
-
-  if $have_xcursor ; then
-    AC_DEFINE(HAVE_XCURSOR, 1, Have the Xcursor library)
-    XCURSOR_PACKAGES="xcursor"
-  else
-    XCURSOR_PACKAGES=
-  fi
-    
   # Xshm checks
 
   if test "x$enable_shm" = "xyes"; then
@@ -1235,13 +1258,14 @@ if test "x$gdktarget" = "xx11"; then
 
   GDK_EXTRA_CFLAGS=
   if test $pango_omitted_x_deps = yes ; then
-    GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs $x_libs $GDK_EXTRA_LIBS"
+    GDK_EXTRA_LIBS="$x_extra_libs $x_libs $GDK_EXTRA_LIBS"
   else
-    GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs $GDK_EXTRA_LIBS"
+    GDK_EXTRA_LIBS="$x_extra_libs $GDK_EXTRA_LIBS"
   fi
 
   AM_CONDITIONAL(USE_X11, true)
 else
+  AM_CONDITIONAL(HAVE_XFT, false)
   AM_CONDITIONAL(XINPUT_XFREE, false)
   AM_CONDITIONAL(USE_X11, false)
   AM_CONDITIONAL(HAVE_X11R6, false)
@@ -1250,6 +1274,9 @@ fi
 if test "x$gdktarget" = "xwin32"; then
   # We start off with the libraries from Pango
 
+  ## be sure we also have Pango built with win32 support
+  PANGO_PACKAGES="pangowin32"
+
   if test x$have_wintab = xyes; then
     GDK_WIN32_EXTRA_CFLAGS="-I $with_wintab/include"
     AC_SUBST(GDK_WIN32_EXTRA_CFLAGS)
@@ -1261,6 +1288,8 @@ else
   AM_CONDITIONAL(USE_WIN32, false)
 fi
 
+AC_SUBST(xinput_progs)
+
 GDK_PIXBUF_XLIB_PACKAGES=
 GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
 GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS"
@@ -1313,13 +1342,11 @@ fi
 #
 
 if test "x$gdktarget" = "xx11"; then
-        PANGO_PACKAGES=pangoxft
-	
-        # We no longer use pangox, but if we find it, we link to it 
-	# for binary compatibility.
-	if $PKG_CONFIG --exists pangox ; then
-		PANGO_PACKAGES="$PANGO_PACKAGES pangox"
-	fi
+	if $have_xft = true ; then
+            PANGO_PACKAGES="pangoxft pangox"
+        else
+            PANGO_PACKAGES=pangox
+        fi
 elif test "x$gdktarget" = "xwin32"; then
         PANGO_PACKAGES=pangowin32
 elif test "x$gdktarget" = "xlinux-fb"; then
@@ -1361,13 +1388,13 @@ 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"
 
 #
 # If we aren't writing explicit dependencies, then don't put the extra libraries we need
-# into the pkg-config files
+a# into the pkg-config files
 #
 if test $enable_explicit_deps != yes ; then
   GDK_EXTRA_LIBS=
@@ -1429,36 +1456,81 @@ AC_SUBST(GTK_XIM_FLAGS)
 # Checks for gtk-doc and docbook-tools
 ##################################################
 
-GTK_DOC_CHECK([1.0])
+AC_ARG_WITH(html-dir, [  --with-html-dir=PATH    path to installed docs ])
+
+if test "x$with_html_dir" = "x" ; then
+  HTML_DIR='${datadir}/gtk-doc/html'
+else
+  HTML_DIR=$with_html_dir
+fi
+
+AC_SUBST(HTML_DIR)
+
+AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
+
+gtk_doc_min_version=0.10
+if $GTKDOC ; then
+    gtk_doc_version=`gtkdoc-mkdb --version`
+    AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
+
+    IFS="${IFS= 	}"; gtk_save_IFS="$IFS"; IFS="."
+    set $gtk_doc_version
+    for min in $gtk_doc_min_version ; do
+        cur=$1; shift
+        if test -z $min ; then break; fi
+        if test -z $cur ; then GTKDOC=false; break; fi
+        if test $cur -gt $min ; then break ; fi
+        if test $cur -lt $min ; then GTKDOC=false; break ; fi
+    done
+    IFS="$gtk_save_IFS"
+
+    if $GTKDOC ; then
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+    fi
+fi
 
 AC_CHECK_PROG(DB2HTML, db2html, true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
 
-AC_ARG_ENABLE(man,
-              [AC_HELP_STRING([--enable-man],
-                              [regenerate man pages from Docbook [default=no]])],enable_man=yes,
-              enable_man=no)
+dnl Make people enable the gtk-doc stuff explicitely.
+AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc        use gtk-doc to build documentation [default=no]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
 
-dnl
-dnl Check for xsltproc
-dnl
-AC_PATH_PROG([XSLTPROC], [xsltproc])
-if test -z "$XSLTPROC"; then
-  enable_man=no
+if test x$enable_gtk_doc = xyes ; then
+  if test x$GTKDOC != xtrue ; then
+    enable_gtk_doc=no 
+  fi
 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)
+dnl NOTE: We need to use a separate automake conditional for this
+dnl       to make this work with the tarballs.
+AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+
 
 ##################################################
 # Output commands
 ##################################################
 
-AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [
+AC_OUTPUT_COMMANDS([
+
+## Generate `gdk/gdkconfig.h' in two cases
+## 1. `config.status' is run either explicitly, or via configure.
+##     Esp. not when it is run in `Makefile' to generate makefiles and
+##     config.h
+## 2. CONFIG_OTHER is set explicitly
+##
+## Case 1 is difficult.  We know that `automake' sets one of
+## CONFIG_FILES or CONFIG_HEADERS to empty.  This heuristic works
+## only when AM_CONFIG_HEADER is set, however.
+
+if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
+  # Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
+  CONFIG_OTHER=${CONFIG_OTHER:-gdk/gdkconfig.h}
+fi
+case "$CONFIG_OTHER" in
+*gdk/gdkconfig.h*)
+	echo creating gdk/gdkconfig.h
 	outfile=gdkconfig.h-tmp
 	cat > $outfile <<\_______EOF
 /* gdkconfig.h
@@ -1491,11 +1563,12 @@ _______EOF
 
 
 	if cmp -s $outfile gdk/gdkconfig.h; then
-          AC_MSG_NOTICE([gdk/gdkconfig.h is unchanged])
+	  echo gdk/gdkconfig.h is unchanged
 	  rm -f $outfile
 	else
 	  mv $outfile gdk/gdkconfig.h
-	fi
+	fi ;;
+esac
 ],[
 if test "x$gdktarget" = "xx11" ; then
   gdk_windowing='
@@ -1528,7 +1601,7 @@ fi
 AC_PATH_PROG(SGML2HTML, sgml2html, no)
 AM_CONDITIONAL(HAVE_SGML2HTML, test x$SGML2HTML != xno)
 
-AC_CONFIG_FILES([
+AC_OUTPUT([
 config.h.win32
 gtk-zip.sh
 Makefile
@@ -1573,12 +1646,9 @@ gtk/gtkversion.h
 gtk/gtk-win32.rc
 gtk/stock-icons/Makefile
 gtk/theme-bits/Makefile
-gtk/xdgmime/Makefile
 modules/Makefile
 modules/input/Makefile
 contrib/Makefile
 contrib/gdk-pixbuf-xlib/Makefile
 contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc
 ])
-
-AC_OUTPUT

contrib/Makefile.am

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

contrib/gdk-pixbuf-xlib/ChangeLog

@@ -1,7 +1,3 @@
-Tue Oct  7 23:30:00 2003  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf-xlib.h: Add C++ guards. (123955, Harring Figueiredo)
-
 2002-08-06  jacob berkman  <jacob@ximian.com>
 
 	* Makefile.am (lib_LTLIBRARIES): link against xlibs

contrib/gdk-pixbuf-xlib/Makefile.am

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

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

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

demos/Makefile.am

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

demos/gtk-demo/.cvsignore

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

demos/gtk-demo/Makefile.am

@@ -4,27 +4,27 @@ democodedir=$(datadir)/gtk-2.0/demo
 
 ## These should be in the order you want them to appear in the 
 ## demo app, which means alphabetized by demo title, not filename
-demos =						\
-	appwindow.c				\
-	button_box.c				\
-	changedisplay.c				\
-	colorsel.c				\
-	dialog.c				\
-	drawingarea.c				\
-	editable_cells.c			\
-	hypertext.c				\
-	images.c				\
-	list_store.c				\
-	menus.c					\
-	panes.c					\
-	pixbufs.c				\
-	sizegroup.c				\
-	stock_browser.c				\
-	textview.c				\
-	tree_store.c				\
-	ui_manager.c
+demos = @STRIP_BEGIN@	\
+	appwindow.c	\
+	button_box.c	\
+	changedisplay.c	\
+	colorsel.c	\
+	dialog.c	\
+	drawingarea.c	\
+	editable_cells.c \
+	images.c	\
+	item_factory.c	\
+	list_store.c	\
+	menus.c		\
+	panes.c		\
+	pixbufs.c	\
+	sizegroup.c	\
+	stock_browser.c	\
+	textview.c	\
+	tree_store.c	\
+@STRIP_END@
 
-INCLUDES = \
+INCLUDES = @STRIP_BEGIN@ \
 	-DDEMOCODEDIR="\"$(democodedir)\""		\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir)/gdk				\
@@ -32,18 +32,20 @@ INCLUDES = \
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	-DGTK_DISABLE_DEPRECATED 			\
-	$(GTK_DEBUG_FLAGS)				\
-	$(GTK_DEP_CFLAGS)
+	@GTK_DEBUG_FLAGS@				\
+	@GTK_DEP_CFLAGS@				\
+@STRIP_END@
 
 DEPS = \
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/$(gdktargetlib) 				\
-	$(top_builddir)/gtk/$(gtktargetlib)
+	$(top_builddir)/gdk/@gdktargetlib@ 				\
+	$(top_builddir)/gtk/@gtktargetlib@
 
-LDADDS = \
+LDADDS = @STRIP_BEGIN@ 							\
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)
+	$(top_builddir)/gdk/@gdktargetlib@        			\
+	$(top_builddir)/gtk/@gtktargetlib@ 				\
+@STRIP_END@
 
 bin_PROGRAMS = gtk-demo
 
@@ -52,8 +54,8 @@ BUILT_SOURCES = demos.h
 EXTRA_DIST = 		\
 	$(IMAGEFILES)
 
-demos.h: @REBUILD@ $(demos) geninclude.pl
-	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
+demos.h: $(demos) geninclude.pl
+	(cwd=`pwd` && cd $(srcdir) && $(PERL) $$cwd/geninclude.pl $(demos) > demos.h)
 
 gtk_demo_SOURCES = 		\
 	$(demos)		\
@@ -78,5 +80,3 @@ IMAGEFILES=	alphatest.png		\
 		gtk-logo-rgb.gif
 
 democode_DATA = $(demos) $(IMAGEFILES)
-
-DISTCLEANFILES = demos.h

demos/gtk-demo/appwindow.c

@@ -8,20 +8,20 @@
 
 static GtkWidget *window = NULL;
 
-static void
-activate_action (GtkAction *action)
-{
-  const gchar *name = gtk_action_get_name (action);
-  const gchar *typename = G_OBJECT_TYPE_NAME (action);
 
+static void
+menuitem_cb (gpointer             callback_data,
+             guint                callback_action,
+             GtkWidget           *widget)
+{
   GtkWidget *dialog;
   
-  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+  dialog = gtk_message_dialog_new (GTK_WINDOW (callback_data),
                                    GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_INFO,
                                    GTK_BUTTONS_CLOSE,
-                                   "You activated action: \"%s\" of type \"%s\"",
-                                    name, typename);
+                                   "You selected or toggled the menu item: \"%s\"",
+                                    gtk_item_factory_path_from_widget (widget));
 
   /* Close dialog on user response */
   g_signal_connect (dialog,
@@ -32,159 +32,55 @@ activate_action (GtkAction *action)
   gtk_widget_show (dialog);
 }
 
-static void
-activate_radio_action (GtkAction *action, GtkRadioAction *current)
+
+static GtkItemFactoryEntry menu_items[] =
 {
-  const gchar *name = gtk_action_get_name (GTK_ACTION (current));
-  const gchar *typename = G_OBJECT_TYPE_NAME (GTK_ACTION (current));
-  gboolean active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current));
-  gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));
+  { "/_File",            NULL,         0,                     0, "<Branch>" },
+  { "/File/_New",        "<control>N", menuitem_cb,       0, "<StockItem>", GTK_STOCK_NEW },
+  { "/File/_Open",       "<control>O", menuitem_cb,       0, "<StockItem>", GTK_STOCK_OPEN },
+  { "/File/_Save",       "<control>S", menuitem_cb,       0, "<StockItem>", GTK_STOCK_SAVE },
+  { "/File/Save _As...", NULL,         menuitem_cb,       0, "<StockItem>", GTK_STOCK_SAVE },
+  { "/File/sep1",        NULL,         menuitem_cb,       0, "<Separator>" },
+  { "/File/_Quit",       "<control>Q", menuitem_cb,       0, "<StockItem>", GTK_STOCK_QUIT },
 
-  if (active) 
-    {
-      GtkWidget *dialog;
+  { "/_Preferences",                    NULL, 0,               0, "<Branch>" },
+  { "/_Preferences/_Color",             NULL, 0,               0, "<Branch>" },
+  { "/_Preferences/Color/_Red",         NULL, menuitem_cb, 0, "<RadioItem>" },
+  { "/_Preferences/Color/_Green",       NULL, menuitem_cb, 0, "/Preferences/Color/Red" },
+  { "/_Preferences/Color/_Blue",        NULL, menuitem_cb, 0, "/Preferences/Color/Red" },
+  { "/_Preferences/_Shape",             NULL, 0,               0, "<Branch>" },
+  { "/_Preferences/Shape/_Square",      NULL, menuitem_cb, 0, "<RadioItem>" },
+  { "/_Preferences/Shape/_Rectangle",   NULL, menuitem_cb, 0, "/Preferences/Shape/Square" },
+  { "/_Preferences/Shape/_Oval",        NULL, menuitem_cb, 0, "/Preferences/Shape/Rectangle" },
+
+  /* If you wanted this to be right justified you would use "<LastBranch>", not "<Branch>".
+   * Right justified help menu items are generally considered a bad idea now days.
+   */
+  { "/_Help",            NULL,         0,                     0, "<Branch>" },
+  { "/Help/_About",      NULL,         menuitem_cb,       0 },
+};
+
+static void
+toolbar_cb (GtkWidget *button,
+            gpointer   data)
+{
+  GtkWidget *dialog;
   
-      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-				       GTK_DIALOG_DESTROY_WITH_PARENT,
-				       GTK_MESSAGE_INFO,
-				       GTK_BUTTONS_CLOSE,
-				       "You activated radio action: \"%s\" of type \"%s\".\nCurrent value: %d",
-				       name, typename, value);
+  dialog = gtk_message_dialog_new (GTK_WINDOW (data),
+                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_MESSAGE_INFO,
+                                   GTK_BUTTONS_CLOSE,
+                                   "You selected a toolbar button");
 
-      /* Close dialog on user response */
-      g_signal_connect (dialog,
-			"response",
-			G_CALLBACK (gtk_widget_destroy),
-			NULL);
-      
-      gtk_widget_show (dialog);
-    }
+  /* Close dialog on user response */
+  g_signal_connect (dialog,
+                    "response",
+                    G_CALLBACK (gtk_widget_destroy),
+                    NULL);
+  
+  gtk_widget_show (dialog);
 }
 
-
-static GtkActionEntry entries[] = {
-  { "FileMenu", NULL, "_File" },               /* name, stock id, label */
-  { "PreferencesMenu", NULL, "_Preferences" }, /* name, stock id, label */
-  { "ColorMenu", NULL, "_Color"  },            /* name, stock id, label */
-  { "ShapeMenu", NULL, "_Shape" },             /* name, stock id, label */
-  { "HelpMenu", NULL, "_Help" },               /* name, stock id, label */
-  { "New", GTK_STOCK_NEW,                      /* name, stock id */
-    "_New", "<control>N",                      /* label, accelerator */
-    "Create a new file",                       /* tooltip */ 
-    G_CALLBACK (activate_action) },      
-  { "Open", GTK_STOCK_OPEN,                    /* name, stock id */
-    "_Open","<control>O",                      /* label, accelerator */     
-    "Open a file",                             /* tooltip */
-    G_CALLBACK (activate_action) }, 
-  { "Save", GTK_STOCK_SAVE,                    /* name, stock id */
-    "_Save","<control>S",                      /* label, accelerator */     
-    "Save current file",                       /* tooltip */
-    G_CALLBACK (activate_action) },
-  { "SaveAs", GTK_STOCK_SAVE,                  /* name, stock id */
-    "Save _As...", NULL,                       /* label, accelerator */     
-    "Save to a file",                          /* tooltip */
-    G_CALLBACK (activate_action) },
-  { "Quit", GTK_STOCK_QUIT,                    /* name, stock id */
-    "_Quit", "<control>Q",                     /* label, accelerator */     
-    "Quit",                                    /* tooltip */
-    G_CALLBACK (activate_action) },
-  { "About", NULL,                             /* name, stock id */
-    "_About", "<control>A",                    /* label, accelerator */     
-    "About",                                   /* tooltip */  
-    G_CALLBACK (activate_action) },
-  { "Logo", "demo-gtk-logo",                   /* name, stock id */
-     NULL, NULL,                               /* label, accelerator */     
-    "GTK+",                                    /* tooltip */
-    G_CALLBACK (activate_action) },
-};
-static guint n_entries = G_N_ELEMENTS (entries);
-
-
-static GtkToggleActionEntry toggle_entries[] = {
-  { "Bold", GTK_STOCK_BOLD,                    /* name, stock id */
-     "_Bold", "<control>B",                    /* label, accelerator */     
-    "Bold",                                    /* tooltip */
-    G_CALLBACK (activate_action), 
-    TRUE },                                    /* is_active */
-};
-static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);
-
-enum {
-  COLOR_RED,
-  COLOR_GREEN,
-  COLOR_BLUE
-};
-
-static GtkRadioActionEntry color_entries[] = {
-  { "Red", NULL,                               /* name, stock id */
-    "_Red", "<control>R",                      /* label, accelerator */     
-    "Blood", COLOR_RED },                      /* tooltip, value */
-  { "Green", NULL,                             /* name, stock id */
-    "_Green", "<control>G",                    /* label, accelerator */     
-    "Grass", COLOR_GREEN },                    /* tooltip, value */
-  { "Blue", NULL,                              /* name, stock id */
-    "_Blue", "<control>B",                     /* label, accelerator */     
-    "Sky", COLOR_BLUE },                       /* tooltip, value */
-};
-static guint n_color_entries = G_N_ELEMENTS (color_entries);
-
-enum {
-  SHAPE_SQUARE,
-  SHAPE_RECTANGLE,
-  SHAPE_OVAL,
-};
-
-static GtkRadioActionEntry shape_entries[] = {
-  { "Square", NULL,                            /* name, stock id */
-    "_Square", "<control>S",                   /* label, accelerator */     
-    "Square",  SHAPE_SQUARE },                 /* tooltip, value */
-  { "Rectangle", NULL,                         /* name, stock id */
-    "_Rectangle", "<control>R",                /* label, accelerator */     
-    "Rectangle", SHAPE_RECTANGLE },            /* tooltip, value */
-  { "Oval", NULL,                              /* name, stock id */
-    "_Oval", "<control>O",                     /* label, accelerator */     
-    "Egg", SHAPE_OVAL },                       /* tooltip, value */  
-};
-static guint n_shape_entries = G_N_ELEMENTS (shape_entries);
-
-static const gchar *ui_info = 
-"<ui>"
-"  <menubar name='MenuBar'>"
-"    <menu action='FileMenu'>"
-"      <menuitem action='New'/>"
-"      <menuitem action='Open'/>"
-"      <menuitem action='Save'/>"
-"      <menuitem action='SaveAs'/>"
-"      <separator/>"
-"      <menuitem action='Quit'/>"
-"    </menu>"
-"    <menu action='PreferencesMenu'>"
-"      <menu action='ColorMenu'>"
-"	<menuitem action='Red'/>"
-"	<menuitem action='Green'/>"
-"	<menuitem action='Blue'/>"
-"      </menu>"
-"      <menu action='ShapeMenu'>"
-"        <menuitem action='Square'/>"
-"        <menuitem action='Rectangle'/>"
-"        <menuitem action='Oval'/>"
-"      </menu>"
-"      <menuitem action='Bold'/>"
-"    </menu>"
-"    <menu action='HelpMenu'>"
-"      <menuitem action='About'/>"
-"    </menu>"
-"  </menubar>"
-"  <toolbar  name='ToolBar'>"
-"    <toolitem action='Open'/>"
-"    <toolitem action='Quit'/>"
-"    <separator action='Sep1'/>"
-"    <toolitem action='Logo'/>"
-"  </toolbar>"
-"</ui>";
-
-
-
 /* This function registers our custom toolbar icons, so they can be themed.
  *
  * It's totally optional to do this, you could just manually insert icons
@@ -289,30 +185,19 @@ mark_set_callback (GtkTextBuffer     *buffer,
   update_statusbar (buffer, GTK_STATUSBAR (data));
 }
 
-static void
-update_resize_grip (GtkWidget           *widget,
-		    GdkEventWindowState *event,
-		    GtkStatusbar        *statusbar)
-{
-  if (event->changed_mask & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))
-    gtk_statusbar_set_has_resize_grip (statusbar, !(event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)));
-}
-		    
-
 GtkWidget *
-do_appwindow (GtkWidget *do_widget)
+do_appwindow (void)
 {  
   if (!window)
     {
       GtkWidget *table;
+      GtkWidget *toolbar;
       GtkWidget *statusbar;
       GtkWidget *contents;
       GtkWidget *sw;
-      GtkWidget *bar;
       GtkTextBuffer *buffer;
-      GtkActionGroup *action_group;
-      GtkUIManager *merge;
-      GError *error = NULL;
+      GtkAccelGroup *accel_group;      
+      GtkItemFactory *item_factory;
 
       register_stock_icons ();
       
@@ -320,8 +205,6 @@ do_appwindow (GtkWidget *do_widget)
        */
       
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Application Window");
 
       /* NULL window variable when window is closed */
@@ -333,53 +216,66 @@ do_appwindow (GtkWidget *do_widget)
       
       gtk_container_add (GTK_CONTAINER (window), table);
       
-      /* Create the menubar and toolbar
+      /* Create the menubar
        */
       
-      action_group = gtk_action_group_new ("AppWindowActions");
-      gtk_action_group_add_actions (action_group, 
-				    entries, n_entries, 
-				    NULL);
-      gtk_action_group_add_toggle_actions (action_group, 
-					   toggle_entries, n_toggle_entries, 
-					   NULL);
-      gtk_action_group_add_radio_actions (action_group, 
-					  color_entries, n_color_entries, 
-					  COLOR_RED,
-					  G_CALLBACK (activate_radio_action), 
-					  NULL);
-      gtk_action_group_add_radio_actions (action_group, 
-					  shape_entries, n_shape_entries, 
-					  SHAPE_SQUARE,
-					  G_CALLBACK (activate_radio_action), 
-					  NULL);
-
-      merge = gtk_ui_manager_new ();
-      g_object_set_data_full (G_OBJECT (window), "ui-manager", merge, g_object_unref);
-      gtk_ui_manager_insert_action_group (merge, action_group, 0);
-      gtk_window_add_accel_group (GTK_WINDOW (window), 
-				  gtk_ui_manager_get_accel_group (merge));
+      accel_group = gtk_accel_group_new ();
+      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+      g_object_unref (accel_group);
       
-      if (!gtk_ui_manager_add_ui_from_string (merge, ui_info, -1, &error))
-	{
-	  g_message ("building menus failed: %s", error->message);
-	  g_error_free (error);
-	}
+      item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
+
+      /* Set up item factory to go away with the window */
+      g_object_ref (item_factory);
+      gtk_object_sink (GTK_OBJECT (item_factory));
+      g_object_set_data_full (G_OBJECT (window),
+                              "<main>",
+                              item_factory,
+                              (GDestroyNotify) g_object_unref);
+
+      /* create menu items */
+      gtk_item_factory_create_items (item_factory, G_N_ELEMENTS (menu_items),
+                                     menu_items, window);
 
-      bar = gtk_ui_manager_get_widget (merge, "/MenuBar");
-      gtk_widget_show (bar);
       gtk_table_attach (GTK_TABLE (table),
-			bar, 
+			gtk_item_factory_get_widget (item_factory, "<main>"),
                         /* X direction */          /* Y direction */
                         0, 1,                      0, 1,
                         GTK_EXPAND | GTK_FILL,     0,
                         0,                         0);
 
-      bar = gtk_ui_manager_get_widget (merge, "/ToolBar");
-      gtk_toolbar_set_tooltips (GTK_TOOLBAR (bar), TRUE);
-      gtk_widget_show (bar);
+      /* Create the toolbar
+       */
+      toolbar = gtk_toolbar_new ();
+
+      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+                                GTK_STOCK_OPEN,
+                                "This is a demo button with an 'open' icon",
+                                NULL,
+                                G_CALLBACK (toolbar_cb),
+                                window, /* user data for callback */
+                                -1);  /* -1 means "append" */
+
+      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+                                GTK_STOCK_QUIT,
+                                "This is a demo button with a 'quit' icon",
+                                NULL,
+                                G_CALLBACK (toolbar_cb),
+                                window, /* user data for callback */
+                                -1);  /* -1 means "append" */
+
+      gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
+
+      gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+                                "demo-gtk-logo",
+                                "This is a demo button with a 'gtk' icon",
+                                NULL,
+                                G_CALLBACK (toolbar_cb),
+                                window, /* user data for callback */
+                                -1);  /* -1 means "append" */
+
       gtk_table_attach (GTK_TABLE (table),
-			bar, 
+                        toolbar,
                         /* X direction */       /* Y direction */
                         0, 1,                   1, 2,
                         GTK_EXPAND | GTK_FILL,  0,
@@ -408,8 +304,7 @@ do_appwindow (GtkWidget *do_widget)
                                    200, 200);
       
       contents = gtk_text_view_new ();
-      gtk_widget_grab_focus (contents);
-      
+
       gtk_container_add (GTK_CONTAINER (sw),
                          contents);
 
@@ -437,12 +332,6 @@ do_appwindow (GtkWidget *do_widget)
                                G_CALLBACK (mark_set_callback),
                                statusbar,
                                0);
-
-      g_signal_connect_object (window, 
-			       "window_state_event", 
-			       G_CALLBACK (update_resize_grip),
-			       statusbar,
-			       0);
       
       update_statusbar (buffer, GTK_STATUSBAR (statusbar));
     }

demos/gtk-demo/button_box.c

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

demos/gtk-demo/changedisplay.c

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

demos/gtk-demo/colorsel.c

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

demos/gtk-demo/dialog.c

@@ -93,7 +93,7 @@ interactive_dialog_clicked (GtkButton *button,
 }
 
 GtkWidget *
-do_dialog (GtkWidget *do_widget)
+do_dialog (void)
 {
   GtkWidget *frame;
   GtkWidget *vbox;
@@ -106,8 +106,6 @@ do_dialog (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Dialogs");
 
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/drawingarea.c

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

demos/gtk-demo/editable_cells.c

@@ -223,7 +223,7 @@ add_columns (GtkTreeView *treeview)
 }
 
 GtkWidget *
-do_editable_cells (GtkWidget *do_widget)
+do_editable_cells (void)
 {
   if (!window)
     {
@@ -236,8 +236,6 @@ do_editable_cells (GtkWidget *do_widget)
 
       /* create window, etc */
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Shopping list");
       gtk_container_set_border_width (GTK_CONTAINER (window), 5);
       g_signal_connect (window, "destroy",

demos/gtk-demo/geninclude.pl.in

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

demos/gtk-demo/hypertext.c

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

demos/gtk-demo/images.c

@@ -307,7 +307,7 @@ toggle_sensitivity_callback (GtkWidget *togglebutton,
   
 
 GtkWidget *
-do_images (GtkWidget *do_widget)
+do_images (void)
 {
   GtkWidget *frame;
   GtkWidget *vbox;
@@ -322,8 +322,6 @@ do_images (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Images");
 
       g_signal_connect (window, "destroy",

demos/gtk-demo/item_factory.c

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

demos/gtk-demo/list_store.c

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

demos/gtk-demo/main.c

@@ -28,31 +28,6 @@ struct _CallbackData
   GtkTreePath *path;
 };
 
-#ifdef G_OS_WIN32
-
-#undef DEMOCODEDIR
-
-static char *
-get_democodedir (void)
-{
-  static char *result = NULL;
-
-  if (result == NULL)
-    {
-      result = g_win32_get_package_installation_directory (NULL, NULL);
-      if (result == NULL)
-	result = "unknown-location";
-
-      result = g_strconcat (result, "\\share\\gtk-2.0\\demo", NULL);
-    }
-
-  return result;
-}
-
-#define DEMOCODEDIR get_democodedir ()
-
-#endif
-
 /**
  * demo_find_file:
  * @base: base filename
@@ -604,7 +579,7 @@ row_activated_cb (GtkTreeView       *tree_view,
 			  &iter,
 			  ITALIC_COLUMN, !italic,
 			  -1);
-      window = (func) (gtk_widget_get_toplevel (GTK_WIDGET (tree_view)));
+      window = (func) ();
       
       if (window != NULL)
 	{
@@ -837,8 +812,8 @@ main (int argc, char **argv)
   if (g_file_test ("../../gdk-pixbuf/libpixbufloader-pnm.la",
                    G_FILE_TEST_EXISTS))
     {
-      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
-      g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/gtk.immodules", TRUE);
+      putenv ("GDK_PIXBUF_MODULE_FILE=../../gdk-pixbuf/gdk-pixbuf.loaders");
+      putenv ("GTK_IM_MODULE_FILE=../../modules/input/gtk.immodules");
     }
   /* -- End of hack -- */
   

demos/gtk-demo/menus.c

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

demos/gtk-demo/panes.c

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

demos/gtk-demo/pixbufs.c

@@ -205,15 +205,14 @@ cleanup_callback (GtkObject *object,
 }
 
 GtkWidget *
-do_pixbufs (GtkWidget *do_widget)
+do_pixbufs (void)
 {
   if (!window)
     {
       GError *error;
 
+
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Pixbufs");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 

demos/gtk-demo/sizegroup.c

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

demos/gtk-demo/stock_browser.c

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

demos/gtk-demo/textview.c

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

demos/gtk-demo/tree_store.c

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

demos/gtk-demo/ui_manager.c

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

demos/pixbuf-init.c

@@ -15,5 +15,5 @@ void
 pixbuf_init (void)
 {
   if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
-    g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
+    putenv ("GDK_PIXBUF_MODULE_FILE=../gdk-pixbuf/gdk-pixbuf.loaders");
 }

demos/testgtk/main.c

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

demos/testpixbuf-scale.c

@@ -11,12 +11,7 @@ GtkWidget *darea;
 void
 set_interp_type (GtkWidget *widget, gpointer data)
 {
-  guint types[] = { GDK_INTERP_NEAREST,
-                    GDK_INTERP_BILINEAR,
-                    GDK_INTERP_TILES,
-                    GDK_INTERP_HYPER };
-
-  interp_type = types[gtk_combo_box_get_active (GTK_COMBO_BOX (widget))];
+  interp_type = GPOINTER_TO_UINT (data);
   gtk_widget_queue_draw (darea);
 }
 
@@ -63,7 +58,7 @@ int
 main(int argc, char **argv)
 {
 	GtkWidget *window, *vbox;
-        GtkWidget *combo_box;
+	GtkWidget *menuitem, *optionmenu, *menu;
 	GtkWidget *alignment;
 	GtkWidget *hbox, *label, *hscale;
 	GtkAdjustment *adjustment;
@@ -100,18 +95,37 @@ main(int argc, char **argv)
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (window), vbox);
 
-        combo_box = gtk_combo_box_new_text ();
+	menu = gtk_menu_new ();
+	
+	menuitem = gtk_menu_item_new_with_label ("NEAREST");
+	g_signal_connect (menuitem, "activate",
+			  G_CALLBACK (set_interp_type),
+			  GUINT_TO_POINTER (GDK_INTERP_NEAREST));
+	gtk_widget_show (menuitem);
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+	
+	menuitem = gtk_menu_item_new_with_label ("BILINEAR");
+	g_signal_connect (menuitem, "activate",
+			  G_CALLBACK (set_interp_type),
+			  GUINT_TO_POINTER (GDK_INTERP_BILINEAR));
+	gtk_widget_show (menuitem);
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+	
+	menuitem = gtk_menu_item_new_with_label ("TILES");
+	g_signal_connect (menuitem, "activate",
+			  G_CALLBACK (set_interp_type),
+			  GUINT_TO_POINTER (GDK_INTERP_TILES));
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
 
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "NEAREST");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "BILINEAR");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "TILES");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "HYPER");
+	menuitem = gtk_menu_item_new_with_label ("HYPER");
+	g_signal_connect (menuitem, "activate",
+			  G_CALLBACK (set_interp_type),
+			  GUINT_TO_POINTER (GDK_INTERP_HYPER));
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
 
-        gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 1);
-
-        g_signal_connect (combo_box, "changed",
-                          G_CALLBACK (set_interp_type),
-                          NULL);
+	optionmenu = gtk_option_menu_new ();
+	gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
+	gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), 1);
 	
 	alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
@@ -130,7 +144,7 @@ main(int argc, char **argv)
 	gtk_scale_set_digits (GTK_SCALE (hscale), 0);
 	gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE, TRUE, 0);
 
-	gtk_container_add (GTK_CONTAINER (alignment), combo_box);
+	gtk_container_add (GTK_CONTAINER (alignment), optionmenu);
 	gtk_widget_show_all (vbox);
 
 	/* Compute the size without the drawing area, so we know how big to make the default size */

demos/testpixbuf.c

@@ -439,8 +439,7 @@ update_timeout (gpointer data)
         GError *error;
         
 	done = FALSE;
-        error = NULL;
-
+        error = FALSE;
 	if (!feof (status->imagefile)) {
 		gint nbytes;
                 
@@ -448,6 +447,7 @@ update_timeout (gpointer data)
 			       status->imagefile);
 
 
+                error = NULL;
                 if (!gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes, &error)) {
                         g_warning ("Error writing to loader: %s",
                                    error->message);
@@ -458,7 +458,7 @@ update_timeout (gpointer data)
                         
         } 
 	else 
-                done = TRUE;
+	  done = TRUE;
 	  
 	if (done) {
                 /* ignoring errors, we should not do that. */

docs/Makefile.am

@@ -11,7 +11,6 @@ EXTRA_DIST = \
 	sizing-test.txt			\
 	styles.txt			\
 	text_widget.txt 		\
-	text_widget_internals.txt	\
 	tree-column-sizing.txt		\
 	widget_geometry.txt		\
 	widget_system.txt 		\

docs/faq/Makefile.am

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

docs/faq/gtk-faq.sgml

@@ -2,7 +2,7 @@
 <book>
 
 <bookinfo>
-  <date>November 24th 2003</date>
+  <date>September 3rd 2003</date>
   <title>GTK+ FAQ</title>
   <authorgroup>
     <author>
@@ -36,19 +36,17 @@
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>Note: This FAQ is undergoing conversion to GTK+ 2.x</title>
-<para>This FAQ is undergoing conversion to GTK+ 2.x.
+<title>Note: This FAQ mainly covers GTK+ 1.2</title>
+<para>This FAQ mainly covers GTK+ 1.2.
 Where the text covers GTK+ 2.x this will be indicated by prefixing the
-text with: <emphasis>[GTK+ 2.x]</emphasis>. Where this is not
-indicated, the text has not yet been updated from GTK+ 1.2 and may
-not be totally correct.
+text with: <emphasis>[GTK+ 2.x]</emphasis>
 </para>
 </sect1>
 
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>Before anything else: the greetings <emphasis>[GTK 2.x]</emphasis></title>
+<title>Before anything else: the greetings</title>
 <para>The FAQ authors want to thank:</para>
 <itemizedlist spacing=Compact>
 <listitem>
@@ -88,7 +86,7 @@ it's really short :) </para>
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>Authors <emphasis>[GTK 2.x]</emphasis></title>
+<title>Authors</title>
 
 <para>The original authors of GTK+ were:</para>
 
@@ -105,72 +103,35 @@ it's really short :) </para>
 </itemizedlist>
 
 <para>Since then, much has been added by others. Please see the
-AUTHORS file in the distribution for the GTK+ Team. The people currently
-contributing the most code to GTK+ are (in no particular order):</para>
-
-
-<itemizedlist spacing=Compact>
-<listitem>
-<simpara>Owen Taylor</simpara>
-</listitem>
-<listitem>
-<simpara>Matthias Clasen</simpara>
-</listitem>
-<listitem>
-<simpara>Federico Mena Quintero</simpara>
-</listitem>
-<listitem>
-<simpara>Soeren Sandmann</simpara>
-</listitem>
-<listitem>
-<simpara>Padraig O'Briain</simpara>
-</listitem>
-<listitem>
-<simpara>Manish Singh</simpara>
-</listitem>
-<listitem>
-<simpara>Kristian Rietveld</simpara>
-</listitem>
-<listitem>
-<simpara>Tor Lillqvist</simpara>
-</listitem>
-</itemizedlist>
+AUTHORS file in the distribution for the GTK+ Team.</para>
 
 </sect1>
 
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>What is GTK+? <emphasis>[GTK 2.x]</emphasis></title>
+<title>What is GTK+?</title>
 
-<para>GTK+ is a multi-platform toolkit for creating graphical user
-interfaces, originally designed with
+<para>GTK+ is a small and efficient widget set designed with
 the general look and feel of Motif.  In reality, it looks much
-better than Motif.  It contains common and complex widgets, such as
-file selection, and color selection widgets.</para>
+better than Motif.  It contains common widgets and some more
+complex widgets such as a file selection, and color selection
+widgets.</para>
 
-<para>GTK+ was initially developed as a widget set for the GIMP (GNU Image
-Manipulation Program). It has grown extensively since then, and is today
-used by a large number of applications, and is the toolkit used by the
-<ulink url="http://www.gnome.org/">GNOME</ulink> desktop project.</para>
+<para>GTK+ provides some unique features. (At least, I know of
+no other widget library which provides them). For example, a
+button does not contain a label, it contains a child widget,
+which in most instances will be a label.  However, the child
+widget can also be a pixmap, image or any combination possible
+the programmer desires. This flexibility is adhered to
+throughout the library.</para>
 
-<para>GTK+ is free software and part of the GNU Project. However, the
-licensing terms for GTK+, the GNU LGPL, allow it to be used by all developers,
-including those developing proprietary software, without any license fees
-or royalties.</para>
-
-<para>GTK+ has been designed from the ground up to support a range of
-<ulink url="http://www.gtk.org/bindings.html">
-language bindings</ulink>, not only C/C++. Using GTK+ from languages
-such as Perl and Python (especially in combination with the Glade GUI
-builder) provides an effective method of rapid application
-development..</para>
 </sect1>
 
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>What is the + in GTK+? <emphasis>[GTK 2.x]</emphasis></title>
+<title>What is the + in GTK+?</title>
 
 <para>Peter Mattis informed the gtk mailing list that:</para>
 
@@ -184,21 +145,14 @@ version of gtk and the new version. You can think of it as
 being an enhancement to the original gtk that adds object
 oriented features.</quote></para>
 
-<para>Although much has changed with GTK+, and Peter, Spencer and Josh
-don't have any direct involvement these days, the name is kept to keep
-a link with the heritage of GTK+.</para>
-
-<para>GTK+ is now additionally based upon the Pango and ATK
-libraries, that provide text layout and rendering and accessibility
-interfaces.</para>
 </sect1>
 
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>Does the G in GTK+, GDK and GLib stand for? <emphasis>[GTK 2.x]</emphasis></title>
+<title>Does the G in GTK+, GDK and GLib stand for?</title>
 
-<para>GTK+ == The GIMP Toolkit</para>
+<para>GTK+ == Gimp Toolkit</para>
 <para>GDK == GTK+ Drawing Kit</para>
 <para>GLib == G Library</para>
 
@@ -207,14 +161,14 @@ interfaces.</para>
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>Where is the documentation for GTK+? <emphasis>[GTK 2.x]</emphasis></title>
+<title>Where is the documentation for GTK+?</title>
 
 <para>In the GTK+ distribution's doc/ directory you will find
-the API Reference for both GTK and GDK, this FAQ and the
+the reference material for both GTK and GDK, this FAQ and the
 GTK Tutorial.</para>
 
 <para>In addition, you can find links to HTML versions of
-these documents by going to <ulink url="http://www.gtk.org/">
+these documents  by going to <ulink url="http://www.gtk.org/">
 http://www.gtk.org/</ulink>. A
 packaged version of the GTK Tutorial, with SGML, HTML,
 Postscript, DVI and text versions can be found in <ulink
@@ -222,9 +176,8 @@ url="ftp://ftp.gtk.org/pub/gtk/tutorial">
 ftp://ftp.gtk.org/pub/gtk/tutorial
 </ulink></para>
 
-<para>There are now a few books available that deal with
-programming GTK+, GDK and GNOME. Unfortunately, they
-currently are all based upon GTK+ 1.x:</para>
+<para>There are now a couple of books available that deal with
+programming GTK+, GDK and GNOME:</para>
 
 <itemizedlist>
 <listitem><simpara>Eric Harlows book entitled "Developing
@@ -249,28 +202,15 @@ url="http://pobox.com/~hp/gnome-app-devel.html">
 http://pobox.com/~hp/gnome-app-devel.html
 </ulink></simpara>
 </listitem>
-<listitem><simpara>"GTK+ Programming in C" by
-Syd Logan. ISBN: 0-1301-4264-6</simpara>
-</listitem>
-<listitem><simpara>"Linux GNOME/GTK+ Programming Bible" by
-Arthur Griffith. ISBN: 0-7645-4640-6</simpara>
-</listitem>
-<listitem><simpara>"Beginning GTK+/GNOME Programming" by
-Peter Wright. ISBN: 1-8610-0381-1</simpara>
-</listitem>
-<listitem><simpara>"Sams Teach Yourself GTK+ Programming
-in 21 Days" by Donna Martin
-. ISBN: 0-6723-1829-6</simpara>
-</listitem>
 </itemizedlist>
 
 </sect1>
 
 <!-- ----------------------------------------------------------------- -->
 
-<sect1 id="faq-MailLists">
+<sect1>
 <title>Is there a mailing list (or mailing list archive) for
-GTK+? <emphasis>[GTK 2.x]</emphasis></title>
+GTK+?</title>
 
 <para>Information on mailing lists relating to GTK+ can be
 found at: <ulink
@@ -283,7 +223,7 @@ http://www.gtk.org/mailinglists.html
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>How to get help with GTK+ <emphasis>[GTK 2.x]</emphasis></title>
+<title>How to get help with GTK+</title>
 
 <para>First, make sure your question isn't answered in the
 documentation, this FAQ or the tutorial. Done that? You're
@@ -295,7 +235,7 @@ post questions is to the GTK+ mailing list.</para>
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>How to report bugs in GTK+ <emphasis>[GTK 2.x]</emphasis></title>
+<title>How to report bugs in GTK+</title>
 
 <para>Bugs should be reported to the GNOME bug tracking system
 (<ulink url="http://bugzilla.gnome.org">http://bugzilla.gnome.org</ulink>).
@@ -311,11 +251,10 @@ that may prove useful includes:</para>
 <listitem><simpara> How to reproduce the bug.</simpara>
 <simpara>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 complete, short test
-program that exhibits the behavior. As a last resort, you can also
+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.</simpara>
-
 <simpara>(Bugs that can be reproduced within the GIMP are
 almost as good as bugs that can be reproduced in
 testgtk. If you are reporting a bug found with the GIMP,
@@ -324,13 +263,11 @@ using)</simpara>
 </listitem>
 
 <listitem><simpara> If the bug was a crash, the exact text that was
-printed out when the crash occurred. If you can easily reproduce this
-crash then running the program under a debugger (e.g. gdb) and getting
-a backtrace when the crash occurs is very useful.</simpara>
+printed out when the crash occurred.</simpara>
 </listitem>
 
 <listitem><simpara> Further information such as stack traces
-may be useful. If you do send a stack trace,
+may be useful, but are not necessary. If you do send a stack trace,
 and the error is an X error, it will be more useful if the stacktrace is
 produced running the test program with the <literal>--sync</literal>
 command line option.</simpara>
@@ -342,31 +279,33 @@ command line option.</simpara>
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>Is there a Windows version of GTK+? <emphasis>[GTK 2.x]</emphasis></title>
+<title>Is there a Windows version of GTK+?</title>
 
-<para>The Win32 port of GTK+ is maintained concurrently with the Xwindows
-version in CVS. As such it is a supported architecture.</para>
+<para>There is an on going port of GTK+ to the Windows
+platform which is making impressive progress.</para>
 
-<para>The Win32 port has been predominately done by Tor Lillqvist. Tor
-maintains some information on <ulink url="http://www.gimp.org/~tml/gimp/win32/">
-GTK+ and GIMP for Windows</ulink>.</para>
-
-<para>There is a pre-compiled, easy-to-install version of GTK+ for
-windows on the <ulink url="http://www.dropline.net/gtk/">
-Dropline GTK+</ulink> site.</para>
+<para>See <ulink
+url="http://www.iki.fi/tml/gimp/win32">
+http://www.iki.fi/tml/gimp/win32</ulink>
+for more information.</para>
 
 </sect1>
 
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>What applications have been written with GTK+? <emphasis>[GTK 2.x]</emphasis></title>
+<title>What applications have been written with GTK+?</title>
 
-<para>The GNOME software map contains a catalogue of software that is
-built using GNOME and GTK+. The catalogue is searchable and browsable, so
-provides easy access.</para>
+<para>A list of some GTK+ based application can be found on
+the GTK+ web server at <ulink
+url="http://www.gtk.org/apps/">http://www.gtk.org/apps/</ulink>
+and contains more than 350 applications.</para>
 
-<para>Some of the best known projects utilising GTK+ are:</para>
+<para>Failing that, look for a project to work on for the
+GNOME project, <ulink
+url="http://www.gnome.org/">http://www.gnome.org/</ulink>
+Write a game. Write something that is useful.</para>
+<para>Some of these are:</para>
 
 <itemizedlist>
 <listitem><simpara> GIMP (<ulink
@@ -374,36 +313,53 @@ url="http://www.gimp.org/">http://www.gimp.org/</ulink>), an
 image manipulation program</simpara>
 </listitem>
 <listitem><simpara> AbiWord (<ulink
-url="http://www.abiword.org/">http://www.abiword.com/</ulink>),
+url="http://www.abisource.com/">http://www.abisource.com/</ulink>),
 a professional word processor</simpara>
 </listitem>
-<listitem><simpara> Dia (<ulink
-url="http://www.lysator.liu.se/~alla/dia/dia.html">
-http://www.lysator.liu.se/~alla/dia/dia.html</ulink>),
-a diagram creation program</simpara>
+<listitem><simpara> Gzilla (<ulink
+url="http://www.levien.com/gzilla/">http://www.levien.com/gzilla/</ulink>),
+a web browser</simpara>
 </listitem>
-<listitem><simpara> GnuCash (<ulink
-url="http://www.gnucash.org/">
-http://www.gnucash.org/</ulink>),
-a personal finance manager</simpara>
+<listitem><simpara> XQF (<ulink
+url="http://www.botik.ru/~roma/quake/">
+http://www.botik.ru/~roma/quake/</ulink>),
+a QuakeWorld/Quake2 server browser and launcher</simpara>
 </listitem>
-<listitem><simpara> Gnumeric (<ulink
-url="http://www.gnome.org/projects/gnumeric/">
-http://www.gnome.org/projects/gnumeric/</ulink>),
-the GNOME spreadsheet application</simpara>
+<listitem><simpara> GDK Imlib (<ulink
+url="http://www.rasterman.com/imlib.html">
+http://www.rasterman.com/imlib.html</ulink>),
+a fast image loading and manipulation library for GDK</simpara>
 </listitem>
 <listitem><simpara> Glade (<ulink
-url="http://glade.gnome.org/">http://glade.gnome.org/</ulink>), a
-GTK+ based RAD tool which produces GTK+ and GNOME applications</simpara>
-</listitem>
-<listitem><simpara> Anjuta (<ulink
-url="http://anjuta.sourceforge.net/">http://anjuta.sourceforge.net/</ulink>),
-a versatile Integrated Development Environment (IDE) using C and C++ for GTK+
-and GIMP.</simpara>
+url="http://glade.pn.org/">http://glade.pn.org/</ulink>), a
+GTK+ based RAD tool which produces GTK+ applications</simpara>
 </listitem>
 </itemizedlist>
 </sect1>
 
+<!-- ----------------------------------------------------------------- -->
+
+<sect1>
+<title>I'm looking for an application to write in GTK+. How
+about an IRC client?</title>
+
+<para>Ask on gtk-list for suggestions. There are at least
+three IRC clients already under development (probably more in fact. The
+server at <ulink url="http://www.forcix.cx/irc-clients.html">
+http://www.forcix.cx/irc-clients.html</ulink> list a bunch of
+them).</para>
+
+<itemizedlist spacing=compact>
+<listitem><simpara> X-Chat.</simpara>
+</listitem>
+<listitem><simpara> girc. (Included with GNOME)</simpara>
+</listitem>
+<listitem><simpara> gsirc. (In the gnome CVS tree)</simpara>
+</listitem>
+</itemizedlist>
+
+</sect1>
+
 </chapter>
 
 <!-- ***************************************************************** -->
@@ -412,84 +368,18 @@ and GIMP.</simpara>
 
 <!-- ----------------------------------------------------------------- -->
 
-<sect1 id="faq-Compile">
-<title>What do I need to compile GTK+? <emphasis>[GTK 2.x]</emphasis></title>
+<sect1>
+<title>What do I need to run GTK+?</title>
 
-<para>GTK+ is a large package that is dependent on a number of other
-tools and libraries. It is recommended that you use precompiled
-binary packages for your system if possible</para>
-
-<para>To compile GTK+ from source you need a C compiler (gcc) and
-the X Window System and associated development libraries and packages
-on your system.</para>
-
-<para>You will also need to have installed the tools
-and libraries that GTK+ depends upon. These are listed below in the order
-in which they need to be installed:</para>
-
-<itemizedlist spacing=compact>
-<listitem><simpara> pkg-config
-(<ulink url="http://www.freedesktop.org/software/pkgconfig/">
-pkg-config Site</ulink>)</simpara>
-</listitem>
-
-<listitem><simpara> GNU make
-(<ulink url="http://www.gnu.org/software/make/">
-GNU make Site</ulink>)</simpara>
-</listitem>
-
-<listitem><simpara> JPEG, PNG and TIFF image libraries
-(<ulink url="ftp://ftp.gtk.org/pub/gtk/v2.2/dependencies/">
-GTK+ Site</ulink>)</simpara>
-</listitem>
-
-<listitem><simpara> FreeType
-(<ulink url="http://www.freetype.org/">
-FreeType Site</ulink>)</simpara>
-</listitem>
-
-<listitem><simpara> fontconfig
-(<ulink url="http://www.fontconfig.org/">
-fontconfig Site</ulink>)</simpara>
-</listitem>
-
-<listitem><simpara> GNU libiconv library (if your system doesn't have iconv())
-(<ulink url="http://www.gnu.org/software/libiconv/">
-GNU libiconv Site</ulink>)</simpara>
-</listitem>
-
-<listitem><simpara> GNU gettext (if your system doesn't have gettext())
-(<ulink url="http://www.gnu.org/software/gettext/">
-GTK+ Site</ulink>)</simpara>
-</listitem>
-
-<listitem><simpara> GLib
-(<ulink url="ftp://ftp.gtk.org/pub/gtk/v2.2/">
-GTK+ Site</ulink>)</simpara>
-</listitem>
-
-<listitem><simpara> Pango
-(<ulink url="ftp://ftp.gtk.org/pub/gtk/v2.2/">
-GTK+ Site</ulink>)</simpara>
-</listitem>
-
-<listitem><simpara> ATK
-(<ulink url="ftp://ftp.gtk.org/pub/gtk/v2.2/">
-GTK+ Site</ulink>)</simpara>
-</listitem>
-
-<listitem><simpara> GTK+
-(<ulink url="ftp://ftp.gtk.org/pub/gtk/v2.2/">
-GTK+ Site</ulink>)</simpara>
-</listitem>
-</itemizedlist>
+<para>To compile GTK+, all you need is a C compiler (gcc) and
+the X Window System and associated libraries on your system.</para>
 
 </sect1>
 
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>Where can I get GTK+? <emphasis>[GTK 2.x]</emphasis></title>
+<title>Where can I get GTK+?</title>
 
 <para>The canonical site is <ulink
 url="ftp://ftp.gtk.org/pub/gtk">ftp://ftp.gtk.org/pub/gtk</ulink>.</para>
@@ -507,31 +397,30 @@ url="ftp://ftp.gtk.org/etc/mirrors">ftp://ftp.gtk.org/etc/mirrors
 <ulink url="ftp://ftp.is.co.za/applications/gimp">
 ftp://ftp.is.co.za/applications/gimp</ulink></simpara> 
 </listitem>
-
 <listitem><simpara> Australia -
 <ulink
-url="ftp://ftp.planetmirror.com/pub/gimp/gtk">
-ftp://ftp.planetmirror.com/pub/gimp/gtk</ulink></simpara> 
+url="ftp://ftp.au.gimp.org/pub/gimp">
+ftp://ftp.au.gimp.org/pub/gimp</ulink></simpara> 
 </listitem>
-
 <listitem><simpara> Finland -
-<ulink url="ftp://ftp.funet.fi/pub/sci/graphics/packages/gimp/gtk">
-ftp://ftp.funet.fi/pub/sci/graphics/packages/gimp/gtk</ulink></simpara> 
+<ulink url="ftp://ftp.funet.fi/pub/sci/graphics/packages/gimp">
+ftp://ftp.funet.fi/pub/sci/graphics/packages/gimp</ulink></simpara> 
 </listitem>
-
 <listitem><simpara> Germany -
-<ulink url="ftp://ftp.gwdg.de/pub/misc/grafik/gimp/gtk">
-ftp://ftp.gwdg.de/pub/misc/grafik/gimp/gtk</ulink></simpara> 
+<ulink url="ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org">
+ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org"</ulink></simpara> 
 </listitem>
-
 <listitem><simpara> Japan -
-<ulink url="ftp://sunsite.sut.ac.jp/pub/archives/packages/gimp/gtk">
-ftp://sunsite.sut.ac.jp/pub/archives/packages/gimp/gtk</ulink></simpara> 
+<ulink url="ftp://SunSITE.sut.ac.jp/pub/archives/packages/gimp">
+ftp://SunSITE.sut.ac.jp/pub/archives/packages/gimp</ulink></simpara> 
 </listitem>
-
 <listitem><simpara> UK - 
-<ulink url="http://www.mirror.ac.uk/sites/ftp.gimp.org/pub/gtk/">
-http://www.mirror.ac.uk/sites/ftp.gimp.org/pub/gtk/</ulink></simpara>
+<ulink url="ftp://ftp.flirble.org/pub/X/gimp">
+ftp://ftp.flirble.org/pub/X/gimp</ulink></simpara>
+</listitem>
+<listitem><simpara> US -
+<ulink url="ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org">
+ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org</ulink></simpara> 
 </listitem>
 </itemizedlist>
 </sect1>
@@ -539,34 +428,21 @@ http://www.mirror.ac.uk/sites/ftp.gimp.org/pub/gtk/</ulink></simpara>
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>How do I configure/compile GTK+? <emphasis>[GTK 2.x]</emphasis></title>
+<title>How do I configure/compile GTK+?</title>
 
-<para>Generally, the minimum you need to do is issue the commands:</para>
+<para>Generally, all you will need to do is issue the commands:</para>
 
 <para><literallayout><literal>./configure</literal>
-<literal>make</literal>
-<literal>make install</literal></literallayout></para>
+<literal>make</literal></literallayout></para>
 
-<para>in the GTK+ source directory.</para>
-
-<para>This generally also holds true for each of the packages that GTK+
-depends upon, listed <link linkend="faq-Compile">above</link>.</para>
-
-<para>There are various options that you can pass to the configure script
-in order to change its default settings. The one that you are most likely
-to want to use is the <literal>--prefix</literal>
-argument, which defines where the package is to be install, e.g.</para>
-
-<para>
-<literallayout><literal>./configure --prefix=/usr</literal></literallayout>
-</para>
+<para>in the gtk+-version/ directory.</para>
 </sect1>
 
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
 <title>When compiling GTK+ I get an error like: <literal>make:
-file `Makefile' line 456: Syntax error</literal> <emphasis>[GTK 2.x]</emphasis></title>
+file `Makefile' line 456: Syntax error</literal></title>
 
 <para>Make sure that you are using GNU make
 (use <literal>make -v</literal>
@@ -638,7 +514,7 @@ component of GTK) isn't in your path, or there is an old
 version on your system. Type:</simpara>
 
 <para><literallayout>
-<literal>pkg-config gtk+-2.0 --modversion</literal>
+<literal>pkg-config gtk+-2.0 --version</literal>
 </literallayout></para>
 
 <para>to check for both of these. If it returns a value
@@ -671,14 +547,14 @@ successful, try executing it.</para>
 
 <sect1>
 <title>Whats this CVS thing that everyone keeps talking about,
-and how do I access it? <emphasis>[GTK 2.x]</emphasis></title>
+and how do I access it?</title>
 
 <para>CVS is the Concurrent Version System and is a very
 popular means of version control for software projects. It is
-designed to allow multiple authors to simultanously operate on the same
-source tree.  This source tree is centrally maintained, but each
-developer has a local mirror of this repository that they make
-their changes to.</para>
+designed to allow multiple  authors to be able to
+simultanously operate on the same source tree.  This source
+tree is centrally maintained, but each developer has a local
+mirror of this repository that they make their changes to.</para>
 
 <para>The GTK+ developers use a CVS repository to store the
 master copy of the current development version of GTK+. As
@@ -725,22 +601,12 @@ need to get that as well:</para>
 </listitem>
 </itemizedlist>
 
-<para>The CVS archive stores both the current development version of
-GTK+ (the CVS HEAD branch) and all current and past stable versions.
-If you want to retrieve a specific version of GTK+ you have to specify
-the CVS tag corresponding to the version you want to checkout. If you
-want to checkout the current GTK+ 2.2 stable source code, you would need
-to use the following command:</para>
-
-<para><literallayout>
-<literal>cvs -z3 get -r gtk-2-2 gtk+</literal>
-</literallayout></para>
 </sect1>
 
 <!-- ----------------------------------------------------------------- -->
 
-<sect1 id="faq-Patches">
-<title>How can I contribute to GTK+? <emphasis>[GTK 2.x]</emphasis></title>
+<sect1>
+<title>How can I contribute to GTK+?</title>
 
 <para>It's simple. If something doesn't work like you think it
 should in a program, check the documentation to make sure
@@ -748,15 +614,35 @@ you're not missing something. If it is a true bug or missing
 feature, track it down in the GTK+ source, change it,  and
 then generate a patch in the form of a 'context diff'. This
 can be done using a command such as <literal>diff -ru
-&lt;oldfile&gt; &lt;newfile&gt;</literal>.</para>
+&lt;oldfile&gt; &lt;newfile&gt;</literal>. Then upload the patchfile
+to:</para>
 
-<para>The patch should then be attached to a bug report in
-the GNOME bug tracking system, which can also be used to store
-general patches
-(<ulink url="http://bugzilla.gnome.org">http://bugzilla.gnome.org</ulink>).
-</para>
+<para><literallayout>
+<literal>ftp://ftp.gtk.org/incoming</literal>
+</literallayout></para>
 
-<para>This method ensures that the patch will not be lost.</para>
+<para>along with a README file. Make sure you follow the
+naming conventions or your patch will just be deleted! The
+filenames should be of this form:</para>
+
+<para><literallayout>
+<literal>gtk&lt;username&gt;-&lt;date yymmdd-n&gt;.patch.gz</literal>
+<literal>gtk-&lt;username&gt;-&lt;date yymmdd-n&gt;.patch.README</literal>
+</literallayout></para>
+
+<para>The "n" in the date indicates a unique number (starting
+from 0) of patches you uploaded that day.  It should be 0,
+unless you upload more than one patch in the same day.</para>
+
+<para>Example:</para>
+
+<para><literallayout>
+<literal>gtk-gale-982701-0.patch.gz</literal>
+<literal>gtk-gale-982701-0.patch.README</literal>
+</literallayout></para>
+
+<para>Once you upload <emphasis>anything</emphasis>, send the README to
+ftp-admin@gtk.org</para>
 
 </sect1>
 
@@ -764,51 +650,153 @@ general patches
 
 <sect1>
 <title>How do I know if my patch got applied, and if not, why
-not? <emphasis>[GTK 2.x]</emphasis></title>
+not?</title>
 
-<para>If you have used the GNOME bug tracking system (as stated
-<link linkend="faq-Patches">above</link>) then the status
-of your patch should be reflected in the bug report.</para>
+<para>Uploaded patches will be moved to
+<filename>ftp://ftp.gtk.org/pub/gtk/patches</filename> where one of the
+GTK+ development team will pick them up. If applied, they will be moved
+to <filename>/pub/gtk/patches/old</filename>.</para>
+
+<para>Patches that aren't applied, for whatever reason, are
+moved to <filename>/pub/gtk/patches/unapplied</filename> or
+<filename>/pub/gtk/patches/outdated</filename>. At this point you can ask
+on the <literal>gtk-list</literal> mailing list why your patch wasn't
+applied. There are many possible reasons why patches may not
+be applied, ranging from it doesn't apply cleanly, to it isn't
+right. Don't be put off if your patch didn't make it first
+time round.</para>
 
-<para>The GTK+ developers will generally add comments to the bug
-report stating what needs to be done to get the patch applied,
-or why the patch is not appropriate.</para>
 </sect1>
 
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
 <title>What is the policy on incorporating new widgets into
-the library? <emphasis>[GTK 2.x]</emphasis></title>
+the library?</title>
 
 <para>This is up to the authors, so you will have to ask them
 once you are done with your widget. As a general guideline,
-widgets that are generally useful, work, and are not a
+widgets that are  generally useful, work, and are not a
 disgrace to the widget set will gladly be included.</para>
 
-<para>The new widgets that get added to GTK+ are generally either
-replacements for existing widgets that are no longer
-deemed to be adequate, or have been developed externally to GTK+ but
-have been widely tested. One possible avenue for this is via
-<ulink url="http://cvs.gnome.org/lxr/source/libegg/">libegg</ulink>.</para>
-
-<para>Before you spend months of your valuable time implementing your
-revolutionary widget, it is highly recommended that you get some
-feedback on your idea via the appropriate 
-<link linkend="faq-MailLists">mailing list</link>.</para>
 </sect1>
 
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
 <title>Is anyone working on bindings for languages other than
-C? <emphasis>[GTK 2.x]</emphasis></title>
+C?</title>
 
-<para>There is a list of <ulink url="http://www.gtk.org/bindings.html">
-language bindings</ulink> on the GTK+ website.</para>
+<para>The GTK+ home page (<ulink
+url="http://www.gtk.org/">http://www.gtk.org/</ulink>)
+presents a list of GTK+ bindings.</para>
 
-<para>The 'official' language bindings are C++, Ada and Python.
-However, bindings for many other languages are available.</para>
+<itemizedlist>
+<listitem><simpara>There are several C++ wrappers for GTK+.</simpara>
+
+  <itemizedlist> 
+  <listitem><simpara>the gtkmm package, which is a wrapper for
+  GTK+. You can find the home page at <ulink
+  url="http://www.gtkmm.org">
+  http://www.gtkmm.org/</ulink>.</simpara>
+  </listitem>
+
+  <listitem><simpara>the VDK package, which was built as
+  the base package of a GTK+ application Borland-like
+  builder. The home page can be found at <ulink
+  url="http://vdkbuilder.sourceforge.net/">
+  http://vdkbuilder.sourceforge.net/</ulink>.</simpara>
+  </listitem>
+
+  <listitem><simpara>The wxWindows/Gtk package, a free C++ library for
+  cross-platform GUI development. The home page of this package is
+  <ulink url="http://www.wxwindows.org/">
+  http://www.wxwindows.org/</ulink>.</simpara>
+  </listitem>
+
+  </itemizedlist>
+</listitem>
+
+<listitem><simpara>There are three known Objective-c
+bindings currently in development:</simpara>
+
+  <itemizedlist> 
+  <listitem><simpara>The <ulink
+  url="http://www.gnome.org/">http://www.gnome.org/</ulink>
+  package of choice is objgtk. Objgtk is based on the Object class and
+  is maintained by <ulink url="mailto:sopwith@cuc.edu">Elliot
+  Lee</ulink>. Apparently, objgtk is being accepted as the `standard'
+  Objective-C binding for GTK+.</simpara>
+  </listitem>
+
+  <listitem><simpara>If you are more inclined towards the 
+  <ulink url="http://www.gnustep.org/">GNUstep project</ulink>,
+  you may want to check out GTKKit by 
+  <ulink url="mailto:helge@mdlink.de">Helge He&szlig;</ulink>.
+  The intention is to setup a GTK+ binding using the FoundationKit. 
+  GTKKit includes nicities like writing a XML-type template file to 
+  construct a GTK+ interface.</simpara>
+  </listitem>
+
+  <listitem><simpara>The GToolKit package, which can be found at
+  <ulink url="ftp://ftp.gtk.org/pub/gtk/objc-gtoolkit/">
+  ftp://ftp.gtk.org/pub/gtk/objc-gtoolkit/</ulink>.</simpara>
+  </listitem>
+  
+  </itemizedlist>
+</listitem>
+
+<listitem><simpara>Perl bindings <ulink
+url="ftp://ftp.gtk.org/pub/gtk/perl">
+ftp://ftp.gtk.org/pub/gtk/perl</ulink></simpara>
+</listitem>
+
+<listitem><simpara>Guile bindings. The home page is at
+<ulink url="http://www.ping.de/sites/zagadka/guile-gtk">
+http://www.ping.de/sites/zagadka/guile-gtk</ulink>.
+By the way, Guile is the GNU Project's implemention of R4RS Scheme (the
+standard). If you like Scheme, you may want to take a look at
+this.</simpara>
+</listitem>
+
+<listitem><simpara>David Monniaux reports:
+<quote>I've started a gtk-O'Caml binding system.
+The basics of the system, including callbacks, work fine.
+
+The current development is in
+<ulink url="http://www.ens-lyon.fr/~dmonniau/arcs">
+http://www.ens-lyon.fr/~dmonniau/arcs</ulink>
+</quote></simpara>
+</listitem>
+
+<listitem><simpara>Several python bindings have been done:</simpara>
+
+  <itemizedlist>
+  <listitem><simpara>pygtk is at 
+  <ulink url="http://www.daa.com.au/~james/pygtk">
+  http://www.daa.com.au/~james/pygtk</ulink> and 
+  <ulink url="ftp://ftp.gtk.org/pub/gtk/python">
+  ftp://ftp.gtk.org/pub/gtk/python</ulink></simpara>
+  </listitem>
+
+  <listitem><simpara>python-gtk is at
+  <ulink url="http://www.ucalgary.ca/~nascheme/python-gtk">
+  http://www.ucalgary.ca/~nascheme/python-gtk</ulink></simpara>
+  </listitem>
+  
+  </itemizedlist>
+</listitem>
+
+<listitem><simpara>There's are a couple of OpenGL/Mesa
+widgets available for GTK+. I suggest you start at
+<ulink url="http://www.student.oulu.fi/~jlof/gtkglarea/index.html">
+http://www.student.oulu.fi/~jlof/gtkglarea/index.html</ulink></simpara>
+</listitem>
+<listitem><simpara>Last, there are a lot of other language
+bindings for languages such as Eiffel, TOM, Pascal, Pike, etc.</simpara>
+</listitem>
+
+</itemizedlist>
 </sect1>
 
 </chapter>
@@ -820,7 +808,7 @@ However, bindings for many other languages are available.</para>
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>How do I get started? <emphasis>[GTK 2.x]</emphasis></title>
+<title>How do I get started?</title>
 
 <para>So, after you have installed GTK+ there are a couple of
 things that can ease you into developing applications with
@@ -830,10 +818,10 @@ http://www.gtk.org/tutorial/</ulink>, which is undergoing
 development. This will introduce you to writing applications
 using C.</para>
 
-<para>The GTK+ Tutorial doesn't contain information on all of
+<para>The Tutorial doesn't (yet) contain information on all of
 the widgets that are in GTK+. For example code on how to use
-the basics of all the GTK+ widgets you should look in the
-directory 'tests' (and associated source files) within the GTK+
+the basics of all the GTK+ widgets you should look at the file
+gtk/testgtk.c (and associated source files) within the GTK+
 distribution. Looking at these examples will give you a good
 grounding on what the widgets can do.</para>
 
@@ -869,18 +857,11 @@ http://developer.gnome.org/doc/API/2.0/libglade/libglade-notes.html#libglade-bas
 
 <sect1>
 <title>How do I write security sensitive/SUID/SGID programs with GTK+?
-Is GTK+ secure? What's this GTK_MODULES security hole I heard about?
-<emphasis>[GTK 2.x]</emphasis></title>
+Is GTK+ secure? What's this GTK_MODULES security hole I heard about?</title>
 
-<para>The short answer to this question is: you can't, so don't write SUID/SGID
+<para>The short answer to this question is: Don't write SUID/SGID
 programs with GTK+</para>
 
-<para>GTK+ will refuse to run with elevated privileges, as it is not designed
-to be used in this manner. The only correct way to write a setuid program with
-a graphical user interface is to have a setuid backend that communicates with
-the non-setuid graphical user interface via a mechanism such as a pipe and that
-considers the input it receives to be untrusted.</para>
-
 <para>For a more thorough explanation of the GTK+ Developers position on
 this issue see <ulink
 url="http://www.gtk.org/setuid.html">http://www.gtk.org/setuid.html</ulink>.</para>
@@ -894,7 +875,7 @@ url="http://www.gtk.org/setuid.html">http://www.gtk.org/setuid.html</ulink>.</pa
 but it failed. Any clue? <emphasis>[GTK 2.x]</emphasis></title>
 
 <para>Since you are good at coding, we will not deal with
-compile time errors here :)</para>
+compile time error here :)</para>
 
 <para>The classic command line to compile a GTK+ based program is</para>
 <para><literallayout>
@@ -903,7 +884,7 @@ compile time errors here :)</para>
 
 <para>You should notice the backquote character which is used
 in this command line. A common mistake when you start a GTK+
-based development is to use quotes instead of backquotes. If
+based development is to use quote instead of backquotes. If
 you do so, the compiler will complain about an unknown file
 called <filename>pkg-config gtk+-2.0 --cflags --libs</filename>. The
 text in backquotes is an instruction to your shell to
@@ -931,7 +912,7 @@ needed libraries.</simpara>
 <title>What about using the <command>make</command>
 utility? <emphasis>[GTK 2.x]</emphasis></title>
 
-<para>This is a sample makefile which compiles a GTK+ based
+<para>This is a sample makefile which compile a GTK+ based
 program:</para>
 
 <programlisting role="C">
@@ -961,14 +942,14 @@ should read either the related man page or the relevant info file.</para>
 
 <sect1>
 <title>I use the backquote stuff in my makefiles, but my make
-process failed. <emphasis>[GTK 2.x]</emphasis></title>
+process failed.</title>
 
 <para>The backquote construction seems to not be accepted by
 some old <command>make</command> utilities. If you use one of these, the
 make process will probably fail. In order to have the
 backquote syntax working again, you should use the GNU make
 utility (get it on the GNU ftp server at <ulink
-url="ftp://ftp.gnu.org/gnu/make/">ftp://ftp.gnu.org/gnu/make/</ulink>).</para>
+url="ftp://ftp.gnu.org/">ftp://ftp.gnu.org/</ulink>).</para>
 
 </sect1>
 
@@ -992,7 +973,7 @@ relevant packages. These are:</para>
 </listitem>
 </itemizedlist>
 
-<para>You'll find these packages on the main GNU ftp server
+<para>You'll find these packages on the GNU main ftp server
 (<ulink url="ftp://ftp.gnu.org/">ftp://ftp.gnu.org/</ulink>)
 or on any GNU mirror.</para>
 
@@ -1060,7 +1041,7 @@ resources that deal with autoconf and automake).</para>
 <sect1>
 <title>I try to debug my GTK+ application with gdb, but it
 hangs my X server when I hit some breakpoint. Any
-Idea? <emphasis>[GTK 2.x]</emphasis></title>
+Idea?</title>
 
 <para>From Federico Mena Quintero:</para>
 
@@ -1979,7 +1960,7 @@ do <literal>gtk_grab_remove(my_window)</literal>.</para>
 
 <sect1>
 <title>Why doesn't my widget (e.g. progressbar)
-update? <emphasis>[GTK 2.x]</emphasis></title>
+update?</title>
 
 <para>You are probably doing all the changes within a function without
 returning control to <literal>gtk_main()</literal>. This may
@@ -1990,7 +1971,7 @@ drawing queue to be processed using something like:</para>
 
 
 <programlisting role="C">
-while (g_main_context_iteration(NULL, FALSE));
+while (g_main_iteration(FALSE));
 </programlisting>
 
 <para>inside you're function that changes the widget.</para>
@@ -3597,15 +3578,22 @@ and become more useful!</para>
 Tony Gale
 <ulink url="mailto:gale@gtk.org">&lt;gale@gtk.org&gt;</ulink>
 
+Nathan Froyd
+<ulink url="mailto:maestrox@geocities.com">
+&lt;maestrox@geocities.com&gt;</ulink>,
+and 
+Emmanuel Deloget
+<ulink url="mailto:logout@free.fr">&lt;logout@free.fr&gt;</ulink>.
+
 This FAQ was created by Shawn T. Amundson 
 <ulink url="mailto:amundson@gimp.org">
-&lt;amundson@gimp.org&gt;</ulink>.
+&lt;amundson@gimp.org&gt;</ulink> who continues to provide support.
 
 Contributions should be sent to Tony Gale <ulink
 url="mailto:gale@gtk.org">&lt;gale@gtk.org&gt;</ulink></para>
 
-<para>The GTK+ FAQ is Copyright (C) 1997-2003 by Shawn T. Amundson, 
-Tony Gale.</para>
+<para>The GTK+ FAQ is Copyright (C) 1997-2000 by Shawn T. Amundson, 
+Tony Gale, Emmanuel Deloget and Nathan Froyd.</para>
 
 <para>Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are

docs/reference/ChangeLog

@@ -1,295 +1,20 @@
-Sun Nov 23 20:59:57 2003  Matthias Clasen  <maclas@gmx.de>
+2003-08-11  Matthias Clasen  <maclas@gmx.de>
 
-	* gtk/tree_widget.sgml: Add a missing comma.
+	* gtk/tmpl/gtkwidget.sgml:  Document public GtkWidget members.  (#119463)
 
-Fri Nov 21 00:09:36 2003  Matthias Clasen  <maclas@gmx.de>
+2003-08-08  Matthias Clasen  <maclas@gmx.de>
 
-	* gtk/tmpl/gtkfontsel.sgml: 
-	* gtk/tmpl/gtkfontseldlg.sgml: Remove leftover documentation of
-	the filter functionality that got removed long ago.
-
-2003-11-18  Federico Mena Quintero  <federico@ximian.com>
-
-	* gtk/tmpl/gtkfilechooser.sgml: Added sections section about
-	generating previews and including extra widgets.
-
-	* gtk/gtk-docs.sgml: Added a part about migrating old code to new
-	widgets.
-
-	* gtk/migrating-GtkFileChooser.sgml: New file.
-
-	* gtk/Makefile.am (content_files): Added
-	migrating-GtkFileChooser.sgml.
-
-Tue Nov 18 00:12:23 2003  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk/gdk-sections.txt: Add gdk_drawable_copy_to_image.
-
-Mon Nov 17 23:29:21 2003  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add gtk_combo_box_new_with_model,
-	gtk_combo_box_set_model.
-
-Sun Nov 16 00:41:48 2003  Matthias Clasen  <maclas@gmx.de>
- 
-	* gtk/gtk-sections.txt: Remove gtk_tool_item_[sg]et_pack_end.
-
-Sun Nov 16 00:32:18 2003  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Move GtkFileChooser out of the
-	private section, in order to get the autogenerated docs
-	on hierarchy, signals, properties, etc.
-
-Sat Nov 15 00:25:39 2003  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf/tmpl/module_interface.sgml: Add an example
-	for GdkPixbufModulePattern.
-
-Wed Nov 12 21:52:35 2003  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add gtk_menu_set_monitor.
-
-Fri Oct 24 13:15:32 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
-
-	* gtk/tmpl/gtktoolbar.sgml, gtk/tmpl/gtkseparatortoolitem.sgml:
-	Mention the "expand" and "draw" trick for separator tool items.
-
-Fri Oct 24 17:21:04 2003  Owen Taylor  <otaylor@redhat.com>
-
-	* gdk-pixbuf/Makefile.am gtk/Makefile.am: Distribute generated
-	man pages.
-
-2003-10-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* gtk/tmpl/gtkfilechooser.sgml: Added the text for the initial
-	section, and descriptions for the signals and enumerations.
-
-	* gtk/tmpl/gtkfilechooserdialog.sgml: Added the text for the
-	initial section, and a short example.
-
-	* gtk/tmpl/gtkfilechooserwidget.sgml: Added the text for the
-	initial section.
-
-Fri Oct 24 00:25:07 2003  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkfilefilter.sgml: 
-	* gtk/tmpl/gtkfilechooser.sgml: 
-	* gtk/tmpl/gtkfilechooserwidget.sgml: 
-	* gtk/tmpl/gtkfilechooserdialog.sgml: Add short descriptions.
-
-Thu Oct 23 22:41:02 2003  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-docs.sgml: Move GtkCombo and GtkOptionMenu to
-	the "Deprecated" chapter. Add GtkFileChooser, GtkFileChooserDialog,
-	GtkFileChooseWidget and GtkFileFilter.
-
-2003-10-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* gtk/gtk.types: Added gtk_file_chooser_get_type,
-	gtk_file_chooser_dialog_get_type,
-	gtk_file_chooser_widget_get_type, gtk_file_filter_get_type.
-
-	* gtk/gtk-sections.txt: Added GtkFileChooser,
-	GtkFileChooserWidget, GtkFileChooserDialog, GtkFileFilter.
-
-	* gtk/Makefile.am (IGNORE_HFILES): Added gtkcellrendererseptext.h,
-	gtkfilechooserdefault.h, gtkfilechooserentry.h,
-	gtkfilechooserutils.h, gtkfilesystem.h, gtkfilesystemmodel.h,
-	gtkfilesystemunix.h.
-
-	* gtk/tmpl/gtkfilechooser.sgml: New template file.
-
-	* gtk/tmpl/gtkfilechooserdialog.sgml: Likewise.
-
-	* gtk/tmpl/gtkfilechooserwidget.sgml: Likewise.
-
-	* gtk/tmpl/gtkfilefilter.sgml: Likewise.
-
-Sun Oct 12 00:33:48 2003  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk.types: Add the get_type() functions for
-	GtkEntryCompletion, GtkTreeModelFilter, GtkCellLayout, 
-	GtkComboBox, GtkComboBoxEntry.
-
-Sat Oct 11 00:18:46 2003  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkprogressbar.sgml: Included 
-	gtk_progress_bar_get_orientation() in the list of undeprecated 
-	functions, use less clumsy markup for enumerations.
-
-2003-10-02  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/Makefile.am (IGNORE_HFILES): Add gtkcellview.h and
-	gtkcellviewmenuitem.h.
-
-	* gtk/tmpl/gtkentrycompletion.sgml: 
-	* gtk/tmpl/gtktreemodelfilter.sgml: 
-	* gtk/tmpl/gtkcelllayout.sgml: 
-	* gtk/tmpl/gtkcombobox.sgml: 
-	* gtk/tmpl/gtkcomboboxentry.sgml: New templates.
-
-	* gtk/gtk-sections.txt: 
-	* gtk/gtk-docs.sgml: Add sections for GtkEntryCompletion, 
-	GtkTreeModelFilter, GtkCellLayout, GtkComboBox, GtkComboBoxEntry.
-
-	* gtk/tmpl/gtktreednd.sgml: Add short description.
-
-	* gtk/gtk-docs.sgml: Move GtkItemFactory to the "Deprecated" chapter.
-
-	* gtk/tmpl/gtktoggletoolbutton.sgml: Fix section title.
-
-2003-10-01  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk/tmpl/keys.sgml: Add two missing signals.
-
-	* gtk/tmpl/gtkaction.sgml: Fix cross reference to GtkMenuMerge.
-
-	* gtk/gtk-sections.txt: Additions.
-
-	* gtk/tmpl/gtkitemfactory.sgml: Add hint to use #GtkUIManager instead.
-
-2003-09-30  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkuimanager.sgml: Add a section about empty menus.
-
-	* gdk/tmpl/keys.sgml: Small addition.
-
-	* gdk/gdk-sections.txt: Add GdkDisplayClass and GdkScreenClass.
+	* gtk/gtk-docs.sgml: 
+	* gdk-pixbuf/gdk-pixbuf.sgml: 
+	* gdk/gdk-docs.sgml: Add indices.
 
 	* gdk-pixbuf/gdk-pixbuf-sections.txt: Add GdkPixbufLoaderClass.
 
-2003-09-22  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtktable.sgml: Fix a copy-and-paste error.  (#122800)
-
-2003-09-21  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add gtk_widget_[gs]et_no_show_all.
-	Add gtk_toggle_action_[gs]et_draw_as_radio.
-
-2003-09-18  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: 
-	* gtk/tmpl/gtkuimanager.sgml: Updates for accelerator-only actions.
-
-2003-09-16  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkaction.sgml: 
-	* gtk/tmpl/gtkradioaction.sgml: 
-	* gtk/tmpl/gtkactiongroup.sgml: 
-	* gtk/tmpl/gtkuimanager.sgml: Updates.
-
-2003-09-15  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkuimanager.sgml: Add a paragraph about smart separators.
-
-	* gtk/gtk-sections.txt: Add gtk_action_group_add_toggle_actions[_full].
-
-2003-09-12  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk/tmpl/drawing.sgml: Add deprecation note for gdk_draw_pixmap().
-
-2003-09-11  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk/tmpl/drawing.sgml: Add hints about obtaining Pango 
-	structures. (#121953, Martin Pool)
-
-2003-09-04  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add GtkUIManagerItemType.
-
-	* gtk/tmpl/gtkuimanager.sgml: Change the name of the "pos" 
-	attribute to "position".
-
-	* gtk/tmpl/gtkactiongroup.sgml: Doc tweaks.
-
-2003-09-02  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkactiongroup.sgml:	
-	* gtk/tmpl/gtkuimanager.sgml: Additions.
-
-	* gtk/gtk-sections.txt: Add gtk_ui_manager_new_merge_id and
-	gtk_ui_manager_add_ui.
-
-2003-09-01  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkuimanager.sgml: Add an example UI description.
-
-	* gtk/gtk-sections.txt: Add gtk_ui_manager_ensure_update.
-
-2003-08-31  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/Makefile.am (IGNORE_HFILES): Add gtktoggleactionprivate.h
-
-	* gtk/tmpl/gtkuimanager.sgml: 
-	* gtk/gtk-sections.txt: Replace gtk_ui_manager_activate by
-	gtk_ui_manager_get_action.
-
-	* gtk/tmpl/gtkuimanager.sgml: 
-	* gtk/tmpl/gtkactiongroup.sgml: 
-	* gtk/tmpl/gtkaction.sgml: 
-	* gtk/tmpl/gtktoggleaction.sgml: 
-	* gtk/tmpl/gtkradioaction.sgml: Additions.
-
-	* gtk/gtk-sections.txt: Updates.
-
-	* gtk/gtk.types: Add GtkAction, GtkActionGroup, GtkToggleAction,
-	GtkRadioAction and GtkUIManager.
-	
-2003-08-28  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk/tmpl/events.sgml: Improve PointerHint docs.
-	* gdk/tmpl/event_structs.sgml: Explain is_hint field in GdkEventMotion.
-	(#120542)
-
-2003-08-26  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Rename GtkMenuMerge to GtkUIManager
-	* gtk/gtk-docs.sgml: Adjust.
-	* gtk/tmpl/gtkuimanager.sgml: New template.
-	* gtk/tmpl/gtkmenumerge.sgml: Removed.
-
-2003-08-24  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkmenumerge.sgml: 
-	* gtk/tmpl/gtkaction.sgml: 
-	* gtk/tmpl/gtkactiongroup.sgml: 
-	* gtk/tmpl/gtkradioaction.sgml: 
-	* gtk/tmpl/gtktoggleaction.sgml: New templates.
-
-	* gtk/gtk-docs.sgml: 
-	* gtk/gtk-sections.txt: Add GtkMenuMerge, GtkAction, GtkActionGroup, 
-	GtkRadioAction, GtkToggleAction.
-
-2003-08-11  Matthias Clasen  <maclas@gmx.de>
- 
-	* gdk/gdk-sections.txt: Add gdk_window_set_keep_above and
-	gdk_window_set_keep_below.  
-
-	* gtk/gtk-sections.txt: Add gtk_window_set_keep_above and
-	gtk_window_set_keep_below. 
-
-	* gdk/tmpl/event_structs.sgml: Document GDK_WINDOW_STATE_FULLSCREEN, 
-	GDK_WINDOW_STATE_ABOVE and GDK_WINDOW_STATE_BELOW.
-
-2003-08-10  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkwidget.sgml: Document public GtkWidget members.
-	(#119463) 
-
-2003-08-09  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkcalendar.sgml: Deprecate
-	GTK_CALENDAR_WEEK_START_MONDAY. (#87977) 
+	* gdk/gdk-sections.txt: Add GdkScreenClass and GdkDisplayClass.
 
 2003-08-03  Matthias Clasen  <maclas@gmx.de>
 
-	* gdk-pixbuf/tmpl/gdk-pixbuf.sgml: Clarify misleading explanation
-	of rowstride. (#119000) 
-
-Tue Jul 29 14:21:48 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
-
-	* gtk/tmpl/gtktoolbar.sgml: Move documentation inline
+	* gdk-pixbuf/tmpl/gdk-pixbuf.sgml: Clarify misleading explanation of rowstride. (#119000)
 
 2003-07-29  Sven Neumann  <sven@gimp.org>
 
@@ -298,186 +23,37 @@ Tue Jul 29 14:21:48 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 2003-07-21  Matthias Clasen  <maclas@gmx.de>
 
+	* gtk/tmpl/gtktreemodel.sgml: Fix example.  (#117972, Akira Tagoh)
+
 	* gtk/tmpl/gtkdnd.sgml: It is GTK_DEST_DEFAULT_DROP, not
 	GTK_DRAG_DEFAULT_DROP. (#117917, Tim-Philipp Müller)
 
-2003-07-19  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add GTK_STOCK_DIALOG_AUTHENTICATION.
-
-	* gtk/tmpl/gtkstock.sgml: Add GTK_STOCK_DIALOG_AUTHENTICATION.
-
-	* gtk/gtk-sections.txt: Add gtk_button_box_get_child_secondary().
-
-2003-07-18  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add gtk_message_dialog_new_with_markup()
-	and gtk_window_set_default_icon(). 
-
-2003-07-15  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkseparatortoolitem.sgml: 
-	* gtk/tmpl/gtkradiotoolbutton.sgml: 
-	* gtk/tmpl/gtktoggletoolbutton.sgml: New templates.
-
-	* gtk/gtk-docs.sgml: Include gtkseparatortoolitem.xml,
-	gtkradiotoolbutton.xml and gtktoggletoolbutton.xml.
-
-	* gtk/gtk.types: Add gtk_separator_tool_item_get_type,
-	gtk_radio_tool_button_get_type and gtk_toggle_tool_button_get_type.
-
-	* gtk/gtk-sections.txt: Add GtkSeparatorToolItem,
-	GtkRadioToolButton and GtkToggleToolButton sections.
-
-	* gdk/tmpl/input_devices.sgml: Remove docs for
-	gdk_device_get_history() which are now inline. 
-
-	* gdk/gdk-sections.txt: Add gdk_display_flush.
-
-2003-07-13  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk.types: Add gtk_tool_button_get_type and
-	gtk_tool_item_get_type. 
-	
-	* gtk/tmpl/gtktoolbutton.sgml:
-	* gtk/tmpl/gtktoolitem.sgml:
-	* gtk/gtk-docs.sgml: 
-	* gtk/gtk-sections.txt: Add new toolbar api.
-
-	* gtk/tmpl/gtkdnd.sgml: Remove docs for gtk_drag_begin(), which
-	are now inline. 
-
-	* gdk-pixbuf/gdk-pixbuf-sections.txt: Add
-	gdk_pixbuf_new_from_file_at_size. 
-
 2003-07-08  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/tmpl/gtkfilesel.sgml: Fix the example.  (#116575)
 
-Wed Jul  2 18:15:21 2003  Owen Taylor  <otaylor@redhat.com>
-
-	* gtk/Makefile.am gtk/gtk-docs.sgml gtk/gtksections.txt
-	gtk/tmpl/gtkicontheme.sgml: Document named icon system.
-
-	* gtk/tmpl/gtkrc.sgml: Mention specifying named icons
-	as @"icon-name".
-
-	* gtk/tmpl/gtkimage.sgml: Add a cross-reference to stock
-	icons.
-
-2003-07-01  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkcolorbutton.sgml: 
-	* gtk/tmpl/gtkfontbutton.sgml: 
-	* gtk/tmpl/gtkexpander.sgml: New files. Templates for GtkExpander,
-	GtkFontButton and GtkColorButton. 
-
-	* gtk/gtk-sections.txt: Add a sections for GtkExpander,
-	GtkColorButton and GtkFontButton. 
-
-	* gtk/gtk-docs.sgml: Add an entities for GtkExpander,
-	GtkColorButton and GtkFontButton. 
-	
-	* gtk/gtk.types: Add gtk_expander_get_type,
-	gtk_color_button_get_type() and gtk_font_button_get_type(). 
-
-	* gdk/gdk-sections.txt: Add
-	gdk_cursor_new_from_pixbuf(), gdk_display_supports_cursor_alpha(), 
-	gdk_display_supports_cursor_color(),
-	gdk_display_get_default_cursor_size() and 
-	gdk_display_get_maximal_cursor_size(). 
-
-2003-06-30  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkcontainer.sgml: Write a bit about size negotiation. 
-
-	* gtk/tmpl/gtkwidget.sgml: Some additions.
-
-2003-06-24  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-docs.sgml: Move GtkIMContext to "Abstract Base Classes",
-	since its abstract. 
-
-	* gtk/tmpl/gtkaccessible.sgml: 
-	* gtk/tmpl/gtkimmulticontext.sgml: 
-	* gtk/tmpl/gtkimcontextsimple.sgml: 
-	* gtk/tmpl/gtkimcontext.sgml: 
-	* gtk/tmpl/gtkviewport.sgml: 
-	* gtk/tmpl/gtkcellrenderertext.sgml: 
-	* gtk/tmpl/gtkcellrendererpixbuf.sgml: 
-	* gtk/tmpl/gtkcelleditable.sgml: 
-	* gtk/tmpl/gtktreemodelsort.sgml: 
-	* gtk/tmpl/gtktreednd.sgml: 
-	* gtk/tmpl/gtktreesortable.sgml: Add short descriptions.
-
-2003-06-23  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/Makefile.am (HTML_IMAGES): Add RTL variants of stock icons.
-
-	* gtk/tmpl/gtkstock.sgml: Document RTL variants of stock icons. 
-
 2003-06-22  Matthias Clasen  <matthias@localhost.localdomain>
 
-	* gdk-pixbuf/tmpl/gdk-pixbuf.sgml: Typo fix.
-
-	* gdk-pixbuf/gdk-pixbuf-sections.txt: Add
-	gdk_pixbuf_loader_new_with_mime_type. 
+	* gdk-pixbuf/tmpl/gdk-pixbuf.sgml: Fix a typo.
 
 2003-06-19  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/question_index.sgml: Add a question about changing
-	fonts. And one about "Getting Started".  (#114747, #108015)	 
-
-2003-06-17  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf/Makefile.am: Add rule to regenerate man pages from 
-	Docbook.
-	(man_MANS): Add gdk-pixbuf-csource.1, gdk-pixbuf-query-loaders.1.
-	(content_files): Add gdk-pixbuf-csource.xml, 
-	gdk-pixbuf-query-loaders.xml.
-
-	* gdk-pixbuf/gdk-pixbuf-csource.xml: New refentry, containing the 
-	former gdk-pixbuf/gdk-pixbuf-csource.1, converted to Docbook.
-
-	* gdk-pixbuf/gdk-pixbuf-query-loaders.xml: New refentry.
-
-	* gdk-pixbuf/gdk-pixbuf-csource.1:
-	* gdk-pixbuf/gdk-pixbuf-query-loaders.1: Man pages generated from
-	the .xml sources.
-
-	* gdk-pixbuf/gdk-pixbuf.sgml: Include gdk-pixbuf-csource.xml and
-	gdk-pixbuf-query-loaders.xml.
-	
-	* gtk/Makefile.am: Add rule to regenerate man pages from Docbook.
-	(man_MANS): Add gtk-query-immodules-2.0.1
-	(content_files): Add gtk-query-immodules-2.0.xml
-
-	* gtk/gtk-query-immodules-2.0.xml: New refentry.
-
-	* gtk/gtk-query-immodules-2.0.1: Man page generated from the .xml 
-	source.
-
-	* gtk/gtk-docs.sgml: Include gtk-query-immodules-2.0.xml.
-
-	* gtk/gtk-docs.sgml: 
-	* gdk-pixbuf/gdk-pixbuf.sgml: 
-	* gdk/gdk-docs.sgml: Add autogenerated indices.
+ 
+	* gtk/question_index.sgml: Add a question about changing 
+	fonts. And one about "Getting Started".   (#114747, #108015)
 
 2003-06-11  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/tmpl/gtkdnd.sgml: Fix some typos.
 
-2003-06-10  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add gtk_text_view_[gs]et_overwrite().
-
 2003-06-05  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/question_index.sgml: Add a couple of questions.
 
 2003-06-01  Matthias Clasen  <maclas@gmx.de>
 
-	* gtk/gtk-sections.txt: Add gtk_alignment_[gs]et_padding().
+	* gdk-pixbuf/tmpl/gdk-pixbuf.sgml: 
+	* gdk-pixbuf/tmpl/animation.sgml: Remove manually inserted
+	anchors, gtk-doc emits anchors for all objects since Dec 2002.
 
 2003-05-27  Matthias Clasen  <maclas@gmx.de>
 
@@ -487,11 +63,14 @@ Wed Jul  2 18:15:21 2003  Owen Taylor  <otaylor@redhat.com>
 	* gtk/tmpl/gtkradiomenuitem.sgml: Fix example.  (#113604, 
 	Julien Moutte)
 
-2003-05-08  Matthias Clasen  <maclas@gmx.de>
+2003-05-19  Matthias Clasen  <maclas@gmx.de>
 
-	* gtk/tmpl/gtkcalendar.sgml: Deprecate gtk_calendar_display_options().
+	* gdk-pixbuf/gdk-pixbuf-sections.txt: 
+	* gdk/gdk-sections.txt: Add some unused symbols to private sections.
 
-	* gtk/gtk-sections.txt: Add gtk_calendar_[sg]et_display_options().
+2003-05-17  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtk-sections.txt: Add gtk_tree_row_reference_get_type.
 
 2003-05-05  Matthias Clasen  <maclas@gmx.de>
 
@@ -499,39 +78,12 @@ Wed Jul  2 18:15:21 2003  Owen Taylor  <otaylor@redhat.com>
 	* gtk/tmpl/gtksocket.sgml: Improve the docs about cross-process
 	embedding a bit.  (#112101, #112006)
 
-2003-05-01  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-docs.sgml: 
-	* gtk/gtk-sections.txt: Remove some accidentally committed changes.
-
-2003-04-16  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkstyle.sgml: Additions.
-
 2003-04-13  Matthias Clasen  <maclas@gmx.de>
 
-	* gtk/tmpl/gtkenums.sgml: Additions.
-
-	* gtk/tmpl/gtkvruler.sgml: 
-	* gtk/tmpl/gtkhruler.sgml: 
-	* gtk/tmpl/gtkgamma.sgml: 
-	* gtk/tmpl/gtkcurve.sgml: 
-	* gtk/tmpl/gtkruler.sgml: Fix some typos and add some markup.
-
-	* gtk/gtk-sections.txt: Add a bunch of new functions.
-
-2003-04-09  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/building.sgml: More typo fixes.
-
-2003-04-08  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/building.sgml: Typo fix.
+	* gtk/gtk-sections.txt: Add gtk_tree_view_column_cell_get_position().
 
 2003-04-07  Matthias Clasen  <maclas@gmx.de>
 
-	* gtk/tmpl/gtktexttag.sgml: Document GTK_WRAP_WORD_CHAR.  (#110086)
-
 	* gtk/tmpl/gtkenums.sgml, gtk/tmpl/gtkmain.sgml,
 	gtk/tmpl/gtkpaned.sgml, gtk/tmpl/gtkradiobutton.sgml,
 	gtk/tmpl/gtkspinbutton.sgml, gtk/tmpl/gtkstatusbar.sgml,
@@ -539,8 +91,6 @@ Wed Jul  2 18:15:21 2003  Owen Taylor  <otaylor@redhat.com>
 	gtk/tmpl/gtktreeviewcolumn.sgml, gtk/tmpl/gtktypeutils.sgml: Fix
 	numerous misspellings of possessive "its".  (#110027, Doug Quale)
 
-	* gtk/tmpl/gtktypeutils.sgml: Add some deprecation info.
-
 2003-04-01  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/tmpl/gtkmessagedialog.sgml: Fix formatting of examples.
@@ -555,10 +105,6 @@ Wed Jul  2 18:15:21 2003  Owen Taylor  <otaylor@redhat.com>
 	* gtk/tmpl/gtkstock.sgml: use it for GTK_STOCK_COLOR_PICKER
 	instead of stock_colorselector_24.png.
 
-2003-03-04  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkobject.sgml: Add deprecation notes.
-
 2003-02-24  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/tmpl/gtktreemodel.sgml: Fix self-referential documenation of
@@ -569,50 +115,10 @@ Wed Jul  2 18:15:21 2003  Owen Taylor  <otaylor@redhat.com>
 	* gtk/tmpl/gtkrc.sgml: Document that font and fontset declarations
 	are ignored.
 
-2003-02-02  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-docs.sgml: 
-	* gtk/question_index.sgml: # doesn't work here, add links
-	manually.  (#104991)
-
-2003-02-01  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/compiling.sgml: Mention xxx_DISABLE_DEPRECATED and
-	GDK_MULTIHEAD_SAFE. 
-
-2003-01-31  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkmain.sgml: Deprecate the gtk_timeout_*, gtk_idle_*
-	and gtk_input_* functions.  (#71596)
-
 2003-01-30  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/running.sgml: s/overwrite/override/g  (#104627, Brian Cameron)
 
-2003-01-21  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkrc.sgml: Fix integer color range.  (#103992)
-
-2003-01-14  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/gtk-sections.txt: Add new GtkTextIter functions.
-
-2003-01-13  Matthias Clasen  <maclas@gmx.de>
-
-	* gdk-pixbuf/tmpl/gdk-pixbuf.sgml: 
-	* gdk-pixbuf/tmpl/animation.sgml: Remove ids which are now
-	generated by gtk-doc.
-	
-2003-01-03  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkrc.sgml: Update description of priorities for styles
-	and bindings.  (#98054)
-
-2002-12-31  Matthias Clasen  <maclas@gmx.de>
-
-	* gtk/tmpl/gtkrc.sgml: Add a note about gtkrc-2.0 being parsed by
-	all 2.x versions.
-
 Fri Dec 20 13:10:06 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/building.sgml: Update directories in download
@@ -1010,9 +516,8 @@ Tue Jun 18 17:02:48 2002  Owen Taylor  <otaylor@redhat.com>
 
 2002-05-05  Matthias Clasen  <maclas@gmx.de>
 
-	* gtk/gtk-sections.txt: Add gtk_widget_class_find_style_property, 
-	gtk_widget_class_list_style_properties and
-	gtk_style_get_font_for_display. 
+	* gtk/gtk-sections.txt: Add gtk_widget_class_find_style_property,
+	gtk_widget_class_list_style_properties and gtk_style_get_font_for_display.
 
 2002-05-03  Matthias Clasen  <maclas@gmx.de>
 
@@ -1033,15 +538,14 @@ Tue Jun 18 17:02:48 2002  Owen Taylor  <otaylor@redhat.com>
 
 2002-05-01  Matthias Clasen  <maclas@gmx.de>
 
-	* gdk/gdk-sections.txt: Move GdkScreen struct to the GdkScreen
-	section. 
+	* gdk/gdk-sections.txt: Move GdkScreen struct to the GdkScreen section.
 
 	* gdk/tmpl/gdkscreen.sgml: 
 	* gdk/tmpl/gdkdisplay.sgml: Typo and markup fixes.
 
 	* gdk/gdk-docs.sgml: Reorder display and screen sections.
 
-	* gdk/multihead.sgml: Remove references to GdkDisplayManager, typo 
+	* gdk/multihead.sgml: Remove references to GdkDisplayManager, typo
 	and markup fixes.
 
 Tue Apr 30 14:16:12 2002  Owen Taylor  <otaylor@redhat.com>
@@ -1174,9 +678,9 @@ Fri Mar  8 15:14:32 2002  Owen Taylor  <otaylor@redhat.com>
 2002-03-07  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk-pixbuf/tmpl/animation.sgml, gdk-pixbuf/tmpl/gdk-pixbuf.sgml,
-	gtk/tmpl/gtkrc.sgml, gtk/tmpl/gtktextview.sgml,
-	gtk/tmpl/gtkiconfactory.sgml, gtk/tmpl/gtkaccelgroup.sgml: Add
-	some ids which are referenced from the object hierarchy.
+	gtk/tmpl/gtkrc.sgml, gtk/tmpl/gtktextview.sgml, gtk/tmpl/gtkiconfactory.sgml,
+	gtk/tmpl/gtkaccelgroup.sgml: Add some ids which are referenced
+	from the object hierarchy.
 
 	* gtk/gtk-docs.sgml: Use parts as top-level division (#61575),
 	include gtkaccessible docs.
@@ -1643,8 +1147,7 @@ Sat Dec 22 18:18:07 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/tmpl/gtklist.sgml: Markup fixes.
 
-	* gdk/tmpl/selections.sgml, gtk/tmpl/gtksocket.sgml:
-	s/succesful/successful/g. 
+	* gdk/tmpl/selections.sgml, gtk/tmpl/gtksocket.sgml: s/succesful/successful/g.
 
 	* gtk/gtk-sections.txt, gtk/tmpl/gtkstyle.sgml: Remove
 	GTK_STYLE_NUM_STYLECOLORS. (#66467)

docs/reference/gdk-pixbuf/Makefile.am

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

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

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

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

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

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

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

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

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

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

@@ -56,7 +56,6 @@ GdkPixbufDestroyNotify
 <SECTION>
 <FILE>file-loading</FILE>
 gdk_pixbuf_new_from_file
-gdk_pixbuf_new_from_file_at_size
 </SECTION>
 
 <SECTION>
@@ -151,7 +150,6 @@ gdk_interp_type_get_type
 GdkPixbufLoader
 gdk_pixbuf_loader_new
 gdk_pixbuf_loader_new_with_type
-gdk_pixbuf_loader_new_with_mime_type
 gdk_pixbuf_loader_get_format
 gdk_pixbuf_loader_write
 gdk_pixbuf_loader_set_size

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

@@ -25,8 +25,6 @@
 <!ENTITY gdk-pixbuf "<application>gdk-pixbuf</application>">
 <!ENTITY Imlib "<application>Imlib</application>">
 <!ENTITY version SYSTEM "version.xml">
-<!ENTITY gdk-pixbuf-csource SYSTEM "gdk-pixbuf-csource.xml">
-<!ENTITY gdk-pixbuf-query-loaders SYSTEM "gdk-pixbuf-query-loaders.xml">
 ]>
 
 <book id="index">
@@ -115,21 +113,7 @@
     &gdk-pixbuf-gdk-pixbuf-xlib-from-drawables;
     &gdk-pixbuf-gdk-pixbuf-xlib-rgb;
   </reference>
-
-  <reference>
-    <title>Tools Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the tools which are shipped with the
-	&gdk-pixbuf; library.  
-      </para>
-    </partintro>
-
-    &gdk-pixbuf-csource;
-    &gdk-pixbuf-query-loaders;
-  </reference>
-
+ 
   <index/>
 
   &Porting-From-Imlib;

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

@@ -40,15 +40,3 @@ End:
 -->
 
 
-<!-- ##### FUNCTION gdk_pixbuf_new_from_file_at_size ##### -->
-<para>
-
-</para>
-
-@filename: 
-@width: 
-@height: 
-@error: 
-@Returns: 
-
-

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

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

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

@@ -18,8 +18,8 @@ a #GdkPixbufModuleFillVtableFunc function named
 In order to make format-checking work before actually loading the modules
 (which may require dlopening image libraries), modules export their 
 signatures (and other information) via the <function>fill_info</function>
-function. An external utility, <command>gdk-pixbuf-query-loaders</command>, 
-uses this to create a text file containing a list of all available loaders and 
+function. An external utility, <command>gdk-pixbuf-query-loaders</command>, uses
+this to create a text file containing a list of all available loaders and 
 their signatures. This file is then read at runtime by &gdk-pixbuf; to obtain
 the list of available loaders and their signatures. 
 </para>
@@ -158,30 +158,18 @@ operations.
 <!-- ##### STRUCT GdkPixbufModulePattern ##### -->
 <para>
 The signature of a module is a set of prefixes. Prefixes are encoded as
-pairs of ordinary strings, where the second string, if not %NULL, must be
-of the same length as the first one and may contain ' ', '!', 'x', 'z', 
-and 'n' to indicate bytes that must be matched, not matched, 
-"don't-care"-bytes, zeros and non-zeros.
+pairs of ordinary strings, where the second string, if not %NULL,
+may contain ' ', '!', 'x', 'z', and 'n' to indicate bytes that must be 
+matched, not matched, "don't-care"-bytes, zeros and non-zeros.
 Each prefix has an associated integer that describes the relevance of 
 the prefix, with 0 meaning a mismatch and 100 a "perfect match".
 </para>
 
 <para>
 The signature of a module is stored as an array of 
-#GdkPixbufModulePattern<!-- -->s. The array is terminated by a pattern
-where the @prefix is %NULL.
+#GdkPixbufModulePattern<!-- -->s. 
 </para>
 
-<informalexample><programlisting>
-GdkPixbufModulePattern *signature[] = {
-  { "abcdx", " !x z", 100 },
-  { "bla", NULL,  90 },
-  { NULL, NULL, 0 }
-};
-</programlisting>
-The example matches e.g. "auud\0" with relevance 100, and "blau" with 
-relevance 90.</informalexample>
-
 @prefix: the prefix for this pattern
 @mask: mask containing bytes which modify how the prefix is matched against
   test data

docs/reference/gdk/Makefile.am

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

docs/reference/gdk/gdk-sections.txt

@@ -127,7 +127,6 @@ gdk_display_keyboard_ungrab
 gdk_display_pointer_is_grabbed
 gdk_display_beep
 gdk_display_sync
-gdk_display_flush
 gdk_display_close
 gdk_display_list_devices
 gdk_display_get_event
@@ -139,23 +138,19 @@ gdk_display_get_pointer
 gdk_display_get_window_at_pointer
 GdkDisplayPointerHooks
 gdk_display_set_pointer_hooks
-gdk_display_supports_cursor_color
-gdk_display_supports_cursor_alpha
-gdk_display_get_default_cursor_size
-gdk_display_get_maximal_cursor_size
 
 <SUBSECTION Standard>
 GDK_DISPLAY_OBJECT
 GDK_IS_DISPLAY
 GDK_TYPE_DISPLAY
+gdk_display_get_type
 GDK_DISPLAY_CLASS
 GDK_IS_DISPLAY_CLASS
 GDK_DISPLAY_GET_CLASS
 
 <SUBSECTION Private>
-gdk_display_open_default_libgtk_only
-gdk_display_get_type
 GdkDisplayClass
+gdk_display_open_default_libgtk_only
 </SECTION>
 
 <SECTION>
@@ -212,6 +207,7 @@ GDK_TYPE_SCREEN
 GDK_SCREEN_CLASS
 GDK_IS_SCREEN_CLASS
 GDK_SCREEN_GET_CLASS
+
 <SUBSECTION Private>
 GdkScreenClass
 gdk_screen_get_type
@@ -466,7 +462,6 @@ gdk_draw_pixmap
 gdk_draw_drawable
 gdk_draw_image
 gdk_drawable_get_image
-gdk_drawable_copy_to_image
 
 <SUBSECTION Standard>
 GDK_DRAWABLE
@@ -618,8 +613,6 @@ gdk_window_maximize
 gdk_window_unmaximize
 gdk_window_fullscreen
 gdk_window_unfullscreen
-gdk_window_set_keep_above
-gdk_window_set_keep_below
 gdk_window_move
 gdk_window_resize
 gdk_window_move_resize
@@ -1071,7 +1064,6 @@ GdkCursor
 GdkCursorType
 gdk_cursor_new
 gdk_cursor_new_from_pixmap
-gdk_cursor_new_from_pixbuf
 gdk_cursor_new_for_display
 gdk_cursor_get_display
 gdk_cursor_ref

docs/reference/gdk/tmpl/cursors.sgml

@@ -130,18 +130,6 @@ The standard cursors available.
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_cursor_new_from_pixbuf ##### -->
-<para>
-
-</para>
-
-@display: 
-@pixbuf: 
-@x: 
-@y: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_cursor_new_for_display ##### -->
 <para>
 

docs/reference/gdk/tmpl/drawing.sgml

@@ -19,12 +19,6 @@ the number of arguments needed for each drawing operation. See the
 <link linkend="gdk-Graphics-Contexts">Graphics Contexts</link> section for
 more information.
 </para>
-<para id="pango-data-structures">
-Some of the drawing operations take Pango data structures like #PangoContext,
-#PangoLayout or #PangoLayoutLine as arguments. If you're using GTK+, the ususal 
-way to obtain these structures is via gtk_widget_create_pango_context() or
-gtk_widget_create_pango_layout().
-</para>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
@@ -393,7 +387,6 @@ function.
 Draws a pixmap, or a part of a pixmap, onto another drawable.
 </para>
 
-@Deprecated: Use gdk_draw_drawable() instead.
 
 
 <!-- ##### FUNCTION gdk_draw_drawable ##### -->

docs/reference/gdk/tmpl/event_structs.sgml

@@ -203,8 +203,7 @@ Generated when the pointer moves.
   the mouse.
 @state: a bit-mask representing the state of the modifier keys (e.g. Control,
   Shift and Alt) and the pointer buttons. See #GdkModifierType.
-@is_hint: set to 1 if this event is just a hint, see the %GDK_POINTER_MOTION_HINT_MASK
-  value of #GdkEventMask.
+@is_hint: 
 @device: the device where the event originated.
 @x_root: the x coordinate of the pointer relative to the root of the screen.
 @y_root: the y coordinate of the pointer relative to the root of the screen.
@@ -472,9 +471,7 @@ Specifies the state of a toplevel window.
 @GDK_WINDOW_STATE_ICONIFIED: the window is minimized.
 @GDK_WINDOW_STATE_MAXIMIZED: the window is maximized.
 @GDK_WINDOW_STATE_STICKY: the window is sticky.
-@GDK_WINDOW_STATE_FULLSCREEN: the window is maximized without decorations.
-@GDK_WINDOW_STATE_ABOVE: the window is kept above other windows.
-@GDK_WINDOW_STATE_BELOW: the window is kept below other windows.
+@GDK_WINDOW_STATE_FULLSCREEN: 
 
 <!-- ##### ENUM GdkSettingAction ##### -->
 <para>

docs/reference/gdk/tmpl/events.sgml

@@ -97,9 +97,8 @@ 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 %GDK_MOTION_NOTIFY
+events when the application asks for them, by calling gdk_window_get_pointer().
 </para>
 
 @GDK_EXPOSURE_MASK: 

docs/reference/gdk/tmpl/gdkdisplay.sgml

@@ -36,14 +36,6 @@ of an X display. All its fields are private and should not be accessed directly.
 
 @Since: 2.2
 
-<!-- ##### SIGNAL GdkDisplay::closed ##### -->
-<para>
-
-</para>
-
-@gdkdisplay: the object which received the signal.
-@arg1: 
-
 <!-- ##### FUNCTION gdk_display_open ##### -->
 <para>
 
@@ -141,14 +133,6 @@ of an X display. All its fields are private and should not be accessed directly.
 @display: 
 
 
-<!-- ##### FUNCTION gdk_display_flush ##### -->
-<para>
-
-</para>
-
-@display: 
-
-
 <!-- ##### FUNCTION gdk_display_close ##### -->
 <para>
 
@@ -269,40 +253,11 @@ Applications should never have any reason to use this facility
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_display_supports_cursor_color ##### -->
+<!-- ##### SIGNAL GdkDisplay::closed ##### -->
 <para>
 
 </para>
 
-@display: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_display_supports_cursor_alpha ##### -->
-<para>
-
-</para>
-
-@display: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_display_get_default_cursor_size ##### -->
-<para>
-
-</para>
-
-@display: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_display_get_maximal_cursor_size ##### -->
-<para>
-
-</para>
-
-@display: 
-@width: 
-@height: 
-
+@gdkdisplay: the object which received the signal.
+@arg1: 
 

docs/reference/gdk/tmpl/gdkdisplaymanager.sgml

@@ -24,19 +24,6 @@ fields.
 
 @Since: 2.2
 
-<!-- ##### SIGNAL GdkDisplayManager::display-opened ##### -->
-<para>
-
-</para>
-
-@gdkdisplaymanager: the object which received the signal.
-@arg1: 
-
-<!-- ##### ARG GdkDisplayManager:default-display ##### -->
-<para>
-
-</para>
-
 <!-- ##### FUNCTION gdk_display_manager_get ##### -->
 <para>
 
@@ -81,3 +68,16 @@ fields.
 @Returns: 
 
 
+<!-- ##### SIGNAL GdkDisplayManager::display-opened ##### -->
+<para>
+
+</para>
+
+@gdkdisplaymanager: the object which received the signal.
+@arg1: 
+
+<!-- ##### ARG GdkDisplayManager:default-display ##### -->
+<para>
+
+</para>
+

docs/reference/gdk/tmpl/gdkscreen.sgml

@@ -31,13 +31,6 @@ when GDK gets multihead support.
 
 @Since: 2.2
 
-<!-- ##### SIGNAL GdkScreen::size-changed ##### -->
-<para>
-
-</para>
-
-@gdkscreen: the object which received the signal.
-
 <!-- ##### FUNCTION gdk_screen_get_default ##### -->
 <para>
 
@@ -254,3 +247,10 @@ when GDK gets multihead support.
 @Returns: 
 
 
+<!-- ##### SIGNAL GdkScreen::size-changed ##### -->
+<para>
+
+</para>
+
+@gdkscreen: the object which received the signal.
+

docs/reference/gdk/tmpl/input_devices.sgml

@@ -243,16 +243,16 @@ Gets the current state of a device.
 
 <!-- ##### FUNCTION gdk_device_get_history ##### -->
 <para>
-
+Obtains the motion history for a device.
 </para>
 
-@device: 
-@window: 
-@start: 
-@stop: 
-@events: 
-@n_events: 
-@Returns: 
+@device: a #GdkDevice.
+@window: the window wrt. which the event coordinates will be translated.
+@start: only return events newer than this timestamp.
+@stop: only return events older than this timestamp.
+@events: location to return a newly-allocated array of #GdkTimeCoord.
+@n_events: location to return the length of @events.
+@Returns: %TRUE if the @events were successfully filled.
 
 
 <!-- ##### FUNCTION gdk_device_free_history ##### -->

docs/reference/gdk/tmpl/keys.sgml

@@ -30,9 +30,8 @@ Unicode characters with gdk_keyval_to_unicode() and gdk_unicode_to_keyval().
 </para>
 
 <para>
-One #GdkKeymap object exists for each user display. gdk_keymap_get_default() 
-returns the #GdkKeymap for the default display; to obtain keymaps for other 
-displays, use gdk_keymap_get_for_display(). A keymap
+One #GdkKeymap object exists for each user display. GTK 2 supports only one
+display, so gdk_keymap_get_default() returns the singleton #GdkKeymap.  A keymap
 is a mapping from #GdkKeymapKey to key values. You can think of a #GdkKeymapKey
 as a representation of a symbol printed on a physical keyboard key. That is, it
 contains three pieces of information. First, it contains the hardware keycode;
@@ -91,20 +90,6 @@ in the keymap and see what keyval it corresponds to.
 </para>
 
 
-<!-- ##### SIGNAL GdkKeymap::direction-changed ##### -->
-<para>
-
-</para>
-
-@keymap: the object which received the signal.
-
-<!-- ##### SIGNAL GdkKeymap::keys-changed ##### -->
-<para>
-
-</para>
-
-@keymap: the object which received the signal.
-
 <!-- ##### STRUCT GdkKeymapKey ##### -->
 <para>
 A <structname>GdkKeymapKey</structname> is a hardware key that can 
@@ -200,7 +185,7 @@ Returns the direction of the keymap.
 
 @keymap: a #GdkKeymap or %NULL to use the default keymap.
 Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL.
-@Returns: the direction of the keymap.
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_keyval_name ##### -->

docs/reference/gdk/tmpl/windows.sgml

@@ -416,24 +416,6 @@ Deprecated equivalent of g_object_unref()
 @window: 
 
 
-<!-- ##### FUNCTION gdk_window_set_keep_above ##### -->
-<para>
-
-</para>
-
-@window: 
-@setting: 
-
-
-<!-- ##### FUNCTION gdk_window_set_keep_below ##### -->
-<para>
-
-</para>
-
-@window: 
-@setting: 
-
-
 <!-- ##### FUNCTION gdk_window_move ##### -->
 <para>
 

docs/reference/gtk/Makefile.am

@@ -1,99 +1,56 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = 1.6
-
 # The name of the module.
 DOC_MODULE=gtk
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gtk-docs.sgml
 
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED" 
+# The directory containing the source code. Relative to $(srcdir)
+DOC_SOURCE_DIR=../../../gtk
 
 # Extra options to pass to gtkdoc-scangobj
 SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)" 
 
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../gtk
+# Extra options to supply to gtkdoc-scan
+SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED" 
+
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS=--sgml-mode --output-format=xml
+
+# Extra options to supply to gtkdoc-fixref
+FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gtk/*.h
 CFILE_GLOB=$(top_srcdir)/gtk/*.c
 
 # Header files to ignore when scanning
-IGNORE_HFILES=				\
-	fnmatch.h			\
-	gdk-pixbuf-loader.h		\
-	gtkcellrendererseptext.h	\
-	gtkdebug.h			\
-	gtkfilechooserdefault.h		\
-	gtkfilechooserentry.h		\
-	gtkfilechooserutils.h		\
-	gtkfilesystem.h			\
-	gtkfilesystemmodel.h		\
-	gtkfilesystemunix.h		\
-	gtkhsv.h			\
-	gtkiconthemeparser.h		\
-	gtkimmodule.h			\
-	gtkintl.h			\
-	gtkkeyhash.h			\
-	gtkmarshal.h			\
-	gtkprivate.h			\
-	gtktreeprivate.h		\
-	gtkrbtree.h			\
-	gtktreedatalist.h		\
-	gtktextbtree.h			\
-	gtktextdisplay.h		\
-	gtktextiterprivate.h		\
-	gtktextlayout.h			\
-	gtktextmarkprivate.h		\
-	gtktextsegment.h		\
-	gtktexttagprivate.h		\
-	gtktexttypes.h			\
-	gtktextutil.h			\
-	gtktypebuiltins.h		\
-	gtkxembed.h			\
-	xembed.h			\
-	gtktoggleactionprivate.h
-
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
-	-I$(top_srcdir) 	\
-	-I$(top_builddir) 	\
-	-I$(top_builddir)/gdk	\
-	-DGTK_ENABLE_BROKEN	\
-	$(GTK_DEBUG_FLAGS)	\
-	$(GTK_DEP_CFLAGS)
-
-GTKDOC_LIBS = \
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)
-
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
-content_files =					\
-	version.xml				\
-	running.sgml				\
-	building.sgml				\
-	changes-1.2.sgml			\
-	changes-2.0.sgml			\
-	compiling.sgml				\
-	framebuffer.sgml			\
-	migrating-GtkFileChooser.sgml		\
-	objects_grouped.sgml			\
-	question_index.sgml			\
-	resources.sgml				\
-	text_widget.sgml			\
-	tree_widget.sgml			\
-	windows.sgml				\
-	x11.sgml				\
-	gtk-query-immodules-2.0.xml
+IGNORE_HFILES=			\
+	fnmatch.h		\
+	gdk-pixbuf-loader.h	\
+	gtkdebug.h		\
+	gtkhsv.h		\
+	gtkimmodule.h		\
+	gtkintl.h		\
+	gtkkeyhash.h		\
+	gtkmarshal.h		\
+	gtkprivate.h		\
+	gtktreeprivate.h	\
+	gtkrbtree.h		\
+	gtktreedatalist.h	\
+	gtktextbtree.h		\
+	gtktextdisplay.h	\
+	gtktextiterprivate.h	\
+	gtktextlayout.h		\
+	gtktextmarkprivate.h	\
+	gtktextsegment.h	\
+	gtktexttagprivate.h	\
+	gtktexttypes.h		\
+	gtktextutil.h		\
+	gtktypebuiltins.h	\
+	gtkxembed.h		\
+	xembed.h
 
 # Images to copy into HTML directory
 HTML_IMAGES = \
@@ -130,7 +87,6 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/stock_index_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_text_italic_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_jump_to_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_jump_to_rtl_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_align_center_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_align_justify_24.png	\
 	$(top_srcdir)/gtk/stock-icons/stock_align_left_24.png		\
@@ -147,15 +103,13 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/stock_properties_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_exit_24.png			\
 	$(top_srcdir)/gtk/stock-icons/stock_redo_24.png			\
-	$(top_srcdir)/gtk/stock-icons/stock_redo_rtl_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_refresh_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_remove_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_revert_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_revert_rtl_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_save_24.png			\
 	$(top_srcdir)/gtk/stock-icons/stock_save_as_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_colorselector_24.png	\
-	$(top_srcdir)/gtk/stock-icons/stock_color_picker_25.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_color_picker_25.png	\
 	$(top_srcdir)/gtk/stock-icons/stock_font_24.png			\
 	$(top_srcdir)/gtk/stock-icons/stock_sort_ascending_24.png	\
 	$(top_srcdir)/gtk/stock-icons/stock_sort_descending_24.png	\
@@ -163,39 +117,183 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/stock_stop_24.png			\
 	$(top_srcdir)/gtk/stock-icons/stock_text_strikethrough_24.png	\
 	$(top_srcdir)/gtk/stock-icons/stock_undelete_24.png		\
-	$(top_srcdir)/gtk/stock-icons/stock_undelete_rtl_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_text_underline_24.png	\
 	$(top_srcdir)/gtk/stock-icons/stock_undo_24.png			\
-	$(top_srcdir)/gtk/stock-icons/stock_undo_rtl_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_yes_20.png			\
 	$(top_srcdir)/gtk/stock-icons/stock_zoom_1_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_zoom_fit_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_zoom_in_24.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_zoom_out_24.png
 
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-
-include $(top_srcdir)/gtk-doc.make
+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
+content_files = 		\
+	version.xml		\
+	running.sgml		\
+	building.sgml		\
+	changes-1.2.sgml	\
+	changes-2.0.sgml	\
+	compiling.sgml		\
+	framebuffer.sgml	\
+	objects_grouped.sgml	\
+	question_index.sgml	\
+	resources.sgml		\
+	text_widget.sgml	\
+	tree_widget.sgml	\
+	windows.sgml		\
+	x11.sgml
 
 # Other files to distribute
-EXTRA_DIST += version.xml.in
+extra_files = version.xml.in
 
-########################################################################
+# CFLAGS and LDFLAGS for compiling scan program. Only needed
+# if $(DOC_MODULE).types is non-empty.
+GTKDOC_CFLAGS = @STRIP_BEGIN@ 				\
+	@CFLAGS@					\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir) 				\
+	-I$(top_builddir)/gdk				\
+	-DGTK_ENABLE_BROKEN				\
+	@GTK_DEBUG_FLAGS@				\
+	@GTK_DEP_CFLAGS@				\
+@STRIP_END@
 
-man_MANS = gtk-query-immodules-2.0.1 
+GTKDOC_LIBS = @STRIP_BEGIN@ 						\
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+	$(top_builddir)/gdk/@gdktargetlib@        			\
+	$(top_builddir)/gtk/@gtktargetlib@ 				\
+@STRIP_END@
 
-if ENABLE_MAN
+GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
+GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
 
-%.1 : %.xml 
-	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
+####################################
+# Everything below here is generic #
+####################################
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+EXTRA_DIST = 				\
+	$(content_files)		\
+	$(extra_files)			\
+	$(HTML_IMAGES)			\
+	$(DOC_MAIN_SGML_FILE)		\
+	$(DOC_MODULE).types		\
+	$(DOC_MODULE)-sections.txt	\
+	$(DOC_MODULE)-overrides.txt
+
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+SCANOBJ_FILES = 		 \
+	$(DOC_MODULE).args 	 \
+	$(DOC_MODULE).hierarchy  \
+	$(DOC_MODULE).interfaces \
+	$(DOC_MODULE).prerequisites \
+	$(DOC_MODULE).signals
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB)
+	@echo '*** Scanning header files ***'
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	else \
+	    cd $(srcdir) ; \
+	    for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+	    done \
+	fi
+	cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+	@true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+	@echo '*** Rebuilding template files ***'
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+	touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+	@true
+
+#### sgml ####
+
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
+	@echo '*** Building SGML ***'
+	cd $(srcdir) && \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
+	touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+	@true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo '*** Building HTML ***'
+	rm -rf $(srcdir)/html 
+	mkdir $(srcdir)/html
+	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@echo '-- Fixing Crossreferences' 
+	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	touch html-build.stamp
 endif
 
-BUILT_EXTRA_DIST = $(man_MANS)
+##############
 
-dist-hook-local: $(BUILT_EXTRA_DIST)
-	files='$(BUILT_EXTRA_DIST)';				\
-	for f in $$files; do					\
-	  if test -f $$f; then d=.; else d=$(srcdir); fi;	\
-	  cp $$d/$$f $(distdir) || exit 1; done
+clean-local:
+	rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
+
+maintainer-clean-local: clean
+	cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
+	(installfiles=`echo $(srcdir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
+	then echo '-- Nothing to install' ; \
+	else \
+	  for i in $$installfiles; do \
+	    echo '-- Installing '$$i ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+	  done; \
+	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
+	fi)
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+	@false
+endif
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+	mkdir $(distdir)/tmpl
+	mkdir $(distdir)/xml
+	mkdir $(distdir)/html
+	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+	-cp $(srcdir)/xml/*.xml $(distdir)/xml
+	-cp $(srcdir)/html/* $(distdir)/html
+
+.PHONY : dist-hook-local

docs/reference/gtk/building.sgml

@@ -136,7 +136,7 @@ How to compile GTK+ itself
 	  <ulink
 	  url="http://www.freedesktop.org/software/pkgconfig/">pkg-config</ulink>
 	  is a tool for tracking the compilation flags needed for
-	  libraries that are used by the GTK+ libraries. (For each
+	  libraries that is used by the GTK+ libraries. (For each
 	  library, a small <literal>.pc</literal> text file is installed in a standard
 	  location that contains the compilation flags needed for that
 	  library along with version number information.)  The version
@@ -168,7 +168,7 @@ How to compile GTK+ itself
 	<para>
 	  The GLib library provides core non-graphical functionality
 	  such as high level data types, Unicode manipulation, and
-	  an object and type system to C programs. It is available
+	  a object and type system to C programs. It is available
 	  from the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.2/">GTK+
 	  FTP site.</ulink>
 	</para>
@@ -176,7 +176,7 @@ How to compile GTK+ itself
       <listitem>
 	<para>
 	  <ulink url="http://www.pango.org">Pango</ulink> is a library
-	  for internationalized text handling. It is available from
+	  for internationalized text handling. Itis available from
 	  the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.2/">GTK+ FTP
 	  site.</ulink>. Either Pango-1.0 or Pango-1.2 can be used
 	  with GTK+-2.2, though Pango-1.2 is recommended.
@@ -240,8 +240,8 @@ How to compile GTK+ itself
 	  The <ulink url="http://www.fontconfig.org">fontconfig</ulink>
 	  library provides Pango with a standard way of locating
 	  fonts and matching them against font names. The Xft2
-	  library, distributed with fontconfig, provides support for
-	  scalable and antialiased fonts on X. Pango includes two
+	  library, distributed with fontconfig, provide support for
+	  scaleable and antialiased fonts on X. Pango includes two
 	  backends that work on top of fontconfig: an Xft2 backend
 	  and a backend that uses fontconfig and the underlying
 	  <ulink url="http://www.freetype.org">FreeType

docs/reference/gtk/compiling.sgml

@@ -49,25 +49,6 @@ $ cc `pkg-config --cflags --libs gtk+-linux-fb-2.0` hello.c -o hello
 </programlisting>
 </para>
 
-<para>
-If you want to make sure that your program doesn't use any deprecated 
-functions, you can define the preprocessor symbol GTK_DISABLE_DEPRECATED
-by using the command line option <literal>-DGTK_DISABLE_DEPRECATED=1</literal>.
-There are similar symbols GDK_DISABLE_DEPRECATED, 
-GDK_PIXBUF_DISABLE_DEPRECATED and G_DISABLE_DEPRECATED for GDK, GdkPixbuf and
-GLib. 
-</para>
-
-<para>
-If you want to make sure that your program doesn't use any functions which 
-may be problematic in a multihead setting, you can define the preprocessor
-symbol GDK_MULTIHEAD_SAFE by using the command line option 
-<literal>-DGTK_MULTIHEAD_SAFE=1</literal>.
-</para>
-
 </refsect1>
+
 </refentry>
-
-
-
-

docs/reference/gtk/gtk-docs.sgml

@@ -2,8 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 <!ENTITY GtkAccelLabel SYSTEM "xml/gtkaccellabel.xml">
-<!ENTITY GtkAction SYSTEM "xml/gtkaction.xml">
-<!ENTITY GtkActionGroup SYSTEM "xml/gtkactiongroup.xml">
 <!ENTITY GtkAdjustment SYSTEM "xml/gtkadjustment.xml">
 <!ENTITY GtkAlignment SYSTEM "xml/gtkalignment.xml">
 <!ENTITY GtkArrow SYSTEM "xml/gtkarrow.xml">
@@ -16,12 +14,9 @@
 <!ENTITY GtkCheckButton SYSTEM "xml/gtkcheckbutton.xml">
 <!ENTITY GtkCheckMenuItem SYSTEM "xml/gtkcheckmenuitem.xml">
 <!ENTITY GtkCList SYSTEM "xml/gtkclist.xml">
-<!ENTITY GtkColorButton SYSTEM "xml/gtkcolorbutton.xml">
 <!ENTITY GtkColorSelection SYSTEM "xml/gtkcolorsel.xml">
 <!ENTITY GtkColorSelectionDialog SYSTEM "xml/gtkcolorseldlg.xml">
 <!ENTITY GtkCombo SYSTEM "xml/gtkcombo.xml">
-<!ENTITY GtkComboBox SYSTEM "xml/gtkcombobox.xml">
-<!ENTITY GtkComboBoxEntry SYSTEM "xml/gtkcomboboxentry.xml">
 <!ENTITY GtkContainer SYSTEM "xml/gtkcontainer.xml">
 <!ENTITY GtkCTree SYSTEM "xml/gtkctree.xml">
 <!ENTITY GtkCurve SYSTEM "xml/gtkcurve.xml">
@@ -30,16 +25,9 @@
 <!ENTITY GtkEditable SYSTEM "xml/gtkeditable.xml">
 <!ENTITY GtkOldEditable SYSTEM "xml/gtkoldeditable.xml">
 <!ENTITY GtkEntry SYSTEM "xml/gtkentry.xml">
-<!ENTITY GtkEntryCompletion SYSTEM "xml/gtkentrycompletion.xml">
 <!ENTITY GtkEventBox SYSTEM "xml/gtkeventbox.xml">
-<!ENTITY GtkExpander SYSTEM "xml/gtkexpander.xml">
-<!ENTITY GtkFileChooser SYSTEM "xml/gtkfilechooser.xml">
-<!ENTITY GtkFileChooserDialog SYSTEM "xml/gtkfilechooserdialog.xml">
-<!ENTITY GtkFileChooserWidget SYSTEM "xml/gtkfilechooserwidget.xml">
-<!ENTITY GtkFileFilter SYSTEM "xml/gtkfilefilter.xml">
 <!ENTITY GtkFileSelection SYSTEM "xml/gtkfilesel.xml">
 <!ENTITY GtkFixed SYSTEM "xml/gtkfixed.xml">
-<!ENTITY GtkFontButton SYSTEM "xml/gtkfontbutton.xml">
 <!ENTITY GtkFontSelection SYSTEM "xml/gtkfontsel.xml">
 <!ENTITY GtkFontSelectionDialog SYSTEM "xml/gtkfontseldlg.xml">
 <!ENTITY GtkFrame SYSTEM "xml/gtkframe.xml">
@@ -80,10 +68,8 @@
 <!ENTITY GtkPreview SYSTEM "xml/gtkpreview.xml">
 <!ENTITY GtkProgress SYSTEM "xml/gtkprogress.xml">
 <!ENTITY GtkProgressBar SYSTEM "xml/gtkprogressbar.xml">
-<!ENTITY GtkRadioAction SYSTEM "xml/gtkradioaction.xml">
 <!ENTITY GtkRadioButton SYSTEM "xml/gtkradiobutton.xml">
 <!ENTITY GtkRadioMenuItem SYSTEM "xml/gtkradiomenuitem.xml">
-<!ENTITY GtkRadioToolButton SYSTEM "xml/gtkradiotoolbutton.xml">
 <!ENTITY GtkRange SYSTEM "xml/gtkrange.xml">
 <!ENTITY GtkRuler SYSTEM "xml/gtkruler.xml">
 <!ENTITY GtkScale SYSTEM "xml/gtkscale.xml">
@@ -91,7 +77,6 @@
 <!ENTITY GtkScrolledWindow SYSTEM "xml/gtkscrolledwindow.xml">
 <!ENTITY GtkSeparator SYSTEM "xml/gtkseparator.xml">
 <!ENTITY GtkSeparatorMenuItem SYSTEM "xml/gtkseparatormenuitem.xml">
-<!ENTITY GtkSeparatorToolItem SYSTEM "xml/gtkseparatortoolitem.xml">
 <!ENTITY GtkSizeGroup SYSTEM "xml/gtksizegroup.xml">
 <!ENTITY GtkSocket SYSTEM "xml/gtksocket.xml">
 <!ENTITY GtkSpinButton SYSTEM "xml/gtkspinbutton.xml">
@@ -106,25 +91,18 @@
 <!ENTITY GtkTextTagTable SYSTEM "xml/gtktexttagtable.xml">
 <!ENTITY GtkTextView SYSTEM "xml/gtktextview.xml">
 <!ENTITY GtkTipsQuery SYSTEM "xml/gtktipsquery.xml">
-<!ENTITY GtkToggleAction SYSTEM "xml/gtktoggleaction.xml">
 <!ENTITY GtkToggleButton SYSTEM "xml/gtktogglebutton.xml">
-<!ENTITY GtkToggleToolButton SYSTEM "xml/gtktoggletoolbutton.xml">
 <!ENTITY GtkToolbar SYSTEM "xml/gtktoolbar.xml">
-<!ENTITY GtkToolButton SYSTEM "xml/gtktoolbutton.xml">
-<!ENTITY GtkToolItem SYSTEM "xml/gtktoolitem.xml">
 <!ENTITY GtkTooltips SYSTEM "xml/gtktooltips.xml">
 <!ENTITY GtkTree SYSTEM "xml/gtktree.xml">
 <!ENTITY GtkTreeItem SYSTEM "xml/gtktreeitem.xml">
 <!ENTITY GtkTreeModel SYSTEM "xml/gtktreemodel.xml">
 <!ENTITY GtkTreeSortable SYSTEM "xml/gtktreesortable.xml">
 <!ENTITY GtkTreeModelSort SYSTEM "xml/gtktreemodelsort.xml">
-<!ENTITY GtkTreeModelFilter SYSTEM "xml/gtktreemodelfilter.xml">
 <!ENTITY GtkTreeSelection SYSTEM "xml/gtktreeselection.xml">
 <!ENTITY GtkTreeStore SYSTEM "xml/gtktreestore.xml">
 <!ENTITY GtkTreeViewColumn SYSTEM "xml/gtktreeviewcolumn.xml">
 <!ENTITY GtkTreeView SYSTEM "xml/gtktreeview.xml">
-<!ENTITY GtkUIManager SYSTEM "xml/gtkuimanager.xml">
-<!ENTITY GtkCellLayout SYSTEM "xml/gtkcelllayout.xml">
 <!ENTITY GtkCellRenderer SYSTEM "xml/gtkcellrenderer.xml">
 <!ENTITY GtkCellEditable SYSTEM "xml/gtkcelleditable.xml">
 <!ENTITY GtkCellRendererPixbuf SYSTEM "xml/gtkcellrendererpixbuf.xml">
@@ -159,7 +137,6 @@
 <!ENTITY gtk-Types SYSTEM "xml/gtktypeutils.xml">
 <!ENTITY gtk-Bindings SYSTEM "xml/gtkbindings.xml">
 <!ENTITY gtk-Standard-Enumerations SYSTEM "xml/gtkenums.xml">
-<!ENTITY gtk-Named-Icons SYSTEM "xml/gtkicontheme.xml">
 <!ENTITY gtk-Stock-Items SYSTEM "xml/gtkstock.xml">
 <!ENTITY gtk-Themeable-Stock-Images SYSTEM "xml/gtkiconfactory.xml">
 <!ENTITY gtk-Settings SYSTEM "xml/gtksettings.xml">
@@ -179,9 +156,7 @@
 <!ENTITY gtk-Questions SYSTEM "question_index.sgml">
 <!ENTITY gtk-Changes-1-2 SYSTEM "changes-1.2.sgml">
 <!ENTITY gtk-Changes-2-0 SYSTEM "changes-2.0.sgml">
-<!ENTITY gtk-migrating-GtkFileChooser SYSTEM "migrating-GtkFileChooser.sgml">
 <!ENTITY version SYSTEM "version.xml">
-<!ENTITY gtk-query-immodules SYSTEM "gtk-query-immodules-2.0.xml">
 ]>
 <book id="index">
   <bookinfo>
@@ -220,11 +195,8 @@ string utilities, file utilities, a main loop abstraction, and so on.
 <listitem><para>
 
 Pango is a library for internationalized text handling. It centers
-around the <link linkend="PangoLayout">PangoLayout</link> object, representing
-a paragraph of text. 
-Pango provides the engine for <link linkend="GtkTextView">GtkTextView</link>, 
-<link linkend="GtkLabel">GtkLabel</link>, 
-<link linkend="GtkEntry">GtkEntry</link>, and
+around the #PangoLayout object, representing a paragraph of text.
+Pango provides the engine for #GtkTextView, #GtkLabel, #GtkEntry, and
 other widgets that display text.
 
 </para></listitem>
@@ -247,9 +219,9 @@ framework.
 <varlistentry>
 <term>GdkPixbuf</term>
 <listitem><para>
-This is a small library which allows you to create <link linkend="GdkPixbuf">GdkPixbuf</link>
+This is a small library which allows you to create #GdkPixbuf
 ("pixel buffer") objects from image data or image files. 
-Use a <link linkend="GdkPixbuf">GdkPixbuf</link> in combination with <link linkend="GtkImage">GtkImage</link> to display images.
+Use a #GdkPixbuf in combination with #GtkImage to display images.
 </para></listitem>
 </varlistentry>
 
@@ -267,8 +239,7 @@ on X11, Windows, and the Linux framebuffer device.
 <listitem><para>
 
 The GTK+ library itself contains <firstterm>widgets</firstterm>, 
-that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or 
-<link linkend="GtkTextView">GtkTextView</link>.
+that is, GUI components such as #GtkButton or #GtkTextView.
 
 </para></listitem>
 </varlistentry>
@@ -296,7 +267,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
     &gtk-accel-map;
     &gtk-Clipboards;
     &gtk-Drag-and-Drop;
-    &gtk-Named-Icons;
     &gtk-Stock-Items;
     &gtk-Themeable-Stock-Images;
     &gtk-Resource-Files;   
@@ -314,7 +284,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
 
   <part id="gtkobjects">
     <title>GTK+ Widgets and Objects</title>
-
     <chapter>
       <title>Object Hierarchy</title>
     &index-Object-Tree;
@@ -349,7 +318,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
     <chapter id="NumericEntry">
       <title>Numeric/Text Data Entry</title>
         &GtkEntry;
-        &GtkEntryCompletion;
         &GtkHScale;      
         &GtkVScale;
         &GtkSpinButton;
@@ -377,8 +345,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkTreeDND;
 	&GtkTreeSortable;
         &GtkTreeModelSort;
-        &GtkTreeModelFilter;
-        &GtkCellLayout;
         &GtkCellRenderer;
         &GtkCellEditable;
         &GtkCellRendererPixbuf;
@@ -387,48 +353,28 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkListStore;
         &GtkTreeStore;
     </chapter>
-
     <chapter id="MenusAndCombos">
       <title>Menus, Combo Box, Toolbar</title>
-	&GtkComboBox;
-	&GtkComboBoxEntry;
+        &GtkCombo;
+        &GtkItemFactory;
         &GtkMenu;
         &GtkMenuBar;
         &GtkMenuItem;
         &GtkMenuShell;
+        &GtkOptionMenu;
 	&GtkImageMenuItem;
         &GtkRadioMenuItem;
         &GtkCheckMenuItem;      
         &GtkSeparatorMenuItem;
         &GtkTearoffMenuItem;
         &GtkToolbar;
-        &GtkToolItem;
-        &GtkSeparatorToolItem;
-        &GtkToolButton;
-        &GtkToggleToolButton;
-        &GtkRadioToolButton;
-    </chapter>
- 
-    <chapter id="Actions">
-      <title>Action-based menus and toolbars</title>
-        &GtkUIManager;
-        &GtkActionGroup;
-        &GtkAction;
-        &GtkToggleAction;
-        &GtkRadioAction;
     </chapter>
 
     <chapter id="SelectorWidgets">
       <title>Selectors (File/Font/Color/Input Devices)</title>
-        &GtkColorButton;
         &GtkColorSelection;
         &GtkColorSelectionDialog;
         &GtkFileSelection;
-	&GtkFileChooser;
-	&GtkFileChooserDialog;
-	&GtkFileChooserWidget;
-	&GtkFileFilter;
-        &GtkFontButton;
         &GtkFontSelection;
         &GtkFontSelectionDialog;
         &GtkInputDialog;
@@ -448,7 +394,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkLayout;
         &GtkNotebook;
         &GtkTable;
-        &GtkExpander;
     </chapter>
 
     <chapter id="Ornaments">
@@ -473,6 +418,7 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkDrawingArea;
         &GtkEventBox;
         &GtkHandleBox;
+        &GtkIMContext;
         &GtkIMContextSimple;
         &GtkIMMulticontext;
         &GtkSizeGroup;
@@ -496,7 +442,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkScrollbar;
         &GtkSeparator;
         &GtkWidget;
-        &GtkIMContext;
     </chapter>    
 
     <chapter id="PlugSocket">
@@ -516,9 +461,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
 
     <chapter id="DeprecatedObjects">
       <title>Deprecated</title>
-        &GtkCombo;
-        &GtkOptionMenu;
-        &GtkItemFactory;
         &GtkCList;      
         &GtkCTree;
         &GtkList;
@@ -532,29 +474,9 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkTree;
         &GtkTreeItem;
     </chapter>
-  </part>
 
-  <part id="migrating">
-    <title>Migrating from Previous Versions of GTK+</title>
-
-    <partintro>
-      <para>
-	This part describes what you need to change in programs use
-	older versions of GTK+ so that they can use the new features.
-      </para>
-    </partintro>
-
-    &gtk-migrating-GtkFileChooser;
-  </part>
-
-  <part>
-    <title>GTK+ Tools</title>
-
-     &gtk-query-immodules;
   </part>
 
   <index/>
 
 </book>
-
-

docs/reference/gtk/gtk-query-immodules-2.0.1

@@ -1,49 +0,0 @@
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "GTK-QUERY-IMMODUL" 1 "" "" ""
-.SH NAME
-gtk-query-immodules-2.0 \- Input method module registration utility
-.SH "SYNOPSIS"
-
-.nf
-\fBgtk-query-immodules-2.0\fR [module...]
-.fi
-
-.SH "DESCRIPTION"
-
-.PP
- \fBgtk-query-immodules-2.0\fR collects information about loadable input method modules for GTK+ and writes it to \fIstdout\fR\&.
-
-.PP
-If called without arguments, it looks for modules in the GTK+ input method module path\&.
-
-.PP
-If called with arguments, it looks for the specified modules\&. The arguments may be absolute or relative paths\&.
-
-.SH "ENVIRONMENT"
-
-.PP
-The environment variable \fBGTK_PATH\fR can be used to prepend directories to the input method module path\&.
-
-.SH "BUGS"
-
-.PP
-None known yet\&.
-

docs/reference/gtk/gtk-query-immodules-2.0.xml

@@ -1,50 +0,0 @@
-<refentry id="gtk-query-immodules-2.0">
-
-<refmeta>
-<refentrytitle>gtk-query-immodules-2.0</refentrytitle>
-<manvolnum>1</manvolnum>
-</refmeta>
-
-<refnamediv>
-<refname>gtk-query-immodules-2.0</refname>
-<refpurpose>Input method module registration utility</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>gtk-query-immodules-2.0</command>
-<arg choice="opt" rep="repeat">module</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-<command>gtk-query-immodules-2.0</command> collects information about loadable 
-input method modules for GTK+ and writes it to <filename>stdout</filename>. 
-</para>
-<para>
-If called without arguments, it looks for modules in the GTK+ input method 
-module path.  
-</para>
-<para>
-If called with arguments, it looks for the specified modules. The arguments
-may be absolute or relative paths.
-</para>
-</refsect1>
-
-<refsect1><title>Environment</title>
-<para>
-The environment variable <link linkend="GTK_PATH"><envar>GTK_PATH</envar></link> can 
-be used to prepend directories to the input method module path. 
-</para>
-</refsect1>
-
-<refsect1><title>Bugs</title>
-<para>
-None known yet.
-</para>
-</refsect1>
-
-</refentry>
-
-

docs/reference/gtk/gtk-sections.txt

@@ -98,71 +98,6 @@ GTK_IS_ACCESSIBLE_CLASS
 gtk_accessible_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkaction</FILE>
-<TITLE>GtkAction</TITLE>
-GtkAction
-gtk_action_get_name
-gtk_action_activate
-gtk_action_create_icon
-gtk_action_create_menu_item
-gtk_action_create_tool_item
-gtk_action_connect_proxy
-gtk_action_disconnect_proxy
-gtk_action_get_proxies
-gtk_action_connect_accelerator
-gtk_action_disconnect_accelerator
-gtk_action_block_activate_from
-gtk_action_unblock_activate_from
-gtk_action_set_accel_path
-gtk_action_set_accel_group
-<SUBSECTION Standard>
-GTK_TYPE_ACTION
-GTK_ACTION
-GTK_ACTION_CLASS
-GTK_IS_ACTION
-GTK_IS_ACTION_CLASS
-GTK_ACTION_GET_CLASS
-GtkActionClass
-<SUBSECTION Private>
-gtk_action_get_type
-GtkActionPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtkactiongroup</FILE>
-<TITLE>GtkActionGroup</TITLE>
-GtkActionGroup
-gtk_action_group_new
-gtk_action_group_get_name
-gtk_action_group_get_action
-gtk_action_group_list_actions
-gtk_action_group_add_action
-gtk_action_group_remove_action
-GtkActionEntry
-gtk_action_group_add_actions
-gtk_action_group_add_actions_full 
-GtkToggleActionEntry
-gtk_action_group_add_toggle_actions
-gtk_action_group_add_toggle_actions_full 
-GtkRadioActionEntry
-gtk_action_group_add_radio_actions
-gtk_action_group_add_radio_actions_full
-gtk_action_group_set_translate_func
-gtk_action_group_set_translation_domain
-<SUBSECTION Standard>
-GTK_TYPE_ACTION_GROUP
-GTK_ACTION_GROUP
-GTK_ACTION_GROUP_CLASS
-GTK_IS_ACTION_GROUP
-GTK_IS_ACTION_GROUP_CLASS
-GTK_ACTION_GROUP_GET_CLASS
-GtkActionGroupClass
-<SUBSECTION Private>
-gtk_action_group_get_type
-GtkActionGroupPrivate
-</SECTION>
-
 <SECTION>
 <FILE>gtkadjustment</FILE>
 <TITLE>GtkAdjustment</TITLE>
@@ -190,8 +125,6 @@ gtk_adjustment_get_type
 GtkAlignment
 gtk_alignment_new
 gtk_alignment_set
-gtk_alignment_get_padding
-gtk_alignment_set_padding
 <SUBSECTION Standard>
 GTK_ALIGNMENT
 GTK_IS_ALIGNMENT
@@ -201,7 +134,6 @@ GTK_IS_ALIGNMENT_CLASS
 GTK_ALIGNMENT_GET_CLASS
 <SUBSECTION Private>
 gtk_alignment_get_type
-GtkAlignmentPrivate
 </SECTION>
 
 <SECTION>
@@ -247,7 +179,6 @@ gtk_button_box_get_spacing
 gtk_button_box_get_layout
 gtk_button_box_get_child_size
 gtk_button_box_get_child_ipadding
-gtk_button_box_get_child_secondary
 gtk_button_box_set_spacing
 gtk_button_box_set_layout
 gtk_button_box_set_child_size
@@ -328,8 +259,6 @@ gtk_button_get_use_stock
 gtk_button_set_use_stock
 gtk_button_get_use_underline
 gtk_button_set_use_underline
-gtk_button_set_focus_on_click
-gtk_button_get_focus_on_click
 
 <SUBSECTION Standard>
 GTK_BUTTON
@@ -353,8 +282,6 @@ gtk_calendar_select_day
 gtk_calendar_mark_day
 gtk_calendar_unmark_day
 gtk_calendar_clear_marks
-gtk_calendar_get_display_options
-gtk_calendar_set_display_options
 gtk_calendar_display_options
 gtk_calendar_get_date
 gtk_calendar_freeze
@@ -402,8 +329,6 @@ gtk_check_menu_item_set_show_toggle
 gtk_check_menu_item_toggled
 gtk_check_menu_item_get_inconsistent
 gtk_check_menu_item_set_inconsistent
-gtk_check_menu_item_set_draw_as_radio
-gtk_check_menu_item_get_draw_as_radio
 
 <SUBSECTION Standard>
 GTK_CHECK_MENU_ITEM
@@ -535,32 +460,6 @@ GTK_CLIST_GET_CLASS
 gtk_clist_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkcolorbutton</FILE>
-<TITLE>GtkColorButton</TITLE>
-GtkColorButton
-gtk_color_button_new
-gtk_color_button_new_with_color
-gtk_color_button_set_color
-gtk_color_button_get_color
-gtk_color_button_set_alpha
-gtk_color_button_get_alpha
-gtk_color_button_set_use_alpha
-gtk_color_button_get_use_alpha
-gtk_color_button_set_title
-gtk_color_button_get_title
-<SUBSECTION Standard>
-GTK_COLOR_BUTTON
-GTK_IS_COLOR_BUTTON
-GTK_TYPE_COLOR_BUTTON
-GTK_COLOR_BUTTON_CLASS
-GTK_IS_COLOR_BUTTON_CLASS
-GTK_COLOR_BUTTON_GET_CLASS
-<SUBSECTION Private>
-gtk_color_button_get_type
-GtkColorButtonPrivate
-</SECTION>
-
 <SECTION>
 <FILE>gtkcolorsel</FILE>
 <TITLE>GtkColorSelection</TITLE>
@@ -638,53 +537,6 @@ GTK_COMBO_GET_CLASS
 gtk_combo_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkcombobox</FILE>
-<TITLE>GtkComboBox</TITLE>
-GtkComboBox
-gtk_combo_box_new
-gtk_combo_box_new_with_model
-gtk_combo_box_set_wrap_width
-gtk_combo_box_set_row_span_column
-gtk_combo_box_set_column_span_column
-gtk_combo_box_get_active
-gtk_combo_box_set_active
-gtk_combo_box_get_model
-gtk_combo_box_set_model
-gtk_combo_box_new_text
-gtk_combo_box_append_text
-gtk_combo_box_insert_text
-gtk_combo_box_prepend_text
-<SUBSECTION Standard>
-GTK_TYPE_COMBO_BOX
-GTK_COMBO_BOX
-GTK_COMBO_BOX_CLASS
-GTK_IS_COMBO_BOX
-GTK_IS_COMBO_BOX_CLASS
-GTK_COMBO_BOX_GET_CLASS
-<SUBSECTION Private>
-GtkComboBoxPrivate
-gtk_combo_box_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkcomboboxentry</FILE>
-<TITLE>GtkComboBoxEntry</TITLE>
-GtkComboBoxEntry
-gtk_combo_box_entry_new
-gtk_combo_box_entry_get_text_column
-<SUBSECTION Standard>
-GTK_TYPE_COMBO_BOX_ENTRY
-GTK_COMBO_BOX_ENTRY
-GTK_COMBO_BOX_ENTRY_CLASS
-GTK_IS_COMBO_BOX_ENTRY
-GTK_IS_COMBO_BOX_ENTRY_CLASS
-GTK_COMBO_BOX_ENTRY_GET_CLASS
-<SUBSECTION Private>
-GtkComboBoxEntryPrivate
-gtk_combo_box_entry_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkcontainer</FILE>
 <TITLE>GtkContainer</TITLE>
@@ -975,8 +827,6 @@ gtk_entry_get_layout
 gtk_entry_get_layout_offsets
 gtk_entry_get_max_length
 gtk_entry_get_visibility
-gtk_entry_set_completion
-gtk_entry_get_completion
 <SUBSECTION Standard>
 GTK_ENTRY
 GTK_IS_ENTRY
@@ -988,45 +838,11 @@ GTK_ENTRY_GET_CLASS
 gtk_entry_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkentrycompletion</FILE>
-<TITLE>GtkEntryCompletion</TITLE>
-GtkEntryCompletion
-GtkEntryCompletionMatchFunc
-gtk_entry_completion_new
-gtk_entry_completion_get_entry
-gtk_entry_completion_set_model
-gtk_entry_completion_get_model
-gtk_entry_completion_set_match_func
-gtk_entry_completion_set_minimum_key_length
-gtk_entry_completion_get_minimum_key_length
-gtk_entry_completion_complete
-gtk_entry_completion_insert_action_text
-gtk_entry_completion_insert_action_markup
-gtk_entry_completion_delete_action
-gtk_entry_completion_set_text_column
-<SUBSECTION Standard>
-GTK_TYPE_ENTRY_COMPLETION
-GTK_ENTRY_COMPLETION
-GTK_ENTRY_COMPLETION_CLASS
-GTK_IS_ENTRY_COMPLETION
-GTK_IS_ENTRY_COMPLETION_CLASS
-GTK_ENTRY_COMPLETION_GET_CLASS
-GTK_ENTRY_COMPLETION_GET_PRIVATE
-<SUBSECTION Private>
-GtkEntryCompletionPrivate
-gtk_entry_completion_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkeventbox</FILE>
 <TITLE>GtkEventBox</TITLE>
 GtkEventBox
 gtk_event_box_new
-gtk_event_box_set_above_child
-gtk_event_box_get_above_child
-gtk_event_box_set_visible_window
-gtk_event_box_get_visible_window
 <SUBSECTION Standard>
 GTK_EVENT_BOX
 GTK_IS_EVENT_BOX
@@ -1038,148 +854,6 @@ GTK_EVENT_BOX_GET_CLASS
 gtk_event_box_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkexpander</FILE>
-<TITLE>GtkExpander</TITLE>
-GtkExpander
-gtk_expander_new
-gtk_expander_new_with_mnemonic
-gtk_expander_set_expanded
-gtk_expander_get_expanded
-gtk_expander_set_spacing
-gtk_expander_get_spacing
-gtk_expander_set_label
-gtk_expander_get_label
-gtk_expander_set_use_underline
-gtk_expander_get_use_underline
-gtk_expander_set_label_widget
-gtk_expander_get_label_widget
-<SUBSECTION Standard>
-GTK_TYPE_EXPANDER
-GTK_EXPANDER_CLASS
-GTK_EXPANDER
-GTK_IS_EXPANDER
-GTK_IS_EXPANDER_CLASS
-GTK_EXPANDER_GET_CLASS
-<SUBSECTION Private>
-gtk_expander_get_type
-GtkExpanderPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtkfilechooser</FILE>
-<TITLE>GtkFileChooser</TITLE>
-GtkFileChooser
-GtkFileChooserAction
-GTK_FILE_CHOOSER_ERROR
-GtkFileChooserError
-gtk_file_chooser_error_quark
-gtk_file_chooser_set_action
-gtk_file_chooser_get_action
-gtk_file_chooser_set_folder_mode
-gtk_file_chooser_get_folder_mode
-gtk_file_chooser_set_local_only
-gtk_file_chooser_get_local_only
-gtk_file_chooser_set_select_multiple
-gtk_file_chooser_get_select_multiple
-gtk_file_chooser_set_current_name
-gtk_file_chooser_get_filename
-gtk_file_chooser_set_filename
-gtk_file_chooser_select_filename
-gtk_file_chooser_unselect_filename
-gtk_file_chooser_select_all
-gtk_file_chooser_unselect_all
-gtk_file_chooser_get_filenames
-gtk_file_chooser_set_current_folder
-gtk_file_chooser_get_current_folder
-gtk_file_chooser_get_uri
-gtk_file_chooser_set_uri
-gtk_file_chooser_select_uri
-gtk_file_chooser_unselect_uri
-gtk_file_chooser_get_uris
-gtk_file_chooser_set_current_folder_uri
-gtk_file_chooser_get_current_folder_uri
-gtk_file_chooser_set_preview_widget
-gtk_file_chooser_get_preview_widget
-gtk_file_chooser_set_preview_widget_active
-gtk_file_chooser_get_preview_widget_active
-gtk_file_chooser_get_preview_filename
-gtk_file_chooser_get_preview_uri
-gtk_file_chooser_set_extra_widget
-gtk_file_chooser_get_extra_widget
-gtk_file_chooser_add_filter
-gtk_file_chooser_remove_filter
-gtk_file_chooser_list_filters
-gtk_file_chooser_set_filter
-gtk_file_chooser_get_filter
-gtk_file_chooser_add_shortcut_folder
-gtk_file_chooser_remove_shortcut_folder
-gtk_file_chooser_list_shortcut_folders
-gtk_file_chooser_add_shortcut_folder_uri
-gtk_file_chooser_remove_shortcut_folder_uri
-gtk_file_chooser_list_shortcut_folder_uris
-<SUBSECTION Standard>
-GTK_FILE_CHOOSER
-GTK_IS_FILE_CHOOSER
-GTK_TYPE_FILE_CHOOSER
-<SUBSECTION Private>
-gtk_file_chooser_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkfilechooserdialog</FILE>
-<TITLE>GtkFileChooserDialog</TITLE>
-gtk_file_chooser_dialog_new
-<SUBSECTION Standard>
-GTK_FILE_CHOOSER_DIALOG
-GTK_IS_FILE_CHOOSER_DIALOG
-GTK_TYPE_FILE_CHOOSER_DIALOG
-GTK_FILE_CHOOSER_DIALOG_CLASS
-GTK_IS_FILE_CHOOSER_DIALOG_CLASS
-GTK_FILE_CHOOSER_DIALOG_GET_CLASS
-<SUBSECTION Private>
-gtk_file_chooser_dialog_get_type
-GtkFileChooserDialogPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtkfilechooserwidget</FILE>
-<TITLE>GtkFileChooserWidget</TITLE>
-gtk_file_chooser_widget_new
-<SUBSECTION Standard>
-GTK_FILE_CHOOSER_WIDGET
-GTK_IS_FILE_CHOOSER_WIDGET
-GTK_TYPE_FILE_CHOOSER_WIDGET
-GTK_FILE_CHOOSER_WIDGET_CLASS
-GTK_IS_FILE_CHOOSER_WIDGET_CLASS
-GTK_FILE_CHOOSER_WIDGET_GET_CLASS
-<SUBSECTION Private>
-gtk_file_chooser_widget_get_type
-GtkFileChooserWidgetPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtkfilefilter</FILE>
-GtkFileFilter
-GtkFileFilterInfo
-GtkFileFilterFlags
-GtkFileFilterFunc
-gtk_file_filter_new
-gtk_file_filter_set_name
-gtk_file_filter_get_name
-gtk_file_filter_add_mime_type
-gtk_file_filter_add_pattern
-gtk_file_filter_add_custom
-gtk_file_filter_get_needed
-gtk_file_filter_filter
-<SUBSECTION Standard>
-GTK_FILE_FILTER
-GTK_IS_FILE_FILTER
-GTK_TYPE_FILE_FILTER
-<SUBSECTION Private>
-gtk_file_filter_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkfilesel</FILE>
 <TITLE>GtkFileSelection</TITLE>
@@ -1225,35 +899,6 @@ GTK_FIXED_GET_CLASS
 gtk_fixed_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkfontbutton</FILE>
-<TITLE>GtkFontButton</TITLE>
-GtkFontButton
-gtk_font_button_new
-gtk_font_button_new_with_font
-gtk_font_button_set_font_name
-gtk_font_button_get_font_name
-gtk_font_button_set_show_style
-gtk_font_button_get_show_style
-gtk_font_button_set_show_size
-gtk_font_button_get_show_size
-gtk_font_button_set_use_font
-gtk_font_button_get_use_font
-gtk_font_button_set_use_size
-gtk_font_button_get_use_size
-gtk_font_button_set_title
-gtk_font_button_get_title
-<SUBSECTION Standard>
-GTK_FONT_BUTTON
-GTK_IS_FONT_BUTTON
-GTK_TYPE_FONT_BUTTON
-GTK_FONT_BUTTON_CLASS
-GTK_IS_FONT_BUTTON_CLASS
-GTK_FONT_BUTTON_GET_CLASS
-<SUBSECTION Private>
-gtk_font_button_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkfontsel</FILE>
 <TITLE>GtkFontSelection</TITLE>
@@ -1604,7 +1249,6 @@ GTK_IS_IM_MULTICONTEXT_CLASS
 GTK_IM_MULTICONTEXT_GET_CLASS
 <SUBSECTION Private>
 gtk_im_multicontext_get_type
-GtkIMMulticontextPrivate
 </SECTION>
 
 <SECTION>
@@ -1848,7 +1492,6 @@ gtk_menu_append
 gtk_menu_prepend
 gtk_menu_insert
 gtk_menu_reorder_child
-gtk_menu_attach
 gtk_menu_popup
 gtk_menu_set_accel_group
 gtk_menu_get_accel_group
@@ -1867,7 +1510,6 @@ gtk_menu_detach
 gtk_menu_get_attach_widget
 GtkMenuPositionFunc
 GtkMenuDetachFunc
-gtk_menu_set_monitor
 <SUBSECTION Standard>
 GTK_MENU
 GTK_IS_MENU
@@ -1928,40 +1570,6 @@ GTK_MENU_ITEM_GET_CLASS
 gtk_menu_item_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkuimanager</FILE>
-<TITLE>GtkUIManager</TITLE>
-GtkUIManager
-gtk_ui_manager_new
-gtk_ui_manager_set_add_tearoffs
-gtk_ui_manager_get_add_tearoffs
-gtk_ui_manager_insert_action_group
-gtk_ui_manager_remove_action_group
-gtk_ui_manager_get_action_groups
-gtk_ui_manager_get_accel_group
-gtk_ui_manager_get_widget
-gtk_ui_manager_get_action
-gtk_ui_manager_add_ui_from_string
-gtk_ui_manager_add_ui_from_file
-gtk_ui_manager_new_merge_id
-GtkUIManagerItemType
-gtk_ui_manager_add_ui
-gtk_ui_manager_remove_ui
-gtk_ui_manager_get_ui
-gtk_ui_manager_ensure_update
-<SUBSECTION Standard>
-GTK_TYPE_UI_MANAGER
-GTK_UI_MANAGER
-GTK_UI_MANAGER_CLASS
-GTK_IS_UI_MANAGER
-GTK_IS_UI_MANAGER_CLASS
-GTK_UI_MANAGER_GET_CLASS
-GtkUIManagerClass
-<SUBSECTION Private>
-gtk_ui_manager_get_type
-GtkUIManagerPrivate
-</SECTION>
-
 <SECTION>
 <FILE>gtkmenushell</FILE>
 <TITLE>GtkMenuShell</TITLE>
@@ -1993,7 +1601,6 @@ GtkMessageDialog
 GtkMessageType
 GtkButtonsType
 gtk_message_dialog_new
-gtk_message_dialog_new_with_markup
 <SUBSECTION Standard>
 GTK_MESSAGE_DIALOG
 GTK_IS_MESSAGE_DIALOG
@@ -2310,25 +1917,6 @@ GTK_PROGRESS_BAR_GET_CLASS
 gtk_progress_bar_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkradioaction</FILE>
-<TITLE>GtkRadioAction</TITLE>
-GtkRadioAction
-gtk_radio_action_get_group
-gtk_radio_action_set_group
-gtk_radio_action_get_current_value
-<SUBSECTION Standard>
-GTK_TYPE_RADIO_ACTION
-GTK_RADIO_ACTION
-GTK_RADIO_ACTION_CLASS
-GTK_IS_RADIO_ACTION
-GTK_IS_RADIO_ACTION_CLASS
-GTK_RADIO_ACTION_GET_CLASS
-<SUBSECTION Private>
-gtk_radio_action_get_type
-GtkRadioActionPrivate
-</SECTION>
-
 <SECTION>
 <FILE>gtkradiobutton</FILE>
 <TITLE>GtkRadioButton</TITLE>
@@ -2773,7 +2361,6 @@ gtk_text_buffer_get_mark
 gtk_text_buffer_get_insert
 gtk_text_buffer_get_selection_bound
 gtk_text_buffer_place_cursor
-gtk_text_buffer_select_range
 gtk_text_buffer_apply_tag
 gtk_text_buffer_remove_tag
 gtk_text_buffer_apply_tag_by_name
@@ -2876,14 +2463,6 @@ gtk_text_iter_backward_sentence_start
 gtk_text_iter_backward_sentence_starts
 gtk_text_iter_forward_sentence_end
 gtk_text_iter_forward_sentence_ends
-gtk_text_iter_forward_visible_word_ends
-gtk_text_iter_backward_visible_word_starts
-gtk_text_iter_forward_visible_word_end
-gtk_text_iter_backward_visible_word_start
-gtk_text_iter_forward_visible_cursor_position
-gtk_text_iter_backward_visible_cursor_position
-gtk_text_iter_forward_visible_cursor_positions
-gtk_text_iter_backward_visible_cursor_positions
 gtk_text_iter_set_offset
 gtk_text_iter_set_line
 gtk_text_iter_set_line_offset
@@ -3026,8 +2605,6 @@ gtk_text_view_set_editable
 gtk_text_view_get_editable
 gtk_text_view_set_cursor_visible
 gtk_text_view_get_cursor_visible
-gtk_text_view_set_overwrite
-gtk_text_view_get_overwrite
 gtk_text_view_set_pixels_above_lines
 gtk_text_view_get_pixels_above_lines
 gtk_text_view_set_pixels_below_lines
@@ -3044,8 +2621,6 @@ gtk_text_view_set_indent
 gtk_text_view_get_indent
 gtk_text_view_set_tabs
 gtk_text_view_get_tabs
-gtk_text_view_set_accepts_tab
-gtk_text_view_get_accepts_tab
 gtk_text_view_get_default_attributes
 GTK_TEXT_VIEW_PRIORITY_VALIDATE
 <SUBSECTION Standard>
@@ -3092,29 +2667,6 @@ GTK_TIPS_QUERY_GET_CLASS
 gtk_tips_query_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtktoggleaction</FILE>
-<TITLE>GtkToggleAction</TITLE>
-GtkToggleAction
-gtk_toggle_action_toggled
-gtk_toggle_action_set_active
-gtk_toggle_action_get_active
-gtk_toggle_action_set_draw_as_radio
-gtk_toggle_action_get_draw_as_radio
-
-<SUBSECTION Standard>
-GTK_TYPE_TOGGLE_ACTION
-GTK_TOGGLE_ACTION
-GTK_TOGGLE_ACTION_CLASS
-GTK_IS_TOGGLE_ACTION
-GTK_IS_TOGGLE_ACTION_CLASS
-GTK_TOGGLE_ACTION_GET_CLASS
-GtkToggleActionClass
-<SUBSECTION Private>
-gtk_toggle_action_get_type
-GtkToggleActionPrivate
-</SECTION>
-
 <SECTION>
 <FILE>gtktogglebutton</FILE>
 <TITLE>GtkToggleButton</TITLE>
@@ -3150,22 +2702,6 @@ GtkToolbarChildType
 GtkToolbarSpaceStyle
 GtkToolbarChild
 gtk_toolbar_new
-gtk_toolbar_insert
-gtk_toolbar_get_item_index
-gtk_toolbar_get_n_items
-gtk_toolbar_get_nth_item
-gtk_toolbar_get_drop_index
-gtk_toolbar_set_show_arrow
-gtk_toolbar_set_orientation
-gtk_toolbar_set_tooltips
-gtk_toolbar_unset_icon_size
-gtk_toolbar_get_show_arrow
-gtk_toolbar_get_orientation
-gtk_toolbar_get_style
-gtk_toolbar_get_icon_size
-gtk_toolbar_get_tooltips
-gtk_toolbar_get_relief_style
-
 gtk_toolbar_append_item
 gtk_toolbar_prepend_item
 gtk_toolbar_insert_item
@@ -3178,12 +2714,18 @@ gtk_toolbar_insert_element
 gtk_toolbar_append_widget
 gtk_toolbar_prepend_widget
 gtk_toolbar_insert_widget
+gtk_toolbar_set_orientation
 gtk_toolbar_set_style
+gtk_toolbar_set_tooltips
 gtk_toolbar_insert_stock
 gtk_toolbar_set_icon_size
+gtk_toolbar_get_icon_size
+gtk_toolbar_get_orientation
+gtk_toolbar_get_style
+gtk_toolbar_get_tooltips
 gtk_toolbar_remove_space
+gtk_toolbar_unset_icon_size
 gtk_toolbar_unset_style
-
 <SUBSECTION Standard>
 GTK_TOOLBAR
 GTK_IS_TOOLBAR
@@ -3193,140 +2735,6 @@ GTK_IS_TOOLBAR_CLASS
 GTK_TOOLBAR_GET_CLASS
 <SUBSECTION Private>
 gtk_toolbar_get_type
-GtkToolbarPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtktoolitem</FILE>
-<TITLE>GtkToolItem</TITLE>
-GtkToolItem
-gtk_tool_item_new
-gtk_tool_item_set_homogeneous
-gtk_tool_item_get_homogeneous
-gtk_tool_item_set_expand
-gtk_tool_item_get_expand
-gtk_tool_item_set_tooltip
-gtk_tool_item_set_use_drag_window
-gtk_tool_item_get_use_drag_window
-gtk_tool_item_set_visible_horizontal
-gtk_tool_item_get_visible_horizontal
-gtk_tool_item_set_visible_vertical
-gtk_tool_item_get_visible_vertical
-gtk_tool_item_set_is_important
-gtk_tool_item_get_is_important
-gtk_tool_item_get_icon_size
-gtk_tool_item_get_orientation
-gtk_tool_item_get_toolbar_style
-gtk_tool_item_get_relief_style
-gtk_tool_item_retrieve_proxy_menu_item
-gtk_tool_item_get_proxy_menu_item
-gtk_tool_item_set_proxy_menu_item
-
-<SUBSECTION Standard>
-GTK_TYPE_TOOL_ITEM
-GTK_TOOL_ITEM
-GTK_TOOL_ITEM_CLASS
-GTK_IS_TOOL_ITEM
-GTK_IS_TOOL_ITEM_CLASS
-GTK_TOOL_ITEM_GET_CLASS
-
-<SUBSECTION Private>
-gtk_tool_item_get_type
-GtkToolItemPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtkseparatortoolitem</FILE>
-<TITLE>GtkSeparatorToolItem</TITLE>
-GtkSeparatorToolItem
-gtk_separator_tool_item_new
-
-<SUBSECTION Standard>
-GTK_TYPE_SEPARATOR_TOOL_ITEM
-GTK_SEPARATOR_TOOL_ITEM
-GTK_SEPARATOR_TOOL_ITEM_CLASS
-GTK_IS_SEPARATOR_TOOL_ITEM
-GTK_IS_SEPARATOR_TOOL_ITEM_CLASS
-GTK_SEPARATOR_TOOL_ITEM_GET_CLASS
-
-<SUBSECTION Private>
-gtk_separator_tool_item_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtktoolbutton</FILE>
-<TITLE>GtkToolButton</TITLE>
-GtkToolButton
-gtk_tool_button_new
-gtk_tool_button_new_from_stock
-gtk_tool_button_set_label
-gtk_tool_button_get_label
-gtk_tool_button_set_use_underline
-gtk_tool_button_get_use_underline
-gtk_tool_button_set_stock_id
-gtk_tool_button_get_stock_id
-gtk_tool_button_set_icon_widget
-gtk_tool_button_get_icon_widget
-gtk_tool_button_set_label_widget
-gtk_tool_button_get_label_widget
-
-<SUBSECTION Standard>
-GTK_TYPE_TOOL_BUTTON
-GTK_TOOL_BUTTON
-GTK_TOOL_BUTTON_CLASS
-GTK_IS_TOOL_BUTTON
-GTK_IS_TOOL_BUTTON_CLASS
-GTK_TOOL_BUTTON_GET_CLASS
-
-<SUBSECTION Private>
-gtk_tool_button_get_type
-GtkToolButtonPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtkradiotoolbutton</FILE>
-<TITLE>GtkRadioToolButton</TITLE>
-GtkRadioToolButton
-gtk_radio_tool_button_new
-gtk_radio_tool_button_new_from_stock
-gtk_radio_tool_button_new_from_widget
-gtk_radio_tool_button_new_with_stock_from_widget
-gtk_radio_tool_button_get_group
-gtk_radio_tool_button_set_group
-
-<SUBSECTION Standard>
-GTK_TYPE_RADIO_TOOL_BUTTON
-GTK_RADIO_TOOL_BUTTON
-GTK_RADIO_TOOL_BUTTON_CLASS
-GTK_IS_RADIO_TOOL_BUTTON
-GTK_IS_RADIO_TOOL_BUTTON_CLASS
-GTK_RADIO_TOOL_BUTTON_GET_CLASS
-
-<SUBSECTION Private>
-gtk_radio_tool_button_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtktoggletoolbutton</FILE>
-<TITLE>GtkToggleToolButton</TITLE>
-GtkToggleToolButton
-gtk_toggle_tool_button_new
-gtk_toggle_tool_button_new_from_stock
-gtk_toggle_tool_button_set_active
-gtk_toggle_tool_button_get_active
-
-<SUBSECTION Standard>
-GtkToggleToolButtonClass
-GTK_TYPE_TOGGLE_TOOL_BUTTON
-GTK_TOGGLE_TOOL_BUTTON
-GTK_TOGGLE_TOOL_BUTTON_CLASS
-GTK_IS_TOGGLE_TOOL_BUTTON
-GTK_IS_TOGGLE_TOOL_BUTTON_CLASS
-GTK_TOGGLE_TOOL_BUTTON_GET_CLASS
-
-<SUBSECTION Private>
-gtk_toggle_tool_button_get_type
-GtkToggleToolButtonPrivate
 </SECTION>
 
 <SECTION>
@@ -3485,10 +2893,10 @@ GTK_TYPE_TREE_ITER
 GTK_TYPE_TREE_PATH
 GTK_TYPE_TREE_ROW_REFERENCE
 <SUBSECTION Private>
-gtk_tree_row_reference_get_type
 gtk_tree_model_get_type
 gtk_tree_iter_get_type
 gtk_tree_path_get_type
+gtk_tree_row_reference_get_type
 </SECTION>
 
 <SECTION>
@@ -3515,35 +2923,6 @@ GTK_TREE_MODEL_SORT_GET_CLASS
 gtk_tree_model_sort_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtktreemodelfilter</FILE>
-<TITLE>GtkTreeModelFilter</TITLE>
-GtkTreeModelFilter
-GtkTreeModelFilterVisibleFunc
-GtkTreeModelFilterModifyFunc
-gtk_tree_model_filter_new
-gtk_tree_model_filter_set_visible_func
-gtk_tree_model_filter_set_modify_func
-gtk_tree_model_filter_set_visible_column
-gtk_tree_model_filter_get_model
-gtk_tree_model_filter_convert_child_iter_to_iter
-gtk_tree_model_filter_convert_iter_to_child_iter
-gtk_tree_model_filter_convert_child_path_to_path
-gtk_tree_model_filter_convert_path_to_child_path
-gtk_tree_model_filter_refilter
-gtk_tree_model_filter_clear_cache
-<SUBSECTION Standard>
-GTK_TYPE_TREE_MODEL_FILTER
-GTK_TREE_MODEL_FILTER
-GTK_TREE_MODEL_FILTER_CLASS
-GTK_IS_TREE_MODEL_FILTER
-GTK_IS_TREE_MODEL_FILTER_CLASS
-GTK_TREE_MODEL_FILTER_GET_CLASS
-<SUBSECTION Private>
-GtkTreeModelFilterPrivate
-gtk_tree_model_filter_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtktreeselection</FILE>
 <TITLE>GtkTreeSelection</TITLE>
@@ -3699,8 +3078,6 @@ gtk_tree_view_column_get_max_width
 gtk_tree_view_column_clicked
 gtk_tree_view_column_set_title
 gtk_tree_view_column_get_title
-gtk_tree_view_column_set_expand
-gtk_tree_view_column_get_expand
 gtk_tree_view_column_set_clickable
 gtk_tree_view_column_get_clickable
 gtk_tree_view_column_set_widget
@@ -3834,28 +3211,6 @@ GTK_TREE_DRAG_SOURCE_GET_IFACE
 
 </SECTION>
 
-<SECTION>
-<FILE>gtkcelllayout</FILE>
-<TITLE>GtkCellLayout</TITLE>
-GtkCellLayout
-GtkCellLayoutIface
-GtkCellLayoutDataFunc
-gtk_cell_layout_pack_start
-gtk_cell_layout_pack_end
-gtk_cell_layout_clear
-gtk_cell_layout_set_attributes
-gtk_cell_layout_add_attribute
-gtk_cell_layout_set_cell_data_func
-gtk_cell_layout_clear_attributes
-<SUBSECTION Standard>
-GTK_TYPE_CELL_LAYOUT
-GTK_CELL_LAYOUT
-GTK_IS_CELL_LAYOUT
-GTK_CELL_LAYOUT_GET_IFACE
-<SUBSECTION Private>
-gtk_cell_layout_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkcellrenderer</FILE>
 <TITLE>GtkCellRenderer</TITLE>
@@ -4056,7 +3411,6 @@ GTK_IS_VPANED_CLASS
 GTK_VPANED_GET_CLASS
 <SUBSECTION Private>
 gtk_vpaned_get_type
-GtkPanedPrivate
 </SECTION>
 
 <SECTION>
@@ -4180,7 +3534,6 @@ gtk_widget_realize
 gtk_widget_unrealize
 gtk_widget_queue_draw
 gtk_widget_queue_resize
-gtk_widget_queue_resize_no_redraw
 gtk_widget_draw
 gtk_widget_size_request
 gtk_widget_get_child_requisition
@@ -4292,8 +3645,6 @@ gtk_widget_set_default_visual
 gtk_widget_set_size_request
 gtk_widget_set_visual
 gtk_widget_thaw_child_notify
-gtk_widget_set_no_show_all
-gtk_widget_get_no_show_all
 <SUBSECTION>
 gtk_requisition_copy
 gtk_requisition_free
@@ -4336,8 +3687,6 @@ gtk_window_set_transient_for
 gtk_window_set_destroy_with_parent
 gtk_window_set_screen
 gtk_window_get_screen
-gtk_window_is_active
-gtk_window_has_toplevel_focus
 gtk_window_list_toplevels
 gtk_window_add_mnemonic
 gtk_window_remove_mnemonic
@@ -4354,8 +3703,6 @@ gtk_window_maximize
 gtk_window_unmaximize
 gtk_window_fullscreen
 gtk_window_unfullscreen
-gtk_window_set_keep_above
-gtk_window_set_keep_below
 gtk_window_begin_resize_drag
 gtk_window_begin_move_drag
 gtk_window_set_decorated
@@ -4389,7 +3736,6 @@ gtk_window_parse_geometry
 gtk_window_reshow_with_initial_size
 gtk_window_resize
 gtk_window_set_default_icon_list
-gtk_window_set_default_icon
 gtk_window_set_default_icon_from_file
 gtk_window_set_icon
 gtk_window_set_icon_list
@@ -4967,7 +4313,6 @@ GtkPositionType
 GtkPreviewType
 GtkReliefStyle
 GtkResizeMode
-GtkScrollStep
 GtkScrollType
 GtkSelectionMode
 GtkShadowType
@@ -5011,7 +4356,6 @@ GTK_STOCK_CONVERT
 GTK_STOCK_COPY
 GTK_STOCK_CUT
 GTK_STOCK_DELETE
-GTK_STOCK_DIALOG_AUTHENTICATION
 GTK_STOCK_DIALOG_ERROR
 GTK_STOCK_DIALOG_INFO
 GTK_STOCK_DIALOG_QUESTION
@@ -5073,55 +4417,6 @@ GTK_STOCK_ZOOM_IN
 GTK_STOCK_ZOOM_OUT
 </SECTION>
 
-<SECTION>
-<FILE>gtkicontheme</FILE>
-<TITLE>GtkIconTheme</TITLE>
-GtkIconInfo
-GtkIconTheme
-GtkIconLookupFlags
-GTK_ICON_THEME_ERROR
-GtkIconThemeError
-gtk_icon_theme_new
-gtk_icon_theme_get_default
-gtk_icon_theme_get_for_screen
-gtk_icon_theme_set_screen
-gtk_icon_theme_set_search_path
-gtk_icon_theme_get_search_path
-gtk_icon_theme_append_search_path
-gtk_icon_theme_prepend_search_path
-gtk_icon_theme_set_custom_theme
-gtk_icon_theme_has_icon
-gtk_icon_theme_lookup_icon
-gtk_icon_theme_load_icon
-gtk_icon_theme_list_icons
-gtk_icon_theme_get_example_icon_name
-gtk_icon_theme_rescan_if_needed
-gtk_icon_theme_add_builtin_icon
-gtk_icon_info_copy
-gtk_icon_info_free
-gtk_icon_info_get_base_size
-gtk_icon_info_get_filename
-gtk_icon_info_get_builtin_pixbuf
-gtk_icon_info_load_icon
-gtk_icon_info_set_raw_coordinates
-gtk_icon_info_get_embedded_rect
-gtk_icon_info_get_attach_points
-gtk_icon_info_get_display_name
-<SUBSECTION Standard>
-GtkIconThemeClass
-GTK_ICON_THEME
-GTK_IS_ICON_THEME
-GTK_TYPE_ICON_THEME
-gtk_icon_theme_get_type
-GTK_ICON_THEME_CLASS
-GTK_IS_ICON_THEME_CLASS
-GTK_ICON_THEME_GET_CLASS
-gtk_icon_info_get_type
-GTK_TYPE_ICON_INFO
-<SUBSECTION Private>
-GtkIconThemePrivate
-gtk_icon_theme_error_quark
-</SECTION>
 
 <SECTION>
 <FILE>gtkiconfactory</FILE>
@@ -5156,7 +4451,6 @@ gtk_icon_source_get_direction
 gtk_icon_source_get_direction_wildcarded
 gtk_icon_source_get_filename
 gtk_icon_source_get_pixbuf
-gtk_icon_source_get_icon_name
 gtk_icon_source_get_size
 gtk_icon_source_get_size_wildcarded
 gtk_icon_source_get_state
@@ -5166,7 +4460,6 @@ gtk_icon_source_set_direction
 gtk_icon_source_set_direction_wildcarded
 gtk_icon_source_set_filename
 gtk_icon_source_set_pixbuf
-gtk_icon_source_set_icon_name
 gtk_icon_source_set_size
 gtk_icon_source_set_size_wildcarded
 gtk_icon_source_set_state

docs/reference/gtk/gtk.types

@@ -3,8 +3,6 @@
 gtk_accel_group_get_type
 gtk_accel_label_get_type
 gtk_accessible_get_type
-gtk_action_get_type
-gtk_action_group_get_type
 gtk_adjustment_get_type
 gtk_alignment_get_type
 gtk_arrow_get_type
@@ -14,7 +12,6 @@ gtk_box_get_type
 gtk_button_box_get_type
 gtk_button_get_type
 gtk_calendar_get_type
-gtk_cell_layout_get_type
 gtk_cell_renderer_get_type
 gtk_cell_renderer_pixbuf_get_type
 gtk_cell_renderer_text_get_type
@@ -22,28 +19,18 @@ gtk_cell_renderer_toggle_get_type
 gtk_check_button_get_type
 gtk_check_menu_item_get_type
 gtk_clist_get_type
-gtk_color_button_get_type
 gtk_color_selection_dialog_get_type
 gtk_color_selection_get_type
-gtk_combo_box_get_type
-gtk_combo_box_entry_get_type
 gtk_combo_get_type
 gtk_container_get_type
 gtk_ctree_get_type
 gtk_curve_get_type
 gtk_dialog_get_type
 gtk_drawing_area_get_type
-gtk_entry_completion_get_type
 gtk_entry_get_type
 gtk_event_box_get_type
-gtk_expander_get_type
-gtk_file_chooser_get_type
-gtk_file_chooser_dialog_get_type
-gtk_file_chooser_widget_get_type
-gtk_file_filter_get_type
 gtk_file_selection_get_type
 gtk_fixed_get_type
-gtk_font_button_get_type
 gtk_font_selection_dialog_get_type
 gtk_font_selection_get_type
 gtk_frame_get_type
@@ -57,7 +44,6 @@ gtk_hscale_get_type
 gtk_hscrollbar_get_type
 gtk_hseparator_get_type
 gtk_icon_factory_get_type
-gtk_icon_theme_get_type
 gtk_im_context_get_type
 gtk_im_context_simple_get_type
 gtk_im_multicontext_get_type
@@ -88,10 +74,8 @@ gtk_plug_get_type
 gtk_preview_get_type
 gtk_progress_bar_get_type
 gtk_progress_get_type
-gtk_radio_action_get_type
 gtk_radio_button_get_type
 gtk_radio_menu_item_get_type
-gtk_radio_tool_button_get_type
 gtk_range_get_type
 gtk_rc_style_get_type
 gtk_ruler_get_type
@@ -100,7 +84,6 @@ gtk_scrollbar_get_type
 gtk_scrolled_window_get_type
 gtk_separator_get_type
 gtk_separator_menu_item_get_type
-gtk_separator_tool_item_get_type
 gtk_settings_get_type
 gtk_size_group_get_type
 gtk_socket_get_type
@@ -117,22 +100,16 @@ gtk_text_tag_get_type
 gtk_text_tag_table_get_type
 gtk_text_view_get_type
 gtk_tips_query_get_type
-gtk_toggle_action_get_type
 gtk_toggle_button_get_type
-gtk_toggle_tool_button_get_type
 gtk_toolbar_get_type
 gtk_tooltips_get_type
-gtk_tool_button_get_type
-gtk_tool_item_get_type
 gtk_tree_get_type
 gtk_tree_item_get_type
-gtk_tree_model_filter_get_type
 gtk_tree_model_sort_get_type
 gtk_tree_selection_get_type
 gtk_tree_store_get_type
 gtk_tree_view_column_get_type
 gtk_tree_view_get_type
-gtk_ui_manager_get_type
 gtk_vbox_get_type
 gtk_vbutton_box_get_type
 gtk_viewport_get_type

docs/reference/gtk/migrating-GtkFileChooser.sgml

@@ -1,159 +0,0 @@
-<chapter id="gtk-migrating-GtkFileChooser">
-  <chapterinfo>
-    <title>Migrating from GtkFileSelection to GtkFileChooser</title>
-    <author>
-      <firstname>Federico</firstname>
-      <surname>Mena-Quintero</surname>
-      <affiliation>
-	<address>
-	  <email>federico@ximian.com</email>
-	</address>
-      </affiliation>
-    </author>
-  </chapterinfo>
-
-  <para>
-    #GtkFileChooser, starting with GTK+ 2.4, is the new set of APIs
-    for file selection widgets and dialogs.  Previous versions of GTK+
-    used #GtkFileSelection, which has numerous problems.
-  </para>
-
-  <para>
-    #GtkFileChooser is an abstract interface that can be implemented
-    by widgets that perform file selection tasks.  Two widgets in GTK+
-    implement this interface:  #GtkFileChooserDialog and
-    #GtkFileChooserWidget.  Most applications simply need to use
-    #GtkFileChooserDialog, which is a dialog box that allows the user
-    to select existing files for opening them, or to pick new
-    filenames for saving documents.  #GtkFileChooserWidget is for
-    special applications that need to embed a file selection widget
-    inside a larger window.  In the context of GTK+,
-    #GtkFileChooserDialog is simply a #GtkDialog box with a
-    #GtkFileChooserWidget inside.
-  </para>
-
-  <section id="gtkfilechooser-creating">
-    <title>Creating a GtkFileChooserDialog</title>
-
-    <para>
-      To create a #GtkFileChooserDialog, you simply call
-      gtk_file_chooser_dialog_new().  This function is similar to
-      gtk_dialog_new() in that it takes parameters for the title
-      of the dialog box and its transient parent, as well as its
-      buttons.  In addition, it takes in an argument that determines
-      whether the file chooser dialog will be used for opening
-      existing files or for saving to a possibly new file.
-    </para>
-
-    <para>
-      Please see <xref linkend="gtkfilechooser-typical-usage"/> for
-      how to create a simple file chooser dialog and extract the
-      selected filename from it.
-    </para>
-  </section>
-
-  <section id="gtkfilechooser-selection-modes">
-    <title>Selection Modes</title>
-
-    <para>
-      #GtkFileChooser can be used in two modes, to select a single
-      file at a time or to select a set of more than one file.  To set
-      this, use gtk_file_chooser_set_select_multiple().  In
-      single-selection mode, you can use
-      gtk_file_chooser_get_filename() to get a file name from the
-      local file system or gtk_file_chooser_get_uri() to get a
-      full-formed URI.  In multiple-selection mode, you can use
-      gtk_file_chooser_get_filenames() to get a #GSList of filename
-      strings, or gtk_file_chooser_get_uris() to get a list of URI
-      strings.
-    </para>
-
-    <para>
-      Also, you can configure #GtkFileChooser to select files or
-      folders.  Consider a backup program that needs to let the user
-      select a folder that will be backed up along with its
-      subfolders.  To configure whether #GtkFileChooser is used to
-      select files or folders, use gtk_file_chooser_set_folder_mode().
-    </para>
-  </section>
-
-  <section id="gtkfilechooser-installing-preview">
-    <title>Installing a Preview widget</title>
-
-    <para>
-      Many applications need to have a preview facility within their
-      file chooser dialogs.  Previous to GTK+ 2.4, one needed to
-      access the #GtkFileSelection widget hierarchy directly to hook
-      in a preview widget.  With #GtkFileChooser, there is a dedicated
-      API to do this.
-    </para>
-
-    <para>
-      Please see the <link linkend="gtkfilechooser-preview">section on
-      creating preview widgets</link> for more information.
-    </para>
-  </section>
-
-  <section id="gtkfilechooser-installing-extra-widgets">
-    <title>Installing Extra Widgets</title>
-
-    <para>
-      Some applications need to install extra widgets in a file
-      chooser.  For example, an application may want to provide a
-      toggle button to give the user the option of opening a file
-      read-only.
-    </para>
-
-    <para>
-      Please see the <link linkend="gtkfilechooser-extra">section on
-      creating extra widgets</link> for more information.
-    </para>
-  </section>
-
-  <section id="gtkfilechooser-new-features">
-    <title>New features</title>
-
-    <para>
-      New features in #GtkFileChooser include the following:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-	<para>
-	  Ability to select URIs rather than just local files.  You
-	  must use a #GtkFileSystem implementation that supports this,
-	  for example GtkFileSystemGnomeVFS.
-	</para>
-      </listitem>
-
-      <listitem>
-	<para>
-	  Present a list of application-specific shortcut folders.
-	  For example, a paint program may want to add a shortcut for
-	  its <filename>/usr/share/paint_program/Clipart</filename>
-	  folder.
-	</para>
-      </listitem>
-
-      <listitem>
-	<para>
-	  Define custom filters so that not all the files in a folder
-	  are listed.  For example, you could filter out backup files,
-	  or show only image files.
-	</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      To see how to use these features, please consult the
-      #GtkFileChooser reference documentation.
-    </para>
-  </section>
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

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

@@ -525,27 +525,6 @@ This is a private struct used by GTK+ internally, don't worry about it.
 @object: 
 @signal_id: 
 
-<!-- ##### SIGNAL GtkAccelGroup::accel-activate ##### -->
-<para>
-
-</para>
-
-@accelgroup: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@Returns: 
-
-<!-- ##### SIGNAL GtkAccelGroup::accel-changed ##### -->
-<para>
-
-</para>
-
-@accelgroup: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
 <!-- ##### ARG GtkAccelLabel:accel-object ##### -->
 <para>
 
@@ -1140,12 +1119,6 @@ after other user handlers and the default handler.
 </para>
 
 
-<!-- ##### ARG GtkSettings:gtk-icon-theme-name ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### ARG GtkSettings:gtk-key-theme-name ##### -->
 <para>
 
@@ -1388,18 +1361,6 @@ produce superscript and subscript.
 </para>
 
 
-<!-- ##### ARG GtkToolButton:show-label-horizontally ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkToolbar:pack-end ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### STRUCT GtkTreeSelectionClass ##### -->
 <para>
 
@@ -1444,13 +1405,6 @@ produce superscript and subscript.
 @user_data: 
 @Returns: 
 
-<!-- ##### SIGNAL GtkUIManager::changed ##### -->
-<para>
-
-</para>
-
-@uimanager: the object which received the signal.
-
 <!-- ##### ARG GtkVScale:adjustment ##### -->
 <para>
 the #GtkAdjustment which sets the range of the scale.
@@ -3052,29 +3006,6 @@ Creates a border around the arrows of a #GtkSpinButton. The type of border is de
 
 @Returns: 
 
-<!-- ##### FUNCTION gtk_tool_item_get_pack_end ##### -->
-<para>
-
-</para>
-
-@tool_item: 
-@Returns: 
-
-<!-- ##### FUNCTION gtk_tool_item_set_pack_end ##### -->
-<para>
-
-</para>
-
-@tool_item: 
-@pack_end: 
-
-<!-- ##### FUNCTION gtk_tool_item_toolbar_reconfigured ##### -->
-<para>
-
-</para>
-
-@tool_item: 
-
 <!-- ##### FUNCTION gtk_trace_referencing ##### -->
 <para>
 Private: print debugging information while doing a gtk_object_ref() or 

docs/reference/gtk/tmpl/gtkaccessible.sgml

@@ -2,7 +2,7 @@
 GtkAccessible
 
 <!-- ##### SECTION Short_Description ##### -->
-Accessibility support for widgets
+
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>

docs/reference/gtk/tmpl/gtkaction.sgml

@@ -1,249 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkAction
-
-<!-- ##### SECTION Short_Description ##### -->
-an action which can be triggered by a menu or toolbar item
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Actions represent operations that the user can be perform, along with
-some information how it should be presented in the interface. Each action 
-provides methods to create icons, menu items and toolbar items representing 
-itself.
-</para>
-<para>
-As well as the callback that is called when the action gets activated, the 
-following also gets associated with the action:
-<itemizedlist>
-  <listitem><para>a name (not translated, for path lookup)</para></listitem>
-  <listitem><para>a label (translated, for display)</para></listitem>
-  <listitem><para>an accelerator</para></listitem>
-  <listitem><para>whether label indicates a stock id</para></listitem>
-  <listitem><para>a tooltip (optional, translated)</para></listitem>
-  <listitem><para>a toolbar label (optional, shorter than label)</para></listitem>
-</itemizedlist>
-The action will also have some state information:
-<itemizedlist>
-  <listitem><para>visible (shown/hidden)</para></listitem>
-  <listitem><para>sensitive (enabled/disabled)</para></listitem>
-</itemizedlist>
-</para>
-<para>
-Apart from regular actions, there are <link linkend="GtkToggleAction">toggle 
-actions</link>, which can be toggled between two states and <link 
-linkend="GtkRadioAction">radio actions</link>, of which only one in a group 
-can be in the "active" state. Other actions can be implemented as #GtkAction 
-subclasses.
-</para>
-<para>
-Each action can have one or more proxy menu item, toolbar button or
-other proxy widgets.  Proxies mirror the state of the action (text
-label, tooltip, icon, visible, sensitive, etc), and should change when
-the action's state changes. When the proxy is activated, it should
-activate its action.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkActionGroup, #GtkUIManager
-</para>
-
-<!-- ##### STRUCT GtkAction ##### -->
-<para>
-The <structname>GtkAction</structname> struct contains only private members
-and should not be accessed directly.
-</para>
-
-
-<!-- ##### FUNCTION gtk_action_get_name ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_activate ##### -->
-<para>
-
-</para>
-
-@action: 
-
-
-<!-- ##### FUNCTION gtk_action_create_icon ##### -->
-<para>
-
-</para>
-
-@action: 
-@icon_size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_create_menu_item ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_create_tool_item ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_connect_proxy ##### -->
-<para>
-
-</para>
-
-@action: 
-@proxy: 
-
-
-<!-- ##### FUNCTION gtk_action_disconnect_proxy ##### -->
-<para>
-
-</para>
-
-@action: 
-@proxy: 
-
-
-<!-- ##### FUNCTION gtk_action_get_proxies ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_connect_accelerator ##### -->
-<para>
-
-</para>
-
-@action: 
-
-
-<!-- ##### FUNCTION gtk_action_disconnect_accelerator ##### -->
-<para>
-
-</para>
-
-@action: 
-
-
-<!-- ##### FUNCTION gtk_action_block_activate_from ##### -->
-<para>
-
-</para>
-
-@action: 
-@proxy: 
-
-
-<!-- ##### FUNCTION gtk_action_unblock_activate_from ##### -->
-<para>
-
-</para>
-
-@action: 
-@proxy: 
-
-
-<!-- ##### FUNCTION gtk_action_set_accel_path ##### -->
-<para>
-
-</para>
-
-@action: 
-@accel_path: 
-
-
-<!-- ##### FUNCTION gtk_action_set_accel_group ##### -->
-<para>
-
-</para>
-
-@action: 
-@accel_group: 
-
-
-<!-- ##### SIGNAL GtkAction::activate ##### -->
-<para>
-
-</para>
-
-@action: the object which received the signal.
-
-<!-- ##### SIGNAL GtkAction::connect-proxy ##### -->
-<para>
-
-</para>
-
-@action: the object which received the signal.
-@widget: 
-
-<!-- ##### SIGNAL GtkAction::disconnect-proxy ##### -->
-<para>
-
-</para>
-
-@action: the object which received the signal.
-@widget: 
-
-<!-- ##### ARG GtkAction:hide-if-empty ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:is-important ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:sensitive ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:short-label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:stock-id ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:tooltip ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:visible ##### -->
-<para>
-
-</para>
-

docs/reference/gtk/tmpl/gtkactiongroup.sgml

@@ -1,239 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkActionGroup
-
-<!-- ##### SECTION Short_Description ##### -->
-a group of actions
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Actions are organised into groups.  An action group is essentially a
-map from names to #GtkAction objects.
-</para>
-<para>
-All actions that would make sense to use in a particular context
-should be in a single group.  Multiple action groups may be used for a
-particular user interface.  In fact, it is expected that most nontrivial 
-applications will make use of multiple groups.  For example, in an application
-that can edit multiple documents, one group holding global actions 
-(e.g. quit, about, new), and one group per document holding actions that 
-act on that document (eg. save, cut/copy/paste, etc).  Each window's menus 
-would be constructed from a combination of two action groups.
-</para>
-<para id="Action-Accel">
-Accelerators are handled by the GTK+ accelerator map. All actions are assigned an 
-accelerator path (which normally has the form 
-<literal>&lt;Actions&gt;/<replaceable>group-name</replaceable>/<replaceable>action-name</replaceable></literal>) 
-and a shortcut is associated with this accelerator path. All menuitems and 
-toolitems take on this accelerator path. The GTK+ accelerator map code makes 
-sure that the correct shortcut is displayed next to the menu item.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT GtkActionGroup ##### -->
-<para>
-The <structname>GtkActionGroup</structname> struct contains only private 
-members and should not be accessed directly.
-</para>
-
-
-<!-- ##### FUNCTION gtk_action_group_new ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_group_get_name ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_group_get_action ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@action_name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_group_list_actions ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_group_add_action ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@action: 
-
-
-<!-- ##### FUNCTION gtk_action_group_remove_action ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@action: 
-
-
-<!-- ##### STRUCT GtkActionEntry ##### -->
-<para>
-<structname>GtkActionEntry</structname> structs are used with 
-gtk_action_group_add_actions() to construct actions.
-</para>
-
-@name: The name of the action.
-@stock_id: The stock id for the action.
-@label: The label for the action. This field should typically be marked for 
-    translation, see gtk_action_group_set_translation_domain().
-@accelerator: The accelerator for the action, in the format understood by 
-    gtk_accelerator_parse().
-@tooltip: The tooltip for the action. This field should typically be marked 
-    for translation, see gtk_action_group_set_translation_domain().
-@callback: The function to call when the action is activated.
-
-<!-- ##### FUNCTION gtk_action_group_add_actions ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@entries: 
-@n_entries: 
-@user_data: 
-
-
-<!-- ##### FUNCTION gtk_action_group_add_actions_full ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@entries: 
-@n_entries: 
-@user_data: 
-@destroy: 
-
-
-<!-- ##### STRUCT GtkToggleActionEntry ##### -->
-<para>
-<structname>GtkToggleActionEntry</structname> structs are used with 
-gtk_action_group_add_toggle_actions() to construct toggle actions.
-</para>
-
-@name: The name of the action.
-@stock_id: The stock id for the action.
-@label: The label for the action. This field should typically be marked for 
-    translation, see gtk_action_group_set_translation_domain().
-@accelerator: The accelerator for the action, in the format understood by 
-    gtk_accelerator_parse().
-@tooltip: The tooltip for the action. This field should typically be marked 
-    for translation, see gtk_action_group_set_translation_domain().
-@callback: The function to call when the action is activated.
-@is_active: The initial state of the toggle action.
-
-<!-- ##### FUNCTION gtk_action_group_add_toggle_actions ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@entries: 
-@n_entries: 
-@user_data: 
-
-
-<!-- ##### FUNCTION gtk_action_group_add_toggle_actions_full ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@entries: 
-@n_entries: 
-@user_data: 
-@destroy: 
-
-
-<!-- ##### STRUCT GtkRadioActionEntry ##### -->
-<para>
-<structname>GtkRadioActionEntry</structname> structs are used with 
-gtk_action_group_add_radio_actions() to construct groups of radio actions.
-</para>
-
-@name: The name of the action.
-@stock_id: The stock id for the action.
-@label: The label for the action. This field should typically be marked for 
-    translation, see gtk_action_group_set_translation_domain().
-@accelerator: The accelerator for the action, in the format understood by 
-    gtk_accelerator_parse().
-@tooltip: The tooltip for the action. This field should typically be marked for 
-    translation, see gtk_action_group_set_translation_domain().
-@value: The value to set on the radio action. See gtk_radio_action_get_current_value().
-
-<!-- ##### FUNCTION gtk_action_group_add_radio_actions ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@entries: 
-@n_entries: 
-@value: 
-@on_change: 
-@user_data: 
-
-
-<!-- ##### FUNCTION gtk_action_group_add_radio_actions_full ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@entries: 
-@n_entries: 
-@value: 
-@on_change: 
-@user_data: 
-@destroy: 
-
-
-<!-- ##### FUNCTION gtk_action_group_set_translate_func ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@func: 
-@data: 
-@notify: 
-
-
-<!-- ##### FUNCTION gtk_action_group_set_translation_domain ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@domain: 
-
-

docs/reference/gtk/tmpl/gtkalignment.sgml

@@ -72,50 +72,6 @@ space allocated for the #GtkAlignment.
 unused space, from 0 to 1. The values are similar to @xscale.
 
 
-<!-- ##### FUNCTION gtk_alignment_get_padding ##### -->
-<para>
-
-</para>
-
-@alignment: 
-@padding_top: 
-@padding_bottom: 
-@padding_left: 
-@padding_right: 
-
-
-<!-- ##### FUNCTION gtk_alignment_set_padding ##### -->
-<para>
-
-</para>
-
-@alignment: 
-@padding_top: 
-@padding_bottom: 
-@padding_left: 
-@padding_right: 
-
-
-<!-- ##### ARG GtkAlignment:bottom-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:left-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:right-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:top-padding ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkAlignment:xalign ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkbbox.sgml

@@ -104,16 +104,6 @@ Gets the default number of pixels that pad the buttons in a given button box.
 <literal>"child-internal-pad-x/-y"</literal> instead.
 
 
-<!-- ##### FUNCTION gtk_button_box_get_child_secondary ##### -->
-<para>
-
-</para>
-
-@widget: 
-@child: 
-@Returns: 
-
-
 <!-- ##### MACRO gtk_button_box_set_spacing ##### -->
 <para>
 Sets the amount of spacing between buttons in a given button box.

docs/reference/gtk/tmpl/gtkbutton.sgml

@@ -184,24 +184,6 @@ Returns the current relief style of the given #GtkButton.
 @value: 
 
 
-<!-- ##### FUNCTION gtk_button_set_focus_on_click ##### -->
-<para>
-
-</para>
-
-@button: 
-@focus_on_click: 
-
-
-<!-- ##### FUNCTION gtk_button_get_focus_on_click ##### -->
-<para>
-
-</para>
-
-@button: 
-@Returns: 
-
-
 <!-- ##### SIGNAL GtkButton::activate ##### -->
 <para>
 
@@ -247,11 +229,6 @@ mouse cursor is.
 
 @button: the object which received the signal.
 
-<!-- ##### ARG GtkButton:focus-on-click ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkButton:label ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcalendar.sgml

@@ -21,7 +21,7 @@ Alternative, all marks can be cleared with gtk_calendar_clear_marks().
 </para>
 <para>
 The way in which the calendar itself is displayed can be altered using
-gtk_calendar_set_display_options().
+gtk_calendar_display_options().
 </para>
 <para>
 The selected date can be retrieved from a #GtkCalendar using
@@ -67,16 +67,40 @@ are 0-11) while <structfield>selected_day</structfield> is one-based
 
 <!-- ##### ENUM GtkCalendarDisplayOptions ##### -->
 <para>
-These options can be used to influence the display and behaviour of a #GtkCalendar.
+<informaltable pgwide="1" frame="none" role="enum">
+<tgroup cols="2"><colspec colwidth="*"/><colspec colwidth="8*"/>
+<tbody>
+
+<row>
+<entry>GTK_CALENDAR_SHOW_HEADING</entry>
+<entry>Specifies that the month and year should be displayed.</entry>
+</row>
+<row>
+<entry>GTK_CALENDAR_SHOW_DAY_NAMES</entry>
+<entry>Specifies that three letter day descriptions should be present.</entry>
+</row>
+<row>
+<entry>GTK_CALENDAR_NO_MONTH_CHANGE</entry>
+<entry>Prevents the user from switching months with the calendar.</entry>
+</row>
+<row>
+<entry>GTK_CALENDAR_SHOW_WEEK_NUMBERS</entry>
+<entry>Displays each week numbers of the current year, down the left side of
+the calendar.</entry>
+</row>
+<row>
+<entry>GTK_CALENDAR_WEEK_START_MONDAY</entry>
+<entry>Starts the calendar week on Monday, instead of the default Sunday.</entry>
+</row>
+
+</tbody></tgroup></informaltable>
 </para>
 
-@GTK_CALENDAR_SHOW_HEADING: Specifies that the month and year should be displayed.
-@GTK_CALENDAR_SHOW_DAY_NAMES: Specifies that three letter day descriptions should be present.
-@GTK_CALENDAR_NO_MONTH_CHANGE: Prevents the user from switching months with the calendar.
-@GTK_CALENDAR_SHOW_WEEK_NUMBERS: Displays each week numbers of the current year, down the left side 
- of the calendar.
-@GTK_CALENDAR_WEEK_START_MONDAY: Since GTK+ 2.4, this option is deprecated and ignored by GTK+. 
- The information on which day the calendar week starts is derived from the locale.
+@GTK_CALENDAR_SHOW_HEADING: 
+@GTK_CALENDAR_SHOW_DAY_NAMES: 
+@GTK_CALENDAR_NO_MONTH_CHANGE: 
+@GTK_CALENDAR_SHOW_WEEK_NUMBERS: 
+@GTK_CALENDAR_WEEK_START_MONDAY: 
 
 <!-- ##### FUNCTION gtk_calendar_new ##### -->
 <para>
@@ -135,24 +159,6 @@ Remove all visual markers.
 @calendar: a #GtkCalendar.
 
 
-<!-- ##### FUNCTION gtk_calendar_get_display_options ##### -->
-<para>
-
-</para>
-
-@calendar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_calendar_set_display_options ##### -->
-<para>
-
-</para>
-
-@calendar: 
-@flags: 
-
-
 <!-- ##### FUNCTION gtk_calendar_display_options ##### -->
 <para>
 Sets display options (whether to display the heading and the month headings).
@@ -160,7 +166,6 @@ Sets display options (whether to display the heading and the month headings).
 
 @calendar: a #GtkCalendar.
 @flags: the display options to set.
-@Deprecated: Use gtk_calendar_set_display_options() instead
 
 
 <!-- ##### FUNCTION gtk_calendar_get_date ##### -->
@@ -241,38 +246,3 @@ calendar.
 
 @calendar: the object which received the signal.
 
-<!-- ##### ARG GtkCalendar:day ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:month ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:no-month-change ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:show-day-names ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:show-heading ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:show-week-numbers ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:year ##### -->
-<para>
-
-</para>
-

docs/reference/gtk/tmpl/gtkcelleditable.sgml

@@ -2,7 +2,7 @@
 GtkCellEditable
 
 <!-- ##### SECTION Short_Description ##### -->
-Interface for widgets which can are used for editing cells
+
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>

docs/reference/gtk/tmpl/gtkcelllayout.sgml

@@ -1,117 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellLayout
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT GtkCellLayout ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GtkCellLayoutIface ##### -->
-<para>
-
-</para>
-
-@g_iface: 
-@pack_start: 
-@pack_end: 
-@clear: 
-@add_attribute: 
-@set_cell_data_func: 
-@clear_attributes: 
-
-<!-- ##### USER_FUNCTION GtkCellLayoutDataFunc ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-@tree_model: 
-@iter: 
-@data: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_pack_start ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-@expand: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_pack_end ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-@expand: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_clear ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_set_attributes ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_add_attribute ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-@attribute: 
-@column: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_set_cell_data_func ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-@func: 
-@func_data: 
-@destroy: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_clear_attributes ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-
-

docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml

@@ -2,7 +2,7 @@
 GtkCellRendererPixbuf
 
 <!-- ##### SECTION Short_Description ##### -->
-Renders a pixbuf in a cell
+
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>

docs/reference/gtk/tmpl/gtkcellrenderertext.sgml

@@ -2,7 +2,7 @@
 GtkCellRendererText
 
 <!-- ##### SECTION Short_Description ##### -->
-Renders text in a cell
+
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>

docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml

@@ -2,7 +2,7 @@
 GtkCellRendererToggle
 
 <!-- ##### SECTION Short_Description ##### -->
-Renders a toggle button in a cell
+
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>

docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml

@@ -130,24 +130,6 @@ Emits the GtkCheckMenuItem::toggled signal.
 @setting: 
 
 
-<!-- ##### FUNCTION gtk_check_menu_item_set_draw_as_radio ##### -->
-<para>
-
-</para>
-
-@check_menu_item: 
-@draw_as_radio: 
-
-
-<!-- ##### FUNCTION gtk_check_menu_item_get_draw_as_radio ##### -->
-<para>
-
-</para>
-
-@check_menu_item: 
-@Returns: 
-
-
 <!-- ##### SIGNAL GtkCheckMenuItem::toggled ##### -->
 <para>
 This signal is emitted when the state of the check box is changed.
@@ -165,11 +147,6 @@ field of the #GtkCheckMenuItem-struct struct to discover the new state.
 
 </para>
 
-<!-- ##### ARG GtkCheckMenuItem:draw-as-radio ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkCheckMenuItem:inconsistent ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcolorbutton.sgml

@@ -1,139 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkColorButton
-
-<!-- ##### SECTION Short_Description ##### -->
-A button to launch a color selection dialog
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkColorButton is a button which displays the currently selected color an allows to open a color 
-selection dialog to change the color. It is suitable widget for selecting a color in a preference dialog.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkColorSelectionDialog, #GtkFontButton
-</para>
-
-<!-- ##### STRUCT GtkColorButton ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gtk_color_button_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_button_new_with_color ##### -->
-<para>
-
-</para>
-
-@color: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_button_set_color ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@color: 
-
-
-<!-- ##### FUNCTION gtk_color_button_get_color ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@color: 
-
-
-<!-- ##### FUNCTION gtk_color_button_set_alpha ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@alpha: 
-
-
-<!-- ##### FUNCTION gtk_color_button_get_alpha ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_button_set_use_alpha ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@use_alpha: 
-
-
-<!-- ##### FUNCTION gtk_color_button_get_use_alpha ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_button_set_title ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@title: 
-
-
-<!-- ##### FUNCTION gtk_color_button_get_title ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@Returns: 
-
-
-<!-- ##### SIGNAL GtkColorButton::color-set ##### -->
-<para>
-
-</para>
-
-@colorbutton: the object which received the signal.
-
-<!-- ##### ARG GtkColorButton:alpha ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorButton:color ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorButton:title ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorButton:use-alpha ##### -->
-<para>
-
-</para>
-

docs/reference/gtk/tmpl/gtkcombobox.sgml

@@ -1,158 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkComboBox
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT GtkComboBox ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gtk_combo_box_new ##### -->
-<para>
-
-</para>
-
-@model: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_wrap_width ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@width: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_row_span_column ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@row_span: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_column_span_column ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@column_span: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_active ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_active ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@index: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_model ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_new_text ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_append_text ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@text: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_insert_text ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@position: 
-@text: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_prepend_text ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@text: 
-
-
-<!-- ##### SIGNAL GtkComboBox::changed ##### -->
-<para>
-
-</para>
-
-@combobox: the object which received the signal.
-
-<!-- ##### ARG GtkComboBox:active ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:column-span-column ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:model ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:row-span-column ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:wrap-width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:appearance ##### -->
-<para>
-
-</para>
-

docs/reference/gtk/tmpl/gtkcomboboxentry.sgml

@@ -1,46 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkComboBoxEntry
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT GtkComboBoxEntry ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gtk_combo_box_entry_new ##### -->
-<para>
-
-</para>
-
-@model: 
-@text_column: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_entry_get_text_column ##### -->
-<para>
-
-</para>
-
-@entry_box: 
-@Returns: 
-
-
-<!-- ##### ARG GtkComboBoxEntry:text-column ##### -->
-<para>
-
-</para>
-

docs/reference/gtk/tmpl/gtkcontainer.sgml

@@ -5,71 +5,7 @@ GtkContainer
 Base class for widgets which contain other widgets
 
 <!-- ##### SECTION Long_Description ##### -->
-<para>
-A GTK+ user interface is constructed by nesting widgets inside widgets. Container widgets are the inner
-nodes in the resulting tree of widgets: they contain other widgets. So, for example, you might have a 
-#GtkWindow containing a #GtkFrame containing a GtkLabel. If you wanted an image instead of a textual label 
-inside the frame, you might replace the #GtkLabel widget with a #GtkImage widget.
-</para>
-<para>
-There are two major kinds of container widgets in GTK+. Both are subclasses of the abstract #GtkContainer 
-base class.
-</para>
-<para>
-The first type of container widget has a single child widget and derives from #GtkBin. These containers
-are <firstterm>decorators</firstterm>, which add some kind of functionality to the child. For example, 
-a #GtkButton makes its child into a clickable button; a #GtkFrame draws a frame around its child and 
-a #GtkWindow places its child widget inside a top-level window.
-</para>
-<para>
-The second type of container can have more than one child; its purpose is to manage 
-<firstterm>layout</firstterm>. This means that these containers assign sizes and positions to their children. 
-For example, a #GtkHBox arranges its children in a horizontal row, and a #GtkTable arranges the widgets it
-contains in a two-dimensional grid. 
-</para>
-<para>
-To fulfill its task, a layout container must negotiate the size requirements with its parent and its children.
-This negotiation is carried out in two phases, <firstterm>size requisition</firstterm> and 
-<firstterm>size allocation</firstterm>. 
-</para>
-<refsect2 id="size-requisition"><title>Size Requisition</title>
-<para>
-The size requisition of a widget is it's desired width and height. This is represented by a #GtkRequisition.
-</para>
-<para>
-How a widget determines its desired size depends on the widget. A #GtkLabel, for example, requests enough space 
-to display all its text. Container widgets generally base their size request on the requisitions of their 
-children.  
-</para>
-<para>
-The size requisition phase of the widget layout process operates top-down. It starts at a top-level widget,
-typically a #GtkWindow. The top-level widget asks its child for its size requisition by calling
-gtk_widget_size_request(). To determine its requisition, the child asks its own children for their requisitions 
-and so on. Finally, the top-level widget will get a requisition back from its child. 
-</para>
-</refsect2>
-<refsect2 id="size-allocation"><title>Size Allocation</title>
-<para>
-When the top-level widget has determined how much space its child would like to have, the second phase of the
-size negotiation, size allocation, begins. Depending on its configuration (see gtk_window_set_resizable()), the 
-top-level widget may be able to expand in order to satisfy the size request or it may have to ignore the size 
-request and keep its fixed size. It then tells its child widget how much space it gets by calling 
-gtk_widget_size_allocate(). The child widget divides the space among its children and tells each child how much 
-space it got, and so on. Under normal circumstances, a #GtkWindow will always give its child the amount of space
-the child requested.
-</para>
-<para>
-A child's size allocation is represented by a #GtkAllocation. This struct contains not only a width and height, 
-but also a position (i.e. X and Y coordinates), so that containers can tell their children not only how much
-space they have gotten, but also where they are positioned inside the space available to the container. 
-</para>
-<para>
-Widgets are required to honor the size allocation they receive; a size request is only a request, and widgets
-must be able to cope with any size.
-</para>
-</refsect2>
-<refsect2 id="child-properties"><title>Child properties</title>
-<para>
+<para id="child-properties">
 <structname>GtkContainer</structname> introduces <firstterm>child 
 properties</firstterm> - these are object properties that are not specific
 to either the container or the contained widget, but rather to their relation.
@@ -89,7 +25,6 @@ gtk_container_child_get_property(), gtk_container_child_get() or
 gtk_container_child_get_valist(). To emit notification about child property 
 changes, use gtk_widget_child_notify().
 </para>
-</refsect2>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>

docs/reference/gtk/tmpl/gtkcurve.sgml

@@ -5,9 +5,8 @@ GtkCurve
 allows direct editing of a curve.
 
 <!-- ##### SECTION Long_Description ##### -->
-<note>
 <para>
- This widget is considered too specialized/little-used for
+ NOTE this widget is considered too specialized/little-used for
  GTK+, and will in the future be moved to some other package.  If
  your application needs this widget, feel free to use it, as the
  widget does work and is useful in some applications; it's just not
@@ -15,7 +14,6 @@ allows direct editing of a curve.
  the widget, and it will eventually move out of the GTK+
  distribution.
 </para>
-</note>
 <para>
 The #GtkCurve widget allows the user to edit a curve covering a range of
 values. It is typically used to fine-tune color balances in graphics