2.90.0

Move libgail-util to libgail-util-3.0, and gail.pc to gail-3.0.pc

Makefile.am

@@ -4,7 +4,6 @@ include $(top_srcdir)/Makefile.decl
 SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
-# require automake 1.4
 AUTOMAKE_OPTIONS = 1.7
 ACLOCAL_AMFLAGS = -I m4
 
@@ -50,14 +49,10 @@ EXTRA_DIST +=			\
 	examples/buttons/info.xpm  \
 	examples/calendar/Makefile  \
 	examples/calendar/calendar.c  \
-	examples/clist/Makefile  \
-	examples/clist/clist.c  \
 	examples/entry/Makefile  \
 	examples/entry/entry.c  \
 	examples/eventbox/Makefile  \
 	examples/eventbox/eventbox.c  \
-	examples/filesel/Makefile  \
-	examples/filesel/filesel.c  \
 	examples/gtkdial/Makefile  \
 	examples/gtkdial/dial_test.c  \
 	examples/gtkdial/gtkdial.c  \
@@ -68,11 +63,8 @@ EXTRA_DIST +=			\
 	examples/helloworld2/helloworld2.c  \
 	examples/label/Makefile	\
 	examples/label/label.c	\
-	examples/list/Makefile  \
-	examples/list/list.c  \
 	examples/menu/Makefile  \
 	examples/menu/menu.c  \
-	examples/menu/itemfactory.c  \
 	examples/notebook/Makefile  \
 	examples/notebook/notebook.c  \
 	examples/packbox/Makefile  \
@@ -102,14 +94,10 @@ EXTRA_DIST +=			\
 	examples/statusbar/statusbar.c  \
 	examples/table/Makefile  \
 	examples/table/table.c  \
-	examples/text/Makefile  \
-	examples/text/text.c  \
 	examples/tictactoe/Makefile  \
 	examples/tictactoe/tictactoe.c  \
 	examples/tictactoe/tictactoe.h  \
 	examples/tictactoe/ttt_test.c  \
-	examples/tree/Makefile  \
-	examples/tree/tree.c  \
 	examples/wheelbarrow/Makefile  \
 	examples/wheelbarrow/wheelbarrow.c  \
 	examples/fixed/fixed.c  \
@@ -143,37 +131,37 @@ MAINTAINERCLEANFILES = \
 GDKTARGET=@gdktarget@
 
 ## Copy .pc files to target-specific names
-gtk+-$(GDKTARGET)-2.0.pc: gtk+-2.0.pc
-	rm -f gtk+-$(GDKTARGET)-2.0.pc && \
-	cp gtk+-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
+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
 
-gdk-$(GDKTARGET)-2.0.pc: gdk-2.0.pc
-	rm -f gdk-$(GDKTARGET)-2.0.pc && \
-	cp gdk-2.0.pc gdk-$(GDKTARGET)-2.0.pc
+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
 
-gtk+-$(GDKTARGET)-2.0-uninstalled.pc: gtk+-2.0-uninstalled.pc
-	rm -f gtk+-$(GDKTARGET)-2.0-uninstalled.pc && \
-	cp gtk+-2.0-uninstalled.pc gtk+-$(GDKTARGET)-2.0-uninstalled.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)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
-	rm -f gdk-$(GDKTARGET)-2.0-uninstalled.pc && \
-	cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.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
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc
+pkgconfig_DATA = gdk-pixbuf-3.0.pc gdk-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail-3.0.pc
 
 if OS_UNIX
-pkgconfig_DATA += gtk+-unix-print-2.0.pc
+pkgconfig_DATA += gtk+-unix-print-3.0.pc
 endif
 
 DISTCLEANFILES =				\
-	gtk+-unix-print-2.0.pc			\
-	gtk+-$(GDKTARGET)-2.0.pc		\
-	gdk-$(GDKTARGET)-2.0.pc			\
-	gail.pc					\
-	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
-	gdk-$(GDKTARGET)-2.0-uninstalled.pc	\
-	gail-uninstalled.pc 			\
+	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			\
 	config.lt
 
 distclean-local:
@@ -195,21 +183,21 @@ ChangeLog:
 	  echo A git checkout and git-log is required to generate this file >> $@); \
 	fi
 
-## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc
+## 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)-2.0.pc && \
-	 test -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
-	 rm -f gdk-2.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
-	 rm -f gtk+-2.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \
+	 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-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
-	 rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
+	 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-2.0.pc
-	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-2.0.pc
+	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-3.0.pc
+	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc
 
 dist-hook:
 	if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \

NEWS

@@ -1,10 +1,50 @@
 Overview of Changes from GTK+ 2.20.x to 2.90.0
 ==============================================
 
-* GtkExtendedLayout: Width-for-height geometry management
+* GtkExtendedLayout: Width-for-height geometry management.
+  This change is known to currently cause minor problems in
+  some applications, see
+  617444 GNU emacs warnings with extended layout GTK+
+  617556 inkscape toolbars broken with extended layout
 
 * gtk_icon_theme_load_symbolic: Support for 'symbolic' icons
 
+* Applications can indicate their preference for a dark theme
+  variant by setting GtkSettings::gtk-application-prefer-dark-theme
+
+* GtkTreeModelFilter can be more usefully subclassed
+
+* Tooltip positioning has been changed to make it less likely
+  that the tooltip covers up the widget that it relates to
+
+* Deprecated functions have been removed (though some more work
+  remains to be done in GDK)
+
+* This release is parallel installable with GTK+ <= 2.22, by renaming
+  .pc files, libraries, include paths, module paths, gtkrc files, etc
+  to include a '3.0' in its name.
+
+* Updated translations:
+ Basque
+ Bengali
+ Bengali India
+ Catalan
+ Catalan (Valencian)
+ Crimean Tatar
+ Danish
+ Dutch
+ Galician
+ Greek
+ Indonesian
+ Kannada
+ Kazakh
+ Latvian
+ Marathi
+ Norwegian bokmål
+ Spanish
+ Thai
+ Ukrainian
+
 
 Overview of Changes from GTK+ 2.19.7 to 2.20.0
 ==============================================

build/win32/vs9/gtk+.vsprops

@@ -31,7 +31,7 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h

 	/>
 	<UserMacro
 		Name="GtkApiVersion"
-		Value="2.0"
+		Value="3.0"
 	/>
 	<UserMacro
 		Name="GtkBinaryVersion"

configure.ac

@@ -11,7 +11,7 @@ AC_PREREQ(2.62)
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [21])
+m4_define([gtk_minor_version], [90])
 m4_define([gtk_micro_version], [0])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
@@ -19,7 +19,7 @@ m4_define([gtk_binary_age],
 m4_define([gtk_version],
           [gtk_major_version.gtk_minor_version.gtk_micro_version])
 # This is the X.Y used in -lgtk-FOO-X.Y
-m4_define([gtk_api_version], [2.0])
+m4_define([gtk_api_version], [3.0])
 
 # Define a string for the earliest version that this release has
 # backwards binary compatibility with for all interfaces a module
@@ -28,7 +28,7 @@ m4_define([gtk_api_version], [2.0])
 # for GTK+.
 #
 #GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
-m4_define([gtk_binary_version], [2.10.0])
+m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
 m4_define([glib_required_version], [2.23.6])
@@ -58,7 +58,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
 
 #
 # For each of the libraries we build, we define the following
- 
 # substituted variables:
 #
 # foo_PACKAGES:     pkg-config packages this library requires
@@ -121,7 +120,7 @@ AC_SUBST(GDK_PIXBUF_MINOR)
 AC_SUBST(GDK_PIXBUF_MICRO)
 AC_SUBST(GDK_PIXBUF_VERSION)
 
-GETTEXT_PACKAGE=gtk20
+GETTEXT_PACKAGE=gtk30
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [The prefix for our gettext translation domains.])
@@ -163,10 +162,10 @@ dnl Initialize libtool
 AC_PROG_CC
 AM_DISABLE_STATIC
 
-dnl 
+dnl
 dnl Check for a working C++ compiler, but do not bail out, if none is found.
 dnl We use this for an automated test for C++ header correctness.
-dnl 
+dnl
 AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
@@ -287,7 +286,7 @@ AC_SUBST(gtktargetlib)
 
 if test "x$enable_debug" = "xyes"; then
   test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" 
+  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
 else
   if test "x$enable_debug" = "xno"; then
     GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
@@ -305,7 +304,7 @@ fi
 AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}",
                    [Define if debugging is enabled])
 
-			
+
 # Build time sanity check...
 AM_SANITY_CHECK
 
@@ -337,7 +336,7 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES"
 
 # Ensure MSVC-compatible struct packing convention is used when
 # compiling for Win32 with gcc.
@@ -377,11 +376,11 @@ fi
 # Honor aclocal flags
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
-## Initial sanity check, done here so that users get told they 
+## Initial sanity check, done here so that users get told they
 ## have the wrong dependencies as early in the process as possible.
 ## Later on we actually use the cflags/libs from separate pkg-config
-## calls. Oh, also the later pkg-config calls don't include 
-## the version requirements since those make the module lists 
+## calls. Oh, also the later pkg-config calls don't include
+## the version requirements since those make the module lists
 ## annoying to construct
 PKG_CHECK_MODULES(BASE_DEPENDENCIES,
   [glib-2.0 >= glib_required_version dnl
@@ -416,7 +415,7 @@ dnl ******************************************************
 dnl * See whether to include shared library dependencies *
 dnl ******************************************************
 
-AC_ARG_ENABLE(explicit-deps, 
+AC_ARG_ENABLE(explicit-deps,
               [AC_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@],
                               [use explicit dependencies in .pc files [default=auto]])],,
               [enable_explicit_deps=auto])
@@ -427,12 +426,12 @@ case $enable_explicit_deps in
     export SED
     deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
-      enable_explicit_deps=yes  
+      enable_explicit_deps=yes
     else
-      enable_explicit_deps=no  
+      enable_explicit_deps=no
     fi
   ;;
-  yes|no) 
+  yes|no)
   ;;
   *) AC_MSG_ERROR([Value given to --enable-explicit-deps must be one of yes, no or auto])
   ;;
@@ -507,7 +506,7 @@ if test "$gtk_ok" = "yes"; then
   AC_DEFINE([HAVE__NL_PAPER_WIDTH], [1],
 	    [Define if _NL_PAPER_WIDTH is available])
 fi
-	
+
 # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
 AC_MSG_CHECKING(for sigsetjmp)
 AC_TRY_LINK([#include <setjmp.h>], [
@@ -550,7 +549,7 @@ dnl (End of adapted AM_GLIB_GNU_GETTEXT snippet.)
 
 AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR)
 
-dnl The DU4 header files don't provide library prototypes unless 
+dnl The DU4 header files don't provide library prototypes unless
 dnl -std1 is given to the native cc.
 AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
 
@@ -614,13 +613,13 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
 
 #
 # Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
-# 
+#
 
 GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0"
 
 AM_PATH_GLIB_2_0(glib_required_version, :,
   AC_MSG_ERROR([
-*** GLIB glib_required_version or better is required. The latest version of 
+*** GLIB glib_required_version or better is required. The latest version of
 *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
   gobject gmodule-no-export gthread)
 
@@ -795,7 +794,7 @@ if test x$enable_modules = xno; then
 else
     AC_MSG_RESULT(yes)
     AC_MSG_CHECKING(whether dynamic modules work)
-    ## for loop is to strip newline 
+    ## for loop is to strip newline
     tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0`
     for I in $tmp; do
         dynworks=$I
@@ -867,7 +866,7 @@ if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
 
   if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
      AC_MSG_ERROR([
-*** Checks for TIFF loader failed. You can build without it by passing 
+*** Checks for TIFF loader failed. You can build without it by passing
 *** --without-libtiff to configure but some programs using GTK+ may
 *** not work properly])
   fi
@@ -893,7 +892,7 @@ if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
       AC_MSG_RESULT($jpeg_ok)
       if test "$jpeg_ok" = yes; then
         LIBJPEG='-ljpeg'
-        AC_CHECK_LIB(jpeg, jpeg_simple_progression,     
+        AC_CHECK_LIB(jpeg, jpeg_simple_progression,
           AC_DEFINE(HAVE_PROGRESSIVE_JPEG, 1,
                     [Define to 1 is libjpeg supports progressive JPEG]),
           AC_MSG_WARN(JPEG library does not support progressive saving.))
@@ -905,7 +904,7 @@ if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
 
   if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
      AC_MSG_ERROR([
-*** Checks for JPEG loader failed. You can build without it by passing 
+*** Checks for JPEG loader failed. You can build without it by passing
 *** --without-libjpeg to configure but some programs using GTK+ may
 *** not work properly])
   fi
@@ -946,7 +945,7 @@ dnl Test for libpng
 
   if test x$with_libpng != xno && test -z "$LIBPNG"; then
      AC_MSG_ERROR([
-*** Checks for PNG loader failed. You can build without it by passing 
+*** Checks for PNG loader failed. You can build without it by passing
 *** --without-libpng to configure but many programs using GTK+ will
 *** not work properly. The PNG loader is also needed if you are compiling
 *** from CVS.])
@@ -959,7 +958,7 @@ dnl Test for libjasper
 
   if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
      AC_MSG_ERROR([
-*** Checks for JPEG2000 loader failed. You can build without it by passing 
+*** Checks for JPEG2000 loader failed. You can build without it by passing
 *** --without-libjasper to configure])
   fi
 
@@ -983,7 +982,7 @@ AC_ARG_WITH(included_loaders,
 [  --with-included-loaders=LOADER1,LOADER2,...
                           build the specified loaders into gdk-pixbuf])
 
-if $dynworks; then 
+if $dynworks; then
    :
 else
    ## if the option was specified, leave it; otherwise disable included loaders
@@ -1081,21 +1080,21 @@ if test x$gio_can_sniff = x; then
   AC_RUN_IFELSE([AC_LANG_SOURCE([[
   #include <gio/gio.h>
   static const gsize data_size = 159;
-  static const guint8 data[] = 
+  static const guint8 data[] =
   {
-    0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
-    0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 
-    0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00, 
-    0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, 
-    0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 
-    0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 
-    0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8, 
-    0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, 
-    0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 
-    0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, 
-    0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, 
-    0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, 
-    0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 
+    0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
+    0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
+    0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
+    0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+    0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
+    0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
+    0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
+    0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
+    0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+    0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
+    0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
+    0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
+    0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
     0x42, 0x60, 0x82
   };
   int
@@ -1103,7 +1102,7 @@ if test x$gio_can_sniff = x; then
   {
     char *content_type;
     char *image_png;
-    content_type = g_content_type_guess (NULL, data, data_size, NULL);  
+    content_type = g_content_type_guess (NULL, data, data_size, NULL);
     image_png = g_content_type_from_mime_type ("image/png");
     return !!strcmp (content_type, image_png);
   }]])],
@@ -1128,7 +1127,7 @@ AC_ARG_WITH(included_immodules,
 [  --with-included-immodules=MODULE1,MODULE2,...
                           build the specified input methods into gtk])
 
-if $dynworks; then 
+if $dynworks; then
    :
 else
    ## if the option was specified, leave it; otherwise disable included immodules
@@ -1221,7 +1220,7 @@ fi
 # support.
 #
 AC_CHECK_HEADER(sys/systeminfo.h,
-                AC_DEFINE(HAVE_SYS_SYSTEMINFO_H, 1, 
+                AC_DEFINE(HAVE_SYS_SYSTEMINFO_H, 1,
                           [Define to 1 if sys/systeminfo.h is available]))
 AC_CHECK_HEADER(sys/sysinfo.h,
                 AC_DEFINE(HAVE_SYS_SYSINFO_H, 1,
@@ -1258,10 +1257,10 @@ AM_CONDITIONAL(USE_MEDIALIB25, test $use_mlib25 = yes)
 AC_MSG_CHECKING(for x86 platform)
 case $host_cpu in
   i386|i486|i586|i686|i786|k6|k7)
-	use_x86_asm=yes
+        use_x86_asm=yes
         ;;
    *)
-  	use_x86_asm=no
+        use_x86_asm=no
 esac
 AC_MSG_RESULT($use_x86_asm)
 
@@ -1269,7 +1268,7 @@ use_mmx_asm=no
 if test $use_x86_asm = yes; then
     save_ac_ext=$ac_ext
     ac_ext=S
-    
+
     AC_MSG_CHECKING(compiler support for MMX)
     cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S
     if AC_TRY_EVAL(ac_compile); then
@@ -1307,11 +1306,11 @@ if test $cross_compiling = yes; then
   fi
 fi
 
-if test ! -f $srcdir/gtk/gtkbuiltincache.h && 
+if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
    test "x$REBUILD_PNGS" = "x#" ; then
      AC_MSG_ERROR([
 *** gtkbuiltincache.h is not in the tree, and cannot be built
-*** because you don't have libpng, or (when cross-compiling) you 
+*** because you don't have libpng, or (when cross-compiling) you
 *** don't have a prebuilt gtk-update-icon-cache on the build system.])
 fi
 
@@ -1319,7 +1318,7 @@ AC_SUBST(REBUILD_PNGS)
 
 GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
 GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
-GDK_PIXBUF_EXTRA_CFLAGS= 
+GDK_PIXBUF_EXTRA_CFLAGS=
 GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
 GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
 
@@ -1330,10 +1329,10 @@ GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $
 GDK_PIXBUF_XLIB_PACKAGES=
 GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
 GDK_PIXBUF_XLIB_EXTRA_LIBS=
-	
+
 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=
@@ -1358,17 +1357,17 @@ if test "x$gdktarget" = "xx11"; then
     X_PACKAGES="$X_PACKAGES x11 xext xrender"
     x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
     X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
-    
+
     # Strip out any .la files that pkg-config might give us (this happens
     # with -uninstalled.pc files)
     x_libs_for_checks=
     for I in $x_libs ; do
-      case $I in 
+      case $I in
         *.la) ;;
         *) x_libs_for_checks="$x_libs_for_checks $I" ;;
       esac
     done
-    
+
     GDK_PIXBUF_XLIB_PACKAGES="x11"
     GTK_PACKAGES_FOR_X="x11"
   else
@@ -1377,7 +1376,7 @@ if test "x$gdktarget" = "xx11"; then
     if test x$no_x = xyes ; then
       AC_MSG_ERROR([X development libraries not found])
     fi
-    
+
     x_cflags="$X_CFLAGS"
     x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS"
 
@@ -1394,7 +1393,7 @@ if test "x$gdktarget" = "xx11"; then
 
   gtk_save_LIBS=$LIBS
   LIBS="$x_libs_for_checks $LIBS"
-  
+
   # Sanity check for the X11 and Xext libraries. While everything we need from
   # Xext is optional, the chances a system has *none* of these things is so
   # small that we just unconditionally require it.
@@ -1426,9 +1425,9 @@ if test "x$gdktarget" = "xx11"; then
 
   # Generic X11R6 check needed for XIM support; we could
   # probably use this to replace the above, but we'll
-  # leave the separate checks for XConvertCase and XInternAtoms 
+  # leave the separate checks for XConvertCase and XInternAtoms
   # for clarity
-  
+
   have_x11r6=false
   AC_CHECK_FUNC(XAddConnectionWatch,
       have_x11r6=true)
@@ -1458,7 +1457,7 @@ if test "x$gdktarget" = "xx11"; then
   # X SYNC check
   gtk_save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $x_cflags"
-  
+
   AC_CHECK_FUNC(XSyncQueryExtension,
       [AC_CHECK_HEADER(X11/extensions/sync.h,
 	  AC_DEFINE(HAVE_XSYNC, 1, [Have the SYNC extension library]),
@@ -1473,9 +1472,9 @@ if test "x$gdktarget" = "xx11"; then
      AC_CHECK_FUNC(XShmAttach,
 	:,
 	# On AIX, it is in XextSam instead
-	[AC_CHECK_LIB(XextSam, XShmAttach, 
+	[AC_CHECK_LIB(XextSam, XShmAttach,
 	    [GTK_ADD_LIB(x_extra_libs,XextSam)])])
-  fi    
+  fi
 
   if test "x$enable_shm" = "xyes"; then
     # Check for shared memory
@@ -1489,7 +1488,7 @@ if test "x$gdktarget" = "xx11"; then
                     no_sys_shm=yes)
 
     # Check for the X shared memory extension header file
-    have_xshm=no 
+    have_xshm=no
     AC_MSG_CHECKING(X11/extensions/XShm.h)
     if test "x$no_xext_lib" = "xyes"; then
       :
@@ -1518,17 +1517,17 @@ if test "x$gdktarget" = "xx11"; then
     # Check for Xinerama extension (Solaris impl or Xfree impl)
     gtk_save_cppflags="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $x_cflags"
-  
+
     # Check for XFree
     AC_MSG_CHECKING(for Xinerama support on XFree86)
-	  
+
     have_xfree_xinerama=false
     if $PKG_CONFIG --exists xinerama ; then
        have_xfree_xinerama=true
        X_PACKAGES="$X_PACKAGES xinerama"
-    else    
+    else
        AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
-	   [AC_CHECK_HEADER(X11/extensions/Xinerama.h, 
+	   [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
 	   [GTK_ADD_LIB(x_extra_libs,Xinerama)
 	   have_xfree_xinerama=true], :,
            [#include <X11/Xlib.h>])])
@@ -1547,13 +1546,13 @@ if test "x$gdktarget" = "xx11"; then
         *-*-solaris*)
             # Check for solaris
 	    AC_MSG_CHECKING(for Xinerama support on Solaris)
-	  
+
 	    have_solaris_xinerama=false
 	    AC_CHECK_FUNC(XineramaGetInfo,
 	        [AC_CHECK_HEADER(X11/extensions/xinerama.h,
-  	  	    [have_solaris_xinerama=true], :,
+		    [have_solaris_xinerama=true], :,
 		    [#include <X11/Xlib.h>])])
-		
+
             if $have_solaris_xinerama ; then
               AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1,
                         [Define to 1 if solaris xinerama is available])
@@ -1569,13 +1568,13 @@ if test "x$gdktarget" = "xx11"; then
       esac
     fi
   fi
-  
+
   # set up things for XInput
 
   if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
     AC_DEFINE(XINPUT_XFREE, 1,
               [Define to 1 if XFree XInput should be used])
-    
+
     if $PKG_CONFIG --exists xi ; then
       X_PACKAGES="$X_PACKAGES xi"
     else
@@ -1594,20 +1593,20 @@ if test "x$gdktarget" = "xx11"; then
 
      X_PACKAGES="$X_PACKAGES xrandr"
   fi
-       
+
   # Checks for Xcursor library
-  
+
   if $PKG_CONFIG --exists xcursor ; then
     AC_DEFINE(HAVE_XCURSOR, 1, [Have the Xcursor library])
-    
+
     X_PACKAGES="$X_PACKAGES xcursor"
   fi
 
   # Checks for XFixes extension
-  
+
   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"
   fi
@@ -1778,7 +1777,7 @@ if test "x$gdktarget" = "xx11"; then
   GTK_PACKAGES="$GTK_PACKAGES pangoft2"
 fi
 GTK_EXTRA_LIBS=
-GTK_EXTRA_CFLAGS= 
+GTK_EXTRA_CFLAGS=
 GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
 GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
 
@@ -1832,7 +1831,7 @@ AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
 		[#include <sys/types.h>
 		 #include <sys/un.h>]
 		)
-case $struct_sockaddr_un_sun_len in 
+case $struct_sockaddr_un_sun_len in
 	true)
 		AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_UN_SUN_LEN, 1,
 		                   [Have the sockaddr_un.sun_len member])
@@ -1877,7 +1876,7 @@ else
 
     if test $CUPS_API_MAJOR -gt 1 -o \
             $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
-      AC_DEFINE(HAVE_CUPS_API_1_2, 1, 
+      AC_DEFINE(HAVE_CUPS_API_1_2, 1,
                 [Define to 1 if CUPS 1.2 API is available])
     fi
 
@@ -1942,17 +1941,17 @@ AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
 
 if test "$os_win32" != "yes"; then
   AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
-*** Can't find cairo-ps.h. You must build Cairo with the 
+*** Can't find cairo-ps.h. You must build Cairo with the
 *** postscript backend enabled.]))
 
   AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([
 *** Can't find cairo-svg.h. You must build Cairo with the
 *** svg backend enabled.]))
-fi   
+fi
 
 CPPFLAGS="$gtk_save_cppflags"
-     
-			  	
+
+
 AC_ARG_ENABLE(test-print-backend,
               [AC_HELP_STRING([--enable-test-print-backend],
                               [build test print backend])],,
@@ -2030,7 +2029,7 @@ AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [
 	cat > $outfile <<\_______EOF
 /* gdkconfig.h
  *
- * This is a generated file.  Please modify `configure.in'
+ * This is a generated file.  Please modify `configure.ac'
  */
 
 #ifndef GDKCONFIG_H
@@ -2109,15 +2108,15 @@ AC_CONFIG_FILES([
 config.h.win32
 gtk-zip.sh
 Makefile
-gdk-pixbuf-2.0.pc
-gdk-2.0.pc
-gtk+-2.0.pc
-gtk+-unix-print-2.0.pc
-gail.pc
-gdk-pixbuf-2.0-uninstalled.pc
-gdk-2.0-uninstalled.pc
-gtk+-2.0-uninstalled.pc
-gail-uninstalled.pc
+gdk-pixbuf-3.0.pc
+gdk-3.0.pc
+gtk+-3.0.pc
+gtk+-unix-print-3.0.pc
+gail-3.0.pc
+gdk-pixbuf-3.0-uninstalled.pc
+gdk-3.0-uninstalled.pc
+gtk+-3.0-uninstalled.pc
+gail-3.0-uninstalled.pc
 m4macros/Makefile
 po/Makefile.in
 po-properties/Makefile.in
@@ -2167,7 +2166,7 @@ modules/engines/Makefile
 modules/engines/pixbuf/Makefile
 modules/engines/ms-windows/Makefile
 modules/engines/ms-windows/Theme/Makefile
-modules/engines/ms-windows/Theme/gtk-2.0/Makefile
+modules/engines/ms-windows/Theme/gtk-3.0/Makefile
 modules/input/Makefile
 modules/printbackends/Makefile
 modules/printbackends/cups/Makefile
@@ -2178,7 +2177,7 @@ modules/printbackends/test/Makefile
 perf/Makefile
 contrib/Makefile
 contrib/gdk-pixbuf-xlib/Makefile
-contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc
+contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-3.0.pc
 ])
 
 AC_OUTPUT

contrib/gdk-pixbuf-xlib/Makefile.am

@@ -4,7 +4,7 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
+lib_LTLIBRARIES=libgdk_pixbuf_xlib-3.0.la
 
 INCLUDES = \
 	-I$(top_srcdir) -I$(top_builddir) 	\
@@ -12,31 +12,31 @@ INCLUDES = \
 	-I$(top_srcdir)/contrib 		\
 	$(GDK_PIXBUF_XLIB_DEP_CFLAGS)
 
-libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
+libgdk_pixbuf_xlib_3_0_la_LDFLAGS =         \
 	-export-dynamic						\
 	$(no_undefined)						\
 	-version-info $(LT_VERSION_INFO)
 
-libgdk_pixbuf_xlib_2_0_la_LIBADD = \
+libgdk_pixbuf_xlib_3_0_la_LIBADD = \
         $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
 	$(GDK_PIXBUF_XLIB_DEP_LIBS)
 
-libgdk_pixbuf_xlib_2_0_la_SOURCES =         \
+libgdk_pixbuf_xlib_3_0_la_SOURCES =         \
 	gdk-pixbuf-xlib-private.h	\
         gdk-pixbuf-xlib.c               \
         gdk-pixbuf-xlib-render.c        \
         gdk-pixbuf-xlib-drawable.c      \
         gdk-pixbuf-xlibrgb.c
 
-libgdk_pixbuf_xlibincludedir=$(includedir)/gtk-2.0/gdk-pixbuf-xlib
+libgdk_pixbuf_xlibincludedir=$(includedir)/gtk-3.0/gdk-pixbuf-xlib
 
 libgdk_pixbuf_xlibinclude_HEADERS =         		\
         gdk-pixbuf-xlib.h               	    	\
         gdk-pixbuf-xlibrgb.h
 
 pkgconfigdir   = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc
+pkgconfig_DATA = gdk-pixbuf-xlib-3.0.pc
 
-EXTRA_DIST += gdk-pixbuf-xlib-2.0.pc.in
+EXTRA_DIST += gdk-pixbuf-xlib-3.0.pc.in
 
 -include $(top_srcdir)/git.mk

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-3.0.pc.in

@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: GdkPixbuf Xlib
 Description: GdkPixbuf rendering for Xlib
 Version: @VERSION@
-Requires: gobject-2.0,gmodule-no-export-2.0,gdk-pixbuf-2.0
+Requires: gobject-2.0,gmodule-no-export-2.0,gdk-pixbuf-3.0
 Libs: -L${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@
 Cflags: -I${includedir}

demos/Makefile.am

@@ -41,8 +41,8 @@ if CROSS_COMPILING
 pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
 pixbuf_csource_deps=
 else
-pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
-pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders 
+pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource-3.0
+pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource-3.0 $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders
 endif
 
 test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png

demos/gtk-demo/Makefile.am

@@ -1,7 +1,7 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-democodedir=$(datadir)/gtk-2.0/demo
+democodedir=$(datadir)/gtk-$(GTK_API_VERSION)/demo
 
 ## These should be in the order you want them to appear in the
 ## demo app, which means alphabetized by demo title, not filename
@@ -65,7 +65,7 @@ LDADDS = \
 	$(top_builddir)/gtk/$(gtktargetlib)				\
 	$(GTK_DEP_LIBS)
 
-bin_PROGRAMS = gtk-demo
+bin_PROGRAMS = gtk3-demo
 
 BUILT_SOURCES = demos.h
 
@@ -76,15 +76,15 @@ EXTRA_DIST += 		\
 demos.h: @REBUILD@ $(demos) geninclude.pl
 	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
 
-gtk_demo_SOURCES = 		\
+gtk3_demo_SOURCES = 		\
 	$(demos)		\
 	demo-common.h		\
 	main.c			\
 	demos.h
 
-gtk_demo_DEPENDENCIES = $(DEPS)
-gtk_demo_LDADD = $(LDADDS)
-gtk_demo_LDFLAGS = -export-dynamic
+gtk3_demo_DEPENDENCIES = $(DEPS)
+gtk3_demo_LDADD = $(LDADDS)
+gtk3_demo_LDFLAGS = -export-dynamic
 
 IMAGEFILES=	alphatest.png		\
 	        apple-red.png		\
@@ -99,7 +99,7 @@ IMAGEFILES=	alphatest.png		\
 		gnome-gmush.png		\
 		gnome-gsame.png		\
 		gnu-keys.png		\
-		gtk-logo-rgb.gif		
+		gtk-logo-rgb.gif
 
 democode_DATA = $(demos) $(IMAGEFILES) demo.ui
 

demos/gtk-demo/appwindow.c

@@ -19,6 +19,16 @@ activate_action (GtkAction *action)
 
   GtkWidget *dialog;
 
+  if (g_str_equal (name, "DarkTheme"))
+    {
+      gboolean value = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+      GtkSettings *settings = gtk_settings_get_default ();
+
+      g_object_set (G_OBJECT (settings),
+		    "gtk-application-prefer-dark-theme", value,
+		    NULL);
+      return;
+    }
   dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                    GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_INFO,
@@ -212,6 +222,11 @@ static GtkToggleActionEntry toggle_entries[] = {
     "Bold",                                    /* tooltip */
     G_CALLBACK (activate_action),
     TRUE },                                    /* is_active */
+  { "DarkTheme", NULL,                         /* name, stock id */
+     "_Prefer Dark Theme", NULL,               /* label, accelerator */
+    "Prefer Dark Theme",                       /* tooltip */
+    G_CALLBACK (activate_action),
+    FALSE },                                   /* is_active */
 };
 static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);
 
@@ -265,6 +280,7 @@ static const gchar *ui_info =
 "      <menuitem action='Quit'/>"
 "    </menu>"
 "    <menu action='PreferencesMenu'>"
+"      <menuitem action='DarkTheme'/>"
 "      <menu action='ColorMenu'>"
 "	<menuitem action='Red'/>"
 "	<menuitem action='Green'/>"

docs/RELEASE-HOWTO

@@ -29,9 +29,9 @@ Make sure that gtk-doc is the latest released version.
  3) In particular, if this is a major, stable, release, verify that
     README.in contains the relevant release notes and that the
     required versions of dependencies in INSTALL.in are in sync
-    with configure.in.
+    with configure.ac.
 
- 4) Verify that the version in configure.in has been bumped after the last
+ 4) Verify that the version in configure.ac has been bumped after the last
     release. (Note that this is critical, a slip-up here will cause the
     soname to change).
 
@@ -78,7 +78,7 @@ Make sure that gtk-doc is the latest released version.
 
     git push origin refs/tags/2.12.10
 
-13) Bump the version number in configure.in and commit and push this change
+13) Bump the version number in configure.ac and commit and push this change
 
 14) Upload the tarball to master.gnome.org and run install-module to transfer
     it to download.gnome.org. If you don't have an account on master.gnome.org,

docs/faq/gtk-faq.sgml

@@ -996,11 +996,11 @@ relevant packages. These are:</para>
 or on any GNU mirror.</para>
 
 <para>In order to use the powerful autoconf/automake scheme,
-you must create a configure.in which may look like:</para>
+you must create a configure.ac which may look like:</para>
 
 <programlisting role="C">
 dnl Process this file with autoconf to produce a configure script.
-dnl configure.in for a GTK+ based program
+dnl configure.ac for a GTK+ based program
 
 AC_INIT(myprg.c)
 AM_INIT_AUTOMAKE(mypkgname, 0.0.1)
@@ -1137,8 +1137,7 @@ myapp --display=:1
      | | | +GtkCombo
      | | | `GtkStatusbar
      | | `GtkVBox
-     | |   +GtkColorSelection
-     | |   `GtkGammaCurve
+     | |   `GtkColorSelection
      | +GtkButton
      | | +GtkOptionMenu
      | | `GtkToggleButton
@@ -1160,7 +1159,6 @@ myapp --display=:1
      | +GtkToolbar
      | `GtkTree
      +GtkDrawingArea
-     | `GtkCurve
      +GtkEditable
      | +GtkEntry
      | | `GtkSpinButton
@@ -1629,11 +1627,7 @@ int main(int argc, char *argv[])
   g_signal_connect(G_OBJECT (window), "destroy",
 		     G_CALLBACK(destroy), NULL);
 
-#if (GTK_MAJOR_VERSION == 1) &amp;&amp; (GTK_MINOR_VERSION == 0)
-  gtk_container_border_width(GTK_CONTAINER (window), 10);
-#else  
   gtk_container_set_border_width(GTK_CONTAINER (window), 10);
-#endif
 
   /* add a button to do something useful */
   button = gtk_button_new_with_label("Fork me!");
@@ -1898,7 +1892,7 @@ not applied you'll have to use the
 function. <literal>gtk_object_class_user_signal_new</literal> allows you
 to add a new signal to a predefined GTK+ widget without any
 modification of the GTK+ source code. The new signal can be
-emited with <literal>gtk_signal_emit</literal> and can be
+emited with <literal>g_signal_emit</literal> and can be
 handled in the same way as other signals.</para>
 
 <para>Tim Janik posted this code snippet:</para>
@@ -1920,7 +1914,7 @@ gtk_widget_user_action (GtkWidget *widget,
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  gtk_signal_emit (GTK_OBJECT (widget), signal_user_action, act_data);
+  g_signal_emit (widget, signal_user_action, act_data);
 }
 </programlisting>
 
@@ -2527,15 +2521,15 @@ using the following expression:</para>
 
 <para>If you don't want the user to be able to modify the
 content of this entry, you can use the
-gtk_entry_set_editable() function:</para>
+gtk_editable_set_editable() function:</para>
 
 
 <programlisting role="C">
-      void gtk_entry_set_editable(GtkEntry *entry, 
-                                  gboolean editable);
+void gtk_editable_set_editable (GtkEditable *editable,
+                                gboolean     is_editable);
 </programlisting>
 
-<para>Set the editable parameter to FALSE to disable typing
+<para>Set the is_editable parameter to FALSE to disable typing
 into the entry.</para>
 </sect1>
 
@@ -2559,10 +2553,10 @@ into the entry.</para>
 signal handler with</para>
 
 <programlisting role="C">
-      gtk_signal_connect(GTK_COMBO(cb)->entry,
-                         "changed",
-                         GTK_SIGNAL_FUNC(my_cb_change_handler),
-                         NULL);
+      g_signal_connect(GTK_COMBO(cb)->entry,
+                       "changed",
+                       G_CALLBACK(my_cb_change_handler),
+                       NULL);
 </programlisting>
 
 </sect1>
@@ -2629,8 +2623,8 @@ underlined, and the relevant accelerators are created.</para>
   gtk_box_pack_start (GTK_BOX (vbox1), menubar1, FALSE, FALSE, 0);
 
   file1 = gtk_menu_item_new_with_label ("");
-  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (file1)->child),
-                                   _("_File"));
+  gtk_label_set_use_underline (GTK_LABEL (gtk_bin_get_child (GTK_BIN (file1))),
+                               TRUE);
   gtk_widget_add_accelerator (file1, "activate_item", accel_group,
                               tmp_key, GDK_MOD1_MASK, 0);
   gtk_object_set_data (GTK_OBJECT (window1), "file1", file1);
@@ -2643,8 +2637,8 @@ underlined, and the relevant accelerators are created.</para>
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (file1), file1_menu);
 
   new1 = gtk_menu_item_new_with_label ("");
-  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (new1)->child),
-                                   _("_New"));
+  gtk_label_set_use_underline (GTK_LABEL (gtk_bin_get_child (GTK_BIN (new1))),
+                               TRUE);
   gtk_widget_add_accelerator (new1, "activate_item", file1_menu_accels,
                               tmp_key, 0, 0);
   gtk_object_set_data (GTK_OBJECT (window1), "new1", new1);
@@ -2670,9 +2664,9 @@ GtkMenuItem with:</para>
       /* do stuff with child */
       if (GTK_IS_LABEL (child))
       {
-        gchar *text;
+        const gchar *text;
     
-        gtk_label_get (GTK_LABEL (child), &amp;text);
+        text = gtk_label_get_text (GTK_LABEL (child));
         g_print ("menu item text: %s\n", text);
       }
     }
@@ -2864,9 +2858,9 @@ be:</para>
 
 <programlisting role="C">
   entry = gtk_entry_new();
-  gtk_signal_connect (GTK_OBJECT(entry), "activate",
-                      GTK_SIGNAL_FUNC(entry_callback),
-                      NULL);
+  g_signal_connect (entry, "activate",
+                    G_CALLBACK(entry_callback),
+                    NULL);
 </programlisting>
 
 </sect1>
@@ -3044,8 +3038,8 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (window), text);
 
   /* connect after everything else */
-  gtk_signal_connect_after (GTK_OBJECT(text), "button_press_event",
-    GTK_SIGNAL_FUNC (insert_bar), NULL);
+  g_signal_connect_after (text, "button_press_event",
+                          G_CALLBACK (insert_bar), NULL);
 
   gtk_widget_show_all(window);
   gtk_main();

docs/gtk-config.txt

@@ -152,10 +152,10 @@ and the AM_PATH_GTK macro. The program used here is the testinput.c
 You should first read the introductory portions of the automake
 Manual, if you are not already familiar with it.
 
-Two files are needed, 'configure.in', which is used to build the
+Two files are needed, 'configure.ac', which is used to build the
 configure script:
 
-==configure.in===
+==configure.ac===
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(testinput.c)
 

docs/refcounting.txt

@@ -197,7 +197,7 @@ GtkOptionMenu looks like this:
   /* menu_item->ref_count == 1 and it is flagged as `floating'.
    */
 
-  gtk_menu_append (GTK_MENU (menu), menu_item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
   /* menu_item->ref_count still == 1, but it is no longer `floating'.
    */
   

docs/reference/gdk-pixbuf/Makefile.am

@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module.
-DOC_MODULE=gdk-pixbuf
+DOC_MODULE=gdk-pixbuf3
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gdk-pixbuf.sgml
@@ -56,8 +56,8 @@ content_files =				\
 	gdk-pixbuf-rendering.sgml	\
 	gdk-pixbuf.sgml			\
 	porting-from-imlib.sgml		\
-	gdk-pixbuf-csource.xml		\
-	gdk-pixbuf-query-loaders.xml
+	gdk-pixbuf-csource-3.0.xml	\
+	gdk-pixbuf-query-loaders-3.0.xml
 
 # Images to copy into HTML directory
 HTML_IMAGES = composite.png
@@ -81,7 +81,9 @@ EXTRA_DIST += version.xml.in \
 
 if ENABLE_MAN
 
-man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 
+man_MANS = 				\
+	gdk-pixbuf-csource-3.0.1	\
+	gdk-pixbuf-query-loaders-3.0.1
 
 %.1 : %.xml 
 	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<

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

@@ -5,23 +5,23 @@
 <refentry id="gdk-pixbuf-csource">
 
 <refmeta>
-<refentrytitle>gdk-pixbuf-csource</refentrytitle>
+<refentrytitle>gdk-pixbuf-csource-3.0</refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-<refname>gdk-pixbuf-csource</refname>
+<refname>gdk-pixbuf-csource-3.0</refname>
 <refpurpose>C code generation utility for GdkPixbuf images</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gdk-pixbuf-csource</command>
+<command>gdk-pixbuf-csource-3.0</command>
 <arg choice="opt">options</arg>
 <arg choice="opt">image</arg>
 </cmdsynopsis>
 <cmdsynopsis>
-<command>gdk-pixbuf-csource</command>
+<command>gdk-pixbuf-csource-3.0</command>
 <arg choice="opt">options</arg>
 <arg choice="plain">--build-list</arg>
 <arg rep="repeat">
@@ -33,16 +33,16 @@
 
 <refsect1><title>Description</title>
 <para>
-<command>gdk-pixbuf-csource</command> is a small utility that generates C code
-containing images, useful for compiling images directly into programs.
+<command>gdk-pixbuf-csource-3.0</command> is a small utility that generates
+C code containing images, useful for compiling images directly into programs.
 </para>
 </refsect1>
 
 <refsect1><title>Invocation</title>
 <para>
-<command>gdk-pixbuf-csource</command> either takes as input one image file name
-to generate code for, or, using the <option>--build-list</option> option, a 
-list of (<replaceable>name</replaceable>, <replaceable>image</replaceable>)
+<command>gdk-pixbuf-csource-3.0</command> either takes as input one image file
+name to generate code for, or, using the <option>--build-list</option> option,
+a list of (<replaceable>name</replaceable>, <replaceable>image</replaceable>)
 pairs to generate code for a list of images into named variables.
 </para>
 <refsect2><title>Options</title>
@@ -151,7 +151,7 @@ Make warnings fatal (causes the program to abort).
 
 <refsect1><title>See also</title>
 <para>
-The <structname>GdkPixbuf</structname> documentation, shipped with the 
+The <structname>GdkPixbuf</structname> documentation, shipped with the
 Gtk+ distribution, available from <ulink url="http://www.gtk.org">www.gtk.org</ulink>.
 </para>
 </refsect1>
@@ -166,11 +166,11 @@ generates pixbufs with suboptimal rowstride in some cases.
 
 <refsect1><title>Author</title>
 <para>
-<command>gdk-pixbuf-csource</command> was written by Tim Janik
-<email>timj@gtk.org</email>. 
+<command>gdk-pixbuf-csource-3.0</command> was written by Tim Janik
+<email>timj@gtk.org</email>.
 </para>
 <para>
-This manual page was provided by Tim Janik <email>timj@gtk.org</email>. 
+This manual page was provided by Tim Janik <email>timj@gtk.org</email>.
 </para>
 </refsect1>
 </refentry>

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

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

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

@@ -104,12 +104,12 @@
     <partintro>
       <para>
 	This part presents the tools which are shipped with the
-	&gdk-pixbuf; library.  
+	&gdk-pixbuf; library.
       </para>
     </partintro>
 
-    <xi:include href="gdk-pixbuf-csource.xml" />
-    <xi:include href="gdk-pixbuf-query-loaders.xml" />
+    <xi:include href="gdk-pixbuf-csource-3.0.xml" />
+    <xi:include href="gdk-pixbuf-query-loaders-3.0.xml" />
   </reference>
 
   <index id="api-index-full">

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

@@ -54,8 +54,6 @@ gdk_pixbuf_error_get_type
 
 <SECTION>
 <FILE>refcounting</FILE>
-gdk_pixbuf_ref
-gdk_pixbuf_unref
 GdkPixbufDestroyNotify
 </SECTION>
 
@@ -120,8 +118,6 @@ gdk_pixbuf_fill
 GdkPixbufAnimation
 GdkPixbufAnimationIter
 gdk_pixbuf_animation_new_from_file
-gdk_pixbuf_animation_ref
-gdk_pixbuf_animation_unref
 gdk_pixbuf_animation_get_width
 gdk_pixbuf_animation_get_height
 gdk_pixbuf_animation_get_iter

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

@@ -23,6 +23,9 @@ Animated images.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPixbufAnimation ##### -->
 <para>
 An opaque struct representing an animation.
@@ -46,23 +49,6 @@ certain position in an animation.
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_pixbuf_animation_ref ##### -->
-<para>
-
-</para>
-
-@animation: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_animation_unref ##### -->
-<para>
-
-</para>
-
-@animation: 
-
-
 <!-- ##### FUNCTION gdk_pixbuf_animation_get_width ##### -->
 <para>
 

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

@@ -46,6 +46,9 @@ Creating a pixbuf from image data that is already in memory.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_new ##### -->
 <para>
 

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

@@ -28,6 +28,9 @@ Loading a pixbuf from a file.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_new_from_file ##### -->
 <para>
 

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

@@ -21,6 +21,9 @@ to a socket or store it in a database.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_savev ##### -->
 <para>
 

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

@@ -72,6 +72,9 @@ Application-driven progressive image loading.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPixbufLoader ##### -->
 <para>
 The <structname>GdkPixbufLoader</structname> struct contains only private
@@ -114,6 +117,7 @@ fields.
 
 </para>
 
+@void: 
 @Returns: 
 
 

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

@@ -8,12 +8,6 @@
   </para>
 
 
-<!-- ##### SECTION ./tmpl/from-drawables.sgml:See_Also ##### -->
-  <para>
-    gdk_image_get().
-  </para>
-
-
 <!-- ##### SECTION ./tmpl/from-drawables.sgml:Short_Description ##### -->
 Getting parts of a drawable's image data into a pixbuf.
 
@@ -221,14 +215,6 @@ GnomeCanvasPixbuf
     and use that to draw the image onto a drawable.
   </para>
 
-  <important>
-    <para>
-      Since these functions use GdkRGB for rendering, you must
-      initialize GdkRGB before using any of them.  You can do this by
-      calling gdk_rgb_init() near the beginning of your program.
-    </para>
-  </important>
-
 
 <!-- ##### SECTION ./tmpl/rendering.sgml:See_Also ##### -->
   <para>
@@ -567,3 +553,33 @@ End:
   </para>
 
 
+<!-- ##### FUNCTION gdk_pixbuf_animation_ref ##### -->
+<para>
+
+</para>
+
+@animation: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_pixbuf_animation_unref ##### -->
+<para>
+
+</para>
+
+@animation: 
+
+<!-- ##### FUNCTION gdk_pixbuf_ref ##### -->
+  <para>
+
+  </para>
+
+@pixbuf: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_pixbuf_unref ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+

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

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

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

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

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

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

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

@@ -20,6 +20,9 @@ Rendering RGB buffers to X drawables.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT XlibRgbCmap ##### -->
   <para>
     FIXME: Describe this.
@@ -198,6 +201,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -230,6 +234,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -238,6 +243,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -246,6 +252,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -254,6 +261,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -262,6 +270,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -270,6 +279,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: <!--
 Local variables:
 mode: sgml

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

@@ -93,6 +93,9 @@ put_pixel (GdkPixbuf *pixbuf, int x, int y, guchar red, guchar green, guchar blu
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GdkPixbufError ##### -->
 <para>
 An error code in the #GDK_PIXBUF_ERROR domain. Many &gdk-pixbuf;
@@ -127,9 +130,7 @@ information on error domains and error codes.
 
 <!-- ##### ENUM GdkPixbufAlphaMode ##### -->
   <para>
-    These values can be passed to
-    gdk_pixbuf_render_to_drawable_alpha() to control how the alpha
-    channel of an image should be handled.  This function can create a
+    This function can create a
     bilevel clipping mask (black and white) and use it while painting
     the image.  In the future, when the X Window System gets an alpha
     channel extension, it will be possible to do full alpha

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

@@ -19,6 +19,9 @@ you're linking against.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### VARIABLE gdk_pixbuf_version ##### -->
 <para>
 Contains the full version of the &gdk-pixbuf; library as a string.

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

@@ -22,6 +22,9 @@ into #GdkPixbuf<!-- -->s, use gdk_pixbuf_from_pixdata.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPixdata ##### -->
   <para>
 

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

@@ -68,6 +68,9 @@ They are not covered by the same stability guarantees as the regular
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_set_option ##### -->
 <para>
 
@@ -84,6 +87,7 @@ They are not covered by the same stability guarantees as the regular
 
 </para>
 
+@void: 
 @Returns: 
 
 

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

@@ -48,21 +48,7 @@ Functions for reference counting and memory management on pixbufs.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION gdk_pixbuf_ref ##### -->
-  <para>
-
-  </para>
-
-@pixbuf: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_unref ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
+<!-- ##### SECTION Image ##### -->
 
 
 <!-- ##### USER_FUNCTION GdkPixbufDestroyNotify ##### -->

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

@@ -81,6 +81,9 @@ expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GdkInterpType ##### -->
   <para>
     This enumeration describes the different interpolation modes that

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

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

docs/reference/gdk/Makefile.am

@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module.
-DOC_MODULE=gdk
+DOC_MODULE=gdk3
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gdk-docs.sgml

docs/reference/gdk/gdk3-sections.txt

@@ -258,11 +258,7 @@ gdk_pixmap_create_from_xpm
 gdk_pixmap_colormap_create_from_xpm
 gdk_pixmap_create_from_xpm_d
 gdk_pixmap_colormap_create_from_xpm_d
-gdk_pixmap_ref
-gdk_pixmap_unref
 GdkBitmap
-gdk_bitmap_ref
-gdk_bitmap_unref
 
 <SUBSECTION Standard>
 GDK_PIXMAP
@@ -285,11 +281,6 @@ GdkPixmapObjectClass
 GdkImage
 gdk_image_new
 GdkImageType
-gdk_image_new_bitmap
-gdk_image_get
-gdk_image_ref
-gdk_image_unref
-gdk_image_destroy
 gdk_image_get_colormap
 gdk_image_set_colormap
 
@@ -314,7 +305,6 @@ gdk_image_get_type
 <SECTION>
 <TITLE>GdkRGB</TITLE>
 <FILE>rgb</FILE>
-gdk_rgb_init
 
 <SUBSECTION>
 gdk_draw_rgb_image
@@ -331,9 +321,6 @@ gdk_rgb_cmap_free
 GdkRgbCmap
 
 <SUBSECTION>
-gdk_rgb_gc_set_foreground
-gdk_rgb_gc_set_background
-gdk_rgb_xpixel_from_rgb
 gdk_rgb_find_color
 
 <SUBSECTION>
@@ -354,8 +341,6 @@ GDK_TYPE_RGB_DITHER
 <TITLE>Pixbufs</TITLE>
 <FILE>pixbufs</FILE>
 gdk_pixbuf_render_threshold_alpha
-gdk_pixbuf_render_to_drawable
-gdk_pixbuf_render_to_drawable_alpha
 gdk_pixbuf_render_pixmap_and_mask
 gdk_pixbuf_render_pixmap_and_mask_for_colormap
 gdk_pixbuf_get_from_drawable
@@ -528,16 +513,12 @@ GdkFunction
 gdk_gc_new
 gdk_gc_new_with_values
 gdk_gc_get_screen
-gdk_gc_ref
-gdk_gc_unref
-gdk_gc_destroy
 gdk_gc_set_values
 gdk_gc_get_values
 gdk_gc_set_foreground
 gdk_gc_set_background
 gdk_gc_set_rgb_fg_color
 gdk_gc_set_rgb_bg_color
-gdk_gc_set_font
 gdk_gc_set_function
 gdk_gc_set_fill
 GdkFill
@@ -600,8 +581,6 @@ gdk_visual_get_best
 gdk_visual_get_best_with_depth
 gdk_visual_get_best_with_type
 gdk_visual_get_best_with_both
-gdk_visual_ref
-gdk_visual_unref
 gdk_visual_get_screen
 
 <SUBSECTION Standard>
@@ -813,9 +792,6 @@ gdk_window_thaw_toplevel_updates_libgtk_only
 <SECTION>
 <TITLE>Selections</TITLE>
 <FILE>selections</FILE>
-GdkSelection
-GdkSelectionType
-GdkTarget
 GDK_SELECTION_PRIMARY
 GDK_SELECTION_SECONDARY
 GDK_SELECTION_CLIPBOARD
@@ -885,7 +861,6 @@ gdk_pango_renderer_set_stipple
 gdk_pango_renderer_set_override_color
 gdk_pango_context_get
 gdk_pango_context_get_for_screen
-gdk_pango_context_set_colormap
 GdkPangoAttrEmbossed
 GdkPangoAttrEmbossColor
 GdkPangoAttrStipple
@@ -1096,7 +1071,6 @@ GDK_PRIORITY_REDRAW
 gdk_events_pending
 gdk_event_peek
 gdk_event_get
-gdk_event_get_graphics_expose
 gdk_event_put
 gdk_event_new
 gdk_event_copy
@@ -1216,7 +1190,6 @@ gdk_cursor_get_type
 gdk_input_add_full
 GdkInputCondition
 GdkInputFunction
-GdkDestroyNotify
 gdk_input_add
 gdk_input_remove
 
@@ -1234,14 +1207,12 @@ gdk_drag_context_new
 gdk_drag_drop
 gdk_drag_find_window
 gdk_drag_find_window_for_screen
-gdk_drag_context_ref
 gdk_drag_begin
 gdk_drag_motion
 gdk_drop_finish
 gdk_drag_get_protocol
 gdk_drag_get_protocol_for_display
 GdkDragProtocol
-gdk_drag_context_unref
 GdkDragContext
 GdkDragAction
 gdk_drag_status
@@ -1359,8 +1330,6 @@ gdk_x11_get_xatom_name_for_display
 gdk_display
 GDK_HAVE_WCHAR_H
 GDK_HAVE_WCTYPE_H
-gdk_iswalnum
-gdk_iswspace
 </SECTION>
 
 <SECTION>

docs/reference/gdk/tmpl/cairo_interaction.sgml

@@ -27,6 +27,9 @@ Cairo paths and to use pixbufs as sources for drawing operations.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_cairo_create ##### -->
 <para>
 

docs/reference/gdk/tmpl/colors.sgml

@@ -46,6 +46,9 @@ gdk_color_change() will probably become aliases.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkColor ##### -->
 <para>
 The #GdkColor structure is used to describe an 
@@ -57,8 +60,8 @@ allocated or unallocated color.
 @red: The red component of the color. This is
   a value between 0 and 65535, with 65535 indicating
   full intensitiy.
-@green: The blue component of the color.
-@blue: The green component of the color.
+@green: The green component of the color.
+@blue: The blue component of the color.
 
 <!-- ##### STRUCT GdkColormap ##### -->
 <para>
@@ -102,6 +105,7 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -109,6 +113,7 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/cursors.sgml

@@ -31,6 +31,9 @@ gdk_window_set_cursor() or by setting the cursor member of the
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkCursor ##### -->
 <para>
 A <type>GdkCursor</type> structure represents a cursor.
@@ -214,10 +217,3 @@ The standard cursors available.
 @cursor: 
 
 
-<!-- ##### MACRO gdk_cursor_destroy ##### -->
-<para>
-Destroys a cursor, freeing any resources allocated for it.
-</para>
-
-
-

docs/reference/gdk/tmpl/dnd.sgml

@@ -25,6 +25,9 @@ the GTK+ documentation for more information.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_drag_get_selection ##### -->
 <para>
 </para>
@@ -54,6 +57,7 @@ the GTK+ documentation for more information.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -91,13 +95,6 @@ the GTK+ documentation for more information.
 @protocol: 
 
 
-<!-- ##### FUNCTION gdk_drag_context_ref ##### -->
-<para>
-</para>
-
-@context: 
-
-
 <!-- ##### FUNCTION gdk_drag_begin ##### -->
 <para>
 </para>
@@ -166,13 +163,6 @@ which DND is done.
 @GDK_DRAG_PROTO_OLE2: The complex OLE2 DND protocol (not implemented).
 @GDK_DRAG_PROTO_LOCAL: Intra-application DND.
 
-<!-- ##### FUNCTION gdk_drag_context_unref ##### -->
-<para>
-</para>
-
-@context: 
-
-
 <!-- ##### STRUCT GdkDragContext ##### -->
 <para>
 A <structname>GdkDragContext</structname> holds information about a 

docs/reference/gdk/tmpl/drawing.sgml

@@ -34,6 +34,9 @@ gtk_widget_create_pango_layout().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDrawable ##### -->
 <para>
 An opaque structure representing an object that can be

docs/reference/gdk/tmpl/event_structs.sgml

@@ -23,6 +23,9 @@ required events are received. See gtk_widget_set_events().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### UNION GdkEvent ##### -->
 <para>
 The #GdkEvent struct contains a union of all of the event structs,

docs/reference/gdk/tmpl/events.sgml

@@ -30,6 +30,9 @@ The structs used for each type of event.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GdkEventType ##### -->
 <para>
 Specifies the type of the event.
@@ -165,6 +168,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -172,6 +176,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -179,14 +184,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 <para>
 </para>
 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_event_get_graphics_expose ##### -->
-<para>
-</para>
-
-@window: 
+@void: 
 @Returns: 
 
 
@@ -340,6 +338,7 @@ gdk_event_handler_set().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/fonts.sgml

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

docs/reference/gdk/tmpl/gcs.sgml

@@ -33,6 +33,9 @@ be set by the latter method.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkGC ##### -->
 <para>
 The #GdkGC structure represents a graphics context.
@@ -148,33 +151,6 @@ useful. For bitmaps, %GDK_AND and %GDK_OR are also useful.
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_gc_ref ##### -->
-<para>
-
-</para>
-
-@gc: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_gc_unref ##### -->
-<para>
-
-</para>
-
-@gc: 
-
-
-<!-- ##### MACRO gdk_gc_destroy ##### -->
-<para>
-This function is obsolete and should not be used.
-</para>
-
-@Deprecated: Use g_object_unref() instead
-<!-- # Unused Parameters # -->
-@gc: a #GdkGC.
-
-
 <!-- ##### FUNCTION gdk_gc_set_values ##### -->
 <para>
 
@@ -230,15 +206,6 @@ This function is obsolete and should not be used.
 @color: 
 
 
-<!-- ##### FUNCTION gdk_gc_set_font ##### -->
-<para>
-
-</para>
-
-@gc: 
-@font: 
-
-
 <!-- ##### FUNCTION gdk_gc_set_function ##### -->
 <para>
 

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

@@ -923,6 +923,14 @@ they will be ignored.
 </para>
 
 
+<!-- ##### MACRO gdk_rgb_get_cmap ##### -->
+<para>
+Gets the colormap set by GdkRGB. This colormap and the corresponding
+visual should be used when creating windows that will be drawn in by GdkRGB.
+</para>
+
+@Returns: The #GdkColormap set by GdkRGB.
+
 <!-- ##### VARIABLE gdk_screen ##### -->
 <para>
 

docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml

@@ -36,6 +36,9 @@ g_object_unref (context);
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF GdkAppLaunchContext ##### -->
 <para>
 An opaque structure representing an application launch context.
@@ -47,6 +50,7 @@ An opaque structure representing an application launch context.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/gdkdisplay.sgml

@@ -31,6 +31,9 @@ Controls the keyboard/mouse pointer grabs and a set of <type>GdkScreen</type>s
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDisplay ##### -->
 <para>
 The <structname>GdkDisplay</structname> struct is the GDK representation
@@ -61,6 +64,7 @@ of an X display. All its fields are private and should not be accessed directly.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/gdkdisplaymanager.sgml

@@ -19,6 +19,9 @@ changes.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDisplayManager ##### -->
 <para>
 The <structname>GdkDisplayManager</structname> struct has no interesting 
@@ -45,6 +48,7 @@ fields.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/gdkscreen.sgml

@@ -25,6 +25,9 @@ form a large screen area.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkScreen ##### -->
 <para>
 This is a currently just a placeholder typedef for the first argument of 
@@ -70,6 +73,7 @@ when GDK gets multihead support.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/gdktesting.sgml

@@ -18,6 +18,9 @@ They allow to simulate some user input.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_test_render_sync ##### -->
 <para>
 

docs/reference/gdk/tmpl/general.sgml

@@ -18,6 +18,9 @@ utility functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_init ##### -->
 <para>
 Initializes the GDK library and connects to the X server.
@@ -70,6 +73,7 @@ by GTK+ applications.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -94,6 +98,7 @@ If the locale is not supported by X then it is reset to the standard "C"
 locale.
 </para>
 
+@void: 
 @Returns: the resulting locale.
 
 
@@ -123,6 +128,7 @@ of g_atexit()).
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_notify_startup_complete_with_id ##### -->
@@ -141,6 +147,7 @@ commandline option, the default value is the program name (determined
 with g_get_prgname()) with the first character converted to uppercase. 
 </para>
 
+@void: 
 @Returns: the program class.
 
 
@@ -160,6 +167,7 @@ Gets the name of the display, which usually comes from the <envar>DISPLAY</envar
 environment variable or the <option>--display</option> command line option.
 </para>
 
+@void: 
 @Returns: the name of the display.
 
 
@@ -170,12 +178,14 @@ by the server. This is rarely needed by applications. It's main use is for
 trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_screen_width ##### -->
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -183,6 +193,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -190,6 +201,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -197,6 +209,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -279,6 +292,7 @@ success or the reason for the failure of the grab attempt.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -324,6 +338,7 @@ available.
 <para>
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_get_use_xshm ##### -->
@@ -338,6 +353,7 @@ SYSV shared memory calls. However, it can only be used if the X client and
 server are on the same machine and the server supports it.
 </para>
 
+@void: 
 @Returns: %TRUE if use of the MIT shared memory extension will be attempted.
 
 
@@ -375,6 +391,7 @@ avoid the X error in any other way.
 </programlisting>
 </example>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_error_trap_pop ##### -->
@@ -382,6 +399,7 @@ avoid the X error in any other way.
 Removes the X error trap installed with gdk_error_trap_push().
 </para>
 
+@void: 
 @Returns: the X error code, or 0 if no error occurred.
 
 
@@ -392,10 +410,3 @@ This macro is defined if GDK is configured to use the X backend.
 
 
 
-<!-- ##### MACRO GDK_WINDOWING_WIN32 ##### -->
-<para>
-This macro is defined if GDK is configured to use the Win32 backend.
-</para>
-
-
-

docs/reference/gdk/tmpl/images.sgml

@@ -12,7 +12,6 @@ It has now been superceded to a large extent by the much more flexible
 </para>
 <para>
 To create an empty #GdkImage use gdk_image_new().
-To create a #GdkImage from bitmap data use gdk_image_new_bitmap().
 To create an image from part of a #GdkWindow use gdk_drawable_get_image().
 </para>
 <para>
@@ -25,7 +24,7 @@ the different formats that may be used.
 To draw a #GdkImage in a #GdkWindow or #GdkPixmap use gdk_draw_image().
 </para>
 <para>
-To destroy a #GdkImage use gdk_image_destroy().
+To destroy a #GdkImage use g_object_unref().
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -58,6 +57,9 @@ displays.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkImage ##### -->
 <para>
 The #GdkImage struct contains information on the image and the pixel data.
@@ -105,55 +107,6 @@ is supported by the server.
 @GDK_IMAGE_FASTEST: Specifies that %GDK_IMAGE_SHARED should be tried first,
 and if that fails then %GDK_IMAGE_NORMAL will be used.
 
-<!-- ##### FUNCTION gdk_image_new_bitmap ##### -->
-<para>
-</para>
-
-@visual: 
-@data: 
-@width: 
-@height: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_image_get ##### -->
-<para>
-</para>
-
-@drawable: 
-@x: 
-@y: 
-@width: 
-@height: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_image_ref ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_image_unref ##### -->
-<para>
-
-</para>
-
-@image: 
-
-
-<!-- ##### MACRO gdk_image_destroy ##### -->
-<para>
-Destroys a #GdkImage, freeing any resources allocated for it.
-</para>
-
-<!-- # Unused Parameters # -->
-@image: a #GdkImage.
-
-
 <!-- ##### FUNCTION gdk_image_get_colormap ##### -->
 <para>
 

docs/reference/gdk/tmpl/input.sgml

@@ -34,6 +34,9 @@ callbacks.</para></listitem>
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_input_add_full ##### -->
 
 
@@ -72,16 +75,6 @@ occurs.
 @condition: the triggering condition.
 
 
-<!-- ##### USER_FUNCTION GdkDestroyNotify ##### -->
-<para>
-A callback function called when a piece of user data is 
-no longer being stored by GDK. Will typically free the
-structure or object that @data points to.
-</para>
-
-@data: the user data.
-
-
 <!-- ##### FUNCTION gdk_input_add ##### -->
 
 

docs/reference/gdk/tmpl/input_devices.sgml

@@ -87,6 +87,9 @@ and <structfield>ytilt</structfield>.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDevice ##### -->
 <para>
 A <structname>GdkDevice</structname> structure contains
@@ -174,6 +177,7 @@ types that GTK+ understands.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -224,6 +228,7 @@ Specifies how an axis of a device is used.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/keys.sgml

@@ -88,6 +88,9 @@ gdk_keymap_translate_keyboard_state() just to get the keyval.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkKeymap ##### -->
 <para>
 A <structname>GdkKeymap</structname> defines the translation from keyboard state
@@ -143,6 +146,7 @@ be mapped to a keyval.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -234,6 +238,15 @@ Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_keymap_add_virtual_modifiers ##### -->
+<para>
+
+</para>
+
+@keymap: 
+@state: 
+
+
 <!-- ##### FUNCTION gdk_keymap_map_virtual_modifiers ##### -->
 <para>
 

docs/reference/gdk/tmpl/pango_interaction.sgml

@@ -132,6 +132,9 @@ g_object_unref (gc);
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPangoRenderer ##### -->
 <para>
 
@@ -210,6 +213,7 @@ g_object_unref (gc);
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -222,15 +226,6 @@ g_object_unref (gc);
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_pango_context_set_colormap ##### -->
-<para>
-
-</para>
-
-@context: 
-@colormap: 
-
-
 <!-- ##### STRUCT GdkPangoAttrEmbossed ##### -->
 <para>
 A Pango text attribute containing a embossed bitmap to be used when

docs/reference/gdk/tmpl/pixbufs.sgml

@@ -19,6 +19,9 @@ pixbufs, see the #GdkPixbuf API documentation.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_render_threshold_alpha ##### -->
 <para>
 
@@ -35,44 +38,10 @@ pixbufs, see the #GdkPixbuf API documentation.
 @alpha_threshold: 
 
 
-<!-- ##### FUNCTION gdk_pixbuf_render_to_drawable ##### -->
 <para>
 
 </para>
 
-@pixbuf: 
-@drawable: 
-@gc: 
-@src_x: 
-@src_y: 
-@dest_x: 
-@dest_y: 
-@width: 
-@height: 
-@dither: 
-@x_dither: 
-@y_dither: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_render_to_drawable_alpha ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@drawable: 
-@src_x: 
-@src_y: 
-@dest_x: 
-@dest_y: 
-@width: 
-@height: 
-@alpha_mode: 
-@alpha_threshold: 
-@dither: 
-@x_dither: 
-@y_dither: 
-
 
 <!-- ##### FUNCTION gdk_pixbuf_render_pixmap_and_mask ##### -->
 <para>

docs/reference/gdk/tmpl/pixmaps.sgml

@@ -21,7 +21,10 @@ pixel can be either on or off).
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT GdkPixmap ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### TYPEDEF GdkPixmap ##### -->
 <para>
 An opaque structure representing an offscreen drawable.
 Pointers to structures of type #GdkPixmap, #GdkBitmap,
@@ -118,21 +121,6 @@ for the new pixmap. Can be %NULL, if the depth is given.
 @Returns: 
 
 
-<!-- ##### MACRO gdk_pixmap_ref ##### -->
-<para>
-Deprecated equivalent of g_object_ref().
-</para>
-
-@Returns: @pixmap
-
-
-<!-- ##### MACRO gdk_pixmap_unref ##### -->
-<para>
-Deprecated equivalent of g_object_unref().
-</para>
-
-
-
 <!-- ##### TYPEDEF GdkBitmap ##### -->
 <para>
 An opaque structure representing an offscreen drawable of depth
@@ -142,18 +130,3 @@ refers generically to any of these types.
 </para>
 
 
-<!-- ##### MACRO gdk_bitmap_ref ##### -->
-<para>
-Deprecated equivalent of g_object_ref().
-</para>
-
-@Returns: @pixmap
-
-
-<!-- ##### MACRO gdk_bitmap_unref ##### -->
-<para>
-Deprecated equivalent of g_object_unref().
-</para>
-
-
-

docs/reference/gdk/tmpl/properties.sgml

@@ -45,7 +45,10 @@ data commonly stored in X window properties.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT GdkAtom ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### TYPEDEF GdkAtom ##### -->
 <para>
 An opaque type representing a string as an index into a table
 of strings on the X server.

docs/reference/gdk/tmpl/regions.sgml

@@ -36,6 +36,9 @@ It can be intersected to regions by using gdk_region_spans_intersect_foreach().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPoint ##### -->
 <para>
 Defines the x and y coordinates of a point.
@@ -86,6 +89,7 @@ A GdkRegion represents a set of pixels on the screen.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/rgb.sgml

@@ -125,12 +125,7 @@ colors.</para></listitem>
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION gdk_rgb_init ##### -->
-<para>
-This function no longer does anything at all. It's completely useless
-(and harmless).
-</para>
-
+<!-- ##### SECTION Image ##### -->
 
 
 <!-- ##### FUNCTION gdk_draw_rgb_image ##### -->
@@ -328,37 +323,6 @@ colors. This is used only for gdk_draw_indexed_image().
 @colors: The colors, represented as 0xRRGGBB integer values.
 @n_colors: The number of colors in the cmap.
 
-<!-- ##### FUNCTION gdk_rgb_gc_set_foreground ##### -->
-<para>
-Sets the foreground color in @gc to the specified color (or the
-closest approximation, in the case of limited visuals).
-</para>
-
-@gc: The #GdkGC to modify.
-@rgb: The color, represented as a 0xRRGGBB integer value.
-
-
-<!-- ##### FUNCTION gdk_rgb_gc_set_background ##### -->
-<para>
-Sets the background color in @gc to the specified color (or the
-closest approximation, in the case of limited visuals).
-</para>
-
-@gc: The #GdkGC to modify.
-@rgb: The color, represented as a 0xRRGGBB integer value.
-
-
-<!-- ##### FUNCTION gdk_rgb_xpixel_from_rgb ##### -->
-<para>
-Finds the X pixel closest in color to the @rgb color specified. This
-value may be used to set the <structfield>pixel</structfield> field of
-a #GdkColor struct.
-</para>
-
-@rgb: The color, represented as a 0xRRGGBB integer value.
-@Returns: The X pixel value.
-
-
 <!-- ##### FUNCTION gdk_rgb_find_color ##### -->
 <para>
 
@@ -399,6 +363,7 @@ private colormap.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -407,18 +372,10 @@ private colormap.
 
 </para>
 
+@void: 
 @Returns: 
 
 
-<!-- ##### MACRO gdk_rgb_get_cmap ##### -->
-<para>
-Gets the colormap set by GdkRGB. This colormap and the corresponding
-visual should be used when creating windows that will be drawn in by GdkRGB.
-</para>
-
-@Returns: The #GdkColormap set by GdkRGB.
-
-
 <!-- ##### FUNCTION gdk_rgb_ditherable ##### -->
 <para>
 Determines whether the preferred visual is ditherable. This function may be
@@ -427,6 +384,7 @@ dither mode is desired; if the display is not ditherable, it may make
 sense to gray out or hide the corresponding UI widget.
 </para>
 
+@void: 
 @Returns: %TRUE if the preferred visual is ditherable.
 
 

docs/reference/gdk/tmpl/selections.sgml

@@ -50,34 +50,7 @@ to the X Inter-client Communication Conventions Manual
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### TYPEDEF GdkSelection ##### -->
-<para>
-The #GdkSelection enumeration contains predefined 
-atom values for several common selections.
-</para>
-
-
-<!-- ##### TYPEDEF GdkSelectionType ##### -->
-<para>
-The #GdkSelectionType enumeration contains predefined
-atom values used to represent the types of data transferred
-in response to a request for a target. See the
-ICCCM for details about what data should be transferred
-for each of these types. Other atoms can be used,
-and the recommended practice for GTK+ is to to use mime 
-types for this purpose. However, supporting these types
-may be useful for compatibility with older programs.
-</para>
-
-
-<!-- ##### TYPEDEF GdkTarget ##### -->
-<para>
-The #GdkTarget enumeration contains predefined atom values which are
-used to describe possible targets for a selection. Other atoms can be
-used, and the recommended practice for GTK+ is to to use mime types
-for this purpose. However, supporting these types may be useful for
-compatibility with older programs.
-</para>
+<!-- ##### SECTION Image ##### -->
 
 
 <!-- ##### MACRO GDK_SELECTION_PRIMARY ##### -->

docs/reference/gdk/tmpl/threads.sgml

@@ -250,6 +250,9 @@ int main (int argc, char *argv[])
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO GDK_THREADS_ENTER ##### -->
 <para>
 This macro marks the beginning of a critical section in which GDK and
@@ -275,6 +278,7 @@ begun with #GDK_THREADS_ENTER.
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_threads_enter ##### -->
@@ -285,6 +289,7 @@ conditions.  Only one thread at a time can be in such a critial
 section.
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_threads_leave ##### -->
@@ -292,6 +297,7 @@ section.
 Leaves a critical region begun with gdk_threads_enter(). 
 </para>
 
+@void: 
 
 
 <!-- ##### VARIABLE gdk_threads_mutex ##### -->

docs/reference/gdk/tmpl/visuals.sgml

@@ -54,6 +54,9 @@ then %GDK_VISUAL_STATIC_GRAY.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkVisual ##### -->
 <para>
 The <type>GdkVisual</type> structure contains information about
@@ -171,6 +174,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -179,6 +183,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -187,6 +192,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -195,6 +201,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -203,6 +210,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -234,23 +242,6 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 @Returns: 
 
 
-<!-- ##### MACRO gdk_visual_ref ##### -->
-<para>
-Deprecated equivalent of g_object_ref().
-</para>
-
-@v: a #GdkVisual
-@Returns: the same visual
-
-
-<!-- ##### MACRO gdk_visual_unref ##### -->
-<para>
-Deprecated equivalent of g_object_unref().
-</para>
-
-@v: a #GdkVisual
-
-
 <!-- ##### FUNCTION gdk_visual_get_screen ##### -->
 <para>
 

docs/reference/gdk/tmpl/windows.sgml

@@ -209,7 +209,10 @@ gdk_offscreen_window_get_pixmap().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT GdkWindow ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### TYPEDEF GdkWindow ##### -->
 <para>
 An opaque structure representing an onscreen drawable.
 Pointers to structures of type #GdkPixmap, #GdkBitmap,
@@ -984,7 +987,8 @@ Registers a window as a potential drop destination.
 
 @window: 
 @region: 
-@child_func: 
+@GdkWindow *, gpointer:
+@GdkWindow *, gpointer: 
 @user_data: 
 
 
@@ -1018,6 +1022,7 @@ Registers a window as a potential drop destination.
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_window_process_updates ##### -->
@@ -1745,6 +1750,7 @@ The hint must be set before mapping the window.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -1753,6 +1759,7 @@ The hint must be set before mapping the window.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/x_interaction.sgml

@@ -17,6 +17,9 @@ X backend-specific functions
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO GDK_ROOT_WINDOW ##### -->
 <para>
 Obtains the Xlib window id of the root window of the current screen. 
@@ -657,6 +660,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -665,6 +669,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -673,6 +678,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -681,6 +687,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_x11_image_get_xdisplay ##### -->
@@ -724,6 +731,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_x11_visual_get_xvisual ##### -->

docs/reference/gtk/Makefile.am

@@ -4,16 +4,13 @@ include $(top_srcdir)/Makefile.decl
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module.
-DOC_MODULE=gtk
+DOC_MODULE=gtk3
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gtk-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED" 
-
-# Extra options to pass to gtkdoc-scangobj
-SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)" 
+SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED"
 
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR=../../../gtk
@@ -152,9 +149,9 @@ content_files =					\
 	tree_widget.sgml			\
 	windows.sgml				\
 	x11.sgml				\
-	gtk-query-immodules-2.0.xml		\
-	gtk-update-icon-cache.xml		\
-	gtk-builder-convert.xml			\
+	gtk-query-immodules-3.0.xml		\
+	gtk-update-icon-cache-3.0.xml		\
+	gtk-builder-convert-3.0.xml		\
 	visual_index.xml
 
 expand_content_files = 				\
@@ -370,9 +367,12 @@ EXTRA_DIST += version.xml.in
 
 if ENABLE_MAN
 
-man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
+man_MANS = 				\
+	gtk-query-immodules-3.0.1	\
+	gtk-update-icon-cache-3.0.1	\
+	gtk-builder-convert-3.0.1
 
-%.1 : %.xml 
+%.1 : %.xml
 	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 BUILT_EXTRA_DIST = $(man_MANS)

docs/reference/gtk/glossary.xml

@@ -232,7 +232,7 @@
       <para>
 	Widgets that don't own the GdkWindow on which they draw are
 	called <glossterm linkend="no-window">no-window widgets</glossterm>.  
-        This can be tested with the GTK_WIDGET_NO_WINDOW() macro.  Normally, 
+        This can be tested with the gtk_widget_get_has_window() function.  Normally,
         these widgets draw on their parent's GdkWindow.
       </para>
 

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

@@ -1,18 +1,18 @@
 <refentry id="gtk-builder-convert">
 
 <refmeta>
-<refentrytitle>gtk-builder-convert</refentrytitle>
+<refentrytitle>gtk-builder-convert-3.0</refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-<refname>gtk-builder-convert</refname>
+<refname>gtk-builder-convert-3.0</refname>
 <refpurpose>Glade file conversion utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gtk-builder-convert</command>
+<command>gtk-builder-convert-3.0</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</command> converts glade files
+<para><command>gtk-builder-convert-3.0</command> converts glade files
 into XML files which can be loaded with GtkBuilder.
 </para>
 <para>

docs/reference/gtk/gtk-docs.sgml

@@ -122,7 +122,6 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <xi:include href="xml/gtkstyle.xml" />
     <xi:include href="xml/gtkselection.xml" />
     <xi:include href="xml/gtkfeatures.xml" />
-    <xi:include href="xml/gtksignal.xml" />
     <xi:include href="xml/gtktypeutils.xml" />
     <xi:include href="xml/gtktesting.xml" />
     <xi:include href="xml/filesystem.xml" />
@@ -275,7 +274,6 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtkfontbutton.xml" />
       <xi:include href="xml/gtkfontsel.xml" />
       <xi:include href="xml/gtkfontseldlg.xml" />
-      <xi:include href="xml/gtkinputdialog.xml" />
     </chapter>
     
     <chapter id="LayoutContainers">
@@ -367,8 +365,6 @@ that is, GUI components such as #GtkButton or #GtkTextView.
 
     <chapter id="SpecialObjects">
       <title>Special-purpose features</title>
-      <xi:include href="xml/gtkcurve.xml" />
-      <xi:include href="xml/gtkgamma.xml" />
       <xi:include href="xml/gtkruler.xml" />
       <xi:include href="xml/gtkhruler.xml" />
       <xi:include href="xml/gtkvruler.xml" />
@@ -389,27 +385,6 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtkbuildable.xml" />
       <xi:include href="xml/gtkbuilder.xml" />
     </chapter>
-
-    <chapter id="DeprecatedObjects">
-      <title>Deprecated</title>
-      <xi:include href="xml/gtkclist.xml" />
-      <xi:include href="xml/gtkctree.xml" />
-      <xi:include href="xml/gtkcombo.xml" />
-      <xi:include href="xml/gtkfilesel.xml" />
-      <xi:include href="xml/gtkitemfactory.xml" />
-      <xi:include href="xml/gtklist.xml" />
-      <xi:include href="xml/gtklistitem.xml" />
-      <xi:include href="xml/gtkoldeditable.xml" />
-      <xi:include href="xml/gtkoptionmenu.xml" />
-      <xi:include href="xml/gtkpixmap.xml" />
-      <xi:include href="xml/gtkpreview.xml" />
-      <xi:include href="xml/gtkprogress.xml" />
-      <xi:include href="xml/gtktext.xml" />
-      <xi:include href="xml/gtktooltips.xml" />
-      <xi:include href="xml/gtktipsquery.xml" />
-      <xi:include href="xml/gtktree.xml" />
-      <xi:include href="xml/gtktreeitem.xml" />
-    </chapter>
   </part>
 
   <part id="migrating">
@@ -446,9 +421,9 @@ that is, GUI components such as #GtkButton or #GtkTextView.
 
   <part>
     <title>GTK+ Tools</title>
-    <xi:include href="gtk-query-immodules-2.0.xml" />
-    <xi:include href="gtk-update-icon-cache.xml" />
-    <xi:include href="gtk-builder-convert.xml" />
+    <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" />
   </part>
 
   <xi:include href="glossary.xml" />
@@ -502,7 +477,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <xi:include href="xml/api-index-2.20.xml"><xi:fallback /></xi:include>
   </index>
   <index id="api-index-2-22" role="2.22">
-    <title>Index of new symbols in 2.20</title>
+    <title>Index of new symbols in 2.22</title>
     <xi:include href="xml/api-index-2.22.xml"><xi:fallback /></xi:include>
   </index>
   <index id="api-index-3-0" role="3.0">

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

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

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

@@ -5,18 +5,18 @@
 <refentry id="gtk-update-icon-cache">
 
 <refmeta>
-<refentrytitle>gtk-update-icon-cache</refentrytitle>
+<refentrytitle>gtk-update-icon-cache-3.0</refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-<refname>gtk-update-icon-cache</refname>
+<refname>gtk-update-icon-cache-3.0</refname>
 <refpurpose>Icon theme caching utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gtk-update-icon-cache</command>
+<command>gtk-update-icon-cache-3.0</command>
 <arg choice="opt">--force</arg>
 <arg choice="opt">--ignore-theme-index</arg>
 <arg choice="opt">--index-only</arg>
@@ -28,20 +28,22 @@
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
-<para><command>gtk-update-icon-cache</command> creates mmap()able cache files for
-icon themes. 
+<para>
+  <command>gtk-update-icon-cache-3.0</command> creates mmap()able cache
+  files for icon themes.
 </para>
 <para>
-It expects to be given the path to a icon theme directory containing an
-<filename>index.theme</filename>, e.g. <filename>/usr/share/icons/hicolor</filename>, 
-and writes a <filename>icon-theme.cache</filename> containing cached information
-about the icons in the directory tree below the given directory.
+  It expects to be given the path to a icon theme directory containing an
+  <filename>index.theme</filename>, e.g. <filename>/usr/share/icons/hicolor</filename>,
+  and writes a <filename>icon-theme.cache</filename> containing cached
+  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</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 reduced as well.
+  GTK+ can use the cache files created by <command>gtk-update-icon-cache-3.0</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
+  reduced as well.
 </para>
 </refsect1>
 
@@ -50,17 +52,17 @@ multiple applications, the overall memory consumption is reduced as well.
   <varlistentry>
     <term>--force</term>
     <term>-f</term>
-    <listitem><para>Overwrite an existing cache file even if it appears to be 
+    <listitem><para>Overwrite an existing cache file even if it appears to be
          uptodate.</para></listitem>
   </varlistentry>
 
   <varlistentry>
     <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</command> refuses
-     to create an icon cache in a directory which does not appear to be the toplevel
-     directory of an icon theme. 
+    <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>
+     refuses to create an icon cache in a directory which does not appear to
+     be the toplevel directory of an icon theme.
     </para></listitem>
   </varlistentry>
 
@@ -74,15 +76,15 @@ multiple applications, the overall memory consumption is reduced as well.
   <varlistentry>
     <term>--source</term>
     <term>-c</term>
-    <listitem><para>Output a C header file declaring a constant 
-     <replaceable>name</replaceable> with the contents of the icon 
+    <listitem><para>Output a C header file declaring a constant
+     <replaceable>name</replaceable> with the contents of the icon
      cache.</para></listitem>
   </varlistentry>
 
   <varlistentry>
     <term>--quiet</term>
     <term>-q</term>
-    <listitem><para>Turn off verbose output. 
+    <listitem><para>Turn off verbose output.
     </para></listitem>
   </varlistentry>
 

docs/reference/gtk/gtk3.types

@@ -36,16 +36,12 @@ gtk_cell_view_get_type
 gtk_check_button_get_type
 gtk_check_menu_item_get_type
 gtk_clipboard_get_type
-gtk_clist_get_type
 gtk_color_button_get_type
 gtk_color_selection_dialog_get_type
 gtk_color_selection_get_type
 gtk_combo_box_entry_get_type
 gtk_combo_box_get_type
-gtk_combo_get_type
 gtk_container_get_type
-gtk_ctree_get_type
-gtk_curve_get_type
 gtk_dialog_get_type
 gtk_drawing_area_get_type
 gtk_editable_get_type
@@ -60,13 +56,11 @@ gtk_file_chooser_dialog_get_type
 gtk_file_chooser_get_type
 gtk_file_chooser_widget_get_type
 gtk_file_filter_get_type
-gtk_file_selection_get_type
 gtk_fixed_get_type
 gtk_font_button_get_type
 gtk_font_selection_dialog_get_type
 gtk_font_selection_get_type
 gtk_frame_get_type
-gtk_gamma_curve_get_type
 gtk_handle_box_get_type
 gtk_hbox_get_type
 gtk_hbutton_box_get_type
@@ -85,15 +79,11 @@ gtk_im_context_get_type
 gtk_im_context_simple_get_type
 gtk_im_multicontext_get_type
 gtk_info_bar_get_type
-gtk_input_dialog_get_type
 gtk_invisible_get_type
-gtk_item_factory_get_type
 gtk_item_get_type
 gtk_label_get_type
 gtk_layout_get_type
 gtk_link_button_get_type
-gtk_list_get_type
-gtk_list_item_get_type
 gtk_list_store_get_type
 gtk_menu_bar_get_type
 gtk_menu_get_type
@@ -106,16 +96,12 @@ gtk_mount_operation_get_type
 gtk_notebook_get_type
 gtk_object_get_type
 gtk_offscreen_window_get_type
-gtk_old_editable_get_type
-gtk_option_menu_get_type
 gtk_orientable_get_type
 gtk_page_setup_get_type
 gtk_page_setup_unix_dialog_get_type
 gtk_paned_get_type
 gtk_paper_size_get_type
-gtk_pixmap_get_type
 gtk_plug_get_type
-gtk_preview_get_type
 gtk_printer_get_type
 gtk_print_context_get_type
 gtk_print_job_get_type
@@ -157,13 +143,11 @@ gtk_table_get_type
 gtk_tearoff_menu_item_get_type
 gtk_text_buffer_get_type
 gtk_text_child_anchor_get_type
-gtk_text_get_type
 gtk_text_iter_get_type
 gtk_text_mark_get_type
 gtk_text_tag_get_type
 gtk_text_tag_table_get_type
 gtk_text_view_get_type
-gtk_tips_query_get_type
 gtk_toggle_action_get_type
 gtk_toggle_button_get_type
 gtk_toggle_tool_button_get_type
@@ -172,11 +156,8 @@ gtk_tool_button_get_type
 gtk_tool_item_get_type
 gtk_tool_item_group_get_type
 gtk_tool_palette_get_type
-gtk_tooltips_get_type
 gtk_tree_drag_dest_get_type
 gtk_tree_drag_source_get_type
-gtk_tree_get_type
-gtk_tree_item_get_type
 gtk_tree_model_filter_get_type
 gtk_tree_model_get_type
 gtk_tree_model_sort_get_type

docs/reference/gtk/objects_grouped.sgml

@@ -84,8 +84,6 @@
     <link linkend="GtkImage">GtkImage</link>
     <link linkend="GtkPixmap">GtkPixmap</link>
     <link linkend="GtkPreview">GtkPreview</link>
-    <link linkend="GtkCurve">GtkCurve</link>
-    <link linkend="GtkGammaCurve">GtkGammaCurve</link>
 
 <emphasis>Misc. Widgets</emphasis>
     <link linkend="GtkArrow">GtkArrow</link>

docs/reference/gtk/question_index.sgml

@@ -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-question-index" revision="1 Jan 2002">
+<refentry id="gtk-question-index">
 <refmeta>
 <refentrytitle>Common Questions</refentrytitle>
 <manvolnum>3</manvolnum>

docs/reference/gtk/running.sgml

@@ -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-running" revision="10 Jan 2002">
+<refentry id="gtk-running">
 <refmeta>
 <refentrytitle>Running GTK+ Applications</refentrytitle>
 <manvolnum>3</manvolnum>
@@ -24,8 +24,8 @@ How to run and debug your GTK+ application
 
 <para>
 All GTK+ applications support a number of standard commandline
-options. These are removed from <literal>argv</literal> by gtk_init(). 
-Modules may parse and remove further options. The 
+options. These are removed from <literal>argv</literal> by gtk_init().
+Modules may parse and remove further options. The
 <link linkend="x11-cmdline">X11</link> and
 <link linkend="win32-cmdline">Windows</link> GDK backends parse
 some additional commandline options.
@@ -35,8 +35,8 @@ some additional commandline options.
 <title><systemitem>--gtk-module <replaceable>module</replaceable></systemitem></title>
 
 <para>
-A list of modules to load in addition to those specified in the 
-<envar>GTK_MODULES</envar> environment variable and the 
+A list of modules to load in addition to those specified in the
+<envar>GTK_MODULES</envar> environment variable and the
 <literal>gtk-modules</literal> setting.
 </para>
 </formalpara>
@@ -56,11 +56,10 @@ warning that occurs.
 <title><systemitem>--gtk-debug <replaceable>options</replaceable></systemitem></title>
 
 <para>
-A list of <link linkend="GTK-Debug-Options">debug options</link> 
-to turn on in addition to those specified in the <envar>GTK_DEBUG</envar> 
-environment variable. 
-This option is only available if GTK+ has been configured with
-<option>--enable-debug=yes</option>.
+A list of <link linkend="GTK-Debug-Options">debug options</link>
+to turn on in addition to those specified in the <envar>GTK_DEBUG</envar>
+environment variable. This option is only available if GTK+ has been
+configured with <option>--enable-debug=yes</option>.
 </para>
 </formalpara>
 
@@ -68,9 +67,8 @@ This option is only available if GTK+ has been configured with
 <title><systemitem>--gtk-no-debug <replaceable>options</replaceable></systemitem></title>
 
 <para>
-A list of <link linkend="GTK-Debug-Options">debug options</link> 
-to turn off.
-This option is only available if GTK+ has been configured with
+A list of <link linkend="GTK-Debug-Options">debug options</link>
+to turn off. This option is only available if GTK+ has been configured with
 <option>--enable-debug=yes</option>.
 </para>
 </formalpara>
@@ -84,7 +82,7 @@ list them here for completeness nevertheless.
 <title><systemitem>--class <replaceable>class</replaceable></systemitem></title>
 
 <para>
-Sets the program class; see gdk_set_program_class(). 
+Sets the program class; see gdk_set_program_class().
 </para>
 </formalpara>
 
@@ -100,9 +98,9 @@ Sets the program name.
 <title><systemitem>--gdk-debug <replaceable>options</replaceable></systemitem></title>
 
 <para>
-A list of <link linkend="GDK-Debug-Options">debug options</link> 
-to turn on in addition to those specified in the <envar>GDK_DEBUG</envar> 
-environment variable. This option is only available if GTK+ has been 
+A list of <link linkend="GDK-Debug-Options">debug options</link>
+to turn on in addition to those specified in the <envar>GDK_DEBUG</envar>
+environment variable. This option is only available if GTK+ has been
 configured with <option>--enable-debug=yes</option>.
 </para>
 </formalpara>
@@ -111,7 +109,7 @@ configured with <option>--enable-debug=yes</option>.
 <title><systemitem>--gdk-no-debug <replaceable>options</replaceable></systemitem></title>
 
 <para>
-A list of <link linkend="GDK-Debug-Options">debug options</link> 
+A list of <link linkend="GDK-Debug-Options">debug options</link>
 to turn off. This option is only available if GTK+ has been configured with
 <option>--enable-debug=yes</option>.
 </para>
@@ -122,12 +120,12 @@ to turn off. This option is only available if GTK+ has been configured with
 <refsect2>
 <title>Environment variables</title>
 
-<para> 
+<para>
 GTK+ inspects a number of environment variables in addition to standard
-variables like <envar>LANG</envar>, <envar>PATH</envar>, <envar>HOME</envar> 
-or <envar>DISPLAY</envar>; mostly to determine paths to look for certain 
-files. The <link linkend="x11-envar">X11</link>, 
-<link linkend="win32-envar">Windows</link> and 
+variables like <envar>LANG</envar>, <envar>PATH</envar>, <envar>HOME</envar>
+or <envar>DISPLAY</envar>; mostly to determine paths to look for certain
+files. The <link linkend="x11-envar">X11</link>,
+<link linkend="win32-envar">Windows</link> and
 <link linkend="fb-envar">Framebuffer</link> GDK backends use some
 additional environment variables.
 </para>
@@ -190,7 +188,7 @@ additional environment variables.
     </varlistentry>
 
   </variablelist>
-  The special value <literal>all</literal> can be used to turn on all 
+  The special value <literal>all</literal> can be used to turn on all
   debug options.
   </para>
 </formalpara>
@@ -210,14 +208,14 @@ additional environment variables.
     Specifies a list of directories to search when GTK+ is looking for
     dynamically loaded objects such as the modules specified by
     <envar>GTK_MODULES</envar>, theme engines, input method
-    modules, file system backends and print backends. If the path to 
-    the dynamically loaded object is given as an absolute path name, 
-    then GTK+ loads it directly. 
-    Otherwise, GTK+ goes in turn through the directories in GTK_PATH, 
-    followed by the directory <filename>.gtk-2.0</filename> in the user's 
-    home directory, followed by the system default directory, 
-    which is <filename><replaceable>libdir</replaceable>/gtk-2.0/modules</filename>.
-    (If <envar>GTK_EXE_PREFIX</envar> is defined, <replaceable>libdir</replaceable> is 
+    modules, file system backends and print backends. If the path to
+    the dynamically loaded object is given as an absolute path name,
+    then GTK+ loads it directly.
+    Otherwise, GTK+ goes in turn through the directories in GTK_PATH,
+    followed by the directory <filename>.gtk-3.0</filename> in the user's
+    home directory, followed by the system default directory,
+    which is <filename><replaceable>libdir</replaceable>/gtk-3.0/modules</filename>.
+    (If <envar>GTK_EXE_PREFIX</envar> is defined, <replaceable>libdir</replaceable> is
     <filename>$GTK_EXE_PREFIX/lib</filename>. Otherwise it is the libdir
     specified when GTK+ was configured, usually
     <filename>/usr/lib</filename>, or
@@ -227,14 +225,14 @@ additional environment variables.
     <filename><replaceable>directory</replaceable>/<replaceable>version</replaceable>/<replaceable>host</replaceable>/<replaceable>type</replaceable></filename>
     Where <replaceable>version</replaceable> is derived from the
     version of GTK+ (use <literal>pkg-config
-    --variable=gtk_binary_version gtk+-2.0</literal> to determine this from a
+    --variable=gtk_binary_version gtk+-3.0</literal> to determine this from a
     script), <replaceable>host</replaceable> is the architecture on
     which GTK+ was built. (use <literal>pkg-config
-    --variable=gtk_host gtk+-2.0</literal> to determine this from a
+    --variable=gtk_host gtk+-3.0</literal> to determine this from a
     script), and <replaceable>type</replaceable> is a directory
     specific to the type of modules; currently it can be
-    <literal>modules</literal>, <literal>engines</literal>, 
-    <literal>immodules</literal>, <literal>filesystems</literal> or 
+    <literal>modules</literal>, <literal>engines</literal>,
+    <literal>immodules</literal>, <literal>filesystems</literal> or
     <literal>printbackends</literal>, corresponding to the types of
     modules mentioned above. Either <replaceable>version</replaceable>,
     <replaceable>host</replaceable>, or both may be omitted. GTK+ looks
@@ -262,17 +260,17 @@ additional environment variables.
 
   <para>
     Specifies the file listing the IM modules to load. This environment
-    variable overrides the <literal>im_module_file</literal> specified in 
-    the RC files, which in turn overrides the default value 
-    <filename><replaceable>sysconfdir</replaceable>/gtk-2.0/gtk.immodules</filename>
-    (<replaceable>sysconfdir</replaceable> is the sysconfdir specified when GTK+ was configured, 
+    variable overrides the <literal>im_module_file</literal> specified in
+    the RC files, which in turn overrides the default value
+    <filename><replaceable>sysconfdir</replaceable>/gtk-3.0/gtk.immodules</filename>
+    (<replaceable>sysconfdir</replaceable> is the sysconfdir specified when GTK+ was configured,
      usually <filename>/usr/local/etc</filename>.)
   </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>.
@@ -283,7 +281,7 @@ additional environment variables.
   <title><envar>GTK_EXE_PREFIX</envar></title>
 
   <para>
-    If set, GTK+ uses <filename>$GTK_EXE_PREFIX/lib</filename> instead of 
+    If set, GTK+ uses <filename>$GTK_EXE_PREFIX/lib</filename> instead of
     the libdir configured when GTK+ was compiled.
   </para>
 </formalpara>
@@ -307,9 +305,9 @@ nevertheless.
   <title><envar>GDK_PIXBUF_MODULE_FILE</envar></title>
 
   <para>
-    Specifies the file listing the GdkPixbuf loader modules to load. 
-    This environment variable overrides the default value 
-    <filename><replaceable>sysconfdir</replaceable>/gtk-2.0/gdk-pixbuf.loaders</filename>
+    Specifies the file listing the GdkPixbuf loader modules to load.
+    This environment variable overrides the default value
+    <filename><replaceable>sysconfdir</replaceable>/gtk-3.0/gdk-pixbuf.loaders</filename>
     (<replaceable>sysconfdir</replaceable> is the sysconfdir specified when
 	  GTK+ was configured, usually <filename>/usr/local/etc</filename>.)
   </para>
@@ -385,9 +383,9 @@ nevertheless.
 
   <para>
     GTK+ uses these environment variables to locate icon themes
-    and MIME information. For more information, see 
+    and MIME information. For more information, see
     <ulink url="http://freedesktop.org/Standards/icon-theme-spec">Icon Theme Specification</ulink>,
-    the <ulink url="http://freedesktop.org/Standards/shared-mime-info-spec">Shared MIME-info Database</ulink> 
+    the <ulink url="http://freedesktop.org/Standards/shared-mime-info-spec">Shared MIME-info Database</ulink>
     and the <ulink url="http://freedesktop.org/Standards/basedir-spec">Base Directory Specification</ulink>.
   </para>
 </formalpara>

docs/reference/gtk/tmpl/gtkaccelmap.sgml

@@ -17,6 +17,9 @@ Loadable keyboard accelerator specifications
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkAccelMap ##### -->
 <para>
 
@@ -148,6 +151,7 @@ Loadable keyboard accelerator specifications
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkactiongroup.sgml

@@ -70,6 +70,9 @@ it doesn't allow you to specify a signal.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkActionGroup ##### -->
 <para>
 The <structname>GtkActionGroup</structname> struct contains only private 

docs/reference/gtk/tmpl/gtkadjustment.sgml

@@ -31,6 +31,9 @@ after changing the value and its bounds. This results in the emission of the
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkAdjustment ##### -->
 <para>
 The #GtkAdjustment-struct struct contains the following fields.

docs/reference/gtk/tmpl/gtkbindings.sgml

@@ -120,6 +120,9 @@ The "unbind" functionality has been introduced in GTK+ 2.12.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkBindingSet ##### -->
 <para>
 A binding set maintains a list of activatable key bindings.
@@ -175,13 +178,6 @@ key binding signal emission as stored in #GtkBindingSignal.
 
 @arg_type: implementation detail
 
-<!-- ##### MACRO gtk_binding_entry_add ##### -->
-<para>
-
-</para>
-
-
-
 <!-- ##### FUNCTION gtk_binding_entry_add_signall ##### -->
 <para>
 
@@ -194,25 +190,6 @@ key binding signal emission as stored in #GtkBindingSignal.
 @binding_args: 
 
 
-<!-- ##### FUNCTION gtk_binding_entry_clear ##### -->
-<para>
-
-</para>
-
-@binding_set: 
-@keyval: 
-@modifiers: 
-
-
-<!-- ##### FUNCTION gtk_binding_parse_binding ##### -->
-<para>
-
-</para>
-
-@scanner: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_binding_set_new ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkbutton.sgml

@@ -24,6 +24,9 @@ the #GtkLabel.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkButton ##### -->
 <para>
 This should not be accessed directly.  Use the accessor functions below.
@@ -158,6 +161,7 @@ Creates a new #GtkButton widget. To add a child widget to the button,
 use gtk_container_add().
 </para>
 
+@void: 
 @Returns: The newly created #GtkButton widget.
 
 

docs/reference/gtk/tmpl/gtkcalendar.sgml

@@ -36,6 +36,9 @@ gtk_calendar_get_date().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCalendar ##### -->
 <para>
 <structfield>num_marked_dates</structfield> is an integer containing the
@@ -191,6 +194,7 @@ calendar.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -312,25 +316,3 @@ calendar.
 @rows: 
 
 
-<!-- ##### FUNCTION gtk_calendar_display_options ##### -->
-<para>
-</para>
-
-@calendar: 
-@flags: 
-
-
-<!-- ##### FUNCTION gtk_calendar_freeze ##### -->
-<para>
-</para>
-
-@calendar: 
-
-
-<!-- ##### FUNCTION gtk_calendar_thaw ##### -->
-<para>
-</para>
-
-@calendar: 
-
-

docs/reference/gtk/tmpl/gtkcelleditable.sgml

@@ -18,6 +18,9 @@ to be usable when editing the contents of a #GtkTreeView cell.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellEditable ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcelllayout.sgml

@@ -58,6 +58,9 @@ content of the element is the attribute value.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellLayout ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcellrenderer.sgml

@@ -51,6 +51,9 @@ respectively.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GtkCellRendererState ##### -->
 <para>
 Tells how a cell is to be rendererd.
@@ -245,14 +248,6 @@ it cannot be individually modified.
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_cell_renderer_editing_canceled ##### -->
-<para>
-
-</para>
-
-@cell: 
-
-
 <!-- ##### FUNCTION gtk_cell_renderer_stop_editing ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml

@@ -23,6 +23,9 @@ The #GtkCellRendererAccel cell renderer was added in GTK+ 2.10.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererAccel ##### -->
 <para>
 
@@ -81,6 +84,7 @@ The #GtkCellRendererAccel cell renderer was added in GTK+ 2.10.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml

@@ -34,6 +34,9 @@ The #GtkCellRendererCombo cell renderer was added in GTK+ 2.6.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererCombo ##### -->
 <para>
 
@@ -69,6 +72,7 @@ The #GtkCellRendererCombo cell renderer was added in GTK+ 2.6.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml

@@ -33,6 +33,9 @@ property is set to a pixbuf, it renders that one.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererPixbuf ##### -->
 <para>
 
@@ -89,6 +92,7 @@ property is set to a pixbuf, it renders that one.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml

@@ -22,6 +22,9 @@ The #GtkCellRendererProgress cell renderer was added in GTK+ 2.6.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererProgress ##### -->
 <para>
 
@@ -63,6 +66,7 @@ The #GtkCellRendererProgress cell renderer was added in GTK+ 2.6.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcellrendererspin.sgml

@@ -33,6 +33,9 @@ The #GtkCellRendererSpin cell renderer was added in GTK+ 2.10.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererSpin ##### -->
 <para>
 
@@ -59,6 +62,7 @@ The #GtkCellRendererSpin cell renderer was added in GTK+ 2.10.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcellrenderertext.sgml

@@ -25,6 +25,9 @@ the #GtkCellRendererText allows to edit its text using an entry.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererText ##### -->
 <para>
 
@@ -265,6 +268,7 @@ the #GtkCellRendererText allows to edit its text using an entry.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml

@@ -20,6 +20,9 @@ property. When activated, it emits the toggled signal.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererToggle ##### -->
 <para>
 
@@ -64,6 +67,7 @@ property. When activated, it emits the toggled signal.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcellview.sgml

@@ -20,6 +20,9 @@ and drag and drop.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellView ##### -->
 <para>
 
@@ -51,6 +54,7 @@ and drag and drop.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -137,12 +141,3 @@ and drag and drop.
 @color: 
 
 
-<!-- ##### FUNCTION gtk_cell_view_get_cell_renderers ##### -->
-<para>
-
-</para>
-
-@cell_view: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkcheckbutton.sgml

@@ -37,6 +37,9 @@ The important signal ('toggled') is also inherited from #GtkToggleButton.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCheckButton ##### -->
 <para>
 <structfield>toggle_button</structfield> is a #GtkToggleButton representing the actual toggle button that composes the check button.
@@ -58,6 +61,7 @@ The important signal ('toggled') is also inherited from #GtkToggleButton.
 Creates a new #GtkCheckButton.
 </para>
 
+@void: 
 @Returns: a #GtkWidget.