Revert accidental gtk.symbols changes

This can be used to theme widgets differently depending on the
orientation. Bug 639157, reported by Christian Dywan.

Makefile.am

@@ -47,47 +47,45 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/install-sh \
 	$(srcdir)/ltmain.sh \
 	$(srcdir)/missing \
-	$(srcdir)/mkinstalldirs \
 	$(srcdir)/omf.make \
 	$(srcdir)/xmldocs.make \
 	$(srcdir)/gtk-doc.make \
 	$(srcdir)/ChangeLog \
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
-GDKTARGET=@gdktarget@
 
 ## Copy .pc files to target-specific names
-gtk+-$(GDKTARGET)-3.0.pc: gtk+-3.0.pc
-	rm -f gtk+-$(GDKTARGET)-3.0.pc && \
-	cp gtk+-3.0.pc gtk+-$(GDKTARGET)-3.0.pc
+gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc: gtk+-3.0.pc
+	rm -f $@ && \
+	cp gtk+-3.0.pc $@
 
-gdk-$(GDKTARGET)-3.0.pc: gdk-3.0.pc
-	rm -f gdk-$(GDKTARGET)-3.0.pc && \
-	cp gdk-3.0.pc gdk-$(GDKTARGET)-3.0.pc
+gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc: gdk-3.0.pc
+	rm -f $@ && \
+	cp gdk-3.0.pc $@
 
-gtk+-$(GDKTARGET)-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
-	rm -f gtk+-$(GDKTARGET)-3.0-uninstalled.pc && \
-	cp gtk+-3.0-uninstalled.pc gtk+-$(GDKTARGET)-3.0-uninstalled.pc
-
-gdk-$(GDKTARGET)-3.0-uninstalled.pc: gdk-3.0-uninstalled.pc
-	rm -f gdk-$(GDKTARGET)-3.0-uninstalled.pc && \
-	cp gdk-3.0-uninstalled.pc gdk-$(GDKTARGET)-3.0-uninstalled.pc
+gtk+-*-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
+	rm -f $@ && \
+	cp gtk+-3.0-uninstalled.pc $@
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail-3.0.pc
+pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc
+
+pkgconfig_DATA += ${GDK_BACKENDS:%=gtk+-%-3.0.pc}
+pkgconfig_DATA += ${GDK_BACKENDS:%=gdk-%-3.0.pc}
 
 if OS_UNIX
 pkgconfig_DATA += gtk+-unix-print-3.0.pc
 endif
 
-DISTCLEANFILES =				\
-	gtk+-unix-print-3.0.pc			\
-	gtk+-$(GDKTARGET)-3.0.pc		\
-	gdk-$(GDKTARGET)-3.0.pc			\
-	gail-3.0.pc				\
-	gtk+-$(GDKTARGET)-3.0-uninstalled.pc	\
-	gdk-$(GDKTARGET)-3.0-uninstalled.pc	\
-	gail-3.0-uninstalled.pc			\
+DISTCLEANFILES = \
+	gtk+-unix-print-3.0.pc		\
+	gtk+-3.0.pc			\
+	gtk+-x11-3.0.pc			\
+	gdk-3.0.pc			\
+	gdk-x11-3.0.pc			\
+	gail-3.0.pc			\
+	gtk+-3.0-uninstalled.pc		\
+	gail-3.0-uninstalled.pc		\
 	config.lt
 
 distclean-local:
@@ -96,8 +94,7 @@ distclean-local:
 	fi
 
 ChangeLog:
-	@echo Creating $@
-	@if test -d "$(srcdir)/.git"; then \
+	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
 	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
 	  && mv -f $@.tmp $@ \
 	  || ($(RM) $@.tmp; \
@@ -109,20 +106,7 @@ ChangeLog:
 	  echo A git checkout and git-log is required to generate this file >> $@); \
 	fi
 
-## copy the default target for this platform to gdk-3.0.pc and gtk+-3.0.pc
-DEFAULT_GDKTARGET=x11
-install-data-hook:
-	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 test -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc && \
-	 test -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc && \
-	 rm -f gdk-3.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc gdk-3.0.pc && \
-	 rm -f gtk+-3.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc gtk+-3.0.pc) || \
-	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 rm -f gdk-3.0.pc && cp -f gdk-$(GDKTARGET)-3.0.pc gdk-3.0.pc && \
-	 rm -f gtk+-3.0.pc && cp -f gtk+-$(GDKTARGET)-3.0.pc gtk+-3.0.pc)
-
 uninstall-local:
-	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-3.0.pc
 	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc
 
 dist-hook:

Makefile.decl

@@ -17,9 +17,15 @@ XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
   1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
   9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
   9995 9996 9997 9998 9999
+
+if USE_X11
 SKIP_GDKTARGET = \
-	test "$(gdktarget)" != "x11" \
-	&& echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
+	false
+else
+SKIP_GDKTARGET = \
+	echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
+endif
+
 XVFB_START = \
 	${XVFB} -help 2>/dev/null 1>&2 \
 	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \

NEWS

@@ -1,3 +1,274 @@
+Overview of Changes from GTK+ 2.99.1 to 2.99.2
+==============================================
+
+* More widgets are using GtkStyleContext directly:
+  GtkColorButton, GtkColorSelection, GtkHSV,
+  GtkFontSelection, GtkPrintUnixDialog, GtkImage,
+  GtkLayout, GtkViewport, GtkTextDisplay, GtkTextUtil,
+  GtkCalendar
+
+* GtkBuilder support has been added for setting menus
+  on GtkMenuToolButtons and for adding tags to
+  GtkTextTagTable as well as adding items to
+  GtkComboBoxText
+
+* Bug fixes:
+ 350618 start rubber banding on "white space"
+ 612918 Support disabling X11 extensions
+ 635687 problem with pygtk or gtk with gtk.Plug and gtk.Socket...
+ 638017 GtkTextView: Crash in gtk_text_view_set_tabs()
+ 638119 GtkSpinner animation not correctly stopped...
+ 638880 Need a setter for has_user_ref_count
+ 639030 Small cleanup in gailtextview code.
+ 639047 Fix remaining usage of g[dk]ktargetlib.
+ 639079 Obtain the fg color from the renderer
+ 639105 Port GtkTextDisplay to StyleContext.
+ 639106 New CSS style misses distinction between "selected focused"...
+ 639127 Misc Win32 GDK building problems
+ 639157 GtkOrientable should add/ remove "horizontal" and "vertical"...
+
+* Translation updates:
+ British English
+ Galician
+ Hebrew
+ Indonesian
+ Spanish
+
+
+Overview of Changes from GTK+ 2.91.7 to 2.99.0
+==============================================
+
+* Deprecations and removals:
+ - Long-obsolete linuxfb-related GtkWindow APIs have been dropped
+ - All remaining G_SEALed struct members have been removed
+ - GtkThemeEngine has been removed
+ - gdk_display_get_window_at_device_position() has been renamed to
+   gdk_device_get_window_at_position()
+ - gdk_display_get_device_state() has been renamed to
+   gdk_device_get_position()
+ - gdk_device_set_source() has been dropped
+ - gdk_set_pointer_hooks(), gdk_display_set_pointer_hooks() and
+   gdk_display_set_device_hooks() have been removed
+ - The deprecated GtkNotebook:tab-pack child property has been removed
+ - The deprecated gtk_quit_add() functions have been removed
+ - The GtkRange update-policy facility has been removed
+
+* The gtk-update-icon-cache and gtk-builder-convert utilities have
+  been renamed back to their un-suffixed names. Distributions will
+  have to resolve the conflict between GTK+ 2.x and 3.0 packages
+  by dropping one set of the utilities and adding a dependency.
+
+* It is now possible to include multiple GDK backends in a single
+  library. The --with-gdk-backend option has been split into separate
+  --enable-{x11,win32,quartz}-backend options.
+
+* The GDK Quartz backend has been ported to the new GDK backend API
+
+* A number of widgets have been ported to use GtkStyleContext directly:
+  GtkAccelLabel, GtkArrow, GtkSeparator, GtkSpinButton, GtkMessageDialog,
+  GtkFrame, GtkEventBox, GtkScrolledWindow, GtkProgressBar, GtkEntry,
+  GtkFileChooserEntry, GtkSwitch, GtkHandleBox, GtkToolbar, GtkFixed,
+  GtkToolPalette, GtkAboutDialog, GtkAssistant, GtkTrayIcon, GtkPaned,
+  GtkToolButton, GtkSocket, GtkRecentChooser, GtkTooltip, GtkPathBar,
+  GtkWin32EmbedWidget, GtkCellView, GtkDialog, GtkDrawingArea, GtkPlug,
+  GtkEntryCompletion, GtkFileChooserButton, GtkFileChooser, GtkHandleBox,
+  GtkLinkButton, GtkOffscreenWindow
+
+* Various problems with width-for-height geometry management have been
+  fixed in GtkAlignment, GtkCheckButton, GtkBin
+
+* The GtkComboBox, GtkIconView and GtkCellView widgets have been ported
+  to use GtkCellArea for their cell layouts
+
+* The cups print backend can now send print jobs directly in PDF if
+  cups supports it
+
+* GtkNumerableIcon is a variant of GEmblemedIcon for using numbers
+  as emblems
+
+* Bugs fixed:
+ 144324 Leaking dnd contexts with XDnD
+ 165987 unsets DESKTOP_STARTUP_ID
+ 307963 GtkSpinButton clamps value with the wrong maximum.
+ 321958 gtk.Calendar Notes should also say the format of year
+ 533745 Segfault on gdk.DragContext.drag_get_selection()
+ 553404 Out-of-date comment in gtk_text_view_add_child_in_window()
+ 559503 Description should mention gregorian
+ 560177 Applications should send print jobs to CUPS in PDF format...
+ 562182 gtk_init() docs inaccurate
+ 599130 Ending a drag using space or enter doesn't always cause a...
+ 617312 Move documentation to inline comments: GtkDialog
+ 617315 Move documentation to inline comments: GtkDrawingArea
+ 617322 Move documentation to inline comments: GtkEntryCompletion
+ 617327 Move documentation to inline comments: GtkExpander
+ 617471 Migrate API docs from templates to source files...
+ 621720 Use $(AM_V_GEN) to silent the build a bit.
+ 622125 Note that gtk_show_uri needs gvfs to spawn URLs
+ 629955 Deprecate/remove gtk_main and gtk_init_add/remove* API
+ 633795 gdk_event_get_state wrongly extracts GDK_PROPERTY_NOTIFY...
+ 634711 Xlib warning when RANDR is missing
+ 635299 add gtk_selection_data_get_data_with_length API...
+ 637691 Eating events breaks proxied DND
+ 637721 gtk 2.91.6 issue with gtkcellrendererprogress
+ 637736 [GtkAboutDialog] Newlines are ignored in translator-credits
+ 637763 [GtkAboutDialog] no longer display contact link
+ 637834 gtk_widget_verify_invariants: relax toplevel checks
+ 637849 Shell segfaults when unicode characters after U+00FF...
+ 637895 gdk_pointer_grab() deprecated comment is not helpful enough
+ 637907 gtkwindow.h includes a private header
+ 637910 GtkSpinner - does not animate
+ 637958 print dialog doesn't fit on netbook screen size
+ 637974 Gtk+ 2.91.7 build of introspection fails
+ 638179 in draw signal handle call gtk_style_context_add_provider...
+ 638193 GtkSpinButton documentation out of date
+ 638231 GtkSwitch states translation
+ 638386 gdk_x11_display_init_input careless
+ 638580 'application' window's property released too late
+ 638608 gtkenums: add GTK_STATE_FLAG_NORMAL = 0
+
+* Updated translations:
+ Estonian
+ Kurdish
+ Norwegian bokmål
+ Punjabi
+ Spanish
+ Swedish
+ Uighur
+
+
+Overview of Changes from GTK+ 2.91.6 to 2.91.7
+==============================================
+
+* The treeview-refactor branch has been merged, bringing more
+  flexible cell arrangement with GtkCellArea, GtkCellAreaBox, etc
+
+* The gdk-backend branch has been merged. This branch cleans up the
+  internal frontend/backend separation in GDK, with the ultimate goal
+  of allowing to build a single gdk library that contains multiple
+  backends (interesting combinations are x11+wayland or quartz+x11).
+
+  For now, GDK is still restricted to a single backend, but
+  as a first step, the libraries no longer include the backend name
+  in their soname, but are just libgdk-3.0.so and libgtk-3.0.so.
+
+  Only the x11 backend has been kept up to date with this cleanup
+  work, other backends are broken in this release.
+
+* Deprecations and removals:
+ - G_SEALed struct members have been removed from GtkWindowGroup,
+   GtkDrawingArea, GtkTreeStore, GtkTreeModelSort, GtkTreeSelection,
+   GtkSocket, GtkPrintJob, GtkSelectionData
+ - Input device handling:
+   - gdk_display_list_devices, gdk_display_get_core_pointer,
+     gdk_input_set_extension_events, gtk_widget_set_extension_events,
+     gdk_devices_list have been removed
+   - gdk_display_warp_device has been replaced by gdk_device_warp
+   - gdk_enable_multidevice has been replaced by gdk_disable_multidevice
+ - Drag-and-Drop:
+   gdk_drag_context_new, gdk_drag_find_window and gdk_drag_get_protocol
+   have been removed
+ - Property handling:
+   Functions that deal with X11-specific encodings such as Compound Text
+   have been moved to backend-specific API:
+   gdk_string_to_compound_text[_for_display],
+   gdk_utf8_to_compound_text[_for_display], gdk_free_compound_text,
+   gdk_text_property_to_text_list[_for_display], gdk_free_text_list,
+   gdk_text_property_to_utf8_list
+ - Foreign windows:
+   Functions for dealing with GdkWindow wrappers around foreign
+   windows have been moved to backend-specific API.
+ - Application launching:
+   The gdk_spawn_* APIs have been removed, since they were trivial
+   wrappers around g_spawn_* on most platforms and can be replaced
+   by GIO GAppInfo APIs.
+ - Misc. other functions: gdk_net_wm_supports, gdk_set_locale,
+   gdkx_visual_get have been either removed, gdk_set_sm_client_id
+   has been moved to backend-specific API.
+
+* A number of GTK+ widgets have been ported to use GtkStyleContext
+  directly for rendering
+
+* The tracker search backend for the file chooser has been updated
+  to work with libtracker-sparql as available in tracker >= 0.9
+
+* The GtkAboutDialog has been given a facelift. It no longer
+  opens second-level dialogs
+
+* The GDK X11 backend now uses XI2 (including multi-device capabilities)
+  by default. Use gdk_disable_multidevice() to switch back to the
+  XI1/Core implementation
+
+* Bug fixes:
+ 629923 Consider always calling unmap() when unsetting MAPPED flag
+ 634657 Dynamically attached calendar does not respond to mouse clicks
+ 635401 Setting conflict warning does not disappear when conflict is fixed
+ 636732 Gtk+ fails to build
+ 636777 Leak in gtk_css_provider_get_named
+ 637018 Add checks for id-column/entry-text-column >= 0
+ 637069 Custom print settings set in custom-widget-apply are lost
+ 637155 Remove vestiges of support for themes using XSHAPE
+ 637156 Optimize gtk_widget_shape_combine_region (widget, NULL, ...)
+ 637189 gtk_cell_renderer_spin_start_editing uses g_ascii_strtod but...
+ 637243 docs: fix link failure on gtk-doc scanner binaries
+ 637256 gtkstylecontext: fix typos in annotations
+ 637464 Fix GdkWindowFilter internal refcounting
+ 637471 GTK2_RC_FILES should be renamed to GTK3_RC_FILES
+ 637520 Gtk+ seems to have broken Mutter
+ 637606 Missing out annotations for gtk_accelerator_parse and...
+ 637608 Problems with the new AboutDialog
+
+* Translation updates:
+ Estonian
+ Hebrew
+ Kazakh
+ Norwegian bokmål
+ Persian
+ Spanish
+ Vietnamese
+
+
+Overview of Changes from GTK+ 2.91.5 to 2.91.6
+==============================================
+
+* Deprecations, cleanups and API changes:
+ - GdkDrawable and some X11-specific APIs have been removed
+ - GtkStyle and GtkRcStyle have been deprecated
+ - The GdkWindowClass enumeration is now GdkWindowWindowClass
+ - gdk_window_get_geometry lost its depth argument
+ - The old, unused gtk_decorated_window_... functions have
+   been removed.
+
+* GtkComboBox has gained an 'active id' property that is
+  intended for easy binding to settings
+
+* GtkAppChooser: A new family of widgets that allow choosing
+  an application to open a file. This is strongly based on
+  the corresponding nautilus dialog, which it is replacing.
+
+* The GtkStyleContext branch has been merged, changing the APIs
+  that are used to do themed drawing, and the theme engine interfaces.
+  Among the new classes are GtkStyleContext (replacing GtkStyle) and
+  GtkCssProvider (replacing the gtkrc parser). The migration guide
+  contains a chapter about porting from GtkStyle to GtkStyleContext.
+
+* Bugs fixed:
+ 549720 Add a way to hide GtkScale's slider
+ 582557 need open with dialog box to use with IBM's Lotus Notes...
+ 619148 "active ID" properties (GtkComboBox)
+ 636060 use ATK_DEFINE_TYPE where possible
+ 636129 invalid uninstantiatable type `(null)' in cast to `GtkSpinner'
+ 636388 gtk3-demo craches (segfault) when pressing a key in the textarea...
+ 636511 New style override functions do not work on textview
+
+* Updated translations:
+ Estonian
+ Galician
+ Hebrew
+ Persian
+ Slovenian
+ Spanish
+
+
 Overview of Changes from GTK+ 2.91.4 to 2.91.5
 ==============================================
 

README.win32

@@ -85,7 +85,7 @@ LDFLAGS="-L/devel/dist/${ARCH}/${LIBPNG}/lib \
 LIBS=-lintl \
 CFLAGS=-O2 \
 ./configure \
---with-gdktarget=win32 \
+--enable-win32-backend \
 --disable-gdiplus \
 --with-included-immodules \
 --without-libjasper \

autogen.sh

@@ -1,130 +1,32 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
 
-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=Gtk+
-TEST_TYPE=-d
-FILE=gdk
+olddir=`pwd`
+cd "$srcdir"
 
-DIE=0
-
-have_libtool=false
-if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
-	libtool_version=`libtoolize --version |
-			 head -1 |
-			 sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \
-			     -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
-	case $libtool_version in
-	    2.*)
-		have_libtool=true
-		;;
-	esac
-fi
-if $have_libtool ; then : ; else
-	echo
-	echo "You must have libtool 2.2 installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
-	DIE=1
-fi
-
-(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have gtk-doc installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-	DIE=1
-}
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have autoconf installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
-	DIE=1
-}
-
-if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.11
-    ACLOCAL=aclocal-1.11
-else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.10
-    ACLOCAL=aclocal-1.10
+GTKDOCIZE=`which gtkdocize`
+if test -z $GTKDOCIZE; then
+        echo "*** No GTK-Doc found, please install it ***"
+        exit 1
 else
-	echo
-	echo "You must have automake 1,10.x or 1.11.x installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
-	DIE=1
+        gtkdocize || exit $?
 fi
-fi
-
-if test "$DIE" -eq 1; then
-	exit 1
-fi
-
-test $TEST_TYPE $FILE || {
-	echo "You must run this script in the top-level $PROJECT directory"
-	exit 1
-}
-
-# NOCONFIGURE is used by gnome-common; support both
-if ! test -z "$AUTOGEN_SUBDIR_MODE"; then
-    NOCONFIGURE=1
-fi
-
-if test -z "$NOCONFIGURE"; then
-        if test -z "$*"; then
-                echo "I am going to run ./configure with no arguments - if you wish "
-                echo "to pass any to it, please specify them on the $0 command line."
-        fi
-fi
-
-if test -z "$ACLOCAL_FLAGS"; then
-
-	acdir=`$ACLOCAL --print-ac-dir`
-        m4list="glib-2.0.m4 glib-gettext.m4"
-
-	for file in $m4list
-	do
-		if [ ! -f "$acdir/$file" ]; then
-			echo "WARNING: aclocal's directory is $acdir, but..."
-			echo "         no file $acdir/$file"
-			echo "         You may see fatal macro warnings below."
-			echo "         If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
-			echo "         environment variable to \"-I /some/dir\", or install"
-			echo "         $acdir/$file."
-			echo ""
-		fi
-	done
-fi
-
-rm -rf autom4te.cache
 
 # README and INSTALL are required by automake, but may be deleted by clean
 # up rules. to get automake to work, simply touch these here, they will be
 # regenerated from their corresponding *.in files by ./configure anyway.
 touch README INSTALL
 
-gtkdocize || exit $?
-
-$ACLOCAL -I m4 $ACLOCAL_FLAGS || exit $?
-
-libtoolize --force || exit $?
-
-autoheader || exit $?
-
-$AUTOMAKE --add-missing || exit $?
-autoconf || exit $?
-cd $ORIGDIR || exit $?
-
-if test -z "$NOCONFIGURE"; then
-        $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
-
-        echo 
-        echo "Now type 'make' to compile $PROJECT."
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+        echo "*** No autoreconf found, please install it ***"
+        exit 1
+else
+        autoreconf --force --install --verbose || exit $?
 fi
+
+cd "$olddir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"

config.h.win32.in

@@ -276,12 +276,6 @@
 /* Whether to load modules via .la files rather than directly */
 /* #undef USE_LA_MODULES */
 
-/* Define to 1 if medialib is available and should be used */
-/* #undef USE_MEDIALIB */
-
-/* Define to 1 if medialib 2.5 is available */
-/* #undef USE_MEDIALIB25 */
-
 /* Define to 1 if XXM is available and should be used */
 #ifndef _MSC_VER
 #  define USE_MMX 1

configure.ac

@@ -9,8 +9,8 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [91])
-m4_define([gtk_micro_version], [6])
+m4_define([gtk_minor_version], [99])
+m4_define([gtk_micro_version], [1])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -19,7 +19,7 @@ m4_define([gtk_version],
 # This is the X.Y used in -lgtk-FOO-X.Y
 m4_define([gtk_api_version], [3.0])
 
-AC_PREREQ([2.64])
+AC_PREREQ([2.62])
 AC_INIT([gtk+], [gtk_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B],
         [gtk+])
@@ -38,7 +38,7 @@ AC_CONFIG_MACRO_DIR([m4])
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.27.3])
+m4_define([glib_required_version], [2.27.5])
 m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.29.2])
 m4_define([cairo_required_version], [1.10.0])
@@ -236,42 +236,117 @@ 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(xkb,
-              [AC_HELP_STRING([--enable-xkb],
-                              [support XKB [default=maybe]])],,
-              [enable_xkb="maybe"])
-AC_ARG_ENABLE(xinerama,
-              [AC_HELP_STRING([--enable-xinerama],
-	                      [support xinerama extension if available [default=yes]])],,
-              [enable_xinerama="yes"])
+
 AC_ARG_ENABLE(rebuilds,
               [AC_HELP_STRING([--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_ENABLE(xkb,
+              [AC_HELP_STRING([--enable-xkb],
+                              [support XKB extension [default=maybe]])],,
+              [enable_xkb="maybe"])
+AC_ARG_ENABLE(xinerama,
+              [AC_HELP_STRING([--enable-xinerama],
+	                      [support Xinerama extension if available [default=maybe]])],,
+              [enable_xinerama="maybe"])
+AC_ARG_ENABLE(xinput,
+              [AC_HELP_STRING([--enable-xinput],
+                              [support XInput extension if available [default=yes]])],,
+              [enable_xinput="maybe"])
+AC_ARG_ENABLE(xrandr,
+              [AC_HELP_STRING([--enable-xrandr],
+                              [support XRandR extension if available [default=maybe]])],,
+              [enable_xrandr="maybe"])
+AC_ARG_ENABLE(xfixes,
+              [AC_HELP_STRING([--enable-xfixes],
+                              [support XFixes extension if available [default=maybe]])],,
+              [enable_xfixes="maybe"])
+AC_ARG_ENABLE(xcomposite,
+              [AC_HELP_STRING([--enable-xcomposite],
+                              [support X Composite extension if available [default=maybe]])],,
+              [enable_xcomposite="maybe"])
+AC_ARG_ENABLE(xdamage,
+              [AC_HELP_STRING([--enable-xdamage],
+                              [support X Damage extension if available [default=maybe]])],,
+              [enable_xdamage="maybe"])
 
-if test "$platform_win32" = yes; then
-  gdktarget=win32
-else
-  gdktarget=x11
+AC_ARG_ENABLE(x11-backend,
+              [AC_HELP_STRING([--enable-x11-backend],
+                              [enable the X11 gdk backend])],
+			      [backend_set=yes])
+AC_ARG_ENABLE(win32-backend,
+              [AC_HELP_STRING([--enable-win32-backend],
+                              [enable the Win32 gdk backend])],
+			      [backend_set=yes])
+AC_ARG_ENABLE(quartz-backend,
+              [AC_HELP_STRING([--enable-quartz-backend],
+                              [enable the quartz gdk backend])],
+			      [backend_set=yes])
+
+if test -z "$backend_set"; then
+  if test "$platform_win32" = yes; then
+    enable_win32_backend=yes
+  else
+    enable_x11_backend=yes
+  fi
 fi
 
-AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/win32/quartz]] select non-default GDK target],
-	gdktarget=$with_gdktarget)
+cairo_backends=
+backend_immodules=
+GDK_BACKENDS=
+GDK_EXTRA_LIBS=
+GDK_EXTRA_CFLAGS=
+GDK_WINDOWING=
+GIO_PACKAGE=gio-2.0
+PANGO_PACKAGES="pango pangocairo"
 
-AC_SUBST(gdktarget)
-case $gdktarget in
-  x11|win32|quartz) ;;
-  *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz or win32.]);;
-esac
+if test "x$enable_x11_backend" == xyes; then
+  # GDK calls the xlib backend "x11," cairo calls it "xlib." Other
+  # backend names are identical.
+  cairo_backends="$cairo_backends cairo-xlib"
+  GDK_BACKENDS="$GDK_BACKENDS x11"
+  # Pull in gio-unix for GDesktopAppInfo usage, see at least
+  # gdkapplaunchcontext-x11.c
+  GIO_PACKAGE=gio-unix-2.0
+  backend_immodules="$backend_immodules,xim"
+  GDK_WINDOWING="$GDK_WINDOWING
+#define GDK_WINDOWING_X11"
+fi
 
-gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
-gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
+if test "x$enable_win32_backend" == xyes; then
+  cairo_backends="$cairo_backends cairo-win32"
+  GDK_BACKENDS="$GDK_BACKENDS win32"
+  backend_immodules="$backend_immodules,ime"
+  GDK_WINDOWING="$GDK_WINDOWING
+#define GDK_NATIVE_WINDOW_POINTER
+#define GDK_WINDOWING_WIN32"
+  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
+  AM_CONDITIONAL(USE_WIN32, true)
+  PANGO_PACKAGES="pangowin32 pangocairo"
+else
+  AM_CONDITIONAL(USE_WIN32, false)
+fi
 
-AC_SUBST(gdktargetlib)
-AC_SUBST(gtktargetlib)
+if test "x$enable_quartz_backend" == xyes; then
+  cairo_backends="$cairo_backends cairo-quartz"
+  GDK_BACKENDS="$GDK_BACKENDS quartz"
+  GDK_WINDOWING="$GDK_WINDOWING
+#define GDK_WINDOWING_QUARTZ"
+  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
+  AM_CONDITIONAL(USE_QUARTZ, true)
+else
+  AM_CONDITIONAL(USE_QUARTZ, false)
+fi
+
+# strip leading space
+GDK_BACKENDS=${GDK_BACKENDS/# }
+
+AC_SUBST(GDK_BACKENDS)
+
+if test -z "$GDK_BACKENDS"; then
+  AC_MSG_ERROR([No GDK backends selected.])
+fi
 
 if test "x$enable_debug" = "xyes"; then
   test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
@@ -364,18 +439,7 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES,
    cairo-gobject >= cairo_required_version dnl
    gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
 
-## In addition to checking that cairo is present, we also need to
-## check that the correct cairo backend is there. E.g. if the GDK
-## target is win32 we need the cairo-win32 backend and so on.
-cairo_backend=$gdktarget
-
-# GDK calls the xlib backend "x11," cairo calls it "xlib." Other
-# backend names are identical.
-if test "x$cairo_backend" = "xx11"; then
-   cairo_backend=xlib
-fi
-PKG_CHECK_MODULES(CAIRO_BACKEND,
-  [cairo-$cairo_backend >= cairo_required_version])
+PKG_CHECK_MODULES(CAIRO_BACKEND, [$cairo_backends])
 
 if test "$os_win32" != yes; then
     # libtool option to control which symbols are exported
@@ -666,53 +730,6 @@ else
     fi
 fi
 
-# `widechar' tests for gdki18n.h
-AC_MSG_CHECKING(for wchar.h)
-AC_TRY_CPP([#include <wchar.h>], gdk_wchar_h=yes, gdk_wchar_h=no)
-if test $gdk_wchar_h = yes; then
-   AC_DEFINE(HAVE_WCHAR_H, 1, [Have wchar.h include file])
-fi
-AC_MSG_RESULT($gdk_wchar_h)
-
-# Check for wctype.h (for iswalnum)
-AC_MSG_CHECKING(for wctype.h)
-AC_TRY_CPP([#include <wctype.h>], gdk_wctype_h=yes, gdk_wctype_h=no)
-if test $gdk_wctype_h = yes; then
-   AC_DEFINE(HAVE_WCTYPE_H, 1, [Have wctype.h include file])
-fi
-AC_MSG_RESULT($gdk_wctype_h)
-
-# in Solaris 2.5, `iswalnum' is in -lw
-GDK_WLIBS=
-AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)])
-
-oLIBS="$LIBS"
-LIBS="$LIBS $GDK_WLIBS"
-# The following is necessary for Linux libc-5.4.38
-AC_MSG_CHECKING(if iswalnum() and friends are properly defined)
-AC_TRY_LINK([#include <stdlib.h>],[
-#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
-#  ifdef HAVE_WCTYPE_H
-#    include <wctype.h>
-#  else
-#    ifdef HAVE_WCHAR_H
-#      include <wchar.h>
-#    endif
-#  endif
-#else
-#  define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
-#endif
-iswalnum((wchar_t) 0);
-], gdk_working_wctype=yes, gdk_working_wctype=no)
-LIBS="$oLIBS"
-
-if test $gdk_working_wctype = no; then
-   AC_DEFINE(HAVE_BROKEN_WCTYPE, 1, [Is the wctype implementation broken])
-   GDK_WLIBS=
-fi
-AC_MSG_RESULT($gdk_working_wctype)
-AC_SUBST(GDK_WLIBS)
-
 # Check for uxtheme.h (for MS-Windows Engine)
 AC_MSG_CHECKING(for uxtheme.h)
 AC_TRY_CPP([#include <uxtheme.h>], gtk_uxtheme_h=yes, gtk_uxtheme_h=no)
@@ -732,6 +749,7 @@ AC_ARG_ENABLE(modules,
                               [disable dynamic module loading])])
 
 dynworks=false
+build_dynamic_modules=no
 deps=
 if test x$enable_modules = xno; then
     AC_MSG_RESULT(no)
@@ -759,10 +777,12 @@ else
     fi
 
     if $dynworks; then
+        build_dynamic_modules=yes
         AC_DEFINE(USE_GMODULE, 1,
                   [Define to 1 if gmodule works and should be used])
         AC_MSG_RESULT(yes)
     else
+        build_dynamic_modules=no
         AC_MSG_RESULT(no)
     fi
 fi
@@ -779,8 +799,8 @@ dnl AC_HELP_STRING cause problems.
 dnl AC_HELP_STRING([--with-included-immodules=MODULE1 MODULE2 ...],
 dnl                [build the specified input method modules into gtk])
 AC_ARG_WITH(included_immodules,
-[  --with-included-immodules=MODULE1,MODULE2,...
-                          build the specified input methods into gtk])
+            AC_HELP_STRING([--with-included-immodules=MODULE1,MODULE2,...],
+                           [build the specified input methods into gtk]))
 
 if $dynworks; then
    :
@@ -791,14 +811,7 @@ else
    fi
 fi
 
-all_immodules="am-et,cedilla,cyrillic-translit"
-if test "$gdktarget" = "win32"; then
-   all_immodules="${all_immodules},ime"
-fi
-all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr"
-if test "$gdktarget" = "x11"; then
-   all_immodules="${all_immodules},xim"
-fi
+all_immodules="am-et,cedilla,cyrillic-translit,inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr$backend_immodules"
 
 included_immodules=""
 # If the switch specified without listing any specific ones, include all
@@ -858,28 +871,6 @@ AC_CHECK_HEADER(sys/sysinfo.h,
                 AC_DEFINE(HAVE_SYS_SYSINFO_H, 1,
                           [Define to 1 if sys/sysinfo.h is available]))
 
-AC_MSG_CHECKING(for mediaLib 2.3)
-use_mlib25=no
-# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib
-# patch requires.
-AC_CHECK_LIB(mlib, mlib_ImageSetStruct, use_mlib=yes, use_mlib=no)
-if test $use_mlib = yes; then
-    AC_DEFINE(USE_MEDIALIB, 1,
-              [Define to 1 if medialib is available and should be used])
-    MEDIA_LIB=-lmlib
-
-    AC_MSG_CHECKING(for mediaLib 2.5)
-    # Check for a mediaLib 2.5 function since that is what is needed for
-    # gdk_rgb_convert integration.
-    AC_CHECK_LIB(mlib, mlib_VideoColorRGBint_to_BGRAint, use_mlib25=yes, use_mlib25=no)
-    if test $use_mlib25 = yes; then
-        AC_DEFINE(USE_MEDIALIB25, 1,
-                  [Define to 1 if medialib 2.5 is available])
-    fi
-fi
-AM_CONDITIONAL(USE_MEDIALIB, test $use_mlib = yes)
-AM_CONDITIONAL(USE_MEDIALIB25, test $use_mlib25 = yes)
-
 dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
 
 AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
@@ -905,14 +896,12 @@ fi
 # Windowing system checks
 ########################################
 
-GDK_EXTRA_LIBS="$GDK_WLIBS"
-GDK_EXTRA_CFLAGS=
-
 # GTK+ uses some X calls, so needs to link against X directly
 GTK_DEP_PACKAGES_FOR_X=
 GTK_DEP_LIBS_FOR_X=
+X_EXTENSIONS=
 
-if test "x$gdktarget" = "xx11"; then
+if test "x$enable_x11_backend" == xyes; then
   X_PACKAGES=fontconfig
 
   #
@@ -1010,10 +999,13 @@ if test "x$gdktarget" = "xx11"; then
   # Check for XKB support.
 
   if test "x$enable_xkb" = "xyes"; then
-        AC_MSG_WARN(XKB support explicitly enabled)
-        AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension])
+        AC_CHECK_FUNC(XkbQueryExtension,
+                      X_EXTENSIONS="$X_EXTENSIONS XKB"
+                      AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension]),
+                      AC_MSG_ERROR([*** XKB extension not found. Check 'config.log' for more details.]))
   elif test "x$enable_xkb" = "xmaybe"; then
         AC_CHECK_FUNC(XkbQueryExtension,
+                      X_EXTENSIONS="$X_EXTENSIONS XKB"
                       AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension]))
   else
         AC_MSG_WARN(XKB support explicitly disabled)
@@ -1035,19 +1027,23 @@ if test "x$gdktarget" = "xx11"; then
 
   CFLAGS="$gtk_save_CFLAGS"
 
-  if test "x$enable_xinerama" = "xyes"; then
+  if test "x$enable_xinerama" != "xno"; then
     # Check for Xinerama extension (Solaris impl or Xfree impl)
+    have_xfree_xinerama=false
+    have_solaris_xinerama=false
+
     gtk_save_cppflags="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $x_cflags"
 
     # Check for XFree
-    AC_MSG_CHECKING(for Xinerama support on XFree86)
+    AC_MSG_CHECKING(for Xinerama packages)
 
-    have_xfree_xinerama=false
     if $PKG_CONFIG --exists xinerama ; then
+       AC_MSG_RESULT(yes)
        have_xfree_xinerama=true
        X_PACKAGES="$X_PACKAGES xinerama"
     else
+       AC_MSG_RESULT(no)
        AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
 	   [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
 	   [GTK_ADD_LIB(x_extra_libs,Xinerama)
@@ -1056,14 +1052,12 @@ if test "x$gdktarget" = "xx11"; then
     fi
 
     if $have_xfree_xinerama ; then
+      X_EXTENSIONS="$X_EXTENSIONS Xinerama"
       AC_DEFINE(HAVE_XFREE_XINERAMA, 1,
                 [Define to 1 if XFree Xinerama is available])
       AC_DEFINE(HAVE_XINERAMA, 1,
                 [Define to 1 is Xinerama is available])
-      AC_MSG_RESULT(yes)
     else
-      AC_MSG_RESULT(no)
-
       case "$host" in
         *-*-solaris*)
             # Check for solaris
@@ -1076,6 +1070,7 @@ if test "x$gdktarget" = "xx11"; then
 		    [#include <X11/Xlib.h>])])
 
             if $have_solaris_xinerama ; then
+              X_EXTENSIONS="$X_EXTENSIONS Xinerama"
               AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1,
                         [Define to 1 if solaris xinerama is available])
 	      AC_DEFINE(HAVE_XINERAMA, 1,
@@ -1090,9 +1085,14 @@ if test "x$gdktarget" = "xx11"; then
       esac
     fi
   fi
+  if test "x$enable_xinerama" = "xyes" ; then
+    if test "x$have_xfree_xinerama" != "xtrue" -a "x$have_solaris_xinerama" != "xtrue" ; then
+      AC_MSG_ERROR([*** Xinerama extension not found. Check 'config.log' for more details.])
+    fi
+  fi
 
   # set up things for XInput
-  if test "x$with_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
+  if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
     have_xinput=yes
 
     AC_DEFINE(XINPUT_XFREE, 1,
@@ -1101,7 +1101,11 @@ if test "x$gdktarget" = "xx11"; then
     X_PACKAGES="$X_PACKAGES xi"
 
     AC_CHECK_HEADER(X11/extensions/XInput2.h,
-                    have_xinput2=yes; AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]))
+                    have_xinput2=yes
+                    X_EXTENSIONS="$X_EXTENSIONS XI2"
+                    AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]),
+                    X_EXTENSIONS="$X_EXTENSIONS XInput")
+
   else
     AC_DEFINE(XINPUT_NONE, 1,
               [Define to 1 if no XInput should be used])
@@ -1110,11 +1114,22 @@ if test "x$gdktarget" = "xx11"; then
   AM_CONDITIONAL(XINPUT_XFREE, test "x$have_xinput" = "xyes")
   AM_CONDITIONAL(XINPUT_2,     test "x$have_xinput2" = "xyes")
 
-  # Check for the RANDR extension
-  if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
-     AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
+  if test "x$enable_xinput" = "xyes" ; then
+    if test "x$have_xinput" != "xyes" -a "x$have_xinput2" != "xyes" ; then
+      AC_MSG_ERROR([*** XInput extension not found. Check 'config.log' for more details.])
+    fi
+  fi
 
-     X_PACKAGES="$X_PACKAGES xrandr"
+  # Check for the RANDR extension
+  if test x"$enable_xrandr" != xno; then
+    if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
+      AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
+
+      X_PACKAGES="$X_PACKAGES xrandr"
+      X_EXTENSIONS="$X_EXTENSIONS XRANDR"
+    elif test x"$enable_xrandr" = xyes; then
+      AC_MSG_ERROR([RANDR support requested but xrandr not found])
+    fi
   fi
 
   # Checks for Xcursor library
@@ -1127,29 +1142,44 @@ if test "x$gdktarget" = "xx11"; then
 
   # Checks for XFixes extension
 
-  if $PKG_CONFIG --exists xfixes ; then
-    AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
+  if test x"$enable_xfixes" != xno; then
+    if $PKG_CONFIG --exists xfixes ; then
+      AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
 
-    X_PACKAGES="$X_PACKAGES xfixes"
-    GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes"
+      X_PACKAGES="$X_PACKAGES xfixes"
+      X_EXTENSIONS="$X_EXTENSIONS XFIXES"
+      GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes"
+    elif test x"$enable_xfixes" = xyes; then
+      AC_MSG_ERROR([XFixes support requested but xfixes not found])
+    fi
   fi
 
   # Checks for Xcomposite extension
 
-  if $PKG_CONFIG --exists xcomposite ; then
-    AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
+  if test x"$enable_xcomposite" != xno; then
+    if $PKG_CONFIG --exists xcomposite ; then
+      AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
 
-    X_PACKAGES="$X_PACKAGES xcomposite"
-    GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite"
+      X_PACKAGES="$X_PACKAGES xcomposite"
+      X_EXTENSIONS="$X_EXTENSIONS Composite"
+      GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite"
+    elif test x"$enable_xcomposite" = xyes; then
+      AC_MSG_ERROR([Xcomposite support requested but xcomposite not found])
+    fi
   fi
 
   # Checks for Xdamage extension
 
-  if $PKG_CONFIG --exists xdamage ; then
-    AC_DEFINE(HAVE_XDAMAGE, 1, [Have the XDAMAGE X extension])
+  if test x"$enable_xdamage" != xno; then
+    if $PKG_CONFIG --exists xdamage ; then
+      AC_DEFINE(HAVE_XDAMAGE, 1, [Have the XDAMAGE X extension])
 
-    X_PACKAGES="$X_PACKAGES xdamage"
-    GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage"
+      X_PACKAGES="$X_PACKAGES xdamage"
+      X_EXTENSIONS="$X_EXTENSIONS DAMAGE"
+      GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage"
+    elif test x"$enable_xdamage" = xyes; then
+      AC_MSG_ERROR([Xdamage support requested but xdamage not found])
+    fi
   fi
 
   if $have_base_x_pc ; then
@@ -1162,6 +1192,10 @@ if test "x$gdktarget" = "xx11"; then
   LIBS="$gtk_save_libs"
 
   AM_CONDITIONAL(USE_X11, true)
+
+  # strip leading space
+  X_EXTENSIONS=${X_EXTENSIONS/# }
+
 else
   XPACKAGES=
 
@@ -1171,28 +1205,8 @@ else
   AM_CONDITIONAL(HAVE_X11R6, false)
 fi
 
-if test "x$gdktarget" = "xwin32"; then
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
-  AM_CONDITIONAL(USE_WIN32, true)
-else
-  AM_CONDITIONAL(USE_WIN32, false)
-fi
-
-if test "x$gdktarget" = "xquartz"; then
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
-  AM_CONDITIONAL(USE_QUARTZ, true)
-else
-  AM_CONDITIONAL(USE_QUARTZ, false)
-fi
-
 # Check for Pango flags
 
-if test "x$gdktarget" = "xwin32"; then
-	PANGO_PACKAGES="pangowin32 pangocairo"
-else
-	PANGO_PACKAGES="pango pangocairo"
-fi
-
 AC_MSG_CHECKING(Pango flags)
 if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
         PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES`
@@ -1222,12 +1236,7 @@ fi
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
-# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
-if test "x$gdktarget" = "xx11"; then
-  GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend cairo-gobject"
-else
-  GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend cairo-gobject"
-fi
+GDK_PACKAGES="$PANGO_PACKAGES $GIO_PACKAGE $X_PACKAGES gdk-pixbuf-2.0 $cairo_backends cairo-gobject"
 
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
 GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
@@ -1236,7 +1245,7 @@ GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFL
 # into the pkg-config files
 #
 if test $enable_explicit_deps != yes ; then
-  GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
+  GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 cairo-gobject"
   GDK_EXTRA_LIBS=
 fi
 
@@ -1277,7 +1286,7 @@ else
 fi
 
 GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
-if test "x$gdktarget" = "xx11"; then
+if test "x$enable_x11_backend" == xyes; then
   GTK_PACKAGES="$GTK_PACKAGES pangoft2"
 fi
 GTK_EXTRA_LIBS=
@@ -1346,8 +1355,10 @@ LIBS="$old_LIBS"
 # Printing system checks
 ################################################################
 
+PRINT_BACKENDS="file lpr"
+
 AC_ARG_ENABLE(cups,
-              [AC_HELP_STRING([--disable-cups]
+              [AC_HELP_STRING([--disable-cups],
                               [disable cups print backend])],,
               [enable_cups=auto])
 
@@ -1384,6 +1395,7 @@ else
 
     AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]]))
 
+    PRINT_BACKENDS="$PRINT_BACKENDS cups"
     AM_CONDITIONAL(HAVE_CUPS, true)
 
     gtk_save_cflags="$CFLAGS"
@@ -1407,7 +1419,7 @@ fi
 #
 
 AC_ARG_ENABLE(papi,
-              [AC_HELP_STRING([--disable-papi]
+              [AC_HELP_STRING([--disable-papi],
                               [disable papi print backend])],,
              [enable_papi=auto])
 
@@ -1417,6 +1429,7 @@ else
   AC_MSG_CHECKING(libpapi)
   AC_CHECK_LIB(papi, papiServiceCreate, have_papi=yes, have_papi=no)
   if test $have_papi = yes; then
+    PRINT_BACKENDS="$PRINT_BACKENDS papi"
     AC_DEFINE([HAVE_PAPI], [], [Define to 1 if libpapi available])
   fi
   AM_CONDITIONAL(HAVE_PAPI, test $have_papi = yes)
@@ -1442,7 +1455,7 @@ if test "$os_win32" != "yes"; then
 *** postscript backend enabled.]))
 
   AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([
-*** Can't find cairo-svg.h. You must build Cairo with the
+*** Cannot find cairo-svg.h. You must build Cairo with the
 *** svg backend enabled.]))
 fi
 
@@ -1453,6 +1466,9 @@ AC_ARG_ENABLE(test-print-backend,
               [AC_HELP_STRING([--enable-test-print-backend],
                               [build test print backend])],,
               [enable_test_print_backend=no])
+if test "x$enable_test_print_backend" != "xno" ; then
+  PRINT_BACKENDS="$PRINT_BACKENDS test"
+fi
 AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno")
 
 
@@ -1488,6 +1504,24 @@ GLIB_GSETTINGS
 
 GOBJECT_INTROSPECTION_CHECK([0.9.3])
 
+##################################################
+# Packagekit module
+#################################################
+
+AC_ARG_ENABLE(packagekit,
+              AC_HELP_STRING([--disable-packagekit],
+                             [build packagekit open-with module]))
+
+build_packagekit=no
+if test "os_win32" != "yes"; then
+        if test "x$enable_packagekit" != "xno"; then
+                build_packagekit=yes
+                AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable packagekit])
+        fi
+fi
+
+AM_CONDITIONAL(ENABLE_PACKAGEKIT, test "x$build_packagekit" = "xyes")
+
 ##################################################
 # Checks for gtk-doc and docbook-tools
 ##################################################
@@ -1533,36 +1567,28 @@ AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [
  * This is a generated file.  Please modify `configure.ac'
  */
 
-#ifndef GDKCONFIG_H
-#define GDKCONFIG_H
+#ifndef __GDKCONFIG_H__
+#define __GDKCONFIG_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
 
-#ifndef GSEAL
-/* introduce GSEAL() here for all of Gdk and Gtk+ without the need to modify GLib */
-#  ifdef GSEAL_ENABLE
-#    define GSEAL(ident)      _g_sealed__ ## ident
-#  else
-#    define GSEAL(ident)      ident
-#  endif
-#endif /* !GSEAL */
+#include <glib.h>
+
+G_BEGIN_DECLS
 
 _______EOF
 
 	cat >>$outfile <<_______EOF
 $gdk_windowing
-$gdk_wc
 _______EOF
 
 	cat >>$outfile <<_______EOF
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* GDKCONFIG_H */
+#endif  /* __GDKCONFIG_H__ */
 _______EOF
 
 
@@ -1573,31 +1599,7 @@ _______EOF
 	  mv $outfile gdk/gdkconfig.h
 	fi
 ],[
-if test "x$gdktarget" = "xx11" ; then
-  gdk_windowing='
-#define GDK_WINDOWING_X11'
-elif test "x$gdktarget" = "xwin32" ; then
-  gdk_windowing='
-#define GDK_NATIVE_WINDOW_POINTER
-
-#define GDK_WINDOWING_WIN32'
-elif test "x$gdktarget" = "xquartz" ; then
-  gdk_windowing='
-#define GDK_WINDOWING_QUARTZ'
-fi
-
-if test x$gdk_wchar_h = xyes; then
-  gdk_wc='
-#define GDK_HAVE_WCHAR_H 1'
-fi
-if test x$gdk_wctype_h = xyes; then
-  gdk_wc="\$gdk_wc
-#define GDK_HAVE_WCTYPE_H 1"
-fi
-if test x$gdk_working_wctype = xno; then
-  gdk_wc="\$gdk_wc
-#define GDK_HAVE_BROKEN_WCTYPE 1"
-fi
+gdk_windowing='$GDK_WINDOWING'
 ])
 
 dnl
@@ -1617,7 +1619,7 @@ AC_ARG_ENABLE(Bsymbolic,
                            enable_Bsymbolic=no)
                LDFLAGS="${SAVED_LDFLAGS}"])
 
-if test "x${enable_Bsymbolic}" == "xyes"; then
+if test "x${enable_Bsymbolic}" = "xyes" ; then
   GTK_LINK_FLAGS=-Wl,-Bsymbolic-functions
 fi
 AC_SUBST(GTK_LINK_FLAGS)
@@ -1630,7 +1632,6 @@ gdk-3.0.pc
 gtk+-3.0.pc
 gtk+-unix-print-3.0.pc
 gail-3.0.pc
-gdk-3.0-uninstalled.pc
 gtk+-3.0-uninstalled.pc
 gail-3.0-uninstalled.pc
 m4macros/Makefile
@@ -1648,6 +1649,7 @@ docs/reference/gdk/version.xml
 docs/reference/gtk/Makefile
 docs/reference/gtk/version.xml
 docs/reference/libgail-util/Makefile
+docs/reference/libgail-util/version.xml
 docs/tools/Makefile
 build/Makefile
 build/win32/Makefile
@@ -1687,5 +1689,19 @@ perf/Makefile
 
 AC_OUTPUT
 
-echo "configuration:
-        target:             $gdktarget"
+# beautify the immodule list a bit
+included_immodules=${included_immodules//,/ }
+included_immodules=${included_immodules:-none}
+
+echo "configuration:"
+echo "        GDK backends:         $GDK_BACKENDS"
+if test "x$enable_x11_backend" = "xyes"; then
+echo "        X11 extensions:       $X_EXTENSIONS"
+fi
+echo "        Print backends:       $PRINT_BACKENDS"
+echo "        Dynamic modules:      $build_dynamic_modules"
+echo "        Included immodules:   $included_immodules"
+echo "        PackageKit support:   $build_packagekit"
+echo "        Introspection:        $found_introspection"
+echo "        Debugging:            $enable_debug"
+echo "        Documentation:        $enable_gtk_doc"

demos/Makefile.am

@@ -11,14 +11,13 @@ INCLUDES = 				\
 	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)
 
-DEPS = 									\
-	$(top_builddir)/gdk/$(gdktargetlib) 				\
-	$(top_builddir)/gtk/$(gtktargetlib)
+DEPS = \
+	$(top_builddir)/gtk/libgtk-3.0.la
 
-LDADDS = 								\
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)							\
+LDADDS = \
+	$(top_builddir)/gtk/libgtk-3.0.la	\
+	$(top_builddir)/gdk/libgdk-3.0.la	\
+	$(GTK_DEP_LIBS)				\
 	$(MATH_LIB)
 
 noinst_PROGRAMS = 		\

demos/gtk-demo/Makefile.am

@@ -55,13 +55,12 @@ INCLUDES = \
 	$(GTK_DEP_CFLAGS)
 
 DEPS = \
-	$(top_builddir)/gdk/$(gdktargetlib) 				\
-	$(top_builddir)/gtk/$(gtktargetlib)
+	$(top_builddir)/gtk/libgtk-3.0.la
 
 LDADDS = \
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)							\
+	$(top_builddir)/gtk/libgtk-3.0.la	\
+	$(top_builddir)/gdk/libgdk-3.0.la	\
+	$(GTK_DEP_LIBS)				\
 	-lm
 
 bin_PROGRAMS = gtk3-demo

demos/gtk-demo/assistant.c

@@ -110,7 +110,7 @@ create_page1 (GtkWidget *assistant)
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 1");
   gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), box, GTK_ASSISTANT_PAGE_INTRO);
 
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
   gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
   g_object_unref (pixbuf);
 }
@@ -133,7 +133,7 @@ create_page2 (GtkWidget *assistant)
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 2");
 
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
   gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
   g_object_unref (pixbuf);
 }
@@ -152,7 +152,7 @@ create_page3 (GtkWidget *assistant)
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), label, TRUE);
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), label, "Confirmation");
 
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
   gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), label, pixbuf);
   g_object_unref (pixbuf);
 }

demos/gtk-demo/changedisplay.c

@@ -27,6 +27,9 @@
  *  - Using GtkDialog
  */
 #include <string.h>
+
+#undef GDK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include "demo-common.h"
 
@@ -151,7 +154,7 @@ query_for_toplevel (GdkScreen  *screen,
 	toplevel = NULL;
     }
 
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
   gtk_widget_destroy (popup);
   gdk_flush ();			/* Really release the grab */
 

demos/gtk-demo/clipboard.c

@@ -77,8 +77,8 @@ get_image_pixbuf (GtkImage *image)
       return g_object_ref (gtk_image_get_pixbuf (image));
     case GTK_IMAGE_STOCK:
       gtk_image_get_stock (image, &stock_id, &size);
-      return gtk_widget_render_icon (GTK_WIDGET (image),
-                                     stock_id, size, NULL);
+      return gtk_widget_render_icon_pixbuf (GTK_WIDGET (image),
+                                            stock_id, size);
     default:
       g_warning ("Image storage type %d not handled",
                  gtk_image_get_storage_type (image));
@@ -125,7 +125,7 @@ drag_data_received (GtkWidget        *widget,
 {
   GdkPixbuf *pixbuf;
 
-  if (selection_data->length > 0)
+  if (gtk_selection_data_get_length (selection_data) > 0)
     {
       pixbuf = gtk_selection_data_get_pixbuf (selection_data);
       gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);

demos/gtk-demo/colorsel.c

@@ -9,35 +9,37 @@
 
 static GtkWidget *window = NULL;
 static GtkWidget *da;
-static GdkColor color;
+static GdkRGBA color;
 static GtkWidget *frame;
 
-/* Expose callback for the drawing area
+/* draw callback for the drawing area
  */
 static gboolean
-draw_callback (GtkWidget *widget, 
+draw_callback (GtkWidget *widget,
                cairo_t   *cr,
                gpointer   data)
 {
-  GtkStyle *style;
+  GtkStyleContext *context;
+  GdkRGBA *bg;
 
-  style = gtk_widget_get_style (widget);
-
-  gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_get (context, 0, "background-color", &bg, NULL);
+  gdk_cairo_set_source_rgba (cr, bg);
   cairo_paint (cr);
+  gdk_rgba_free (bg);
 
   return TRUE;
 }
 
 static void
 change_color_callback (GtkWidget *button,
-		       gpointer	  data)
+                       gpointer   data)
 {
   GtkWidget *dialog;
   GtkColorSelection *colorsel;
   GtkColorSelectionDialog *selection_dialog;
   gint response;
-  
+
   dialog = gtk_color_selection_dialog_new ("Changing color");
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
@@ -45,20 +47,19 @@ change_color_callback (GtkWidget *button,
   selection_dialog = GTK_COLOR_SELECTION_DIALOG (dialog);
   colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));
 
-  gtk_color_selection_set_previous_color (colorsel, &color);
-  gtk_color_selection_set_current_color (colorsel, &color);
+  gtk_color_selection_set_previous_rgba (colorsel, &color);
+  gtk_color_selection_set_current_rgba (colorsel, &color);
   gtk_color_selection_set_has_palette (colorsel, TRUE);
-  
+
   response = gtk_dialog_run (GTK_DIALOG (dialog));
 
   if (response == GTK_RESPONSE_OK)
     {
-      gtk_color_selection_get_current_color (colorsel,
-					     &color);
-      
-      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &color);
+      gtk_color_selection_get_current_rgba (colorsel, &color);
+
+      gtk_widget_override_background_color (da, 0, &color);
     }
-  
+
   gtk_widget_destroy (dialog);
 }
 
@@ -68,20 +69,21 @@ do_colorsel (GtkWidget *do_widget)
   GtkWidget *vbox;
   GtkWidget *button;
   GtkWidget *alignment;
-  
+
   if (!window)
     {
       color.red = 0;
-      color.blue = 65535;
+      color.blue = 1;
       color.green = 0;
-      
+      color.alpha = 1;
+
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Color Selection");
 
       g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
@@ -92,33 +94,32 @@ do_colorsel (GtkWidget *do_widget)
       /*
        * Create the color swatch area
        */
-      
-      
+
+
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
 
       da = gtk_drawing_area_new ();
 
-      g_signal_connect (da, "draw",
-			G_CALLBACK (draw_callback), NULL);
+      g_signal_connect (da, "draw", G_CALLBACK (draw_callback), NULL);
 
       /* set a minimum size */
       gtk_widget_set_size_request (da, 200, 200);
       /* set the color */
-      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &color);
-      
+      gtk_widget_override_background_color (da, 0, &color);
+
       gtk_container_add (GTK_CONTAINER (frame), da);
 
       alignment = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
-      
+
       button = gtk_button_new_with_mnemonic ("_Change the above color");
       gtk_container_add (GTK_CONTAINER (alignment), button);
-      
+
       gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
-      
+
       g_signal_connect (button, "clicked",
-			G_CALLBACK (change_color_callback), NULL);
+                        G_CALLBACK (change_color_callback), NULL);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/combobox.c

@@ -65,8 +65,8 @@ create_stock_icon_store (void)
     {
       if (stock_id[i])
 	{
-	  pixbuf = gtk_widget_render_icon (cellview, stock_id[i],
-					   GTK_ICON_SIZE_BUTTON, NULL);
+	  pixbuf = gtk_widget_render_icon_pixbuf (cellview, stock_id[i],
+					          GTK_ICON_SIZE_BUTTON);
 	  gtk_stock_lookup (stock_id[i], &item);
 	  label = strip_underscore (item.label);
 	  gtk_list_store_append (store, &iter);
@@ -281,18 +281,18 @@ G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
 static void
 mask_entry_set_background (MaskEntry *entry)
 {
-  static const GdkColor error_color = { 0, 65535, 60000, 60000 };
+  static const GdkRGBA error_color = { 1.0, 0.9, 0.9, 1.0 };
 
   if (entry->mask)
     {
       if (!g_regex_match_simple (entry->mask, gtk_entry_get_text (GTK_ENTRY (entry)), 0, 0))
 	{
-	  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, &error_color);
+	  gtk_widget_override_color (GTK_WIDGET (entry), 0, &error_color);
 	  return;
 	}
     }
 
-  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL);
+  gtk_widget_override_color (GTK_WIDGET (entry), 0, NULL);
 }
 
 

demos/gtk-demo/main.c

@@ -751,7 +751,7 @@ create_text (GtkTextBuffer **buffer,
   if (is_source)
     {
       font_desc = pango_font_description_from_string ("monospace");
-      gtk_widget_modify_font (text_view, font_desc);
+      gtk_widget_override_font (text_view, font_desc);
       pango_font_description_free (font_desc);
 
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view),

demos/gtk-demo/offscreen_window.c

@@ -230,7 +230,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
 {
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
   GtkAllocation allocation;
-  GtkStyle *style;
+  GtkStyleContext *context;
   GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
@@ -290,10 +290,9 @@ gtk_rotated_bin_realize (GtkWidget *widget)
   g_signal_connect (bin->offscreen_window, "from-embedder",
                     G_CALLBACK (offscreen_window_from_parent), bin);
 
-  gtk_widget_style_attach (widget);
-  style = gtk_widget_get_style (widget);
-  gtk_style_set_background (style, window, GTK_STATE_NORMAL);
-  gtk_style_set_background (style, bin->offscreen_window, GTK_STATE_NORMAL);
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_set_background (context, window);
+  gtk_style_context_set_background (context, bin->offscreen_window);
   gdk_window_show (bin->offscreen_window);
 }
 
@@ -542,12 +541,11 @@ gtk_rotated_bin_draw (GtkWidget *widget,
     }
   if (gtk_cairo_should_draw_window (cr, bin->offscreen_window))
     {
-      gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
-                          GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-                          widget, "blah",
-                          0, 0,
-                          gdk_window_get_width (bin->offscreen_window),
-                          gdk_window_get_height (bin->offscreen_window));
+      gtk_render_background (gtk_widget_get_style_context (widget),
+                             cr,
+                             0, 0,
+                             gdk_window_get_width (bin->offscreen_window),
+                             gdk_window_get_height (bin->offscreen_window));
 
       if (bin->child)
         gtk_container_propagate_draw (GTK_CONTAINER (widget),
@@ -575,7 +573,7 @@ do_offscreen_window (GtkWidget *do_widget)
   if (!window)
     {
       GtkWidget *bin, *vbox, *scale, *button;
-      GdkColor black;
+      GdkRGBA black;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
@@ -585,8 +583,8 @@ do_offscreen_window (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      gdk_color_parse ("black", &black);
-      gtk_widget_modify_bg (window, GTK_STATE_NORMAL, &black);
+      gdk_rgba_parse (&black, "black");
+      gtk_widget_override_background_color (window, 0, &black);
       gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

demos/gtk-demo/offscreen_window2.c

@@ -168,7 +168,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   GtkAllocation allocation;
-  GtkStyle *style;
+  GtkStyleContext *context;
   GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
@@ -228,10 +228,9 @@ gtk_mirror_bin_realize (GtkWidget *widget)
   g_signal_connect (bin->offscreen_window, "from-embedder",
                     G_CALLBACK (offscreen_window_from_parent), bin);
 
-  gtk_widget_style_attach (widget);
-  style = gtk_widget_get_style (widget);
-  gtk_style_set_background (style, window, GTK_STATE_NORMAL);
-  gtk_style_set_background (style, bin->offscreen_window, GTK_STATE_NORMAL);
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_set_background (context, window);
+  gtk_style_context_set_background (context, bin->offscreen_window);
   gdk_window_show (bin->offscreen_window);
 }
 
@@ -451,12 +450,11 @@ gtk_mirror_bin_draw (GtkWidget *widget,
     }
   else if (gtk_cairo_should_draw_window (cr, bin->offscreen_window))
     {
-      gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
-                          GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-                          widget, "blah",
-                          0, 0,
-                          gdk_window_get_width (bin->offscreen_window),
-                          gdk_window_get_height (bin->offscreen_window));
+      gtk_render_background (gtk_widget_get_style_context (widget),
+                             cr,
+                             0, 0,
+                             gdk_window_get_width (bin->offscreen_window),
+                             gdk_window_get_height (bin->offscreen_window));
 
       if (bin->child)
         gtk_container_propagate_draw (GTK_CONTAINER (widget),

demos/gtk-demo/rotated_text.c

@@ -18,17 +18,17 @@ const char text[] = "I ♥ GTK+";
 
 static void
 fancy_shape_renderer (cairo_t        *cr,
-		      PangoAttrShape *attr,
-		      gboolean        do_path,
-		      gpointer        data)
+                      PangoAttrShape *attr,
+                      gboolean        do_path,
+                      gpointer        data)
 {
   double x, y;
   cairo_get_current_point (cr, &x, &y);
   cairo_translate (cr, x, y);
 
   cairo_scale (cr,
-	       (double) attr->ink_rect.width  / PANGO_SCALE,
-	       (double) attr->ink_rect.height / PANGO_SCALE);
+               (double) attr->ink_rect.width  / PANGO_SCALE,
+               (double) attr->ink_rect.height / PANGO_SCALE);
 
   switch (GPOINTER_TO_UINT (attr->data))
     {
@@ -36,9 +36,9 @@ fancy_shape_renderer (cairo_t        *cr,
       {
         cairo_move_to (cr, .5, .0);
         cairo_line_to (cr, .9, -.4);
-	cairo_curve_to (cr, 1.1, -.8, .5, -.9, .5, -.5);
-	cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
-	cairo_close_path (cr);
+        cairo_curve_to (cr, 1.1, -.8, .5, -.9, .5, -.5);
+        cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
+        cairo_close_path (cr);
       }
       break;
     }
@@ -60,8 +60,8 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)
 
   /* Get font metrics and prepare fancy shape size */
   metrics = pango_context_get_metrics (pango_layout_get_context (layout),
-				       pango_layout_get_font_description (layout),
-				       NULL);
+                                       pango_layout_get_font_description (layout),
+                                       NULL);
   ascent = pango_font_metrics_get_ascent (metrics);
   logical_rect.x = 0;
   logical_rect.width = ascent;
@@ -77,9 +77,9 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)
       PangoAttribute *attr;
       
       attr = pango_attr_shape_new_with_data (&ink_rect,
-					     &logical_rect,
-					     GUINT_TO_POINTER (g_utf8_get_char (p)),
-					     NULL, NULL);
+                                             &logical_rect,
+                                             GUINT_TO_POINTER (g_utf8_get_char (p)),
+                                             NULL, NULL);
 
       attr->start_index = p - text;
       attr->end_index = attr->start_index + strlen (HEART);
@@ -93,7 +93,7 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)
 static gboolean
 rotated_text_draw (GtkWidget *widget,
                    cairo_t   *cr,
-		   gpointer   data)
+                   gpointer   data)
 {
 #define RADIUS 150
 #define N_WORDS 5
@@ -119,8 +119,8 @@ rotated_text_draw (GtkWidget *widget,
   height = gtk_widget_get_allocated_height (widget);
   device_radius = MIN (width, height) / 2.;
   cairo_translate (cr,
-		   device_radius + (width - 2 * device_radius) / 2,
-		   device_radius + (height - 2 * device_radius) / 2);
+                   device_radius + (width - 2 * device_radius) / 2,
+                   device_radius + (height - 2 * device_radius) / 2);
   cairo_scale (cr, device_radius / RADIUS, device_radius / RADIUS);
 
   /* Create and a subtle gradient source and use it. */
@@ -132,8 +132,8 @@ rotated_text_draw (GtkWidget *widget,
   /* Create a PangoContext and set up our shape renderer */
   context = gtk_widget_create_pango_context (widget);
   pango_cairo_context_set_shape_renderer (context,
-					  fancy_shape_renderer,
-					  NULL, NULL);
+                                          fancy_shape_renderer,
+                                          NULL, NULL);
 
   /* Create a PangoLayout, set the text, font, and attributes */
   layout = pango_layout_new (context);
@@ -181,11 +181,11 @@ do_rotated_text (GtkWidget *do_widget)
       PangoLayout *layout;
       PangoAttrList *attrs;
 
-      const GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
-      
+      const GdkRGBA white = { 1.0, 1.0, 1.0, 1.0 };
+
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Rotated Text");
       gtk_window_set_default_size (GTK_WINDOW (window), 4 * RADIUS, 2 * RADIUS);
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
@@ -200,10 +200,10 @@ do_rotated_text (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (box), drawing_area);
 
       /* This overrides the background color from the theme */
-      gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, &white);
+      gtk_widget_override_background_color (drawing_area, 0, &white);
 
       g_signal_connect (drawing_area, "draw",
-			G_CALLBACK (rotated_text_draw), NULL);
+                        G_CALLBACK (rotated_text_draw), NULL);
 
       /* And a label */
 
@@ -215,8 +215,8 @@ do_rotated_text (GtkWidget *do_widget)
       /* Set up fancy stuff on the label */
       layout = gtk_label_get_layout (GTK_LABEL (label));
       pango_cairo_context_set_shape_renderer (pango_layout_get_context (layout),
-					      fancy_shape_renderer,
-					      NULL, NULL);
+                                              fancy_shape_renderer,
+                                              NULL, NULL);
       attrs = create_fancy_attr_list_for_layout (layout);
       gtk_label_set_attributes (GTK_LABEL (label), attrs);
       pango_attr_list_unref (attrs);

demos/gtk-demo/stock_browser.c

@@ -166,9 +166,9 @@ create_model (void)
             }
           g_free (sizes);
           
-          info.small_icon = gtk_widget_render_icon (window, info.id,
-                                                    size,
-                                                    NULL);
+          info.small_icon = gtk_widget_render_icon_pixbuf (window, 
+                                                           info.id,
+                                                           size);
           
           if (size != GTK_ICON_SIZE_MENU)
             {

demos/gtk-demo/textview.c

@@ -561,7 +561,7 @@ recursive_attach_view (int                 depth,
 {
   GtkWidget *child_view;
   GtkWidget *event_box;
-  GdkColor color;
+  GdkRGBA color;
   GtkWidget *align;
 
   if (depth > 4)
@@ -571,8 +571,8 @@ recursive_attach_view (int                 depth,
 
   /* Event box is to add a black border around each child view */
   event_box = gtk_event_box_new ();
-  gdk_color_parse ("black", &color);
-  gtk_widget_modify_bg (event_box, GTK_STATE_NORMAL, &color);
+  gdk_rgba_parse (&color, "black");
+  gtk_widget_override_background_color (event_box, 0, &color);
 
   align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
   gtk_container_set_border_width (GTK_CONTAINER (align), 1);

demos/gtk-demo/toolpalette.c

@@ -41,7 +41,7 @@ canvas_item_new (GtkWidget     *widget,
   GdkPixbuf *pixbuf;
 
   stock_id = gtk_tool_button_get_stock_id (button);
-  pixbuf = gtk_widget_render_icon (widget, stock_id, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (widget, stock_id, GTK_ICON_SIZE_DIALOG);
 
   if (pixbuf)
     {

demos/testpixbuf-scale.c

@@ -24,9 +24,9 @@ set_interp_type (GtkWidget *widget, gpointer data)
 void
 overall_changed_cb (GtkAdjustment *adjustment, gpointer data)
 {
-  if (adjustment->value != overall_alpha)
+  if (gtk_adjustment_get_value (adjustment) != overall_alpha)
     {
-      overall_alpha = adjustment->value;
+      overall_alpha = gtk_adjustment_get_value (adjustment);
       gtk_widget_queue_draw (darea);
     }
 }

docs/reference/gdk/Makefile.am

@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.6
 
@@ -13,40 +12,39 @@ DOC_MAIN_SGML_FILE=gdk-docs.sgml
 SCAN_OPTIONS=--deprecated-guards="GDK_ENABLE_BROKEN|GDK_DISABLE_DEPRECATED"
 
 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../gdk
+DOC_SOURCE_DIR=../../../gdk ../../../gdk/x11
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gdk/*.h $(top_srcdir)/gdk/x11/gdkx.h
 CFILE_GLOB=$(top_srcdir)/gdk/*.c
 
 # Header files to ignore when scanning
-IGNORE_HFILES=			\
+IGNORE_HFILES= 			\
 	gdkintl.h		\
 	gdkmarshalers.h		\
 	gdkkeysyms.h		\
 	gdkinternals.h		\
 	gdkprivate.h		\
-	gdkpoly-generic.h	\
+	gdk*private.h		\
 	keyname-table.h		\
-	win32 			\
+	win32			\
 	x11			\
 	quartz
 
 # Extra files to add when scanning (relative to $srcdir)
 EXTRA_HFILES=			\
-	../../../gdk/x11/gdkx.h 
+	../../../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 	\
+INCLUDES = 			\
+	-I$(top_srcdir)		\
+	-I$(top_builddir)	\
+	-I$(top_builddir)/gdk	\
 	$(GTK_DEBUG_FLAGS)	\
 	$(GDK_DEP_CFLAGS)
 
-GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib)
-
+GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.0.la $(GDK_DEP_LIBS)
 
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk
@@ -57,86 +55,85 @@ content_files = 		\
 	multihead.sgml
 
 # Images to copy into HTML directory
-HTML_IMAGES =				\
+HTML_IMAGES = 				\
 	images/rotated-text.png		\
-					\
-	images/X_cursor.png 		\
-	images/arrow.png 		\
-	images/based_arrow_down.png 	\
-	images/based_arrow_up.png 	\
-	images/boat.png 		\
-	images/bogosity.png 		\
-	images/bottom_left_corner.png 	\
-	images/bottom_right_corner.png 	\
-	images/bottom_side.png 		\
-	images/bottom_tee.png 		\
-	images/box_spiral.png 		\
-	images/center_ptr.png 		\
-	images/circle.png 		\
-	images/clock.png 		\
-	images/coffee_mug.png 		\
-	images/cross.png 		\
-	images/cross_reverse.png 	\
-	images/crosshair.png 		\
-	images/diamond_cross.png 	\
-	images/dot.png 			\
-	images/dotbox.png 		\
-	images/double_arrow.png 	\
-	images/draft_large.png 		\
-	images/draft_small.png 		\
-	images/draped_box.png 		\
-	images/exchange.png 		\
-	images/fleur.png 		\
-	images/gobbler.png 		\
-	images/gumby.png 		\
-	images/hand1.png 		\
-	images/hand2.png 		\
-	images/heart.png 		\
-	images/icon.png 		\
-	images/iron_cross.png 		\
-	images/left_ptr.png 		\
-	images/left_side.png 		\
-	images/left_tee.png 		\
-	images/leftbutton.png 		\
-	images/ll_angle.png 		\
-	images/lr_angle.png 		\
-	images/man.png 			\
-	images/middlebutton.png 	\
-	images/mouse.png 		\
-	images/pencil.png 		\
-	images/pirate.png 		\
-	images/plus.png 		\
-	images/question_arrow.png 	\
-	images/right_ptr.png 		\
-	images/right_side.png 		\
-	images/right_tee.png 		\
-	images/rightbutton.png 		\
-	images/rtl_logo.png 		\
-	images/sailboat.png 		\
-	images/sb_down_arrow.png 	\
-	images/sb_h_double_arrow.png 	\
-	images/sb_left_arrow.png 	\
-	images/sb_right_arrow.png 	\
-	images/sb_up_arrow.png 		\
-	images/sb_v_double_arrow.png 	\
-	images/shuttle.png 		\
-	images/sizing.png 		\
-	images/spider.png 		\
-	images/spraycan.png 		\
-	images/star.png 		\
-	images/target.png 		\
-	images/tcross.png 		\
-	images/top_left_arrow.png 	\
-	images/top_left_corner.png 	\
-	images/top_right_corner.png 	\
-	images/top_side.png 		\
-	images/top_tee.png 		\
-	images/trek.png 		\
-	images/ul_angle.png 		\
-	images/umbrella.png 		\
-	images/ur_angle.png 		\
-	images/watch.png 		\
-	images/xterm.png 
+	images/X_cursor.png		\
+	images/arrow.png		\
+	images/based_arrow_down.png	\
+	images/based_arrow_up.png	\
+	images/boat.png			\
+	images/bogosity.png		\
+	images/bottom_left_corner.png	\
+	images/bottom_right_corner.png	\
+	images/bottom_side.png		\
+	images/bottom_tee.png		\
+	images/box_spiral.png		\
+	images/center_ptr.png		\
+	images/circle.png		\
+	images/clock.png		\
+	images/coffee_mug.png		\
+	images/cross.png		\
+	images/cross_reverse.png	\
+	images/crosshair.png		\
+	images/diamond_cross.png	\
+	images/dot.png			\
+	images/dotbox.png		\
+	images/double_arrow.png		\
+	images/draft_large.png		\
+	images/draft_small.png		\
+	images/draped_box.png		\
+	images/exchange.png		\
+	images/fleur.png		\
+	images/gobbler.png		\
+	images/gumby.png		\
+	images/hand1.png		\
+	images/hand2.png		\
+	images/heart.png		\
+	images/icon.png			\
+	images/iron_cross.png		\
+	images/left_ptr.png		\
+	images/left_side.png		\
+	images/left_tee.png		\
+	images/leftbutton.png		\
+	images/ll_angle.png		\
+	images/lr_angle.png		\
+	images/man.png			\
+	images/middlebutton.png		\
+	images/mouse.png		\
+	images/pencil.png		\
+	images/pirate.png		\
+	images/plus.png			\
+	images/question_arrow.png	\
+	images/right_ptr.png		\
+	images/right_side.png		\
+	images/right_tee.png		\
+	images/rightbutton.png		\
+	images/rtl_logo.png		\
+	images/sailboat.png		\
+	images/sb_down_arrow.png	\
+	images/sb_h_double_arrow.png	\
+	images/sb_left_arrow.png	\
+	images/sb_right_arrow.png	\
+	images/sb_up_arrow.png		\
+	images/sb_v_double_arrow.png	\
+	images/shuttle.png		\
+	images/sizing.png		\
+	images/spider.png		\
+	images/spraycan.png		\
+	images/star.png			\
+	images/target.png		\
+	images/tcross.png		\
+	images/top_left_arrow.png	\
+	images/top_left_corner.png	\
+	images/top_right_corner.png	\
+	images/top_side.png		\
+	images/top_tee.png		\
+	images/trek.png			\
+	images/ul_angle.png		\
+	images/umbrella.png		\
+	images/ur_angle.png		\
+	images/watch.png		\
+	images/xterm.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS= \

docs/reference/gdk/gdk-docs.sgml

@@ -20,9 +20,11 @@
     <xi:include href="multihead.sgml" />
     <xi:include href="xml/gdkdisplay.xml" />
     <xi:include href="xml/gdkdisplaymanager.xml" />
+    <xi:include href="xml/gdkdevice.xml" />
+    <xi:include href="xml/gdkdevicemanager.xml" />
     <xi:include href="xml/gdkscreen.xml" />
     <xi:include href="xml/regions.xml" />
-    <xi:include href="xml/drawing.xml" />
+    <xi:include href="xml/pixbufs.xml" />
     <xi:include href="xml/colors.xml" />
     <xi:include href="xml/rgba_colors.xml" />
     <xi:include href="xml/visuals.xml" />
@@ -35,7 +37,6 @@
     <xi:include href="xml/dnd.xml" />
     <xi:include href="xml/properties.xml" />
     <xi:include href="xml/threads.xml" />
-    <xi:include href="xml/gdkdevicemanager.xml" />
     <xi:include href="xml/pango_interaction.xml" />
     <xi:include href="xml/cairo_interaction.xml" />
     <xi:include href="xml/x_interaction.xml" />

docs/reference/gdk/gdk3-overrides.txt

@@ -1,27 +1,4 @@
 
-# GdkPixmap, GdkBitmap and GdkDrawable are the same as GdkWindow.
-<STRUCT>
-<NAME>GdkWindow</NAME>
-struct GdkPixmap
-{
-  gpointer user_data;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkPixmap</NAME>
-struct GdkPixmap
-{
-  gpointer user_data;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkDrawable</NAME>
-struct GdkDrawable
-{
-  gpointer user_data;
-};
-</STRUCT>
-
 # GdkAtom is an opaque typedef
 <STRUCT>
 <NAME>GdkAtom</NAME>

docs/reference/gdk/gdk3-sections.txt

@@ -8,8 +8,6 @@ gdk_init
 gdk_init_check
 gdk_parse_args
 gdk_get_display_arg_name
-gdk_set_locale
-gdk_set_sm_client_id
 gdk_notify_startup_complete
 gdk_notify_startup_complete_with_id
 
@@ -63,7 +61,6 @@ GdkStatus
 GDKVAR
 gdk_axis_use_get_type
 gdk_byte_order_get_type
-gdk_cap_style_get_type
 gdk_crossing_mode_get_type
 gdk_cursor_type_get_type
 gdk_drag_action_get_type
@@ -79,17 +76,14 @@ gdk_input_mode_get_type
 gdk_input_source_get_type
 gdk_modifier_type_get_type
 gdk_notify_type_get_type
-gdk_overlap_type_get_type
 gdk_property_state_get_type
 gdk_prop_mode_get_type
 gdk_scroll_direction_get_type
 gdk_setting_action_get_type
 gdk_status_get_type
-gdk_subwindow_mode_get_type
 gdk_visibility_state_get_type
 gdk_visual_type_get_type
 gdk_window_attributes_type_get_type
-gdk_window_class_get_type
 gdk_window_edge_get_type
 gdk_window_hints_get_type
 gdk_window_state_get_type
@@ -122,23 +116,17 @@ gdk_display_sync
 gdk_display_flush
 gdk_display_close
 gdk_display_is_closed
-gdk_display_list_devices
 gdk_display_get_event
 gdk_display_peek_event
 gdk_display_put_event
+gdk_display_has_pending
 gdk_display_add_client_message_filter
 gdk_display_set_double_click_time
 gdk_display_set_double_click_distance
 gdk_display_get_pointer
-gdk_display_get_device_state
+gdk_display_list_devices
 gdk_display_get_window_at_pointer
-gdk_display_get_window_at_device_position
-GdkDisplayPointerHooks
-gdk_display_set_pointer_hooks
-GdkDisplayDeviceHooks
-gdk_display_set_device_hooks
 gdk_display_warp_pointer
-gdk_display_warp_device
 gdk_display_supports_cursor_color
 gdk_display_supports_cursor_alpha
 gdk_display_get_default_cursor_size
@@ -151,7 +139,11 @@ gdk_display_store_clipboard
 gdk_display_supports_shapes
 gdk_display_supports_input_shapes
 gdk_display_supports_composite
+gdk_display_get_app_launch_context
+gdk_display_notify_startup_complete
+
 <SUBSECTION Standard>
+GDK_DISPLAY
 GDK_DISPLAY_OBJECT
 GDK_IS_DISPLAY
 GDK_TYPE_DISPLAY
@@ -173,7 +165,8 @@ gdk_display_manager_get
 gdk_display_manager_get_default_display
 gdk_display_manager_set_default_display
 gdk_display_manager_list_displays
-gdk_display_get_core_pointer
+gdk_display_manager_open_display
+
 <SUBSECTION Standard>
 GDK_DISPLAY_MANAGER
 GDK_DISPLAY_MANAGER_CLASS
@@ -219,10 +212,6 @@ gdk_screen_get_resolution
 gdk_screen_set_resolution
 gdk_screen_get_active_window
 gdk_screen_get_window_stack
-<SUBSECTION Spawning>
-gdk_spawn_on_screen
-gdk_spawn_on_screen_with_pipes
-gdk_spawn_command_line_on_screen
 
 <SUBSECTION Standard>
 GDK_SCREEN
@@ -257,6 +246,8 @@ gdk_color_to_string
 <SUBSECTION Standard>
 GDK_TYPE_COLOR
 
+<SUBSECTION Private>
+gdk_color_get_type
 </SECTION>
 
 <SECTION>
@@ -272,25 +263,9 @@ gdk_rgba_to_string
 
 <SUBSECTION Standard>
 GDK_TYPE_RGBA
-</SECTION>
-
-<SECTION>
-<TITLE>Drawing Primitives</TITLE>
-<FILE>drawing</FILE>
-GdkDrawable
-gdk_drawable_get_clip_region
-gdk_drawable_get_visible_region
-
-<SUBSECTION Standard>
-GDK_DRAWABLE
-GDK_DRAWABLE_GET_CLASS
-GDK_TYPE_DRAWABLE
-GDK_IS_DRAWABLE
-GDK_DRAWABLE_CLASS
-GDK_IS_DRAWABLE_CLASS
 
 <SUBSECTION Private>
-GdkDrawableClass
+gdk_rgba_get_type
 </SECTION>
 
 <SECTION>
@@ -339,7 +314,7 @@ gdk_visual_get_type
 <FILE>windows</FILE>
 GdkWindow
 GdkWindowType
-GdkWindowClass
+GdkWindowWindowClass
 GdkWindowHints
 GdkGeometry
 GdkGravity
@@ -397,9 +372,11 @@ gdk_window_constrain_size
 gdk_window_beep
 
 <SUBSECTION>
+gdk_window_get_clip_region
 gdk_window_begin_paint_rect
 gdk_window_begin_paint_region
 gdk_window_end_paint
+gdk_window_get_visible_region
 
 <SUBSECTION>
 gdk_window_invalidate_rect
@@ -489,10 +466,8 @@ gdk_window_get_device_cursor
 gdk_window_set_device_cursor
 gdk_window_get_device_events
 gdk_window_set_device_events
-
-<SUBSECTION>
-GdkPointerHooks
-gdk_set_pointer_hooks
+gdk_window_get_source_events
+gdk_window_set_source_events
 
 <SUBSECTION>
 gdk_offscreen_window_get_surface
@@ -515,7 +490,6 @@ GDK_TYPE_FILTER_RETURN
 GDK_TYPE_GRAVITY
 GDK_TYPE_MODIFIER_TYPE
 GDK_TYPE_WINDOW_ATTRIBUTES_TYPE
-GDK_TYPE_WINDOW_CLASS
 GDK_TYPE_WINDOW_EDGE
 GDK_TYPE_WINDOW_HINTS
 GDK_TYPE_WINDOW_TYPE
@@ -524,12 +498,11 @@ GDK_TYPE_WM_DECORATION
 GDK_TYPE_WM_FUNCTION
 
 <SUBSECTION Private>
-gdk_window_object_get_type
-gdk_drawable_get_type
-GdkWindowObject
-GdkWindowObjectClass
+gdk_window_get_type
+gdk_window_window_class_get_type
+GdkWindowClass
 GdkWindowImpl
-GdkWindowImplIface
+GdkWindowImplClass
 GdkWindowRedirect
 gdk_window_impl_get_type
 gdk_window_freeze_toplevel_updates_libgtk_only
@@ -572,17 +545,8 @@ GdkAtom
 GDK_ATOM_TO_POINTER
 GDK_POINTER_TO_ATOM
 GDK_NONE
-gdk_text_property_to_text_list
-gdk_text_property_to_text_list_for_display
-gdk_free_text_list
-gdk_text_property_to_utf8_list
 gdk_text_property_to_utf8_list_for_display
-gdk_string_to_compound_text
-gdk_string_to_compound_text_for_display
-gdk_free_compound_text
 gdk_utf8_to_string_target
-gdk_utf8_to_compound_text
-gdk_utf8_to_compound_text_for_display
 gdk_atom_intern
 gdk_atom_intern_static_string
 gdk_atom_name
@@ -616,7 +580,6 @@ gdk_cairo_set_source_pixbuf
 gdk_cairo_set_source_window
 gdk_cairo_rectangle
 gdk_cairo_region
-gdk_cairo_reset_clip
 gdk_cairo_region_create_from_surface
 </SECTION>
 
@@ -649,10 +612,6 @@ gdk_threads_add_timeout
 gdk_threads_add_timeout_full
 gdk_threads_add_timeout_seconds
 gdk_threads_add_timeout_seconds_full
-
-<SUBSECTION Private>
-gdk_threads_lock
-gdk_threads_unlock
 </SECTION>
 
 <SECTION>
@@ -702,25 +661,17 @@ gdk_keymap_get_type
 </SECTION>
 
 <SECTION>
-<TITLE>GdkDeviceManager</TITLE>
-<FILE>gdkdevicemanager</FILE>
-GdkDeviceManager
+<TITLE>GdkDevice</TITLE>
+<FILE>gdkdevice</FILE>
 GdkDevice
-GdkDeviceType
 GdkInputSource
 GdkInputMode
-GdkDeviceKey
-GdkDeviceAxis
 GdkAxisUse
+GdkDeviceType
 GdkGrabOwnership
-gdk_enable_multidevice
-gdk_device_manager_get_display
-gdk_device_manager_list_devices
-gdk_device_manager_get_client_pointer
 
 <SUBSECTION>
 gdk_device_get_name
-gdk_device_set_source
 gdk_device_get_source
 gdk_device_set_mode
 gdk_device_get_mode
@@ -729,10 +680,13 @@ gdk_device_get_key
 gdk_device_set_axis_use
 gdk_device_get_axis_use
 gdk_device_get_associated_device
+gdk_device_list_slave_devices
 gdk_device_get_device_type
 gdk_device_get_display
 gdk_device_get_has_cursor
 gdk_device_get_n_axes
+gdk_device_get_n_keys
+gdk_device_warp
 
 <SUBSECTION>
 gdk_device_grab
@@ -740,6 +694,8 @@ gdk_device_ungrab
 
 <SUBSECTION>
 gdk_device_get_state
+gdk_device_get_position
+gdk_device_get_window_at_position
 gdk_device_get_history
 gdk_device_free_history
 GdkTimeCoord
@@ -747,14 +703,6 @@ gdk_device_get_axis
 gdk_device_list_axes
 gdk_device_get_axis_value
 
-<SUBSECTION>
-gdk_input_set_extension_events
-GdkExtensionMode
-
-<SUBSECTION>
-gdk_devices_list
-gdk_device_get_core_pointer
-
 <SUBSECTION Standard>
 GDK_TYPE_AXIS_USE
 GDK_TYPE_EXTENSION_MODE
@@ -762,12 +710,6 @@ GDK_TYPE_INPUT_MODE
 GDK_TYPE_INPUT_SOURCE
 GDK_TYPE_DEVICE_TYPE
 GDK_TYPE_GRAB_OWNERSHIP
-GDK_DEVICE_MANAGER
-GDK_DEVICE_MANAGER_CLASS
-GDK_DEVICE_MANAGER_GET_CLASS
-GDK_IS_DEVICE_MANAGER
-GDK_IS_DEVICE_MANAGER_CLASS
-GDK_TYPE_DEVICE_MANAGER
 GDK_DEVICE
 GDK_DEVICE_CLASS
 GDK_DEVICE_GET_CLASS
@@ -777,15 +719,33 @@ GDK_TYPE_DEVICE
 
 <SUBSECTION Private>
 GdkDeviceClass
-GdkDevicePrivate
-GdkDeviceManagerClass
-GdkDeviceManagerPrivate
 gdk_device_get_type
-gdk_device_manager_get_type
 gdk_device_type_get_type
 GDK_MAX_TIMECOORD_AXES
 </SECTION>
 
+<SECTION>
+<TITLE>GdkDeviceManager</TITLE>
+<FILE>gdkdevicemanager</FILE>
+GdkDeviceManager
+gdk_disable_multidevice
+gdk_device_manager_get_display
+gdk_device_manager_list_devices
+gdk_device_manager_get_client_pointer
+
+<SUBSECTION Standard>
+GDK_DEVICE_MANAGER
+GDK_DEVICE_MANAGER_CLASS
+GDK_DEVICE_MANAGER_GET_CLASS
+GDK_IS_DEVICE_MANAGER
+GDK_IS_DEVICE_MANAGER_CLASS
+GDK_TYPE_DEVICE_MANAGER
+
+<SUBSECTION Private>
+GdkDeviceManagerClass
+gdk_device_manager_get_type
+</SECTION>
+
 <SECTION>
 <TITLE>Events</TITLE>
 <FILE>events</FILE>
@@ -795,7 +755,6 @@ GDK_CURRENT_TIME
 GDK_PRIORITY_EVENTS
 GDK_PRIORITY_REDRAW
 
-
 <SUBSECTION>
 gdk_events_pending
 gdk_event_peek
@@ -831,6 +790,8 @@ gdk_event_set_screen
 gdk_event_get_screen
 gdk_event_get_device
 gdk_event_set_device
+gdk_event_get_source_device
+gdk_event_set_source_device
 
 <SUBSECTION>
 gdk_setting_get
@@ -862,7 +823,6 @@ GdkNativeWindow
 GdkEventDND
 GdkEventProximity
 GdkEventClient
-GdkEventNoExpose
 GdkEventWindowState
 GdkEventSetting
 GdkEventOwnerChange
@@ -921,30 +881,31 @@ gdk_cursor_get_type
 <SECTION>
 <TITLE>Drag and Drop</TITLE>
 <FILE>dnd</FILE>
+GdkDragContext
 gdk_drag_get_selection
 gdk_drag_abort
 gdk_drop_reply
-gdk_drag_context_new
 gdk_drag_drop
-gdk_drag_find_window
 gdk_drag_find_window_for_screen
-gdk_drag_context_get_source_window
 gdk_drag_begin
+gdk_drag_begin_for_device
 gdk_drag_motion
 gdk_drop_finish
-gdk_drag_get_protocol
 gdk_drag_get_protocol_for_display
 GdkDragProtocol
-GdkDragContext
 GdkDragAction
 gdk_drag_status
 gdk_drag_drop_succeeded
+
 gdk_drag_context_get_actions
 gdk_drag_context_get_suggested_action
 gdk_drag_context_get_selected_action
 gdk_drag_context_list_targets
 gdk_drag_context_get_device
 gdk_drag_context_set_device
+gdk_drag_context_get_source_window
+gdk_drag_context_get_dest_window
+gdk_drag_context_get_protocol
 
 <SUBSECTION Standard>
 GDK_DRAG_CONTEXT
@@ -966,38 +927,19 @@ gdk_drag_context_get_type
 <TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_ROOT_WINDOW
-GDK_WINDOW_XDISPLAY
 GDK_WINDOW_XID
 GDK_DISPLAY_XDISPLAY
-GDK_DRAWABLE_XDISPLAY
-GDK_DRAWABLE_XID
 GDK_SCREEN_XDISPLAY
 GDK_SCREEN_XNUMBER
 GDK_SCREEN_XSCREEN
 GDK_CURSOR_XCURSOR
 GDK_CURSOR_XDISPLAY
-GDK_WINDOW_XWINDOW
-gdkx_visual_get
-gdk_window_foreign_new
-gdk_window_foreign_new_for_display
-gdk_xid_table_lookup
-gdk_xid_table_lookup_for_display
-gdk_window_lookup
-gdk_window_lookup_for_display
 gdk_x11_lookup_xdisplay
 gdk_x11_get_server_time
-gdk_net_wm_supports
-gdk_x11_screen_supports_net_wm_hint
-gdk_x11_screen_get_window_manager_name
-gdk_x11_screen_get_monitor_output
-gdk_x11_screen_lookup_visual
-gdk_x11_window_set_user_time
-gdk_x11_window_move_to_current_desktop
 gdk_x11_display_get_user_time
-gdk_x11_cursor_get_xcursor
-gdk_x11_cursor_get_xdisplay
 gdk_x11_display_broadcast_startup_message
 gdk_x11_display_get_startup_notification_id
+gdk_x11_display_set_startup_notification_id
 gdk_x11_display_get_xdisplay
 gdk_x11_display_grab
 gdk_x11_display_ungrab
@@ -1006,15 +948,24 @@ gdk_x11_display_error_trap_pop
 gdk_x11_display_error_trap_pop_ignored
 gdk_x11_display_set_cursor_theme
 gdk_x11_register_standard_event_type
-gdk_x11_drawable_get_xdisplay
-gdk_x11_drawable_get_xid
+gdk_x11_screen_get_screen_number
+gdk_x11_screen_get_xscreen
+gdk_x11_screen_get_window_manager_name
+gdk_x11_screen_get_monitor_output
+gdk_x11_screen_lookup_visual
+gdk_x11_screen_supports_net_wm_hint
+gdk_x11_window_foreign_new_for_display
+gdk_x11_window_lookup_for_display
+gdk_x11_window_get_xid
+gdk_x11_window_set_user_time
+gdk_x11_window_move_to_current_desktop
 gdk_x11_get_default_root_xwindow
 gdk_x11_get_default_screen
 gdk_x11_get_default_xdisplay
 gdk_x11_grab_server
-gdk_x11_screen_get_screen_number
-gdk_x11_screen_get_xscreen
 gdk_x11_ungrab_server
+gdk_x11_cursor_get_xcursor
+gdk_x11_cursor_get_xdisplay
 gdk_x11_visual_get_xvisual
 gdk_x11_atom_to_xatom
 gdk_x11_atom_to_xatom_for_display
@@ -1024,11 +975,30 @@ gdk_x11_get_xatom_by_name
 gdk_x11_get_xatom_by_name_for_display
 gdk_x11_get_xatom_name
 gdk_x11_get_xatom_name_for_display
+gdk_x11_set_sm_client_id
+gdk_x11_display_text_property_to_text_list
+gdk_x11_free_text_list
+gdk_x11_display_string_to_compound_text
+gdk_x11_display_utf8_to_compound_text
+gdk_x11_free_compound_text
 
 <SUBSECTION Private>
-GDK_HAVE_WCHAR_H
-GDK_HAVE_WCTYPE_H
-gdk_x11_window_get_drawable_impl
+gdk_x11_app_launch_context_get_type
+gdk_x11_cursor_get_type
+gdk_x11_device_core_get_type
+gdk_x11_device_manager_core_get_type
+gdk_x11_device_manager_xi2_get_type
+gdk_x11_device_manager_xi_get_type
+gdk_x11_device_xi2_get_type
+gdk_x11_device_xi_get_type
+gdk_x11_display_get_type
+gdk_x11_display_manager_get_type
+gdk_x11_drag_context_get_type
+gdk_x11_keymap_get_type
+gdk_x11_screen_get_type
+gdk_x11_visual_get_type
+gdk_x11_window_get_type
+gdk_window_impl_x11_get_type
 </SECTION>
 
 <SECTION>
@@ -1050,7 +1020,6 @@ GDK_IS_APP_LAUNCH_CONTEXT
 GDK_IS_APP_LAUNCH_CONTEXT_CLASS
 GDK_TYPE_APP_LAUNCH_CONTEXT
 GdkAppLaunchContextClass
-GdkAppLaunchContextPrivate
 <SUBSECTION Private>
 gdk_app_launch_context_get_type
 </SECTION>

docs/reference/gdk/gdk3.types

@@ -1,10 +1,13 @@
 #include <gdk/gdk.h>
 
-gdk_display_get_type
-gdk_display_manager_get_type
-gdk_screen_get_type
-gdk_drawable_get_type
-gdk_window_object_get_type
-gdk_keymap_get_type
+gdk_app_launch_context_get_type
+gdk_cursor_get_type
 gdk_device_get_type
 gdk_device_manager_get_type
+gdk_display_get_type
+gdk_display_manager_get_type
+gdk_drag_context_get_type
+gdk_keymap_get_type
+gdk_screen_get_type
+gdk_visual_get_type
+gdk_window_get_type

docs/reference/gtk/Makefile.am

@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.6
 
@@ -22,6 +21,8 @@ CFILE_GLOB=$(top_srcdir)/gtk/*.c
 # Header files to ignore when scanning
 IGNORE_HFILES=				\
 	fnmatch.h			\
+	gtk9slice.h			\
+	gtkanimationdescription.h	\
 	gtkdebug.h			\
 	gtkbuilderprivate.h		\
 	gtkdndcursors.h			\
@@ -77,6 +78,7 @@ IGNORE_HFILES=				\
 	gtktexttagprivate.h		\
 	gtktexttypes.h			\
 	gtktextutil.h			\
+	gtktimeline.h			\
 	gtkthemes.h			\
 	gtktrayicon.h			\
 	gtktreedatalist.h		\
@@ -104,8 +106,8 @@ CPPFLAGS += \
 	-UGTK_DISABLE_SINGLE_INCLUDES
 
 GTKDOC_LIBS = \
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)
+	$(top_builddir)/gtk/libgtk-3.0.la				\
+	$(GTK_DEP_LIBS)
 
 
 # Extra options to supply to gtkdoc-mkdb
@@ -122,6 +124,7 @@ content_files =					\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
 	migrating-GtkApplication.xml		\
+	migrating-GtkStyleContext.xml		\
 	objects_grouped.sgml			\
 	osx.sgml				\
 	question_index.sgml			\
@@ -131,8 +134,8 @@ content_files =					\
 	windows.sgml				\
 	x11.sgml				\
 	gtk-query-immodules-3.0.xml		\
-	gtk-update-icon-cache-3.0.xml		\
-	gtk-builder-convert-3.0.xml		\
+	gtk-update-icon-cache.xml		\
+	gtk-builder-convert.xml			\
 	visual_index.xml			\
 	getting_started.xml			\
 	overview.xml
@@ -144,6 +147,7 @@ expand_content_files = 				\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
 	migrating-GtkApplication.xml		\
+	migrating-GtkStyleContext.xml		\
 	question_index.sgml			\
 	text_widget.sgml			\
 	tree_widget.sgml
@@ -271,6 +275,8 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/24/gtk-page-setup.png		\
 	$(srcdir)/images/aboutdialog.png				\
 	$(srcdir)/images/accel-label.png				\
+	$(srcdir)/images/appchooserbutton.png				\
+	$(srcdir)/images/appchooserdialog.png				\
 	$(srcdir)/images/assistant.png					\
 	$(srcdir)/images/button.png					\
 	$(srcdir)/images/check-button.png				\
@@ -323,7 +329,33 @@ HTML_IMAGES = \
 	$(srcdir)/images/layout-tbrl.png				\
 	$(srcdir)/images/window-default.png				\
 	$(srcdir)/images/hello-world.png				\
-	$(srcdir)/images/switch.png
+	$(srcdir)/images/switch.png					\
+	$(srcdir)/images/linear.png					\
+	$(srcdir)/images/ease.png					\
+	$(srcdir)/images/ease-in-out.png				\
+	$(srcdir)/images/ease-in.png					\
+	$(srcdir)/images/ease-out.png					\
+	$(srcdir)/images/gradient1.png					\
+	$(srcdir)/images/gradient2.png					\
+	$(srcdir)/images/gradient3.png					\
+	$(srcdir)/images/gradient4.png					\
+	$(srcdir)/images/border1.png					\
+	$(srcdir)/images/border2.png					\
+	$(srcdir)/images/border3.png					\
+	$(srcdir)/images/slices.png					\
+	$(srcdir)/images/checks.png					\
+	$(srcdir)/images/options.png					\
+	$(srcdir)/images/arrows.png					\
+	$(srcdir)/images/expanders.png					\
+	$(srcdir)/images/background.png					\
+	$(srcdir)/images/frames.png					\
+	$(srcdir)/images/frame-gap.png					\
+	$(srcdir)/images/sliders.png					\
+	$(srcdir)/images/focus.png					\
+	$(srcdir)/images/handles.png					\
+	$(srcdir)/images/extensions.png					\
+	$(srcdir)/images/numerableicon.png				\
+	$(srcdir)/images/numerableicon2.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \
@@ -342,8 +374,8 @@ EXTRA_DIST += version.xml.in
 
 man_MANS = 				\
 	gtk-query-immodules-3.0.1	\
-	gtk-update-icon-cache-3.0.1	\
-	gtk-builder-convert-3.0.1
+	gtk-update-icon-cache.1		\
+	gtk-builder-convert.1
 
 if ENABLE_MAN
 

docs/reference/gtk/building.sgml

@@ -30,7 +30,7 @@ How to compile GTK+ itself
       your operating system will be available, either from your
       operating system vendor or from independent sources. If such a
       set of packages is available, installing it will get you
-      programming wih GTK+ much faster than building it yourself. In
+      programming with GTK+ much faster than building it yourself. In
       fact, you may well already have GTK+ installed on your system
       already.
     </para>
@@ -45,7 +45,7 @@ How to compile GTK+ itself
     </para>
     <para>
       If you are building GTK+ from the distributed source packages,
-      then won't need these tools installed; the necessary pieces
+      then you won't need these tools installed; the necessary pieces
       of the tools are already included in the source packages. But
       it's useful to know a bit about how packages that use these
       tools work. A source package is distributed as a
@@ -57,14 +57,15 @@ How to compile GTK+ itself
       tar xvfj gtk+-3.0.0.tar.bz2
     </programlisting>
     <para>
-      In the toplevel of the directory that is created, there will be
+      In the toplevel directory that is created, there will be
       a shell script called <filename>configure</filename> which
       you then run to take the template makefiles called
       <filename>Makefile.in</filename> in the package and create
-      makefiles customized for your operating system. The <filename>configure</filename>
-      script can be passed various command line arguments to determine how
-      the package is built and installed. The most commonly useful
-      argument is the <systemitem>--prefix</systemitem> argument which
+      makefiles customized for your operating system.
+      The <filename>configure</filename> script can be passed
+      various command line arguments to determine how the package
+      is built and installed. The most commonly useful argument is
+      the <systemitem>--prefix</systemitem> argument which
       determines where the package is installed. To install a package
       in <filename>/opt/gtk</filename> you would run configure as:
     </para>
@@ -210,22 +211,6 @@ How to compile GTK+ itself
           message translation databases.
         </para>
       </listitem>
-      <listitem>
-        <para>
-          The <ulink url="http://en.wikipedia.org/wiki/Libjpeg">JPEG</ulink>,
-          <ulink url="http://www.libpng.org">PNG</ulink>, and
-          <ulink url="http://www.libtiff.org">TIFF</ulink> image
-          loading libraries are needed to compile GTK+. You probably
-          already have these libraries installed, but if not, the
-          versions you need are available in the
-           <filename>dependencies</filename> directory on the the
-          <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.10/dependencies/">GTK+
-            FTP site.</ulink>. (Before installing these libraries
-          from source, you should check if your operating system
-          vendor has prebuilt packages of these libraries that you
-          don't have installed.)
-        </para>
-      </listitem>
       <listitem>
         <para>
           The libraries from the X window system are needed to build
@@ -246,10 +231,16 @@ How to compile GTK+ itself
         <para>
           <ulink url="http://www.cairographics.org">Cairo</ulink>
           is a graphics library that supports vector graphics and image
-          compositing. Both Pango and GTK+ use cairo for much of their
+          compositing. Both Pango and GTK+ use cairo for all of their
           drawing.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          The GdkPixbuf library provides facilities for loading
+          images in a variety of file formats.
+        </para>
+      </listitem>
       <listitem>
         <para>
           <ulink url="http://live.gnome.org/GObjectIntrospection">gobject-introspection</ulink>
@@ -289,8 +280,8 @@ How to compile GTK+ itself
       <literal>make install</literal> mentioned above. If you're
       lucky, this will all go smoothly, and you'll be ready to
       <link linkend="gtk-compiling">start compiling your own GTK+
-        applications</link>. You can test your GTK+ installation
-      by running the <command>gtk-demo</command> program that
+      applications</link>. You can test your GTK+ installation
+      by running the <command>gtk3-demo</command> program that
       GTK+ installs.
     </para>
     <para>
@@ -327,7 +318,7 @@ How to compile GTK+ itself
             <arg>--with-included-immodules=MODULE1,MODULE2,...</arg>
           </group>
           <group>
-            <arg>--enable-debug=[no|minimum|yes]</arg>
+            <arg>--enable-debug=[no/minimum/yes]</arg>
           </group>
           <group>
             <arg>--disable-Bsymbolic</arg>
@@ -354,13 +345,23 @@ How to compile GTK+ itself
             <arg>--enable-papi</arg>
           </group>
           <group>
-            <arg>--with-xinput=[no|yes]</arg>
+            <arg>--enable-xinput</arg>
+            <arg>--disable-xinput</arg>
           </group>
           <group>
-            <arg>--with-gdktarget=[x11|win32|quartz]</arg>
+            <arg>--enable-packagekit</arg>
+            <arg>--disable-packagekit</arg>
           </group>
           <group>
-            <arg>--disable-introspection</arg>
+            <arg>--enable-x11-backend</arg>
+            <arg>--disable-x11-backend</arg>
+            <arg>--enable-win32-backend</arg>
+            <arg>--disable-win32-backend</arg>
+            <arg>--enable-quartz-backend</arg>
+            <arg>--disable-quartz-backend</arg>
+          </group>
+          <group>
+            <arg>--enable-introspection=[no/auto/yes]</arg>
           </group>
         </cmdsynopsis>
       </para>
@@ -371,14 +372,14 @@ How to compile GTK+ itself
 
         <para>
           Normally GTK+ will try to build the input method modules
-          as little shared libraries that are loaded on
-          demand.  The <systemitem>--disable-modules</systemitem>
-          argument indicates that they should all be built statically
-          into the GTK+ library instead.  This is useful for
-          people who need to produce statically-linked binaries.  If
-          neither <systemitem>--disable-modules</systemitem> nor
-          <systemitem>--enable-modules</systemitem> is specified, then
-          the <command>configure</command> script will try to
+          as little shared libraries that are loaded on demand.
+          The <systemitem>--disable-modules</systemitem> argument
+          indicates that they should all be built statically
+          into the GTK+ library instead. This is useful for
+          people who need to produce statically-linked binaries.
+          If neither <systemitem>--disable-modules</systemitem> nor
+          <systemitem>--enable-modules</systemitem> is specified,
+          then the <command>configure</command> script will try to
           auto-detect whether shared modules work on your system.
         </para>
       </formalpara>
@@ -388,7 +389,8 @@ How to compile GTK+ itself
 
         <para>
          This option allows you to specify which input method modules you
-         want to include.
+         want to include directly into the GTK+ shared library, as opposed
+         to building them as loadable modules.
         </para>
       </formalpara>
 
@@ -396,10 +398,9 @@ How to compile GTK+ itself
         <title><systemitem>--enable-debug</systemitem></title>
 
         <para>
-         Turns on various amounts of debugging support. Setting this to 'no'
-         disables g_assert(), g_return_if_fail(), g_return_val_if_fail() and
-         all cast checks between different object types. Setting it to 'minimum'
-         disables only cast checks. Setting it to 'yes' enables
+         Turns on various amounts of debugging support. Setting this to
+         'no' disables g_assert(), g_return_if_fail(), g_return_val_if_fail()           and all cast checks between different object types. Setting it
+         to 'minimum' disables only cast checks. Setting it to 'yes' enables
          <link linkend="GTK-Debug-Options">runtime debugging</link>.
          The default is 'minimum'.
          Note that 'no' is fast, but dangerous as it tends to destabilize
@@ -416,6 +417,8 @@ How to compile GTK+ itself
         <para>
           The option <systemitem>--disable-Bsymbolic</systemitem>
           turns off the use of the -Bsymbolic-functions linker flag.
+          This is only necessary if you want to override GTK+ functions
+          by using <envar>LD_PRELOAD</envar>.
         </para>
       </formalpara>
 
@@ -469,6 +472,21 @@ How to compile GTK+ itself
         </para>
       </formalpara>
 
+      <formalpara>
+        <title><systemitem>--disable-xinput</systemitem> and
+           <systemitem>--enable-xinput</systemitem></title>
+        <para>
+          Controls whether GTK+ is built with support for the XInput
+          or XInput2 extension. These extensions provide an extended
+          interface to input devices such as graphics tablets.
+          When this support is compiled in, specially written
+          GTK+ programs can get access to subpixel positions,
+          multiple simultaneous input devices, and extra "axes"
+          provided by the device such as pressure and tilt
+          information.
+        </para>
+      </formalpara>
+
       <formalpara>
         <title><systemitem>--disable-gtk-doc</systemitem> and
           <systemitem>--enable-gtk-doc</systemitem></title>
@@ -513,33 +531,40 @@ How to compile GTK+ itself
       </formalpara>
 
       <formalpara>
-        <title><systemitem>--with-xinput</systemitem></title>
+        <title><systemitem>--disable-packagekit</systemitem> and
+           <systemitem>--enable-packagekit</systemitem></title>
         <para>
-          Controls whether GTK+ is built with support for the XInput
-          or XInput2 extension. These extensions provide an extended
-          interface to input devices such as graphics tablets.
-          When this support is compiled in, specially written
-          GTK+ programs can get access to subpixel positions,
-          multiple simultaneous input devices, and extra "axes"
-          provided by the device such as pressure and tilt
-          information.
+          By default the <command>configure</command> script will try
+          to build the PackageKit support for the open-with dialog if
+          the PackageKit libraries are found.
+          These options can be used to explicitly control whether
+          PackageKit support should be built.
+        </para>
+      </formalpara>
+
+      <formalpara>
+        <title><systemitem>--enable-x11-backend</systemitem>,
+          <systemitem>--disable-x11-backend</systemitem>,
+          <systemitem>--enable-win32-backend</systemitem>,
+          <systemitem>--disable-win32-backend</systemitem>,
+          <systemitem>--enable-quartz-backend</systemitem>,
+          and <systemitem>--disable-quartz-backend</systemitem></title>
+
+        <para>
+          Enables specific backends for GDK.  If none of these options
+          are given, the x11 backend will be enabled by default,
+          unless the platform is Windows, in which case the default is
+          win32.  If any backend is explicitly enabled or disabled, no
+          other platform will be enabled automatically.  Other
+          supported backends are the quartz backend for OS X.
         </para>
       </formalpara>
       <formalpara>
-        <title><systemitem>--with-gdktarget</systemitem></title>
+        <title><systemitem>--enable-introspection</systemitem></title>
 
         <para>
-          Toggles between the supported backends for GDK.
-          The default is x11, unless the platform is Windows, in which
-          case the default is win32. Other supported backends are
-          the quartz backend for OS X.
-        </para>
-      </formalpara>
-      <formalpara>
-        <title><systemitem>--disable-introspection</systemitem></title>
-
-        <para>
-          Build without introspection support.
+          Build with or without introspection support.
+          The default is 'auto'.
         </para>
       </formalpara>
     </refsect1>

docs/reference/gtk/compiling.sgml

@@ -32,7 +32,7 @@ your system may be different):
 $ pkg-config --cflags gtk+-3.0
  -pthread -I/usr/include/gtk-3.0 -I/usr/lib64/gtk-3.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
 $ pkg-config --libs gtk+-3.0
- -pthread -lgtk-x11-3.0 -lgdk-x11-3.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-3.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
+ -pthread -lgtk-3.0 -lgdk-3.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-3.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
 </programlisting>
 </para>
 <para>
@@ -69,24 +69,5 @@ define the preprocessor symbol GDK_MULTIDEVICE_SAFE by using the command
 line option <literal>-DGTK_MULTIDEVICE_SAFE=1</literal>.
 </para>
 
-<para>
-The recommended way of using GTK+ has always been to only include the
-toplevel headers <filename>gtk.h</filename>, <filename>gdk.h</filename>,
-<filename>gdk-pixbuf.h</filename>.
-If you want to make sure that your program follows this recommended
-practise, you can define the preprocessor symbols GTK_DISABLE_SINGLE_INCLUDES
-and GDK_PIXBUF_DISABLE_SINGLE_INCLUDES to make GTK+ generate an error
-when individual headers are directly included.
-There are some exceptions: <filename>gdkkeysyms.h</filename> is not included in
-<filename>gdk.h</filename> because the file is quite large; see
-<link linkend="gdk-Keyboard-Handling">Key Values documentation</link>.
-<filename>gdkx.h</filename> must be included independently because It's
-platform-specific; see
-<link linkend="gdk-X-Window-System-Interaction">X Window System Interaction</link>
-documentation.
-The same for <filename>gtkunixprint.h</filename> if you use the non-portable
-<link linkend="GtkPrintUnixDialog">GtkPrintUnixDialog</link> API.
-</para>
-
 </refsect1>
 </refentry>

docs/reference/gtk/getting_started.xml

@@ -43,7 +43,7 @@
   <warning><para>Even if GTK+ installs multiple header files, only the
   top-level <filename>gtk/gtk.h</filename> header can be directly included
   by third party code. The compiler will abort with an error if any other
-  header will be included.</para></warning>
+  header is directly included.</para></warning>
 
   <para>We then proceed into the <function>main</function>() function of the
   application, and we declare a <varname>window</varname> variable as a pointer

docs/reference/gtk/gtk-builder-convert.xml

@@ -1,18 +1,18 @@
 <refentry id="gtk-builder-convert">
 
 <refmeta>
-<refentrytitle>gtk-builder-convert-3.0</refentrytitle>
+<refentrytitle>gtk-builder-convert</refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-<refname>gtk-builder-convert-3.0</refname>
+<refname>gtk-builder-convert</refname>
 <refpurpose>Glade file conversion utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gtk-builder-convert-3.0</command>
+<command>gtk-builder-convert</command>
 <arg choice="opt">--skip-windows</arg>
 <arg choice="opt">--root <replaceable>name</replaceable></arg>
 <arg choice="req">input</arg>
@@ -21,7 +21,7 @@
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
-<para><command>gtk-builder-convert-3.0</command> converts glade files
+<para><command>gtk-builder-convert</command> converts glade files
 into XML files which can be loaded with GtkBuilder.
 </para>
 <para>
@@ -40,7 +40,7 @@ its output the file specified as the second argument.
   <varlistentry>
     <term>--root</term>
     <term>-r</term>
-    <listitem><para>Convert only the widget named <replaceable>name</replaceable> 
+    <listitem><para>Convert only the widget named <replaceable>name</replaceable>
        and its children.</para></listitem>
   </varlistentry>
 </variablelist>

docs/reference/gtk/gtk-docs.sgml

@@ -3,6 +3,8 @@
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 <!ENTITY version SYSTEM "version.xml">
+<!ENTITY pi "&#960;">
+<!ENTITY solidus "&#8260;">
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
@@ -38,19 +40,32 @@
     <xi:include href="xml/gtkaccelmap.xml" />
     <xi:include href="xml/gtkclipboard.xml" />
     <xi:include href="xml/gtkdnd.xml" />
-    <xi:include href="xml/gtkicontheme.xml" />
     <xi:include href="xml/gtkstock.xml" />
-    <xi:include href="xml/gtkiconfactory.xml" />
-    <xi:include href="xml/gtkrc.xml" />
     <xi:include href="xml/gtksettings.xml" />
     <xi:include href="xml/gtkbindings.xml" />
     <xi:include href="xml/gtkenums.xml" />
-    <xi:include href="xml/gtkstyle.xml" />
     <xi:include href="xml/gtkselection.xml" />
     <xi:include href="xml/gtktesting.xml" />
     <xi:include href="xml/filesystem.xml" />
   </part>
 
+  <part id="theming">
+    <title>Theming in GTK+</title>
+    <xi:include href="xml/gtkstylecontext.xml" />
+    <xi:include href="xml/gtkcssprovider.xml" />
+    <xi:include href="xml/gtkstyleprovider.xml" />
+    <xi:include href="xml/gtkstyleproperties.xml" />
+    <xi:include href="xml/gtkthemingengine.xml" />
+    <xi:include href="xml/gtkwidgetpath.xml" />
+    <xi:include href="xml/gtksymboliccolor.xml" />
+    <xi:include href="xml/gtkgradient.xml" />
+    <xi:include href="xml/gtkicontheme.xml" />
+    <xi:include href="xml/gtkiconfactory.xml" />
+    <xi:include href="xml/gtknumerableicon.xml" />
+    <xi:include href="xml/gtkrc.xml" />
+    <xi:include href="xml/gtkstyle.xml" />
+  </part>
+
   <part id="gtkobjects">
     <title>GTK+ Widgets and Objects</title>
 
@@ -137,6 +152,9 @@
       <xi:include href="xml/gtktreemodelsort.xml" />
       <xi:include href="xml/gtktreemodelfilter.xml" />
       <xi:include href="xml/gtkcelllayout.xml" />
+      <xi:include href="xml/gtkcellarea.xml" />
+      <xi:include href="xml/gtkcellareabox.xml" />
+      <xi:include href="xml/gtkcellareacontext.xml" />
       <xi:include href="xml/gtkcellrenderer.xml" />
       <xi:include href="xml/gtkcelleditable.xml" />
       <xi:include href="xml/gtkcellrendereraccel.xml" />
@@ -297,6 +315,14 @@
       <xi:include href="xml/gtkrecentfilter.xml" />
     </chapter>
 
+    <chapter id="ApplicationChoosing">
+      <title>Choosing from installed applications</title>
+      <xi:include href="xml/gtkappchooser.xml" />
+      <xi:include href="xml/gtkappchooserbutton.xml" />
+      <xi:include href="xml/gtkappchooserdialog.xml" />
+      <xi:include href="xml/gtkappchooserwidget.xml" />
+    </chapter>
+
     <chapter id="Builder">
       <title>Interface builder</title>
       <xi:include href="xml/gtkbuildable.xml" />
@@ -325,13 +351,14 @@
     <xi:include href="xml/migrating-checklist.sgml" />
     <xi:include href="xml/migrating-2to3.xml" />
     <xi:include href="xml/migrating-GtkApplication.xml" />
+    <xi:include href="xml/migrating-GtkStyleContext.xml" />
   </part>
 
   <part>
     <title>GTK+ Tools</title>
     <xi:include href="gtk-query-immodules-3.0.xml" />
-    <xi:include href="gtk-update-icon-cache-3.0.xml" />
-    <xi:include href="gtk-builder-convert-3.0.xml" />
+    <xi:include href="gtk-update-icon-cache.xml" />
+    <xi:include href="gtk-builder-convert.xml" />
   </part>
 
   <xi:include href="glossary.xml" />

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

@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="gtk-query-immodules">
+<refentry id="gtk-query-immodules-3.0">
 
 <refmeta>
 <refentrytitle>gtk-query-immodules-3.0</refentrytitle>

docs/reference/gtk/gtk-update-icon-cache.xml

@@ -5,18 +5,18 @@
 <refentry id="gtk-update-icon-cache">
 
 <refmeta>
-<refentrytitle>gtk-update-icon-cache-3.0</refentrytitle>
+<refentrytitle>gtk-update-icon-cache</refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-<refname>gtk-update-icon-cache-3.0</refname>
+<refname>gtk-update-icon-cache</refname>
 <refpurpose>Icon theme caching utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gtk-update-icon-cache-3.0</command>
+<command>gtk-update-icon-cache</command>
 <arg choice="opt">--force</arg>
 <arg choice="opt">--ignore-theme-index</arg>
 <arg choice="opt">--index-only</arg>
@@ -29,7 +29,7 @@
 
 <refsect1><title>Description</title>
 <para>
-  <command>gtk-update-icon-cache-3.0</command> creates mmap()able cache
+  <command>gtk-update-icon-cache</command> creates mmap()able cache
   files for icon themes.
 </para>
 <para>
@@ -39,7 +39,7 @@
   information about the icons in the directory tree below the given directory.
 </para>
 <para>
-  GTK+ can use the cache files created by <command>gtk-update-icon-cache-3.0</command>
+  GTK+ can use the cache files created by <command>gtk-update-icon-cache</command>
   to avoid a lot of system call and disk seek overhead when the application
   starts. Since the format of the cache files allows them to be mmap()ed
   shared between multiple applications, the overall memory consumption is
@@ -60,7 +60,7 @@
     <term>--ignore-theme-index</term>
     <term>-t</term>
     <listitem><para>Don't check for the existence of 'index.theme' in the icon
-     theme directory. Without this option, <command>gtk-update-icon-cache-3.0</command>
+     theme directory. Without this option, <command>gtk-update-icon-cache</command>
      refuses to create an icon cache in a directory which does not appear to
      be the toplevel directory of an icon theme.
     </para></listitem>
@@ -104,5 +104,3 @@ None known yet.
 </refsect1>
 
 </refentry>
-
-

docs/reference/gtk/gtk3.types

@@ -11,6 +11,10 @@ gtk_action_group_get_type
 gtk_activatable_get_type
 gtk_adjustment_get_type
 gtk_alignment_get_type
+gtk_app_chooser_get_type
+gtk_app_chooser_button_get_type
+gtk_app_chooser_dialog_get_type
+gtk_app_chooser_widget_get_type
 gtk_application_get_type
 gtk_arrow_get_type
 gtk_aspect_frame_get_type
@@ -22,6 +26,9 @@ gtk_buildable_get_type
 gtk_button_box_get_type
 gtk_button_get_type
 gtk_calendar_get_type
+gtk_cell_area_get_type
+gtk_cell_area_box_get_type
+gtk_cell_area_context_get_type
 gtk_cell_editable_get_type
 gtk_cell_layout_get_type
 gtk_cell_renderer_accel_get_type
@@ -43,6 +50,7 @@ gtk_color_selection_get_type
 gtk_combo_box_get_type
 gtk_combo_box_text_get_type
 gtk_container_get_type
+gtk_css_provider_get_type
 gtk_dialog_get_type
 gtk_drawing_area_get_type
 gtk_editable_get_type
@@ -93,6 +101,7 @@ gtk_message_dialog_get_type
 gtk_misc_get_type
 gtk_mount_operation_get_type
 gtk_notebook_get_type
+gtk_numerable_icon_get_type
 gtk_offscreen_window_get_type
 gtk_orientable_get_type
 gtk_page_setup_get_type
@@ -137,6 +146,8 @@ gtk_statusbar_get_type
 gtk_status_icon_get_type
 gtk_switch_get_type
 gtk_style_get_type
+gtk_style_context_get_type
+gtk_style_provider_get_type
 gtk_table_get_type
 gtk_tearoff_menu_item_get_type
 gtk_text_buffer_get_type
@@ -146,6 +157,7 @@ gtk_text_mark_get_type
 gtk_text_tag_get_type
 gtk_text_tag_table_get_type
 gtk_text_view_get_type
+gtk_theming_engine_get_type
 gtk_toggle_action_get_type
 gtk_toggle_button_get_type
 gtk_toggle_tool_button_get_type

docs/reference/gtk/migrating-2to3.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 ]>
 <chapter id="gtk-migrating-2-to-3">
   <title>Migrating from GTK+ 2.x to GTK+ 3</title>
@@ -99,10 +100,11 @@
   </para>
   <para>
     To ensure that your application does not have problems with this, you
-    define the preprocessor symbol <literal>GSEAL_ENABLE</literal>. This
-    will make the compiler catch all uses of direct access to struct fields
-    so that you can go through them one by one and replace them with a call
-    to an accessor function instead.
+    define the preprocessor symbol <literal>GSEAL_ENABLE</literal> while
+    building your application against GTK+ 2.x. This will make the compiler
+    catch all uses of direct access to struct fields so that you can go
+    through them one by one and replace them with a call to an accessor
+    function instead.
     <programlisting>
     make CFLAGS+="-DGSEAL_ENABLE"
     </programlisting>
@@ -122,6 +124,53 @@
 
   </section>
 
+  <section>
+    <title>Use GIO for launching applications</title>
+    <para>
+      The <literal>gdk_spawn</literal> family of functions has been
+      deprecated in GDK 2.24 and removed from GDK 3. Various replacements
+      exist; the best replacement depends on the circumstances:
+      <itemizedlist>
+        <listitem>If you are opening a document or URI by launching a command
+        like <literal>firefox http://my-favourite-website.com</literal> or
+        <literal>gnome-open ghelp:epiphany</literal>, it is best to just use
+        gtk_show_uri(); as an added benefit, your application will henceforth
+        respect the users preference for what application to use.</listitem>
+        <listitem>If you are launching a regular, installed application that
+        has a desktop file, it is best to use GIOs #GAppInfo with a suitable
+        launch context.
+        <informalexample><programlisting>
+        GAppInfo *info;
+        GAppLaunchContext *context;
+        GError *error = NULL;
+
+        info = g_desktop_app_info_new ("epiphany.desktop");
+        context = gdk_display_get_app_launch_context (display);
+        g_app_info_launch (info, NULL, context, &amp;error);
+
+        if (error)
+          {
+            g_warning ("Failed to launch epiphany: %s", error-&gt;message);
+            g_error_free (error);
+          }
+
+        g_object_unref (info);
+        g_object_unref (context);
+        </programlisting></informalexample>
+        </listitem>
+        <listitem>If you are launching a custom commandline, you can
+        still use g_app_info_launch() with a GAppInfo that is constructed
+        with g_app_info_create_from_commandline(), or you can use the
+        more lowlevel <literal>g_spawn</literal> family of functions
+        (e.g. g_spawn_command_line_async()), and pass <envar>DISPLAY</envar>
+        in the environment. gdk_screen_make_display_name() can be
+        used to find the right value for the <envar>DISPLAY</envar>
+        environment variable.
+        </listitem>
+      </itemizedlist>
+    </para>
+  </section>
+
   <section>
     <title>Use cairo for drawing</title>
     <para>
@@ -134,7 +183,7 @@
       them, are gone. This includes the <literal>gdk_draw</literal> family
       of functions like gdk_draw_rectangle() and gdk_draw_drawable(). As
       #GdkGC is roughly equivalent to #cairo_t and #GdkImage was used for
-      drawing images to GdkDrawables, which cairo supports automatically,
+      drawing images to GdkWindows, which cairo supports automatically,
       a transition is usually straightforward.
     </para>
     <para>
@@ -143,7 +192,7 @@
       was replaced.
     </para>
     <example>
-       <title>Drawing a GdkPixbuf onto a GdkDrawable</title>
+       <title>Drawing a GdkPixbuf onto a GdkWindow</title>
          <para>
            Drawing a pixbuf onto a drawable used to be done like this:
 <programlisting><![CDATA[
@@ -170,7 +219,7 @@ cairo_destroy (cr);
          </para>
       </example>
       <example>
-        <title>Drawing a tiled GdkPixmap to a GdkDrawable</title>
+        <title>Drawing a tiled GdkPixmap to a GdkWindow</title>
         <para>
           Tiled pixmaps are often used for drawing backgrounds.
           Old code looked something like this:
@@ -954,6 +1003,8 @@ gtk_arrow_draw (GtkWidget *widget,
   </para>
   </section>
 
+  <xi:include href="migrating-GtkStyleContext.xml" />
+
   </section>
 
 </chapter>

docs/reference/gtk/migrating-ClientSideWindows.sgml

@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-ClientSideWindows">
-
-  <title>Migrating to client-side windows</title>
-
-  <para>
-    In version 2.18, GDK has been changed to use client-side windows. This
-    means that there is no longer a 1-1 correspondence between #GdkWindows
-    and windows in the underlying window system. In particular, it is no
-    longer correct to assume that each window has an associated XID.
-    Code that makes this assumption can sometimes be fixed by calling
-    gdk_window_ensure_native() on the windows in question.
-    Calling gdk_x11_drawable_get_xid() (or GDK_WINDOW_XID()) from the
-    X11-specific API on a non-native window will explicitly call
-    gdk_window_ensure_native(), so old code using this will continue to
-    work. A small gotcha is that the GDK_WINDOW_XID() call is no longer a
-    trivial accessor for the XID of the window, and thus must not be called
-    from another thread without taking locking precautions.
-  </para>
-
-  <para>
-    GDK looks for the <envar>GDK_NATIVE_WINDOWS</envar> environment variable
-    and makes all windows native if it is set. It also tries to be more
-    compatible with the way prior versions worked in some other ways.
-  </para>
-
-  <para>
-    Some applications assume that they can just operate on the X windows
-    corresponding to their GDK windows without ever telling GDK. One
-    example that we've seen is changing the child window stacking order
-    using XRestackWindows(). Fixing this properly requires to fix the code
-    to use GDK functions to achieve whatever it is trying to achieve.
-    To make this easier in the case of stacking order changes, we've added
-    a gdk_window_restack() function.
-  </para>
-
-  <para>
-    One change that can cause problems for some applications is that GDK
-    is more aggressive about optimizing away expose events. Code that does
-    more than just repainting exposed areas in response to expose events
-    may be affected by this.
-  </para>
-
-  <para>
-    Problems can also occur when using cairo for drawing. One thing that can
-    go wrong is clip handling. If you ever need to reset the clip region on
-    a cairo_t (i.e. use cairo_reset_clip()), you have to to use
-    gdk_cairo_reset_clip() instead. The reason for this is that the cairo_reset_clip() call will remove the initial clip region that limits your drawing to
-    the client-side window at hand, so you will end up drawing over stuff
-    outside the window. You also need to use gdk_cairo_reset_clip() if you
-    use a cairo_t that was not allocated in a double-buffered expose handler
-    and keep it in use after window hierarchy changes (resizing, moving,
-    stacking order changes). The easiest fix for this kind of problem is to
-    simply create a new cairo context for each expose event.
-  </para>
-
-  <para>
-    Due to a weird API in XClearArea the gdk_window_clear_area() call handled
-    a specified width or height of zero to mean "to end of window" for
-    non-double-buffered drawing. This has been changed to be consistent with
-    the docs and what happens in the double-buffered case. All code in GTK+
-    that relied on this has been fixed, but it is possible (although unlikely)
-    that third party applications rely on this. If you need to do this, just
-    implement it yourself using gdk_drawable_get_size().
-  </para>
-
-</chapter>

docs/reference/gtk/migrating-GtkAboutDialog.sgml

@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkAboutDialog">
-
-  <title>Migrating from GnomeAbout to GtkAboutDialog</title>
-
-  <para>
-    Since version 2.6, GTK+ provides the #GtkAboutDialog widget as a 
-    replacement for the <structname>GnomeAbout</structname> dialog in 
-    the libgnomeui library.
-  </para>
-
-  <para>
-    #GtkAboutDialog supports all features found in <structname>GnomeAbout</structname>.
-    The <structname>GtkAboutDialog</structname> API is bigger, since it follows 
-    the GTK+ policy to have getters and setters for all widget properties, 
-    but it isn't much more complex than <structname>GnomeAbout</structname>.
-  </para>
-
-  <para>
-    To convert an application that uses <structname>GnomeAbout</structname> to 
-    <structname>GtkAboutDialog</structname>, as a first step, replace calls 
-    like
-    <informalexample><programlisting>
-    const gchar *documentors[] = { 
-      "Documenter 1", 
-      "Documenter 2", 
-      NULL 
-    };
-
-    const gchar *documentors[] = { 
-      "Author 1", 
-      "Author 2", 
-      NULL 
-    };
-
-    GtkWidget *about = gnome_about_new ("GNOME Test Program", VERSION,
-					"(C) 1998-2001 The Free Software Foundation",
-					"Program to display GNOME functions.",
-					authors,
-					documenters,
-					_("translator-credits"),
-					"logo.png");
-    </programlisting></informalexample>
-    by something like 
-    <informalexample><programlisting>
-    GdkPixbuf *logo = gdk_pixbuf_new_from_file ("logo.png", NULL);
-    GtkWidget *about = g_object_new (GTK_TYPE_ABOUT_DIALOG,
-                                     "name", "GNOME Test Program", 
-                                     "version", VERSION,
-			             "copyright", "(C) 1998-2001 The Free Software Foundation",
-				     "comments", "Program to display GNOME functions.",
-			             "authors", authors,
-			             "documenters", documenters,
-			             "translator-credits", _("translator-credits"),
-				     "logo", logo,
-                                     NULL);
-    g_object_unref (pixbuf);
-    </programlisting></informalexample>
-    If the g_object_new() construction scares you, you can also use 
-    gtk_about_dialog_new() to construct the dialog and then use the 
-    setters for the individual properties.
-  </para>
-
-  <para>
-    Once you are done with the initial conversion, you may want to look into 
-    using some of the features of <structname>GtkAboutDialog</structname> 
-    which are not present in <structname>GnomeAbout</structname>.
-    <itemizedlist>
-      <listitem><para>
-        You can specify license information with the 
-        #GtkAboutDialog:license property
-      </para></listitem>
-      <listitem><para>
-        You can add separate credits for artists with the 
-        #GtkAboutDialog:artists property
-      </para></listitem>
-      <listitem><para>
-        You can add a pointer to the website of your application, using the 
-        #GtkAboutDialog:website and #GtkAboutDialog:website-label properties.
-      </para></listitem>
-      <listitem><para>
-        If your credits contain email addresses or URLs, you can turn them 
-        into clickable links using gtk_about_dialog_set_email_hook() and 
-        gtk_about_dialog_set_url_hook(). 
-      </para></listitem>   
-    </itemizedlist>
-  </para>
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkAction.sgml

@@ -1,445 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkAction">
-  <chapterinfo>
-    <author>
-      <firstname>Federico</firstname>
-      <surname>Mena-Quintero</surname>
-      <affiliation>
-	<address>
-	  <email>federico@ximian.com</email>
-	</address>
-      </affiliation>
-    </author>
-  </chapterinfo>
-
-  <title>Migrating from old menu and toolbar systems to GtkAction</title>
-
-  <para>
-    Prior to GTK+ 2.4, there were several APIs in use to create menus
-    and toolbars.  GTK+ itself included #GtkItemFactory, which was
-    historically used in the GIMP; libgnomeui provided the gnome-ui
-    set of macros; libbonoboui provided a complex mechanism to do menu
-    merging across embedded components.  GTK+ 2.4 includes a system
-    for creating menus and toolbars, with merging of items, based
-    around the #GtkAction mechanism.
-  </para>
-
-  <section id="actions-and-action-groups">
-    <title>Actions and Action Groups</title>
-
-    <para>
-      A #GtkAction represents an operation that the user can perform from 
-      the menus and toolbars of an application.  It is similar to "verbs" 
-      in other menu systems.  A #GtkAction has a name, which is its identifier, 
-      and it can have several widgets that represent it in the user interface.  
-      For example, an action for <symbol>EditCopy</symbol> can have a menu item 
-      as well as a toolbar button associated to it.  If there is nothing selected
-      in the document, the application can simply de-sensitize the
-      <symbol>EditCopy</symbol> action; this will cause both the menu
-      item and the toolbar button to be de-sensitized automatically.
-      Similarly, whenever the user selects the menu item or the
-      toolbar button associated to the <symbol>EditCopy</symbol>
-      action, the corresponding #GtkAction object will emit an
-      "activate" signal.
-    </para>
-
-    <para>
-      #GtkActionGroup is simply a group of #GtkAction objects.  An
-      application may want to have several groups:  one for global
-      actions such as "new document", "about", and "exit"; then one
-      group for each open document with actions specific to the
-      document, such as "cut", "copy", "paste", and "print".
-    </para>
-
-    <para>
-      Normal actions are simply commands, such as
-      <symbol>FileSave</symbol> or <symbol>EditCopy</symbol>.  
-      Toggle actions can be active or inactive, such as
-      <symbol>FormatBold</symbol> or <symbol>ViewShowRulers</symbol>.
-      Radio actions define a set of items for which one and only one
-      can be active at a time, for example, {
-      <symbol>ViewHighQuality</symbol>,
-      <symbol>ViewNormalQuality</symbol>,
-      <symbol>ViewLowQuality</symbol> }.
-    </para>
-  </section>
-
-  <section id="ui-manager">
-    <title>User Interface Manager Object</title>
-
-    <para>
-      #GtkUIManager is an object that can construct menu and toolbar widgets 
-      from an XML description.  These widgets are in turn associated to
-      corresponding actions and action groups.
-    </para>
-
-    <para>
-      #GtkUIManager supports merging of menus and toolbars for applications 
-      that have multiple components, each with separate sets of commands.  
-      For example, a word processor that can embed images may want to have
-      toolbar buttons for Bold and Italic when the cursor is on a text
-      block, but Crop and Brightness/Contrast buttons when the cursor
-      is on an image.  These actions, which change depending on the
-      state of the application, can be merged and de-merged from a
-      #GtkUIManager as appropriate.
-    </para>
-  </section>
-
-  <section id="migrating-gnomeuiinfo">
-    <title>Migrating from GnomeUIInfo</title>
-
-    <para>
-      Prior to GTK+ 2.4, some applications used the GnomeUIInfo
-      mechanism from
-      <filename>&lt;libgnomeui/gnome-app-helper.h&gt;</filename> to
-      define their menus and toolbars.  With it, a program decleres an
-      array of <structname>GnomeUIInfo</structname> structures, which
-      contain information for menu or toolbar items such as their
-      label, icon, and accelerator key.  Then, one calls
-      gnome_app_fill_menu() or gnome_app_fill_toolbar(), or one of the
-      related functions, to create the appropriate widgets based on
-      these structures.
-    </para>
-
-    <para>
-      A downside of this API is that the same structures are used to
-      pass back pointers to the widgets that got created.  This means
-      that the structures cannot simply be kept around if the program
-      requires multiple instances of the user interface (e.g. several
-      windows); each new invocation of gnome_app_fill_menu() would 
-      overwrite the widget fields of the structures.
-    </para>
-
-    <para>
-      Another disadvantage is that there is no automatic way to
-      synchronize the state of related controls.  If there are toolbar
-      toogle buttons for "Bold", "Italic", "Underline", and also
-      corresponding menu items under "Format/Bold", etc., one has to
-      synchronize their toggled states by hand whenever the user
-      selects any one of them.
-    </para>
-
-    <para>
-      Finally, there is no way to do menu and toolbar merging for
-      applications that require embedded components.
-    </para>
-
-    <para>
-      To convert an application that uses GnomeUIInfo into the new
-      GtkAction mechanism, you need to do several things:
-    </para>
-
-    <orderedlist>
-      <listitem>
-	<para>
-	  Separate your existing GnomeUIInfo entries into normal
-	  actions, toggle actions, and radio actions, and then create
-	  a separate array of #GtkActionEntry structures
-	  for each group.  This will allow you to create the necessary
-	  #GtkActionGroup objects.  Note that this does not describe 
-          the actual "shape" that your menus and toolbars will have; 
-          it simply defines the set of commands that will appear in them.
-	</para>
-      </listitem>
-      <listitem>
-	<para>
-	  Create an XML description of your menus and toolbars for use
-	  with #GtkUIManager.  This defines the actual shape of the menus 
-          and toolbars.
-	</para>
-      </listitem>
-      <listitem>
-	<para>
-	  Port the code that uses gnome-app and gnome-app-helper to
-	  #GtkAction and #GtkUIManager.
-	</para>
-      </listitem>
-      <listitem>
-       <para>
-         If your GnomeUIInfo entries use GNOME_APP_PIXMAP_DATA or 
-         GNOME_APP_PIXMAP_FILENAME for pixmaps, you have to create a 
-         #GtkIconFactory, add it to the list of default factories, then 
-         create a #GtkIconSet for each of your own icons. Add the sets to 
-         the factory, and use the id in the #GtkActionEntry like a regular 
-         GTK+ stock id.
-       </para>
-      </listitem>
-    </orderedlist>
-
-    <example id="gnomeuiinfo-example">
-      <title>GnomeUIInfo Example</title>
-
-      <para>
-	The following code shows a declaration of a simple menu bar to
-	be used with gnome_app_fill_menu() or similar.  The menu hierarchy i
-        looks like this:
-      </para>
-
-      <itemizedlist>
-	<listitem>
-	  <para><guimenu>File</guimenu></para>
-	  <simplelist>
-	    <member><guimenuitem>Open</guimenuitem></member>
-	    <member><guimenuitem>&mdash;</guimenuitem></member>
-	    <member><guimenuitem>Exit</guimenuitem></member>
-	  </simplelist>
-	</listitem>
-
-	<listitem>
-	  <para><guimenu>View</guimenu></para>
-	  <simplelist>
-	    <member><guimenuitem>Zoom In</guimenuitem></member>
-	    <member><guimenuitem>Zoom Out</guimenuitem></member>
-	    <member><guimenuitem>&mdash;</guimenuitem></member>
-	    <member><guimenuitem>[ ] Full Screen</guimenuitem></member>
-	    <member><guimenuitem>&mdash;</guimenuitem></member>
-	    <member><guimenuitem>( ) High Quality</guimenuitem></member>
-	    <member><guimenuitem>( ) Normal Quality</guimenuitem></member>
-	    <member><guimenuitem>( ) Low Quality</guimenuitem></member>
-	  </simplelist>
-	</listitem>
-      </itemizedlist>
-
-      <programlisting>
-static GnomeUIInfo file_menu_items[] = {
-  { GNOME_APP_UI_ITEM, "_Open", "Open a file",
-    open_callback, NULL, NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_OPEN,
-    'o', GDK_CONTROL_MASK, NULL },
-  { GNOME_APP_UI_SEPARATOR },
-  { GNOME_APP_UI_ITEM, "E_xit", "Exit the program",
-    exit_callback, NULL, NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_QUIT,
-    'q', GDK_CONTROL_MASK, NULL},
-  { GNOME_APP_UI_ENDOFINFO }
-};
-
-static GnomeUIInfo view_radio_items[] = {
-  { GNOME_APP_UI_ITEM, "_High Quality", "Display images in high quality, slow mode",
-    high_quality_callback, NULL, NULL, GNOME_APP_PIXMAP_FILENAME, "high-quality.png",
-    0, 0, NULL },
-  { GNOME_APP_UI_ITEM, "_Normal Quality", "Display images in normal quality",
-    normal_quality_callback, NULL, NULL, GNOME_APP_PIXMAP_FILENAME, "normal-quality.png",
-    0, 0, NULL },
-  { GNOME_APP_UI_ITEM, "_Low Quality", "Display images in low quality, fast mode",
-    low_quality_callback, NULL, NULL, GNOME_APP_PIXMAP_FILENAME, "low-quality.png",
-    0, 0, NULL },
-  { GNOME_APP_UI_ENDOFINFO }
-};
-
-static GnomeUIInfo view_menu_items[] = {
-  { GNOME_APP_UI_ITEM, "Zoom _In", "Zoom into the image",
-    zoom_in_callback, NULL, NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_ZOOM_IN,
-    GDK_PLUS, 0, NULL },
-  { GNOME_APP_UI_ITEM, "Zoom _Out", "Zoom away from the image",
-    zoom_out_callback, NULL, NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_ZOOM_OUT,
-    GDK_MINUS, 0, NULL },
-  { GNOME_APP_UI_SEPARATOR },
-  { GNOME_APP_UI_TOGGLEITEM, "_Full Screen", "Switch between full screen and windowed mode",
-    full_screen_callback, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL,
-    GDK_F11, 0, NULL },
-  { GNOME_APP_UI_SEPARATOR },
-  { GNOME_APP_UI_RADIOITEMS, NULL, NULL, view_radio_items },
-  { GNOME_APP_UI_ENDOFINFO }
-};
-
-static GnomeUIInfo menubar[] = {
-  { GNOME_APP_UI_SUBTREE, "_File", NULL, file_menu_items },
-  { GNOME_APP_UI_SUBTREE, "_View", NULL, view_menu_items },
-  { GNOME_APP_UI_ENDOFINFO }
-}
-      </programlisting>
-    </example>
-
-    <example id="gnomeuiinfo-action-entries">
-      <title><structname>GtkActionEntry</structname> Structures</title>
-
-      <para>
-	The following code is the set of actions that are present in
-	the <link linkend="gnomeuiinfo-example">previous
-	example</link>.  Note that the toggle and radio entries are
-	separate from normal actions.  Also, note that #GtkActionEntry 
-        structures take key names in the format of gtk_accelerator_parse() 
-        rather than key values plus modifiers; you will have to convert these
-	values by hand.  For example, %GDK_F11 with no modifiers is equivalent 
-        to a key name of <literal>"F11"</literal>.  Likewise, <literal>"o"</literal>
-	with %GDK_CONTROL_MASK is equivalent to <literal>"&lt;ontrol&gt;O"</literal>.
-      </para>
-
-      <programlisting>
-/* Normal items */
-static const GtkActionEntry entries[] = {
-  { "FileMenu", NULL, "_File" },
-  { "ViewMenu", NULL, "_View" },
-  { "Open", GTK_STOCK_OPEN, "_Open", "&lt;control&gt;O", "Open a file", open_action_callback },
-  { "Exit", GTK_STOCK_QUIT, "E_xit", "&lt;control&gt;Q", "Exit the program", exit_action_callback },
-  { "ZoomIn", GTK_STOCK_ZOOM_IN, "Zoom _In", "plus", "Zoom into the image", zoom_in_action_callback },
-  { "ZoomOut", GTK_STOCK_ZOOM_OUT, "Zoom _Out", "minus", "Zoom away from the image", zoom_out_action_callback },
-};
-
-/* Toggle items */
-static const GtkToggleActionEntry toggle_entries[] = {
-  { "FullScreen", NULL, "_Full Screen", "F11", "Switch between full screen and windowed mode", full_screen_action_callback, FALSE }
-};
-
-/* Radio items */
-static const GtkRadioActionEntry radio_entries[] = {
-  { "HighQuality", "my-stock-high-quality", "_High Quality", NULL, "Display images in high quality, slow mode", 0 },
-  { "NormalQuality", "my-stock-normal-quality", "_Normal Quality", NULL, "Display images in normal quality", 1 },
-  { "LowQuality", "my-stock-low-quality", "_Low Quality", NULL, "Display images in low quality, fast mode", 2 }
-};
-      </programlisting>
-    </example>
-
-    <example id="gnomeuiinfo-xml">
-      <title>XML Description</title>
-
-      <para>
-	After extracting the actions, you will need to create an XML
-	description of the actual layout of your menus and toolbars
-	for use with #GtkUIManager. The following code shows a simple 
-        menu bar that corresponds to the <link linkend="gnomeuiinfo-example">previous
-	example</link>.  Note that the <guimenu>File</guimenu> and
-	<guimenu>View</guimenu> menus have their names specified in
-	the <link linkend="gnomeuiinfo-action-entries">action
-	entries</link>, not in the XML itself.  This is because the
-	XML description only contains <emphasis>identifiers</emphasis>
-	for the items in the GUI, rather than human-readable names.
-      </para>
-
-      <programlisting>
-static const char *ui_description =
-"&lt;ui&gt;"
-"  &lt;menubar name='MainMenu'&gt;"
-"    &lt;menu action='FileMenu'&gt;"
-"      &lt;menuitem action='Open'/&gt;"
-"      &lt;menuitem action='Exit'/&gt;"
-"    &lt;/menu&gt;"
-"    &lt;menu action='ViewMenu'&gt;"
-"      &lt;menuitem action='ZoomIn'/&gt;"
-"      &lt;menuitem action='ZoomOut'/&gt;"
-"      &lt;separator/&gt;"
-"      &lt;menuitem action='FullScreen'/&gt;"
-"      &lt;separator/&gt;"
-"      &lt;menuitem action='HighQuality'/&gt;"
-"      &lt;menuitem action='NormalQuality'/&gt;"
-"      &lt;menuitem action='LowQuality'/&gt;"
-"    &lt;/menu&gt;"
-"  &lt;/menubar&gt;"
-"&lt;/ui&gt;";
-      </programlisting>
-    </example>
-
-    <example id="gnomeuiinfo-code">
-      <title>Creating the Menu Bar</title>
-
-      <para>
-	In this last example, we will create a #GtkActionGroup based on the
-	<link linkend="gnomeuiinfo-action-entries">action entries</link> 
-        we created above.  We will then create a #GtkUIManager with the <link
-	linkend="gnomeuiinfo-xml">XML description</link> of the menu
-	layout.  We will also extract the accelerator group and the
-	widgets from the #GtkUIManager put them into a window.
-      </para>
-
-      <programlisting>
-GtkWidget *window;
-GtkWidget *vbox;
-GtkWidget *menubar;
-GtkActionGroup *action_group;
-GtkUIManager *ui_manager;
-GtkAccelGroup *accel_group;
-GError *error;
-
-register_my_stock_icons (<!-- -->);
-
-window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-vbox = gtk_vbox_new (FALSE, 0);
-gtk_container_add (GTK_CONTAINER (window), vbox);
-
-action_group = gtk_action_group_new ("MenuActions");
-gtk_action_group_add_actions (action_group, entries, G_N_ELEMENTS (entries), window);
-gtk_action_group_add_toggle_actions (action_group, toggle_entries, G_N_ELEMENTS (toggle_entries), window);
-gtk_action_group_add_radio_actions (action_group, radio_entries, G_N_ELEMENTS (radio_entries), 0, radio_action_callback, window);
-
-ui_manager = gtk_ui_manager_new (<!-- -->);
-gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
-
-accel_group = gtk_ui_manager_get_accel_group (ui_manager);
-gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-
-error = NULL;
-if (!gtk_ui_manager_add_ui_from_string (ui_manager, ui_description, -1, &amp;error))
-  {
-    g_message ("building menus failed: %s", error-&gt;message);
-    g_error_free (error);
-    exit (EXIT_FAILURE);
-  }
-
-menubar = gtk_ui_manager_get_widget (ui_manager, "/MainMenu");
-gtk_box_pack_start (GTK_BOX (vbox), menubar, FALSE, FALSE, 0);
-
-gtk_widget_show_all (window);
-      </programlisting>
-    </example>
-
-    <example id="gnomeuiinfo-icons">
-      <title>Registering the icons</title>
-
-      <para>
-	Here we show how the register_my_stock_icons() function
-        used in the previous example could look like.
-      </para>
-
-      <programlisting>
-static struct { 
-  gchar *filename;
-  gchar *stock_id;
-} stock_icons[] = {
-  { "high-quality.png", "my-stock-high-quality" },
-  { "normal-quality.png", "my-stock-normal-quality" },
-  { "low-quality.png", "my-stock-low-quality" },
-};
- 
-static gint n_stock_icons = G_N_ELEMENTS (stock_icons);
-
-static void
-register_my_stock_icons (void)
-{
-   GtkIconFactory *icon_factory;
-   GtkIconSet *icon_set; 
-   GtkIconSource *icon_source;
-   gint i;
-
-   icon_factory = gtk_icon_factory_new (<!-- -->);
-   
-   for (i = 0; i &lt; n_stock_icons; i++) 
-    {
-      icon_set = gtk_icon_set_new (<!-- -->);
-      icon_source = gtk_icon_source_new (<!-- -->);
-      gtk_icon_source_set_filename (icon_source, stock_icons[i].filename);
-      gtk_icon_set_add_source (icon_set, icon_source);
-      gtk_icon_source_free (icon_source);
-      gtk_icon_factory_add (icon_factory, stock_icons[i].stock_id, icon_set);
-      gtk_icon_set_unref (icon_set);
-    }
-
-   gtk_icon_factory_add_default (icon_factory); 
-
-   g_object_unref (icon_factory);
-}
-      </programlisting>
-    </example>
-
-  </section>
-
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkAssistant.sgml

@@ -1,178 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkAssistant">
-  <chapterinfo>
-    <author>
-      <firstname>Carlos</firstname>
-      <surname>Garnacho</surname>
-      <affiliation>
-	<address>
-	  <email>carlosg@gnome.org</email>
-	</address>
-      </affiliation>
-    </author>
-  </chapterinfo>
-
-  <title>Migrating from GnomeDruid to GtkAssistant</title>
-
-  <para>
-    Since version 2.10, GTK+ provides the GtkAssistant widget as a replacement
-    for the <structname>GnomeDruid</structname> widget in the libgnomeui 
-    library.
-  </para>
-
-  <para>
-    Conceptually, both <structname>GtkAssistant</structname> and
-    <structname>GnomeDruid</structname> do the same task, but there are 
-    several areas where the API has been completely redesigned, so this 
-    chapter covers the main changes between both widgets.
-  </para>
-
-  <section id="inserting-pages">
-    <title>Inserting pages</title>
-
-    <para>
-      <structname>GnomeDruid</structname> was implemented as a container for
-	 <structname>GnomeDruidPage</structname> abstract objects, which are
-         implemented by the <structname>GnomeDruidPageEdge</structname> and 
-         <structname>GnomeDruidPageStandard</structname> widgets. Instead, 
-         <structname>GtkAssistant</structname> allows any widget to be a page, 
-         and implements per-page settings (such as page type or title) as 
-         child properties. So instead of:
-    </para>
-
-    <programlisting>
-/* Page 1 */
-page = gnome_druid_page_edge_new (GNOME_EDGE_START);
-gnome_druid_page_edge_set_test (GNOME_DRUID_PAGE_EDGE (page),
-                                "Welcome to the assistant, it will make your life easier");
-gtk_widget_show (page);
-gnome_druid_append_page (GNOME_DRUID (druid), GNOME_DRUID_PAGE (page));
-
-/* Page 2 */
-page = gnome_druid_page_standard_new ();
-gtk_container_add (GTK_CONTAINER (GNOME_DRUID_PAGE_STANDARD (page)->vbox,
-                   create_page1 ());
-gtk_widget_show_all (page);
-gnome_druid_append_page (GNOME_DRUID (druid), GNOME_DRUID_PAGE (page));
-
-/* Page 3 */
-page = gnome_druid_page_edge_new (GNOME_EDGE_FINISH);
-gnome_druid_page_edge_set_test (GNOME_DRUID_PAGE_EDGE (page),
-                                "Now you are done, your life is easier");
-gtk_widget_show (page);
-gnome_druid_append_page (GNOME_DRUID (druid), GNOME_DRUID_PAGE (page));
-    </programlisting>
-
-    <para>
-      You have to write:
-    </para>
-
-    <programlisting>
-gtk_assistant_append_page (GTK_ASSISTANT (assistant),
-                           gtk_label_new ("Welcome to the assistant, it will make your life easier"));
-gtk_assistant_append_page (GTK_ASSISTANT (assistant),
-                           create_page1 ());
-gtk_assistant_append_page (GTK_ASSISTANT (assistant),
-                           gtk_label_new ("Now you are done, your life is easier");
-    </programlisting>
-  </section>
-
-  <section id="decorating-the-assistant-pages">
-    <title>Decorating the assistant pages</title>
-
-    <para>
-      To decorate your assistant pages, <structname>GtkAssistant</structname> provides similar functions
-	 to <structname>GnomeDruid</structname>, so you have to transform code like this:
-    </para>
-
-    <programlisting>
-gnome_druid_page_edge_set_title (GNOME_DRUID_PAGE_EDGE (page), "Welcome");
-gnome_druid_page_edge_set_logo (GNOME_DRUID_PAGE_EDGE (page), logo_pixbuf);
-gnome_druid_page_edge_set_watermark (GNOME_DRUID_PAGE_EDGE (page), watermark_pixbuf);
-    </programlisting>
-
-    <para>
-    Into this:
-    </para>
-
-    <programlisting>
-gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page_widget, "Welcome");
-gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), page_widget, logo_pixbuf);
-gtk_assistant_set_page_side_image (GTK_ASSISTANT (assistant), page_widget, watermark_pixbuf);
-    </programlisting>
-
-    <para>
-      Where page_widget is the widget used as a page.
-    </para>
-  </section>
-
-  <section id="setting-the-page-flow">
-    <title>Setting the page flow</title>
-
-    <para>
-      Here is the area where <structname>GtkAssistant</structname> and <structname>GnomeDruid</structname>
-	 differ the most. While <structname>GnomeDruid</structname> used the "next" and "back" signals from the 
-	 <structname>GnomeDruidPage</structname>, <structname>GtkAssistant</structname> uses the following
-	 techniques:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-	   <para>gtk_assistant_set_forward_page_func (): Allows to define a GtkAssistantPageFunc to let the
-	   assistant know which will be the following page given the current page.</para>
-      </listitem>
-      <listitem>
-	   <para>gtk_assistant_set_page_complete (): Lets the assistant know whether the specified page is complete
-	   or not, updating buttons state accordingly.</para>
-      </listitem>
-      <listitem>
-	   <para>gtk_assistant_set_page_type (): Lets the assistant know the page role and update the buttons
-	   state accordingly. Pages can have the following roles:</para>
-	   <simplelist>
-	     <member>Intro</member>
-		<member>Content</member>
-		<member>Progress</member>
-		<member>Confirmation</member>
-		<member>Summary</member>
-	   </simplelist>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      A sample GtkAssistantPageFunc could look like this:
-    </para>
-
-    <programlisting>
-static gint
-forward_page_function (gint     current_page,
-                       gpointer data)
-{
-  switch (current_page)
-    {
-    case 0:
-      return 1;
-    case 1:
-      if (check_page1_data ())
-	   return 2;
-	 else
-	   return 3;
-    case 2:
-      return 3;
-    default:
-      return -1;
-    }
-}
-    </programlisting>
-
-  </section>
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkBuilder.sgml

@@ -1,102 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkBuilder">
-
-  <title>Migrating from libglade to GtkBuilder</title>
-
-  <para>
-    Since version 2.12, GTK+ provides #GtkBuilder to construct
-    user interfaces from XML descriptions, similar to the functionality
-    provided by #GladeXML in the libglade library.
-  </para>
-
-  <para>
-    A good way to start a migration from libglade to GtkBuilder is using
-    <application>glade3</application> to convert your .glade file.
-    If your code uses the @root parameter of glade_xml_new(),
-    you can use gtk_builder_add_objects_from_file() to construct only certain
-    objects from a GtkBuilder file.
-  </para>
-
-  <para>
-    Alternatively, GTK+ also offers the
-    <link linkend="gtk-builder-convert">gtk-builder-convert</link> script you can use
-    to do the conversion; in which case you should be careful to inspect the output
-    and make sure you didn't lose any data.
-  </para>
-
-  <table pgwide="1" frame="topbot">
-    <title>Step-by-step instructions for porting code from libglade to GtkBuilder</title>
-    <tgroup cols="2" colsep="0" rowsep="0">
-      <thead>
-        <row><entry>libglade</entry><entry>GtkBuilder</entry></row>
-      </thead>
-      <tbody>
-        <row>
-          <entry><![CDATA[#include <glade/glade.h>]]></entry>
-          <entry>not needed</entry>
-        </row>
-        <row>
-          <entry><screen>GladeXML*</screen></entry>
-          <entry><screen>GtkBuilder*</screen></entry>
-        </row>
-        <row>
-          <entry><screen>glade_xml_new (FILE, "first_widget", NULL)</screen></entry>
-          <entry>
-<screen>
-GError* error = NULL;
-GtkBuilder* builder = gtk_builder_new (<!-- -->);
-if (!gtk_builder_add_from_file (builder, FILE, &amp;error))
-  {
-    g_warning ("Couldn't load builder file: &percnt;s", error->message);
-    g_error_free (error);
-  }
-</screen>
-          </entry>
-        </row>
-        <row>
-          <entry><screen>glade_xml_get_widget (gxml, “widget_name”)</screen></entry>
-          <entry><screen>GTK_WIDGET (gtk_builder_get_object (builder, “widget_name”))</screen></entry>
-        </row>
-        <row>
-          <entry><screen>glade_get_widget_name (widget)</screen></entry>
-          <entry><screen>gtk_widget_get_name (widget)</screen></entry>
-        </row>
-        <row>
-          <entry><screen>glade_xml_get_widget_prefix (gxml, “prefix”)</screen></entry>
-          <entry>can be emulated by <literal>gtk_builder_get_objects (builder)</literal> together with manual filtering. It returns a GSList* instead of a GList* though.</entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </table>
-
-  <para>
-    While GtkBuilder strives to be a complete replacement for
-    libglade, there are a number of areas where it is currently
-    still behind libglade:
-    <itemizedlist>
-
-      <listitem><para>
-        GtkBuilder supports context information in translatable
-        properties in a slightly different way than libglade.
-        Intltool does not yet support this; see
-        <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=454894">bug
-        454894</ulink> for the current status of intltool support for
-        GtkBuilder files. Thankfully, context in translations is a
-        rarely used feature, and if you are not using it, intltools
-        glade format support works just fine for GtkBuilder files.
-      </para></listitem>
-
-      <listitem><para>
-        While libglade can often tolerate multiple widgets having the
-        same id in a glade file, GtkBuilder will not accept duplicate
-        object ids. Both <application>gtk-builder-convert</application>
-        and the GtkBuilder parser emit warnings when they see
-        duplicate ids.
-      </para></listitem>
-  </itemizedlist>
-  </para>
-
-</chapter>

docs/reference/gtk/migrating-GtkColorButton.sgml

@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkColorButton">
-
-  <title>Migrating from GnomeColorPicker to GtkColorButton</title>
-
-  <para>
-    Since version 2.6, GTK+ provides the #GtkColorButton
-    widget as a replacement for the <structname>GnomeColorPicker</structname> 
-    widget in the libgnomeui library.
-  </para>
-
-  <para>
-   Porting an application from <structname>GnomeColorPicker</structname> to 
-   <structname>GtkColorButton</structname> is very simple. 
-   <structname>GtkColorButton</structname> doesn't support dithering 
-   (since it is rarely needed on modern hardware), and it doesn't have 
-   setters and getters to set the color from floating point or integer 
-    components. So instead of
-   <informalexample><programlisting>
-   guint red, green, blue, alpha;
-   /* ... */
-   gnome_color_picker_set_i8 (color_picker, red, green, blue, alpha);
-   </programlisting></informalexample>   
-   you have to write
-   <informalexample><programlisting>
-   GdkColor color;
-
-   color.red = red &lt;&lt; 8;
-   color.green = green &lt;&lt; 8;
-   color.blue = blue &lt;&lt; 8;
-   gtk_color_button_set_color (color_picker, &amp;color);
-   gtk_color_button_set_alpha (color_picker, alpha &lt;&lt; 8);
-   </programlisting></informalexample>   
-  and similarly for the setters taking other number formats. For 
-  <function>gnome_color_picker_set_i16()</function> no conversion is needed, 
-  for <function>gnome_color_picker_set_d()</function>, you need to convert 
-  the color components like this:
-   <informalexample><programlisting>  
-   color.red = (guint16) (red * 65535.0 + 0.5);
-   color.green = (guint16) (green * 65535.0 + 0.5);
-   color.blue = (guint16) (blue * 65535.0 + 0.5);
-   </programlisting></informalexample>   
-  </para>
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkComboBox.sgml

@@ -1,213 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkComboBox">
-
-  <title>Migrating from GtkOptionMenu and GtkCombo to GtkComboBox and 
-         GtkComboBoxEntry</title>
-
-  <para>
-    Prior to 2.4, GTK+ offered two widgets for the task of selecting one
-    item from a list of options. #GtkOptionMenu presents the list of 
-    options as a menu while #GtkCombo presents them in a Windows-style list 
-    popup. The only difference between the two is that a #GtkCombo allows to 
-    manually edit the selected value, while the #GtkOptionMenu does not.
-  </para> 
-  <para>
-    In GTK+ 2.4, a unified API for list selection was introduced, with 
-    #GtkComboBox for the non-editable case and #GtkComboBoxEntry for the 
-    editable case. 
-    The selection of the display style &mdash; menu or list &mdash;
-    is no longer done at the API level, but has been made themeable via
-    the style property #GtkComboBox:appears-as-list.
-  </para>
-
-  <section id="migrating-GtkOptionMenu">
-    <title>Migrating from GtkOptionMenu to GtkComboBox</title>
-    
-    <para>
-      Here is an example of a simple, but typical use of 
-      #GtkOptionMenu<!---->:
-      <informalexample><programlisting>
-GtkWidget *option_menu, *menu, *menu_item;
-
-option_menu = gtk_option_menu_new (<!-- -->);      
-menu = gtk_menu_new (<!-- -->);
-
-menu_item = gtk_menu_item_new_with_label ("First Item");
-gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-gtk_widget_show (menu_item);
-menu_item = gtk_menu_item_new_with_label ("Second Item");
-gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-gtk_widget_show (menu_item);
-menu_item = gtk_menu_item_new_with_label ("Third Item");
-gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-gtk_widget_show (menu_item);
-
-gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
-      </programlisting></informalexample>
-      In order to react to the user's selection, connect to the #GtkOptionMenu::changed
-      signal on the option menu and use gtk_option_menu_get_history()
-      to retrieve the index of the selected item.
-    </para>
-    <para>
-      And here is how it would be done with a #GtkComboBox<!---->:
-      <informalexample><programlisting>
-GtkWidget *combo_box;
-
-combo_box = gtk_combo_box_new_text (<!-- -->);
-
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "First Item");
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Second Item");
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Third Item");
-      </programlisting></informalexample>
-      In order to react to the user's selection, connect to the 
-      #GtkComboBox::changed signal and use gtk_combo_box_get_active()
-      to retrieve the index of the selected item.
-    </para>
-
-    <para>
-      A slightly more complex example involving images:
-      <informalexample><programlisting>
-GtkWidget *option_menu, *menu, *menu_item;
-
-option_menu = gtk_option_menu_new (<!-- -->);      
-menu = gtk_menu_new (<!-- -->);
-
-menu_item = gtk_image_menu_item_new_with_label ("First Item");
-gtk_image_menu_item_set_image (gtk_image_new_from_pixbuf (pixbuf1));
-gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-gtk_widget_show (menu_item);
-menu_item = gtk_image_menu_item_new_with_label ("Second Item");
-gtk_image_menu_item_set_image (gtk_image_new_from_pixbuf (pixbuf2));
-gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-gtk_widget_show (menu_item);
-menu_item = gtk_image_menu_item_new_with_label ("Third Item");
-gtk_image_menu_item_set_image (gtk_image_new_from_pixbuf (pixbuf3));
-gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-gtk_widget_show (menu_item);
-
-gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
-      </programlisting></informalexample>
-    </para>
-    <para>
-      can be done using a #GtkComboBox as follows:
-      <informalexample><programlisting>
-GtkListStore *store;
-GtkTreeIter iter;
-GtkCellRenderer *renderer;
-GtkWidget *combo_box;
-
-store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
-
-gtk_list_store_append (store, &amp;iter);
-gtk_list_store_set (store, &amp;iter, 0, pixbuf1, 1, "First Item", -1);
-gtk_list_store_append (store, &amp;iter);
-gtk_list_store_set (store, &amp;iter, 0, pixbuf2, 1, "Second Item", -1);
-gtk_list_store_append (store, &amp;iter);
-gtk_list_store_set (store, &amp;iter, 0, pixbuf3, 1, "Third Item", -1);
-
-combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));
-
-renderer = gtk_cell_renderer_pixbuf_new (<!-- -->);
-gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, FALSE);
-gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
-                                "pixbuf", 0,
-                                NULL);
-
-renderer = gtk_cell_renderer_text_new (<!-- -->);
-gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE);
-gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
-                                "text", 1,
-                                NULL);
-      </programlisting></informalexample>
-    </para>
-  </section>
-
-  <section id="migrating-GtkCombo">
-    <title>Migrating from GtkCombo to GtkComboBoxEntry</title>
-
-    <para>
-      Here is an example of a simple, but typical use of a #GtkCombo<!---->:
-      <informalexample><programlisting>
-GtkWidget *combo;
-GList *items = NULL;
-
-items = g_list_append (items, "First Item");
-items = g_list_append (items, "Second Item");
-items = g_list_append (items, "Third Item");
-
-combo = gtk_combo_new (<!-- -->);
-gtk_combo_set_popdown_strings (GTK_COMBO (combo), items);
-      </programlisting></informalexample>
-      In order to react to the user's selection, connect to the #GtkCombo::changed
-      signal on the combo and use 
-      <literal>gtk_entry_get_text (GTK_ENTRY (combo->entry))</literal>
-      to retrieve the selected text.
-    </para>
-    <para>
-      And here is how it would be done using #GtkComboBoxEntry<!---->:
-      <informalexample><programlisting>
-combo_box = gtk_combo_box_entry_new_text (<!-- -->);
-
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "First Item");
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Second Item");
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Third Item");
-      </programlisting></informalexample>
-      In order to react to the user's selection, connect to the #GtkComboBox::changed
-      signal on the combo and use 
-      <literal>gtk_entry_get_text (GTK_ENTRY (GTK_BIN (combo_box)->child))</literal>
-      to retrieve the selected text.
-    </para>
-  </section>
-
-  <section id="new-features-GtkComboBox">
-    <title>New features</title>
-
-    <para>
-      The new widgets have more to offer than a mere combination of the
-      features of #GtkOptionMenu and #GtkCombo. Notable new features 
-      include:
-      <variablelist>
-        <varlistentry>
-          <term>Grid mode</term>
-          <listitem><para>Sometimes it is preferable to display the available
-            options not in a linear list, but in a grid. A typical example 
-            would be a "color combo" where the individual items are small 
-	    square color swatches. The new widgets support gridded display 
-            with the functions 
-            gtk_combo_box_set_wrap_width(), 
-            gtk_combo_box_set_row_span_column() and 
-            gtk_combo_box_set_column_span_column().
-          </para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Display of icons</term>
-          <listitem><para>An often-heard complaint about #GtkOptionMenu is that 
-          the icons which appear in the image menu items in its menu are not
-	  displayed in the button showing the selected item. This limitation
-          has been removed in #GtkComboBox; the selected item appears in the 
-          same way as the options in the popup.
-          </para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Full tree model power</term>
-          <listitem><para>
-            Since the new widgets are built around the same models that are
-            used for #GtkTreeView, all of the powerful machinery of tree models 
-            and cell renderers can be used.
-          </para></listitem>
-        </varlistentry>
-      </variablelist>
-    </para>
-  </section>
-
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkEntry-icons.sgml

@@ -1,141 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-entry-icons">
-
-  <title>Migrating from SexyIconEntry to GtkEntry</title>
-
-  <para>
-    GTK+ 2.16 supports showing icons inside a #GtkEntry, similar to
-    SexyIconEntry. Porting from SexyIconEntry to GtkEntry is relatively
-    straightforward. The main difference between the two APIs is that
-    SexyIconEntry uses #GtkImage widgets in a somewhat awkward way as
-    storage vehicles for icons, while GtkEntry allows to specify icons
-    via pixbufs, stock ids, icon names or #GIcons. So, if your code uses
-    e.g.:
-<informalexample><programlisting>
-image = gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU);
-sexy_icon_entry_set_icon (entry, SEXY_ICON_ENTRY_PRIMARY, image);
-</programlisting></informalexample>
-    you can get rid of the @image, and directly write:
-<informalexample><programlisting>
-gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_NEW);
-</programlisting></informalexample>
-  </para>
-
-  <para>
-    The signals SexyIconEntry::icon-pressed and SexyIconEntry::icon-released
-    have been renamed to #GtkEntry::icon-press and #GtkEntry::icon-release
-    to avoid problems due to signal name clashes. Also, the signature of the
-    signals has changed from
-<informalexample><programlisting>
-void (*icon_pressed) (SexyIconEntry         *entry, 
-                      SexyIconEntryPosition  icon_pos,
-                      int                    button)
-</programlisting></informalexample>
-to
-<informalexample><programlisting>
-void (*icon_press) (GtkEntry              *entry, 
-                    GtkEntryIconPosition  icon_pos,
-                    GdkEventButton       *event)
-</programlisting></informalexample>
-    The new signature has the advantage that the signal handler can use
-    the timestamp of the event, e.g. for passing it to gtk_menu_popup().
-    When adapting an existing signal handler to the new signature, you 
-    should note that the button number is easily available as @event->button,
-    as shown in the following example:
-<informalexample><programlisting>
-static void
-icon_pressed_cb (SexyIconEntry         *entry,
-                 SexyIconEntryPosition  position,
-                 int                    button,
-                 gpointer               data)
-{
-  GtkMenu *menu = data;
-
-  if (position == SEXY_ICON_ENTRY_PRIMARY)
-    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
-                    button, GDK_CURRENT_TIME);
-} 
-</programlisting></informalexample>
-    can be ported as:
-<informalexample><programlisting>
-static void
-icon_press_cb (GtkEntry             *entry,
-               GtkEntryIconPosition  position,
-               GdkEventButton       *event,
-               gpointer              data)
-{
-  GtkMenu *menu = data;
-
-  if (position == GTK_ENTRY_ICON_PRIMARY)
-    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
-                    event->button, event->time);
-} 
-</programlisting></informalexample>
-  </para>
-
-  <para>
-    Another difference is that SexyIconEntry offers manual control of
-    the icon prelighting, via sexy_icon_entry_set_icon_highlight(). 
-    #GtkEntry prelights automatically when appropriate, depending on 
-    whether the icon is activatable and sensitive. You should make
-    sure that your icons are properly marked as activatable or nonactivatable
-    and sensitive or insensitive:
-    <itemizedlist>
-      <listitem><para>
-        Sensitive, but non-activatable icons are
-        good for purely informational purposes.
-      </para></listitem>
-      <listitem><para>
-        Icons should be marked as insensitive if the
-        function that they trigger is currently not available.
-      </para></listitem>
-    </itemizedlist>
-  </para>
-
-  <para>
-    GtkEntry has no direct equivalent of the special-purpose function
-    sexy_icon_entry_add_clear_button(). If you need this functionality,
-    the following code works:
-<informalexample><programlisting>
-static void
-icon_pressed_cb (GtkEntry       *entry,
-                 gint            position,
-                 GdkEventButton *event,
-                 gpointer        data)
-{
-  if (position == GTK_ENTRY_ICON_SECONDARY)
-    gtk_entry_set_text (entry, "");
-}
-
-static void
-text_changed_cb (GtkEntry   *entry,
-                 GParamSpec *pspec,
-                 GtkWidget  *button)
-{
-  gboolean has_text;
-
-  has_text = gtk_entry_get_text_length (entry) > 0;
-  gtk_entry_set_icon_sensitive (entry,
-                                GTK_ENTRY_ICON_SECONDARY,
-                                has_text);
-}
-
-
-  /* ... */
- 
-  /* Set up the clear icon */
-  gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
-                                 GTK_ENTRY_ICON_SECONDARY,
-                                 GTK_STOCK_CLEAR);
-  g_signal_connect (entry, "icon-press",
-                    G_CALLBACK (icon_pressed_cb), NULL);
-  g_signal_connect (entry, "notify::text",
-                    G_CALLBACK (text_changed_cb), find_button);
- 
-  /* ... */
-</programlisting></informalexample>
-  </para>
-</chapter>

docs/reference/gtk/migrating-GtkFileChooser.sgml

@@ -1,163 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkFileChooser">
-  <chapterinfo>
-    <author>
-      <firstname>Federico</firstname>
-      <surname>Mena-Quintero</surname>
-      <affiliation>
-	<address>
-	  <email>federico@ximian.com</email>
-	</address>
-      </affiliation>
-    </author>
-  </chapterinfo>
-
-  <title>Migrating from GtkFileSelection to GtkFileChooser</title>
-
-  <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_action().  In
-      addition, this lets you configure whether the file chooser will
-      be used to select existing files or folders (e.g. for
-      "File/Open"), or to type in new filenames (for
-      "File/Save&nbsp;As...").
-    </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 the gnome-vfs backend.
-	</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/migrating-GtkIconView.sgml

@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkIconView">
-
-  <title>Migrating from GnomeIconList to GtkIconView</title>
-
-  <para>
-    Since version 2.6, GTK+ provides the #GtkIconView widget. It is similar in 
-    functionality to the <structname>GnomeIconList</structname> widget in the 
-    libgnomeui library, both widgets provide a way to lay out named icons in 
-    a grid. The distinctive feature of the GTK+ widget is that it follows the 
-    model-view pattern, allowing it to share the actual data (i.e. the names 
-    and images of the icons) with other views.
-  </para>
-
-  <para>
-    #GtkIconView currently doesn't support some features found in 
-    <structname>GnomeIconList</structname>. Icons can not be positioned freely, 
-    the spacing is not customizable, and it is not possible to edit the names of 
-    icons. 
-  </para>
-
-  <para>
-    To convert an application that uses <structname>GnomeIconList</structname> 
-    to #GtkIconView, the first step is to organize your data in a #GtkTreeModel. 
-    <structname>GnomeIconList</structname> lets you directly insert data with 
-    gnome_icon_list_insert() and gnome_icon_list_insert_pixbuf() and their
-    append variants. So, if you previously had a function to fill your icon 
-    list similar to this one:
-    <informalexample><programlisting>
-      void 
-      fill_icon_list (GnomeIconList *icon_list)
-      {
-        gnome_icon_list_append (icon_list, "file1.png", "Icon 1");
-        gnome_icon_list_append (icon_list, "file2.png", "Icon 2");
-
-        /* more icons ... */ 
-      }
-    </programlisting></informalexample>
-    you will have to create a tree model, attach your icon view to it, and 
-    fill the model:
-    <informalexample><programlisting>
-      enum { 
-        PIXBUF_COLUMN,
-        TEXT_COLUMN,
-
-        /* you can have more columns here, e.g */ 
-
-        DATA_COLUMN
-      };
- 
-      void 
-      fill_model (GtkListStore *store)
-      {
-        GtkTreeIter iter;
-        GdkPixbuf *pixbuf;
-
-        gtk_list_store_append (store, &amp;iter);
-        pixbuf = gdk_pixbuf_new_from_file ("file1.png", NULL);
-        gtk_list_store_set (store, &amp;iter, PIXBUF_COLUMN, pixbuf, TEXT_COLUMN, "Icon 1", -1);
-        g_object_unref (pixbuf);
-
-        gtk_list_store_append (store, &amp;iter);
-        pixbuf = gdk_pixbuf_new_from_file ("file2.png", NULL);
-        gtk_list_store_set (store, &amp;iter, PIXBUF_COLUMN, pixbuf, TEXT_COLUMN, "Icon 2", -1);
-        g_object_unref (pixbuf);
-
-        /* more icons ... */ 
-      }
-
-      int 
-      main (int argc, char *argv[])
-      {
-        GtkWidget *icon_view;
-        GtkListStore *store;
-
-        gtk_init (&amp;argc, &amp;argv);
-
-        /* do other initialization... */
-
-        /* construct the GtkIconView */
-        icon_view = gtk_icon_view_new (<!-- -->);
-        store = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER);
-
-        gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_view), PIXBUF_COLUMN);
-        gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), TEXT_COLUMN);
-        gtk_icon_view_set_model (GTK_ICON_VIEW (icon_view), GTK_TREE_MODEL (store));
-
-        fill_model (store);
-
-        /* ... */
-      }
-    </programlisting></informalexample>
-    This example uses a #GtkListStore as model, but part of the elegance of the 
-    model-view pattern is that you can easily use another tree model implementation, 
-    or even write your own custom tree model.
-  </para>
-
-  <para>
-    Your application may make use of extra data attached to the icons in the 
-    <structname>GnomeIconList</structname> via gnome_icon_list_set_icon_data() and 
-    gnome_icon_list_get_icon_data(). With #GtkIconView such data is most 
-    conveniently stored in an extra column in the tree model, so you would 
-    call a function like
-    <informalexample><programlisting>
-    void 
-    set_icon_data (GtkIconView *icon_view,
-                   gint         idx,
-                   gpointer     data)
-    {
-       GtkTreeModel *model;
-       GtkTreeIter iter;
-
-       model = gtk_icon_view_get_model (icon_view);
-    
-       if (gtk_tree_model_iter_nth_child (model, &amp;iter, NULL, idx))
-         gtk_list_store_set (GTK_LIST_STORE (model), &amp;iter, 
-                             DATA_COLUMN, data, -1);
-    }
-    </programlisting></informalexample>
-    assuming that your tree model has a <literal>DATA_COLUMN</literal> of type 
-    %G_TYPE_POINTER.
-  </para>
-
-  <para>
-    There is a number of minor API differences between 
-    <structname>GnomeIconList</structname> and 
-    <structname>GtkIconView</structname>:
-    <itemizedlist> 
-     <listitem><para>
-       <type>GnomeIconListMode</type> is replaced by the 
-       <link linkend="GtkIconView--orientation">orientation</link> 
-       property of <structname>GtkIconView</structname>
-     </para></listitem>
-     <listitem><para>
-       <structname>GtkIconView</structname> can not be frozen in the same 
-       way as <structname>GnomeIconList</structname> can with 
-       gnome_icon_list_freeze() and gnome_icon_list_thaw(). Instead you can 
-       replace the whole model of a <structname>GtkIconView</structname>, 
-       instead of doing many small changes to the existing model.
-     </para></listitem>
-    </itemizedlist>
-  </para> 
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkLabel-links.sgml

@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-label-links">
-
-  <title>Migrating from SexyUrlLabel to GtkLabel</title>
-
-  <para>
-    GTK+ 2.18 supports showing links inside a #GtkLabel, similar to
-    SexyUrlLabel. Porting from SexyUrlLabel to GtkLabel is relatively
-    straightforward. GtkLabel accepts links in the markup using the
-    same HTML <tag>a</tag> notation that SexyUrlLabel uses. In addition
-    to the href attribute, GtkLabel accepts a title attribute that
-    is displayed as a tooltip on the link. Instead of
-    sexy_url_label_set_markup(), just call gtk_label_set_markup().
-  </para>
-  <para>
-    One difference between the two APIs is that the ::url-activated signal
-    from SexyUrlLabel has been replaced by the #GtkLabel::activate-link
-    signal. The need for connecting to this signal is greatly reduced,
-    since GtkLabel has a default handler that calls gtk_show_uri().
-  </para>
-</chapter>

docs/reference/gtk/migrating-GtkLinkButton.sgml

@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkLinkButton">
-
-  <title>Migrating from GnomeHRef to GtkLinkButton</title>
-
-  <para>
-    Since version 2.10, GTK+ provides the #GtkLinkButton widget as a
-    replacement for the <structname>GnomeHRef</structname> widget
-    in the libgnomeui library.
-  </para>
-
-  <para>
-    Porting an application from <structname>GnomeHRef</structname> to
-    #GtkLinkButton is very simple. #GtkLinkButton does not have a
-    default action for #GtkButton::clicked signal. So instead of simply 
-    creating the widget
-    <informalexample><programlisting>
-      GtkWidget *button;
-
-      button = gnome_href_new (url, "");
-    </programlisting></informalexample>
-    you will have to handle the activation of the #GtkLinkButton, using
-    the ::clicked signal for instance
-    <informalexample><programlisting>
-      static void
-      link_button_clicked_cb (GtkWidget *widget,
-                              gpointer   data)
-      {
-        const gchar *link;
-
-	link = gtk_link_button_get_uri (GTK_LINK_BUTTON (widget));
-	open_browser_at_url (link);
-      }
-
-      /* ... */
-      
-        GtkWidget *button;
-
-	button = gtk_link_button_new (url);
-	g_signal_connect (button, "clicked",
-	                  G_CALLBACK (link_button_clicked_cb), NULL);
-     </programlisting></informalexample>
-    If you have more than one #GtkLinkButton instead of connecting
-    a signal to each one, you can use a "hook function" which will be
-    called whenever a user activates a link button
-    <informalexample><programlisting>
-      static void
-      link_button_hook (GtkLinkButton *button,
-                        const gchar   *link,
-			gpointer       user_data)
-      
-      {
-        open_browser_at_url (link);
-      }
-      
-      /* ... */
-      
-        GtkWidget *button1 = gtk_link_button_new (uri1);
-	GtkWidget *button2 = gtk_link_button_new (uri2);
-
-        gtk_link_button_set_uri_hook (link_button_hook, NULL, NULL);
-    </programlisting></informalexample>
-
-  </para>
-
-  <para>
-    Starting with GTK+ 2.16, it is no longer necessary to set up a uri hook
-    manually, since GTK+ now defaults to calling gtk_show_uri() if no uri
-    hook has been set.
-  </para>
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkRecentChooser.sgml

@@ -1,323 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkRecentChooser">
-  <chapterinfo>
-    <author>
-      <firstname>Emmanuele</firstname>
-      <lastname>Bassi</lastname>
-      <affiliation>
-        <address>
-	  <email>ebassi@gmail.com</email>
-	</address>
-      </affiliation>
-    </author>
-  </chapterinfo>
-
-  <title>Migrating from EggRecent to GtkRecentChooser</title>
-
-  <para>
-    Since version 2.10, GTK+ provides a way of handling the recently used
-    documents. It is similar to the code that has lived inside the libegg
-    library and has been incorporated by many applications. The GTK+ version
-    aims to completely replace that code, and offers many distinctive features
-    that improve the registration and visualization of the recently used
-    documents, such as:
-  </para>
-
-  <para>
-    <itemizedlist>
-      <listitem><para>
-        Better performances while reading and writing the list of recently used
-	files
-      </para></listitem>
-      <listitem><para>
-        More meta-data available for each recent document, like the
-	applications that have registered a document inside the list, the last
-	time and the number of times the same application did register a
-	document inside the list, an optional user readable name and
-	description of the document
-      </para></listitem>
-      <listitem><para>
-        Improved the ability to sort and filter the documents, also using
-	custom sorting and filtering functions
-      </para></listitem>
-      <listitem><para>
-        New widgets for displaying the list, and better integration with
-	current #GtkFileChooser and #GtkUIManager widgets
-      </para></listitem>
-    </itemizedlist>
-  </para>
-
-  <section id="gtkrecent-manager">
-    <title>Managing the Recently Used Documents</title>
-
-    <para>
-      #GtkRecentManager is used to manage the Recently Used Documents. To
-      create a new #GtkRecentManager, you simply call gtk_recent_manager_new().
-      Like the <structname>EggRecentModel</structname> inside EggRecent, the
-      #GtkRecentManager loads the list of the recent documents and notifies
-      you of changes inside the list.
-    </para>
-
-    <para>
-      Usually, instead of creating a new #GtkRecentManager each time you
-      need it, you'll want to use the gtk_recent_manager_get_default()
-      function.
-    </para>
-
-    <para>
-      To add a document to the list, you can use gtk_recent_manager_add_item(),
-      like:
-      <informalexample><programlisting>
-        GtkRecentManager *manager;
-
-	manager = gtk_recent_manager_new (<!-- -->);
-
-	if (!gtk_recent_manager_add_item (manager, document_uri))
-	  {
-	    /* warn about the error */
-	  }
-	
-	g_object_unref (manager);
-      </programlisting></informalexample>
-      The gtk_recent_manager_add_item() function will try and guess some of the
-      meta-data associated to a URI. If you know some of meta-data about the
-      document yourself, set the desired fields of a #GtkRecentData structure
-      and pass it to the gtk_recent_manager_add_full() function instead:
-      <informalexample><programlisting>
-        GtkRecentManager *manager;
-        GtkRecentData *recent_data;
-
-	manager = gtk_recent_manager_new (<!-- -->);
-	
-	recent_data = g_new0 (GtkRecentData, 1);
-	/* the user visible name of the document (maybe its title); should
-	 * be preferred when displaying the item into the list
-	 */
-        recent_data-&gt;display_name = document_name;
-	
-	/* the MIME type is mandatory */
-	recent_data-&gt;mime_type = document_mime_type;
-
-	/* the name of the application that is registering the document
-	 * (also mandatory); usually, the same name you used with
-	 * the g_set_application_name (<!-- -->) function.
-	 */
-	recent_data-&amp;app_name = APP_NAME;
-
-	/* the command to open a file; the %u string will be automagically
-	 * expanded to the document's URI when getting the application's
-	 * command line from the GtkRecentInfo object with
-	 * gtk_recent_info_get_application_info (<!-- -->)
-	 */
-	recent_data-&amp;app_exec = g_strjoin (" ", g_get_prgname (<!-- -->), "--open-file", "%u", NULL);
-
-	if (!gtk_recent_manager_add_full (manager, document_uri, recent_data))
-	  {
-	    /* warn about the error */
-	  }
-
-	g_free (recent_data-&gt;app_exec);
-	g_free (recent_data);
-	g_object_unref (manager);
-      </programlisting></informalexample>
-    </para>
-
-    <para>
-      Getting the list of items is also similar to
-      <structname>EggRecentModel</structname>; the GtkRecentInfo data is
-      allocated at look up time in order not to waste memory keeping it
-      around, so you must remember to free the data inside the list and then
-      the list itself when you are done using it:
-      <informalexample><programlisting>
-        GtkRecentManager *manager;
-        GList *recent_items, *l;
-
-	manager = gtk_recent_manager_get_default(<!-- -->);
-
-	recent_items = gtk_recent_manager_get_items (manager);
-	for (l = recent_items; l != NULL; l = l-&gt;next)
-	  {
-	    GtkRecentInfo *recent_info = l-&gt;data;
-
-	    do_something_with_the_item (recent_info);
-	  }
-	
-	/* free everything and the list */
-	g_list_foreach (recent_items, (GFunc) gtk_recent_info_unref, NULL);
-	g_list_free (recent_items);
-      </programlisting></informalexample>
-      You can also look up a single item:
-      <informalexample><programlisting>
-        GtkRecentInfo *recent_info;
-	GError *error = NULL;
-
-	recent_info = gtk_recent_manager_lookup_item (manager, document_uri, &amp;error);
-	if (error)
-	  {
-	    display_error (error);
-
-	    g_error_free (error);
-	  }
-	else
-	  {
-	    do_something_with_the_item (recent_info);
-
-	    gtk_recent_info_unref (recent_info);
-	  }
-      </programlisting></informalexample>
-      The #GtkRecentInfo is a reference counted boxed type, and it holds all
-      the meta-data of a recently used document, like its display name, its
-      description, the list of each application that has registered the
-      document or the list of groups to which the document belong.
-    </para>
-  
-  </section> <!-- gtkrecent-manager -->
-
-  <section id="gtkrecent-chooser">
-    <title>Displaying the Recently Used Documents</title>
-
-    <para>
-      Displaying the Recently Used Documents list is handled by any widget
-      implementing the #GtkRecentChooser interface. These widgets also handle
-      the sorting and filtering of the list; they will create their own
-      #GtkRecentManager objects by default:
-      <informalexample><programlisting>
-        GtkWidget *chooser;
-	gint response;
-
-	/* create a new dialog with the recently used documents list shown
-	 * using a GtkTreeView widget
-	 */
-	chooser = gtk_recent_chooser_dialog_new ("Recent Documents",
-	                                         parent_window,
-						 GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
-						 GTK_STOCK_OPEN, GTK_RESPONSE_OK,
-						 NULL);
-        /* set the sorting order to "most recently used first" */
-	gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser), GTK_RECENT_SORT_MRU);
-	response = gtk_dialog_run (GTK_DIALOG (chooser));
-	if (response == GTK_RESPONSE_OK)
-	  {
-	    GtkRecentInfo *info;
-
-            info = gtk_recent_chooser_get_current_item (GTK_RECENT_CHOOSER (chooser));
-	    do_something_with_the_item (info);
-
-	    gtk_recent_info_unref (info);
-	  }
-	
-	gtk_widget_destroy (chooser);
-      </programlisting></informalexample>
-    </para>
-    
-  </section> <!-- gtkrecent-chooser -->
-
-  <section id="gtkrecent-advanced">
-    <title>Advanced usage</title>
-
-    <para>
-      The #GtkRecentChooser widgets might display items sorted and filtered,
-      either with already supplied or custom sorting and filtering functions.
-      The biggest difference from the <structname>EggRecentView</structname>
-      widgets in EggRecent is that the #GtkRecentChooser widgets will use
-      their own copy of the list and will apply the sorting and filtering
-      functions only on the copy; this allows the creation of many viewers
-      with a single controller, like using many #GtkTreeView with a single
-      #GtkTreeModel instance.
-    </para>
-
-    <para>
-      Available sorting methods are:
-      <informalexample><programlisting>
-        /* no sorting */
-	gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser), GTK_RECENT_SORT_NONE);
-	
-        /* most recently used first */
-	gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser), GTK_RECENT_SORT_MRU);
-	
-	/* most recently used last */
-	gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser), GTK_RECENT_SORT_LRU);
-      </programlisting></informalexample>
-      You can create your own sorting function, and the use the
-      GTK_RECENT_SORT_CUSTOM method:
-      <informalexample><programlisting>
-	/* custom sorting function, based on the registration count
-	 * (most used first)
-	 */
-	static void
-	sort_by_usage_count (GtkRecentInfo *a,
-                             GtkRecentInfo *b,
-                             gpointer       data)
-        {
-	  gint count_a, count_b;
-
-	  count_a = count_b = 0;
-
-	  if (gtk_recent_info_has_application (a, APP_NAME))
-	    gtk_recent_info_get_application_info (a, APP_NAME, NULL, &amp;count_a, NULL);
-
-	  if (gtk_recent_info_has_application (b, APP_NAME))
-	    gtk_recent_info_get_application_info (b, APP_NAME, NULL, &amp;count_b, NULL);
-
-	  return count_a &lt; count_b;
-	}
-
-	...
-
-	  /* set custom sorting and set the custom sorting function */
-	  gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser),
-	                                    GTK_RECENT_SORT_CUSTOM);
-	  gtk_recent_chooser_set_sort_func (GTK_RECENT_CHOOSER,
-	                                    sort_by_usage_count,
-			  		    NULL, /* sort function data */
-					    NULL  /* destroy notify for the data */);
-      </programlisting></informalexample>
-    </para>
-
-    <para>
-      Filtering is done using the #GtkRecentFilter object, similar to the
-      #GtkFileFilter object used by the #GtkFileChooser widgets. The
-      #GtkRecentFilter object has a set of pre-defined options based on the
-      meta-data exposed by the #GtkRecentInfo object. It also allows custom
-      filtering function:
-      <informalexample><programlisting>
-        GtkRecentFilter *filter;
-
-	filter = gtk_recent_filter_new (<!-- -->);
-	
-	/* set the user visible name of the filter */
-	gtk_recent_filter_set_name (filter, "Since Last Month");
-
-	/* set the maximum age of a recently used document */
-	gtk_recent_filter_set_age (filter, 31);
-
-	/* the chooser takes the ownership of the object */
-	gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (chooser), filter);
-
-	/* set the currently used filter */
-	gtk_recent_chooser_set_filter (GTK_RECENT_CHOOSER (chooser), filter);
-
-	filter = gtk_recent_filter_new (<!-- -->);
-	gtk_recent_filter_set_name (filter, "Every text file");
-	gtk_recent_filter_set_mime_type (filter, "text/plain");
-
-	gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (chooser), filter);
-      </programlisting></informalexample>
-      The #GtkRecentChooserWidget and #GtkRecentChooserDialog widgets allow
-      multiple filters and the selection of an appropriate one; the
-      #GtkRecentChooserMenu widget allows just a single filter object.
-    </para>
-    
-  </section> <!-- gtkrecent-advanced -->
-  
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkStyleContext.xml

@@ -0,0 +1,659 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<section id="gtk-migrating-GtkStyleContext">
+  <title>Theming changes</title>
+
+  <para>
+    In GTK+ 3.0, #GtkStyleContext was added to replace #GtkStyle and
+    the theming infrastructure available in 2.x. GtkStyleContext is an
+    object similar in spirit to GtkStyle, as it contains theming information,
+    although in a more complete and tokenized fashion. There are two aspects
+    to switching to GtkStyleContext: porting themes and theme engines, and
+    porting applications, libraries and widgets.
+  </para>
+
+  <section id="gtk-migrating-GtkStyleContext-themes">
+    <title>Migrating themes</title>
+
+    <para>
+      From GTK+ 3.0 on, theme engines must implement #GtkThemingEngine and be
+      installed in <filename>$libdir/gtk+-3.0/$GTK_VERSION/theming-engines</filename>,
+      and the files containing style information must be written in the CSS-like
+      format that is understood by #GtkCssProvider. For a theme named
+      "Clearlooks", the CSS file parsed by default is
+      <filename>$datadir/themes/Clearlooks/gtk-3.0/gtk.css</filename>,
+      with possible variants such as the dark theme being named
+      <filename>gtk-dark.css</filename> in the same directory.
+    </para>
+  </section>
+
+  <section id="gtk-migrating-theme-GtkStyleContext-engines">
+    <title>Migrating theme engines</title>
+
+    <para>
+      Migrating a #GtkStyle based engine to a #GtkThemingEngine based one
+      should be straightforward for most of the vfuncs. Besides a cleanup
+      in the available paint methods and a simplification in the passed
+      arguments (in favor of #GtkStyleContext containing all the information),
+      the available render methods resemble those of #GtkStyle quite
+      evidently. Notable differences include:
+    </para>
+
+    <orderedlist>
+      <listitem>
+        All variations of gtk_paint_box(), gtk_paint_flat_box(),
+        gtk_paint_shadow(), gtk_paint_box_gap() and gtk_paint_shadow_gap()
+        are replaced by gtk_render_background(), gtk_render_frame() and
+        gtk_render_frame_gap(). The first function renders frameless
+        backgrounds and the last two render frames in various forms.
+      </listitem>
+      <listitem>
+        gtk_paint_resize_grip() has been subsumed by gtk_render_handle()
+        with a #GTK_STYLE_CLASS_GRIP class set in the style context.
+      </listitem>
+      <listitem>
+        gtk_paint_spinner() disappears in favor of gtk_render_activity()
+        with a #GTK_STYLE_CLASS_SPINNER class set in the style context.
+      </listitem>
+    </orderedlist>
+
+    <para>
+      The list of available render methods is:
+    </para>
+
+    <simplelist>
+      <member>
+        gtk_render_background(): Renders a widget/area background.
+      </member>
+      <member>
+        gtk_render_frame(): Renders a frame border around the given rectangle.
+        Usually the detail of the border depends on the theme information,
+        plus the current widget state.
+      </member>
+      <member>
+        gtk_render_frame_gap(): Renders a frame border with a gap on one side.
+      </member>
+      <member>
+        gtk_render_layout(): Renders a #PangoLayout.
+      </member>
+      <member>
+        gtk_render_handle(): Renders all kind of handles and resize grips,
+        depending on the style class.
+      </member>
+      <member>
+        gtk_render_check(): Render checkboxes.
+      </member>
+      <member>
+        gtk_render_option(): Render radiobuttons.
+      </member>
+      <member>
+        gtk_render_arrow(): Renders an arrow pointing to a direction.
+      </member>
+      <member>
+        gtk_render_expander(): Renders an expander indicator, such as in
+        #GtkExpander.
+      </member>
+      <member>
+        gtk_render_focus(): Renders the indication that a widget has the
+        keyboard focus.
+      </member>
+      <member>
+        gtk_render_line(): Renders a line from one coordinate to another.
+      </member>
+      <member>
+        gtk_render_slider(): Renders a slider, such as in #GtkScale.
+      </member>
+      <member>
+        gtk_render_extension(): Renders an extension that protrudes from
+        a UI element, such as a notebook tab.
+      </member>
+      <member>
+        gtk_render_activity(): Renders an area displaying activity, be it
+        a progressbar or a spinner.
+      </member>
+      <member>
+        gtk_render_icon_pixbuf(): Renders an icon into a #GdkPixbuf.
+      </member>
+    </simplelist>
+
+    <para>
+      One of the main differences to #GtkStyle-based engines is that the
+      rendered widget is totally isolated from the theme engine, all style
+      information is meant to be retrieved from the #GtkThemingEngine API,
+      or from the #GtkWidgetPath obtained from gtk_theming_engine_get_path(),
+      which fully represents the rendered widget's hierarchy from a styling
+      point of view.
+    </para>
+
+    <para>
+      The detail string available in #GtkStyle-based engines has been
+      replaced by widget regions and style classes. Regions are a way for
+      complex widgets to associate different styles with different areas,
+      such as even and odd rows in a treeview. Style classes allow sharing
+      of style information between widgets, regardless of their type.
+      Regions and style classes can be used in style sheets to associate
+      styles, and them engines can also access them. There are several
+      predefined classes and regions such as %GTK_STYLE_CLASS_BUTTON or
+      %GTK_STYLE_REGION_TAB in <filename>gtkstylecontext.h</filename>,
+      although custom widgets may define their own, which themes may
+      attempt to handle.
+    </para>
+
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-parser-extensions">
+    <title>Extending the CSS parser</title>
+
+    <para>
+      In #GtkStyle-based engines, #GtkRCStyle provided ways to extend the
+      gtkrc parser with engine-specific extensions. This has been replaced
+      by gtk_theming_engine_register_property(), which lets a theme engine
+      register new properties with an arbitrary type. While there is built-in
+      support for most basic types, it is possible to use a custom parser
+      for the property.
+    </para>
+
+    <para>
+      The installed properties depend on the #GtkThemeEngine::name property,
+      so they should be added in the <literal>constructed()</literal> vfunc.
+      For example, if an engine with the name "Clearlooks" installs a
+      "focus-color" property with the type #GdkRGBA, the property
+      <literal>-Clearlooks-focus-color</literal> will be registered and
+      accepted in CSS like this:
+      <informalexample><programlisting>
+      GtkEntry {
+        -Clearlooks-focus-color: rgba(255, 0, 0, 1.0);
+      }
+      </programlisting></informalexample>
+    </para>
+
+    <para>
+      Widget style properties also follow a similar syntax, with the widget
+      type name used as a prefix. For example, the #GtkWidget:focus-line-width
+      style property can be modified in CSS as
+      <literal>-GtkWidget-focus-line-width</literal>.
+    </para>
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-css">
+    <title>Using the CSS file format</title>
+
+    <para>
+      The syntax of RC and CSS files formats is obviously different.
+      The CSS-like syntax will hopefully be much more familiar to many
+      people, lowering the barrier for custom theming.
+    </para>
+    <para>
+      Instead of going through the syntax differences one-by-one, we
+      will present a more or less comprehensive example and discuss
+      how it can be translated into CSS:
+    </para>
+
+    <example>
+      <title>Sample RC code</title>
+      <programlisting>
+        style "default" {
+                xthickness = 1
+                ythickness = 1
+
+                GtkButton::child-displacement-x = 1
+                GtkButton::child-displacement-y = 1
+                GtkCheckButton::indicator-size = 14
+
+                bg[NORMAL]        = @bg_color
+                bg[PRELIGHT]      = shade (1.02, @bg_color)
+                bg[SELECTED]      = @selected_bg_color
+                bg[INSENSITIVE]   = @bg_color
+                bg[ACTIVE]        = shade (0.9, @bg_color)
+
+                fg[NORMAL]        = @fg_color
+                fg[PRELIGHT]      = @fg_color
+                fg[SELECTED]      = @selected_fg_color
+                fg[INSENSITIVE]   = darker (@bg_color)
+                fg[ACTIVE]        = @fg_color
+
+                text[NORMAL]      = @text_color
+                text[PRELIGHT]    = @text_color
+                text[SELECTED]    = @selected_fg_color
+                text[INSENSITIVE] = darker (@bg_color)
+                text[ACTIVE]      = @selected_fg_color
+
+                base[NORMAL]      = @base_color
+                base[PRELIGHT]    = shade (0.95, @bg_color)
+                base[SELECTED]    = @selected_bg_color
+                base[INSENSITIVE] = @bg_color
+                base[ACTIVE]      = shade (0.9, @selected_bg_color)
+
+                engine "clearlooks" {
+                        colorize_scrollbar = TRUE
+                        style = CLASSIC
+                }
+        }
+
+        style "tooltips" {
+                xthickness = 4
+                ythickness = 4
+
+                bg[NORMAL]        = @tooltip_bg_color
+                fg[NORMAL]        = @tooltip_fg_color
+        }
+
+        style "button" {
+                xthickness = 3
+                ythickness = 3
+
+                bg[NORMAL]        = shade (1.04, @bg_color)
+                bg[PRELIGHT]      = shade (1.06, @bg_color)
+                bg[ACTIVE]        = shade (0.85, @bg_color)
+        }
+
+        style "entry" {
+                xthickness = 3
+                ythickness = 3
+
+                bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
+                fg[SELECTED] = @text_color
+
+                engine "clearlooks" {
+                        focus_color = shade (0.65, @selected_bg_color)
+                }
+        }
+
+        style "other" {
+                bg[NORMAL] = &num;fff;
+        }
+
+        class "GtkWidget" style "default"
+        class "GtkEntry" style "entry"
+        widget_class "*&lt;GtkButton&gt;" style "button"
+        widget "gtk-tooltip*" style "tooltips"
+        widget_class "window-name.*.GtkButton" style "other"
+      </programlisting>
+    </example>
+
+    <para>
+      would roughly translate to this CSS:
+    </para>
+
+    <example>
+      <title>CSS translation</title>
+      <programlisting>
+        * {
+          padding: 1;
+          -GtkButton-child-displacement-x: 1;
+          -GtkButton-child-displacement-y: 1;
+          -GtkCheckButton-indicator-size: 14;
+
+          background-color: @bg_color;
+          color: @fg_color;
+
+          -Clearlooks-colorize-scrollbar: true;
+          -Clearlooks-style: classic;
+        }
+
+        *:hover {
+          background-color: shade (@bg_color, 1.02);
+        }
+
+        *:selected {
+          background-color: @selected_bg_color;
+          color: @selected_fg_color;
+        }
+
+        *:insensitive {
+          color: shade (@bg_color, 0.7);
+        }
+
+        *:active {
+          background-color: shade (@bg_color, 0.9);
+        }
+
+        .tooltip {
+          padding: 4;
+
+          background-color: @tooltip_bg_color;
+          color: @tooltip_fg_color;
+        }
+
+        .button {
+          padding: 3;
+          background-color: shade (@bg_color, 1.04);
+        }
+
+        .button:hover {
+          background-color: shade (@bg_color, 1.06);
+        }
+
+        .button:active {
+          background-color: shade (@bg_color, 0.85);
+        }
+
+        .entry {
+          padding: 3;
+
+          background-color: @base_color;
+          color: @text_color;
+        }
+
+        .entry:selected {
+          background-color: mix (@selected_bg_color, @base_color, 0.4);
+          -Clearlooks-focus-color: shade (0.65, @selected_bg_color)
+        }
+
+        /* The latter selector is an specification of the first,
+           since any widget may use the same classes or names */
+        &num;window-name .button,
+        GtkWindow&num;window-name GtkButton.button {
+          background-color: &num;fff;
+        }
+      </programlisting>
+    </example>
+
+    <para>
+      One notable difference is the reduction from fg/bg/text/base colors
+      to only foreground/background, in exchange the widget is able to render
+      its various elements with different CSS classes, which can be themed
+      independently.
+    </para>
+
+    <para>
+      In the same vein, the light, dark and mid color variants that
+      were available in GtkStyle should be replaced by a combination of
+      symbolic colors and custom CSS, where necessary. text_aa should
+      really not be used anywhere, anyway, and the white and black colors
+      that were available in GtkStyle can just be replaced by literal
+      GdkRGBA structs.
+    </para>
+
+    <para>
+      Access to colors has also changed a bit. With #GtkStyle, the common
+      way to access colors is:
+      <informalexample><programlisting>
+      GdkColor *color1;
+      GdkColor color2;
+
+      color1 = &amp;style->bg[GTK_STATE_PRELIGHT];
+      gtk_style_lookup_color (style, "focus_color", &amp;color2);
+      </programlisting></informalexample>
+      With #GtkStyleContext, you generally use #GdkRGBA instead of #GdkColor
+      and the code looks like this:
+      <informalexample><programlisting>
+      GdkRGBA *color1;
+      GdkRGBA  color2;
+
+      gtk_style_context_get (context, GTK_STATE_FLAG_PRELIGHT,
+                             "background-color", &amp;color1,
+                             NULL);
+      gtk_style_context_lookup_color (context, "focus_color", &amp;color2);
+
+      ...
+
+      gdk_rgba_free (color1);
+      </programlisting></informalexample>
+      Note that the memory handling here is different: gtk_style_context_get()
+      expects the address of a GdkRGBA* and returns a newly allocated struct,
+      gtk_style_context_lookup_color() expects the address of an existing
+      struct, and fills it.
+    </para>
+
+    <para>
+      It is worth mentioning that the new file format does not support
+      custom keybindings nor stock icon mappings as the RC format did.
+    </para>
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-checklist">
+    <title>A checklist for widgets</title>
+
+    <para>
+      When porting your widgets to use #GtkStyleContext, this checklist
+      might be useful.
+    </para>
+
+    <orderedlist>
+      <listitem>
+        Replace <literal>style_set()</literal> calls with
+        <literal>style_updated()</literal>.
+      </listitem>
+
+      <listitem>
+        <para>
+          Try to identify the role of what you're rendering with any number
+          of classes. This will replace the detail string. There is a predefined
+          set of CSS classes which you can reuse where appropriate. Doing so
+          will give you theming 'for free', whereas custom classes will require
+          extra work in the theme. Note that complex widgets are likely to
+          need different styles when rendering different parts, and style
+          classes are one way to achieve this. This could result in code like
+          the following (simplified) examples:
+        </para>
+
+        <example>
+          <title>Setting a permanent CSS class</title>
+          <programlisting>
+            static void
+            gtk_button_init (GtkButton *button)
+            {
+              GtkStyleContext *context;
+
+              ...
+
+              context = gtk_widget_get_style_context (GTK_WIDGET (button));
+
+              /* Set the "button" class */
+              gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
+            }
+          </programlisting>
+        </example>
+
+        <para>
+          Or
+        </para>
+
+        <example>
+          <title>Using dynamic CSS classes for different elements</title>
+          <programlisting>
+            static gboolean
+            gtk_spin_button_draw (GtkSpinButton *spin,
+                                  cairo_t       *cr)
+            {
+              GtkStyleContext *context;
+
+              ...
+
+              context = gtk_widget_get_style_context (GTK_WIDGET (spin));
+
+              gtk_style_context_save (context);
+              gtk_style_context_add_class (context, GTK_STYLE_CLASS_ENTRY);
+
+              /* Call to entry draw impl with "entry" class */
+              parent_class->draw (spin, cr);
+
+              gtk_style_context_restore (context);
+              gtk_style_context_save (context);
+
+              /* Render up/down buttons with the "button" class */
+              gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
+              draw_up_button (spin, cr);
+              draw_down_button (spin, cr);
+
+              gtk_style_context_restore (context);
+
+              ...
+            }
+          </programlisting>
+        </example>
+
+        <para>
+          Note that #GtkStyleContext only provides fg/bg colors, so text/base
+          is done through distinctive theming of the different classes. For
+          example, an entry would usually be black on white while a button
+          would usually be black on light grey.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Replace all <literal>gtk_paint_*()</literal> calls with corresponding
+          <literal>gtk_render_*()</literal> calls.
+        </para>
+        <para>
+          The most distinctive changes are the use of #GtkStateFlags to
+          represent the widget state and the lack of #GtkShadowType. Note
+          that widget state is now passed implicitly via the context, so
+          to render in a certain state, you have to temporarily set the
+          state on the context, as in the following example:
+        </para>
+        <example>
+          <title>Rendering with a specific state</title>
+          <programlisting>
+            gtk_style_context_save (context);
+            gtk_style_context_set_state (context, GTK_STATE_FLAG_ACTIVE);
+            gtk_render_check (context, cr, x, y, width, height);
+            gtk_style_context_restore (context);
+          </programlisting>
+        </example>
+        <para>
+          For gtk_render_check() and gtk_render_option(), the @shadow_type
+          parameter is replaced by the #GTK_STATE_FLAG_ACTIVE and
+          #GTK_STATE_FLAG_INCONSISTENT state flags. For things such as
+          pressed/unpressed button states, #GTK_STATE_FLAG_ACTIVE is used,
+          and the CSS may style normal/active states differently to render
+          outset/inset borders, respectively.
+        </para>
+      </listitem>
+
+      <listitem>
+        The various <literal>gtk_widget_modify_*()</literal> functions to
+        override colors or fonts for individual widgets have been replaced
+        by similar <literal>gtk_widget_override_*()</literal> functions.
+      </listitem>
+
+      <listitem>
+        It is no longer necessary to call gtk_widget_style_attach(),
+        gtk_style_attach(), gtk_style_detach() or gtk_widget_ensure_style().
+      </listitem>
+
+      <listitem>
+        Replace all uses of xthickness/ythickness. #GtkStyleContext uses the
+        CSS box model, and there are border-width/padding/margin properties to
+        replace the different applications of X and Y thickness. Note that all
+        of this is merely a guideline. Widgets may choose to follow it or not.
+      </listitem>
+    </orderedlist>
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-parsing">
+    <title>Parsing of custom resources</title>
+    <para>
+      As a consequence of the RC format going away, calling gtk_rc_parse() or
+      gtk_rc_parse_string() won't have any effect on a widgets appearance.
+      The way to replace these calls is using a custom #GtkStyleProvider,
+      either for an individual widget through gtk_style_context_add_provider()
+      or for all widgets on a screen through gtk_style_context_add_provider_for_screen().
+      Typically, the provider will be a #GtkCssProvider, which parse CSS
+      information from a file or from a string.
+    </para>
+
+    <para>
+      Notice that you can also get style information from custom resources
+      by implementing the #GtkStyleProvider interface yourself. This is
+      an advanced feature that should be rarely used.
+    </para>
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-bonus-points">
+    <title>Bonus points</title>
+
+    <para>
+      There are some features in #GtkStyleContext that were not available in
+      #GtkStyle, or were made available over time for certain widgets through
+      extending the detail string in obscure ways. There is a lot more
+      information available when rendering UI elements, and it is accessible
+      in more uniform, less hacky ways. By going through this list you'll
+      ensure your widget is a good citizen in a fully themable user interface.
+    </para>
+
+    <orderedlist>
+      <listitem>
+        If your widget renders a series of similar elements, such as tabs
+        in a #GtkNotebook or rows/column in a #GtkTreeView, consider adding
+        regions through gtk_style_context_add_region(). These regions can be
+        referenced in CSS and the :nth-child pseudo-class may be used to match
+        the elements depending on the flags passed.
+
+        <example>
+          <title>Theming widget regions</title>
+          <programlisting>
+            GtkNotebook tab {
+              background-color: &num;f3329d;
+            }
+
+            GtkTreeView row::nth-child (even) {
+              background-color: &num;dddddd;
+            }
+          </programlisting>
+        </example>
+      </listitem>
+
+      <listitem>
+        <para>
+          If your container renders child widgets within different regions,
+          make it implement GtkContainer::get_path_for_child(). This function
+          lets containers assign a special #GtkWidgetPath to child widgets
+          depending on their role/region. This is necessary to extend the
+          concept above throughout the widget hierarchy.
+        </para>
+
+        <para>
+          For example, a #GtkNotebook modifies the tab labels' #GtkWidgetPath
+          so the "tab" region is added. This makes it possible to theme tab
+          labels through:
+        </para>
+
+        <example>
+          <title>Theming a widget within a parent container region</title>
+          <programlisting>
+            GtkNotebook tab GtkLabel {
+              font: Sans 8;
+            }
+          </programlisting>
+        </example>
+
+      </listitem>
+
+      <listitem>
+        If you intend several visual elements to look interconnected,
+        make sure you specify rendered elements' connection areas with
+        gtk_style_context_set_junction_sides(). It is of course up to the
+        theme to make use of this information or not.
+      </listitem>
+
+      <listitem>
+        <para>
+          #GtkStyleContext supports implicit animations on state changes for
+          the most simple case out-of-the-box: widgets with a single animatable
+          area, whose state is changed with gtk_widget_set_state_flags() or
+          gtk_widget_unset_state_flags(). These functions trigger animated
+          transitions for the affected state flags. Examples of widgets for
+          which this kind of animation may be sufficient are #GtkButton or
+          #GtkEntry.
+        </para>
+        <para>
+          If your widget consists of more than a simple area, and these areas
+          may be rendered with different states, make sure to mark the rendered
+          areas with gtk_style_context_push_animatable_region() and
+          gtk_style_context_pop_animatable_region().
+        </para>
+
+        <para>
+          gtk_style_context_notify_state_change() may be used to trigger a
+          transition for a given state. The region ID will determine the
+          animatable region that is affected by this transition.
+        </para>
+      </listitem>
+    </orderedlist>
+  </section>
+</section>

docs/reference/gtk/migrating-GtkTooltip.sgml

@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-tooltips">
-
-  <title>Migrating from GtkTooltips to GtkTooltip</title>
-
-  <para>
-    GTK+ 2.12 brings a completely new tooltip implementation which
-    allows many things that were not possible with the old 
-    #GtkTooltips interface. The new possibilities are explained
-    in more detail in the section about #GtkTooltip. 
-  </para>
-
-  <para>
-    A number of complications of the old API have been removed:
-    <itemizedlist>
-
-      <listitem><para>
-        Tooltips can not be grouped anymore. The old tooltips
-        API allowed this by using multiple #GtkTooltips objects.
-        We believe that the timeout behaviour of the new tooltips 
-        implementation is better and makes it unnecessary to use 
-        grouping as a way to overcome shortcomings of the 
-        fast-tooltips mode.
-      </para></listitem>
-
-      <listitem><para>
-        Timeouts can not be set individually anymore. Instead
-        there are settings #GtkSettings:gtk-tooltip-timeout, 
-        #GtkSettings:gtk-tooltip-browse-timeout and
-        #GtkSettings:gtk-tooltip-browse-mode-timeout to influence
-        the behaviour of tooltips globally.
-      </para></listitem>
-
-    </itemizedlist>
-  </para>
-
-  <para>
-    Here is an example of setting a tooltip on a widget with the old API:
-    <informalexample><programlisting>
-GtkTooltips *tooltips = gtk_tooltips_new ();     
-gtk_tooltips_set_tip (tooltips, widget, "Some tips", NULL);
-    </programlisting></informalexample>
-  </para>
-  <para>
-    Using the new tooltips API, it is no longer necessary to create 
-    an object:
-    <informalexample><programlisting>
-gtk_widget_set_tooltip_text (widget, "Some tips");
-    </programlisting></informalexample>
-  </para>
-  <para>
-    Similarly, setting a tooltip on a #GtkToolItem gets
-    simplified from
-    <informalexample><programlisting>
-gtk_tool_item_set_tooltip (toolitem, toolbar->tooltips, "tool tip", NULL);
-    </programlisting></informalexample>
-    to
-    <informalexample><programlisting>
-gtk_tool_item_set_tooltip_text (toolitem, text);
-    </programlisting></informalexample>
-  </para>
-
-</chapter>

docs/reference/gtk/running.sgml

@@ -267,15 +267,6 @@ additional environment variables.
   </para>
 </formalpara>
 
-<formalpara>
-  <title><envar>GTK2_RC_FILES</envar></title>
-
-  <para>
-    Specifies a list of RC files to parse instead of the default ones;
-    see <link linkend="gtk-Resource-Files">Resource Files</link>.
-  </para>
-</formalpara>
-
 <formalpara>
   <title><envar>GTK_EXE_PREFIX</envar></title>
 
@@ -377,6 +368,15 @@ nevertheless.
   </para>
 </formalpara>
 
+<formalpara>
+  <title><envar>GDK_SYNCHRONIZE</envar></title>
+
+  <para>
+    If set, GDK makes all X requests synchronously. This is a useful
+    option for debugging, but it will slow down the performance considerably.
+  </para>
+</formalpara>
+
 <formalpara>
   <title><envar>XDG_DATA_HOME</envar>, <envar>XDG_DATA_DIRS</envar></title>
 
@@ -389,6 +389,19 @@ nevertheless.
   </para>
 </formalpara>
 
+<formalpara>
+  <title><envar>DESKTOP_STARTUP_ID</envar></title>
+
+  <para>
+    GTK+ uses this environment variable to provide startup notification
+    according to the <ulink url="http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt">Startup Notification Spec</ulink>.
+    Following the specification, GTK+ unsets this variable after reading
+    it (to keep it from leaking to child processes). So, if you need its
+    value for your own purposes, you have to read it before calling
+    gtk_init().
+  </para>
+</formalpara>
+
 </refsect2>
 
 </refsect1>

docs/reference/gtk/tmpl/.gitignore

@@ -8,6 +8,7 @@ gtkbuilder.sgml
 gtkbutton.sgml
 gtkcalendar.sgml
 gtkcelleditable.sgml
+gtkcelllayout.sgml
 gtkcellrenderer.sgml
 gtkcellrenderertext.sgml
 gtkcellview.sgml
@@ -16,9 +17,14 @@ gtkcolorsel.sgml
 gtkcombobox.sgml
 gtkcomboboxentry.sgml
 gtkcontainer.sgml
+gtkdialog.sgml
+gtkdrawingarea.sgml
 gtkeditable.sgml
 gtkentry.sgml
 gtkentrybuffer.sgml
+gtkeventbox.sgml
+gtkexpander.sgml
+gtkfeatures.sgml
 gtkhbox.sgml
 gtkiconview.sgml
 gtkimcontextsimple.sgml
@@ -26,6 +32,7 @@ gtkimmulticontext.sgml
 gtkitemfactory.sgml
 gtklayout.sgml
 gtklinkbutton.sgml
+gtkmain.sgml
 gtkmessagedialog.sgml
 gtknotebook.sgml
 gtkobject.sgml

docs/reference/gtk/tmpl/gtkcelllayout.sgml

@@ -1,186 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellLayout
-
-<!-- ##### SECTION Short_Description ##### -->
-An interface for packing cells
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkCellLayout is an interface to be implemented by all objects which
-want to provide a #GtkTreeViewColumn-like API for packing cells, setting
-attributes and data funcs. 
-</para>
-
-<para>
-One of the notable features provided by implementations of GtkCellLayout
-are <emphasis>attributes</emphasis>. Attributes let you set the properties
-in flexible ways. They can just be set to constant values like regular
-properties. But they can also be mapped to a column of the underlying 
-tree model with gtk_cell_layout_set_attributes(), which means that the value 
-of the attribute can change from cell to cell as they are rendered by the 
-cell renderer. Finally, it is possible to specify a function with 
-gtk_cell_layout_set_cell_data_func() that is called to determine the value 
-of the attribute for each cell that is rendered.
-</para>
-
-<refsect2 id="GtkCellLayout-BUILDER-UI">
-<title>GtkCellLayouts as GtkBuildable</title>
-<para>
-Implementations of GtkCellLayout which also implement the GtkBuildable 
-interface (#GtkCellView, #GtkIconView, #GtkComboBox, #GtkComboBoxEntry, 
-#GtkEntryCompletion, #GtkTreeViewColumn) accept GtkCellRenderer objects
-as &lt;child&gt; elements in UI definitions. They support a custom 
-&lt;attributes&gt; element for their children, which can contain 
-multiple &lt;attribute&gt; elements. Each &lt;attribute&gt; element has 
-a name attribute which specifies a property of the cell renderer; the 
-content of the element is the attribute value.
-</para>
-<example>
-<title>A UI definition fragment specifying attributes</title>
-<programlisting><![CDATA[
-<object class="GtkCellView">
-  <child>
-    <object class="GtkCellRendererText"/>
-    <attributes>
-      <attribute name="text">0</attribute>
-    </attributes>
-  </child>"
-</object>
-]]></programlisting>
-</example>
-</refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkCellLayout ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GtkCellLayoutIface ##### -->
-<para>
-
-</para>
-
-@g_iface: 
-@pack_start: 
-@pack_end: 
-@clear: 
-@add_attribute: 
-@set_cell_data_func: 
-@clear_attributes: 
-@reorder: 
-@get_cells: 
-
-<!-- ##### USER_FUNCTION GtkCellLayoutDataFunc ##### -->
-<para>
-A function which should set the value of @cell_layout's cell renderer(s)
-as appropriate. 
-</para>
-
-@cell_layout: a #GtkCellLayout
-@cell: the cell renderer whose value is to be set
-@tree_model: the model
-@iter: a #GtkTreeIter indicating the row to set the value for
-@data: user data passed to gtk_cell_layout_set_cell_data_func()
-
-
-<!-- ##### 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_get_cells ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_layout_reorder ##### -->
-<para>
-
-</para>
-
-@cell_layout: 
-@cell: 
-@position: 
-
-
-<!-- ##### 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/gtkcheckmenuitem.sgml

@@ -30,20 +30,8 @@ toggles the value.
 
 <!-- ##### STRUCT GtkCheckMenuItem ##### -->
 <para>
-The #GtkCheckMenuItem-struct struct contains the following fields.
-(These fields should be considered read-only. They should never be set by
-an application.)
-
-<informaltable pgwide="1" frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
-<tbody>
-
-<row>
-<entry>#guint active;</entry>
-<entry>TRUE if the check box is active.</entry>
-</row>
-
-</tbody></tgroup></informaltable>
+The #GtkCheckMenuItem-struct struct contains only private fields that
+should not be directly accessed.
 </para>
 
 
@@ -53,8 +41,8 @@ This signal is emitted when the state of the check box is changed.
 </para>
 
 <para>
-A signal handler can examine the <structfield>active</structfield> 
-field of the #GtkCheckMenuItem-struct struct to discover the new state.
+A signal handler can use gtk_check_menu_item_get_active()
+to discover the new state.
 </para>
 
 @checkmenuitem: the object which received the signal.

docs/reference/gtk/tmpl/gtkdialog.sgml

@@ -1,406 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkDialog
-
-<!-- ##### SECTION Short_Description ##### -->
-Create popup windows
-
-<!-- ##### SECTION Long_Description ##### -->
-
-<para>
-Dialog boxes are a convenient way to prompt the user for a small amount of
-input, e.g. to display a message, ask a question, or anything else that does 
-not require extensive effort on the user's part.
-</para>
-
-<para>
-GTK+ treats a dialog as a window split vertically. The top section is a
-#GtkVBox known as the <structfield>content_area</structfield>, and is
-where widgets such as a #GtkLabel or a #GtkEntry should be packed.
-The bottom area is known as the <structfield>action_area</structfield>.
-This is generally used for packing buttons into the dialog which may
-perform functions such as cancel, ok, or apply.
-</para>
-
-<para>
-GtkDialog boxes are created with a call to gtk_dialog_new() or
-gtk_dialog_new_with_buttons(). gtk_dialog_new_with_buttons() is recommended;
-it allows you to set the dialog title, some convenient flags, and add simple
-buttons.
-</para>
-
-<para>
-If 'dialog' is a newly created dialog, the two primary areas of the window
-can be accessed through gtk_dialog_get_content_area() and
-gtk_dialog_get_action_area(), as can be seen from the example, below.
-</para>
-
-<para>
-A 'modal' dialog (that is, one which freezes the rest of the application from
-user input), can be created by calling gtk_window_set_modal() on the dialog. Use
-the GTK_WINDOW() macro to cast the widget returned from gtk_dialog_new() into a
-#GtkWindow. When using gtk_dialog_new_with_buttons() you can also pass the
-#GTK_DIALOG_MODAL flag to make a dialog modal.
-</para>
-
-<para>
-If you add buttons to #GtkDialog using gtk_dialog_new_with_buttons(),
-gtk_dialog_add_button(), gtk_dialog_add_buttons(), or
-gtk_dialog_add_action_widget(), clicking the button will emit a signal called
-"response" with a response ID that you specified. GTK+ will never assign a
-meaning to positive response IDs; these are entirely user-defined. But for
-convenience, you can use the response IDs in the #GtkResponseType enumeration
-(these all have values less than zero). If a dialog receives a delete event, 
-the "response" signal will be emitted with a response ID of #GTK_RESPONSE_DELETE_EVENT.
-</para>
-
-
-<para>
-If you want to block waiting for a dialog to return before returning control
-flow to your code, you can call gtk_dialog_run(). This function enters a
-recursive main loop and waits for the user to respond to the dialog, returning the 
-response ID corresponding to the button the user clicked.
-</para>
-
-<para>
-For the simple dialog in the following example, in reality you'd probably use
-#GtkMessageDialog to save yourself some effort.  But you'd need to create the
-dialog contents manually if you had more than a simple message in the dialog.
-<example>
-<title>Simple <structname>GtkDialog</structname> usage.</title>
-<programlisting>
-
-/* Function to open a dialog box displaying the message provided. */
-
-void quick_message (gchar *message) {
-
-   GtkWidget *dialog, *label, *content_area;
-   
-   /* Create the widgets */
-   
-   dialog = gtk_dialog_new_with_buttons ("Message",
-                                         main_application_window,
-                                         GTK_DIALOG_DESTROY_WITH_PARENT,
-                                         GTK_STOCK_OK,
-                                         GTK_RESPONSE_NONE,
-                                         NULL);
-   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-   label = gtk_label_new (message);
-   
-   /* Ensure that the dialog box is destroyed when the user responds. */
-   
-   g_signal_connect_swapped (dialog,
-                             "response", 
-                             G_CALLBACK (gtk_widget_destroy),
-                             dialog);
-
-   /* Add the label, and show everything we've added to the dialog. */
-
-   gtk_container_add (GTK_CONTAINER (content_area), label);
-   gtk_widget_show_all (dialog);
-}
-
-</programlisting>
-</example>
-</para>
-
-<refsect2 id="GtkDialog-BUILDER-UI"><title>GtkDialog as GtkBuildable</title>
-<para>
-The GtkDialog implementation of the GtkBuildable interface exposes the 
-@vbox and @action_area as internal children with the names "vbox" and 
-"action_area".
-</para>
-<para>
-GtkDialog supports a custom &lt;action-widgets&gt; element, which 
-can contain multiple &lt;action-widget&gt; elements. The "response"
-attribute specifies a numeric response, and the content of the element
-is the id of widget (which should be a child of the dialogs @action_area).
-</para>
-<example>
-<title>A <structname>GtkDialog</structname> UI definition fragment.</title>
-<programlisting><![CDATA[
-<object class="GtkDialog" id="dialog1">
-  <child internal-child="vbox">"
-    <object class="GtkVBox" id="vbox">
-      <child internal-child="action_area">
-        <object class="GtkHButtonBox" id="button_box">
-          <child>
-            <object class="GtkButton" id="button_cancel"/>
-          </child>
-          <child>
-            <object class="GtkButton" id="button_ok"/>
-          </child>
-        </object>
-      </child>
-    </object>
-  </child>
-  <action-widgets>
-    <action-widget response="3">button_ok</action-widget>
-    <action-widget response="-5">button_cancel</action-widget>
-  </action-widgets>
-</object>
-]]></programlisting>
-</example>
-</refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-
-<para>
-<variablelist>
-<varlistentry>
-<term>#GtkVBox</term>
-<listitem><para>Pack widgets vertically.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term>#GtkWindow</term>
-<listitem><para>Alter the properties of your dialog box.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term>#GtkButton</term>
-<listitem><para>Add them to the <structfield>action_area</structfield> to get a
-response from the user.</para></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkDialog ##### -->
-<para>
-<structfield>vbox</structfield> is a #GtkVBox - the main part of the
-dialog box.
-</para>
-
-<para>
-<structfield>action_area</structfield> is a #GtkHButtonBox packed below the
-dividing #GtkHSeparator in the dialog. It is treated exactly the same
-as any other #GtkHButtonBox.
-</para>
-
-
-<!-- ##### SIGNAL GtkDialog::close ##### -->
-<para>
-
-</para>
-
-@dialog: the object which received the signal.
-
-<!-- ##### SIGNAL GtkDialog::response ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@arg1: 
-
-<!-- ##### ARG GtkDialog:action-area-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkDialog:button-spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkDialog:content-area-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkDialog:content-area-spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ENUM GtkDialogFlags ##### -->
-<para>
-Flags used to influence dialog construction.
-</para>
-
-@GTK_DIALOG_MODAL: Make the constructed dialog modal, 
-  see gtk_window_set_modal().
-@GTK_DIALOG_DESTROY_WITH_PARENT: Destroy the dialog when its
-  parent is destroyed, see gtk_window_set_destroy_with_parent().
-
-<!-- ##### ENUM GtkResponseType ##### -->
-<para>
-Predefined values for use as response ids in gtk_dialog_add_button().
-All predefined values are negative, GTK+ leaves positive values for
-application-defined response ids. 
-</para>
-
-@GTK_RESPONSE_NONE: Returned if an action widget has no response id, or if 
-   the dialog gets programmatically hidden or destroyed.
-@GTK_RESPONSE_REJECT: Generic response id, not used by GTK+ dialogs.
-@GTK_RESPONSE_ACCEPT: Generic response id, not used by GTK+ dialogs.
-@GTK_RESPONSE_DELETE_EVENT: Returned if the dialog is deleted.
-@GTK_RESPONSE_OK: Returned by OK buttons in GTK+ dialogs.
-@GTK_RESPONSE_CANCEL: Returned by Cancel buttons in GTK+ dialogs.
-@GTK_RESPONSE_CLOSE: Returned by Close buttons in GTK+ dialogs.
-@GTK_RESPONSE_YES: Returned by Yes buttons in GTK+ dialogs.
-@GTK_RESPONSE_NO: Returned by No buttons in GTK+ dialogs.
-@GTK_RESPONSE_APPLY: Returned by Apply buttons in GTK+ dialogs.
-@GTK_RESPONSE_HELP: Returned by Help buttons in GTK+ dialogs.
-
-<!-- ##### FUNCTION gtk_dialog_new ##### -->
-<para>
-Creates a new dialog box. Widgets should not be packed into this #GtkWindow
-directly, but into the @vbox and @action_area, as described above. 
-</para>
-
-@void: 
-@Returns: a new #GtkDialog.
-
-
-<!-- ##### FUNCTION gtk_dialog_new_with_buttons ##### -->
-<para>
-
-</para>
-
-@title: 
-@parent: 
-@flags: 
-@first_button_text: 
-@Varargs: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_dialog_run ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_dialog_response ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@response_id: 
-
-
-<!-- ##### FUNCTION gtk_dialog_add_button ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@button_text: 
-@response_id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_dialog_add_buttons ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@first_button_text: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION gtk_dialog_add_action_widget ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@child: 
-@response_id: 
-
-
-<!-- ##### FUNCTION gtk_dialog_set_default_response ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@response_id: 
-
-
-<!-- ##### FUNCTION gtk_dialog_set_response_sensitive ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@response_id: 
-@setting: 
-
-
-<!-- ##### FUNCTION gtk_dialog_get_response_for_widget ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@widget: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_dialog_get_widget_for_response ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@response_id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_dialog_get_action_area ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_dialog_get_content_area ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_alternative_dialog_button_order ##### -->
-<para>
-
-</para>
-
-@screen: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_dialog_set_alternative_button_order ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@first_response_id: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION gtk_dialog_set_alternative_button_order_from_array ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@n_params: 
-@new_order: 
-
-

docs/reference/gtk/tmpl/gtkdrawingarea.sgml

@@ -1,131 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkDrawingArea
-
-<!-- ##### SECTION Short_Description ##### -->
-A widget for custom user interface elements
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-The #GtkDrawingArea widget is used for creating custom user interface
-elements. It's essentially a blank widget; you can draw on
-<literal>widget-&gt;window</literal>. After creating a drawing area,
-the application may want to connect to:
-
-<itemizedlist>
-  <listitem>
-    <para>
-    Mouse and button press signals to respond to input from
-    the user. (Use gtk_widget_add_events() to enable events 
-    you wish to receive.)
-    </para>
-  </listitem>
-  <listitem>
-    <para>
-    The "realize" signal to take any necessary actions
-    when the widget is instantiated on a particular display.
-    (Create GDK resources in response to this signal.)
-    </para>
-  </listitem>
-  <listitem>
-    <para>
-    The "configure_event" signal to take any necessary actions
-    when the widget changes size.
-    </para>
-  </listitem>
-  <listitem>
-    <para>
-    The "expose_event" signal to handle redrawing the
-    contents of the widget.
-    </para>
-  </listitem>
-</itemizedlist>
-</para>
-<para>
-The following code portion demonstrates using a drawing
-area to display a circle in the normal widget foreground 
-color.
-Note that GDK automatically clears the exposed area
-to the background color before sending the expose event, and 
-that drawing is implicitly clipped to the exposed area.
-</para>
-<example>
-<title>Simple <structname>GtkDrawingArea</structname> usage.</title>
-<programlisting>
-gboolean
-expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
-  cairo_t *cr;
-  
-  cr = gdk_cairo_create (event->window);
-
-  cairo_set_source_rgb (cr, 0.0, 0.0, 1.0);
-  cairo_paint (cr);
-
-  cairo_destroy (cr);
- 
-  return TRUE;
-}
-[...]
-  GtkWidget *drawing_area = gtk_drawing_area_new (<!-- -->);
-  gtk_widget_set_size_request (drawing_area, 100, 100);
-  g_signal_connect (G_OBJECT (drawing_area), "expose_event",  
-                    G_CALLBACK (expose_event_callback), NULL);
-</programlisting>
-</example>
-
-<para>
-Expose events are normally delivered when a drawing area first comes
-onscreen, or when it's covered by another window and then uncovered
-(exposed). You can also force an expose event by adding to the "damage
-region" of the drawing area's window; gtk_widget_queue_draw_area() and
-gdk_window_invalidate_rect() are equally good ways to do this. You'll
-then get an expose event for the invalid region.
-</para>
-
-<para>
-The available routines for drawing are documented on the <link
-linkend="gdk-Drawing-Primitives">GDK Drawing Primitives</link> page.
-See also gdk_draw_pixbuf() for drawing a #GdkPixbuf.
-</para>
-
-<para>
-To receive mouse events on a drawing area, you will need to enable
-them with gtk_widget_add_events(). To receive keyboard events, you
-will need to set the #GTK_CAN_FOCUS flag on the drawing area, and
-should probably draw some user-visible indication that the drawing
-area is focused. Use the GTK_HAS_FOCUS() macro in your expose event
-handler to decide whether to draw the focus indicator. See
-gtk_paint_focus() for one way to draw focus.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-Sometimes #GtkImage is a useful alternative to a drawing area. 
-You can put a #GdkPixmap in the #GtkImage and draw to the #GdkPixmap, 
-calling gtk_widget_queue_draw() on the #GtkImage when you want to 
-refresh to the screen.
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkDrawingArea ##### -->
-<para>
-The #GtkDrawingArea struct contains private data only, and
-should be accessed using the functions below.
-</para>
-
-
-<!-- ##### FUNCTION gtk_drawing_area_new ##### -->
-<para>
-Creates a new drawing area.
-</para>
-
-@void: 
-@Returns: a new #GtkDrawingArea
-
-

docs/reference/gtk/tmpl/gtkentrycompletion.sgml

@@ -1,377 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkEntryCompletion
-
-<!-- ##### SECTION Short_Description ##### -->
-Completion functionality for GtkEntry
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkEntryCompletion is an auxiliary object to be used in conjunction with
-#GtkEntry to provide the completion functionality. It implements the
-#GtkCellLayout interface, to allow the user to add extra cells to the 
-#GtkTreeView with completion matches. 
-</para>
-<para>
-"Completion functionality" means that when the user modifies the text 
-in the entry, #GtkEntryCompletion checks which rows in the model match 
-the current content of the entry, and displays a list of matches.
-By default, the matching is done by comparing the entry text 
-case-insensitively against the text column of the model (see 
-gtk_entry_completion_set_text_column()), but this can be overridden with 
-a custom match function (see gtk_entry_completion_set_match_func()).
-</para>
-<para>
-When the user selects a completion, the content of the entry is updated. 
-By default, the content of the entry is replaced by the text column of the 
-model, but this can be overridden by connecting to the ::match-selected signal
-and updating the entry in the signal handler. Note that you should return 
-%TRUE from the signal handler to suppress the default behaviour.
-</para>
-<para>
-To add completion functionality to an entry, use gtk_entry_set_completion().
-</para>
-<para>
-In addition to regular completion matches, which will be inserted into the
-entry when they are selected, #GtkEntryCompletion also allows to display 
-"actions" in the popup window. Their appearance is similar to menuitems, 
-to differentiate them clearly from completion strings. When an action is 
-selected, the ::action-activated signal is emitted.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkEntryCompletion ##### -->
-<para>
-The GtkEntryCompletion struct contains only private data.
-</para>
-
-
-<!-- ##### SIGNAL GtkEntryCompletion::action-activated ##### -->
-<para>
-
-</para>
-
-@entrycompletion: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkEntryCompletion::cursor-on-match ##### -->
-<para>
-
-</para>
-
-@entrycompletion: the object which received the signal.
-@arg1: 
-@arg2: 
-@Returns: 
-
-<!-- ##### SIGNAL GtkEntryCompletion::insert-prefix ##### -->
-<para>
-
-</para>
-
-@entrycompletion: the object which received the signal.
-@arg1: 
-@Returns: 
-
-<!-- ##### SIGNAL GtkEntryCompletion::match-selected ##### -->
-<para>
-
-</para>
-
-@entrycompletion: the object which received the signal.
-@arg1: 
-@arg2: 
-@Returns: 
-
-<!-- ##### ARG GtkEntryCompletion:inline-completion ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntryCompletion:inline-selection ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntryCompletion:minimum-key-length ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntryCompletion:model ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntryCompletion:popup-completion ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntryCompletion:popup-set-width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntryCompletion:popup-single-match ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntryCompletion:text-column ##### -->
-<para>
-
-</para>
-
-<!-- ##### USER_FUNCTION GtkEntryCompletionMatchFunc ##### -->
-<para>
-A function which decides whether the row indicated by @iter matches a given 
-@key, and should be displayed as a possible completion for @key. Note that
-@key is normalized and case-folded (see g_utf8_normalize() and 
-g_utf8_casefold()). If this is not appropriate, match functions have access
-to the unmodified key via <literal>gtk_entry_get_text (GTK_ENTRY (gtk_entry_completion_get_entry (<!-- -->)))</literal>.
-</para>
-
-@completion: the #GtkEntryCompletion
-@key: the string to match, normalized and case-folded
-@iter: a #GtkTreeIter indicating the row to match
-@user_data: user data given to gtk_entry_completion_set_match_func()
-@Returns: %TRUE if @iter should be displayed as a possible completion for @key
-
-
-<!-- ##### FUNCTION gtk_entry_completion_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_get_entry ##### -->
-<para>
-
-</para>
-
-@completion: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_set_model ##### -->
-<para>
-
-</para>
-
-@completion: 
-@model: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_get_model ##### -->
-<para>
-
-</para>
-
-@completion: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_set_match_func ##### -->
-<para>
-
-</para>
-
-@completion: 
-@func: 
-@func_data: 
-@func_notify: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_set_minimum_key_length ##### -->
-<para>
-
-</para>
-
-@completion: 
-@length: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_get_minimum_key_length ##### -->
-<para>
-
-</para>
-
-@completion: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_complete ##### -->
-<para>
-
-</para>
-
-@completion: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_get_completion_prefix ##### -->
-<para>
-
-</para>
-
-@completion: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_insert_prefix ##### -->
-<para>
-
-</para>
-
-@completion: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_insert_action_text ##### -->
-<para>
-
-</para>
-
-@completion: 
-@index_: 
-@text: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_insert_action_markup ##### -->
-<para>
-
-</para>
-
-@completion: 
-@index_: 
-@markup: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_delete_action ##### -->
-<para>
-
-</para>
-
-@completion: 
-@index_: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_set_text_column ##### -->
-<para>
-
-</para>
-
-@completion: 
-@column: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_get_text_column ##### -->
-<para>
-
-</para>
-
-@completion: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_set_inline_completion ##### -->
-<para>
-
-</para>
-
-@completion: 
-@inline_completion: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_get_inline_completion ##### -->
-<para>
-
-</para>
-
-@completion: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_set_inline_selection ##### -->
-<para>
-
-</para>
-
-@completion: 
-@inline_selection: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_get_inline_selection ##### -->
-<para>
-
-</para>
-
-@completion: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_set_popup_completion ##### -->
-<para>
-
-</para>
-
-@completion: 
-@popup_completion: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_get_popup_completion ##### -->
-<para>
-
-</para>
-
-@completion: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_set_popup_set_width ##### -->
-<para>
-
-</para>
-
-@completion: 
-@popup_set_width: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_get_popup_set_width ##### -->
-<para>
-
-</para>
-
-@completion: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_set_popup_single_match ##### -->
-<para>
-
-</para>
-
-@completion: 
-@popup_single_match: 
-
-
-<!-- ##### FUNCTION gtk_entry_completion_get_popup_single_match ##### -->
-<para>
-
-</para>
-
-@completion: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkenums.sgml

@@ -315,19 +315,28 @@ Used to change the appearance of an outline typically provided by a #GtkFrame.
 
 <!-- ##### ENUM GtkStateType ##### -->
 <para>
-This type indicates the current state of a widget; the state determines how
-the widget is drawn. The #GtkStateType enumeration is also used to
-identify different colors in a #GtkStyle for drawing, so states can be
-used for subparts of a widget as well as entire widgets.
+
 </para>
 
-@GTK_STATE_NORMAL: State during normal operation.
-@GTK_STATE_ACTIVE: State of a currently active widget, such as a depressed button.
-@GTK_STATE_PRELIGHT: State indicating that the mouse pointer is over
-the widget and the widget will respond to mouse clicks.
-@GTK_STATE_SELECTED: State of a selected item, such the selected row in a list.
-@GTK_STATE_INSENSITIVE: State indicating that the widget is
-unresponsive to user actions.
+@GTK_STATE_NORMAL: 
+@GTK_STATE_ACTIVE: 
+@GTK_STATE_PRELIGHT: 
+@GTK_STATE_SELECTED: 
+@GTK_STATE_INSENSITIVE: 
+@GTK_STATE_INCONSISTENT: 
+@GTK_STATE_FOCUSED: 
+
+<!-- ##### ENUM GtkStateFlags ##### -->
+<para>
+
+</para>
+
+@GTK_STATE_FLAG_ACTIVE: 
+@GTK_STATE_FLAG_PRELIGHT: 
+@GTK_STATE_FLAG_SELECTED: 
+@GTK_STATE_FLAG_INSENSITIVE: 
+@GTK_STATE_FLAG_INCONSISTENT: 
+@GTK_STATE_FLAG_FOCUSED: 
 
 <!-- ##### ENUM GtkToolbarStyle ##### -->
 <para>
@@ -411,3 +420,39 @@ The value can by obtained by connecting to the
 @GTK_DRAG_RESULT_ERROR: The drag operation failed due to some 
    unspecified error
 
+<!-- ##### ENUM GtkJunctionSides ##### -->
+<para>
+
+</para>
+
+@GTK_JUNCTION_NONE: 
+@GTK_JUNCTION_CORNER_TOPLEFT: 
+@GTK_JUNCTION_CORNER_TOPRIGHT: 
+@GTK_JUNCTION_CORNER_BOTTOMLEFT: 
+@GTK_JUNCTION_CORNER_BOTTOMRIGHT: 
+@GTK_JUNCTION_TOP: 
+@GTK_JUNCTION_BOTTOM: 
+@GTK_JUNCTION_LEFT: 
+@GTK_JUNCTION_RIGHT: 
+
+<!-- ##### ENUM GtkBorderStyle ##### -->
+<para>
+
+</para>
+
+@GTK_BORDER_STYLE_NONE: 
+@GTK_BORDER_STYLE_SOLID: 
+@GTK_BORDER_STYLE_INSET: 
+@GTK_BORDER_STYLE_OUTSET: 
+
+<!-- ##### ENUM GtkRegionFlags ##### -->
+<para>
+
+</para>
+
+@GTK_REGION_EVEN: 
+@GTK_REGION_ODD: 
+@GTK_REGION_FIRST: 
+@GTK_REGION_LAST: 
+@GTK_REGION_SORTED: 
+

docs/reference/gtk/tmpl/gtkeventbox.sgml

@@ -1,86 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkEventBox
-
-<!-- ##### SECTION Short_Description ##### -->
-A widget used to catch events for widgets which do not have their own window
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkEventBox widget is a subclass of #GtkBin which also has its own window.
-It is useful since it allows you to catch events for widgets which do not
-have their own window.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkEventBox ##### -->
-<para>
-The #GtkEventBox-struct struct contains private data only, and
-should be accessed using the functions below.
-</para>
-
-
-<!-- ##### ARG GtkEventBox:above-child ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEventBox:visible-window ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_event_box_new ##### -->
-<para>
-Creates a new #GtkEventBox.
-</para>
-
-@void: 
-@Returns: a new #GtkEventBox.
-
-
-<!-- ##### FUNCTION gtk_event_box_set_above_child ##### -->
-<para>
-
-</para>
-
-@event_box: 
-@above_child: 
-
-
-<!-- ##### FUNCTION gtk_event_box_get_above_child ##### -->
-<para>
-
-</para>
-
-@event_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_event_box_set_visible_window ##### -->
-<para>
-
-</para>
-
-@event_box: 
-@visible_window: 
-
-
-<!-- ##### FUNCTION gtk_event_box_get_visible_window ##### -->
-<para>
-
-</para>
-
-@event_box: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkexpander.sgml

@@ -1,296 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkExpander
-
-<!-- ##### SECTION Short_Description ##### -->
-A container which can hide its child
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkExpander allows the user to hide or show its child by clicking 
-on an expander triangle similar to the triangles used in a #GtkTreeView.
-</para>
-
-<para>
-Normally you use an expander as you would use any other descendant
-of #GtkBin; you create the child widget and use gtk_container_add() 
-to add it to the expander. When the expander is toggled, it will take 
-care of showing and hiding the child automatically.
-</para>
-
-<section id="expander-special-usage">
-<title>Special Usage</title>
-
-<para>
-There are situations in which you may prefer to show and hide the 
-expanded widget yourself, such as when you want to actually create 
-the widget at expansion time. In this case, create a #GtkExpander 
-but do not add a child to it. The expander widget has an 
-<literal>expanded</literal> property which can be used to monitor 
-its expansion state. You should watch this property with a signal 
-connection as follows:
-</para>
-
-<programlisting id="expander-callback-example">
-expander = gtk_expander_new_with_mnemonic ("_More Options");
-g_signal_connect (expander, "notify::expanded",
-                  G_CALLBACK (expander_callback), NULL);
-
-...
-
-static void
-expander_callback (GObject    *object,
-                   GParamSpec *param_spec,
-                   gpointer    user_data)
-{
-  GtkExpander *expander;
-
-  expander = GTK_EXPANDER (object);
-
-  if (gtk_expander_get_expanded (expander))
-    {
-      /* Show or create widgets */
-    }
-  else
-    {
-      /* Hide or destroy widgets */
-    }
-}
-</programlisting>
-</section>
-<refsect2 id="GtkExpander-BUILDER-UI">
-<title>GtkExpander as GtkBuildable</title>
-<para>
-The GtkExpander implementation of the GtkBuildable interface 
-supports placing a child in the label position by specifying
-"label" as the "type" attribute of a &lt;child&gt; element.
-A normal content child can be specified without specifying 
-a &lt;child&gt; type attribute.
-</para>
-<example>
-<title>A UI definition fragment with GtkExpander</title>
-<programlisting><![CDATA[
-<object class="GtkExpander">
-  <child type="label">
-    <object class="GtkLabel" id="expander-label"/>
-  </child>
-  <child>
-    <object class="GtkEntry" id="expander-content"/>
-  </child>
-</object>
-]]></programlisting>
-</example>
-</refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkExpander ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkExpander::activate ##### -->
-<para>
-
-</para>
-
-@expander: the object which received the signal.
-
-<!-- ##### ARG GtkExpander:expanded ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkExpander:label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkExpander:label-fill ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkExpander:label-widget ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkExpander:spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkExpander:use-markup ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkExpander:use-underline ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkExpander:expander-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkExpander:expander-spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_expander_new ##### -->
-<para>
-
-</para>
-
-@label: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_expander_new_with_mnemonic ##### -->
-<para>
-
-</para>
-
-@label: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_expander_set_expanded ##### -->
-<para>
-
-</para>
-
-@expander: 
-@expanded: 
-
-
-<!-- ##### FUNCTION gtk_expander_get_expanded ##### -->
-<para>
-
-</para>
-
-@expander: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_expander_set_spacing ##### -->
-<para>
-
-</para>
-
-@expander: 
-@spacing: 
-
-
-<!-- ##### FUNCTION gtk_expander_get_spacing ##### -->
-<para>
-
-</para>
-
-@expander: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_expander_set_label ##### -->
-<para>
-
-</para>
-
-@expander: 
-@label: 
-
-
-<!-- ##### FUNCTION gtk_expander_get_label ##### -->
-<para>
-
-</para>
-
-@expander: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_expander_set_use_underline ##### -->
-<para>
-
-</para>
-
-@expander: 
-@use_underline: 
-
-
-<!-- ##### FUNCTION gtk_expander_get_use_underline ##### -->
-<para>
-
-</para>
-
-@expander: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_expander_set_use_markup ##### -->
-<para>
-
-</para>
-
-@expander: 
-@use_markup: 
-
-
-<!-- ##### FUNCTION gtk_expander_get_use_markup ##### -->
-<para>
-
-</para>
-
-@expander: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_expander_set_label_widget ##### -->
-<para>
-
-</para>
-
-@expander: 
-@label_widget: 
-
-
-<!-- ##### FUNCTION gtk_expander_get_label_widget ##### -->
-<para>
-
-</para>
-
-@expander: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_expander_set_label_fill ##### -->
-<para>
-
-</para>
-
-@expander: 
-@label_fill: 
-
-
-<!-- ##### FUNCTION gtk_expander_get_label_fill ##### -->
-<para>
-
-</para>
-
-@expander: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkfeatures.sgml

@@ -1,135 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Version Information
-
-<!-- ##### SECTION Short_Description ##### -->
-Variables and functions to check the GTK+ version
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-GTK+ provides version information, primarily useful in configure checks
-for builds that have a configure script. Applications will not
-typically use the features described here.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION gtk_get_major_version ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_get_minor_version ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_get_micro_version ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_get_binary_age ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_get_interface_age ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_check_version ##### -->
-<para>
-</para>
-
-@required_major: 
-@required_minor: 
-@required_micro: 
-@Returns: 
-
-
-<!-- ##### MACRO GTK_MAJOR_VERSION ##### -->
-<para>
-Like #gtk_major_version, but from the headers used at
-application compile time, rather than from the library linked against
-at application run time.
-</para>
-
-
-
-<!-- ##### MACRO GTK_MINOR_VERSION ##### -->
-<para>
-Like #gtk_minor_version, but from the headers used at
-application compile time, rather than from the library linked against
-at application run time.
-</para>
-
-
-
-<!-- ##### MACRO GTK_MICRO_VERSION ##### -->
-<para>
-Like #gtk_micro_version, but from the headers used at
-application compile time, rather than from the library linked against
-at application run time.
-</para>
-
-
-
-<!-- ##### MACRO GTK_BINARY_AGE ##### -->
-<para>
-Like #gtk_binary_age, but from the headers used at
-application compile time, rather than from the library linked against
-at application run time.
-</para>
-
-
-
-<!-- ##### MACRO GTK_INTERFACE_AGE ##### -->
-<para>
-Like #gtk_interface_age, but from the headers used at
-application compile time, rather than from the library linked against
-at application run time.
-</para>
-
-
-
-<!-- ##### MACRO GTK_CHECK_VERSION ##### -->
-<para>
-Returns %TRUE if the version of the GTK+ header files is the same 
-as or newer than the passed-in version.
-</para>
-
-@major: major version (e.g. 1 for version 1.2.5)
-@minor: minor version (e.g. 2 for version 1.2.5)
-@micro: micro version (e.g. 5 for version 1.2.5)
-
-

docs/reference/gtk/tmpl/gtkiconfactory.sgml

@@ -279,6 +279,17 @@ This attribute is optional.</para>
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_icon_set_render_icon_pixbuf ##### -->
+<para>
+
+</para>
+
+@icon_set: 
+@context: 
+@size: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_icon_set_unref ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkicontheme.sgml

@@ -449,6 +449,18 @@ The #GQuark used for #GtkIconThemeError errors.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_icon_info_load_symbolic_for_context ##### -->
+<para>
+
+</para>
+
+@icon_info: 
+@context: 
+@was_symbolic: 
+@error: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_icon_info_set_raw_coordinates ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkmain.sgml

@@ -1,626 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Main loop and Events
-
-<!-- ##### SECTION Short_Description ##### -->
-Library initialization, main event loop, and events
-
-<!-- ##### SECTION Long_Description ##### -->
-
-<para>
-Before using GTK+, you need to initialize it; initialization connects
-to the window system display, and parses some standard command line
-arguments. The gtk_init() function initializes GTK+. gtk_init() exits
-the application if errors occur; to avoid this, use gtk_init_check(). 
-gtk_init_check() allows you to recover from a failed GTK+
-initialization - you might start up your application in text mode instead.
-</para>
-
-<para>
-Like all GUI toolkits, GTK+ uses an event-driven programming
-model. When the user is doing nothing, GTK+ sits in the
-<firstterm>main loop</firstterm> and waits for input. If the user
-performs some action - say, a mouse click - then the main loop "wakes
-up" and delivers an event to GTK+. GTK+ forwards the event to one or
-more widgets.
-</para>
-
-<para>
-When widgets receive an event, they frequently emit one or more 
-<firstterm>signals</firstterm>. Signals notify your program that
-"something interesting happened" by invoking functions you've
-connected to the signal with g_signal_connect(). Functions connected
-to a signal are often termed <firstterm>callbacks</firstterm>. 
-</para>
-
-<para>
-When your callbacks are invoked, you would typically take some action
-- for example, when an Open button is clicked you might display a 
-#GtkFileSelectionDialog. After a callback finishes, GTK+ will return
-to the main loop and await more user input.
-</para>
-
-<example>
-<title>Typical <function>main</function> function for a GTK+ application</title>
-<programlisting>
-int 
-main (int argc, char **argv)
-{
-  /* Initialize i18n support */
-  gtk_set_locale (<!-- -->);
-
-  /* Initialize the widget set */
-  gtk_init (&amp;argc, &amp;argv);
-
-  /* Create the main window */
-  mainwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-  /* Set up our GUI elements */
-  ...
-
-  /* Show the application window */
-  gtk_widget_show_all (mainwin);
-
-  /* Enter the main event loop, and wait for user interaction */
-  gtk_main (<!-- -->);
-
-  /* The user lost interest */
-  return 0;
-}
-</programlisting>
-</example>
-
-<para>
-It's OK to use the GLib main loop directly instead of gtk_main(),
-though it involves slightly more typing. See #GMainLoop in the GLib
-documentation.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-See the GLib manual, especially #GMainLoop and signal-related
-functions such as g_signal_connect().
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION gtk_set_locale ##### -->
-
-<para>
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_disable_setlocale ##### -->
-<para>
-
-</para>
-
-@void: 
-
-
-<!-- ##### FUNCTION gtk_get_default_language ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_parse_args ##### -->
-<para>
-
-</para>
-
-@argc: 
-@argv: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_init ##### -->
-<para>
-</para>
-
-<note>
-<para>
-</para>
-</note>
-
-@argc: 
-@argv: 
-
-
-<!-- ##### FUNCTION gtk_init_check ##### -->
-<para>
-</para>
-
-@argc: 
-@argv: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_init_with_args ##### -->
-<para>
-
-</para>
-
-@argc: 
-@argv: 
-@parameter_string: 
-@entries: 
-@translation_domain: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_get_option_group ##### -->
-<para>
-
-</para>
-
-@open_default_display: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_events_pending ##### -->
-<para>
-Checks if any events are pending. This can be used to update the GUI 
-and invoke timeouts etc. while doing some time intensive computation.
-</para>
-
-<example>
-<title>Updating the GUI during a long computation.</title>
-<programlisting>
-	/* computation going on */
-...
-        while (gtk_events_pending (<!-- -->))
-	  gtk_main_iteration (<!-- -->);
-...
-	/* computation continued */
-</programlisting>
-</example>
-
-@void: 
-@Returns: %TRUE if any events are pending, %FALSE otherwise.
-
-
-<!-- ##### FUNCTION gtk_main ##### -->
-<para>
-Runs the main loop until gtk_main_quit() is called. You can nest calls to
-gtk_main(). In that case gtk_main_quit() will make the innermost invocation
-of the main loop return.
-</para>
-
-@void: 
-
-
-<!-- ##### FUNCTION gtk_main_level ##### -->
-<para>
-Asks for the current nesting level of the main loop. This can be useful
-when calling gtk_quit_add().
-</para>
-
-@void: 
-@Returns: the nesting level of the current invocation of the main loop.
-
-
-<!-- ##### FUNCTION gtk_main_quit ##### -->
-<para>
-Makes the innermost invocation of the main loop return when it regains 
-control.
-</para>
-
-@void: 
-
-
-<!-- ##### FUNCTION gtk_main_iteration ##### -->
-<para>
-Runs a single iteration of the mainloop. If no events are waiting to be
-processed GTK+ will block until the next event is noticed. If you don't
-want to block look at gtk_main_iteration_do() or check if any events are
-pending with gtk_events_pending() first.
-</para>
-
-@void: 
-@Returns: %TRUE if gtk_main_quit() has been called for the innermost mainloop.
-
-
-<!-- ##### FUNCTION gtk_main_iteration_do ##### -->
-<para>
-Runs a single iteration of the mainloop. If no events are available either
-return or block dependent on the value of @blocking. 
-</para>
-
-@blocking: %TRUE if you want GTK+ to block if no events are pending.
-@Returns: %TRUE if gtk_main_quit() has been called for the innermost mainloop.
-
-
-<!-- ##### FUNCTION gtk_main_do_event ##### -->
-<para>
-Processes a single GDK event. This is public only to allow filtering of events
-between GDK and GTK+. You will not usually need to call this function directly.
-</para>
-<para>
-While you should not call this function directly, you might want to know
-how exactly events are handled. So here is what this function does with 
-the event:
-</para>
-
-<orderedlist>
-<listitem><para>
-  Compress enter/leave notify events. If the event passed build an 
-  enter/leave pair together with the next event (peeked from GDK)
-  both events are thrown away. This is to avoid a backlog of (de-)highlighting
-  widgets crossed by the pointer.
-</para></listitem>
-<listitem><para>
-  Find the widget which got the event. If the widget can't be determined 
-  the event is thrown away unless it belongs to a INCR transaction. In that
-  case it is passed to gtk_selection_incr_event().
-</para></listitem>
-<listitem><para>
-  Then the event is passed on a stack so you can query the currently handled
-  event with gtk_get_current_event(). 
-</para></listitem>
-<listitem><para>
-  The event is sent to a widget. If a grab is active all events for 
-  widgets that are not in the contained in the grab widget are sent to the 
-  latter with a few exceptions: 
-
-  <itemizedlist>
-  <listitem><para>
-    Deletion and destruction events are still sent to the event widget for
-    obvious reasons.
-  </para></listitem>
-  <listitem><para>
-    Events which directly relate to the visual representation of the event
-    widget.
-  </para></listitem>
-  <listitem><para>
-    Leave events are delivered to the event widget if there was an enter 
-    event delivered to it before without the paired leave event.
-  </para></listitem>
-  <listitem><para>
-    Drag events are not redirected because it is unclear what the semantics
-    of that would be.
-  </para></listitem>
-  </itemizedlist>
-
-  Another point of interest might be that all key events are first passed
-  through the key snooper functions if there are any. Read the description
-  of gtk_key_snooper_install() if you need this feature.
-</para></listitem>
-<listitem><para>
-  After finishing the delivery the event is popped from the event stack.
-</para></listitem>
-</orderedlist>
-
-@event: An event to process (normally) passed by GDK.
-
-
-<!-- ##### USER_FUNCTION GtkModuleInitFunc ##### -->
-<para>
-Each GTK+ module must have a function gtk_module_init() with this prototype.
-This function is called after loading the module with the @argc and @argv 
-cleaned from any arguments that GTK+ handles itself.
-</para>
-
-@argc: Pointer to the number of arguments remaining after gtk_init().
-@argv: Points to the argument vector.
-
-
-<!-- ##### USER_FUNCTION GtkModuleDisplayInitFunc ##### -->
-<para>
-
-</para>
-
-@display: 
-@Since: 2.2
-
-
-<!-- ##### FUNCTION gtk_true ##### -->
-<para>
-All this function does it to return %TRUE. This can be useful for example
-if you want to inhibit the deletion of a window. Of course you should 
-not do this as the user expects a reaction from clicking the close 
-icon of the window...
-</para>
-
-<example>
-<title>A persistent window</title>
-<programlisting>
-##include &lt;gtk/gtk.h&gt;
-
-int
-main (int argc, char **argv)
-{
-  GtkWidget     *win, *but;
-
-  gtk_init( &amp;argc, &amp;argv );
-
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  g_signal_connect (win, "delete-event",
-                    G_CALLBACK (gtk_true), NULL);
-  g_signal_connect (win, "destroy",
-		    G_CALLBACK (gtk_main_quit), NULL);
-
-  but = gtk_button_new_with_label ("Close yourself. I mean it!");
-  g_signal_connect_swapped (but, "clicked",
-		  G_CALLBACK (gtk_object_destroy), win);
-  gtk_container_add (GTK_CONTAINER (win), but);
-
-  gtk_widget_show_all (win);
-  gtk_main (<!-- -->);
-  return 0;
-}
-</programlisting>
-</example>
-
-@void: 
-@Returns: %TRUE
-
-
-<!-- ##### FUNCTION gtk_false ##### -->
-<para>
-Analogical to gtk_true() this function does nothing 
-but always returns %FALSE.
-</para>
-
-@void: 
-@Returns: %FALSE
-
-
-<!-- ##### FUNCTION gtk_grab_add ##### -->
-<para>
-Makes @widget the current grabbed widget. This means that interaction with 
-other widgets in the same application is blocked and mouse as well as 
-keyboard events are delivered to this widget.
-</para>
-<para>
-If @widget is not sensitive, it is not set as the current grabbed
-widget and this function does nothing.
-</para>
-
-@widget: The widget that grabs keyboard and pointer events.
-
-
-<!-- ##### FUNCTION gtk_grab_get_current ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_grab_remove ##### -->
-<para>
-Removes the grab from the given widget. You have to pair calls to gtk_grab_add()
-and gtk_grab_remove().
-</para>
-<para>
-If @widget does not have the grab, this function does nothing.
-</para>
-
-@widget: The widget which gives up the grab.
-
-
-<!-- ##### FUNCTION gtk_device_grab_add ##### -->
-<para>
-
-</para>
-
-@widget: 
-@device: 
-@block_others: 
-
-
-<!-- ##### FUNCTION gtk_device_grab_remove ##### -->
-<para>
-
-</para>
-
-@widget: 
-@device: 
-
-
-<!-- ##### USER_FUNCTION GtkFunction ##### -->
-<para>
-
-</para>
-
-@data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_quit_add_destroy ##### -->
-<para>
-Trigger destruction of @object in case the mainloop at level @main_level
-is quit.
-</para>
-
-@main_level: Level of the mainloop which shall trigger the destruction.
-@object: Object to be destroyed.
-@Deprecated: This function is going to be removed in GTK+ 3.0
-
-
-<!-- ##### FUNCTION gtk_quit_add ##### -->
-<para>
-Registers a function to be called when an instance of the mainloop is left.
-</para>
-
-@main_level: Level at which termination the function shall be called. You
- can pass 0 here to have the function run at the termination of the current
- mainloop.
-@function: The function to call. This should return 0 to be removed from the 
- list of quit handlers. Otherwise the function might be called again.
-@data: Pointer to pass when calling @function.
-@Returns: A handle for this quit handler (you need this for gtk_quit_remove())
-  or 0 if you passed a %NULL pointer in @function.
-@Deprecated: This function is going to be removed in GTK+ 3.0
-
-
-<!-- ##### USER_FUNCTION GtkCallbackMarshal ##### -->
-<para>
-
-</para>
-
-@object: 
-@data: 
-@n_args: 
-@args: 
-
-
-<!-- ##### STRUCT GtkArg ##### -->
-<para>
-
-</para>
-
-@type: 
-@name: 
-
-<!-- ##### FUNCTION gtk_quit_add_full ##### -->
-<para>
-Registers a function to be called when an instance of the mainloop is left.
-In comparison to gtk_quit_add() this function adds the possibility to 
-pass a marshaller and a function to be called when the quit handler is freed.
-</para>
-<para>
-The former can be used to run interpreted code instead of a compiled function
-while the latter can be used to free the information stored in @data (while
-you can do this in @function as well)... So this function will mostly be
-used by GTK+ wrappers for languages other than C.
-</para>
-
-@main_level: Level at which termination the function shall be called. You
- can pass 0 here to have the function run at the termination of the current
- mainloop.
-@function: The function to call. This should return 0 to be removed from the 
- list of quit handlers. Otherwise the function might be called again.
-@marshal: The marshaller to be used. If this is non-%NULL, @function is 
- ignored.
-@data: Pointer to pass when calling @function.
-@destroy: Function to call to destruct @data. Gets @data as argument.
-@Returns: A handle for this quit handler (you need this for gtk_quit_remove())
-  or 0 if you passed a %NULL pointer in @function.
-@Deprecated: This function is going to be removed in GTK+ 3.0
-
-
-<!-- ##### FUNCTION gtk_quit_remove ##### -->
-<para>
-Removes a quit handler by its identifier.
-</para>
-
-@quit_handler_id: Identifier for the handler returned when installing it.
-@Deprecated: This function is going to be removed in GTK+ 3.0
-
-
-<!-- ##### FUNCTION gtk_quit_remove_by_data ##### -->
-<para>
-Removes a quit handler identified by its @data field.
-</para>
-
-@data: The pointer passed as @data to gtk_quit_add() or gtk_quit_add_full().
-@Deprecated: This function is going to be removed in GTK+ 3.0
-
-
-<!-- ##### MACRO GTK_PRIORITY_RESIZE ##### -->
-<para>
-Use this priority for resizing related stuff. It is used internally by
-GTK+ to compute the sizes of widgets. This priority is higher than 
-%GDK_PRIORITY_REDRAW to avoid resizing a widget which was just redrawn.
-</para>
-
-
-
-<!-- ##### FUNCTION gtk_key_snooper_install ##### -->
-<para>
-Installs a key snooper function, which will get called on all key events
-before delivering them normally.
-</para>
-
-@snooper: a #GtkKeySnoopFunc.
-@func_data: data to pass to @snooper.
-@Returns: a unique id for this key snooper for use with gtk_key_snooper_remove().
-
-
-<!-- ##### USER_FUNCTION GtkKeySnoopFunc ##### -->
-<para>
-Key snooper functions are called before normal event delivery.
-They can be used to implement custom key event handling.
-</para>
-
-@grab_widget: the widget to which the event will be delivered.
-@event: the key event.
-@func_data: the @func_data supplied to gtk_key_snooper_install().
-@Returns: %TRUE to stop further processing of @event, %FALSE to continue.
-
-
-<!-- ##### FUNCTION gtk_key_snooper_remove ##### -->
-<para>
-Removes the key snooper function with the given id.
-</para>
-
-@snooper_handler_id: Identifies the key snooper to remove.
-
-
-<!-- ##### FUNCTION gtk_get_current_event ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_get_current_event_time ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_get_current_event_state ##### -->
-<para>
-
-</para>
-
-@state: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_get_current_event_device ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_get_event_widget ##### -->
-<para>
-
-</para>
-
-@event: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_propagate_event ##### -->
-<para>
-
-</para>
-
-@widget: 
-@event: 
-
-

docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml

@@ -16,6 +16,24 @@ A GtkToolItem containing a button with an additional dropdown menu
   #GtkMenuToolButton. Use gtk_menu_tool_button_new_from_stock() to
   create a new #GtkMenuToolButton containing a stock item.
 </para>
+<refsect2 id="GtkMenuToolButton-BUILDER-UI">
+<title>GtkMenuToolButton as GtkBuildable</title>
+<para>
+The GtkMenuToolButton implementation of the GtkBuildable interface
+supports adding a menu by specifying "menu" as the "type" 
+attribute of a &lt;child&gt; element.
+</para>
+<example>
+<title>A UI definition fragment with menus</title>
+<programlisting><![CDATA[
+<object class="GtkMenuToolButton">
+  <child type="menu">
+    <object class="GtkMenu"/>
+  </child>
+</object>
+]]></programlisting>
+</example>
+</refsect2>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>

docs/reference/gtk/tmpl/gtkrc.sgml

@@ -10,6 +10,10 @@ GTK+ provides resource file mechanism for configuring
 various aspects of the operation of a GTK+ program
 at runtime.
 </para>
+<para>
+In GTK+ 3.0, resource files have been deprecated and replaced
+by CSS-like style sheets, which are understood by #GtkCssProvider.
+</para>
 
 <refsect2><title>Default files</title>
 <para>

docs/reference/gtk/tmpl/gtkspinbutton.sgml

@@ -1,482 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkSpinButton
-
-<!-- ##### SECTION Short_Description ##### -->
-Retrieve an integer or floating-point number from the user
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkSpinButton is an ideal way to allow the user to set the value of some 
-attribute. Rather than having to directly type a number into a #GtkEntry, 
-#GtkSpinButton allows the user to click on one of two arrows to increment or 
-decrement the displayed value. A value can still be typed in, with the bonus 
-that it can be checked to ensure it is in a given range.
-</para>
-<para>
-The main properties of a #GtkSpinButton are through a #GtkAdjustment. See the 
-#GtkAdjustment section for more details about an adjustment's properties.
-</para>
-<para>
-<example>
-<title>Using a <structname>GtkSpinButton</structname> to get an integer.</title>
-<programlisting>
-
-/* Provides a function to retrieve an integer value from a GtkSpinButton
- * and creates a spin button to model percentage values.
- */
-
-gint grab_int_value (GtkSpinButton *a_spinner, gpointer user_data) {
-   return gtk_spin_button_get_value_as_int (a_spinner);
-}
-
-void create_integer_spin_button (void) {
-
-   GtkWidget *window, *spinner;
-   GtkAdjustment *spinner_adj;
-
-   spinner_adj = gtk_adjustment_new (50.0, 0.0, 100.0, 1.0, 5.0, 5.0);
-
-   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-   gtk_container_set_border_width (GTK_CONTAINER (window), 5);
-   
-   /* creates the spinner, with no decimal places */
-   spinner = gtk_spin_button_new (spinner_adj, 1.0, 0);
-   gtk_container_add (GTK_CONTAINER (window), spinner);
-   
-   gtk_widget_show_all (window);
-   return;
-}
-
-</programlisting>
-</example>
-</para>
-
-<para>
-<example>
-<title>Using a <structname>GtkSpinButton</structname> to get a floating point value.</title>
-<programlisting>
-
-/* Provides a function to retrieve a floating point value from a
- * GtkSpinButton, and creates a high precision spin button.
- */
-
-gfloat grab_int_value (GtkSpinButton *a_spinner, gpointer user_data) {
-   return gtk_spin_button_get_value (a_spinner);
-}
-
-void create_floating_spin_button (void) {
-
-   GtkWidget *window, *spinner;
-   GtkAdjustment *spinner_adj;
-
-   spinner_adj = gtk_adjustment_new (2.500, 0.0, 5.0, 0.001, 0.1, 0.1);
-
-   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-   gtk_container_set_border_width (GTK_CONTAINER (window), 5);
-   
-   /* creates the spinner, with three decimal places */
-   spinner = gtk_spin_button_new (spinner_adj, 0.001, 3);
-   gtk_container_add (GTK_CONTAINER (window), spinner);
-   
-   gtk_widget_show_all (window);
-   return;
-}
-
-</programlisting>
-</example>
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-<varlistentry>
-<term>#GtkEntry</term>
-<listitem><para>retrieve text rather than numbers.</para></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkSpinButton ##### -->
-<para>
-<structfield>entry</structfield> is the #GtkEntry part of the #GtkSpinButton 
-widget, and can be used accordingly. All other fields contain private data 
-and should only be modified using the functions below.
-</para>
-
-
-<!-- ##### SIGNAL GtkSpinButton::change-value ##### -->
-<para>
-
-</para>
-
-@spinbutton: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkSpinButton::input ##### -->
-<para>
-
-</para>
-
-@spinbutton: the object which received the signal.
-@arg1: 
-@Returns: 
-
-<!-- ##### SIGNAL GtkSpinButton::output ##### -->
-<para>
-
-</para>
-
-@spinbutton: the object which received the signal.
-@Returns: 
-
-<!-- ##### SIGNAL GtkSpinButton::value-changed ##### -->
-<para>
-
-</para>
-
-@spinbutton: the object which received the signal.
-
-<!-- ##### SIGNAL GtkSpinButton::wrapped ##### -->
-<para>
-
-</para>
-
-@spinbutton: the object which received the signal.
-
-<!-- ##### ARG GtkSpinButton:adjustment ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSpinButton:climb-rate ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSpinButton:digits ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSpinButton:numeric ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSpinButton:snap-to-ticks ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSpinButton:update-policy ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSpinButton:value ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSpinButton:wrap ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSpinButton:shadow-type ##### -->
-<para>
-the type of border that surrounds the arrows of a spin button.
-</para>
-
-<!-- ##### ENUM GtkSpinButtonUpdatePolicy ##### -->
-<para>
-
-<informaltable pgwide="1" frame="none" role="enum">
-<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
-<tbody>
-<row>
-<entry>GTK_UPDATE_ALWAYS</entry>
-<entry>When refreshing your #GtkSpinButton, the value is always displayed.</entry>
-</row>
-<row>
-<entry>GTK_UPDATE_IF_VALID</entry>
-<entry>When refreshing your #GtkSpinButton, the value is only displayed if it is valid within the bounds of the spin button's #GtkAdjustment.</entry>
-</row>
-</tbody></tgroup></informaltable>
-</para>
-
-@GTK_UPDATE_ALWAYS: 
-@GTK_UPDATE_IF_VALID: 
-
-<!-- ##### ENUM GtkSpinType ##### -->
-<para>
-
-<informaltable pgwide="1" frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
-<tbody>
-<row>
-<entry>GTK_SPIN_STEP_FORWARD, 
-GTK_SPIN_STEP_BACKWARD, 
-GTK_SPIN_PAGE_FORWARD, 
-GTK_SPIN_PAGE_BACKWARD</entry>
-<entry>These values spin a #GtkSpinButton by the relevant values of the spin button's #GtkAdjustment.</entry>
-</row>
-<row>
-<entry>GTK_SPIN_HOME, 
-GTK_SPIN_END</entry>
-<entry>These set the spin button's value to the minimum or maxmimum possible values, (set by its #GtkAdjustment), respectively.</entry>
-</row>
-<row>
-<entry>GTK_SPIN_USER_DEFINED</entry>
-<entry>The programmer must specify the exact amount to spin the #GtkSpinButton.</entry>
-</row>
-</tbody></tgroup></informaltable>
-</para>
-
-@GTK_SPIN_STEP_FORWARD: 
-@GTK_SPIN_STEP_BACKWARD: 
-@GTK_SPIN_PAGE_FORWARD: 
-@GTK_SPIN_PAGE_BACKWARD: 
-@GTK_SPIN_HOME: 
-@GTK_SPIN_END: 
-@GTK_SPIN_USER_DEFINED: 
-
-<!-- ##### FUNCTION gtk_spin_button_configure ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@adjustment: 
-@climb_rate: 
-@digits: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_new ##### -->
-<para>
-Creates a new #GtkSpinButton.
-</para>
-
-@adjustment: the #GtkAdjustment object that this spin button should use.
-@climb_rate: specifies how much the spin button changes when an arrow is clicked on.
-@digits: the number of decimal places to display.
-@Returns: The new spin button as a #GtkWidget.
-
-
-<!-- ##### FUNCTION gtk_spin_button_new_with_range ##### -->
-<para>
-
-</para>
-
-@min: 
-@max: 
-@step: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_set_adjustment ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@adjustment: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_get_adjustment ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_set_digits ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@digits: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_set_increments ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@step: 
-@page: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_set_range ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@min: 
-@max: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_get_value_as_int ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_set_value ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@value: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_set_update_policy ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@policy: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_set_numeric ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@numeric: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_spin ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@direction: 
-@increment: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_set_wrap ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@wrap: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_set_snap_to_ticks ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@snap_to_ticks: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_update ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_get_digits ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_get_increments ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@step: 
-@page: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_get_numeric ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_get_range ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@min: 
-@max: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_get_snap_to_ticks ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_get_update_policy ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_get_value ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_spin_button_get_wrap ##### -->
-<para>
-
-</para>
-
-@spin_button: 
-@Returns: 
-
-
-<!-- ##### MACRO GTK_INPUT_ERROR ##### -->
-<para>
-
-</para>
-
-
-

docs/reference/gtk/tmpl/gtktextbuffer.sgml

@@ -931,7 +931,7 @@ It must return the serialized form of the content.
 </para>
 
 @register_buffer: the #GtkTextBuffer for which the format is registered
-@content_buffer: the #GtkTextsBuffer to serialize
+@content_buffer: the #GtkTextBuffer to serialize
 @start: start of the block of text to serialize
 @end: end of the block of text to serialize
 @length: Return location for the length of the serialized data

docs/reference/gtk/visual_index.xml

@@ -30,6 +30,9 @@
   <link linkend="GtkFontButton">
     <inlinegraphic fileref="font-button.png" format="PNG"></inlinegraphic>
   </link>
+  <link linkend="GtkAppChooserButton">
+    <inlinegraphic fileref="appchooserbutton.png" format="PNG"></inlinegraphic>
+  </link>
   <link linkend="GtkFrame">
     <inlinegraphic fileref="frame.png" format="PNG"></inlinegraphic>
   </link>
@@ -123,6 +126,9 @@
   <link linkend="GtkFileChooserDialog">
     <inlinegraphic fileref="filechooser.png" format="PNG"></inlinegraphic>
   </link>
+  <link linkend="GtkAppChooserDialog">
+    <inlinegraphic fileref="appchooserdialog.png" format="PNG"></inlinegraphic>
+  </link>
   <link linkend="GtkSwitch">
     <inlinegraphic fileref="switch.png" format="PNG"></inlinegraphic>
   </link>