GtkSpiner: adjust to minor GPeriodic change

The timestamp to the tick function is now in microseconds instead of
milliticks.

INSTALL.in

@@ -5,9 +5,11 @@ GTK+ requires the following packages:
 
  - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at
    the same location as GTK+. GTK+ @GTK_VERSION@ requires at least
-   GLib 2.23.6, Pango 1.20, GdkPixbuf 2.21.0 ATK 1.29.2 and cairo 1.6.0.
+   GLib @GLIB_REQUIRED_VERSION@, Pango @PANGO_REQUIRED_VERSION@,
+   GdkPixbuf @GDK_PIXBUF_REQUIRED_VERSION@, ATK @ATK_REQUIRED_VERSION@
+   and cairo @CAIRO_REQUIRED_VERSION@.
 
- - gobject-introspection 0.6.7 or newer.
+ - gobject-introspection 0.9.3 or newer.
 
 Simple install procedure
 ========================

Makefile.am

@@ -1,12 +1,13 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = gdk gtk modules demos tests perf
+SRC_SUBDIRS = gdk gtk modules demos tests perf examples
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 EXTRA_DIST +=			\
+	autogen.sh		\
 	HACKING			\
 	makecopyright		\
 	NEWS.pre-1-0		\
@@ -30,82 +31,8 @@ EXTRA_DIST +=			\
 	gtk-zip.sh.in		\
 	sanitize-la.sh		\
 	po/README.translators	\
-	po/po2tbl.sed.in	\
-	examples/aspectframe/Makefile  \
-	examples/aspectframe/aspectframe.c  \
-	examples/Makefile  \
-	examples/README.1ST  \
-	examples/extract.awk  \
-	examples/extract.sh  \
-	examples/arrow/Makefile	\
-	examples/arrow/arrow.c	\
-	examples/base/Makefile  \
-	examples/base/base.c  \
-	examples/buttonbox/Makefile \
-	examples/buttonbox/buttonbox.c	\
-	examples/buttons/Makefile  \
-	examples/buttons/buttons.c  \
-	examples/buttons/info.xpm  \
-	examples/calendar/Makefile  \
-	examples/calendar/calendar.c  \
-	examples/entry/Makefile  \
-	examples/entry/entry.c  \
-	examples/eventbox/Makefile  \
-	examples/eventbox/eventbox.c  \
-	examples/gtkdial/Makefile  \
-	examples/gtkdial/dial_test.c  \
-	examples/gtkdial/gtkdial.c  \
-	examples/gtkdial/gtkdial.h  \
-	examples/helloworld/Makefile  \
-	examples/helloworld/helloworld.c  \
-	examples/helloworld2/Makefile  \
-	examples/helloworld2/helloworld2.c  \
-	examples/label/Makefile	\
-	examples/label/label.c	\
-	examples/menu/Makefile  \
-	examples/menu/menu.c  \
-	examples/notebook/Makefile  \
-	examples/notebook/notebook.c  \
-	examples/packbox/Makefile  \
-	examples/packbox/packbox.c  \
-	examples/paned/Makefile  \
-	examples/paned/paned.c  \
-	examples/pixmap/Makefile  \
-	examples/pixmap/pixmap.c  \
-	examples/progressbar/Makefile  \
-	examples/progressbar/progressbar.c  \
-	examples/radiobuttons/Makefile  \
-	examples/radiobuttons/radiobuttons.c  \
-	examples/rangewidgets/Makefile  \
-	examples/rangewidgets/rangewidgets.c  \
-	examples/rulers/Makefile  \
-	examples/rulers/rulers.c  \
-	examples/scribble-simple/Makefile  \
-	examples/scribble-simple/scribble-simple.c  \
-	examples/scribble-xinput/Makefile	\
-	examples/scribble-xinput/scribble-xinput.c	\
-	examples/scrolledwin/Makefile  \
-	examples/scrolledwin/scrolledwin.c  \
-	examples/selection/Makefile  \
-	examples/selection/gettargets.c  \
-	examples/selection/setselection.c  \
-	examples/statusbar/Makefile  \
-	examples/statusbar/statusbar.c  \
-	examples/table/Makefile  \
-	examples/table/table.c  \
-	examples/tictactoe/Makefile  \
-	examples/tictactoe/tictactoe.c  \
-	examples/tictactoe/tictactoe.h  \
-	examples/tictactoe/ttt_test.c  \
-	examples/wheelbarrow/Makefile  \
-	examples/wheelbarrow/wheelbarrow.c  \
-	examples/fixed/fixed.c  \
-	examples/fixed/Makefile  \
-	examples/frame/frame.c  \
-	examples/frame/Makefile  \
-	examples/spinbutton/spinbutton.c  \
-	examples/spinbutton/Makefile  \
-	examples/find-examples.sh
+	po/po2tbl.sed.in
+
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
 	$(srcdir)/README \

NEWS

@@ -1,3 +1,274 @@
+Overview of Changes from GTK+ 2.91.0 to 2.91.1
+==============================================
+
+* GTK+ can now add a resize grip to any window. The resize
+  grip functionality in GtkStatusbar has been removed.
+
+* A very old bug in the handling of geometry widgets has
+  been fixed, and a way to set geometry in terms of the
+  geometry widget has been added: gtk_window_resize_to_geometry()
+
+* The GtkFileChooser now uses GSettings to store its settings
+  instead of the keyfile ~/.config/gtk-2.0/gtkfilechooser.ini
+
+* GtkWrapBox has been dropped from GTK+ again. The widget
+  will be available in libegg until clear use cases have
+  been established.
+
+* GtkWidget now has horizontal and vertical expand flags, in
+  the form of ::hexpand and ::vexpand properties. These flags
+  are intended to obsolete most custom container-specific
+  expand child properties, over time.
+  Expandability is inherited up the widget hierarchy.
+
+* GtkComboBoxEntry has been deprecated in favor of a
+  ::has-entry property on GtkComboBox.
+
+* The GtkComboBox text convenience API (gtk_combo_box_new_text(), etc)
+  has been deprecated in favor of a new GtkComboBoxText class.
+
+* GtkLinkButton has gained a ::activate-link signal that
+  can be used to suppress the default behavior.
+
+* The very outdated tutorial has been dropped from the GTK+ distribution,
+  and a new 'Getting started' section has been added to the API
+  documentation that will accumulate tutorial material over time.
+
+* Bugs fixed:
+  68668 Fix handling of geometry widget
+ 313350 Return type of gtk_accelerator_get_default_mod_mask...
+ 351247 GtkScrolledWindow is mis documented
+ 423201 gtk_combo_box_entry_active_changed does not transform...
+ 563002 Doesn't call 'update-preview' on set_filename
+ 612396 Implement GtkComboBoxText subclass to supersede "text"...
+ 613728 Rationalize GtkTreeView focus
+ 628902 use expand flags to determine window resizability
+ 629722 save_entry_get_info_cb() doesn't behave correctly
+ 629778 Scrolled window does not behave properly with height-for...
+ 629955 Deprecate / remove gtk_main and gtk_init_add / remove* API
+ 630850 Use GSettings for the filechooser settings
+ 630900 GtkCellRendererClass: unify const of GdkRectangle args
+ 631203 Scrolling in GtkTextView can use 100% cpu
+ 631311 Obvious fix for nasty crash in menu code
+ 631473 Fix GTK+3 documentation
+ 631475 Two old GDK_foo key macros left in gdk/quartz/gdkkeys-quartz.c
+ 631599 Allow to use arbitrary surfaces for offscreen windows
+ 631719 Action-based menu accelerators don't synch with GtkMenuItem
+ 631794 Warn when calling gtk_window_parse_geometry() on an empty...
+ 631976 Remove GtkWidgetAuxInfo from GtkScrolledWindow
+ 632059 Move the introduction of the tutorial in the reference
+ 632095 GtkTargetEntry: Add boxed type and constructor
+ 632140 optionally take hotspot coordinates from the pixbuf...
+ 632218 BadMatch when starting gnome-shell
+
+* New or updated translations:
+ Catalan
+ Estonian
+ Galician
+ Greek
+ Kazakh
+ Kikongo
+ Lithuanian
+ Punjabi
+ Slovenian
+ Spanish
+
+
+Overview of Changes from GTK+ 2.90.7 to 2.91.0
+==============================================
+
+* The rendering cleanup work has landed. This is a large change that
+  affects many APIs.
+  - All gtkstyle functions have been changed to take a cairo_t argument
+    instead of a window + area.
+  - GdkPixmap is gone. APIs that took pixmaps are being replaced by ones
+    that take pixbufs or cairo surfaces, or regions (where pixmaps were
+    used as masks). In background handling, pixmaps have been replaced
+    by cairo patterns, see gdk_window_set_background_pattern().
+  - GdkColormap is gone. It is replaced by visuals, see
+    gtk_widget_set_visual().
+  - The ::expose-event signal on GtkWidget has been replaced by a
+    ::draw signal.
+  - gtk_widget_get_snapshot() has been removed. Instead, gtk_widget_draw()
+    can render a widget onto an cairo_t.
+
+* The GtkSizeRequest interface has been merged into GtkWidget, and
+  GtkCellSizeRequest has been merged into GtkCellRenderer. The wrapper
+  functions have been renamed to include 'preferred', e.g
+  gtk_size_request_get_width() is now gtk_widget_get_preferred_width()
+  and gtk_cell_size_request_get_width_for_height() is now
+  gtk_cell_renderer_get_preferred_width_for_height().
+
+* GtkObject has been removed. The ::destroy signal has been moved
+  to GtkWidget. At the same time, GtkWidgetFlags have been removed,
+  they already had getters and setters anyway.
+
+* GtkWidget has gained generic alignment and padding properties:
+  halign, valign, margin-left, margin-right, margin-top, margin-bottom
+  These can be used instead of container-specific child properties or
+  GtkMisc and GtkAlignment widgets.
+
+* Container widgets can now let GTK+ handle border-width for them, using
+  gtk_container_class_handle_border_width()
+
+* The GtkEditableClass struct has been renamed to GtkEditableInterface
+
+* Mouse wheel scrolling has been removed from GtkNotebook
+
+* The default policy for scrolled windows has been changed to 'automatic'
+
+* Global url hooks have been removed from GtkAboutDialog and GtkLinkButton
+
+* The global window creation hook has been removed from GtkNotebook
+
+* The error handling in GDK has been modernized and avoids synchronizing
+  X requests as much as possible
+
+* Fixed Bugs:
+ 323904 GtkEditable header is slightly incorrect
+ 339745 Return value of gtk_link_button_set_uri_hook not usable
+ 468672 GTK_POLICY_AUTOMATIC should be the default policy...
+ 486839 Filechooser 'Places' items should not move up and down...
+ 601731 Drag and Drop from Workspace to Activities Overview
+ 617316 Move documentation to inline comments: GtkEditable
+ 621590 Add length to gtk_tree_path_get_indices
+ 623664 Missing accessors for gtk_menu_get_position_func{,_data}
+ 628829 Chain get_width_for_height default impl to vfunc...
+ 629177 Do not use deprecated gtk_widget_get_child_requisition()
+ 629277 Hanging because do_syntheszie_crossing_event is called...
+ 629387 Use gint16 for GtkBorder
+ 629598 Do not use deprecated gtk_widget_size_request()
+ 629608 Revamp and modernize X error traps
+ 629733 There is a misprint in the description of the gtk_check_...
+ 629748 Fails to build without XComposite
+ 629785 Do not use deprecated gtk_cell_renderer_get_size()
+ 630033 Improve tests for X error traps, fix two bugs
+ 630226 Removing tab scrolling from GtkNotebook
+ 630520 Don't try to unref event->dnd.context unconditionally...
+ 630521 Remove some remaining API warts from tab dnd api
+ 630532 invalid drop point in drag-data-received callback
+
+Updated translations:
+Catalan
+Czech
+Danish
+Dutch
+German
+Gujarati
+Japanese
+Simplified Chinese
+
+
+Overview of Changes from GTK+ 2.90.6 to 2.90.7
+==============================================
+
+* Various deprecated APIs have been removed:
+ - the GtkWidget::draw-border style property
+ - the GtkEntry::state-hint style property
+ - the GtkTreeView::row-ending-details style property
+ - the GtkRange::trough-side-details style property
+ - the GtkRange::stepper-position-details style property
+ - the GtkRange::activate-slider style property
+ - the GTK_CALENDAR_WEEK_START_MONDAY option
+ - the GtkFrame::shadow and GtkHandleBox::shadow properties
+ - the GtkTextView::page-horizontally signal
+ - the GDK_WINDOW_DIALOG window type
+ - the GTK_SELECTION_EXTENDED selection mode
+ - the GtkProgressBarOrientation, GtkAnchorType and GtkVisibility
+   enumerations
+ - GtkDialog separators, including the GtkDialog::has-separator
+   property, including setter/getter, the GTK_DIALOG_NO_SEPARATOR
+   flag and the GtkMessageDialog::use-separator style property
+ - gtk_status_icon_set/get_blinking
+ - gdk_window_et_deskrelative_origin
+ - The GtkItem class has been removed. Its functionality has
+   been merged into is sole subclass, GtkMenuItem
+
+* The GtkIconView::orientation property has been renamed
+  to 'item-orientation'
+
+* GtkProgressBar and GtkCellRendererProgress implement GtkOrientable
+  now, and their 'orientation' property have been split into
+  a 'orientation' property of type GtkOrientation and a boolean
+  'inverted' property
+
+* GDK no longer exports variables: gdk_threads_lock, gdk_threads_unlock,
+  gdk_threads_mutex and gdk_display are no longer available
+
+* GTK no longer exports variables: gtk_major_version, gtk_minor_version,
+  gtk_micro_version, gtk_binary_age, gtk_interface_age have been
+  converted to functions. gtk_debug_flags has a getter and a setter.
+  Misc. variables that had been exported by the semi-private text
+  API have been removed.
+
+* All GDK keysym names have been changed from GDK_keysym to GDK_KEY_keysym;
+  the previous names are still available in gdkkeysyms-compat.h.
+
+* GtkWrapBox is a new container, which distributes its children
+  over multiple rows/columns
+
+* GTK+ now uses standard icon names when looking up stock icons
+
+* More widgets and cell renderers have been converted to support
+  width-for-height: GtkCellRendererText, GtkAccelLabel, GtkCellView,
+  GtkComboBox, GtkMenu, GtkMenuItem
+
+* Button boxes are now semi-homogeneous.
+
+* The directfb backend has been removed
+
+* Bugs fixed:
+  77669 GtkWrapBox for gtk itself, not gimp?
+  84188 "Dialogue" button widths should not be homogenous
+ 414712 gtk_container_set_focus_child leaks widget
+ 527499 FileFilter combo becames too wide
+ 528257 File selector and stock string problems
+ 605186 Use G_DEFINE_INTERFACE macro
+ 614006 File chooser crashes when creating a new folder...
+ 616401 Noneffective gdk_keymap_map_virtual_modifiers in early use
+ 626710 GailScaleButton calculates wrong value for minimum increment
+ 627028 Marked state of calendar day is not accessible
+ 627139 gtkfilechooserentry shows completion progress tooltip on first show
+ 627445 Removal of GtkWidget::draw-border breaks gtk_widget_queue_draw()
+ 627580 GtkFontSelection: don't notify the non-existent "font" property
+ 627643 gtkaboutdialog gettext problem
+ 627828 Drag and drop between treeviews in different window groups broken...
+ 627843 set_active_iter doc: remove restriction on path length
+ 627867 tests/testsocket is broken
+ 627912 misprint in the desc. of "hover-expand" and "hover-selection"...
+ 628160 introspection: Update to new scanner API
+ 628308 docs referencing non existing icons
+ 628656 _gdk_windowing_get_startup_notify_id memory leak
+ 628807 Add more "reserved for expansion" fields to GtkWidgetClass
+ 628808 Warn if a widget requests minimum size > natural size
+ 628884 Use a bitfield for Widget::private_flags, ::state, ::saved_state
+ 628935 add gtk_radio_button_join_group method for bindings
+ 629110 gtk_spinner_accessible_get_type always returns null
+
+* Translation updates
+ Arabic
+ Armenian
+ Brazilian Portuguese
+ British English
+ Bulgarian
+ Danish
+ Estonian
+ French
+ Galician
+ Hebrew
+ Hungarian
+ Indonesian
+ Kazakh
+ Norwegian bokmål
+ Norwegian Nynorsk
+ Portuguese
+ Serbian
+ Slovenian
+ Spanish
+ Telugu
+ Traditional Chinese
+
+
 Overview of Changes from GTK+ 2.90.5 to 2.90.6
 ==============================================
 

autogen.sh

@@ -19,7 +19,7 @@ if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
 			 sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \
 			     -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 	case $libtool_version in
-	    2.2*)
+	    2.*)
 		have_libtool=true
 		;;
 	esac
@@ -110,10 +110,11 @@ rm -rf autom4te.cache
 # regenerated from their corresponding *.in files by ./configure anyway.
 touch README INSTALL
 
+gtkdocize || exit $?
+
 $ACLOCAL -I m4 $ACLOCAL_FLAGS || exit $?
 
 libtoolize --force || exit $?
-gtkdocize || exit $?
 
 autoheader || exit $?
 

configure.ac

@@ -2,6 +2,14 @@
 # require autoconf 2.54
 AC_PREREQ([2.62])
 
+AC_INIT([gtk+], [gtk_version],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B],
+        [gtk+])
+
+AC_CONFIG_HEADER([config.h])
+AC_CONFIG_SRCDIR([gdk/gdktypes.h])
+AC_CONFIG_MACRO_DIR([m4])
+
 # Making releases:
 #   GTK_MICRO_VERSION += 1;
 #   GTK_INTERFACE_AGE += 1;
@@ -11,8 +19,8 @@ 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], [90])
-m4_define([gtk_micro_version], [7])
+m4_define([gtk_minor_version], [91])
+m4_define([gtk_micro_version], [2])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -31,21 +39,23 @@ m4_define([gtk_api_version], [3.0])
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.25.15])
+m4_define([glib_required_version], [2.27.1])
 m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.29.2])
-m4_define([cairo_required_version], [1.9.10])
+m4_define([cairo_required_version], [1.10.0])
 m4_define([gdk_pixbuf_required_version], [2.21.0])
+GLIB_REQUIRED_VERSION=glib_required_version
+PANGO_REQUIRED_VERSION=pango_required_version
+ATK_REQUIRED_VERSION=atk_required_version
+CAIRO_REQUIRED_VERSION=cairo_required_version
+GDK_PIXBUF_REQUIRED_VERSION=gdk_pixbuf_required_version
+AC_SUBST(GLIB_REQUIRED_VERSION)
+AC_SUBST(PANGO_REQUIRED_VERSION)
+AC_SUBST(ATK_REQUIRED_VERSION)
+AC_SUBST(CAIRO_REQUIRED_VERSION)
+AC_SUBST(GDK_PIXBUF_REQUIRED_VERSION)
 
 
-AC_INIT([gtk+], [gtk_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B],
-	[gtk+])
-
-AC_CONFIG_HEADER([config.h])
-AC_CONFIG_SRCDIR([gdk/gdktypes.h])
-AC_CONFIG_MACRO_DIR([m4])
-
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
@@ -227,10 +237,6 @@ AC_ARG_ENABLE(debug,
               AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
                              [turn on debugging @<:@default=debug_default@:>@]),,
               enable_debug=debug_default)
-AC_ARG_ENABLE(shm,
-              [AC_HELP_STRING([--enable-shm],
-                              [support shared memory if available [default=yes]])],,
-              [enable_shm="yes"])
 AC_ARG_ENABLE(xkb,
               [AC_HELP_STRING([--enable-xkb],
                               [support XKB [default=maybe]])],,
@@ -243,10 +249,6 @@ AC_ARG_ENABLE(rebuilds,
               [AC_HELP_STRING([--disable-rebuilds],
                               [disable all source autogeneration rules])],,
               [enable_rebuilds=yes])
-AC_ARG_ENABLE(visibility,
-              [AC_HELP_STRING([--disable-visibility],
-                              [do not use ELF visibility attributes])],,
-              [enable_visibility=yes])
 
 AC_ARG_WITH(xinput,
             [AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])])
@@ -284,11 +286,6 @@ else
 fi
 
 
-if test "x$enable_visibility" = "xno"; then
-  GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY"
-fi
-
-
 AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}",
                    [Define if debugging is enabled])
 
@@ -365,6 +362,7 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES,
    atk >= atk_required_version dnl
    pango >= pango_required_version dnl
    cairo >= cairo_required_version dnl
+   cairo-gobject >= cairo_required_version dnl
    gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
 
 ## In addition to checking that cairo is present, we also need to
@@ -486,18 +484,6 @@ if test "$gtk_ok" = "yes"; then
 	    [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>], [
-sigjmp_buf env;
-sigsetjmp(env, 0);
-], gtk_ok=yes, gtk_ok=no)
-AC_MSG_RESULT($gtk_ok)
-if test "$gtk_ok" = "yes"; then
-  AC_DEFINE(HAVE_SIGSETJMP, 1,
-            [Define to 1 if sigsetjmp is available])
-fi
-
 # i18n stuff
 ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
 AM_GLIB_GNU_GETTEXT
@@ -1050,54 +1036,6 @@ if test "x$gdktarget" = "xx11"; then
 
   CFLAGS="$gtk_save_CFLAGS"
 
-  # Xshm checks
-
-  if test "x$enable_shm" = "xyes"; then
-     # Check for the XShm extension, normally in Xext
-     AC_CHECK_FUNC(XShmAttach,
-	:,
-	# On AIX, it is in XextSam instead
-	[AC_CHECK_LIB(XextSam, XShmAttach,
-	    [GTK_ADD_LIB(x_extra_libs,XextSam)])])
-  fi
-
-  if test "x$enable_shm" = "xyes"; then
-    # Check for shared memory
-    AC_CHECK_HEADER(sys/ipc.h,
-                    AC_DEFINE(HAVE_IPC_H, 1,
-                              [Define to 1 if ipc.h is available]),
-                    no_sys_ipc=yes)
-    AC_CHECK_HEADER(sys/shm.h,
-                    AC_DEFINE(HAVE_SHM_H, 1,
-                              [Define to 1 if shm.h is available]),
-                    no_sys_shm=yes)
-
-    # Check for the X shared memory extension header file
-    have_xshm=no
-    AC_MSG_CHECKING(X11/extensions/XShm.h)
-    if test "x$no_xext_lib" = "xyes"; then
-      :
-    else
-      gtk_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS $x_cflags"
-      AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/XShm.h>
-], [XShmSegmentInfo *x_shm_info;], have_xshm=yes)
-      CFLAGS="$gtk_save_CFLAGS"
-    fi
-    AC_MSG_RESULT($have_xshm)
-    if test $have_xshm = yes ; then
-      AC_DEFINE(HAVE_XSHM_H, 1,
-                [Define to 1 if xshm.h is available])
-    fi
-  fi
-
   if test "x$enable_xinerama" = "xyes"; then
     # Check for Xinerama extension (Solaris impl or Xfree impl)
     gtk_save_cppflags="$CPPFLAGS"
@@ -1287,9 +1225,9 @@ LDFLAGS="$saved_ldflags"
 
 # Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
 if test "x$gdktarget" = "xx11"; then
-  GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
+  GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend cairo-gobject"
 else
-  GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
+  GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend cairo-gobject"
 fi
 
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
@@ -1339,7 +1277,7 @@ else
         LIBS="$gtk_save_LIBS"
 fi
 
-GTK_PACKAGES="atk cairo gdk-pixbuf-2.0 gio-2.0"
+GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
 if test "x$gdktarget" = "xx11"; then
   GTK_PACKAGES="$GTK_PACKAGES pangoft2"
 fi
@@ -1539,11 +1477,17 @@ if test -n "$export_dynamic"; then
   GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
+#############
+# GSettings #
+#############
+
+GLIB_GSETTINGS
+
 ##################################################
 # GObject introspection
 ##################################################
 
-GOBJECT_INTROSPECTION_CHECK([0.9.0])
+GOBJECT_INTROSPECTION_CHECK([0.9.3])
 
 ##################################################
 # Checks for gtk-doc and docbook-tools
@@ -1696,6 +1640,7 @@ po-properties/Makefile.in
 demos/Makefile
 demos/gtk-demo/Makefile
 demos/gtk-demo/geninclude.pl
+examples/Makefile
 tests/Makefile
 docs/Makefile
 docs/reference/Makefile
@@ -1704,9 +1649,7 @@ docs/reference/gdk/version.xml
 docs/reference/gtk/Makefile
 docs/reference/gtk/version.xml
 docs/reference/libgail-util/Makefile
-docs/faq/Makefile
 docs/tools/Makefile
-docs/tutorial/Makefile
 build/Makefile
 build/win32/Makefile
 build/win32/vs9/Makefile
@@ -1746,4 +1689,4 @@ perf/Makefile
 AC_OUTPUT
 
 echo "configuration:
-        target: $gdktarget"
+        target:             $gdktarget"

demos/gtk-demo/appwindow.c

@@ -67,25 +67,6 @@ activate_radio_action (GtkAction *action, GtkRadioAction *current)
     }
 }
 
-static void
-activate_email (GtkAboutDialog *about,
-		const gchar    *link,
-		gpointer        data)
-{
-  gchar *text;
-  text = g_strdup_printf ("send mail to %s", link);
-  g_print ("%s\n", text);
-  g_free (text);
-}
-
-static void
-activate_url (GtkAboutDialog *about,
-	      const gchar    *link,
-	      gpointer        data)
-{
-  g_print ("show url %s\n", link);
-}
-
 static void
 about_cb (GtkAction *action,
 	  GtkWidget *window)
@@ -120,11 +101,13 @@ about_cb (GtkAction *action,
       g_object_unref (pixbuf);
     }
 
-  gtk_about_dialog_set_email_hook (activate_email, NULL, NULL);
-  gtk_about_dialog_set_url_hook (activate_url, NULL, NULL);
   gtk_show_about_dialog (GTK_WINDOW (window),
 			 "program-name", "GTK+ Code Demos",
-			 "version", PACKAGE_VERSION,
+			 "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
+						     PACKAGE_VERSION,
+						     gtk_get_major_version (),
+						     gtk_get_minor_version (),
+						     gtk_get_micro_version ()),
 			 "copyright", "(C) 1997-2009 The GTK+ Team",
 			 "license-type", GTK_LICENSE_LGPL_2_1,
 			 "website", "http://www.gtk.org",
@@ -401,23 +384,6 @@ mark_set_callback (GtkTextBuffer     *buffer,
   update_statusbar (buffer, GTK_STATUSBAR (data));
 }
 
-static void
-update_resize_grip (GtkWidget           *widget,
-		    GdkEventWindowState *event,
-		    GtkStatusbar        *statusbar)
-{
-  if (event->changed_mask & (GDK_WINDOW_STATE_MAXIMIZED |
-			     GDK_WINDOW_STATE_FULLSCREEN))
-    {
-      gboolean maximized;
-
-      maximized = event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED |
-					     GDK_WINDOW_STATE_FULLSCREEN);
-      gtk_statusbar_set_has_resize_grip (statusbar, !maximized);
-    }
-}
-
-
 GtkWidget *
 do_appwindow (GtkWidget *do_widget)
 {
@@ -586,12 +552,6 @@ do_appwindow (GtkWidget *do_widget)
                                statusbar,
                                0);
 
-      g_signal_connect_object (window,
-			       "window_state_event",
-			       G_CALLBACK (update_resize_grip),
-			       statusbar,
-			       0);
-
       update_statusbar (buffer, GTK_STATUSBAR (statusbar));
     }
 

demos/gtk-demo/changedisplay.c

@@ -585,7 +585,7 @@ destroy_info (ChangeDisplayInfo *info)
 }
 
 static void
-destroy_cb (GtkObject          *object,
+destroy_cb (GObject            *object,
 	    ChangeDisplayInfo **info)
 {
   destroy_info (*info);
@@ -610,7 +610,7 @@ do_changedisplay (GtkWidget *do_widget)
 
       info->window = gtk_dialog_new_with_buttons ("Change Screen or display",
 					    GTK_WINDOW (do_widget),
-					    GTK_DIALOG_NO_SEPARATOR,
+					    0,
 					    GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
 					    "Change",         GTK_RESPONSE_OK,
 					    NULL);

demos/gtk-demo/colorsel.c

@@ -15,28 +15,16 @@ static GtkWidget *frame;
 /* Expose callback for the drawing area
  */
 static gboolean
-expose_event_callback (GtkWidget      *widget, 
-                       GdkEventExpose *event, 
-                       gpointer        data)
+draw_callback (GtkWidget *widget, 
+               cairo_t   *cr,
+               gpointer   data)
 {
-  GdkWindow *window;
+  GtkStyle *style;
 
-  window = gtk_widget_get_window (widget);
-  if (window)
-    {
-      GtkStyle *style;
-      cairo_t *cr;
+  style = gtk_widget_get_style (widget);
 
-      style = gtk_widget_get_style (widget);
-
-      cr = gdk_cairo_create (window);
-
-      gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
-      gdk_cairo_rectangle (cr, &event->area);
-      cairo_fill (cr);
-
-      cairo_destroy (cr);
-    }
+  gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
+  cairo_paint (cr);
 
   return TRUE;
 }
@@ -112,8 +100,8 @@ do_colorsel (GtkWidget *do_widget)
 
       da = gtk_drawing_area_new ();
 
-      g_signal_connect (da, "expose_event",
-			G_CALLBACK (expose_event_callback), NULL);
+      g_signal_connect (da, "draw",
+			G_CALLBACK (draw_callback), NULL);
 
       /* set a minimum size */
       gtk_widget_set_size_request (da, 200, 200);

demos/gtk-demo/combobox.c

@@ -238,12 +238,12 @@ is_capital_sensitive (GtkCellLayout   *cell_layout,
 }
 
 static void
-fill_combo_entry (GtkWidget *entry)
+fill_combo_entry (GtkWidget *combo)
 {
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "One");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "Two");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "2\302\275");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "Three");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "One");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Two");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "2\302\275");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Three");
 }
 
 
@@ -271,7 +271,7 @@ struct _MaskEntryClass
 };
 
 
-static void mask_entry_editable_init (GtkEditableClass *iface);
+static void mask_entry_editable_init (GtkEditableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
 			 G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
@@ -316,7 +316,7 @@ mask_entry_class_init (MaskEntryClass *klass)
 
 
 static void
-mask_entry_editable_init (GtkEditableClass *iface)
+mask_entry_editable_init (GtkEditableInterface *iface)
 {
   iface->changed = mask_entry_changed;
 }
@@ -428,7 +428,7 @@ do_combobox (GtkWidget *do_widget)
     gtk_container_set_border_width (GTK_CONTAINER (box), 5);
     gtk_container_add (GTK_CONTAINER (frame), box);
     
-    combo = gtk_combo_box_entry_new_text ();
+    combo = gtk_combo_box_text_new_with_entry ();
     fill_combo_entry (combo);
     gtk_container_add (GTK_CONTAINER (box), combo);
     

demos/gtk-demo/drawingarea.c

@@ -51,19 +51,12 @@ scribble_configure_event (GtkWidget         *widget,
 
 /* Redraw the screen from the surface */
 static gboolean
-scribble_expose_event (GtkWidget      *widget,
-                       GdkEventExpose *event,
-                       gpointer        data)
+scribble_draw (GtkWidget *widget,
+               cairo_t   *cr,
+               gpointer   data)
 {
-  cairo_t *cr;
-
-  cr = gdk_cairo_create (gtk_widget_get_window (widget));
-  
   cairo_set_source_surface (cr, surface, 0, 0);
-  gdk_cairo_rectangle (cr, &event->area);
-  cairo_fill (cr);
-
-  cairo_destroy (cr);
+  cairo_paint (cr);
 
   return FALSE;
 }
@@ -144,45 +137,38 @@ scribble_motion_notify_event (GtkWidget      *widget,
 
 
 static gboolean
-checkerboard_expose (GtkWidget      *da,
-                     GdkEventExpose *event,
-                     gpointer        data)
+checkerboard_draw (GtkWidget *da,
+                   cairo_t   *cr,
+                   gpointer   data)
 {
-  GtkAllocation allocation;
-  gint i, j, xcount, ycount;
-  cairo_t *cr;
+  gint i, j, xcount, ycount, width, height;
 
 #define CHECK_SIZE 10
 #define SPACING 2
 
-  /* At the start of an expose handler, a clip region of event->area
-   * is set on the window, and event->area has been cleared to the
+  /* At the start of a draw handler, a clip region has been set on
+   * the Cairo context, and the contents have been cleared to the
    * widget's background color. The docs for
    * gdk_window_begin_paint_region() give more details on how this
    * works.
    */
 
-  cr = gdk_cairo_create (gtk_widget_get_window (da));
-  gdk_cairo_rectangle (cr, &event->area);
-  cairo_clip (cr);
-
-  gtk_widget_get_allocation (da, &allocation);
   xcount = 0;
+  width = gtk_widget_get_allocated_width (da);
+  height = gtk_widget_get_allocated_height (da);
   i = SPACING;
-  while (i < allocation.width)
+  while (i < width)
     {
       j = SPACING;
       ycount = xcount % 2; /* start with even/odd depending on row */
-      while (j < allocation.height)
+      while (j < height)
         {
           if (ycount % 2)
             cairo_set_source_rgb (cr, 0.45777, 0, 0.45777);
           else
             cairo_set_source_rgb (cr, 1, 1, 1);
 
-          /* If we're outside event->area, this will do nothing.
-           * It might be mildly more efficient if we handled
-           * the clipping ourselves, but again we're feeling lazy.
+          /* If we're outside the clip, this will do nothing.
            */
           cairo_rectangle (cr, i, j, CHECK_SIZE, CHECK_SIZE);
           cairo_fill (cr);
@@ -195,8 +181,6 @@ checkerboard_expose (GtkWidget      *da,
       ++xcount;
     }
 
-  cairo_destroy (cr);
-
   /* return TRUE because we've handled this event, so no
    * further processing is required.
    */
@@ -209,7 +193,7 @@ close_window (void)
   window = NULL;
 
   if (surface)
-    g_object_unref (surface);
+    cairo_surface_destroy (surface);
   surface = NULL;
 }
 
@@ -255,8 +239,8 @@ do_drawingarea (GtkWidget *do_widget)
 
       gtk_container_add (GTK_CONTAINER (frame), da);
 
-      g_signal_connect (da, "expose-event",
-                        G_CALLBACK (checkerboard_expose), NULL);
+      g_signal_connect (da, "draw",
+                        G_CALLBACK (checkerboard_draw), NULL);
 
       /*
        * Create the scribble area
@@ -279,8 +263,8 @@ do_drawingarea (GtkWidget *do_widget)
 
       /* Signals used to handle backing surface */
 
-      g_signal_connect (da, "expose-event",
-                        G_CALLBACK (scribble_expose_event), NULL);
+      g_signal_connect (da, "draw",
+                        G_CALLBACK (scribble_draw), NULL);
       g_signal_connect (da,"configure-event",
                         G_CALLBACK (scribble_configure_event), NULL);
 

demos/gtk-demo/hypertext.c

@@ -113,8 +113,8 @@ key_press_event (GtkWidget *text_view,
 
   switch (event->keyval)
     {
-      case GDK_Return: 
-      case GDK_KP_Enter:
+      case GDK_KEY_Return: 
+      case GDK_KEY_KP_Enter:
         buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
         gtk_text_buffer_get_iter_at_mark (buffer, &iter, 
                                           gtk_text_buffer_get_insert (buffer));

demos/gtk-demo/iconview_edit.c

@@ -120,8 +120,8 @@ do_iconview_edit (GtkWidget *do_widget)
 
       gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
 					GTK_SELECTION_SINGLE);
-      gtk_icon_view_set_orientation (GTK_ICON_VIEW (icon_view),
-				     GTK_ORIENTATION_HORIZONTAL);
+      gtk_icon_view_set_item_orientation (GTK_ICON_VIEW (icon_view),
+				          GTK_ORIENTATION_HORIZONTAL);
       gtk_icon_view_set_columns (GTK_ICON_VIEW (icon_view), 2);
       gtk_icon_view_set_reorderable (GTK_ICON_VIEW (icon_view), TRUE);
 

demos/gtk-demo/images.c

@@ -261,7 +261,7 @@ start_progressive_loading (GtkWidget *image)
 }
 
 static void
-cleanup_callback (GtkObject *object,
+cleanup_callback (GObject   *object,
 		  gpointer   data)
 {
   if (load_timeout)

demos/gtk-demo/main.c

@@ -223,7 +223,6 @@ static gchar *types[] =
   "FALSE",
   "TRUE",
   "FILE ",
-  "GtkObject ",
   "GtkColorSelection ",
   "GtkWidget ",
   "GtkButton ",
@@ -279,7 +278,7 @@ static gchar *types[] =
   "GtkTreeStore ",
   "GtkEntry ",
   "GtkEditable ",
-  "GtkEditableClass ",
+  "GtkEditableInterface ",
   "GdkPixmap ",
   "GdkEventConfigure ",
   "GdkEventMotion ",

demos/gtk-demo/offscreen_window.c

@@ -45,8 +45,8 @@ static void     gtk_rotated_bin_size_allocate (GtkWidget       *widget,
                                                GtkAllocation   *allocation);
 static gboolean gtk_rotated_bin_damage        (GtkWidget       *widget,
                                                GdkEventExpose  *event);
-static gboolean gtk_rotated_bin_expose        (GtkWidget       *widget,
-                                               GdkEventExpose  *offscreen);
+static gboolean gtk_rotated_bin_draw          (GtkWidget       *widget,
+                                               cairo_t         *cr);
 
 static void     gtk_rotated_bin_add           (GtkContainer    *container,
                                                GtkWidget       *child);
@@ -150,7 +150,7 @@ gtk_rotated_bin_class_init (GtkRotatedBinClass *klass)
   widget_class->unrealize = gtk_rotated_bin_unrealize;
   widget_class->size_request = gtk_rotated_bin_size_request;
   widget_class->size_allocate = gtk_rotated_bin_size_allocate;
-  widget_class->expose_event = gtk_rotated_bin_expose;
+  widget_class->draw = gtk_rotated_bin_draw;
 
   g_signal_override_class_closure (g_signal_lookup ("damage-event", GTK_TYPE_WIDGET),
                                    GTK_TYPE_ROTATED_BIN,
@@ -252,10 +252,9 @@ gtk_rotated_bin_realize (GtkWidget *widget)
                         | GDK_LEAVE_NOTIFY_MASK;
 
   attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = gtk_widget_get_colormap (widget);
   attributes.wclass = GDK_INPUT_OUTPUT;
 
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
 
   window = gdk_window_new (gtk_widget_get_parent_window (widget),
                            &attributes, attributes_mask);
@@ -392,7 +391,8 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
   child_requisition.height = 0;
 
   if (bin->child && gtk_widget_get_visible (bin->child))
-    gtk_widget_size_request (bin->child, &child_requisition);
+    gtk_widget_get_preferred_size ( (bin->child),
+                               &child_requisition, NULL);
 
   s = sin (bin->angle);
   c = cos (bin->angle);
@@ -434,7 +434,8 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
       s = sin (bin->angle);
       c = cos (bin->angle);
 
-      gtk_widget_get_child_requisition (bin->child, &child_requisition);
+      gtk_widget_get_preferred_size (bin->child,
+                                     &child_requisition, NULL);
       child_allocation.x = 0;
       child_allocation.y = 0;
       child_allocation.height = child_requisition.height;
@@ -469,65 +470,60 @@ gtk_rotated_bin_damage (GtkWidget      *widget,
 }
 
 static gboolean
-gtk_rotated_bin_expose (GtkWidget      *widget,
-                        GdkEventExpose *event)
+gtk_rotated_bin_draw (GtkWidget *widget,
+                      cairo_t   *cr)
 {
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
   GdkWindow *window;
-  gint width, height;
   gdouble s, c;
   gdouble w, h;
 
-  if (gtk_widget_is_drawable (widget))
+  window = gtk_widget_get_window (widget);
+  if (gtk_cairo_should_draw_window (cr, window))
     {
-      window = gtk_widget_get_window (widget);
-      if (event->window == window)
+      cairo_surface_t *surface;
+      GtkAllocation child_area;
+
+      if (bin->child && gtk_widget_get_visible (bin->child))
         {
-          GdkPixmap *pixmap;
-          GtkAllocation child_area;
-          cairo_t *cr;
+          surface = gdk_offscreen_window_get_surface (bin->offscreen_window);
+          gtk_widget_get_allocation (bin->child, &child_area);
 
-          if (bin->child && gtk_widget_get_visible (bin->child))
-            {
-              pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
-              gtk_widget_get_allocation (bin->child, &child_area);
+          /* transform */
+          s = sin (bin->angle);
+          c = cos (bin->angle);
+          w = c * child_area.width + s * child_area.height;
+          h = s * child_area.width + c * child_area.height;
 
-              cr = gdk_cairo_create (window);
+          cairo_translate (cr, (w - child_area.width) / 2, (h - child_area.height) / 2);
+          cairo_translate (cr, child_area.width / 2, child_area.height / 2);
+          cairo_rotate (cr, bin->angle);
+          cairo_translate (cr, -child_area.width / 2, -child_area.height / 2);
 
-              /* transform */
-              s = sin (bin->angle);
-              c = cos (bin->angle);
-              w = c * child_area.width + s * child_area.height;
-              h = s * child_area.width + c * child_area.height;
-
-              cairo_translate (cr, (w - child_area.width) / 2, (h - child_area.height) / 2);
-              cairo_translate (cr, child_area.width / 2, child_area.height / 2);
-              cairo_rotate (cr, bin->angle);
-              cairo_translate (cr, -child_area.width / 2, -child_area.height / 2);
-
-              /* clip */
-              gdk_drawable_get_size (pixmap, &width, &height);
-              cairo_rectangle (cr, 0, 0, width, height);
-              cairo_clip (cr);
-              /* paint */
-              gdk_cairo_set_source_pixmap (cr, pixmap, 0, 0);
-              cairo_paint (cr);
-
-              cairo_destroy (cr);
-            }
+          /* clip */
+          cairo_rectangle (cr,
+                           0, 0,
+                           gdk_window_get_width (bin->offscreen_window),
+                           gdk_window_get_height (bin->offscreen_window));
+          cairo_clip (cr);
+          /* paint */
+          cairo_set_source_surface (cr, surface, 0, 0);
+          cairo_paint (cr);
         }
-      else if (event->window == bin->offscreen_window)
-        {
-          gtk_paint_flat_box (gtk_widget_get_style (widget), event->window,
-                              GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-                              &event->area, widget, "blah",
-                              0, 0, -1, -1);
+    }
+  if (gtk_cairo_should_draw_window (cr, bin->offscreen_window))
+    {
+      gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
+                          GTK_STATE_NORMAL, GTK_SHADOW_NONE,
+                          widget, "blah",
+                          0, 0,
+                          gdk_window_get_width (bin->offscreen_window),
+                          gdk_window_get_height (bin->offscreen_window));
 
-          if (bin->child)
-            gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                            bin->child,
-                                            event);
-        }
+      if (bin->child)
+        gtk_container_propagate_draw (GTK_CONTAINER (widget),
+                                      bin->child,
+                                      cr);
     }
 
   return FALSE;

demos/gtk-demo/offscreen_window2.c

@@ -41,8 +41,8 @@ static void     gtk_mirror_bin_size_allocate (GtkWidget       *widget,
                                                GtkAllocation   *allocation);
 static gboolean gtk_mirror_bin_damage        (GtkWidget       *widget,
                                                GdkEventExpose  *event);
-static gboolean gtk_mirror_bin_expose        (GtkWidget       *widget,
-                                               GdkEventExpose  *offscreen);
+static gboolean gtk_mirror_bin_draw          (GtkWidget       *widget,
+                                              cairo_t         *cr);
 
 static void     gtk_mirror_bin_add           (GtkContainer    *container,
                                                GtkWidget       *child);
@@ -88,7 +88,7 @@ gtk_mirror_bin_class_init (GtkMirrorBinClass *klass)
   widget_class->unrealize = gtk_mirror_bin_unrealize;
   widget_class->size_request = gtk_mirror_bin_size_request;
   widget_class->size_allocate = gtk_mirror_bin_size_allocate;
-  widget_class->expose_event = gtk_mirror_bin_expose;
+  widget_class->draw = gtk_mirror_bin_draw;
 
   g_signal_override_class_closure (g_signal_lookup ("damage-event", GTK_TYPE_WIDGET),
                                    GTK_TYPE_MIRROR_BIN,
@@ -190,10 +190,9 @@ gtk_mirror_bin_realize (GtkWidget *widget)
                         | GDK_LEAVE_NOTIFY_MASK;
 
   attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = gtk_widget_get_colormap (widget);
   attributes.wclass = GDK_INPUT_OUTPUT;
 
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
 
   window = gdk_window_new (gtk_widget_get_parent_window (widget),
                            &attributes, attributes_mask);
@@ -316,7 +315,8 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
   child_requisition.height = 0;
 
   if (bin->child && gtk_widget_get_visible (bin->child))
-    gtk_widget_size_request (bin->child, &child_requisition);
+    gtk_widget_get_preferred_size ( (bin->child),
+                               &child_requisition, NULL);
 
   border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
   requisition->width = border_width * 2 + child_requisition.width + 10;
@@ -349,7 +349,8 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
       GtkRequisition child_requisition;
       GtkAllocation child_allocation;
 
-      gtk_widget_get_child_requisition (bin->child, &child_requisition);
+      gtk_widget_get_preferred_size (bin->child,
+                                     &child_requisition, NULL);
       child_allocation.x = 0;
       child_allocation.y = 0;
       child_allocation.height = child_requisition.height;
@@ -375,78 +376,63 @@ gtk_mirror_bin_damage (GtkWidget      *widget,
 }
 
 static gboolean
-gtk_mirror_bin_expose (GtkWidget      *widget,
-                        GdkEventExpose *event)
+gtk_mirror_bin_draw (GtkWidget *widget,
+                     cairo_t   *cr)
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   GdkWindow *window;
-  gint width, height;
 
-  if (gtk_widget_is_drawable (widget))
+  window = gtk_widget_get_window (widget);
+  if (gtk_cairo_should_draw_window (cr, window))
     {
-      window = gtk_widget_get_window (widget);
-      if (event->window == window)
+      cairo_surface_t *surface;
+      cairo_matrix_t matrix;
+      cairo_pattern_t *mask;
+      int height;
+
+      if (bin->child && gtk_widget_get_visible (bin->child))
         {
-          GdkPixmap *pixmap;
-          cairo_t *cr;
-          cairo_matrix_t matrix;
-          cairo_pattern_t *mask;
+          surface = gdk_offscreen_window_get_surface (bin->offscreen_window);
+          height = gdk_window_get_height (bin->offscreen_window);
 
-          if (bin->child && gtk_widget_get_visible (bin->child))
-            {
-              pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
-              gdk_drawable_get_size (pixmap, &width, &height);
+          /* paint the offscreen child */
+          cairo_set_source_surface (cr, surface, 0, 0);
+          cairo_paint (cr);
 
-              cr = gdk_cairo_create (window);
+          cairo_matrix_init (&matrix, 1.0, 0.0, 0.3, 1.0, 0.0, 0.0);
+          cairo_matrix_scale (&matrix, 1.0, -1.0);
+          cairo_matrix_translate (&matrix, -10, - 3 * height - 10);
+          cairo_transform (cr, &matrix);
 
-              cairo_save (cr);
+          cairo_set_source_surface (cr, surface, 0, height);
 
-              cairo_rectangle (cr, 0, 0, width, height);
-              cairo_clip (cr);
+          /* create linear gradient as mask-pattern to fade out the source */
+          mask = cairo_pattern_create_linear (0.0, height, 0.0, 2*height);
+          cairo_pattern_add_color_stop_rgba (mask, 0.0,  0.0, 0.0, 0.0, 0.0);
+          cairo_pattern_add_color_stop_rgba (mask, 0.25, 0.0, 0.0, 0.0, 0.01);
+          cairo_pattern_add_color_stop_rgba (mask, 0.5,  0.0, 0.0, 0.0, 0.25);
+          cairo_pattern_add_color_stop_rgba (mask, 0.75, 0.0, 0.0, 0.0, 0.5);
+          cairo_pattern_add_color_stop_rgba (mask, 1.0,  0.0, 0.0, 0.0, 1.0);
 
-              /* paint the offscreen child */
-              gdk_cairo_set_source_pixmap (cr, pixmap, 0, 0);
-              cairo_paint (cr);
+          /* paint the reflection */
+          cairo_mask (cr, mask);
 
-              cairo_restore (cr);
-
-              cairo_matrix_init (&matrix, 1.0, 0.0, 0.3, 1.0, 0.0, 0.0);
-              cairo_matrix_scale (&matrix, 1.0, -1.0);
-              cairo_matrix_translate (&matrix, -10, - 3 * height - 10);
-              cairo_transform (cr, &matrix);
-
-              cairo_rectangle (cr, 0, height, width, height);
-              cairo_clip (cr);
-
-              gdk_cairo_set_source_pixmap (cr, pixmap, 0, height);
-
-              /* create linear gradient as mask-pattern to fade out the source */
-              mask = cairo_pattern_create_linear (0.0, height, 0.0, 2*height);
-              cairo_pattern_add_color_stop_rgba (mask, 0.0,  0.0, 0.0, 0.0, 0.0);
-              cairo_pattern_add_color_stop_rgba (mask, 0.25, 0.0, 0.0, 0.0, 0.01);
-              cairo_pattern_add_color_stop_rgba (mask, 0.5,  0.0, 0.0, 0.0, 0.25);
-              cairo_pattern_add_color_stop_rgba (mask, 0.75, 0.0, 0.0, 0.0, 0.5);
-              cairo_pattern_add_color_stop_rgba (mask, 1.0,  0.0, 0.0, 0.0, 1.0);
-
-              /* paint the reflection */
-              cairo_mask (cr, mask);
-
-              cairo_pattern_destroy (mask);
-              cairo_destroy (cr);
-            }
+          cairo_pattern_destroy (mask);
         }
-      else if (event->window == bin->offscreen_window)
-        {
-          gtk_paint_flat_box (gtk_widget_get_style (widget), event->window,
-                              GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-                              &event->area, widget, "blah",
-                              0, 0, -1, -1);
+    }
+  else if (gtk_cairo_should_draw_window (cr, bin->offscreen_window))
+    {
+      gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
+                          GTK_STATE_NORMAL, GTK_SHADOW_NONE,
+                          widget, "blah",
+                          0, 0,
+                          gdk_window_get_width (bin->offscreen_window),
+                          gdk_window_get_height (bin->offscreen_window));
 
-          if (bin->child)
-            gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                            bin->child,
-                                            event);
-        }
+      if (bin->child)
+        gtk_container_propagate_draw (GTK_CONTAINER (widget),
+                                      bin->child,
+                                      cr);
     }
 
   return FALSE;

demos/gtk-demo/pixbufs.c

@@ -96,19 +96,12 @@ load_pixbufs (GError **error)
 
 /* Expose callback for the drawing area */
 static gint
-expose_cb (GtkWidget      *widget,
-           GdkEventExpose *event,
-           gpointer        data)
+draw_cb (GtkWidget *widget,
+         cairo_t   *cr,
+         gpointer   data)
 {
-  cairo_t *cr;
-
-  cr = gdk_cairo_create (event->window);
-
   gdk_cairo_set_source_pixbuf (cr, frame, 0, 0);
-  gdk_cairo_rectangle (cr, &event->area);
-  cairo_fill (cr);
-
-  cairo_destroy (cr);
+  cairo_paint (cr);
 
   return TRUE;
 }
@@ -193,7 +186,7 @@ timeout (gpointer data)
 static guint timeout_id;
 
 static void
-cleanup_callback (GtkObject *object,
+cleanup_callback (GObject   *object,
                   gpointer   data)
 {
   g_source_remove (timeout_id);
@@ -246,8 +239,8 @@ do_pixbufs (GtkWidget *do_widget)
 
           da = gtk_drawing_area_new ();
 
-          g_signal_connect (da, "expose-event",
-                            G_CALLBACK (expose_cb), NULL);
+          g_signal_connect (da, "draw",
+                            G_CALLBACK (draw_cb), NULL);
 
           gtk_container_add (GTK_CONTAINER (window), da);
 

demos/gtk-demo/rotated_text.c

@@ -91,39 +91,32 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)
 }
 
 static gboolean
-rotated_text_expose_event (GtkWidget      *widget,
-			   GdkEventExpose *event,
-			   gpointer	   data)
+rotated_text_draw (GtkWidget *widget,
+                   cairo_t   *cr,
+		   gpointer   data)
 {
 #define RADIUS 150
 #define N_WORDS 5
 #define FONT "Serif 18"
 
-  GtkAllocation allocation;
-
   PangoContext *context;
   PangoLayout *layout;
   PangoFontDescription *desc;
 
-  cairo_t *cr;
   cairo_pattern_t *pattern;
 
   PangoAttrList *attrs;
 
-  int width;
-  int height;
   double device_radius;
+  int width, height;
   int i;
 
-  gtk_widget_get_allocation (widget, &allocation);
-  width = allocation.width;
-  height = allocation.height;
-
   /* Create a cairo context and set up a transformation matrix so that the user
    * space coordinates for the centered square where we draw are [-RADIUS, RADIUS],
    * [-RADIUS, RADIUS].
    * We first center, then change the scale. */
-  cr = gdk_cairo_create (gtk_widget_get_window (widget));
+  width = gtk_widget_get_allocated_width (widget);
+  height = gtk_widget_get_allocated_height (widget);
   device_radius = MIN (width, height) / 2.;
   cairo_translate (cr,
 		   device_radius + (width - 2 * device_radius) / 2,
@@ -173,7 +166,6 @@ rotated_text_expose_event (GtkWidget      *widget,
   g_object_unref (layout);
   g_object_unref (context);
   cairo_pattern_destroy (pattern);
-  cairo_destroy (cr);
   
   return FALSE;
 }
@@ -209,8 +201,8 @@ do_rotated_text (GtkWidget *do_widget)
       /* This overrides the background color from the theme */
       gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, &white);
 
-      g_signal_connect (drawing_area, "expose-event",
-			G_CALLBACK (rotated_text_expose_event), NULL);
+      g_signal_connect (drawing_area, "draw",
+			G_CALLBACK (rotated_text_draw), NULL);
 
       /* And a label */
 

demos/gtk-demo/sizegroup.c

@@ -25,10 +25,10 @@ create_combo_box (const char **strings)
   GtkWidget *combo_box;
   const char **str;
 
-  combo_box = gtk_combo_box_new_text ();
+  combo_box = gtk_combo_box_text_new ();
   
   for (str = strings; *str; str++)
-    gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), *str);
+    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), *str);
 
   gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
 

demos/gtk-demo/textview.c

@@ -371,11 +371,11 @@ attach_widgets (GtkTextView *text_view)
         }
       else if (i == 1)
         {
-          widget = gtk_combo_box_new_text ();
+          widget = gtk_combo_box_text_new ();
 
-          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 1");
-          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 2");
-          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 3");
+          gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Option 1");
+          gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Option 2");
+          gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Option 3");
         }
       else if (i == 2)
         {

demos/gtk-demo/toolpalette.c

@@ -81,22 +81,13 @@ canvas_item_draw (const CanvasItem *item,
 }
 
 static gboolean
-canvas_expose_event (GtkWidget      *widget,
-                     GdkEventExpose *event)
+canvas_draw (GtkWidget *widget,
+             cairo_t   *cr)
 {
-  GtkAllocation allocation;
-  cairo_t *cr;
   GList *iter;
 
-  cr = gdk_cairo_create (gtk_widget_get_window (widget));
-  gdk_cairo_region (cr, event->region);
-  cairo_clip (cr);
-
-  gtk_widget_get_allocation (widget, &allocation);
-
   cairo_set_source_rgb (cr, 1, 1, 1);
-  cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
-  cairo_fill (cr);
+  cairo_paint (cr);
 
   for (iter = canvas_items; iter; iter = iter->next)
     canvas_item_draw (iter->data, cr, FALSE);
@@ -104,8 +95,6 @@ canvas_expose_event (GtkWidget      *widget,
   if (drop_item)
     canvas_item_draw (drop_item, cr, TRUE);
 
-  cairo_destroy (cr);
-
   return TRUE;
 }
 
@@ -572,7 +561,7 @@ do_toolpalette (GtkWidget *do_widget)
       gtk_widget_set_app_paintable (contents, TRUE);
 
       g_object_connect (contents,
-                        "signal::expose-event", canvas_expose_event, NULL,
+                        "signal::draw", canvas_draw, NULL,
                         "signal::drag-data-received", passive_canvas_drag_data_received, NULL,
                         NULL);
 
@@ -600,7 +589,7 @@ do_toolpalette (GtkWidget *do_widget)
       gtk_widget_set_app_paintable (contents, TRUE);
 
       g_object_connect (contents,
-                        "signal::expose-event", canvas_expose_event, NULL,
+                        "signal::draw", canvas_draw, NULL,
                         "signal::drag-motion", interactive_canvas_drag_motion, NULL,
                         "signal::drag-data-received", interactive_canvas_drag_data_received, NULL,
                         "signal::drag-leave", interactive_canvas_drag_leave, NULL,

demos/pixbuf-demo.c

@@ -86,17 +86,11 @@ load_pixbufs (void)
 }
 
 /* Expose callback for the drawing area */
-static gint
-expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+static gboolean
+draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
 {
-        cairo_t *cr;
-         
-        cr = gdk_cairo_create (event->window);
         gdk_cairo_set_source_pixbuf (cr, frame, 0, 0);
-        gdk_cairo_rectangle (cr, &event->area);
-        cairo_fill (cr);
-
-        cairo_destroy (cr);
+        cairo_paint (cr);
 
 	return TRUE;
 }
@@ -179,7 +173,7 @@ static guint timeout_id;
 
 /* Destroy handler for the window */
 static void
-destroy_cb (GtkObject *object, gpointer data)
+destroy_cb (GObject *object, gpointer data)
 {
 	g_source_remove (timeout_id);
 	timeout_id = 0;
@@ -214,8 +208,8 @@ main (int argc, char **argv)
 
 	da = gtk_drawing_area_new ();
 
-	g_signal_connect (da, "expose_event",
-			  G_CALLBACK (expose_cb), NULL);
+	g_signal_connect (da, "draw",
+			  G_CALLBACK (draw_cb), NULL);
 
 	gtk_container_add (GTK_CONTAINER (window), da);
 

demos/testgtk/main.c

@@ -369,16 +369,16 @@ main (int argc, char **argv)
 			    gtk_label_new ("Source"));
 
   tag = gtk_text_buffer_create_tag (info_buffer, "title");
-  gtk_object_set (GTK_OBJECT (tag),
-		 "font", "Sans 18",
-		 NULL);
+  g_object_set (tag,
+                "font", "Sans 18",
+                NULL);
 
   tag = gtk_text_buffer_create_tag (info_buffer, "source");
-  gtk_object_set (GTK_OBJECT (tag),
-		  "font", "Courier 10",
-		  "pixels_above_lines", 0,
-		  "pixels_below_lines", 0,
-		 NULL);
+  g_object_set (tag,
+                "font", "Courier 10",
+                "pixels_above_lines", 0,
+                "pixels_below_lines", 0,
+                NULL);
 
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   gtk_widget_show_all (window);

demos/testpixbuf-color.c

@@ -112,8 +112,8 @@ main (int argc, char **argv)
 	gtk_init (&argc, &argv);
 
 	root = gdk_get_default_root_window ();
-	pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-					       0, 0, 0, 0, 150, 160);
+	pixbuf = gdk_pixbuf_get_from_window (root,
+					     0, 0, 150, 160);
 
 	/* PASS */
 	g_debug ("try to save PNG with a profile");

demos/testpixbuf-save.c

@@ -307,21 +307,16 @@ close_app (GtkWidget *widget, gpointer data)
         return TRUE;
 }
 
-static int
-expose_cb (GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data)
+static gboolean
+draw_cb (GtkWidget *drawing_area, cairo_t *cr, gpointer data)
 {
         GdkPixbuf *pixbuf;
-        cairo_t *cr;
          
         pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area),
 						  "pixbuf");
 
-        cr = gdk_cairo_create (evt->window);
         gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
-        gdk_cairo_rectangle (cr, &evt->area);
-        cairo_fill (cr);
-
-        cairo_destroy (cr);
+        cairo_paint (cr);
 
         return FALSE;
 }
@@ -340,8 +335,8 @@ configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
                 GdkPixbuf *new_pixbuf;
 
                 root = gdk_get_default_root_window ();
-                new_pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-                                                           0, 0, 0, 0, evt->width, evt->height);
+                new_pixbuf = gdk_pixbuf_get_from_window (root,
+                                                         0, 0, evt->width, evt->height);
                 g_object_set_data_full (G_OBJECT (drawing_area), "pixbuf", new_pixbuf,
                                         (GDestroyNotify) g_object_unref);
         }
@@ -361,8 +356,8 @@ main (int argc, char **argv)
         gtk_init (&argc, &argv);   
 
         root = gdk_get_default_root_window ();
-        pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-                                               0, 0, 0, 0, 150, 160);
+        pixbuf = gdk_pixbuf_get_from_window (root,
+                                             0, 0, 150, 160);
    
         window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
         g_signal_connect (window, "delete_event",
@@ -377,8 +372,8 @@ main (int argc, char **argv)
         gtk_widget_set_size_request (GTK_WIDGET (drawing_area),
                                      gdk_pixbuf_get_width (pixbuf),
                                      gdk_pixbuf_get_height (pixbuf));
-        g_signal_connect (drawing_area, "expose_event",
-			  G_CALLBACK (expose_cb), NULL);
+        g_signal_connect (drawing_area, "draw",
+			  G_CALLBACK (draw_cb), NULL);
 
         g_signal_connect (drawing_area, "configure_event",
 			  G_CALLBACK (configure_cb), NULL);

demos/testpixbuf-scale.c

@@ -32,33 +32,27 @@ overall_changed_cb (GtkAdjustment *adjustment, gpointer data)
 }
 
 gboolean
-expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
 {
-  GtkAllocation allocation;
   GdkPixbuf *dest;
-  cairo_t *cr;
+  int width, height;
 
-  gdk_window_set_back_pixmap (gtk_widget_get_window (widget),
-                              NULL, FALSE);
+  width = gtk_widget_get_allocated_width (widget);
+  height = gtk_widget_get_allocated_height (widget);
 
-  dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, event->area.width, event->area.height);
+  dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
 
-  gtk_widget_get_allocation (widget, &allocation);
   gdk_pixbuf_composite_color (pixbuf, dest,
-			      0, 0, event->area.width, event->area.height,
-			      -event->area.x, -event->area.y,
-                              (double) allocation.width / gdk_pixbuf_get_width (pixbuf),
-                              (double) allocation.height / gdk_pixbuf_get_height (pixbuf),
+			      0, 0, width, height,
+			      0, 0,
+                              (double) width / gdk_pixbuf_get_width (pixbuf),
+                              (double) height / gdk_pixbuf_get_height (pixbuf),
 			      interp_type, overall_alpha,
-			      event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
-
-  cr = gdk_cairo_create (event->window);
+			      0, 0, 16, 0xaaaaaa, 0x555555);
 
   gdk_cairo_set_source_pixbuf (cr, dest, 0, 0);
-  gdk_cairo_rectangle (cr, &event->area);
-  cairo_fill (cr);
+  cairo_paint (cr);
 
-  cairo_destroy (cr);
   g_object_unref (dest);
   
   return TRUE;
@@ -107,12 +101,12 @@ main(int argc, char **argv)
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (window), vbox);
 
-        combo_box = gtk_combo_box_new_text ();
+        combo_box = gtk_combo_box_text_new ();
 
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "NEAREST");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "BILINEAR");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "TILES");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "HYPER");
+        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), "NEAREST");
+        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), "BILINEAR");
+        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), "TILES");
+        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), "HYPER");
 
         gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 1);
 
@@ -129,7 +123,7 @@ main(int argc, char **argv)
 	label = gtk_label_new ("Overall Alpha:");
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
-	adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (overall_alpha, 0, 255, 1, 10, 0));
+	adjustment = gtk_adjustment_new (overall_alpha, 0, 255, 1, 10, 0);
 	g_signal_connect (adjustment, "value_changed",
 			  G_CALLBACK (overall_changed_cb), NULL);
 	
@@ -141,13 +135,14 @@ main(int argc, char **argv)
 	gtk_widget_show_all (vbox);
 
 	/* Compute the size without the drawing area, so we know how big to make the default size */
-	gtk_widget_size_request (vbox, &scratch_requisition);
+        gtk_widget_get_preferred_size ( (vbox),
+                                   &scratch_requisition, NULL);
 
 	darea = gtk_drawing_area_new ();
 	gtk_box_pack_start (GTK_BOX (vbox), darea, TRUE, TRUE, 0);
 
-	g_signal_connect (darea, "expose_event",
-			  G_CALLBACK (expose_cb), NULL);
+	g_signal_connect (darea, "draw",
+			  G_CALLBACK (draw_cb), NULL);
 
 	gtk_window_set_default_size (GTK_WINDOW (window),
 				     gdk_pixbuf_get_width (pixbuf),

docs/CODING-STYLE

@@ -0,0 +1,635 @@
+GTK+ Coding Style
+-------------------------------------------------------------------------------
+
+This document is intended to be a short description of the preferred
+coding style to be used for the GTK+ source code. It was strongly
+inspired by Clutter's CODING_STYLE.
+
+Coding style is a matter of consistency, readability and maintainance;
+coding style is also completely arbitrary and a matter of taste. This
+document will use examples at the very least to provide authoritative
+and consistent answers to common questions regarding the coding style,
+and will also try to identify the allowed exceptions.
+
+The examples will show the preferred coding style; the negative examples
+will be clearly identified. Please, don't submit code to GTK+ that
+looks like any of these.
+
+Part of the rationales for these coding style rules are available either
+in the kernel CodingStyle document or in Cairo's CODING_STYLE one.
+
+When in doubt, check the surrounding code and try to imitate it.
+
++ Line width
+
+The maximum line width for source files is 80 characters, whenever possible.
+Longer lines are usually an indication that you either need a function
+or a pre-processor macro.
+
++ Indentation
+
+Each new level is indented 2 or more spaces than the previous level:
+
+  if (condition)
+    single_statement ();
+
+This can only be achieved using space characters. It may not be achieved
+using tab characters alone, or using a combination of spaces and tabs.
+
+Do not change the editor's configuration to change the meaning of a
+tab character (see below); code using tabs to indent will not be accepted
+into GTK+.
+
+Even if two spaces for each indentation level allows deeper nesting than
+8 spaces, GTK+ favours self-documenting function names that can take
+quite some space. For this reason you should avoid deeply nested code.
+
++ Tab characters
+
+The tab character must always be expanded to spaces. If a literal
+tab must be used inside the source, the tab must always be interpreted
+according to its traditional meaning:
+
+	Advance to the next column which is a multiple of 8.
+        [ these two lines should be aligned ]
+
++ Braces
+
+Curly braces should not be used for single statement blocks:
+
+  if (condition)
+    single_statement ();
+  else
+    another_single_statement (arg1);
+
+In case of multiple statements, curly braces should be put on another
+indentation level:
+
+  if (condition)
+    {
+      statement_1 ();
+      statement_2 ();
+      statement_3 ();
+    }
+
+The "no block for single statements" rule has only four exceptions:
+
+  ①  if the single statement covers multiple lines, e.g. for functions with
+     many arguments, and it is followed by else or else if:
+
+  /* valid */
+  if (condition)
+    {
+      a_single_statement_with_many_arguments (some_lengthy_argument,
+                                              another_lengthy_argument,
+                                              and_another_one,
+                                              plus_one);
+    }
+  else
+    another_single_statement (arg1, arg2);
+
+  ②  if the condition is composed of many lines:
+
+  /* valid */
+  if (condition1 ||
+      (condition2 && condition3) ||
+      condition4 ||
+      (condition5 && (condition6 || condition7)))
+    {
+      a_single_statement ();
+    }
+
+  ③  Nested if's, in which case the block should be placed on the
+     outermost if:
+
+  /* valid */
+  if (condition)
+    {
+      if (another_condition)
+        single_statement ();
+      else
+        another_single_statement ();
+    }
+
+  /* invalid */
+  if (condition)
+    if (another_condition)
+      single_statement ();
+    else if (yet_another_condition)
+      another_single_statement ();
+
+  ④  If either side of an if-else statement has braces, both sides
+     should, to match up indentation:
+
+  /* valid */
+  if (condition)
+    {
+      foo ();
+      bar ();
+    }
+  else
+    {
+      baz ();
+    }
+
+  /* invalid */
+  if (condition)
+    {
+      foo ();
+      bar ();
+    }
+  else
+    baz ();
+
+In general, new blocks should be placed on a new indentation level,
+like:
+
+  int retval = 0;
+
+  statement_1 ();
+  statement_2 ();
+
+  {
+    int var1 = 42;
+    gboolean res = FALSE;
+
+    res = statement_3 (var1);
+
+    retval = res ? -1 : 1;
+  }
+
+While curly braces for function definitions should rest on a new line
+they should not add an indentation level:
+
+  /* valid */
+  static void
+  my_function (int argument)
+  {
+    do_my_things ();
+  }
+
+  /* invalid */
+  static void
+  my_function (int argument) {
+    do_my_things ();
+  }
+
+  /* invalid */
+  static void
+  my_function (int argument)
+    {
+      do_my_things ();
+    }
+
+Curly braces must not be placed on the same line as a condition:
+
+  /* invalid */
+  if (condition) {
+    statement_1 ();
+    statement_2 ();
+  }
++ Conditions
+
+Do not check boolean values for equality:
+
+  /* invalid */
+  if (condition == TRUE)
+    do_foo ();
+
+  /* valid */
+  if (another_condition)
+    do_bar ();
+
+Even if C handles NULL equality like a boolean, be explicit:
+
+  /* valid */
+  if (some_pointer == NULL)
+    do_blah ();
+
+  /* invalid */
+  if (some_other_pointer)
+    do_blurp ();
+
+In case of conditions split over multiple lines, the logical operators should
+always go at the end of the line:
+
+  /* invalid */
+  if (condition1
+      || condition2
+      || condition3)
+    {
+      do_foo ();
+    }
+
+  /* valid */
+  if (condition1 &&
+      condition2 &&
+      (condition3 || (condition4 && condition5)))
+    {
+      do_blah ();
+    }
+
++ Functions
+
+Functions should be declared by placing the returned value on a separate
+line from the function name:
+
+  void
+  my_function (void)
+  {
+  }
+
+The arguments list must be broken into a new line for each argument,
+with the argument names right aligned, taking into account pointers:
+
+  void
+  my_function (some_type_t     type,
+               another_type_t *a_pointer,
+               final_type_t    another_type)
+  {
+  }
+
+The alignment also holds when invoking a function without breaking the
+80 characters limit:
+
+  align_function_arguments (first_argument,
+                            second_argument,
+                            third_argument);
+
+To respect the 80 characters limit do not break the function name from
+the arguments:
+
+  /* invalid */
+  a_very_long_function_name_with_long_parameters
+    (argument_the_first, argument_the_second);
+
+  /* valid */
+  first_a = argument_the_first;
+  second_a = argument_the_second;
+  a_very_long_function_name_with_long_parameters (first_a, second_a);
+
++ Whitespace
+
+Always put a space before a parenthesis but never after:
+
+  /* valid */
+  if (condition)
+    do_my_things ();
+
+  /* valid */
+  switch (condition)
+    {
+    }
+
+  /* invalid */
+  if(condition)
+    do_my_things();
+
+  /* invalid */
+  if ( condition )
+    do_my_things ( );
+
+A switch() should open a block on a new indentation level, and each case
+should start on the same indentation level as the curly braces, with the
+case block on a new indentation level:
+
+  /* valid */
+  switch (condition)
+    {
+    case FOO:
+      do_foo ();
+      break;
+
+    case BAR:
+      do_bar ();
+      break;
+    }
+
+  /* invalid */
+  switch (condition) {
+    case FOO: do_foo (); break;
+    case BAR: do_bar (); break;
+  }
+
+  /* invalid */
+  switch (condition)
+    {
+    case FOO: do_foo ();
+      break;
+    case BAR: do_bar ();
+      break;
+    }
+
+  /* invalid */
+  switch (condition)
+    {
+      case FOO:
+      do_foo ();
+      break;
+      case BAR:
+      do_bar ();
+      break;
+    }
+
+It is preferable, though not mandatory, to separate the various cases with
+a newline:
+
+  switch (condition)
+    {
+    case FOO:
+      do_foo ();
+      break;
+
+    case BAR:
+      do_bar ();
+      break;
+
+    default:
+      do_default ();
+    }
+
+The 'break' statement for the default: case is not mandatory.
+
+If a case block needs to declare new variables, the same rules as the
+inner blocks (see above) apply; the break statement should be placed
+outside of the inner block:
+
+  switch (condition)
+    {
+    case FOO:
+      {
+        int foo;
+
+        foo = do_foo ();
+      }
+      break;
+
+    ...
+    }
+
+When declaring a structure type use newlines to separate logical sections
+of the structure:
+
+  struct _GtkWrapBoxPrivate
+  {
+    GtkOrientation        orientation;
+    GtkWrapAllocationMode mode;
+
+    GtkWrapBoxSpreading   horizontal_spreading;
+    GtkWrapBoxSpreading   vertical_spreading;
+
+    guint16               vertical_spacing;
+    guint16               horizontal_spacing;
+
+    guint16               minimum_line_children;
+    guint16               natural_line_children;
+
+    GList                *children;
+  };
+
+
+Do not eliminate whitespace and newlines just because something would
+fit on 80 characters:
+
+  /* invalid */
+  if (condition) foo (); else bar ();
+
+Do eliminate trailing whitespace on any line, preferably as a separate
+patch or commit. Never use empty lines at the beginning or at the end of
+a file.
+
+Do enable the default git pre-commit hook that detect trailing
+whitespace for you and help you to avoid corrupting GTK+'s tree with
+it. Do that as follows:
+
+  chmod a+x .git/hooks/pre-commit
+
+You might also find the git-stripspace utility helpful which acts as a
+filter to remove trailing whitespace as well as initial, final, and
+duplicate blank lines.
+
++ Headers
+
+Headers are special, for GTK+, in that they don't have to obey the
+80 characters limit. The only major rule for headers is that the function
+definitions should be vertically aligned in three columns:
+
+  return value          function_name           (type   argument,
+                                                 type   argument,
+                                                 type   argument);
+
+The maximum width of each column is given by the longest element in the
+column:
+
+  void                  gtk_type_set_property (GtkType      *type,
+                                               const gchar  *value,
+                                               GError      **error);
+  G_CONST_RETURN gchar *gtk_type_get_property (GtkType      *type);
+
+It is also possible to align the columns to the next tab:
+
+  void          gtk_type_set_prop           (GtkType *type,
+                                             gfloat   value);
+  gfloat        gtk_type_get_prop           (GtkType *type);
+  gint          gtk_type_update_foobar      (GtkType *type);
+
+Public headers should never be included directly:
+
+  #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+  #error "Only <gtk/gtk.h> can be included directly."
+  #endif
+
+All headers should have inclusion guards (for internal usage)
+and C++ guards:
+
+  #ifndef __GTK_FOO_H__
+  #define __GTK_FOO_H__
+
+  #include <gtk/gtk-bar.h>
+
+  G_BEGIN_DECLS
+
+  ...
+
+  G_END_DECLS
+
+  #endif /* __GTK_FOO_H__ */
+
++ Includes
+
+GTK+ source files should never include the global gtk.h header, but
+instead include the individual headers that are needed. Every file must
+include config.h first, then its own header, then other GTK+ headers
+that it needs, then system and third-party headers that it needs.
+
+  /* valid */
+  #include "config.h"
+
+  #include "gtkfoo.h"
+
+  #include "gtkwidget.h"
+  #include "gtkbutton.h"
+
+  ...
+
+  #include <string.h>
+
+
++ GObject
+
+GObject classes definition and implementation require some additional
+coding style notices.
+
+Typedef declarations should be placed at the beginning of the file:
+
+  typedef struct _GtkFoo          GtkFoo;
+  typedef struct _GtkFooClass     GtkFooClass;
+  typedef struct _GtkFooPrivate   GtkFooPrivate;
+
+This includes enumeration types:
+
+  typedef enum
+  {
+    GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT,
+    GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH
+  } GtkSizeRequestMode;
+
+And callback types:
+
+  typedef void (* GtkCallback) (GtkWidget *widget,
+                                gpointer   user_data);
+
+Instance structures should only contain the parent type and a pointer to a
+private data structure, and they should be annotated as "private":
+
+  struct _GtkFoo
+  {
+    /*< private >*/
+    GtkWidget parent_instance;
+
+    GtkFooPrivate *priv;
+  };
+
+All the properties should be stored inside the private data structure, which
+is defined inside the source file - or, if needed, inside a private header
+file; the private header filename must end with "private.h" and must not be
+installed.
+
+The private data structure should only be accessed internally using the
+pointer inside the instance structure, and never using the
+G_TYPE_INSTANCE_GET_PRIVATE() macro or the g_type_instance_get_private()
+function.
+
+Always use the G_DEFINE_TYPE(), G_DEFINE_TYPE_WITH_CODE() macros, or
+their abstract variants G_DEFINE_ABSTRACT_TYPE() and
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE(), and the similar macros for defining
+interfaces.
+
+Interface types should always have the dummy typedef for cast purposes:
+
+        typedef struct _GtkFoo              GtkFoo;
+
+The interface structure should have "Interface" postfixed to the dummy typedef:
+
+        typedef struct _GtkFooInterface         GtkFooInterface;
+
+Interfaces must have the following macros:
+
+        - Macro:                                - Expands to:
+        • GTK_TYPE_<iface_name>             <iface_name>_get_type
+        • GTK_<iface_name>                  G_TYPE_CHECK_INSTANCE_CAST
+        • GTK_IS_<iface_name>               G_TYPE_CHECK_INSTANCE_TYPE
+        • GTK_<iface_name>_GET_IFACE        G_TYPE_INSTANCE_GET_INTERFACE
+
++ Memory allocation
+
+When dynamically allocating data on the heap either use g_new() or,
+if allocating multiple small data structures, g_slice_new().
+
+Public structure types should always be returned after being zero-ed,
+either explicitly for each member, or by using g_new0() or g_slice_new0().
+
++ Macros
+
+Try to avoid private macros unless strictly necessary. Remember to #undef
+them at the end of a block or a series of functions needing them.
+
+Inline functions are usually preferable to private macros.
+
+Public macros should not be used unless they evaluate to a constant.
+
++ Public API
+
+Avoid exporting variables as public API, since this is cumbersome on some
+platforms. It is always preferable to add getters and setters instead.
+
+All public functions must be listed in the gtk.symbols file.
+
++ Private API
+
+Non-exported functions that are needed in more than one source file
+should be named "_gtk_...", and declared in a private header file.
+
+Underscore-prefixed functions are never exported.
+
+Non-exported functions that are only needed in one source file
+should be declared static.
+
++ Documentation
+
+All public APIs must have gtk-doc comments. For functions, these should
+be placed in the source file, directly above the function.
+
+  /* valid */
+  /**
+   * gtk_get_flow:
+   * @widget: a #GtkWidget
+   *
+   * Gets the flow of a widget.
+   *
+   * Note that flows may be laminar or turbulent...
+   *
+   * Returns: (transfer none): the flow of @widget
+   */
+  GtkFlow *
+  gtk_get_flow (GtkWidget *widget)
+  {
+
+    ...
+
+  }
+
+Doc comments for macros, function types, class structs, etc should be
+placed next to the definitions, typically in headers.
+
+Section introductions should be placed in the source file they describe,
+after the license header:
+
+  /* valid */
+  /**
+   * SECTION:gtksizerequest
+   * @Short_Description: Height-for-width geometry management
+   * @Title: GtkSizeRequest
+   *
+   * The GtkSizeRequest interface is GTK+'s height-for-width (and
+   * width-for-height) geometry management system.
+   * ...
+   */
+
+To properly document a new function, macro, function type or struct,
+it needs to be listed in the gtk3-sections.txt file.
+
+To properly document a new class, it needs to be given its own section
+in gtk3-sections.txt, needs to be included in gtk-docs.sgml, and the
+get_type function needs to listed in gtk3.types.
+
++ Old code
+
+New code that is being added to GTK+ should adhere to the style
+explained above. Existing GTK+ code does largely follow these
+conventions, but there are some differences, e.g. occurrences
+of tabs, etc.
+
+It is ok to update the style of a code block or function when you
+are touching it anyway, but sweeping whitespace changes obscure the
+git history and should be avoided.

docs/Makefile.am

@@ -1,23 +1,25 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = tutorial faq reference tools
+SUBDIRS = reference tools
 
 EXTRA_DIST += \
-	defsformat.txt			\
+	CODING-STYLE			\
 	developers.txt			\
 	dnd_internals.txt		\
-	make-todo			\
-	refcounting.txt			\
-	sizing-test.txt			\
-	styles.txt			\
-	text_widget.txt 		\
-	text_widget_internals.txt	\
-	tree-column-sizing.txt		\
-	widget_geometry.txt		\
-	widget_system.txt 		\
+	focus_tracking.txt		\
 	generation.txt			\
 	gtkdocs_fix			\
-	RELEASE-HOWTO
+	make-todo			\
+	refcounting.txt			\
+	RELEASE-HOWTO			\
+	sizing-test.txt			\
+	styles.txt			\
+	text_widget_internals.txt	\
+	text_widget.txt 		\
+	tree-column-sizing.png		\
+	tree-column-sizing.txt		\
+	widget_geometry.txt		\
+	widget_system.txt
 
 -include $(top_srcdir)/git.mk

docs/defsformat.txt

@@ -1,338 +0,0 @@
-
-The overall syntax is:
-
-     (type-of-thing-being-defined  name-used-to-refer-to-this-thing
-       (attribute-name  attribute-value-depending-on-the-attribute)
-       (attribute-name  attribute-value-depending-on-the-attribute)
-       (attribute-name  attribute-value-depending-on-the-attribute))
-
-Some definitions can have a c-declaration field that gives the C code
-we parsed to arrive at the definition. The c-declaration is a quoted
-string because it can contain parentheses and such.
-
-Defined types and their attributes:
-
-===
-(module module-name
-  (submodule-of module-name)) ;; submodule is optional
-
-Ex: (module Gtk)
-Ex: (module Rgb
-      (submodule-of Gdk))
-
-modules are later referred to with a list of module names, like 
-(Gdk Rgb) or (Gtk)
-
-Object and boxed type definitions automatically create a submodule.
-For example, GtkCList creates the module (module CList (submodule-of
-(Gtk))) which is referred to as module (Gtk CList).
-
-===
-
-(type
- (alias some-unique-identifier)
- (in-module module-name)   ;; optional, gchar* is not in a module
- (gtk-type-id gtk-type-system-id) ;; optional, absent if this is not
-                                  ;; in the type system
- (is-parametric boolean)          ;; optional default to #f
- (in-c-name name-of-symbol-in-C)
- (out-c-name name-of-symbol-in-C)
- (inout-c-name name-of-symbol-in-C))
-
-Ex: (type
-     (alias string)
-     (gtk-type-id GTK_TYPE_STRING)
-     (in-c-name "const gchar*")
-     (out-c-name "gchar**")      ;; actually I'm not sure how strings work out/inout
-     (inout-c-name "gchar*"))
-
- (type
-     (alias list)
-     (gtk-type-id GTK_TYPE_POINTER)
-     (is-parametric #t)
-     (in-c-name "GList*")
-     (out-c-name "GList**")
-     (inout-c-name "GList**"))
-
-
- ;; This one would be implied by the (object) def for GtkWidget I
- ;; think - (type) is only required for types that are not implied
- ;; by other definitions, such as int/boolean/etc.
- 
-    (type
-     (alias GtkWidget)
-     (in-module (Gtk))
-     (gtk-type-id GTK_TYPE_WIDGET)
-     (in-c-name "GtkWidget*")
-     (inout-c-name "GtkWidget*")
-     (out-c-name "GtkWidget**"))
-
-"Type" bindings are automatically assumed for objects, boxed types,
-etc. as defined below.
-
-The alias field is used to refer to the type later on.
-
-Whenever a type alias can be used, it is also possible to use the
-keyword "native", which implies that the type in question is too
-C-specific to represent. Then a c-declaration will typically be
-available for use.
-
-C types containing [] or () are function pointers or arrays. For
-arrays that don't specify a size, we just treat them as pointers. For
-function pointers, we need special (type) syntax/attributes of some
-kind, but since there basically aren't any of these right now in the
-libs we care about we can just ignore them. For arrays that specify a
-size ditto, you would handle them by adding an (array-size) attribute
-or something or using the "native" keyword and skipping the (type)
-stuff.
-
-===
-(object object-name
-   (in-module module-name-list)
-   (parent object-name optional-module-name-if-different)
-   (abstract boolean-is-abstract-class) ;; omit for default of #f
-   (c-name name-of-the-object-in-C)
-   (field (type-and-name type-alias-of-struct-field name-of-struct-field)
-          (access read-or-write-or-readwrite)))
-   
-
-Ex: (object Widget
-      (in-module (Gtk))
-      (parent Object)      ;; could say (parent Object (Gtk))
-      (abstract #t)
-      (c-name GtkWidget)
-      (field (type-and-name GdkWindow* window) (access read)))
-
-An "object" declaration automatically implies the type definition:
-
-(type
-  (alias concat-module-elements-and-object-name)
-  (in-c-name pointer-to-c-name)
-  (out-c-name pointer-to-pointer-to-c-name)
-  (inout-c-name pointer-to-c-name))
-
-Ex: 
- (type (alias GtkWidget) 
-       (in-c-name GtkWidget*) 
-       (out-c-name GtkWidget**) 
-       (inout-c-name GtkWidget*))
-
-It also implies a module that is the name broken into parts:
- (module CTree
-   (submodule-of Gtk))
-
-===
-
-(function function-name
-  (in-module module-name-list) ;; "static methods" go in their
-                               ;;  object's module
-  (is-constructor-of object-type-alias) ;; optional, marks a constructor
-  (c-name function-name)
-  (return-type return-value-type) ;; defaults to void
-  (caller-owns-return boolean-value) ;; defaults to #f
-  (can-return-null boolean-value) ;; defaults to #t
-  (parameter in-or-out-or-inout 
-      (type-and-name parameter-type-alias parameter-name)
-      (type-parameter name-of-contained-type) ;; optional, requires parametric type
-      (c-declaration "c-type-and-name")) ;; c-declaration only required
-                                         ;; if the type alias is "native"
-  (varargs #t) ;; has varargs at the end
-)
-
-Ex:
-  (function init
-    (in-module (Gdk Rgb)
-    (c-name gdk_rgb_init)))
-
-Ex: 
-  (function new
-    (in-module (Gdk Rgb Cmap))
-    (is-constructor-of GdkRgbCmap)
-    (c-name gdk_rgb_cmap_new)
-    (return-type GdkRgbCmap)
-    (caller-owns-return #t)   ;; perhaps this could be implied by is-constructor-of
-    (parameter in (type-and-name array-of-guint32 colors))
-    (parameter in (type-and-name gint n_colors)))
-
-Ex:
-  (function config_set_set_handler
-   (in-module (Gnome))
-   (c-name gnome_config_set_set_handler)
-   (parameter in (type-and-name native func)
-                 (c-declaration "void (*func)(void*)"))
-   (parameter in (type-and-name gpointer data)))  
-
-===
-(method method-name
-  (of-object object-name module-name)
-  ;; retval/arg attributes as for (function), but with first parameter
-  ;; omitted for non-constructors
-   )
- 
-Ex:
-  (method set_text
-     (of-object Label (Gtk))
-     (parameter (type-and-name const-gchar* str)))
-
-===
-(object-argument arg-name
-   (of-object object-we-are-an-argument-of optional-objects-module)
-   (type-id argument-type)       ;; GTK_TYPE_OBJECT etc.
-   ;; flags all default to #f
-   (readable bool-value)
-   (writeable bool-value)
-   (construct-only bool-value))
-
-Ex:
-  (object-argument label
-     (of-object Label (Gtk))
-     (type GTK_TYPE_STRING)
-     (readable #t)
-     (writeable #t))
-
-=== 
-(signal signal-name
-  (run-action bool-value)
-  (run-first bool-value)
-  (run-last bool-value)
-  (of-object object-we-are-a-signal-of optional-objects-module)
-  ;; return value and parameters as for a function, omitting the object
-  ;; and user data parameters
-
-  ;; what other properties matter for a signal?
-)
-
-Ex:
-  (signal select_row
-     (of-object CList (Gtk))
-     (run-first #t)
-     ;; return type defaults to void
-     (parameter in (type-and-name gint row))
-     (parameter in (type-and-name gint column))
-     (parameter in (type-and-name GdkEvent* event)))
-
-=== 
-(enum enum-name
-  (in-module modname)
-  (c-name name-in-c)
-  (value (nick value-name-noprefixes-hyphen-lowercase) (c-name value-c-name)))
-
-Ex:
-
-  (enum DirectionType
-    (in-module Gtk)
-    (c-name GtkDirectionType)
-    (value (nick tab-forward) (c-name GTK_DIR_TAB_FORWARD))
-    (value (nick tab-backward) (c-name GTK_DIR_TAB_BACKWARD))
-    (value (nick up) (c-name GTK_DIR_UP))
-    (value (nick down) (c-name GTK_DIR_DOWN))
-    (value (nick left) (c-name GTK_DIR_LEFT))
-    (value (nick right) (c-name GTK_DIR_RIGHT)))
-
-  (enum Pos
-    (in-module (Gtk CTree))
-    (c-name GtkCTreePos)
-    (value (nick before) (c-name GTK_CTREE_POS_BEFORE))
-    (value (nick as-child) (c-name GTK_CTREE_POS_AS_CHILD))
-    (value (nick after) (c-name GTK_CTREE_POS_AFTER)))
-
-===
-(flags) is just like enum, but some bindings may wrap enums and flags differently.
-    
-===
-
-(boxed boxed-name
-  (in-module modname)
-  (c-name c-name)
-  (ref-func func-to-increase-refcount)
-  (copy-func func-to-copy)
-  (release-func func-to-destroy-or-decrement-refcount)
-  (field (type-and-name type-alias-of-struct-field name-of-struct-field) (access access-rule)))
-
-It is never OK to use memcpy() to copy a boxed type, or use
-malloc()/free() to alloc/free one.
-
-Ex:
-
- (boxed Pixmap
-   (in-module (Gdk))
-   (c-name GdkPixmap)
-   (ref-func pixmap_ref)
-   (release-func pixmap_unref))
-
-An "object" declaration automatically implies the type definition:
-
-(type
-  (alias concat-module-elements-and-boxed-name)
-  (in-c-name pointer-to-c-name)
-  (out-c-name pointer-to-pointer-to-c-name)
-  (inout-c-name pointer-to-c-name))
-
-Ex: 
- (type (alias GdkPixmap) 
-       (in-c-name GdkPixmap*) 
-       (out-c-name GdkPixmap**) 
-       (inout-c-name GdkPixmap*))
-
-
-===
-
-(struct struct-name
-  (in-module modname)
-  (c-name c-name)
-  (field (type-and-name type-alias-of-struct-field name-of-struct-field) (access access-rule)))
-
-Unlike a boxed type, a struct type can be copied with memcpy() and
-allocated on the stack or with g_malloc().
-
-Ex:
- (struct Rectangle
-   (in-module (Gdk))
-   (c-name GdkRectangle)
-   (field (type-and-name gint16 x) (access readwrite))
-   (field (type-and-name gint16 y) (access readwrite))
-   (field (type-and-name guint16 width) (access readwrite))
-   (field (type-and-name guint16 height) (access readwrite)))
-
-Implies GdkRectangle type alias:
-
- (type (alias GdkRectangle) 
-       (in-c-name GdkRectangle*) 
-       (out-c-name GdkRectangle*)    ;; note - not the same as boxed types 
-       (inout-c-name GdkRectangle*))
-
-===
-
-(user-function name
-  (in-module module)
-  (c-name c-typedef-name)
-  ;; return-type and parameters as for (function)
-)
-
-Ex:
-
- (user-function PrintFunc
-    (in-module (Gtk))
-    (parameter in (type-and-name gpointer func_data))
-    (parameter in (type-and-name gchar* str)))
-
-===
-
-(typedef new-name
-  (in-module module)
-  (c-name c-full-name)
-  (orig-type alias-of-orig-type))
-
-Ex:
-
- (typedef Type
-   (in-module (Gtk))
-   (c-name GtkType)
-   (orig-type guint))
-
-
-
-
-  
-   
-

docs/faq/Makefile.am

@@ -1,44 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-EXTRA_DIST += 			\
-	gtk-faq.sgml
-
-if HAVE_DOCBOOK
-html:
-	if test -w $(srcdir); then \
-	  (cd $(srcdir); \
-	   db2html gtk-faq.sgml; \
-	   test -d html && rm -r html; \
-	   mv gtk-faq html); \
-	fi
-
-pdf:
-	if test -w $(srcdir); then \
-	  (cd $(srcdir); db2pdf gtk-faq.sgml); \
-	fi
-
-all-local: html
-
-dist-hook: html
-	cp -Rp $(srcdir)/html $(distdir)
-else
-html:
-	echo "***"
-	echo "*** Warning: FAQ not built"
-	echo "***"
-
-pdf:
-	echo "***"
-	echo "*** Warning: FAQ not built"
-	echo "***"
-
-dist-hook:
-	echo "***"
-	echo "*** Warning: FAQ not built"
-	echo "*** DISTRIBUTION IS INCOMPLETE"
-	echo "***"
-endif
-
-.PHONY: html
-
--include $(top_srcdir)/git.mk

docs/gtk-config.txt

@@ -1,236 +0,0 @@
-CONFIGURING PACKAGES TO WORK WITH GTK
--------------------------------------
-
-Compiling a program successfully against the GTK, GDK, and GLIB
-libraries can require a large number of command line options
-to your compiler and linker that are hard to guess correctly.
-The additional libraries required may, for example, depend on the
-manner which GTK was configured
-
-Several tools are included in this package to make process
-easier.
-
-First, there is the shell script 'gtk-config' (installed in
-$exec_prefix/bin):
-
-Invoking gtk-config
--------------------
-
-gtk-config takes the following flags:
-
-  --version
-     Prints out the version of GTK installed
-
-  --cflags
-     Prints '-I' flags pointing to the installed header files.
-
-  --libs
-     Prints out the linker flags necessary to link a program against GTK
-   
-  --prefix[=PREFIX]
-     If PREFIX is specified, overrides the configured value of $prefix.
-     (And of exec-prefix, unless --exec-prefix is also specified)
-     Otherwise, prints out the configured value of $prefix
-
-  --exec-prefix[=PREFIX]
-     If PREFIX is specified, overrides the configured value of $exec_prefix.
-     Otherwise, prints out the configured value of $exec_prefix
- 
-You may also add to the command line a list of additional
-libraries that gtk-config should supply the CFLAGS and LIBS
-for. The only currently supported library is 'gthread'.
-
-As an example of this latter usage, you can get the
-appropriate cflags for a threaded program with:
-
- gtk-config --cflags gthread
-
-
-Example of using gtk-config
----------------------------
-
-Typically, gtk-config will be used within a configure script,
-as described below. It, however, can also be used directly
-from the command line to compile a simple program. For example:
-
-  cc -o simple `gtk-config --cflags` simple.c `gtk-config --libs`
-
-This command line might expand to (for example):
-
-  cc -o simple -I/usr/local/lib/glib/include -I/usr/local/include \
-    -I/usr/X11R6/include simple.c -L/usr/local/lib -L/usr/X11R6/lib \
-    -lgtk -lgdk -lglib -lXi -lXext -lX11 -lm
-
-Not only is the form using gtk-config easier to type, it will
-work on any system, no matter how GTK was configured.
-
-
-AM_PATH_GTK
------------
-
-For packages configured using GNU automake, GTK also provides
-a macro to automate the process of running GTK.
-
- AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-
-This macro:
-
- * Determines the location of GTK using gtk-config, which is either
-   found in the user's path, or from the environment variable
-   GTK_CONFIG
-
- * Tests the installed libraries to make sure that there version
-   is later than MINIMUM-VERSION. (A default version will be used
-   if not specified)
-
- * If the required version was found, sets the GTK_CFLAGS variable to
-   the output of `gtk-config --cflags` and the GTK_LIBS variable to
-   the output of `gtk-config --libs`, and calls AC_SUBST() for these
-   variables so they can be used in generated makefiles, and then
-   executes ACTION-IF-FOUND.
-
- * If the required version was not found, sets GTK_CFLAGS and GTK_LIBS
-   to empty strings, and executes ACTION-IF-NOT-FOUND.
-
-This macro is in file 'gtk.m4' which is installed in $datadir/aclocal.
-Note that if automake was installed with a different --prefix than
-GTK, you will either have to manually move gtk.m4 to automake's
-$datadir/aclocal, or give aclocal the -I option when running it.
-
-
-Configuring a package that uses AM_PATH_GTK
--------------------------------------------
-
-Simply make sure that gtk-config is in your path, and run
-the configure script.
-
-Notes:
-
-* The directory where the GTK libraries are installed needs
-  to be found by your system's dynamic linker.
-  
-  This is generally done by
-
-    editing /etc/ld.so.conf and running ldconfig
-
-  Or by:
-   
-    setting the environment variable LD_LIBRARY_PATH, 
-
-  or, as a last resort, 
- 
-    Giving a -R or -rpath flag (depending on your linker) when
-    running configure, for instance:
-
-      LDFLAGS=-R/usr/home/owen/lib ./configure
-
-* You can also specify a gtk-config not in your path by
-  setting the GTK_CONFIG environment variable to the
-  name of the executable
-
-* If you move the GTK package from its installed location,
-  you will need either need to modify gtk-config script
-  manually to point to the new location or rebuild GTK.
-
-Advanced note:
-
-* configure flags
-  
-  --with-gtk-prefix=PREFIX
-  --with-gtk-exec-prefix=PREFIX 
-
-  are provided to override the prefix and exec-prefix that were stored
-  in the gtk-config shell script by GTK's configure. You are generally
-  better off configuring GTK with the right path to begin with.
-
-Example of a package using AM_PATH_GTK
---------------------------------------
-
-The following shows how to build a simple package using automake
-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.ac', which is used to build the
-configure script:
-
-==configure.ac===
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(testinput.c)
-
-AM_INIT_AUTOMAKE(testinput.c, 1.0.0)
-
-AC_PROG_CC
-AM_PROG_CC_STDC
-AC_PROG_INSTALL
-
-AM_PATH_GTK(0.99.5,
-          [LIBS="$LIBS $GTK_LIBS"
-           CFLAGS="$CFLAGS $GTK_CFLAGS"],
- 	  AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?))
-
-AC_OUTPUT(Makefile)
-=================
-
-The only command in this which is not standard for automake
-is the AM_PATH_GTK() macro.
-
-That command does the following:
-
- If a GTK version greater than 0.99.5 is found, adds $GTK_LIBS to 
- $LIBS and $GTK_CFLAGS to $CFLAGS. Otherwise, dies with the error
- message "Cannot find GTK: Is gtk-config in path?"
-
-And the 'Makefile.am', which will be used to build the Makefile.
-
-== Makefile.am ==
-bin_PROGRAMS = testinput
-testinput_SOURCES = testinput.c
-=================
-
-This Makefile.am, says that we are building a single executable,
-from a single sourcefile 'testinput.c'. Since every program
-we are building uses GTK we simply added the GTK options
-to $LIBS and $CFLAGS, but in other circumstances, we might
-want to specify them on a per-program basis: for instance by
-adding the lines:
-
-  testinput_LDADD = $(GTK_LIBS)
-  INCLUDES = $(GTK_CFLAGS)
-
-to the Makefile.am.
-
-To try this example out, create a new directory, add the two
-files above two it, and copy the testinput.c file from 
-the gtk/ subdirectory to the new directory. Edit the line:
-
-  #include "gtk.h"
-
-in testgtk.c, to read:
-
-  #include <gtk/gtk.h>
-
-
-Now execute the following commands:
-
-  automake --add-missing
-  aclocal
-  autoconf
-  
-You now have a package that can be built in the normal fashion
-
-  ./configure
-  make
-  make install
-
-
-Notes:
-
-* If you are converting a package that used a pre-1.0 version of
-  GTK, you should remove the autoconf tests for X. The results
-  of these tests are included in gtk-config and will be added
-  to GTK_LIBS and GTK_CFLAGS by the AM_PATH_GTK macro.
-
-                                        Owen Taylor
-                                        14 Mar 1997

docs/reference/gdk/gdk-docs.sgml

@@ -17,47 +17,28 @@
   <reference id="reference">
     <title>API Reference</title>
     <xi:include href="xml/general.xml" />
-
     <xi:include href="multihead.sgml" />
     <xi:include href="xml/gdkdisplay.xml" />
     <xi:include href="xml/gdkdisplaymanager.xml" />
     <xi:include href="xml/gdkscreen.xml" />
-
     <xi:include href="xml/regions.xml" />
     <xi:include href="xml/drawing.xml" />
-
-    <xi:include href="xml/pixmaps.xml" />
-    <xi:include href="xml/pixbufs.xml" />
-
     <xi:include href="xml/colors.xml" />
     <xi:include href="xml/visuals.xml" />
-
-    <xi:include href="xml/fonts.xml" />
     <xi:include href="xml/cursors.xml" />
-
     <xi:include href="xml/windows.xml" />
-
     <xi:include href="xml/events.xml" />
     <xi:include href="xml/event_structs.xml" />
-
     <xi:include href="xml/keys.xml" />
-
     <xi:include href="xml/selections.xml" />
     <xi:include href="xml/dnd.xml" />
-
     <xi:include href="xml/properties.xml" />
-
     <xi:include href="xml/threads.xml" />
-
-    <xi:include href="xml/input.xml" />
     <xi:include href="xml/gdkdevicemanager.xml" />
-
     <xi:include href="xml/pango_interaction.xml" />
     <xi:include href="xml/cairo_interaction.xml" />
     <xi:include href="xml/x_interaction.xml" />
-
     <xi:include href="xml/gdkapplaunchcontext.xml" />
-
     <xi:include href="xml/gdktesting.xml" />
   </reference>
 

docs/reference/gdk/gdk3-sections.txt

@@ -47,6 +47,7 @@ gdk_beep
 <SUBSECTION>
 gdk_error_trap_push
 gdk_error_trap_pop
+gdk_error_trap_pop_ignored
 
 <SUBSECTION>
 GDK_WINDOWING_X11
@@ -189,11 +190,7 @@ gdk_display_manager_get_type
 <TITLE>GdkScreen</TITLE>
 GdkScreen
 gdk_screen_get_default
-gdk_screen_get_default_colormap
-gdk_screen_set_default_colormap
-gdk_screen_get_system_colormap
 gdk_screen_get_system_visual
-gdk_screen_get_rgba_colormap
 gdk_screen_get_rgba_visual
 gdk_screen_is_composited
 gdk_screen_get_root_window
@@ -239,50 +236,17 @@ GdkScreenClass
 gdk_screen_get_type
 </SECTION>
 
-<SECTION>
-<TITLE>Bitmaps and Pixmaps</TITLE>
-<FILE>pixmaps</FILE>
-GdkPixmap
-gdk_pixmap_new
-GdkBitmap
-
-<SUBSECTION Standard>
-GDK_PIXMAP
-GDK_PIXMAP_GET_CLASS
-GDK_PIXMAP_OBJECT
-GDK_TYPE_PIXMAP
-GDK_IS_PIXMAP
-GDK_PIXMAP_CLASS
-GDK_IS_PIXMAP_CLASS
-
-<SUBSECTION Private>
-gdk_pixmap_get_type
-GdkPixmapObject
-GdkPixmapObjectClass
-</SECTION>
-
 <SECTION>
 <TITLE>Pixbufs</TITLE>
 <FILE>pixbufs</FILE>
-gdk_pixbuf_render_threshold_alpha
-gdk_pixbuf_render_pixmap_and_mask
-gdk_pixbuf_render_pixmap_and_mask_for_colormap
-gdk_pixbuf_get_from_drawable
+gdk_pixbuf_get_from_window
 gdk_pixbuf_get_from_surface
 </SECTION>
 
 <SECTION>
-<TITLE>Colormaps and Colors</TITLE>
+<TITLE>Colors</TITLE>
 <FILE>colors</FILE>
 GdkColor
-GdkColormap
-gdk_colormap_new
-gdk_colormap_get_system
-gdk_colormap_alloc_colors
-gdk_colormap_alloc_color
-gdk_colormap_free_colors
-gdk_colormap_get_visual
-gdk_colormap_get_screen
 gdk_color_copy
 gdk_color_free
 gdk_color_parse
@@ -291,31 +255,14 @@ gdk_color_hash
 gdk_color_to_string
 
 <SUBSECTION Standard>
-GDK_COLORMAP
-GDK_COLORMAP_GET_CLASS
-GDK_TYPE_COLORMAP
-GDK_IS_COLORMAP
-GDK_COLORMAP_CLASS
-GDK_IS_COLORMAP_CLASS
 GDK_TYPE_COLOR
 
-<SUBSECTION Private>
-GdkColormapClass
-gdk_colormap_get_type
-gdk_color_get_type
 </SECTION>
 
 <SECTION>
 <TITLE>Drawing Primitives</TITLE>
 <FILE>drawing</FILE>
 GdkDrawable
-gdk_drawable_get_display
-gdk_drawable_get_screen
-gdk_drawable_get_visual
-gdk_drawable_set_colormap
-gdk_drawable_get_colormap
-gdk_drawable_get_depth
-gdk_drawable_get_size
 gdk_drawable_get_clip_region
 gdk_drawable_get_visible_region
 
@@ -388,6 +335,9 @@ GdkWindowAttributesType
 gdk_window_new
 gdk_window_destroy
 gdk_window_get_window_type
+gdk_window_get_display
+gdk_window_get_screen
+gdk_window_get_visual
 gdk_window_at_pointer
 gdk_window_show
 gdk_window_show_unraised
@@ -421,9 +371,6 @@ gdk_window_flush
 gdk_window_has_native
 gdk_window_ensure_native
 gdk_window_reparent
-gdk_window_clear
-gdk_window_clear_area
-gdk_window_clear_area_e
 gdk_window_raise
 gdk_window_lower
 gdk_window_restack
@@ -442,6 +389,7 @@ gdk_window_end_paint
 <SUBSECTION>
 gdk_window_invalidate_rect
 gdk_window_invalidate_region
+GdkWindowChildFunc
 gdk_window_invalidate_maybe_recurse
 gdk_window_get_update_area
 gdk_window_freeze_updates
@@ -449,7 +397,6 @@ gdk_window_thaw_updates
 gdk_window_process_all_updates
 gdk_window_process_updates
 gdk_window_set_debug_updates
-gdk_window_get_internal_paint_info
 gdk_window_enable_synchronized_configure
 gdk_window_configure_finished
 
@@ -465,18 +412,16 @@ gdk_window_remove_filter
 GdkFilterFunc
 GdkFilterReturn
 GdkXEvent
-gdk_window_shape_combine_mask
 gdk_window_shape_combine_region
 gdk_window_set_child_shapes
 gdk_window_merge_child_shapes
-gdk_window_input_shape_combine_mask
 gdk_window_input_shape_combine_region
 gdk_window_set_child_input_shapes
 gdk_window_merge_child_input_shapes
 gdk_window_set_static_gravities
 gdk_window_set_title
 gdk_window_set_background
-gdk_window_set_back_pixmap
+gdk_window_set_background_pattern
 gdk_window_get_background_pattern
 GDK_PARENT_RELATIVE
 gdk_window_set_cursor
@@ -484,6 +429,8 @@ gdk_window_get_cursor
 gdk_window_get_user_data
 gdk_window_get_geometry
 gdk_window_set_geometry_hints
+gdk_window_get_width
+gdk_window_get_height
 gdk_window_set_icon_list
 gdk_window_set_modal_hint
 gdk_window_get_modal_hint
@@ -496,7 +443,6 @@ gdk_window_get_position
 gdk_window_get_root_origin
 gdk_window_get_frame_extents
 gdk_window_get_origin
-gdk_window_get_deskrelative_origin
 gdk_window_get_root_coords
 gdk_window_get_pointer
 gdk_window_get_device_position
@@ -507,7 +453,6 @@ gdk_window_get_children
 gdk_window_peek_children
 gdk_window_get_events
 gdk_window_set_events
-gdk_window_set_icon
 gdk_window_set_icon_name
 gdk_window_set_transient_for
 gdk_window_set_role
@@ -534,12 +479,10 @@ GdkPointerHooks
 gdk_set_pointer_hooks
 
 <SUBSECTION>
-gdk_offscreen_window_get_pixmap
+gdk_offscreen_window_get_surface
 gdk_offscreen_window_set_embedder
 gdk_offscreen_window_get_embedder
 gdk_window_geometry_changed
-gdk_window_redirect_to_drawable
-gdk_window_remove_redirection
 gdk_window_coords_from_parent
 gdk_window_coords_to_parent
 gdk_window_get_effective_parent
@@ -650,12 +593,14 @@ gdk_pango_context_get_for_screen
 <FILE>cairo_interaction</FILE>
 gdk_window_create_similar_surface
 gdk_cairo_create
+gdk_cairo_get_clip_rectangle
 gdk_cairo_set_source_color
 gdk_cairo_set_source_pixbuf
-gdk_cairo_set_source_pixmap
+gdk_cairo_set_source_window
 gdk_cairo_rectangle
 gdk_cairo_region
 gdk_cairo_reset_clip
+gdk_cairo_region_create_from_surface
 </SECTION>
 
 <SECTION>
@@ -680,7 +625,6 @@ GDK_THREADS_LEAVE
 gdk_threads_init
 gdk_threads_enter
 gdk_threads_leave
-gdk_threads_mutex
 gdk_threads_set_lock_functions
 gdk_threads_add_idle
 gdk_threads_add_idle_full
@@ -688,7 +632,12 @@ gdk_threads_add_timeout
 gdk_threads_add_timeout_full
 gdk_threads_add_timeout_seconds
 gdk_threads_add_timeout_seconds_full
-
+<SUBSECTION>
+gdk_threads_get_periodic
+gdk_threads_set_periodic
+gdk_threads_periodic_add
+gdk_threads_periodic_remove
+gdk_threads_periodic_damaged
 <SUBSECTION Private>
 gdk_threads_lock
 gdk_threads_unlock
@@ -939,7 +888,6 @@ gdk_owner_change_get_type
 GdkCursor
 GdkCursorType
 gdk_cursor_new
-gdk_cursor_new_from_pixmap
 gdk_cursor_new_from_pixbuf
 gdk_cursor_new_from_name
 gdk_cursor_new_for_display
@@ -1006,35 +954,24 @@ gdk_drag_context_get_type
 <TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_ROOT_WINDOW
-GDK_DISPLAY
 GDK_WINDOW_XDISPLAY
 GDK_WINDOW_XID
-GDK_PIXMAP_XDISPLAY
-GDK_PIXMAP_XID
 GDK_DISPLAY_XDISPLAY
 GDK_DRAWABLE_XDISPLAY
 GDK_DRAWABLE_XID
-GDK_COLORMAP_XDISPLAY
-GDK_COLORMAP_XCOLORMAP
 GDK_SCREEN_XDISPLAY
 GDK_SCREEN_XNUMBER
 GDK_SCREEN_XSCREEN
-GDK_VISUAL_XVISUAL
 GDK_CURSOR_XCURSOR
 GDK_CURSOR_XDISPLAY
 GDK_WINDOW_XWINDOW
 gdkx_visual_get
-gdk_pixmap_foreign_new
-gdk_pixmap_foreign_new_for_display
-gdk_pixmap_foreign_new_for_screen
 gdk_window_foreign_new
 gdk_window_foreign_new_for_display
 gdk_xid_table_lookup
 gdk_xid_table_lookup_for_display
 gdk_window_lookup
 gdk_window_lookup_for_display
-gdk_pixmap_lookup
-gdk_pixmap_lookup_for_display
 gdk_x11_lookup_xdisplay
 gdk_x11_get_server_time
 gdk_net_wm_supports
@@ -1045,9 +982,6 @@ gdk_x11_screen_lookup_visual
 gdk_x11_window_set_user_time
 gdk_x11_window_move_to_current_desktop
 gdk_x11_display_get_user_time
-gdk_x11_colormap_foreign_new
-gdk_x11_colormap_get_xcolormap
-gdk_x11_colormap_get_xdisplay
 gdk_x11_cursor_get_xcursor
 gdk_x11_cursor_get_xdisplay
 gdk_x11_display_broadcast_startup_message
@@ -1055,6 +989,9 @@ gdk_x11_display_get_startup_notification_id
 gdk_x11_display_get_xdisplay
 gdk_x11_display_grab
 gdk_x11_display_ungrab
+gdk_x11_display_error_trap_push
+gdk_x11_display_error_trap_pop
+gdk_x11_display_error_trap_pop_ignored
 gdk_x11_display_set_cursor_theme
 gdk_x11_register_standard_event_type
 gdk_x11_drawable_get_xdisplay
@@ -1077,10 +1014,8 @@ gdk_x11_get_xatom_name
 gdk_x11_get_xatom_name_for_display
 
 <SUBSECTION Private>
-gdk_display
 GDK_HAVE_WCHAR_H
 GDK_HAVE_WCTYPE_H
-gdk_x11_pixmap_get_drawable_impl
 gdk_x11_window_get_drawable_impl
 </SECTION>
 

docs/reference/gdk/gdk3.types

@@ -5,7 +5,6 @@ gdk_display_manager_get_type
 gdk_screen_get_type
 gdk_drawable_get_type
 gdk_window_object_get_type
-gdk_pixmap_get_type
 gdk_keymap_get_type
 gdk_device_get_type
 gdk_device_manager_get_type

docs/reference/gdk/multihead.sgml

@@ -106,12 +106,12 @@ gtk_window_set_screen (window, second_screen);<!--
       <para>
 	<variablelist>
 	  <varlistentry>
-	    <term><link linkend="gdk-GdkDisplay">GdkDisplay</link></term>
+	    <term><link linkend="GdkDisplay">GdkDisplay</link></term>
 	    <listitem><para>the GDK Object used to represent and manipulate display
 		related data</para></listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><link linkend="gdk-GdkScreen">GdkScreen</link></term>
+	    <term><link linkend="GdkScreen">GdkScreen</link></term>
 	    <listitem><para>the GDK Object used to represent and query screen related
 		data</para></listitem>
 	  </varlistentry>

docs/reference/gdk/tmpl/.gitignore

@@ -1,2 +1,6 @@
+cairo_interaction.sgml
+colors.sgml
 dnd.sgml
+pixbufs.sgml
+regions.sgml
 windows.sgml

docs/reference/gdk/tmpl/cairo_interaction.sgml

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

docs/reference/gdk/tmpl/colors.sgml

@@ -1,185 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Colormaps and Colors
-
-<!-- ##### SECTION Short_Description ##### -->
-Manipulation of colors and colormaps
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-These functions are used to modify colormaps.
-A colormap is an object that contains the mapping
-between the color values stored in memory and
-the RGB values that are used to display color
-values. In general, colormaps only contain
-significant information for pseudo-color visuals,
-but even for other visual types, a colormap object
-is required in some circumstances.
-</para>
-
-<para>
-There are a couple of special colormaps that can
-be retrieved. The system colormap (retrieved 
-with gdk_colormap_get_system()) is the default
-colormap of the system. If you are using GdkRGB,
-there is another colormap that is important - the
-colormap in which GdkRGB works, retrieved with
-gdk_rgb_get_colormap(). However, when using GdkRGB, 
-it is not generally necessary to allocate colors
-directly.
-</para>
-
-<para>
-In previous revisions of this interface, a number
-of functions that take a #GdkColormap parameter
-were replaced with functions whose names began
-with "gdk_colormap_".
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GdkColor ##### -->
-<para>
-The #GdkColor structure is used to describe an 
-allocated or unallocated color.
-</para>
-
-@pixel: For allocated colors, the value used to
-  draw this color on the screen.
-@red: The red component of the color. This is
-  a value between 0 and 65535, with 65535 indicating
-  full intensitiy.
-@green: The green component of the color.
-@blue: The blue component of the color.
-
-<!-- ##### STRUCT GdkColormap ##### -->
-<para>
-The colormap structure contains the following public fields.
-</para>
-
-
-<!-- ##### FUNCTION gdk_colormap_new ##### -->
-<para>
-</para>
-
-@visual: 
-@allocate: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_colormap_get_system ##### -->
-<para>
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_colormap_alloc_colors ##### -->
-<para>
-</para>
-
-@colormap: 
-@colors: 
-@n_colors: 
-@writeable: 
-@best_match: 
-@success: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_colormap_alloc_color ##### -->
-<para>
-</para>
-
-@colormap: 
-@color: 
-@writeable: 
-@best_match: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_colormap_free_colors ##### -->
-<para>
-</para>
-
-@colormap: 
-@colors: 
-@n_colors: 
-
-
-<!-- ##### FUNCTION gdk_colormap_get_visual ##### -->
-<para>
-</para>
-
-@colormap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_colormap_get_screen ##### -->
-<para>
-
-</para>
-
-@cmap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_color_copy ##### -->
-<para>
-</para>
-
-@color: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_color_free ##### -->
-<para>
-</para>
-
-@color: 
-
-
-<!-- ##### FUNCTION gdk_color_parse ##### -->
-<para>
-</para>
-
-@spec: 
-@color: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_color_equal ##### -->
-<para>
-</para>
-
-@colora: 
-@colorb: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_color_hash ##### -->
-<para>
-</para>
-
-@colora: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_color_to_string ##### -->
-<para>
-
-</para>
-
-@color: 
-@Returns: 
-
-

docs/reference/gdk/tmpl/cursors.sgml

@@ -8,10 +8,10 @@ Standard and pixmap cursors
 <para>
 These functions are used to create and destroy cursors.
 There is a number of standard cursors, but it is also
-possible to construct new cursors from pixmaps and
-pixbufs. There may be limitations as to what kinds of
-cursors can be constructed on a given display, see
-gdk_display_supports_cursor_alpha(), 
+possible to construct new cursors from pixbufs. There
+may be limitations as to what kinds of cursors can be
+constructed on a given display, see
+gdk_display_supports_cursor_alpha(),
 gdk_display_supports_cursor_color(),
 gdk_display_get_default_cursor_size() and
 gdk_display_get_maximal_cursor_size().
@@ -125,7 +125,7 @@ The standard cursors available.
 @GDK_LAST_CURSOR: last cursor type
 @GDK_BLANK_CURSOR: Blank cursor. Since 2.16
 @GDK_CURSOR_IS_PIXMAP: type of cursors constructed with 
-  gdk_cursor_new_from_pixmap() or gdk_cursor_new_from_pixbuf()
+  gdk_cursor_new_from_pixbuf()
 
 <!-- ##### FUNCTION gdk_cursor_new ##### -->
 <para>
@@ -136,19 +136,6 @@ The standard cursors available.
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_cursor_new_from_pixmap ##### -->
-<para>
-</para>
-
-@source: 
-@mask: 
-@fg: 
-@bg: 
-@x: 
-@y: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_cursor_new_from_pixbuf ##### -->
 <para>
 

docs/reference/gdk/tmpl/drawing.sgml

@@ -45,70 +45,6 @@ or a #GdkWindow.
 </para>
 
 
-<!-- ##### FUNCTION gdk_drawable_get_display ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_drawable_get_screen ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_drawable_get_visual ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_drawable_set_colormap ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@colormap: 
-
-
-<!-- ##### FUNCTION gdk_drawable_get_colormap ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_drawable_get_depth ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_drawable_get_size ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@width: 
-@height: 
-
-
 <!-- ##### FUNCTION gdk_drawable_get_clip_region ##### -->
 <para>
 

docs/reference/gdk/tmpl/gdkscreen.sgml

@@ -77,33 +77,6 @@ when GDK gets multihead support.
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_screen_get_default_colormap ##### -->
-<para>
-
-</para>
-
-@screen: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_screen_set_default_colormap ##### -->
-<para>
-
-</para>
-
-@screen: 
-@colormap: 
-
-
-<!-- ##### FUNCTION gdk_screen_get_system_colormap ##### -->
-<para>
-
-</para>
-
-@screen: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_screen_get_system_visual ##### -->
 <para>
 
@@ -113,15 +86,6 @@ when GDK gets multihead support.
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_screen_get_rgba_colormap ##### -->
-<para>
-
-</para>
-
-@screen: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_screen_get_rgba_visual ##### -->
 <para>
 

docs/reference/gdk/tmpl/general.sgml

@@ -329,37 +329,25 @@ available.
 
 <!-- ##### FUNCTION gdk_error_trap_push ##### -->
 <para>
-This function allows X errors to be trapped instead of the normal behavior
-of exiting the application. It should only be used if it is not possible to
-avoid the X error in any other way.
+
 </para>
-<example>
-<title>Trapping an X error</title>
-<programlisting>
-  gdk_error_trap_push (<!-- -->);
-
-  /* ... Call the X function which may cause an error here ... */
-
-  /* Flush the X queue to catch errors now. */
-  gdk_flush (<!-- -->);
-
-  if (gdk_error_trap_pop (<!-- -->))
-    {
-      /* ... Handle the error here ... */
-    }
-</programlisting>
-</example>
 
 @void: 
 
 
-<!-- ##### FUNCTION gdk_error_trap_pop ##### -->
+<!-- ##### MACRO gdk_error_trap_pop ##### -->
 <para>
-Removes the X error trap installed with gdk_error_trap_push().
+
+</para>
+
+
+
+<!-- ##### FUNCTION gdk_error_trap_pop_ignored ##### -->
+<para>
+
 </para>
 
 @void: 
-@Returns: the X error code, or 0 if no error occurred.
 
 
 <!-- ##### MACRO GDK_WINDOWING_X11 ##### -->

docs/reference/gdk/tmpl/keys.sgml

@@ -11,13 +11,12 @@ They appear in the <structfield>keyval</structfield> field of the
 #GdkEventKey structure, which is passed to signal handlers for the
 "key-press-event" and "key-release-event" signals.
 The complete list of key values can be found in the <filename>&lt;gdk/gdkkeysyms.h&gt;</filename>
-header file. <filename>&lt;gdk/gdkkeysyms.h&gt;</filename> is not included in <filename>&lt;gdk/gdk.h&gt;</filename>, 
-it must be included independently, because the file is quite large.
+header file.
 </para>
 <para>
 Key values are regularly updated from the upstream X.org X11 implementation,
-so new values are added regularly. They will be prefixed with GDK_ rather than
-XF86XK_ or XK_ (for older symbols).
+so new values are added regularly. They will be prefixed with GDK_KEY_ rather
+than XF86XK_ or XK_ (for older symbols).
 </para>
 <para>
 Key values can be converted into a string representation using
@@ -30,7 +29,7 @@ gdk_keyval_is_lower(). Key values can be converted to upper or lower case
 using gdk_keyval_to_upper() and gdk_keyval_to_lower().
 </para>
 <para>
-When it makes sense, key values can be converted to and from 
+When it makes sense, key values can be converted to and from
 Unicode characters with gdk_keyval_to_unicode() and gdk_unicode_to_keyval().
 </para>
 
@@ -270,7 +269,7 @@ Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL.
 <para>
 Converts a key value into a symbolic name.
 The names are the same as those in the <filename>&lt;gdk/gdkkeysyms.h&gt;</filename> header file
-but without the leading "GDK_".
+but without the leading "GDK_KEY_".
 </para>
 
 @keyval: a key value.

docs/reference/gdk/tmpl/pango_interaction.sgml

@@ -7,9 +7,9 @@ Using Pango in GDK
 <!-- ##### SECTION Long_Description ##### -->
 <para>
 Pango is the text layout system used by GDK and GTK+. The functions
-and types in this section are used to render Pango objects to GDK.
-drawables, and also extend the set of Pango attributes to include
-stippling and embossing.
+and types in this section are used to obtain clip regions for
+#PangoLayouts, and to get #PangoContexts that can be used with
+GDK.
 </para>
 <para>
 Creating a #PangoLayout object is the first step in rendering text,
@@ -24,51 +24,38 @@ between Pango units and pixels using <link
 linkend="PANGO-SCALE-CAPS">PANGO_SCALE</link> or the PANGO_PIXELS() macro.)
 </para>
 <para>
-Rendering a Pango layout is done most simply with gdk_draw_layout();
-you can also draw pieces of the layout with gdk_draw_layout().
-#GdkPangoRenderer is a subclass of #PangoRenderer that is used internally
-to implement these functions. Using it directly or subclassing it can be
-useful in some cases. See the #GdkPangoRenderer documentation for details.
+Rendering a Pango layout is done most simply with pango_cairo_show_layout();
+you can also draw pieces of the layout with pango_cairo_show_layout_line().
 </para>
 <example id="rotated-example">
-<title>Using #GdkPangoRenderer to draw transformed text</title>
+<title>Draw transformed text with Pango and cairo</title>
 <!-- Note that this example is basically the same as
      demos/gtk-demo/rotated_text.c -->
 <programlisting>
 #define RADIUS 100
 #define N_WORDS 10
 #define FONT "Sans Bold 18"
-  
-GdkScreen *screen = gdk_drawable_get_screen (drawable);
-PangoRenderer *renderer;
-GdkGC *gc;
 
-PangoMatrix matrix = PANGO_MATRIX_INIT;
 PangoContext *context;
 PangoLayout *layout;
 PangoFontDescription *desc;
 
-double device_radius;
+double radius;
 int width, height;
 int i;
 
-/* Get the default renderer for the screen, and set it up for drawing  */
-renderer = gdk_pango_renderer_get_default (screen);
-gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), drawable);
-
-gc = gdk_gc_new (drawable);
-gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), gc);
-
 /* Set up a transformation matrix so that the user space coordinates for
  * where we are drawing are [-RADIUS, RADIUS], [-RADIUS, RADIUS]
  * We first center, then change the scale */
-gdk_drawable_get_size (drawable, &amp;width, &amp;height);
-device_radius = MIN (width, height) / 2.;
 
-pango_matrix_translate (&amp;matrix,
-                        device_radius + (width - 2 * device_radius) / 2,
-                        device_radius + (height - 2 * device_radius) / 2);
-pango_matrix_scale (&amp;matrix, device_radius / RADIUS, device_radius / RADIUS);
+width = gdk_window_get_width (window);
+height = gdk_window_get_height (window);
+radius = MIN (width, height) / 2.;
+
+cairo_translate (cr,
+                 radius + (width - 2 * radius) / 2,
+                 radius + (height - 2 * radius) / 2);
+                 cairo_scale (cr, radius / RADIUS, radius / RADIUS);
 
 /* Create a PangoLayout, set the font and text */
 context = gdk_pango_context_get_for_screen (screen);
@@ -81,41 +68,32 @@ pango_font_description_free (desc);
 /* Draw the layout N_WORDS times in a circle */
 for (i = 0; i &lt; N_WORDS; i++)
   {
-    GdkColor color;
-    PangoMatrix rotated_matrix = matrix;
-    int width, height;
-    double angle = (360. * i) / N_WORDS;
+    double red, green, blue;
+    double angle = 2 * G_PI * i / n_words;
+
+    cairo_save (cr);
 
     /* Gradient from red at angle == 60 to blue at angle == 300 */
-    color.red   = 65535 * (1 + cos ((angle - 60) * M_PI / 180.)) / 2;
-    color.green = 0;
-    color.blue  = 65535  - color.red;
-    
-    gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
-                                           PANGO_RENDER_PART_FOREGROUND, &amp;color);
-                                             
-    pango_matrix_rotate (&amp;rotated_matrix, angle);
+    red = (1 + cos (angle - 60)) / 2;
+    green = 0;
+    blue = 1 - red;
+
+    cairo_set_source_rgb (cr, red, green, blue);
+    cairo_rotate (cr, angle);
 
-    pango_context_set_matrix (context, &amp;rotated_matrix);
-    
     /* Inform Pango to re-layout the text with the new transformation matrix */
-    pango_layout_context_changed (layout);
-    
+    pango_cairo_update_layout (cr, layout);
+
     pango_layout_get_size (layout, &amp;width, &amp;height);
-    pango_renderer_draw_layout (renderer, layout,
-                                - width / 2, - RADIUS * PANGO_SCALE);
+
+    cairo_move_to (cr, - width / 2 / PANGO_SCALE, - DEFAULT_TEXT_RADIUS);
+    pango_cairo_show_layout (cr, layout);
+
+    cairo_restore (cr);
   }
 
-/* Clean up default renderer, since it is shared */
-gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
-                                       PANGO_RENDER_PART_FOREGROUND, NULL);
-gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), NULL);
-gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), NULL);
-
-/* free the objects we created */
 g_object_unref (layout);
 g_object_unref (context);
-g_object_unref (gc);
 </programlisting>
 </example>
 <figure>
@@ -160,3 +138,21 @@ g_object_unref (gc);
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_pango_context_get ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pango_context_get_for_screen ##### -->
+<para>
+
+</para>
+
+@screen: 
+@Returns: 
+
+

docs/reference/gdk/tmpl/pixbufs.sgml

@@ -1,101 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Pixbufs
-
-<!-- ##### SECTION Short_Description ##### -->
-Functions for rendering pixbufs on drawables
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-These functions allow to render pixbufs on drawables. Pixbufs are
-client-side images. For details on how to create and manipulate
-pixbufs, see the #GdkPixbuf API documentation.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION gdk_pixbuf_render_threshold_alpha ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@bitmap: 
-@src_x: 
-@src_y: 
-@dest_x: 
-@dest_y: 
-@width: 
-@height: 
-@alpha_threshold: 
-
-
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gdk_pixbuf_render_pixmap_and_mask ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@pixmap_return: 
-@mask_return: 
-@alpha_threshold: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_render_pixmap_and_mask_for_colormap ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@colormap: 
-@pixmap_return: 
-@mask_return: 
-@alpha_threshold: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_get_from_drawable ##### -->
-<para>
-
-</para>
-
-@dest: 
-@src: 
-@cmap: 
-@src_x: 
-@src_y: 
-@dest_x: 
-@dest_y: 
-@width: 
-@height: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_get_from_surface ##### -->
-<para>
-
-</para>
-
-@dest: 
-@surface: 
-@src_x: 
-@src_y: 
-@dest_x: 
-@dest_y: 
-@width: 
-@height: 
-@Returns: 
-
-

docs/reference/gdk/tmpl/regions.sgml

@@ -1,72 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Points and Rectangles
-
-<!-- ##### SECTION Short_Description ##### -->
-Simple graphical data types
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-GDK provides the #GdkPoint and #GdkRectangle data types for representing pixels
-and sets of pixels on the screen. Together with Cairo's #cairo_region_t data
-type, they make up the central types for representing graphical data.
-</para>
-<para>
-#GdkPoint is a simple structure containing an x and y coordinate of a point.
-</para>
-<para>
-#GdkRectangle is a structure holding the position and size of a rectangle.
-The intersection of two rectangles can be computed with
-gdk_rectangle_intersect(). To find the union of two rectangles use
-gdk_rectangle_union().
-</para>
-<para>
-#cairo_region_t is usually used for managing clipping of graphical operations.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GdkPoint ##### -->
-<para>
-Defines the x and y coordinates of a point.
-</para>
-
-@x: the x coordinate of the point.
-@y: the y coordinate of the point.
-
-<!-- ##### TYPEDEF GdkRectangle ##### -->
-<para>
-Defines the position and size of a rectangle. It is identical to 
-#cairo_rectangle_int_t.
-</para>
-
-
-<!-- ##### FUNCTION gdk_rectangle_intersect ##### -->
-<para>
-
-</para>
-
-@src1: 
-@src2: 
-@dest: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_rectangle_union ##### -->
-<para>
-
-</para>
-
-@src1: 
-@src2: 
-@dest: 
-
-

docs/reference/gdk/tmpl/threads.sgml

@@ -300,13 +300,6 @@ Leaves a critical region begun with gdk_threads_enter().
 @void: 
 
 
-<!-- ##### VARIABLE gdk_threads_mutex ##### -->
-<para>
-The #GMutex used to implement the critical region for
-gdk_threads_enter()/gdk_threads_leave(). 
-</para>
-
-
 <!-- ##### FUNCTION gdk_threads_set_lock_functions ##### -->
 <para>
 

docs/reference/gdk/tmpl/visuals.sgml

@@ -18,12 +18,8 @@ of an RGB pixel may be in the top 8 bits of the pixel, or may be in the lower
 </para>
 <para>
 There are several standard visuals. The visual returned
-by gdk_visual_get_system() is the system's default
-visual. gdk_rgb_get_visual() return the visual most
-suited to displaying full-color image data. If you
-use the calls in #GdkRGB, you should create your windows
-using this visual (and the colormap returned by
-gdk_rgb_get_colormap()).
+by gdk_screen_get_system_visual() is the system's default
+visual.
 </para>
 <para>
 A number of functions are provided for determining
@@ -40,7 +36,7 @@ then %GDK_VISUAL_STATIC_GRAY.
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
-#GdkColormap
+
 </para>
 
 <!-- ##### SECTION Stability_Level ##### -->

docs/reference/gdk/tmpl/x_interaction.sgml

@@ -6,7 +6,17 @@ X backend-specific functions
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-
+The functions in this section are specific to the GDK X11 backend.
+To use them, you need to include the <literal>&lt;gdk/gdkx.h&gt;</literal>
+header and use the X11-specific pkg-config files to build your application
+(either <literal>gdk-x11-3.0</literal> or <literal>gtk+-x11-3.0</literal>.
+To make your code compile with other GDK backends, guard backend-specific
+calls by an ifdef as follows:
+<informalexample><programlisting>
+#ifdef GDK_WINDOWING_X11
+  /* X11-specific calls here... */
+#endif
+</programlisting></informalexample>
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -27,14 +37,6 @@ Obtains the Xlib window id of the root window of the current screen.
 
 
 
-<!-- ##### MACRO GDK_DISPLAY ##### -->
-<para>
-The current display.
-</para>
-
-@Returns: an Xlib <type>Display*</type>.
-
-
 <!-- ##### MACRO GDK_WINDOW_XDISPLAY ##### -->
 <para>
 Returns the display of a #GdkWindow.
@@ -53,24 +55,6 @@ Returns the X window belonging to a #GdkWindow.
 @Returns: the Xlib <type>Window</type> of @win.
 
 
-<!-- ##### MACRO GDK_PIXMAP_XDISPLAY ##### -->
-<para>
-Returns the display of a #GdkPixmap.
-</para>
-
-@pix: a #GdkPixmap.
-@Returns: an Xlib <type>Display*</type>.
-
-
-<!-- ##### MACRO GDK_PIXMAP_XID ##### -->
-<para>
-Returns the X pixmap belonging to a #GdkPixmap.
-</para>
-
-@pix: a #GdkPixmap.
-@Returns: the Xlib <type>XPixmap</type> of @win.
-
-
 <!-- ##### MACRO GDK_DISPLAY_XDISPLAY ##### -->
 <para>
 Returns the display of a #GdkDisplay.
@@ -97,24 +81,6 @@ Returns the X resource (window or pixmap) belonging to a #GdkDrawable.
 @Returns: the ID of @win's X resource.
 
 
-<!-- ##### MACRO GDK_COLORMAP_XDISPLAY ##### -->
-<para>
-Returns the display of a #GdkColormap.
-</para>
-
-@cmap: a #GdkColormap.
-@Returns: an Xlib <type>Display*</type>.
-
-
-<!-- ##### MACRO GDK_COLORMAP_XCOLORMAP ##### -->
-<para>
-Returns the X colormap belonging to a #GdkColormap.
-</para>
-
-@cmap: a #GdkColormap.
-@Returns: an Xlib <type>Colormap</type>.
-
-
 <!-- ##### MACRO GDK_SCREEN_XDISPLAY ##### -->
 <para>
 Returns the display of a #GdkScreen.
@@ -143,15 +109,6 @@ Returns the screen of a #GdkScreen.
 @Returns: an Xlib <type>Screen*</type>.
 
 
-<!-- ##### MACRO GDK_VISUAL_XVISUAL ##### -->
-<para>
-Returns the X visual belonging to a #GdkVisual.
-</para>
-
-@vis: a #GdkVisual.
-@Returns: an Xlib <type>Visual*</type>.
-
-
 <!-- ##### MACRO GDK_CURSOR_XCURSOR ##### -->
 <para>
 Returns the X cursor belonging to a #GdkCursor.
@@ -186,38 +143,6 @@ Another name for GDK_DRAWABLE_XID().
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_pixmap_foreign_new ##### -->
-<para>
-
-</para>
-
-@anid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixmap_foreign_new_for_display ##### -->
-<para>
-
-</para>
-
-@display: 
-@anid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixmap_foreign_new_for_screen ##### -->
-<para>
-
-</para>
-
-@screen: 
-@anid: 
-@width: 
-@height: 
-@depth: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_window_foreign_new ##### -->
 <para>
 
@@ -274,24 +199,6 @@ Another name for GDK_DRAWABLE_XID().
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_pixmap_lookup ##### -->
-<para>
-</para>
-
-@anid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixmap_lookup_for_display ##### -->
-<para>
-
-</para>
-
-@display: 
-@anid: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_x11_lookup_xdisplay ##### -->
 <para>
 
@@ -384,34 +291,6 @@ Another name for GDK_DRAWABLE_XID().
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_x11_colormap_foreign_new ##### -->
-<para>
-
-</para>
-
-@visual: 
-@xcolormap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_x11_colormap_get_xcolormap ##### -->
-<para>
-
-</para>
-
-@colormap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_x11_colormap_get_xdisplay ##### -->
-<para>
-
-</para>
-
-@colormap: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_x11_cursor_get_xcursor ##### -->
 <para>
 
@@ -474,6 +353,22 @@ Another name for GDK_DRAWABLE_XID().
 @display: 
 
 
+<!-- ##### FUNCTION gdk_x11_display_error_trap_push ##### -->
+<para>
+
+</para>
+
+@display: 
+
+
+<!-- ##### FUNCTION gdk_x11_display_error_trap_pop_ignored ##### -->
+<para>
+
+</para>
+
+@display: 
+
+
 <!-- ##### FUNCTION gdk_x11_display_set_cursor_theme ##### -->
 <para>
 

docs/reference/gtk/Makefile.am

@@ -132,138 +132,141 @@ content_files =					\
 	gtk-query-immodules-3.0.xml		\
 	gtk-update-icon-cache-3.0.xml		\
 	gtk-builder-convert-3.0.xml		\
-	visual_index.xml
+	visual_index.xml			\
+	getting_started.xml			\
+	overview.xml
 
 expand_content_files = 				\
 	drawing-model.xml			\
+	getting_started.xml			\
 	glossary.xml				\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
-	tree_widget.sgml			\
+	question_index.sgml			\
 	text_widget.sgml			\
-	question_index.sgml
+	tree_widget.sgml
 
 # Images to copy into HTML directory
 HTML_IMAGES = \
-	$(top_srcdir)/gtk/stock-icons/24/gtk-about.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-add.png			\
+	$(top_srcdir)/gtk/stock-icons/24/help-about.png			\
+	$(top_srcdir)/gtk/stock-icons/24/list-add.png			\
 	$(top_srcdir)/gtk/stock-icons/20/gtk-apply.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-bold.png			\
+	$(top_srcdir)/gtk/stock-icons/24/format-text-bold.png		\
 	$(top_srcdir)/gtk/stock-icons/20/gtk-cancel.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-caps-lock-warning.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-cdrom.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-clear.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-close.png			\
+	$(top_srcdir)/gtk/stock-icons/24/media-optical.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-clear.png			\
+	$(top_srcdir)/gtk/stock-icons/24/window-close.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-connect.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-convert.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-copy.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-cut.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-delete.png			\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-authentication.png 	\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-error.png		\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-info.png		\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-question.png	\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-warning.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-directory.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-copy.png			\
+	$(top_srcdir)/gtk/stock-icons/24/edit-cut.png			\
+	$(top_srcdir)/gtk/stock-icons/24/edit-delete.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-password.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-error.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-information.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-question.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-warning.png		\
+	$(top_srcdir)/gtk/stock-icons/24/folder.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-disconnect.png		\
 	$(top_srcdir)/gtk/stock-icons/32/gtk-dnd.png			\
 	$(top_srcdir)/gtk/stock-icons/32/gtk-dnd-multiple.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-edit.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-execute.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-file.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-find.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-find-and-replace.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-bottom.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-first-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-first-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-last-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-last-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-top.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-back-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-back-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-down.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-forward-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-forward-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-up.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-harddisk.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-network.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-help.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-home.png			\
+	$(top_srcdir)/gtk/stock-icons/24/system-run.png			\
+	$(top_srcdir)/gtk/stock-icons/24/document-x-generic.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-find.png			\
+	$(top_srcdir)/gtk/stock-icons/24/edit-find-replace.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-bottom.png			\
+	$(top_srcdir)/gtk/stock-icons/24/go-first-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-first-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-last-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-last-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-top.png			\
+	$(top_srcdir)/gtk/stock-icons/24/go-previous-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-previous-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-down.png			\
+	$(top_srcdir)/gtk/stock-icons/24/go-next-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-next-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-up.png			\
+	$(top_srcdir)/gtk/stock-icons/24/drive-harddisk.png		\
+	$(top_srcdir)/gtk/stock-icons/24/network-idle.png		\
+	$(top_srcdir)/gtk/stock-icons/24/help-contents.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-home.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-index.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-indent-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-indent-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-unindent-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-unindent-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-italic.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-jump-to-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-jump-to-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-justify-center.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-justify-fill.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-justify-left.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-justify-right.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-missing-image.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-new.png			\
+	$(top_srcdir)/gtk/stock-icons/24/format-indent-more-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-indent-more-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-indent-less-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-indent-less-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-text-italic.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-jump-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-jump-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/format-justify-center.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-justify-fill.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-justify-left.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-justify-right.png	\
+	$(top_srcdir)/gtk/stock-icons/24/image-missing.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-new.png		\
 	$(top_srcdir)/gtk/stock-icons/20/gtk-no.png			\
 	$(top_srcdir)/gtk/stock-icons/20/gtk-ok.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-open.png			\
+	$(top_srcdir)/gtk/stock-icons/24/document-open.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-landscape.png	\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-portrait.png	\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-reverse-landscape.png \
 	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-reverse-portrait.png \
-	$(top_srcdir)/gtk/stock-icons/24/gtk-paste.png			\
+	$(top_srcdir)/gtk/stock-icons/24/edit-paste.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-preferences.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-print.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-print-error.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-print-paused.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-print-preview.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-print-report.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-print-warning.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-properties.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-quit.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-redo-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-redo-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-refresh.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-remove.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-revert-to-saved-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-revert-to-saved-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-floppy.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-save.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-save-as.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-select-all.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-print.png		\
+	$(top_srcdir)/gtk/stock-icons/24/printer-error.png		\
+	$(top_srcdir)/gtk/stock-icons/24/printer-paused.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-print-preview.png	\
+	$(top_srcdir)/gtk/stock-icons/24/printer-info.png		\
+	$(top_srcdir)/gtk/stock-icons/24/printer-warning.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-properties.png	\
+	$(top_srcdir)/gtk/stock-icons/24/application-exit.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-redo-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-redo-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/view-refresh.png		\
+	$(top_srcdir)/gtk/stock-icons/24/list-remove.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-revert-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/document-revert-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-floppy.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-save.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-save-as.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-select-all.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-select-color.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-color-picker.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-font.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-sort-ascending.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-sort-descending.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-spell-check.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-stop.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-strikethrough.png		\
+	$(top_srcdir)/gtk/stock-icons/24/view-sort-ascending.png	\
+	$(top_srcdir)/gtk/stock-icons/24/view-sort-descending.png	\
+	$(top_srcdir)/gtk/stock-icons/24/tools-check-spelling.png	\
+	$(top_srcdir)/gtk/stock-icons/24/process-stop.png		\
+	$(top_srcdir)/gtk/stock-icons/24/format-text-strikethrough.png	\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-undelete-ltr.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-undelete-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-underline.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-undo-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-undo-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/format-text-underline.png	\
+	$(top_srcdir)/gtk/stock-icons/24/edit-undo-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-undo-rtl.png		\
 	$(top_srcdir)/gtk/stock-icons/20/gtk-yes.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-zoom-100.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-zoom-fit.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-zoom-in.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-zoom-out.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-forward-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-forward-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-next-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-next-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-pause.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-play-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-play-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-previous-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-previous-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-record.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-rewind-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-rewind-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-stop.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-fullscreen.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-leave-fullscreen.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-info.png			\
+	$(top_srcdir)/gtk/stock-icons/24/zoom-original.png		\
+	$(top_srcdir)/gtk/stock-icons/24/zoom-fit-best.png		\
+	$(top_srcdir)/gtk/stock-icons/24/zoom-in.png			\
+	$(top_srcdir)/gtk/stock-icons/24/zoom-out.png			\
+	$(top_srcdir)/gtk/stock-icons/24/media-seek-forward-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-seek-forward-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-skip-forward-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-skip-forward-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-playback-pause.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-playback-start-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-playback-start-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-seek-backward-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-seek-backward-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-record.png		\
+	$(top_srcdir)/gtk/stock-icons/24/media-skip-backward-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-skip-backward-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-playback-stop.png	\
+	$(top_srcdir)/gtk/stock-icons/24/view-fullscreen.png		\
+	$(top_srcdir)/gtk/stock-icons/24/view-restore.png		\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-page-setup.png		\
 	$(srcdir)/images/aboutdialog.png				\
 	$(srcdir)/images/accel-label.png				\
 	$(srcdir)/images/assistant.png					\
@@ -315,7 +318,9 @@ HTML_IMAGES = \
 	$(srcdir)/images/layout-rlbt.png				\
 	$(srcdir)/images/layout-rltb.png				\
 	$(srcdir)/images/layout-tblr.png				\
-	$(srcdir)/images/layout-tbrl.png
+	$(srcdir)/images/layout-tbrl.png				\
+	$(srcdir)/images/window-default.png				\
+	$(srcdir)/images/hello-world.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \

docs/reference/gtk/building.sgml

@@ -330,12 +330,8 @@ How to compile GTK+ itself
             <arg>--enable-debug=[no|minimum|yes]</arg>
           </group>
           <group>
-            <arg>--disable-visibility</arg>
-            <arg>--enable-visibility</arg>
-          </group>
-          <group>
-            <arg>--disable-shm</arg>
-            <arg>--enable-shm</arg>
+            <arg>--disable-Bsymbolic</arg>
+            <arg>--enable-Bsymbolic</arg>
           </group>
           <group>
             <arg>--disable-xkb</arg>
@@ -398,7 +394,7 @@ How to compile GTK+ itself
 
       <formalpara>
         <title><systemitem>--enable-debug</systemitem></title>
-        
+
         <para>
          Turns on various amounts of debugging support. Setting this to 'no'
          disables g_assert(), g_return_if_fail(), g_return_val_if_fail() and
@@ -415,15 +411,11 @@ How to compile GTK+ itself
       </formalpara>
 
       <formalpara>
-        <title><systemitem>--disable-visibility</systemitem> and
-          <systemitem>--enable-visibility</systemitem></title>
+        <title><systemitem>--disable-Bsymbolic</systemitem> and
+          <systemitem>--enable-Bsymbolic</systemitem></title>
         <para>
-          The option <systemitem>--disable-visibility</systemitem>
-          turns off the use of ELF visibility attributes for linking
-          optimizations. This makes sense while changing GTK+ itself,
-          since the way in which GTK+ uses visibility attributes
-          forces a full rebuild of all source files for any header
-          modification.
+          The option <systemitem>--disable-Bsymbolic</systemitem>
+          turns off the use of the -Bsymbolic-functions linker flag.
         </para>
       </formalpara>
 
@@ -452,17 +444,6 @@ How to compile GTK+ itself
         </para>
       </formalpara>
 
-      <formalpara>
-        <title><systemitem>--disable-shm</systemitem> and
-          <systemitem>--enable-shm</systemitem></title>
-
-        <para>
-          These options can be used to control whether GTK+ will use shared
-          memory to communicate with the X server when possible.
-          The default is 'yes'.
-        </para>
-      </formalpara>
-
       <formalpara>
         <title><systemitem>--disable-xkb</systemitem> and
           <systemitem>--enable-xkb</systemitem></title>

docs/reference/gtk/getting_started.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<chapter id="gtk-getting-started" xmlns:xi="http://www.w3.org/2003/XInclude">
+  <title>Getting Started with GTK+</title>
+
+  <para>This chapter is contains some tutorial information to get you
+  started with GTK+ programming. It assumes that you have GTK+, its
+  dependencies and a C compiler installed and ready to use. If you
+  need to build GTK+ itself first, refer to the
+  <link linkend="gtk-compiling">Compiling the GTK+ libraries</link>
+  section in this reference.</para>
+
+  <para>To begin our introduction to GTK, we'll start with the simplest
+  program possible. This program will create an empty 200x200 pixel
+  window:</para>
+
+  <para>
+    <inlinegraphic fileref="window-default.png" format="PNG"></inlinegraphic>
+  </para>
+
+  <informalexample><programlisting>
+    <xi:include href="../../../../examples/window-default.c" parse="text">
+      <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
+    </xi:include>
+  </programlisting></informalexample>
+
+  <para>You can compile the program above with GCC using:</para>
+
+  <para><literallayout>
+    <literal>gcc `pkg-config --cflags gtk+-3.0` -o window-default window-default.c `pkg-config --libs gtk+-3.0`</literal>
+  </literallayout></para>
+
+  <note><para>For more information on how to compile a GTK+ application, please
+  refer to the <link linkend="gtk-compiling">Compiling GTK+ Applications</link>
+  section in this reference.</para></note>
+
+  <para>All GTK+ applications will, of course, include
+  <filename>gtk/gtk.h</filename>, which declares functions, types and
+  macros required by GTK+ applications.</para>
+
+  <warning><para>Even if GTK+ installs multiple header files, only the
+  top-level <filename>gtk/gtk.h</filename> header can be directly included
+  by third party code. The compiler will abort with an error if any other
+  header will be included.</para></warning>
+
+  <para>We then proceed into the <function>main</function>() function of the
+  application, and we declare a <varname>window</varname> variable as a pointer
+  of type #GtkWidget.</para>
+
+  <para>The following line will call gtk_init(), which
+  is the initialization function for GTK+; this function will set up GTK+,
+  the type system, the connection to the windowing environment, etc. The
+  gtk_init() takes as arguments the pointers to the command line arguments
+  counter and string array; this allows GTK+ to parse specific command line
+  arguments that control the behavior of GTK+ itself. The parsed arguments
+  will be removed from the array, leaving the unrecognized ones for your
+  application to parse.</para>
+
+  <note><para>For more information on which command line arguments GTK+
+  recognizes, please refer to the <link linkend="gtk-running">Running GTK+
+  Applications</link> section in this reference.</para></note>
+
+  <para>The call to gtk_window_new() will create a new #GtkWindow and store
+  it inside the <varname>window</varname> variable. The type of the window
+  is %GTK_WINDOW_TOPLEVEL, which means that the #GtkWindow will be managed
+  by the windowing system: it will have a frame, a title bar and window
+  controls, depending on the platform.</para>
+
+  <para>In order to terminate the application when the #GtkWindow is
+  destroyed, we connect the #GtkWidget::destroy signal to the gtk_main_quit()
+  function. This function will terminate the GTK+ main loop started by calling
+  gtk_main() later. The #GtkWidget::destroy signal is emitted when a widget is
+  destroyed, either by explicitly calling gtk_widget_destroy() or when the
+  widget is unparented. Top-level #GtkWindow<!-- -->s are also destroyed when
+  the Close window control button is clicked.</para>
+
+  <para>#GtkWidget<!-- -->s are hidden by default. By calling gtk_widget_show()
+  on a #GtkWidget we are asking GTK+ to set the visibility attribute so that it
+  can be displayed. All this work is done after the main loop has been
+  started.</para>
+
+  <para>The last line of interest is the call to gtk_main(). This function will
+  start the GTK+ main loop and will block the control flow of the
+  <function>main</function>() until the gtk_main_quit() function is
+  called.</para>
+
+  <para>The following example is slightly more complex, and tries to
+  showcase some of the capabilities of GTK+.</para>
+
+  <para>In the long tradition of programming languages and libraries,
+  it is called <emphasis>Hello, World</emphasis>.</para>
+
+  <para>
+    <inlinegraphic fileref="hello-world.png" format="PNG"></inlinegraphic>
+  </para>
+
+  <example id="gtk-getting-started-hello-world">
+    <title>Hello World in GTK+</title>
+    <programlisting>
+      <xi:include href="../../../../examples/hello-world.c" parse="text">
+        <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
+      </xi:include>
+    </programlisting>
+  </example>
+
+</chapter>

docs/reference/gtk/gtk-docs.sgml

@@ -4,7 +4,6 @@
 <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 <!ENTITY version SYSTEM "version.xml">
 ]>
-<!--ENTITY index-Objects-Grouped SYSTEM "objects_grouped.sgml"-->
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>GTK+ Reference Manual</title>
@@ -17,102 +16,8 @@
 
   <part id="gtk">
     <title>GTK+ Overview</title>
-    <partintro>
-    <para>
-GTK+ is a library for creating graphical user interfaces. It
-works on many UNIX-like platforms, Windows, and on framebuffer
-devices. GTK+ is released under the GNU Library General Public License
-(GNU LGPL), which allows for flexible licensing of client
-applications. GTK+ has a C-based object-oriented architecture that
-allows for maximum flexibility.  Bindings for other languages have
-been written, including C++, Objective-C, Guile/Scheme, Perl, Python,
-TOM, Ada95, Free Pascal, and Eiffel.
-    </para>
-    <para>
-GTK+ depends on the following libraries:
-<variablelist>
-
-<varlistentry>
-<term>GLib</term>
-<listitem><para>
-A general-purpose utility library, not specific to graphical user interfaces.
-GLib provides many useful data types, macros, type conversions,
-string utilities, file utilities, a main loop abstraction, and so on.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>GObject</term>
-<listitem><para>A library that provides a type system, a collection of
-fundamental types including an object type, a signal system.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>GIO</term>
-<listitem><para>A modern, easy-to-use VFS API including abstractions for
-files, drives, volumes, stream IO, as well as network programming and
-DBus communication.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>cairo</term>
-<listitem><para>Cairo is a 2D graphics library with support for multiple
-output devices.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Pango</term>
-<listitem><para>
-Pango is a library for internationalized text handling. It centers
-around the #PangoLayout object, representing a paragraph of text.
-Pango provides the engine for #GtkTextView, #GtkLabel, #GtkEntry, and
-other widgets that display text.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>ATK</term>
-<listitem><para>
-ATK is the Accessibility Toolkit. It provides a set of generic
-interfaces allowing accessibility technologies to interact with a
-graphical user interface. For example, a screen reader uses ATK to
-discover the text in an interface and read it to blind users.  GTK+
-widgets have built-in support for accessibility using the ATK
-framework.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>GdkPixbuf</term>
-<listitem><para>
-This is a small library which allows you to create #GdkPixbuf
-("pixel buffer") objects from image data or image files.
-Use a #GdkPixbuf in combination with #GtkImage to display images.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>GDK</term>
-<listitem><para>
-GDK is the abstraction layer that allows GTK+ to support multiple
-windowing systems. GDK provides drawing and window system facilities
-on X11, Windows, and the Linux framebuffer device.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>GTK+</term>
-<listitem><para>
-The GTK+ library itself contains <firstterm>widgets</firstterm>,
-that is, GUI components such as #GtkButton or #GtkTextView.
-</para></listitem>
-</varlistentry>
-</variablelist>
-    </para>
-</partintro>
+    <xi:include href="overview.xml"/>
+    <xi:include href="xml/getting_started.xml"/>
     <xi:include href="building.sgml" />
     <xi:include href="compiling.sgml" />
     <xi:include href="running.sgml" />
@@ -128,6 +33,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
   <part  id="gtkbase">
     <title>GTK+ Core Reference</title>
     <xi:include href="xml/gtkmain.xml" />
+    <xi:include href="xml/gtkfeatures.xml" />
     <xi:include href="xml/gtkaccelgroup.xml" />
     <xi:include href="xml/gtkaccelmap.xml" />
     <xi:include href="xml/gtkclipboard.xml" />
@@ -141,8 +47,6 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <xi:include href="xml/gtkenums.xml" />
     <xi:include href="xml/gtkstyle.xml" />
     <xi:include href="xml/gtkselection.xml" />
-    <xi:include href="xml/gtkfeatures.xml" />
-    <xi:include href="xml/gtktypeutils.xml" />
     <xi:include href="xml/gtktesting.xml" />
     <xi:include href="xml/filesystem.xml" />
   </part>
@@ -249,7 +153,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <chapter id="MenusAndCombos">
       <title>Menus, Combo Box, Toolbar</title>
       <xi:include href="xml/gtkcombobox.xml" />
-      <xi:include href="xml/gtkcomboboxentry.xml" />
+      <xi:include href="xml/gtkcomboboxtext.xml" />
       <xi:include href="xml/gtkmenu.xml" />
       <xi:include href="xml/gtkmenubar.xml" />
       <xi:include href="xml/gtkmenuitem.xml" />
@@ -282,7 +186,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     </chapter>
 
     <chapter id="SelectorWidgets">
-      <title>Selectors (File/Font/Color/Input Devices)</title>
+      <title>Selectors (Color/File/Font)</title>
       <xi:include href="xml/gtkcolorbutton.xml" />
       <xi:include href="xml/gtkcolorseldlg.xml" />
       <xi:include href="xml/gtkcolorsel.xml" />
@@ -316,7 +220,6 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtktable.xml" />
       <xi:include href="xml/gtkexpander.xml" />
       <xi:include href="xml/gtkorientable.xml" />
-      <xi:include href="xml/gtksizerequest.xml" />
     </chapter>
 
     <chapter id="Ornaments">
@@ -366,14 +269,12 @@ that is, GUI components such as #GtkButton or #GtkTextView.
 
     <chapter id="AbstractObjects">
       <title>Abstract Base Classes</title>
-      <xi:include href="xml/gtkbin.xml" />
+      <xi:include href="xml/gtkwidget.xml" />
       <xi:include href="xml/gtkcontainer.xml" />
-      <xi:include href="xml/gtkitem.xml" />
+      <xi:include href="xml/gtkbin.xml" />
       <xi:include href="xml/gtkmenushell.xml" />
       <xi:include href="xml/gtkmisc.xml" />
-      <xi:include href="xml/gtkobject.xml" />
       <xi:include href="xml/gtkrange.xml" />
-      <xi:include href="xml/gtkwidget.xml" />
       <xi:include href="xml/gtkimcontext.xml" />
     </chapter>
 

docs/reference/gtk/gtk3-sections.txt

@@ -37,9 +37,6 @@ gtk_about_dialog_get_logo
 gtk_about_dialog_set_logo
 gtk_about_dialog_get_logo_icon_name
 gtk_about_dialog_set_logo_icon_name
-GtkAboutDialogActivateLinkFunc
-gtk_about_dialog_set_email_hook
-gtk_about_dialog_set_url_hook
 gtk_show_about_dialog
 <SUBSECTION Standard>
 GTK_ABOUT_DIALOG
@@ -594,6 +591,7 @@ gtk_calendar_select_month
 gtk_calendar_select_day
 gtk_calendar_mark_day
 gtk_calendar_unmark_day
+gtk_calendar_get_day_is_marked
 gtk_calendar_clear_marks
 
 <SUBSECTION>
@@ -769,6 +767,7 @@ gtk_color_selection_dialog_get_type
 <TITLE>GtkComboBox</TITLE>
 GtkComboBox
 gtk_combo_box_new
+gtk_combo_box_new_with_entry
 gtk_combo_box_new_with_model
 gtk_combo_box_get_wrap_width
 gtk_combo_box_set_wrap_width
@@ -782,12 +781,6 @@ gtk_combo_box_get_active_iter
 gtk_combo_box_set_active_iter
 gtk_combo_box_get_model
 gtk_combo_box_set_model
-gtk_combo_box_new_text
-gtk_combo_box_append_text
-gtk_combo_box_insert_text
-gtk_combo_box_prepend_text
-gtk_combo_box_remove_text
-gtk_combo_box_get_active_text
 gtk_combo_box_popup_for_device
 gtk_combo_box_popup
 gtk_combo_box_popdown
@@ -802,6 +795,9 @@ gtk_combo_box_set_focus_on_click
 gtk_combo_box_get_focus_on_click
 gtk_combo_box_set_button_sensitivity
 gtk_combo_box_get_button_sensitivity
+gtk_combo_box_get_has_entry
+gtk_combo_box_set_entry_text_column
+gtk_combo_box_get_entry_text_column
 <SUBSECTION Standard>
 GTK_TYPE_COMBO_BOX
 GTK_COMBO_BOX
@@ -815,27 +811,30 @@ gtk_combo_box_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkcomboboxentry</FILE>
-<TITLE>GtkComboBoxEntry</TITLE>
-GtkComboBoxEntry
-gtk_combo_box_entry_new
-gtk_combo_box_entry_new_with_model
-gtk_combo_box_entry_new_text
-gtk_combo_box_entry_set_text_column
-gtk_combo_box_entry_get_text_column
+<FILE>gtkcomboboxtext</FILE>
+<TITLE>GtkComboBoxText</TITLE>
+GtkComboBoxText
+gtk_combo_box_text_new
+gtk_combo_box_text_new_with_entry
+gtk_combo_box_text_append_text
+gtk_combo_box_text_insert_text
+gtk_combo_box_text_prepend_text
+gtk_combo_box_text_remove
+gtk_combo_box_text_get_active_text
+
 <SUBSECTION Standard>
-GTK_TYPE_COMBO_BOX_ENTRY
-GTK_COMBO_BOX_ENTRY
-GTK_COMBO_BOX_ENTRY_CLASS
-GTK_IS_COMBO_BOX_ENTRY
-GTK_IS_COMBO_BOX_ENTRY_CLASS
-GTK_COMBO_BOX_ENTRY_GET_CLASS
+GTK_TYPE_COMBO_BOX_TEXT
+GTK_COMBO_BOX_TEXT
+GTK_IS_COMBO_BOX_TEXT
+GTK_COMBO_BOX_TEXT_CLASS
+GTK_IS_COMBO_BOX_TEXT_CLASS
+GTK_COMBO_BOX_TEXT_GET_CLASS
+
 <SUBSECTION Private>
-GtkComboBoxEntryPrivate
-gtk_combo_box_entry_get_type
+GtkComboBoxTextPrivate
+gtk_combo_box_text_get_type
 </SECTION>
 
-<SECTION>
 <FILE>gtkcontainer</FILE>
 <TITLE>GtkContainer</TITLE>
 GtkContainer
@@ -867,13 +866,15 @@ gtk_container_child_set_valist
 gtk_container_forall
 gtk_container_get_border_width
 gtk_container_set_border_width
-gtk_container_propagate_expose
+gtk_container_propagate_draw
 gtk_container_get_focus_chain
 gtk_container_set_focus_chain
 gtk_container_unset_focus_chain
 gtk_container_class_find_child_property
 gtk_container_class_install_child_property
 gtk_container_class_list_child_properties
+gtk_container_class_handle_border_width
+
 <SUBSECTION Standard>
 GTK_CONTAINER
 GTK_IS_CONTAINER
@@ -898,9 +899,7 @@ gtk_dialog_response
 gtk_dialog_add_button
 gtk_dialog_add_buttons
 gtk_dialog_add_action_widget
-gtk_dialog_get_has_separator
 gtk_dialog_set_default_response
-gtk_dialog_set_has_separator
 gtk_dialog_set_response_sensitive
 gtk_dialog_get_response_for_widget
 gtk_dialog_get_widget_for_response
@@ -1612,8 +1611,8 @@ gtk_icon_view_get_cursor
 gtk_icon_view_selected_foreach
 gtk_icon_view_set_selection_mode
 gtk_icon_view_get_selection_mode
-gtk_icon_view_set_orientation
-gtk_icon_view_get_orientation
+gtk_icon_view_set_item_orientation
+gtk_icon_view_get_item_orientation
 gtk_icon_view_set_columns
 gtk_icon_view_get_columns
 gtk_icon_view_set_item_width
@@ -1676,7 +1675,6 @@ GtkImage
 GtkImageType
 gtk_image_get_icon_set
 gtk_image_get_pixbuf
-gtk_image_get_pixmap
 gtk_image_get_stock
 gtk_image_get_animation
 gtk_image_get_icon_name
@@ -1685,7 +1683,6 @@ gtk_image_get_storage_type
 gtk_image_new_from_file
 gtk_image_new_from_icon_set
 gtk_image_new_from_pixbuf
-gtk_image_new_from_pixmap
 gtk_image_new_from_stock
 gtk_image_new_from_animation
 gtk_image_new_from_icon_name
@@ -1693,7 +1690,6 @@ gtk_image_new_from_gicon
 gtk_image_set_from_file
 gtk_image_set_from_icon_set
 gtk_image_set_from_pixbuf
-gtk_image_set_from_pixmap
 gtk_image_set_from_stock
 gtk_image_set_from_animation
 gtk_image_set_from_icon_name
@@ -1833,24 +1829,6 @@ GTK_INVISIBLE_GET_CLASS
 gtk_invisible_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkitem</FILE>
-<TITLE>GtkItem</TITLE>
-GtkItem
-gtk_item_select
-gtk_item_deselect
-gtk_item_toggle
-<SUBSECTION Standard>
-GTK_ITEM
-GTK_IS_ITEM
-GTK_TYPE_ITEM
-GTK_ITEM_CLASS
-GTK_IS_ITEM_CLASS
-GTK_ITEM_GET_CLASS
-<SUBSECTION Private>
-gtk_item_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtklabel</FILE>
 <TITLE>GtkLabel</TITLE>
@@ -1944,8 +1922,6 @@ gtk_link_button_new
 gtk_link_button_new_with_label
 gtk_link_button_get_uri
 gtk_link_button_set_uri
-GtkLinkButtonUriFunc
-gtk_link_button_set_uri_hook
 gtk_link_button_get_visited
 gtk_link_button_set_visited
 
@@ -2243,12 +2219,10 @@ gtk_notebook_get_tab_detachable
 gtk_notebook_get_tab_hborder
 gtk_notebook_get_tab_vborder
 gtk_notebook_set_current_page
-gtk_notebook_set_group
-gtk_notebook_get_group
+gtk_notebook_set_group_name
+gtk_notebook_get_group_name
 gtk_notebook_set_action_widget
 gtk_notebook_get_action_widget
-GtkNotebookWindowCreationFunc
-gtk_notebook_set_window_creation_hook
 <SUBSECTION Standard>
 GTK_NOTEBOOK
 GTK_IS_NOTEBOOK
@@ -2262,34 +2236,12 @@ GtkNotebookTab
 GtkNotebookPrivate
 </SECTION>
 
-<SECTION>
-<FILE>gtkobject</FILE>
-<TITLE>GtkObject</TITLE>
-GtkObject
-GtkObjectFlags
-GTK_OBJECT_FLAGS
-gtk_object_destroy
-<SUBSECTION Standard>
-GTK_OBJECT
-GTK_IS_OBJECT
-GTK_TYPE_OBJECT
-GTK_OBJECT_CLASS
-GTK_IS_OBJECT_CLASS
-GTK_OBJECT_GET_CLASS
-
-<SUBSECTION Private>
-gtk_object_get_type
-GTK_ARG_READWRITE
-GTK_OBJECT_SET_FLAGS
-GTK_OBJECT_UNSET_FLAGS
-</SECTION>
-
 <SECTION>
 <FILE>gtkoffscreenwindow</FILE>
 <TITLE>GtkOffscreenWindow</TITLE>
 GtkOffscreenWindow
 gtk_offscreen_window_new
-gtk_offscreen_window_get_pixmap
+gtk_offscreen_window_get_surface
 gtk_offscreen_window_get_pixbuf
 <SUBSECTION Standard>
 GTK_OFFSCREEN_WINDOW
@@ -2360,9 +2312,8 @@ gtk_progress_bar_new
 gtk_progress_bar_pulse
 gtk_progress_bar_set_fraction
 gtk_progress_bar_get_fraction
-GtkProgressBarOrientation
-gtk_progress_bar_set_orientation
-gtk_progress_bar_get_orientation
+gtk_progress_bar_set_inverted
+gtk_progress_bar_get_inverted
 gtk_progress_bar_set_show_text
 gtk_progress_bar_get_show_text
 gtk_progress_bar_set_text
@@ -2417,6 +2368,7 @@ gtk_radio_button_new_with_mnemonic
 gtk_radio_button_new_with_mnemonic_from_widget
 gtk_radio_button_set_group
 gtk_radio_button_get_group
+gtk_radio_button_join_group
 <SUBSECTION Standard>
 GTK_RADIO_BUTTON
 GTK_IS_RADIO_BUTTON
@@ -2735,8 +2687,6 @@ GTK_RULER_GET_CLASS
 <SUBSECTION Private>
 GtkRulerPrivate
 gtk_ruler_get_type
-gtk_ruler_draw_ticks
-gtk_ruler_draw_pos
 </SECTION>
 
 <SECTION>
@@ -3021,8 +2971,6 @@ gtk_statusbar_push
 gtk_statusbar_pop
 gtk_statusbar_remove
 gtk_statusbar_remove_all
-gtk_statusbar_set_has_resize_grip
-gtk_statusbar_get_has_resize_grip
 gtk_statusbar_get_message_area
 <SUBSECTION Standard>
 GTK_STATUSBAR
@@ -3070,8 +3018,6 @@ gtk_status_icon_get_title
 gtk_status_icon_set_name
 gtk_status_icon_set_visible
 gtk_status_icon_get_visible
-gtk_status_icon_set_blinking
-gtk_status_icon_get_blinking
 gtk_status_icon_is_embedded
 gtk_status_icon_position_menu
 gtk_status_icon_get_geometry
@@ -4405,6 +4351,16 @@ gtk_cell_renderer_set_alignment
 gtk_cell_renderer_get_padding
 gtk_cell_renderer_set_padding
 
+<SUBSECTION Width-for-height>
+gtk_cell_renderer_get_preferred_height
+gtk_cell_renderer_get_preferred_height_for_width
+gtk_cell_renderer_get_preferred_size
+gtk_cell_renderer_get_preferred_width
+gtk_cell_renderer_get_preferred_width_for_height
+gtk_cell_renderer_get_request_mode
+gtk_cell_view_get_desired_height_for_width_of_row
+gtk_cell_view_get_desired_width_of_row
+
 <SUBSECTION Standard>
 GTK_CELL_RENDERER
 GTK_IS_CELL_RENDERER
@@ -4772,30 +4728,26 @@ gtk_vseparator_get_type
 <TITLE>GtkWidget</TITLE>
 GtkWidget
 GtkWidgetClass
-GtkWidgetFlags
-GTK_WIDGET_FLAGS
-GTK_WIDGET_SET_FLAGS
-GTK_WIDGET_UNSET_FLAGS
 GtkCallback
 GtkRequisition
 GtkAllocation
 GtkSelectionData
 GtkWidgetAuxInfo
-GtkWidgetShapeInfo
 GtkWidgetHelpType
 gtk_widget_new
 gtk_widget_destroy
+gtk_widget_in_destruction
 gtk_widget_destroyed
 gtk_widget_unparent
 gtk_widget_show
 gtk_widget_show_now
 gtk_widget_hide
 gtk_widget_show_all
-gtk_widget_hide_all
 gtk_widget_map
 gtk_widget_unmap
 gtk_widget_realize
 gtk_widget_unrealize
+gtk_widget_draw
 gtk_widget_queue_draw
 gtk_widget_queue_resize
 gtk_widget_queue_resize_no_redraw
@@ -4831,9 +4783,8 @@ gtk_widget_get_device_events
 gtk_widget_add_device_events
 gtk_widget_get_toplevel
 gtk_widget_get_ancestor
-gtk_widget_get_colormap
-gtk_widget_set_colormap
 gtk_widget_get_visual
+gtk_widget_set_visual
 gtk_widget_get_pointer
 gtk_widget_is_ancestor
 gtk_widget_translate_coordinates
@@ -4842,19 +4793,14 @@ gtk_widget_set_style
 gtk_widget_ensure_style
 gtk_widget_get_style
 gtk_widget_reset_rc_styles
-gtk_widget_push_colormap
-gtk_widget_pop_colormap
-gtk_widget_set_default_colormap
 gtk_widget_get_default_style
-gtk_widget_get_default_colormap
-gtk_widget_get_default_visual
 gtk_widget_set_direction
 GtkTextDirection
 gtk_widget_get_direction
 gtk_widget_set_default_direction
 gtk_widget_get_default_direction
-gtk_widget_shape_combine_mask
-gtk_widget_input_shape_combine_mask
+gtk_widget_shape_combine_region
+gtk_widget_input_shape_combine_region
 gtk_widget_path
 gtk_widget_class_path
 gtk_widget_get_composite_name
@@ -4874,6 +4820,7 @@ gtk_widget_render_icon
 gtk_widget_pop_composite_child
 gtk_widget_push_composite_child
 gtk_widget_queue_draw_area
+gtk_widget_queue_draw_region
 gtk_widget_reset_shapes
 gtk_widget_set_app_paintable
 gtk_widget_set_double_buffered
@@ -4925,8 +4872,11 @@ gtk_widget_set_tooltip_window
 gtk_widget_get_has_tooltip
 gtk_widget_set_has_tooltip
 gtk_widget_trigger_tooltip_query
-gtk_widget_get_snapshot
 gtk_widget_get_window
+gtk_cairo_should_draw_window
+gtk_cairo_transform_to_window
+gtk_widget_get_allocated_width
+gtk_widget_get_allocated_height
 gtk_widget_get_allocation
 gtk_widget_set_allocation
 gtk_widget_get_app_paintable
@@ -4965,6 +4915,44 @@ gtk_requisition_new
 gtk_requisition_copy
 gtk_requisition_free
 
+<SUBSECTION Width-for-Height>
+GtkSizeRequestMode
+GtkRequestedSize
+gtk_widget_get_preferred_height
+gtk_widget_get_preferred_width
+gtk_widget_get_preferred_height_for_width
+gtk_widget_get_preferred_width_for_height
+gtk_widget_get_request_mode
+gtk_widget_get_preferred_size
+gtk_distribute_natural_allocation
+
+<SUBSECTION Alignment and Margins>
+GtkAlign
+gtk_widget_get_halign
+gtk_widget_set_halign
+gtk_widget_get_valign
+gtk_widget_set_valign
+gtk_widget_get_margin_left
+gtk_widget_set_margin_left
+gtk_widget_get_margin_right
+gtk_widget_set_margin_right
+gtk_widget_get_margin_top
+gtk_widget_set_margin_top
+gtk_widget_get_margin_bottom
+gtk_widget_set_margin_bottom
+
+<SUBSECTION Expand>
+gtk_widget_get_hexpand
+gtk_widget_set_hexpand
+gtk_widget_get_hexpand_set
+gtk_widget_set_hexpand_set
+gtk_widget_get_vexpand
+gtk_widget_set_vexpand
+gtk_widget_get_vexpand_set
+gtk_widget_set_vexpand_set
+gtk_widget_queue_compute_expand
+gtk_widget_compute_expand
+
 <SUBSECTION Standard>
 GTK_WIDGET
 GTK_IS_WIDGET
@@ -4974,6 +4962,7 @@ GTK_IS_WIDGET_CLASS
 GTK_WIDGET_GET_CLASS
 GTK_TYPE_REQUISITION
 <SUBSECTION Private>
+GtkWidgetPrivate
 gtk_widget_get_type
 gtk_requisition_get_type
 </SECTION>
@@ -5084,6 +5073,11 @@ gtk_window_get_opacity
 gtk_window_set_opacity
 gtk_window_get_mnemonics_visible
 gtk_window_set_mnemonics_visible
+gtk_window_set_has_resize_grip
+gtk_window_get_has_resize_grip
+gtk_window_get_resize_grip_is_visible
+gtk_window_get_resize_grip_area
+
 <SUBSECTION Standard>
 GTK_WINDOW
 GTK_IS_WINDOW
@@ -5093,6 +5087,7 @@ GTK_IS_WINDOW_CLASS
 GTK_WINDOW_GET_CLASS
 
 <SUBSECTION Private>
+GtkWindowPrivate
 gtk_window_get_type
 GtkWindowGeometryInfo
 gtk_window_remove_embedded_xid
@@ -5156,9 +5151,12 @@ gtk_device_grab_add
 gtk_device_grab_remove
 
 <SUBSECTION>
+GtkFunction
 gtk_init_add
 gtk_quit_add_destroy
 gtk_quit_add
+GtkCallbackMarshal
+GtkArg
 gtk_quit_add_full
 gtk_quit_remove
 gtk_quit_remove_by_data
@@ -5189,11 +5187,11 @@ GTKMAIN_C_VAR
 <SECTION>
 <FILE>gtkfeatures</FILE>
 <TITLE>Feature Test Macros</TITLE>
-gtk_major_version
-gtk_minor_version
-gtk_micro_version
-gtk_binary_age
-gtk_interface_age
+gtk_get_major_version
+gtk_get_minor_version
+gtk_get_micro_version
+gtk_get_binary_age
+gtk_get_interface_age
 gtk_check_version
 
 <SUBSECTION>
@@ -5318,6 +5316,9 @@ GtkRcContext
 GtkTargetEntry
 GtkTargetList
 GtkTargetPair
+gtk_target_entry_new
+gtk_target_entry_copy
+gtk_target_entry_free
 gtk_target_list_new
 gtk_target_list_ref
 gtk_target_list_unref
@@ -5444,14 +5445,13 @@ gtk_drag_unhighlight
 <SUBSECTION Source Side>
 gtk_drag_begin
 gtk_drag_set_icon_widget
-gtk_drag_set_icon_pixmap
 gtk_drag_set_icon_pixbuf
 gtk_drag_set_icon_stock
+gtk_drag_set_icon_surface
 gtk_drag_set_icon_name
 gtk_drag_set_icon_default
 gtk_drag_check_threshold
 gtk_drag_source_set
-gtk_drag_source_set_icon
 gtk_drag_source_set_icon_pixbuf
 gtk_drag_source_set_icon_stock
 gtk_drag_source_set_icon_name
@@ -5463,17 +5463,6 @@ gtk_drag_source_add_image_targets
 gtk_drag_source_add_uri_targets
 </SECTION>
 
-<SECTION>
-<FILE>gtktypeutils</FILE>
-<TITLE>Types</TITLE>
-GtkFunction
-GtkCallbackMarshal
-GtkArg
-<SUBSECTION Private>
-GTK_TYPE_IDENTIFIER
-gtk_identifier_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkbindings</FILE>
 <TITLE>Bindings</TITLE>
@@ -5498,7 +5487,6 @@ gtk_binding_set_add_path
 <FILE>gtkenums</FILE>
 <TITLE>Standard Enumerations</TITLE>
 GtkAccelFlags
-GtkAnchorType
 GtkArrowPlacement
 GtkArrowType
 GtkAttachOptions
@@ -5525,11 +5513,8 @@ GtkScrollType
 GtkSelectionMode
 GtkShadowType
 GtkStateType
-GtkSubmenuDirection
-GtkSubmenuPlacement
 GtkToolbarStyle
 GtkUpdateType
-GtkVisibility
 GtkWindowPosition
 GtkWindowType
 GtkSortType
@@ -6308,32 +6293,6 @@ GTK_TYPE_ORIENTABLE
 gtk_orientable_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtksizerequest</FILE>
-<TITLE>GtkSizeRequest</TITLE>
-GtkSizeRequest
-GtkSizeRequestIface
-GtkSizeRequestMode
-GtkRequestedSize
-gtk_size_request_get_height
-gtk_size_request_get_width
-gtk_size_request_get_height_for_width
-gtk_size_request_get_width_for_height
-gtk_size_request_get_request_mode
-gtk_size_request_get_size
-gtk_distribute_natural_allocation
-
-<SUBSECTION Standard>
-GTK_SIZE_REQUEST
-GTK_SIZE_REQUEST_CLASS
-GTK_SIZE_REQUEST_GET_IFACE
-GTK_IS_SIZE_REQUEST
-GTK_TYPE_SIZE_REQUEST
-
-<SUBSECTION Private>
-gtk_size_request_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkapplication</FILE>
 <TITLE>GtkApplication</TITLE>
@@ -6345,6 +6304,7 @@ gtk_application_quit
 gtk_application_set_action_group
 gtk_application_get_window
 gtk_application_add_window
+gtk_application_remove_window
 gtk_application_get_windows
 gtk_application_create_window
 

docs/reference/gtk/gtk3.types

@@ -40,8 +40,8 @@ gtk_clipboard_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_box_text_get_type
 gtk_container_get_type
 gtk_dialog_get_type
 gtk_drawing_area_get_type
@@ -80,7 +80,6 @@ gtk_im_context_simple_get_type
 gtk_im_multicontext_get_type
 gtk_info_bar_get_type
 gtk_invisible_get_type
-gtk_item_get_type
 gtk_label_get_type
 gtk_layout_get_type
 gtk_link_button_get_type
@@ -94,7 +93,6 @@ gtk_message_dialog_get_type
 gtk_misc_get_type
 gtk_mount_operation_get_type
 gtk_notebook_get_type
-gtk_object_get_type
 gtk_offscreen_window_get_type
 gtk_orientable_get_type
 gtk_page_setup_get_type
@@ -132,7 +130,6 @@ gtk_separator_menu_item_get_type
 gtk_separator_tool_item_get_type
 gtk_settings_get_type
 gtk_size_group_get_type
-gtk_size_request_get_type
 gtk_socket_get_type
 gtk_spin_button_get_type
 gtk_spinner_get_type

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

@@ -20,11 +20,11 @@
 
     <para>
       The steps outlined in the following sections assume that your
-      application is working with GTK+ 2.22, which is the final stable
+      application is working with GTK+ 2.24, which is the final stable
       release of GTK+ 2.x. It includes all the necessary APIs and tools
       to help you port your application to GTK+ 3. If you are still using
       an older version of GTK+ 2.x, you should first get your application
-      to build and work with 2.22.
+      to build and work with 2.24.
     </para>
 
   <section>
@@ -44,10 +44,6 @@
         <term><filename>gtk/gtkunixprint.h</filename></term>
         <listitem>for low-level, UNIX-specific printing functions</listitem>
       </varlistentry>
-      <varlistentry>
-        <term><filename>gdk-pixbuf/gdk-pixbuf.h</filename></term>
-        <listitem>for GdkPixbuf</listitem>
-      </varlistentry>
       <varlistentry>
         <term><filename>gdk/gdk.h</filename></term>
         <listitem>for GDK</listitem>
@@ -57,8 +53,8 @@
         <listitem>for GDK functions that are X11-specific</listitem>
       </varlistentry>
       <varlistentry>
-        <term><filename>gdk/gdkkeysyms.h</filename></term>
-        <listitem>if you need the GDK keysym definitions</listitem>
+        <term><filename>gdk/gdkwin32.h</filename></term>
+        <listitem>for GDK functions that are Windows-specific</listitem>
       </varlistentry>
     </variablelist>
     (these relative paths are assuming that you are using the include
@@ -70,7 +66,7 @@
     you can use defines to disable inclusion of individual headers,
     as follows:
     <programlisting>
-    make CFLAGS+="-DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+    make CFLAGS+="-DGTK_DISABLE_SINGLE_INCLUDES"
     </programlisting>
   </para>
   </section>
@@ -90,7 +86,7 @@
     you can use defines to remove deprecated symbols from the header files,
     as follows:
     <programlisting>
-    make CFLAGS+="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+    make CFLAGS+="-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
     </programlisting>
   </para>
   </section>
@@ -113,6 +109,19 @@
   </para>
   </section>
 
+  <section>
+    <title>Replace GDK_&lt;keyname&gt; with GDK_KEY_&lt;keyname&gt;</title>
+
+    <para>
+      Key constants have gained a <literal>_KEY_</literal> infix.
+      For example, <literal>GDK_a</literal> is now
+      <literal>GDK_KEY_a</literal>.  In GTK+ 2, the old names continue
+      to be available.  In GTK+ 3 however, the old names will require
+      an explicit include of the <literal>gdkkeysyms-compat.h</literal> header.
+    </para>
+
+  </section>
+
   <section>
     <title>Use cairo for drawing</title>
     <para>
@@ -122,7 +131,7 @@
     </para>
     <para>
       The #GdkGC and #GdkImage objects, as well as all the functions using
-      them are gone. This includes the <literal>gdk_draw_</literal> family
+      them, are gone. This includes the <literal>gdk_draw</literal> family
       of functions like gdk_draw_rectangle() and gdk_draw_drawable(). As
       #GdkGC is roughly equivalent to #cairo_t and #GdkImage was used for
       drawing images to GdkDrawables, which cairo supports automatically,
@@ -236,7 +245,7 @@ cairo_destroy (cr);
         </para>
       </example>
     <section>
-      <title>what should you be aware of ?</title>
+      <title>What should you be aware of ?</title>
       <formalpara><title>No more stippling</title>
         <para>
           Stippling is the usage of a bi-level mask, called a #GdkBitmap.
@@ -307,7 +316,7 @@ cairo_destroy (cr);
           development to be able to change your code.
         </para>
       </formalpara>
-      <formalpara><title>Using pango_cairo_show_layout() instead of gdk_draw_layout_with_colors()</title>
+      <formalpara><title>Using pango_cairo_show_layout(<!-- -->) instead of gdk_draw_layout_with_colors(<!-- -->)</title>
         <para>
           GDK provided a way to ignore the color attributes of text and use
           a hardcoded text color with the gdk_draw_layout_with_colors()
@@ -330,7 +339,7 @@ cairo_destroy (cr);
   <para>
     This section outlines porting tasks that you need to tackle when
     you get to the point that you actually build your application against
-    GTK+ 3. Making it possible to prepare for these in GTK+ 2.22 would
+    GTK+ 3. Making it possible to prepare for these in GTK+ 2.24 would
     have been either impossible or impractical.
   </para>
 
@@ -380,6 +389,292 @@ cairo_destroy (cr);
     </para>
   </section>
 
+  <section>
+    <title>Replace GdkPixmap by cairo surfaces</title>
+    <para>
+      The #GdkPixmap object and related functions have been removed.
+      In the cairo-centric world of GTK+ 3, cairo surfaces take over
+      the role of pixmaps.
+    </para>
+    <example>
+      <title>Creating custom cursors</title>
+      <para>
+        One place where pixmaps were commonly used is to create custom
+        cursors:
+      <programlisting>
+GdkCursor *cursor;
+GdkPixmap *pixmap;
+cairo_t *cr;
+GdkColor fg = { 0, 0, 0, 0 };
+
+pixmap = gdk_pixmap_new (NULL, 1, 1, 1);
+
+cr = gdk_cairo_create (pixmap);
+cairo_rectangle (cr, 0, 0, 1, 1);
+cairo_fill (cr);
+cairo_destroy (cr);
+
+cursor = gdk_cursor_new_from_pixmap (pixmap, pixmap, &amp;fg, &amp;fg, 0, 0);
+
+g_object_unref (pixmap);
+      </programlisting>
+      The same can be achieved without pixmaps, by drawing onto
+      an image surface:
+      <programlisting>
+GdkCursor *cursor;
+cairo_surface_t *s;
+cairo_t *cr;
+GdkPixbuf *pixbuf;
+
+s = cairo_image_surface_create (CAIRO_FORMAT_A1, 3, 3);
+cr = cairo_create (s);
+cairo_arc (cr, 1.5, 1.5, 1.5, 0, 2 * M_PI);
+cairo_fill (cr);
+cairo_destroy (cr);
+
+pixbuf = gdk_pixbuf_get_from_surface (NULL, s,
+                                      0, 0, 0, 0,
+                                      3, 3);
+
+cairo_surface_destroy (s);
+
+cursor = gdk_cursor_new_from_pixbuf (display, pixbuf, 0, 0);
+
+g_object_unref (pixbuf);
+      </programlisting>
+      </para>
+    </example>
+  </section>
+
+  <section>
+    <title>Replace colormaps by visuals</title>
+    <para>
+      For drawing with cairo, it is not necessary to allocate colors, and
+      a #GdkVisual provides enough information for cairo to handle colors
+      in 'native' surfaces. Therefore, #GdkColormap and related functions
+      have been removed in GTK+ 3, and visuals are used instead. The
+      colormap-handling functions of #GtkWidget (gtk_widget_set_colormap(),
+      etc) have been removed and gtk_window_set_visual() has been added.
+    </para>
+    <example><title>Setting up a translucent window</title>
+    <para>You might have a screen-changed handler like the following
+     to set up a translucent window with an alpha-channel:
+    </para>
+    <programlisting>
+static void
+on_alpha_screen_changed (GtkWidget *widget,
+                         GdkScreen *old_screen,
+                         GtkWidget *label)
+{
+  GdkScreen *screen = gtk_widget_get_screen (widget);
+  GdkColormap *colormap = gdk_screen_get_rgba_colormap (screen);
+
+  if (colormap == NULL)
+    colormap = gdk_screen_get_default_colormap (screen);
+
+  gtk_widget_set_colormap (widget, colormap);
+}
+    </programlisting>
+    <para>
+    With visuals instead of colormaps, this will look as follows:
+    </para>
+    <programlisting>
+static void
+on_alpha_screen_changed (GtkWindow *window,
+                         GdkScreen *old_screen,
+                         GtkWidget *label)
+{
+  GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (window));
+  GdkVisual *visual = gdk_screen_get_rgba_visual (screen);
+
+  if (visual == NULL)
+    visual = gdk_screen_get_system_visual (screen);
+
+  gtk_window_set_visual (window, visual);
+}
+    </programlisting>
+    </example>
+  </section>
+
+  <section>
+    <title>The GtkWidget::draw signal</title>
+    <para>
+      The GtkWidget #GtkWidget::expose-event signal has been replaced by
+      a new #GtkWidget::draw signal, which takes a #cairo_t instead of
+      an expose event. The cairo context is being set up so that the origin
+      at (0, 0) coincides with the upper left corner of the widget, and
+      is properly clipped.
+    </para>
+    <note><para>In other words, the cairo context of the draw signal is set
+      up in 'widget coordinates', which is different from traditional expose
+      event handlers, which always assume 'window coordinates'.
+    </para></note>
+    <para>
+      The widget is expected to draw itself with its allocated size, which
+      is available via the new gtk_widget_get_allocated_width() and
+      gtk_widget_get_allocated_height() functions. It is not necessary to
+      check for GTK_WIDGET_IS_DRAWABLE(), since GTK+ already does this check
+      before emitting the ::draw signal.
+    </para>
+    <para>
+      There are some special considerations for widgets with multiple windows.
+      Expose events are window-specific, and widgets with multiple windows
+      could expect to get an expose event for each window that needs to be
+      redrawn. Therefore, multi-window expose event handlers typically look
+      like this:
+      <informalexample><programlisting>
+      if (event->window == widget->window1)
+        {
+           /* ... draw window1 ... */
+        }
+      else if (event->window == widget->window2)
+        {
+           /* ... draw window2 ... */
+        }
+      ...
+      </programlisting></informalexample>
+      In contrast, the ::draw signal handler may have to draw multiple
+      windows in one call. GTK+ has a convenience function
+      gtk_cairo_should_draw_window() that can be used to find out if
+      a window needs to be drawn. With that, the example above would look
+      like this (note that the 'else' is gone):
+      <informalexample><programlisting>
+      if (gtk_cairo_should_draw_window (cr, widget->window1)
+        {
+           /* ... draw window1 ... */
+        }
+      if (gtk_cairo_should_draw_window (cr, widget->window2)
+        {
+           /* ... draw window2 ... */
+        }
+      ...
+      </programlisting></informalexample>
+      Another convenience function that can help when implementing
+      ::draw for multi-window widgets is gtk_cairo_transform_to_window(),
+      which transforms a cairo context from widget-relative coordinates
+      to window-relative coordinates.
+    </para>
+    <para>
+      All GtkStyle drawing functions (gtk_paint_box(), etc) have been changed
+      to take a #cairo_t instead of a window and a clip area. ::draw
+      implementations will usually just use the cairo context that has been
+      passed in for this.
+    </para>
+    <example><title>A simple ::draw function</title>
+    <programlisting>
+gboolean
+gtk_arrow_draw (GtkWidget *widget,
+                cairo_t   *cr)
+{
+  gint x, y;
+  gint width, height;
+  gint extent;
+
+  width = gtk_widget_get_allocated_width (widget);
+  height = gtk_widget_get_allocated_height (widget);
+
+  extent = MIN (width - 2 * PAD, height - 2 * PAD);
+  x = PAD;
+  y = PAD;
+
+  gtk_paint_arrow (gtk_widget_get_style (widget),
+                   cr,
+                   gtk_widget_get_state (widget),
+                   GTK_SHADOW_OUT,
+                   widget,
+                   "arrow",
+                   widget->priv->arrow_type,
+                   TRUE,
+                   x, y, extent, extent);
+}
+    </programlisting>
+    </example>
+  </section>
+
+  <section>
+    <title>GtkProgressBar orientation</title>
+
+    <para>
+      In GTK+ 2.x, #GtkProgressBar and #GtkCellRendererProgress were using the
+      GtkProgressBarOrientation enumeration to specify their orientation and
+      direction. In GTK+ 3, both the widget and the cell renderer implement
+      #GtkOrientable, and have an additional 'inverted' property to determine
+      their direction. Therefore, a call to gtk_progress_bar_set_orientation()
+      needs to be replaced by a pair of calls to
+      gtk_orientable_set_orientation() and gtk_progress_bar_set_inverted().
+      The following values correspond:
+      <table>
+        <tgroup cols="3">
+          <colspec colname="1"/>
+          <colspec colname="2"/>
+          <colspec colname="3"/>
+          <thead>
+            <row><entry>GTK+ 2.x</entry><entry namest="2" nameend="3">GTK+ 3</entry></row>
+            <row><entry>GtkProgressBarOrientation</entry><entry>GtkOrientation</entry><entry>inverted</entry></row>
+          </thead>
+          <tbody>
+            <row><entry>GTK_PROGRESS_LEFT_TO_RIGHT</entry><entry>GTK_ORIENTATION_HORIZONTAL</entry><entry>FALSE</entry></row>
+            <row><entry>GTK_PROGRESS_RIGHT_TO_LEFT</entry><entry>GTK_ORIENTATION_HORIZONTAL</entry><entry>TRUE</entry></row>
+            <row><entry>GTK_PROGRESS_TOP_TO_BOTTOM</entry><entry>GTK_ORIENTATION_VERTICAL</entry><entry>FALSE</entry></row>
+            <row><entry>GTK_PROGRESS_BOTTOM_TO_TOP</entry><entry>GTK_ORIENTATION_VERTICAL</entry><entry>TRUE</entry></row>
+          </tbody>
+        </tgroup>
+      </table>
+    </para>
+  </section>
+
+  <section>
+    <title>GtkScrolledWindow policy</title>
+
+    <para>
+      The default values for the #GtkScrolledWindow:hscrollbar-policy and
+      #GtkScrolledWindow:vscrollbar-policy properties have been changed from
+      'never' to 'automatic'. If your application was relying on the default
+      value, you will have explicitly set it explicitly.
+    </para>
+  </section>
+
+  <section>
+    <title>GtkObject is gone</title>
+
+    <para>
+      GtkObject has been removed in GTK+ 3. Its remaining functionality,
+      the ::destroy signal, has been moved to GtkWidget. If you have non-widget
+      classes that are directly derived from GtkObject, you have to make
+      them derive from #GInitiallyUnowned (or, if you don't need the floating
+      functionality, #GObject). If you have widgets that override the
+      destroy class handler, you have to adust your class_init function,
+      since destroy is now a member of GtkWidgetClass:
+      <informalexample><programlisting>
+      GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
+
+      object_class->destroy = my_destroy;
+      </programlisting></informalexample>
+      becomes
+      <informalexample><programlisting>
+      GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+      widget_class->destroy = my_destroy;
+      </programlisting></informalexample>
+      In the unlikely case that you have a non-widget class that is derived
+      from GtkObject and makes use of the destroy functionality, you have
+      to implement ::destroy yourself.
+    </para>
+  </section>
+
+  <section>
+    <title>Resize grips</title>
+
+    <para>
+     The resize grip functionality has been moved from #GtkStatusbar
+     to #GtkWindow. Any window can now have resize grips, regardless whether
+     it has a statusbar or not. The functions
+     gtk_statusbar_set_has_resize_grip() and gtk_statusbar_get_has_resize_grip()
+     have disappeared, and instead there are now
+     gtk_window_set_has_resize_grip() and gtk_window_get_has_resize_grip().
+    </para>
+  </section>
+
   <section>
     <title>Prevent mixed linkage</title>
     <para>

docs/reference/gtk/migrating-checklist.sgml

@@ -265,7 +265,7 @@ my_widget_expose_event_handler (GtkWidget *widget, GdkEventExpose *event)
 static gboolean
 my_widget_key_press_event_handler (GtkWidget *widget, GdkEventKey *event)
 {
-  guint modifiers;
+  GdkModifierType modifiers;
 
   modifiers = gtk_accelerator_get_default_mod_mask (<!-- -->);
 

docs/reference/gtk/osx.sgml

@@ -31,7 +31,7 @@ or environment variables.
 
 <para>
 For up-to-date information about the current status of this port, see the
-<ulink url="http://developer.imendio.com/wiki/Gtk_Mac_OS_X">project page</ulink>.
+<ulink url="http://live.gnome.org/GTK+/OSX">project page</ulink>.
 </para>
 
 </refsect1>

docs/reference/gtk/overview.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<!DOCTYPE partintro PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+               ]>
+<partintro>
+<para>
+GTK+ is a library for creating graphical user interfaces. It
+works on many UNIX-like platforms, Windows, and OS X.
+GTK+ is released under the GNU Library General Public License
+(GNU LGPL), which allows for flexible licensing of client
+applications. GTK+ has a C-based object-oriented architecture that
+allows for maximum flexibility.  Bindings for many other languages have
+been written, including C++, Objective-C, Guile/Scheme, Perl, Python,
+TOM, Ada95, Free Pascal, and Eiffel.
+</para>
+<para>
+GTK+ depends on the following libraries:
+<variablelist>
+
+<varlistentry>
+<term>GLib</term>
+<listitem><para>
+A general-purpose utility library, not specific to graphical user interfaces.
+GLib provides many useful data types, macros, type conversions,
+string utilities, file utilities, a main loop abstraction, and so on.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>GObject</term>
+<listitem><para>A library that provides a type system, a collection of
+fundamental types including an object type, a signal system.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>GIO</term>
+<listitem><para>A modern, easy-to-use VFS API including abstractions for
+files, drives, volumes, stream IO, as well as network programming and
+DBus communication.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>cairo</term>
+<listitem><para>Cairo is a 2D graphics library with support for multiple
+output devices.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Pango</term>
+<listitem><para>
+Pango is a library for internationalized text handling. It centers
+around the PangoLayout object, representing a paragraph of text.
+Pango provides the engine for GtkTextView, GtkLabel, GtkEntry, and
+other widgets that display text.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>ATK</term>
+<listitem><para>
+ATK is the Accessibility Toolkit. It provides a set of generic
+interfaces allowing accessibility technologies to interact with a
+graphical user interface. For example, a screen reader uses ATK to
+discover the text in an interface and read it to blind users.  GTK+
+widgets have built-in support for accessibility using the ATK
+framework.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>GdkPixbuf</term>
+<listitem><para>
+This is a small library which allows you to create GdkPixbuf
+("pixel buffer") objects from image data or image files.
+Use a GdkPixbuf in combination with GtkImage to display images.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>GDK</term>
+<listitem><para>
+GDK is the abstraction layer that allows GTK+ to support multiple
+windowing systems. GDK provides window system facilities on X11, Windows,
+and OS X.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>GTK+</term>
+<listitem><para>
+The GTK+ library itself contains <firstterm>widgets</firstterm>,
+that is, GUI components such as GtkButton or GtkTextView.
+</para></listitem>
+</varlistentry>
+</variablelist>
+</para>
+</partintro>

docs/reference/gtk/question_index.sgml

@@ -95,10 +95,10 @@ from functions?
 <answer>
 
 <para>
-See the documentation for #GObject and #GtkObject. For #GObject note 
-specifically g_object_ref() and g_object_unref(). #GtkObject is a subclass 
-of #GObject so the same points apply, except that it has a "floating" state 
-(explained in its documentation).
+See the documentation for #GObject and #GInitiallyUnowned. For #GObject note
+specifically g_object_ref() and g_object_unref(). #GInitiallyUnowned is a
+subclass of #GObject so the same points apply, except that it has a "floating"
+state (explained in its documentation).
 </para>
 
 <para>
@@ -115,7 +115,7 @@ url="http://bugzilla.gnome.org">http://bugzilla.gnome.org</ulink>.)
 <qandaentry>
 <question>
 <para>
-Why does my program leak memory, if I destroy a widget immediately 
+Why does my program leak memory, if I destroy a widget immediately
 after creating it ?
 </para>
 </question>
@@ -127,27 +127,26 @@ If <structname>GtkFoo</structname> isn't a toplevel window, then
  foo = gtk_foo_new (<!-- -->);
  gtk_widget_destroy (foo);
 </programlisting></informalexample>
-is a memory leak, because no one assumed the initial floating 
-reference. If you are using a widget and you aren't immediately 
-packing it into a container, then you probably want standard 
+is a memory leak, because no one assumed the initial floating
+reference. If you are using a widget and you aren't immediately
+packing it into a container, then you probably want standard
 reference counting, not floating reference counting.
 </para>
 
 <para>
-To to get this, you must acquire a reference to the widget and drop the 
-floating reference (<quote>ref and sink</quote> in GTK+ parlance) after 
+To to get this, you must acquire a reference to the widget and drop the
+floating reference (<quote>ref and sink</quote> in GTK+ parlance) after
 creating it:
 <informalexample><programlisting>
  foo = gtk_foo_new (<!-- -->);
- g_object_ref (foo); 
- gtk_object_sink (GTK_OBJECT (foo));
+ g_object_ref_sink (foo);
 </programlisting></informalexample>
 When you want to get rid of the widget, you must call gtk_widget_destroy()
-to break any external connections to the widget before dropping your 
+to break any external connections to the widget before dropping your
 reference:
 <informalexample><programlisting>
- gtk_widget_destroy (foo); 
- g_object_unref (foo); 
+ gtk_widget_destroy (foo);
+ g_object_unref (foo);
 </programlisting></informalexample>
 When you immediately add a widget to a container, it takes care of
 assuming the initial floating reference and you don't have to worry

docs/reference/gtk/tmpl/.gitignore

@@ -1,16 +1,29 @@
+gtkaccelmap.sgml
 gtkactiongroup.sgml
+gtkaboutdialog.sgml
 gtkbbox.sgml
 gtkbox.sgml
 gtkbuilder.sgml
 gtkbutton.sgml
 gtkcalendar.sgml
 gtkcelleditable.sgml
+gtkcombobox.sgml
+gtkcomboboxentry.sgml
+gtkcontainer.sgml
+gtkeditable.sgml
+gtkentrybuffer.sgml
 gtkhbox.sgml
 gtkiconview.sgml
+gtkimcontextsimple.sgml
+gtkimmulticontext.sgml
+gtkitemfactory.sgml
+gtklinkbutton.sgml
 gtkmessagedialog.sgml
+gtknotebook.sgml
 gtkobject.sgml
 gtkorientable.sgml
 gtkpagesetupunixdialog.sgml
+gtkpapersize.sgml
 gtkprinter.sgml
 gtkradioaction.sgml
 gtkradiobutton.sgml
@@ -21,7 +34,9 @@ gtkrecentchooserdialog.sgml
 gtkrecentchoosermenu.sgml
 gtkrecentchooserwidget.sgml
 gtkrecentmanager.sgml
+gtkscale.sgml
 gtkscalebutton.sgml
+gtkscrolledwindow.sgml
 gtkseparator.sgml
 gtkseparatormenuitem.sgml
 gtkseparatortoolitem.sgml
@@ -29,7 +44,11 @@ gtkstatusbar.sgml
 gtkstyle.sgml
 gtktesting.sgml
 gtktextiter.sgml
+gtktexttagtable.sgml
 gtktoggleaction.sgml
+gtktoolbar.sgml
 gtktoolitem.sgml
+gtktooltip.sgml
 gtktreednd.sgml
+gtktypeutils.sgml
 gtkwindow.sgml

docs/reference/gtk/tmpl/gtkaccelmap.sgml

@@ -1,173 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Accelerator Maps
-
-<!-- ##### SECTION Short_Description ##### -->
-Loadable keyboard accelerator specifications
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkAccelMap ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkAccelMap::changed ##### -->
-<para>
-
-</para>
-
-@accelmap: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-<!-- ##### USER_FUNCTION GtkAccelMapForeach ##### -->
-<para>
-
-</para>
-
-@data: 
-@accel_path: 
-@accel_key: 
-@accel_mods: 
-@changed: 
-
-
-<!-- ##### FUNCTION gtk_accel_map_add_entry ##### -->
-<para>
-
-</para>
-
-@accel_path: 
-@accel_key: 
-@accel_mods: 
-
-
-<!-- ##### FUNCTION gtk_accel_map_lookup_entry ##### -->
-<para>
-
-</para>
-
-@accel_path: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_map_change_entry ##### -->
-<para>
-
-</para>
-
-@accel_path: 
-@accel_key: 
-@accel_mods: 
-@replace: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_map_load ##### -->
-<para>
-
-</para>
-
-@file_name: 
-
-
-<!-- ##### FUNCTION gtk_accel_map_save ##### -->
-<para>
-
-</para>
-
-@file_name: 
-
-
-<!-- ##### FUNCTION gtk_accel_map_foreach ##### -->
-<para>
-
-</para>
-
-@data: 
-@foreach_func: 
-
-
-<!-- ##### FUNCTION gtk_accel_map_load_fd ##### -->
-<para>
-
-</para>
-
-@fd: 
-
-
-<!-- ##### FUNCTION gtk_accel_map_save_fd ##### -->
-<para>
-
-</para>
-
-@fd: 
-
-
-<!-- ##### FUNCTION gtk_accel_map_load_scanner ##### -->
-<para>
-
-</para>
-
-@scanner: 
-
-
-<!-- ##### FUNCTION gtk_accel_map_add_filter ##### -->
-<para>
-
-</para>
-
-@filter_pattern: 
-
-
-<!-- ##### FUNCTION gtk_accel_map_foreach_unfiltered ##### -->
-<para>
-
-</para>
-
-@data: 
-@foreach_func: 
-
-
-<!-- ##### FUNCTION gtk_accel_map_get ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_map_lock_path ##### -->
-<para>
-
-</para>
-
-@accel_path: 
-
-
-<!-- ##### FUNCTION gtk_accel_map_unlock_path ##### -->
-<para>
-
-</para>
-
-@accel_path: 
-
-

docs/reference/gtk/tmpl/gtkadjustment.sgml

@@ -2,7 +2,7 @@
 GtkAdjustment
 
 <!-- ##### SECTION Short_Description ##### -->
-A GtkObject representing an adjustable bounded value
+A representation of an adjustable bounded value
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>

docs/reference/gtk/tmpl/gtkcellrenderer.sgml

@@ -181,6 +181,11 @@ it cannot be individually modified.
 </para>
 
 @parent_class: 
+@get_request_mode: 
+@get_preferred_width: 
+@get_preferred_height_for_width: 
+@get_preferred_height: 
+@get_preferred_width_for_height: 
 @get_size: 
 @render: 
 @activate: 
@@ -210,11 +215,10 @@ it cannot be individually modified.
 </para>
 
 @cell: 
-@window: 
+@cr: 
 @widget: 
 @background_area: 
 @cell_area: 
-@expose_area: 
 @flags: 
 
 
@@ -353,3 +357,92 @@ it cannot be individually modified.
 @ypad: 
 
 
+<!-- ##### FUNCTION gtk_cell_renderer_get_preferred_height ##### -->
+<para>
+
+</para>
+
+@cell: 
+@widget: 
+@minimum_size: 
+@natural_size: 
+
+
+<!-- ##### FUNCTION gtk_cell_renderer_get_preferred_height_for_width ##### -->
+<para>
+
+</para>
+
+@cell: 
+@widget: 
+@width: 
+@minimum_height: 
+@natural_height: 
+
+
+<!-- ##### FUNCTION gtk_cell_renderer_get_preferred_size ##### -->
+<para>
+
+</para>
+
+@cell: 
+@widget: 
+@minimum_size: 
+@natural_size: 
+
+
+<!-- ##### FUNCTION gtk_cell_renderer_get_preferred_width ##### -->
+<para>
+
+</para>
+
+@cell: 
+@widget: 
+@minimum_size: 
+@natural_size: 
+
+
+<!-- ##### FUNCTION gtk_cell_renderer_get_preferred_width_for_height ##### -->
+<para>
+
+</para>
+
+@cell: 
+@widget: 
+@height: 
+@minimum_width: 
+@natural_width: 
+
+
+<!-- ##### FUNCTION gtk_cell_renderer_get_request_mode ##### -->
+<para>
+
+</para>
+
+@cell: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_cell_view_get_desired_height_for_width_of_row ##### -->
+<para>
+
+</para>
+
+@cell_view: 
+@path: 
+@avail_size: 
+@minimum_size: 
+@natural_size: 
+
+
+<!-- ##### FUNCTION gtk_cell_view_get_desired_width_of_row ##### -->
+<para>
+
+</para>
+
+@cell_view: 
+@path: 
+@minimum_size: 
+@natural_size: 
+
+

docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml

@@ -31,7 +31,7 @@ The #GtkCellRendererProgress cell renderer was added in GTK+ 2.6.
 </para>
 
 
-<!-- ##### ARG GtkCellRendererProgress:orientation ##### -->
+<!-- ##### ARG GtkCellRendererProgress:inverted ##### -->
 <para>
 
 </para>

docs/reference/gtk/tmpl/gtkcellrenderertext.sgml

@@ -143,6 +143,11 @@ the #GtkCellRendererText allows to edit its text using an entry.
 
 </para>
 
+<!-- ##### ARG GtkCellRendererText:max-width-chars ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkCellRendererText:rise ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcombobox.sgml

@@ -1,461 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkComboBox
-
-<!-- ##### SECTION Short_Description ##### -->
-A widget used to choose from a list of items
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkComboBox is a widget that allows the user to choose from a
-list of valid choices.  The #GtkComboBox displays the selected 
-choice.  When activated, the #GtkComboBox displays a popup 
-which allows the user to make a new choice. The style in which 
-the selected value is displayed, and the style of the popup is
-determined by the current theme. It may be similar to a #GtkOptionMenu,
-or similar to a Windows-style combo box.
-</para>
-
-<para>
-Unlike its predecessors #GtkCombo and #GtkOptionMenu, the #GtkComboBox
-uses the model-view pattern; the list of valid choices is specified in the
-form of a tree model, and the display of the choices can be adapted to
-the data in the model by using cell renderers, as you would in a tree view.
-This is possible since #GtkComboBox implements the #GtkCellLayout interface.
-The tree model holding the valid choices is not restricted to a flat list,
-it can be a real tree, and the popup will reflect the tree structure.
-</para>
-
-<para>
-In addition to the model-view API, #GtkComboBox offers a simple API which 
-is suitable for text-only combo boxes, and hides the complexity of managing
-the data in a model. It consists of the functions gtk_combo_box_new_text(), 
-gtk_combo_box_append_text(), gtk_combo_box_insert_text(), 
-gtk_combo_box_prepend_text(), gtk_combo_box_remove_text() and 
-gtk_combo_box_get_active_text().
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkComboBoxEntry, #GtkTreeModel, #GtkCellRenderer
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkComboBox ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkComboBox::changed ##### -->
-<para>
-
-</para>
-
-@combobox: the object which received the signal.
-
-<!-- ##### SIGNAL GtkComboBox::move-active ##### -->
-<para>
-
-</para>
-
-@combobox: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkComboBox::popdown ##### -->
-<para>
-
-</para>
-
-@combobox: the object which received the signal.
-@Returns: 
-
-<!-- ##### SIGNAL GtkComboBox::popup ##### -->
-<para>
-
-</para>
-
-@combobox: the object which received the signal.
-
-<!-- ##### ARG GtkComboBox:active ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:add-tearoffs ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:button-sensitivity ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:column-span-column ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:focus-on-click ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:has-frame ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:model ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:popup-shown ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:row-span-column ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:tearoff-title ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:wrap-width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:appears-as-list ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:arrow-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:shadow-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_combo_box_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_new_with_model ##### -->
-<para>
-
-</para>
-
-@model: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_wrap_width ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_wrap_width ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@width: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_row_span_column ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_row_span_column ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@row_span: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_column_span_column ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_column_span_column ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@column_span: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_active ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_active ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@index_: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_active_iter ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@iter: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_active_iter ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@iter: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_model ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_model ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@model: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_new_text ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_append_text ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@text: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_insert_text ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@position: 
-@text: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_prepend_text ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@text: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_remove_text ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@position: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_active_text ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_popup_for_device ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@device: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_popup ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_popdown ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_popup_accessible ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_row_separator_func ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_row_separator_func ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@func: 
-@data: 
-@destroy: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_add_tearoffs ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@add_tearoffs: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_add_tearoffs ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_title ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@title: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_title ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_focus_on_click ##### -->
-<para>
-
-</para>
-
-@combo: 
-@focus_on_click: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_focus_on_click ##### -->
-<para>
-
-</para>
-
-@combo: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_set_button_sensitivity ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@sensitivity: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_get_button_sensitivity ##### -->
-<para>
-
-</para>
-
-@combo_box: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkcomboboxentry.sgml

@@ -1,123 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkComboBoxEntry
-
-<!-- ##### SECTION Short_Description ##### -->
-A text entry field with a dropdown list
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkComboBoxEntry is a widget that allows the user to choose from a
-list of valid choices or enter a different value. It is very similar
-to a #GtkComboBox, but it displays the selected value in an entry to
-allow modifying it.
-</para>
-
-<para>
-In contrast to a #GtkComboBox, the underlying model of a #GtkComboBoxEntry 
-must always have a text column (see gtk_combo_box_entry_set_text_column()),
-and the entry will show the content of the text column in the selected row.  
-To get the text from the entry, use gtk_combo_box_get_active_text().
-</para>
-
-<para>
-The changed signal will be emitted while typing into a GtkComboBoxEntry, 
-as well as when selecting an item from the GtkComboBoxEntry's list. Use 
-gtk_combo_box_get_active() or gtk_combo_box_get_active_iter() to discover 
-whether an item was actually selected from the list.
-</para>
-
-<para>
-Connect to the activate signal of the GtkEntry (use gtk_bin_get_child()) 
-to detect when the user actually finishes entering text.
-</para>
-
-<para>
-The convenience API to construct simple text-only #GtkComboBox<!-- -->es 
-can also be used with #GtkComboBoxEntry<!-- -->s which have been constructed
-with gtk_combo_box_entry_new_text().
-</para>
-
-<para>
-If you have special needs that go beyond a simple entry (e.g. input validation),
-it is possible to replace the child entry by a different widget using
-gtk_container_remove() and gtk_container_add().
-</para>
-
-<refsect2 id="GtkComboBoxEntry-BUILDER-UI">
-<title>GtkComboBoxEntry as GtkBuildable</title>
-<para>
-Beyond the &lt;attributes&gt; support that is shared by all
-<link linkend="GtkCellLayout-BUILDER-UI">GtkCellLayout</link> implementation,
-GtkComboBoxEntry makes the entry available in UI definitions as an internal 
-child with name "entry". 
-</para>
-</refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkComboBox
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkComboBoxEntry ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkComboBoxEntry:text-column ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_combo_box_entry_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_entry_new_with_model ##### -->
-<para>
-
-</para>
-
-@model: 
-@text_column: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_entry_new_text ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_entry_set_text_column ##### -->
-<para>
-
-</para>
-
-@entry_box: 
-@text_column: 
-
-
-<!-- ##### FUNCTION gtk_combo_box_entry_get_text_column ##### -->
-<para>
-
-</para>
-
-@entry_box: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkcontainer.sgml

@@ -1,539 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkContainer
-
-<!-- ##### SECTION Short_Description ##### -->
-Base class for widgets which contain other widgets
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A GTK+ user interface is constructed by nesting widgets inside widgets.
-Container widgets are the inner nodes in the resulting tree of widgets:
-they contain other widgets. So, for example, you might have a #GtkWindow
-containing a #GtkFrame containing a GtkLabel. If you wanted an image instead
-of a textual label inside the frame, you might replace the #GtkLabel widget
-with a #GtkImage widget.
-</para>
-<para>
-There are two major kinds of container widgets in GTK+. Both are subclasses
-of the abstract #GtkContainer base class.
-</para>
-<para>
-The first type of container widget has a single child widget and derives
-from #GtkBin. These containers are <firstterm>decorators</firstterm>, which
-add some kind of functionality to the child. For example, a #GtkButton makes
-its child into a clickable button; a #GtkFrame draws a frame around its child
-and a #GtkWindow places its child widget inside a top-level window.
-</para>
-<para>
-The second type of container can have more than one child; its purpose is to
-manage <firstterm>layout</firstterm>. This means that these containers assign
-sizes and positions to their children. For example, a #GtkHBox arranges its
-children in a horizontal row, and a #GtkTable arranges the widgets it contains
-in a two-dimensional grid.
-</para>
-<para>
-To fulfill its task, a layout container must negotiate the size requirements
-with its parent and its children. The basic form of this negotiation is
-carried out in two phases, <firstterm>size requisition</firstterm> and
-<firstterm>size allocation</firstterm>, which are implemented by the
-size_request() and size_allocate() virtual functions in #GtkWidget.
-</para>
-<para>
-GTK+ also supports a more complicated form of size negotiation called
-<firstterm>width-for-height</firstterm> (and its dual
-<firstterm>height-for-width</firstterm>). See #GtkExtendedLayout
-to learn more about width-for-height geometry management.
-</para>
-<refsect2 id="size-requisition"><title>Size Requisition</title>
-<para>
-The size requisition of a widget is it's desired width and height.
-This is represented by a #GtkRequisition.
-</para>
-<para>
-How a widget determines its desired size depends on the widget.
-A #GtkLabel, for example, requests enough space to display all its text.
-Container widgets generally base their size request on the requisitions
-of their children.
-</para>
-<para>
-The size requisition phase of the widget layout process operates top-down.
-It starts at a top-level widget, typically a #GtkWindow. The top-level widget
-asks its child for its size requisition by calling gtk_widget_size_request().
-To determine its requisition, the child asks its own children for their
-requisitions and so on. Finally, the top-level widget will get a requisition
-back from its child.
-</para>
-</refsect2>
-<refsect2 id="size-allocation"><title>Size Allocation</title>
-<para>
-When the top-level widget has determined how much space its child would like
-to have, the second phase of the size negotiation, size allocation, begins.
-Depending on its configuration (see gtk_window_set_resizable()), the top-level
-widget may be able to expand in order to satisfy the size request or it may
-have to ignore the size request and keep its fixed size. It then tells its
-child widget how much space it gets by calling gtk_widget_size_allocate().
-The child widget divides the space among its children and tells each child
-how much space it got, and so on. Under normal circumstances, a #GtkWindow
-will always give its child the amount of space the child requested.
-</para>
-<para>
-A child's size allocation is represented by a #GtkAllocation. This struct
-contains not only a width and height, but also a position (i.e. X and Y
-coordinates), so that containers can tell their children not only how much
-space they have gotten, but also where they are positioned inside the space
-available to the container.
-</para>
-<para>
-Widgets are required to honor the size allocation they receive; a size
-request is only a request, and widgets must be able to cope with any size.
-</para>
-</refsect2>
-<refsect2 id="child-properties"><title>Child properties</title>
-<para>
-<structname>GtkContainer</structname> introduces <firstterm>child
-properties</firstterm> - these are object properties that are not specific
-to either the container or the contained widget, but rather to their relation.
-Typical examples of child properties are the position or pack-type of a widget
-which is contained in a #GtkBox.</para>
-<para>
-Use gtk_container_class_install_child_property() to install child properties
-for a container class and gtk_container_class_find_child_property() or
-gtk_container_class_list_child_properties() to get information about existing
-child properties.
-</para>
-<para>
-To set the value of a child property, use gtk_container_child_set_property(),
-gtk_container_child_set() or gtk_container_child_set_valist().
-To obtain the value of a child property, use
-gtk_container_child_get_property(), gtk_container_child_get() or
-gtk_container_child_get_valist(). To emit notification about child property
-changes, use gtk_widget_child_notify().
-</para>
-</refsect2>
-
-<refsect2 id="GtkContainer-BUILDER-UI">
-<title>GtkContainer as GtkBuildable</title>
-<para>
-The GtkContainer implementation of the GtkBuildable interface
-supports a &lt;packing&gt; element for children, which can
-contain multiple &lt;property&gt; elements that specify
-child properties for the child.
-</para>
-<example>
-<title>Child properties in UI definitions</title>
-<programlisting><![CDATA[
-<object class="GtkVBox">
-  <child>
-    <object class="GtkLabel"/>
-    <packing>
-      <property name="pack-type">start</property>
-    </packing>
-  </child>
-</object>
-]]></programlisting>
-</example>
-<para>
-Since 2.16, child properties can also be marked as translatable using
-the same "translatable", "comments" and "context" attributes that are used
-for regular properties.
-</para>
-</refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkContainer ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkContainer::add ##### -->
-<para>
-
-</para>
-
-@container: the object which received the signal.
-@widget: 
-
-<!-- ##### SIGNAL GtkContainer::check-resize ##### -->
-<para>
-
-</para>
-
-@container: the object which received the signal.
-
-<!-- ##### SIGNAL GtkContainer::remove ##### -->
-<para>
-
-</para>
-
-@container: the object which received the signal.
-@widget: 
-
-<!-- ##### SIGNAL GtkContainer::set-focus-child ##### -->
-<para>
-
-</para>
-
-@container: the object which received the signal.
-@widget: 
-
-<!-- ##### ARG GtkContainer:border-width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkContainer:child ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkContainer:resize-mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### MACRO GTK_IS_RESIZE_CONTAINER ##### -->
-<para>
-
-</para>
-
-@widget: 
-
-
-<!-- ##### MACRO GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID ##### -->
-<para>
-This macro should be used to emit a standard warning about unexpected
-properties in set_child_property() and get_child_property() implementations.
-</para>
-
-@object: the #GObject on which set_child_property() or get_child_property()
-   was called
-@property_id: the numeric id of the property
-@pspec: the #GParamSpec of the property
-
-
-<!-- ##### FUNCTION gtk_container_add ##### -->
-<para>
-
-</para>
-
-@container: 
-@widget: 
-
-
-<!-- ##### FUNCTION gtk_container_remove ##### -->
-<para>
-
-</para>
-
-@container: 
-@widget: 
-
-
-<!-- ##### FUNCTION gtk_container_add_with_properties ##### -->
-<para>
-
-</para>
-
-@container: 
-@widget: 
-@first_prop_name: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION gtk_container_get_resize_mode ##### -->
-<para>
-
-</para>
-
-@container: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_container_set_resize_mode ##### -->
-<para>
-
-</para>
-
-@container: 
-@resize_mode: 
-
-
-<!-- ##### FUNCTION gtk_container_check_resize ##### -->
-<para>
-
-</para>
-
-@container: 
-
-
-<!-- ##### FUNCTION gtk_container_foreach ##### -->
-<para>
-
-</para>
-
-@container: 
-@callback: 
-@callback_data: 
-
-
-<!-- ##### FUNCTION gtk_container_get_children ##### -->
-<para>
-
-</para>
-
-@container: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_container_set_reallocate_redraws ##### -->
-<para>
-
-</para>
-
-@container: 
-@needs_redraws: 
-
-
-<!-- ##### FUNCTION gtk_container_get_focus_child ##### -->
-<para>
-
-</para>
-
-@container: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_container_set_focus_child ##### -->
-<para>
-
-</para>
-
-@container: 
-@child: 
-
-
-<!-- ##### FUNCTION gtk_container_get_focus_vadjustment ##### -->
-<para>
-
-</para>
-
-@container: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_container_set_focus_vadjustment ##### -->
-<para>
-
-</para>
-
-@container: 
-@adjustment: 
-
-
-<!-- ##### FUNCTION gtk_container_get_focus_hadjustment ##### -->
-<para>
-
-</para>
-
-@container: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_container_set_focus_hadjustment ##### -->
-<para>
-
-</para>
-
-@container: 
-@adjustment: 
-
-
-<!-- ##### FUNCTION gtk_container_resize_children ##### -->
-<para>
-
-</para>
-
-@container: 
-
-
-<!-- ##### FUNCTION gtk_container_child_type ##### -->
-<para>
-
-</para>
-
-@container: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_container_child_get ##### -->
-<para>
-
-</para>
-
-@container: 
-@child: 
-@first_prop_name: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION gtk_container_child_set ##### -->
-<para>
-
-</para>
-
-@container: 
-@child: 
-@first_prop_name: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION gtk_container_child_get_property ##### -->
-<para>
-
-</para>
-
-@container: 
-@child: 
-@property_name: 
-@value: 
-
-
-<!-- ##### FUNCTION gtk_container_child_set_property ##### -->
-<para>
-
-</para>
-
-@container: 
-@child: 
-@property_name: 
-@value: 
-
-
-<!-- ##### FUNCTION gtk_container_child_get_valist ##### -->
-<para>
-
-</para>
-
-@container: 
-@child: 
-@first_property_name: 
-@var_args: 
-
-
-<!-- ##### FUNCTION gtk_container_child_set_valist ##### -->
-<para>
-
-</para>
-
-@container: 
-@child: 
-@first_property_name: 
-@var_args: 
-
-
-<!-- ##### FUNCTION gtk_container_forall ##### -->
-<para>
-
-</para>
-
-@container: 
-@callback: 
-@callback_data: 
-
-
-<!-- ##### FUNCTION gtk_container_get_border_width ##### -->
-<para>
-
-</para>
-
-@container: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_container_set_border_width ##### -->
-<para>
-
-</para>
-
-@container: 
-@border_width: 
-
-
-<!-- ##### FUNCTION gtk_container_propagate_expose ##### -->
-<para>
-
-</para>
-
-@container: 
-@child: 
-@event: 
-
-
-<!-- ##### FUNCTION gtk_container_get_focus_chain ##### -->
-<para>
-
-</para>
-
-@container: 
-@focusable_widgets: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_container_set_focus_chain ##### -->
-<para>
-
-</para>
-
-@container: 
-@focusable_widgets: 
-
-
-<!-- ##### FUNCTION gtk_container_unset_focus_chain ##### -->
-<para>
-
-</para>
-
-@container: 
-
-
-<!-- ##### FUNCTION gtk_container_class_find_child_property ##### -->
-<para>
-
-</para>
-
-@cclass: 
-@property_name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_container_class_install_child_property ##### -->
-<para>
-
-</para>
-
-@cclass: 
-@property_id: 
-@pspec: 
-
-
-<!-- ##### FUNCTION gtk_container_class_list_child_properties ##### -->
-<para>
-
-</para>
-
-@cclass: 
-@n_properties: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkdialog.sgml

@@ -14,22 +14,22 @@ not require extensive effort on the user's part.
 
 <para>
 GTK+ treats a dialog as a window split vertically. The top section is a
-#GtkVBox, and is where widgets such as a #GtkLabel or a #GtkEntry should
-be packed. The bottom area is known as the
-<structfield>action_area</structfield>. This is generally used for
-packing buttons into the dialog which may perform functions such as
-cancel, ok, or apply. The two areas are separated by a #GtkHSeparator.
+#GtkVBox known as the <structfield>content_area</structfield>, and is
+where widgets such as a #GtkLabel or a #GtkEntry should be packed.
+The bottom area is known as the <structfield>action_area</structfield>.
+This is generally used for packing buttons into the dialog which may
+perform functions such as cancel, ok, or apply.
 </para>
 
 <para>
-#GtkDialog boxes are created with a call to gtk_dialog_new() or
-gtk_dialog_new_with_buttons(). gtk_dialog_new_with_buttons() is recommended; it
-allows you to set the dialog title, some convenient flags, and add simple
+GtkDialog boxes are created with a call to gtk_dialog_new() or
+gtk_dialog_new_with_buttons(). gtk_dialog_new_with_buttons() is recommended;
+it allows you to set the dialog title, some convenient flags, and add simple
 buttons.
 </para>
 
 <para>
-If 'dialog' is a newly created dialog, the two primary areas of the window 
+If 'dialog' is a newly created dialog, the two primary areas of the window
 can be accessed through gtk_dialog_get_content_area() and
 gtk_dialog_get_action_area(), as can be seen from the example, below.
 </para>
@@ -196,11 +196,6 @@ as any other #GtkHButtonBox.
 @dialog: 
 @arg1: 
 
-<!-- ##### ARG GtkDialog:has-separator ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkDialog:action-area-border ##### -->
 <para>
 
@@ -230,8 +225,6 @@ Flags used to influence dialog construction.
   see gtk_window_set_modal().
 @GTK_DIALOG_DESTROY_WITH_PARENT: Destroy the dialog when its
   parent is destroyed, see gtk_window_set_destroy_with_parent().
-@GTK_DIALOG_NO_SEPARATOR: Don't put a separator between the
-  action area and the dialog content.
 
 <!-- ##### ENUM GtkResponseType ##### -->
 <para>
@@ -325,15 +318,6 @@ directly, but into the @vbox and @action_area, as described above.
 @response_id: 
 
 
-<!-- ##### FUNCTION gtk_dialog_get_has_separator ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_dialog_set_default_response ##### -->
 <para>
 
@@ -343,15 +327,6 @@ directly, but into the @vbox and @action_area, as described above.
 @response_id: 
 
 
-<!-- ##### FUNCTION gtk_dialog_set_has_separator ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@setting: 
-
-
 <!-- ##### FUNCTION gtk_dialog_set_response_sensitive ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkdnd.sgml

@@ -221,12 +221,11 @@ drops.
 
 <!-- ##### FUNCTION gtk_drag_get_source_widget ##### -->
 <para>
-Determines the source widget for a drag.
+
 </para>
 
-@context: a (destination side) drag context.
-@Returns: if the drag is occurring within a single application,
-          a pointer to the source widget. Otherwise, %NULL.
+@context: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_drag_highlight ##### -->
@@ -272,18 +271,6 @@ a widget.
 @hot_y: 
 
 
-<!-- ##### FUNCTION gtk_drag_set_icon_pixmap ##### -->
-<para>
-</para>
-
-@context: 
-@colormap: 
-@pixmap: 
-@mask: 
-@hot_x: 
-@hot_y: 
-
-
 <!-- ##### FUNCTION gtk_drag_set_icon_pixbuf ##### -->
 <para>
 
@@ -306,6 +293,15 @@ a widget.
 @hot_y: 
 
 
+<!-- ##### FUNCTION gtk_drag_set_icon_surface ##### -->
+<para>
+
+</para>
+
+@context: 
+@surface: 
+
+
 <!-- ##### FUNCTION gtk_drag_set_icon_name ##### -->
 <para>
 
@@ -349,16 +345,6 @@ a widget.
 @actions: 
 
 
-<!-- ##### FUNCTION gtk_drag_source_set_icon ##### -->
-<para>
-</para>
-
-@widget: 
-@colormap: 
-@pixmap: 
-@mask: 
-
-
 <!-- ##### FUNCTION gtk_drag_source_set_icon_pixbuf ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkeditable.sgml

@@ -1,214 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkEditable
-
-<!-- ##### SECTION Short_Description ##### -->
-Interface for text-editing widgets
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkEditable interface is an interface which should be implemented by
-text editing widgets, such as #GtkEntry and #GtkText. It contains functions 
-for generically manipulating an editable widget, a large number of action 
-signals used for key bindings, and several signals that an application can 
-connect to to modify the behavior of a widget. 
-</para>
-
-<para>
-As an example of the latter usage, by connecting
-the following handler to "insert_text", an application
-can convert all entry into a widget into uppercase.
-
-<example>
-<title>Forcing entry to uppercase.</title>
-<programlisting>
-#include &lt;ctype.h&gt;
-
-void
-insert_text_handler (GtkEditable *editable,
-                     const gchar *text,
-                     gint         length,
-                     gint        *position,
-                     gpointer     data)
-{
-  int i;
-  gchar *result = g_utf8_strup (text, length);
-
-  g_signal_handlers_block_by_func (editable,
-				   (gpointer) insert_text_handler, data);
-  gtk_editable_insert_text (editable, result, length, position);
-  g_signal_handlers_unblock_by_func (editable,
-                                     (gpointer) insert_text_handler, data);
-
-  g_signal_stop_emission_by_name (editable, "insert_text"); 
-
-  g_free (result);
-}
-</programlisting>
-</example>
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkEditable ##### -->
-<para>
-The #GtkEditable structure is an opaque structure whose members 
-cannot be directly accessed.
-</para>
-
-
-<!-- ##### SIGNAL GtkEditable::changed ##### -->
-<para>
-
-</para>
-
-@editable: the object which received the signal.
-
-<!-- ##### SIGNAL GtkEditable::delete-text ##### -->
-<para>
-
-</para>
-
-@editable: 
-@start_pos: 
-@end_pos: 
-
-<!-- ##### SIGNAL GtkEditable::insert-text ##### -->
-<para>
-
-</para>
-
-@editable: 
-@new_text: 
-@new_text_length: 
-@position: 
-
-<!-- ##### FUNCTION gtk_editable_select_region ##### -->
-<para>
-
-</para>
-
-@editable: 
-@start_pos: 
-@end_pos: 
-
-
-<!-- ##### FUNCTION gtk_editable_get_selection_bounds ##### -->
-<para>
-
-</para>
-
-@editable: 
-@start_pos: 
-@end_pos: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_editable_insert_text ##### -->
-<para>
-
-</para>
-
-@editable: 
-@new_text: 
-@new_text_length: 
-@position: 
-
-
-<!-- ##### FUNCTION gtk_editable_delete_text ##### -->
-<para>
-
-</para>
-
-@editable: 
-@start_pos: 
-@end_pos: 
-
-
-<!-- ##### FUNCTION gtk_editable_get_chars ##### -->
-<para>
-
-</para>
-
-@editable: 
-@start_pos: 
-@end_pos: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_editable_cut_clipboard ##### -->
-<para>
-
-</para>
-
-@editable: 
-
-
-<!-- ##### FUNCTION gtk_editable_copy_clipboard ##### -->
-<para>
-
-</para>
-
-@editable: 
-
-
-<!-- ##### FUNCTION gtk_editable_paste_clipboard ##### -->
-<para>
-
-</para>
-
-@editable: 
-
-
-<!-- ##### FUNCTION gtk_editable_delete_selection ##### -->
-<para>
-
-</para>
-
-@editable: 
-
-
-<!-- ##### FUNCTION gtk_editable_set_position ##### -->
-<para>
-
-</para>
-
-@editable: 
-@position: 
-
-
-<!-- ##### FUNCTION gtk_editable_get_position ##### -->
-<para>
-
-</para>
-
-@editable: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_editable_set_editable ##### -->
-<para>
-
-</para>
-
-@editable: 
-@is_editable: 
-
-
-<!-- ##### FUNCTION gtk_editable_get_editable ##### -->
-<para>
-
-</para>
-
-@editable: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkentry.sgml

@@ -404,11 +404,6 @@ The #GtkEntry-struct struct contains only private data.
 
 </para>
 
-<!-- ##### ARG GtkEntry:state-hint ##### -->
-<para>
-
-</para>
-
 <!-- ##### FUNCTION gtk_entry_new ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkentrybuffer.sgml

@@ -1,171 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkEntryBuffer
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkEntryBuffer ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkEntryBuffer::deleted-text ##### -->
-<para>
-
-</para>
-
-@entrybuffer: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### SIGNAL GtkEntryBuffer::inserted-text ##### -->
-<para>
-
-</para>
-
-@entrybuffer: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-<!-- ##### ARG GtkEntryBuffer:length ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntryBuffer:max-length ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntryBuffer:text ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_entry_buffer_new ##### -->
-<para>
-
-</para>
-
-@initial_chars: 
-@n_initial_chars: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_buffer_get_text ##### -->
-<para>
-
-</para>
-
-@buffer: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_buffer_set_text ##### -->
-<para>
-
-</para>
-
-@buffer: 
-@chars: 
-@n_chars: 
-
-
-<!-- ##### FUNCTION gtk_entry_buffer_get_bytes ##### -->
-<para>
-
-</para>
-
-@buffer: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_buffer_get_length ##### -->
-<para>
-
-</para>
-
-@buffer: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_buffer_get_max_length ##### -->
-<para>
-
-</para>
-
-@buffer: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_buffer_set_max_length ##### -->
-<para>
-
-</para>
-
-@buffer: 
-@max_length: 
-
-
-<!-- ##### FUNCTION gtk_entry_buffer_insert_text ##### -->
-<para>
-
-</para>
-
-@buffer: 
-@position: 
-@chars: 
-@n_chars: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_buffer_delete_text ##### -->
-<para>
-
-</para>
-
-@buffer: 
-@position: 
-@n_chars: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_entry_buffer_emit_deleted_text ##### -->
-<para>
-
-</para>
-
-@buffer: 
-@position: 
-@n_chars: 
-
-
-<!-- ##### FUNCTION gtk_entry_buffer_emit_inserted_text ##### -->
-<para>
-
-</para>
-
-@buffer: 
-@position: 
-@chars: 
-@n_chars: 
-
-

docs/reference/gtk/tmpl/gtkenums.sgml

@@ -29,29 +29,6 @@ Public enumerated types used throughout GTK+
 @GTK_ACCEL_LOCKED: 
 @GTK_ACCEL_MASK: 
 
-<!-- ##### ENUM GtkAnchorType ##### -->
-<para>
-
-</para>
-
-@GTK_ANCHOR_CENTER: 
-@GTK_ANCHOR_NORTH: 
-@GTK_ANCHOR_NORTH_WEST: 
-@GTK_ANCHOR_NORTH_EAST: 
-@GTK_ANCHOR_SOUTH: 
-@GTK_ANCHOR_SOUTH_WEST: 
-@GTK_ANCHOR_SOUTH_EAST: 
-@GTK_ANCHOR_WEST: 
-@GTK_ANCHOR_EAST: 
-@GTK_ANCHOR_N: 
-@GTK_ANCHOR_NW: 
-@GTK_ANCHOR_NE: 
-@GTK_ANCHOR_S: 
-@GTK_ANCHOR_SW: 
-@GTK_ANCHOR_SE: 
-@GTK_ANCHOR_W: 
-@GTK_ANCHOR_E: 
-
 <!-- ##### ENUM GtkArrowPlacement ##### -->
 <para>
 Used to specify the placement of scroll arrows in scrolling menus.
@@ -89,7 +66,6 @@ Used to dictate the style that a #GtkButtonBox uses to layout the buttons it
 contains. (See also: #GtkVButtonBox and #GtkHButtonBox).
 </para>
 
-@GTK_BUTTONBOX_DEFAULT_STYLE: Default packing.
 @GTK_BUTTONBOX_SPREAD: Buttons are evenly spread across the box.
 @GTK_BUTTONBOX_EDGE: Buttons are placed at the edges of the box.
 @GTK_BUTTONBOX_START: Buttons are grouped towards the start of the box, 
@@ -334,7 +310,6 @@ Used to control what selections users are allowed to make.
    The Ctrl key may be used to enlarge the selection, and Shift key to select 
    between the focus and the child pointed to. Some widgets may also allow
    Click-drag to select a range of elements.
-@GTK_SELECTION_EXTENDED: Deprecated, behaves identical to %GTK_SELECTION_MULTIPLE.
 
 <!-- ##### ENUM GtkShadowType ##### -->
 <para>
@@ -363,22 +338,6 @@ the widget and the widget will respond to mouse clicks.
 @GTK_STATE_INSENSITIVE: State indicating that the widget is
 unresponsive to user actions.
 
-<!-- ##### ENUM GtkSubmenuDirection ##### -->
-<para>
-Indicates the direction a sub-menu will appear.
-</para>
-
-@GTK_DIRECTION_LEFT: A sub-menu will appear to the left of the current menu.
-@GTK_DIRECTION_RIGHT: A sub-menu will appear to the right of the current menu.
-
-<!-- ##### ENUM GtkSubmenuPlacement ##### -->
-<para>
-
-</para>
-
-@GTK_TOP_BOTTOM: 
-@GTK_LEFT_RIGHT: 
-
 <!-- ##### ENUM GtkToolbarStyle ##### -->
 <para>
 Used to customize the appearance of a #GtkToolbar. Note that 
@@ -403,15 +362,6 @@ Used by #GtkRange to control the policy for notifying value changes.
 @GTK_UPDATE_DISCONTINUOUS: Notify updates when the mouse button has been released
 @GTK_UPDATE_DELAYED: Space out updates with a small timeout
 
-<!-- ##### ENUM GtkVisibility ##### -->
-<para>
-Used by #GtkCList and #GtkCTree to indicate whether a row is visible.
-</para>
-
-@GTK_VISIBILITY_NONE: The row is not visible.
-@GTK_VISIBILITY_PARTIAL: The row is partially visible.
-@GTK_VISIBILITY_FULL: The row is fully visible.
-
 <!-- ##### ENUM GtkWindowPosition ##### -->
 <para>
 Window placement can be influenced using this enumeration. Note that

docs/reference/gtk/tmpl/gtkfeatures.sgml

@@ -22,62 +22,49 @@ typically use the features described here.
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### VARIABLE gtk_major_version ##### -->
+<!-- ##### FUNCTION gtk_get_major_version ##### -->
 <para>
-The major version number of the GTK+ library.  (e.g. in GTK+ version
-1.2.5 this is 1.) 
+
 </para>
 
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_get_minor_version ##### -->
 <para>
-This variable is in the library, so represents the
-GTK+ library you have linked against. Contrast with the
-#GTK_MAJOR_VERSION macro, which represents the major version of the
-GTK+ headers you have included.
+
 </para>
 
+@void: 
+@Returns: 
 
-<!-- ##### VARIABLE gtk_minor_version ##### -->
+
+<!-- ##### FUNCTION gtk_get_micro_version ##### -->
 <para>
-The minor version number of the GTK+ library.
-(e.g. in GTK+ version 1.2.5 this is 2.)
+
 </para>
 
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_get_binary_age ##### -->
 <para>
-This variable is in the library, so represents the
-GTK+ library you have linked against. Contrast with the
-#GTK_MINOR_VERSION macro, which represents the minor version of the
-GTK+ headers you have included.
+
 </para>
 
+@void: 
+@Returns: 
 
-<!-- ##### VARIABLE gtk_micro_version ##### -->
+
+<!-- ##### FUNCTION gtk_get_interface_age ##### -->
 <para>
-The micro version number of the GTK+ library.
-(e.g. in GTK+ version 1.2.5 this is 5.)
+
 </para>
 
-
-<para>
-This variable is in the library, so represents the GTK+ library you
-have linked against. Contrast with the #GTK_MICRO_VERSION macro, which
-represents the micro version of the GTK+ headers you have included.
-</para>
-
-
-<!-- ##### VARIABLE gtk_binary_age ##### -->
-<para>
-This is the binary age passed to <application>libtool</application>. If 
-<application>libtool</application> means nothing to you, don't worry 
-about it. ;-)
-</para>
-
-
-<!-- ##### VARIABLE gtk_interface_age ##### -->
-<para>
-This is the interface age passed to <application>libtool</application>. If 
-<application>libtool</application> means nothing to you, don't worry 
-about it. ;-)
-</para>
+@void: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_check_version ##### -->

docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml

@@ -37,7 +37,7 @@ The #GtkFileChooserButton supports the #GtkFileChooserAction<!--
 <para>
 The #GtkFileChooserButton will ellipsize the label,
 and thus will thus request little horizontal space.  To give the button
-more space, you should call gtk_widget_size_request(),
+more space, you should call gtk_widget_get_preferred_size(),
 gtk_file_chooser_button_set_width_chars(), or pack the button in
 such a way that other interface elements give space to the widget.
 </para>

docs/reference/gtk/tmpl/gtkfilesel.sgml

@@ -1,226 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkFileSelection
-
-<!-- ##### SECTION Short_Description ##### -->
-Prompt the user for a file or directory name
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkFileSelection has been superseded by the newer #GtkFileChooser family
-of widgets.
-</para>
-<para>
-#GtkFileSelection should be used to retrieve file or directory names from 
-the user. It will create a new dialog window containing a directory list, 
-and a file list corresponding to the current working directory. The filesystem 
-can be navigated using the directory list or the drop-down history menu. 
-Alternatively, the TAB key can be used to navigate using filename 
-completion - common in text based editors such as emacs and jed.
-</para>
-<para>
-File selection dialogs are created with a call to gtk_file_selection_new().
-</para>
-<para>
-The default filename can be set using gtk_file_selection_set_filename() and the selected filename retrieved using gtk_file_selection_get_filename().
-</para>
-<para>
-Use gtk_file_selection_complete() to display files and directories
-that match a given pattern. This can be used for example, to show only
-*.txt files, or only files beginning with gtk*.
-</para>
-<para>
-Simple file operations; create directory, delete file, and rename file, are available from buttons at the top of the dialog. These can be hidden using gtk_file_selection_hide_fileop_buttons() and shown again using gtk_file_selection_show_fileop_buttons().
-</para>
-<para>
-<example>
-<title>Getting a filename from the user.</title>
-<programlisting>
-
-/* The file selection widget and the string to store the chosen filename */
-
-void store_filename (GtkWidget *widget, gpointer user_data) {
-   GtkWidget *file_selector = GTK_WIDGET (user_data);
-   const gchar *selected_filename;
-
-   selected_filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (file_selector));
-   g_print ("Selected filename: &percnt;s\n", selected_filename);
-}
-
-void create_file_selection (void) {
-
-   GtkWidget *file_selector;
-
-   /* Create the selector */
-   
-   file_selector = gtk_file_selection_new ("Please select a file for editing.");
-   
-   g_signal_connect (GTK_FILE_SELECTION (file_selector)->ok_button,
-                     "clicked",
-                     G_CALLBACK (store_filename),
-                     file_selector);
-   			   
-   /* Ensure that the dialog box is destroyed when the user clicks a button. */
-   
-   g_signal_connect_swapped (GTK_FILE_SELECTION (file_selector)->ok_button,
-                             "clicked",
-                             G_CALLBACK (gtk_widget_destroy), 
-                             file_selector);
-
-   g_signal_connect_swapped (GTK_FILE_SELECTION (file_selector)->cancel_button,
-                             "clicked",
-                             G_CALLBACK (gtk_widget_destroy),
-                             file_selector); 
-   
-   /* Display that dialog */
-   
-   gtk_widget_show (file_selector);
-}
-
-</programlisting>
-</example>
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-
-<para>
-<variablelist>
-<varlistentry>
-<term>#GtkDialog</term>
-<listitem><para>Add your own widgets into the #GtkFileSelection.</para></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkFileSelection ##### -->
-<para>
-The #GtkFileSelection struct contains the following #GtkWidget fields:
-</para>
-
-@dir_list: 
-@file_list: 
-@selection_entry: 
-@selection_text: 
-@main_vbox: 
-@ok_button: 
-@cancel_button: the two main buttons that signals should be connected 
-    to in order to perform an action when the user hits either OK or 
-    Cancel.
-@help_button: 
-@history_pulldown: the #GtkOptionMenu used to create the drop-down 
-    directory history.
-@history_menu: 
-@history_list: 
-@fileop_dialog: the dialog box used to display the #GtkFileSelection. 
-   It can be customized by adding/removing widgets from it using the 
-   standard #GtkDialog functions.
-@fileop_entry: 
-@fileop_file: 
-@cmpl_state: 
-@fileop_c_dir: 
-@fileop_del_file: 
-@fileop_ren_file: the buttons that appear at the top of the file 
-    selection dialog. These "operation buttons" can be hidden and 
-    redisplayed with gtk_file_selection_hide_fileop_buttons() and  
-    gtk_file_selection_show_fileop_buttons() respectively.
-@button_area: 
-@action_area: 
-
-<!-- ##### ARG GtkFileSelection:filename ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileSelection:select-multiple ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileSelection:show-fileops ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_file_selection_new ##### -->
-<para>
-Creates a new file selection dialog box. By default it will contain a #GtkTreeView of the application's current working directory, and a file listing. Operation buttons that allow the user to create a directory, delete files and rename files, are also present.
-</para>
-
-@title: a message that will be placed in the file requestor's titlebar.
-@Returns: the new file selection.
-@Deprecated: Use gtk_file_chooser_dialog_new() instead
-
-
-<!-- ##### FUNCTION gtk_file_selection_set_filename ##### -->
-<para>
-</para>
-
-@filesel: 
-@filename: 
-
-
-<!-- ##### FUNCTION gtk_file_selection_get_filename ##### -->
-<para>
-</para>
-
-@filesel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_file_selection_complete ##### -->
-<para>
-Will attempt to match @pattern to a valid filenames or subdirectories in the current directory. If a match can be made, the matched filename will appear in the text entry field of the file selection dialog.
-If a partial match can be made, the "Files" list will contain those
-file names which have been partially matched, and the "Folders"
-list those directories which have been partially matched.
-</para>
-
-@filesel: a #GtkFileSelection.
-@pattern: a string of characters which may or may not match any filenames in the current directory.
-
-
-<!-- ##### FUNCTION gtk_file_selection_show_fileop_buttons ##### -->
-<para>
-Shows the file operation buttons, if they have previously been hidden. The rest of the widgets in the dialog will be resized accordingly.
-</para>
-
-@filesel: a #GtkFileSelection.
-
-
-<!-- ##### FUNCTION gtk_file_selection_hide_fileop_buttons ##### -->
-<para>
-Hides the file operation buttons that normally appear at the top of the dialog. Useful if you wish to create a custom file selector, based on #GtkFileSelection.
-</para>
-
-@filesel: a #GtkFileSelection.
-
-
-<!-- ##### FUNCTION gtk_file_selection_get_selections ##### -->
-<para>
-
-</para>
-
-@filesel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_file_selection_set_select_multiple ##### -->
-<para>
-
-</para>
-
-@filesel: 
-@select_multiple: 
-
-
-<!-- ##### FUNCTION gtk_file_selection_get_select_multiple ##### -->
-<para>
-
-</para>
-
-@filesel: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkframe.sgml

@@ -74,11 +74,6 @@ a <child> type attribute.
 
 </para>
 
-<!-- ##### ARG GtkFrame:shadow ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkFrame:shadow-type ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkhandlebox.sgml

@@ -115,11 +115,6 @@ handlebox are detached from the main window.
 
 </para>
 
-<!-- ##### ARG GtkHandleBox:shadow ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkHandleBox:shadow-type ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkimcontextsimple.sgml

@@ -1,55 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkIMContextSimple
-
-<!-- ##### SECTION Short_Description ##### -->
-An input method context supporting table-based input methods
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkIMContextSimple ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gtk_im_context_simple_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_im_context_simple_add_table ##### -->
-<para>
-
-</para>
-
-@context_simple: 
-@data: 
-@max_seq_len: 
-@n_seqs: 
-
-
-<!-- ##### MACRO GTK_MAX_COMPOSE_LEN ##### -->
-<para>
-The maximum length of sequences in compose tables.
-</para>
-
-
-

docs/reference/gtk/tmpl/gtkimmulticontext.sgml

@@ -1,64 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkIMMulticontext
-
-<!-- ##### SECTION Short_Description ##### -->
-An input method context supporting multiple, loadable input methods
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkIMMulticontext ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gtk_im_multicontext_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_im_multicontext_append_menuitems ##### -->
-<para>
-
-</para>
-
-@context: 
-@menushell: 
-
-
-<!-- ##### FUNCTION gtk_im_multicontext_get_context_id ##### -->
-<para>
-
-</para>
-
-@context: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_im_multicontext_set_context_id ##### -->
-<para>
-
-</para>
-
-@context: 
-@context_id: 
-
-

docs/reference/gtk/tmpl/gtkitem.sgml

@@ -1,75 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkItem
-
-<!-- ##### SECTION Short_Description ##### -->
-Abstract base class for GtkMenuItem, GtkListItem and GtkTreeItem
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkItem widget is an abstract base class for #GtkMenuItem, #GtkListItem
-and #GtkTreeItem.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkItem ##### -->
-<para>
-The #GtkItem-struct struct contains private data only, and
-should be accessed using the functions below.
-</para>
-
-
-<!-- ##### SIGNAL GtkItem::deselect ##### -->
-<para>
-Emitted when the item is deselected.
-</para>
-
-@item: the object which received the signal.
-
-<!-- ##### SIGNAL GtkItem::select ##### -->
-<para>
-Emitted when the item is selected.
-</para>
-
-@item: the object which received the signal.
-
-<!-- ##### SIGNAL GtkItem::toggle ##### -->
-<para>
-Emitted when the item is toggled.
-</para>
-
-@item: the object which received the signal.
-
-<!-- ##### FUNCTION gtk_item_select ##### -->
-<para>
-Emits the "select" signal on the given item.
-</para>
-
-@item: a #GtkItem.
-
-
-<!-- ##### FUNCTION gtk_item_deselect ##### -->
-<para>
-Emits the "deselect" signal on the given item.
-</para>
-
-@item: a #GtkItem.
-
-
-<!-- ##### FUNCTION gtk_item_toggle ##### -->
-<para>
-Emits the "toggle" signal on the given item.
-</para>
-
-@item: a #GtkItem.
-
-

docs/reference/gtk/tmpl/gtkitemfactory.sgml

@@ -1,330 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkItemFactory
-
-<!-- ##### SECTION Short_Description ##### -->
-A factory for menus
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-As of GTK+ 2.4, #GtkItemFactory has been deprecated in favour of #GtkUIManager.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkItemFactory ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### USER_FUNCTION GtkPrintFunc ##### -->
-<para>
-
-</para>
-
-@func_data: 
-@str: 
-
-
-<!-- ##### USER_FUNCTION GtkTranslateFunc ##### -->
-<para>
-The function used to translate messages in e.g. #GtkIconFactory
-and #GtkActionGroup. 
-</para>
-
-@path: The id of the message. In #GtkItemFactory this will be a path
-  from a #GtkItemFactoryEntry, in #GtkActionGroup, it will be a label
-  or tooltip from a #GtkActionEntry.
-@func_data: user data passed in when registering the function
-@Returns: the translated message
-
-
-<!-- ##### USER_FUNCTION GtkItemFactoryCallback ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### USER_FUNCTION GtkItemFactoryCallback1 ##### -->
-<para>
-
-</para>
-
-@callback_data: 
-@callback_action: 
-@widget: 
-
-
-<!-- ##### USER_FUNCTION GtkItemFactoryCallback2 ##### -->
-<para>
-
-</para>
-
-@widget: 
-@callback_data: 
-@callback_action: 
-
-
-<!-- ##### STRUCT GtkItemFactoryEntry ##### -->
-<para>
-
-</para>
-
-@path: 
-@accelerator: 
-@callback: 
-@callback_action: 
-@item_type: 
-@extra_data: 
-
-<!-- ##### STRUCT GtkItemFactoryItem ##### -->
-<para>
-
-</para>
-
-@path: 
-@widgets: 
-
-<!-- ##### FUNCTION gtk_item_factory_new ##### -->
-<para>
-
-</para>
-
-@container_type: 
-@path: 
-@accel_group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_construct ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@container_type: 
-@path: 
-@accel_group: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_add_foreign ##### -->
-<para>
-
-</para>
-
-@accel_widget: 
-@full_path: 
-@accel_group: 
-@keyval: 
-@modifiers: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_from_widget ##### -->
-<para>
-
-</para>
-
-@widget: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_path_from_widget ##### -->
-<para>
-
-</para>
-
-@widget: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_get_item ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_get_widget ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_get_widget_by_action ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_get_item_by_action ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_create_item ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@entry: 
-@callback_data: 
-@callback_type: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_create_items ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@n_entries: 
-@entries: 
-@callback_data: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_create_items_ac ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@n_entries: 
-@entries: 
-@callback_data: 
-@callback_type: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_delete_item ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@path: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_delete_entry ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@entry: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_delete_entries ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@n_entries: 
-@entries: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_popup ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@x: 
-@y: 
-@mouse_button: 
-@time_: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_popup_with_data ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@popup_data: 
-@destroy: 
-@x: 
-@y: 
-@mouse_button: 
-@time_: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_popup_data ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_popup_data_from_widget ##### -->
-<para>
-
-</para>
-
-@widget: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_from_path ##### -->
-<para>
-
-</para>
-
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_create_menu_entries ##### -->
-<para>
-
-</para>
-
-@n_entries: 
-@entries: 
-
-
-<!-- ##### FUNCTION gtk_item_factories_path_delete ##### -->
-<para>
-
-</para>
-
-@ifactory_path: 
-@path: 
-
-
-<!-- ##### FUNCTION gtk_item_factory_set_translate_func ##### -->
-<para>
-
-</para>
-
-@ifactory: 
-@func: 
-@data: 
-@notify: 
-
-

docs/reference/gtk/tmpl/gtklinkbutton.sgml

@@ -1,139 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkLinkButton
-
-<!-- ##### SECTION Short_Description ##### -->
-Create buttons bound to a URL
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkLinkButton is a #GtkButton with a hyperlink, similar to the one
-used by web browsers, which triggers an action when clicked. It is useful
-to show quick links to resources.
-</para>
-
-<para>
-A link button is created by calling either gtk_link_button_new() or
-gtk_link_button_new_with_label(). If using the former, the URI you pass
-to the constructor is used as a label for the widget.
-</para>
-
-<para>
-The URI bound to a #GtkLinkButton can be set specifically using
-gtk_link_button_set_uri(), and retrieved using gtk_link_button_get_uri().
-</para>
-
-<para>
-#GtkLinkButton offers a global hook, which is called when the used clicks
-on it: see gtk_link_button_set_uri_hook().
-</para>
-
-<para>
-#GtkLinkButton was added in GTK+ 2.10.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkButton
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkLinkButton ##### -->
-<para>
-The #GtkLinkButton struct contains private data only, and should be
-manipulated using the functions below.
-</para>
-
-
-<!-- ##### ARG GtkLinkButton:uri ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLinkButton:visited ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_link_button_new ##### -->
-<para>
-
-</para>
-
-@uri: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_link_button_new_with_label ##### -->
-<para>
-
-</para>
-
-@uri: 
-@label: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_link_button_get_uri ##### -->
-<para>
-
-</para>
-
-@link_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_link_button_set_uri ##### -->
-<para>
-
-</para>
-
-@link_button: 
-@uri: 
-
-
-<!-- ##### USER_FUNCTION GtkLinkButtonUriFunc ##### -->
-<para>
-The type of a function which is called when the #GtkLinkButton is
-clicked.
-</para>
-
-@button: the #GtkLinkButton which was clicked
-@link_: the URI to which the clicked #GtkLinkButton points
-@user_data: user data that was passed when the function was registered
-  with gtk_link_button_set_uri_hook()
-
-
-<!-- ##### FUNCTION gtk_link_button_set_uri_hook ##### -->
-<para>
-
-</para>
-
-@func: 
-@data: 
-@destroy: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_link_button_get_visited ##### -->
-<para>
-
-</para>
-
-@link_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_link_button_set_visited ##### -->
-<para>
-
-</para>
-
-@link_button: 
-@visited: 
-
-

docs/reference/gtk/tmpl/gtkmain.sgml

@@ -392,11 +392,11 @@ widget and this function does nothing.
 
 <!-- ##### FUNCTION gtk_grab_get_current ##### -->
 <para>
-Queries the current grab of the default window group. 
+
 </para>
 
 @void: 
-@Returns: The widget which currently has the grab or %NULL if no grab is active.
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_grab_remove ##### -->
@@ -430,6 +430,15 @@ If @widget does not have the grab, this function does nothing.
 @device: 
 
 
+<!-- ##### USER_FUNCTION GtkFunction ##### -->
+<para>
+
+</para>
+
+@data: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_init_add ##### -->
 <para>
 Registers a function to be called when the mainloop is started.
@@ -437,6 +446,7 @@ Registers a function to be called when the mainloop is started.
 
 @function: Function to invoke when gtk_main() is called next.
 @data: Data to pass to that function.
+@Deprecated: This function is going to be removed in GTK+ 3.0
 
 
 <!-- ##### FUNCTION gtk_quit_add_destroy ##### -->
@@ -447,6 +457,7 @@ is quit.
 
 @main_level: Level of the mainloop which shall trigger the destruction.
 @object: Object to be destroyed.
+@Deprecated: This function is going to be removed in GTK+ 3.0
 
 
 <!-- ##### FUNCTION gtk_quit_add ##### -->
@@ -462,8 +473,28 @@ Registers a function to be called when an instance of the mainloop is left.
 @data: Pointer to pass when calling @function.
 @Returns: A handle for this quit handler (you need this for gtk_quit_remove())
   or 0 if you passed a %NULL pointer in @function.
+@Deprecated: This function is going to be removed in GTK+ 3.0
 
 
+<!-- ##### USER_FUNCTION GtkCallbackMarshal ##### -->
+<para>
+
+</para>
+
+@object: 
+@data: 
+@n_args: 
+@args: 
+
+
+<!-- ##### STRUCT GtkArg ##### -->
+<para>
+
+</para>
+
+@type: 
+@name: 
+
 <!-- ##### FUNCTION gtk_quit_add_full ##### -->
 <para>
 Registers a function to be called when an instance of the mainloop is left.
@@ -488,6 +519,7 @@ used by GTK+ wrappers for languages other than C.
 @destroy: Function to call to destruct @data. Gets @data as argument.
 @Returns: A handle for this quit handler (you need this for gtk_quit_remove())
   or 0 if you passed a %NULL pointer in @function.
+@Deprecated: This function is going to be removed in GTK+ 3.0
 
 
 <!-- ##### FUNCTION gtk_quit_remove ##### -->
@@ -496,6 +528,7 @@ Removes a quit handler by its identifier.
 </para>
 
 @quit_handler_id: Identifier for the handler returned when installing it.
+@Deprecated: This function is going to be removed in GTK+ 3.0
 
 
 <!-- ##### FUNCTION gtk_quit_remove_by_data ##### -->
@@ -504,6 +537,7 @@ Removes a quit handler identified by its @data field.
 </para>
 
 @data: The pointer passed as @data to gtk_quit_add() or gtk_quit_add_full().
+@Deprecated: This function is going to be removed in GTK+ 3.0
 
 
 <!-- ##### MACRO GTK_PRIORITY_RESIZE ##### -->

docs/reference/gtk/tmpl/gtkmenu.sgml

@@ -245,6 +245,7 @@ Moves a #GtkMenuItem to a new position within the #GtkMenu.
 @parent_menu_item: 
 @func: 
 @data: 
+@destroy: 
 @button: 
 @activate_time: 
 

docs/reference/gtk/tmpl/gtkmenuitem.sgml

@@ -78,6 +78,20 @@ submenu. For normal applications, the relevant signal is "activate".
 
 @menuitem: the object which received the signal.
 
+<!-- ##### SIGNAL GtkMenuItem::deselect ##### -->
+<para>
+
+</para>
+
+@menuitem: the object which received the signal.
+
+<!-- ##### SIGNAL GtkMenuItem::select ##### -->
+<para>
+
+</para>
+
+@menuitem: the object which received the signal.
+
 <!-- ##### SIGNAL GtkMenuItem::toggle-size-allocate ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkmisc.sgml

@@ -19,6 +19,11 @@ positioned within its allocated area. Note that if the widget is added to
 a container in such a way that it expands automatically to fill its
 allocated area, the alignment settings will not alter the widgets position.
 </para>
+<para>
+Note that the desired effect can in most cases be achieved by using the
+#GtkWidget:halign, #GtkWidget:valign and #GtkWidget:margin properties
+on the child widget.
+</para>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>

docs/reference/gtk/tmpl/gtknotebook.sgml

@@ -1,709 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkNotebook
-
-<!-- ##### SECTION Short_Description ##### -->
-A tabbed notebook container
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkNotebook widget is a #GtkContainer whose children are pages that
-can be switched between using tab labels along one edge.
-</para>
-<para>
-There are many configuration options for #GtkNotebook. Among other
-things, you can choose on which edge the tabs appear
-(see gtk_notebook_set_tab_pos()), whether, if there are too many
-tabs to fit the notebook should be made bigger or scrolling
-arrows added (see gtk_notebook_set_scrollable), and whether there
-will be a popup menu allowing the users to switch pages.
-(see gtk_notebook_popup_enable(), gtk_notebook_popup_disable())
-</para>
-
-<refsect2 id="GtkNotebook-BUILDER-UI">
-<title>GtkNotebook as GtkBuildable</title>
-<para>
-The GtkNoteboopk implementation of the GtkBuildable interface
-supports placing children into tabs by specifying "tab" as the
-"type" attribute of a &lt;child&gt; element. Note that the content
-of the tab must be created before the tab can be filled.
-A tab child can be specified without specifying a &lt;child&gt;
-type attribute.
-</para>
-<para>
-To add a child widget in the notebooks action area, specify
-"action-start" or "action-end" as the "type" attribute of the &lt;child&gt;
-element.
-</para>
-<example>
-<title>A UI definition fragment with GtkNotebook</title>
-<programlisting><![CDATA[
-<object class="GtkNotebook">
-  <child>
-    <object class="GtkLabel" id="notebook-content">
-      <property name="label">Content</property>
-    </object>
-  </child>
-  <child type="tab">
-    <object class="GtkLabel" id="notebook-tab">
-      <property name="label">Tab</property>
-    </object>
-  </child>
-</object>
-]]></programlisting>
-</example>
-</refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-<varlistentry>
-<term>#GtkContainer</term>
-<listitem><para>For functions that apply to every #GtkContainer</para></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkNotebook ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkNotebook::change-current-page ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@arg1: 
-@Returns: 
-
-<!-- ##### SIGNAL GtkNotebook::create-window ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@widget: 
-@arg1: 
-@arg2: 
-@Returns: 
-
-<!-- ##### SIGNAL GtkNotebook::focus-tab ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@arg1: 
-@Returns: 
-
-<!-- ##### SIGNAL GtkNotebook::move-focus-out ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkNotebook::page-added ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@widget: 
-@arg1: 
-
-<!-- ##### SIGNAL GtkNotebook::page-removed ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@widget: 
-@arg1: 
-
-<!-- ##### SIGNAL GtkNotebook::page-reordered ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@widget: 
-@arg1: 
-
-<!-- ##### SIGNAL GtkNotebook::reorder-tab ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@arg1: 
-@Param3: 
-@Returns: 
-
-<!-- ##### SIGNAL GtkNotebook::select-page ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@arg1: 
-@Returns: 
-
-<!-- ##### SIGNAL GtkNotebook::switch-page ##### -->
-<para>
-Emitted when the user or a function changes the current page.
-</para>
-
-@notebook: the object which received the signal.
-@page: the new current page
-@page_num: the index of the page
-
-<!-- ##### ARG GtkNotebook:enable-popup ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:group ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:page ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:scrollable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:show-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:show-tabs ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-pos ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:detachable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:menu-label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:position ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:reorderable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-expand ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-fill ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-pack ##### -->
-<para>
- Deprecated: 2.20: The tab packing functionality of children should not
- be used anymore and support will be removed in the future.
-</para>
-
-<!-- ##### ARG GtkNotebook:arrow-spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:has-backward-stepper ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:has-forward-stepper ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:has-secondary-backward-stepper ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:has-secondary-forward-stepper ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-curvature ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-overlap ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_notebook_new ##### -->
-<para>
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_append_page ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@tab_label: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_append_page_menu ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@tab_label: 
-@menu_label: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_prepend_page ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: the
-@tab_label: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_prepend_page_menu ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@tab_label: 
-@menu_label: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_insert_page ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@tab_label: 
-@position: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_insert_page_menu ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@tab_label: 
-@menu_label: 
-@position: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_remove_page ##### -->
-<para>
-</para>
-
-@notebook: 
-@page_num: 
-
-
-<!-- ##### FUNCTION gtk_notebook_page_num ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_next_page ##### -->
-<para>
-</para>
-
-@notebook: 
-
-
-<!-- ##### FUNCTION gtk_notebook_prev_page ##### -->
-<para>
-</para>
-
-@notebook: 
-
-
-<!-- ##### FUNCTION gtk_notebook_reorder_child ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@position: 
-
-
-<!-- ##### FUNCTION gtk_notebook_set_tab_pos ##### -->
-<para>
-</para>
-
-@notebook: the notebook widget
-@pos: the position
-
-
-<!-- ##### FUNCTION gtk_notebook_set_show_tabs ##### -->
-<para>
-</para>
-
-@notebook: 
-@show_tabs: 
-
-
-<!-- ##### FUNCTION gtk_notebook_set_show_border ##### -->
-<para>
-</para>
-
-@notebook: 
-@show_border: 
-
-
-<!-- ##### FUNCTION gtk_notebook_set_scrollable ##### -->
-<para>
-</para>
-
-@notebook: 
-@scrollable: 
-
-
-<!-- ##### FUNCTION gtk_notebook_popup_enable ##### -->
-<para>
-</para>
-
-@notebook: 
-
-
-<!-- ##### FUNCTION gtk_notebook_popup_disable ##### -->
-<para>
-</para>
-
-@notebook: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_current_page ##### -->
-<para>
-</para>
-
-@notebook: the notebook widget
-@Returns: the page number
-
-
-<!-- ##### FUNCTION gtk_notebook_get_menu_label ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_nth_page ##### -->
-<para>
-</para>
-
-@notebook: 
-@page_num: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_n_pages ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_tab_label ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_set_menu_label ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@menu_label: 
-
-
-<!-- ##### FUNCTION gtk_notebook_set_menu_label_text ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@menu_text: 
-
-
-<!-- ##### FUNCTION gtk_notebook_set_tab_label ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@tab_label: 
-
-
-<!-- ##### FUNCTION gtk_notebook_set_tab_label_text ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@tab_text: 
-
-
-<!-- ##### FUNCTION gtk_notebook_set_tab_reorderable ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@child: 
-@reorderable: 
-
-
-<!-- ##### FUNCTION gtk_notebook_set_tab_detachable ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@child: 
-@detachable: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_menu_label_text ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@child: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_scrollable ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_show_border ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_show_tabs ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_tab_label_text ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@child: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_tab_pos ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_tab_reorderable ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@child: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_tab_detachable ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@child: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_tab_hborder ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_tab_vborder ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_set_current_page ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@page_num: 
-
-
-<!-- ##### FUNCTION gtk_notebook_set_group ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@group: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_group ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_notebook_set_action_widget ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@widget: 
-@pack_type: 
-
-
-<!-- ##### FUNCTION gtk_notebook_get_action_widget ##### -->
-<para>
-
-</para>
-
-@notebook: 
-@pack_type: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION GtkNotebookWindowCreationFunc ##### -->
-<para>
-A function used by GtkNotebook when a detachable tab is dropped
-in the root window, it's used to create a window containing a notebook
-where the tab will be attached. This function will also be responsible
-of moving/resizing the window and adding the necessary properties to
-the notebook (i.e.: group-id).
-
-If the function returns %NULL, the drag will be cancelled.
-</para>
-
-@source: The source #GtkNotebook of the drag operation
-@page: the child #GtkWidget affected
-@x: the X coordinate where the drop happens
-@y: the Y coordinate where the drop happens
-@data: user data
-@Returns: The created #GtkNotebook where the tab will be attached, or NULL to cancel the drag
-
-
-<!-- ##### FUNCTION gtk_notebook_set_window_creation_hook ##### -->
-<para>
-
-</para>
-
-@func: 
-@data: 
-@destroy: 
-
-

docs/reference/gtk/tmpl/gtkpapersize.sgml

@@ -1,308 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkPaperSize
-
-<!-- ##### SECTION Short_Description ##### -->
-Support for named paper sizes
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-GtkPaperSize handles paper sizes. It uses the standard called 
-"PWG 5101.1-2002 PWG: Standard for Media Standardized Names" 
-<!-- FIXME link here -->
-to name the paper sizes (and to get the data for the page sizes).
-In addition to standard paper sizes, GtkPaperSize allows to
-construct custom paper sizes with arbitrary dimensions.
-</para>
-<para>
-The #GtkPaperSize object stores not only the dimensions (width
-and height) of a paper size and its name, it also provides
-default <link linkend="print-margins">print margins</link>.
-</para>
-
-<para>
-Printing support has been added in GTK+ 2.10.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkPageSetup
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkPaperSize ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM GtkUnit ##### -->
-<para>
-
-</para>
-
-@GTK_UNIT_PIXEL: 
-@GTK_UNIT_POINTS: 
-@GTK_UNIT_INCH: 
-@GTK_UNIT_MM: 
-
-<!-- ##### MACRO GTK_PAPER_NAME_A3 ##### -->
-<para>
-Name for the A4 paper size.
-</para>
-
-
-
-<!-- ##### MACRO GTK_PAPER_NAME_A4 ##### -->
-<para>
-Name for the A4 paper size.
-</para>
-
-
-
-<!-- ##### MACRO GTK_PAPER_NAME_A5 ##### -->
-<para>
-Name for the A5 paper size.
-</para>
-
-
-
-<!-- ##### MACRO GTK_PAPER_NAME_B5 ##### -->
-<para>
-Name for the B5 paper size.
-</para>
-
-
-
-<!-- ##### MACRO GTK_PAPER_NAME_LETTER ##### -->
-<para>
-Name for the Letter paper size.
-</para>
-
-
-
-<!-- ##### MACRO GTK_PAPER_NAME_EXECUTIVE ##### -->
-<para>
-Name for the Executive paper size.
-</para>
-
-
-
-<!-- ##### MACRO GTK_PAPER_NAME_LEGAL ##### -->
-<para>
-Name for the Legal paper size.
-</para>
-
-
-
-<!-- ##### FUNCTION gtk_paper_size_new ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_new_from_ppd ##### -->
-<para>
-
-</para>
-
-@ppd_name: 
-@ppd_display_name: 
-@width: 
-@height: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_new_custom ##### -->
-<para>
-
-</para>
-
-@name: 
-@display_name: 
-@width: 
-@height: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_copy ##### -->
-<para>
-
-</para>
-
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_free ##### -->
-<para>
-
-</para>
-
-@size: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_is_equal ##### -->
-<para>
-
-</para>
-
-@size1: 
-@size2: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_get_paper_sizes ##### -->
-<para>
-
-</para>
-
-@include_custom: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_get_name ##### -->
-<para>
-
-</para>
-
-@size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_get_display_name ##### -->
-<para>
-
-</para>
-
-@size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_get_ppd_name ##### -->
-<para>
-
-</para>
-
-@size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_get_width ##### -->
-<para>
-
-</para>
-
-@size: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_get_height ##### -->
-<para>
-
-</para>
-
-@size: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_is_custom ##### -->
-<para>
-
-</para>
-
-@size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_set_size ##### -->
-<para>
-
-</para>
-
-@size: 
-@width: 
-@height: 
-@unit: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_get_default_top_margin ##### -->
-<para>
-
-</para>
-
-@size: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_get_default_bottom_margin ##### -->
-<para>
-
-</para>
-
-@size: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_get_default_left_margin ##### -->
-<para>
-
-</para>
-
-@size: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_get_default_right_margin ##### -->
-<para>
-
-</para>
-
-@size: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_get_default ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_new_from_key_file ##### -->
-<para>
-
-</para>
-
-@key_file: 
-@group_name: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paper_size_to_key_file ##### -->
-<para>
-
-</para>
-
-@size: 
-@key_file: 
-@group_name: 
-
-

docs/reference/gtk/tmpl/gtkprogressbar.sgml

@@ -36,21 +36,6 @@ orientation of the bar, optional text can be displayed along with
 the bar, and the step size used in activity mode can be set.
 </para>
 
-<note>
-<para>
-The #GtkProgressBar/#GtkProgress API in GTK 1.2 was bloated, needlessly complex
-and hard to use properly.  Therefore #GtkProgress has been deprecated
-completely and the #GtkProgressBar API has been reduced to the following 10
-functions: gtk_progress_bar_new(), gtk_progress_bar_pulse(), 
-gtk_progress_bar_set_text(), gtk_progress_bar_set_fraction(), 
-gtk_progress_bar_set_pulse_step(), gtk_progress_bar_set_orientation(), 
-gtk_progress_bar_get_text(), gtk_progress_bar_get_fraction(), 
-gtk_progress_bar_get_pulse_step(), gtk_progress_bar_get_orientation(). 
-These have been grouped at the beginning of this section, followed by 
-a large chunk of deprecated 1.2 compatibility functions.
-</para>
-</note>
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
@@ -79,7 +64,7 @@ and should be accessed using the functions below.
 
 </para>
 
-<!-- ##### ARG GtkProgressBar:orientation ##### -->
+<!-- ##### ARG GtkProgressBar:inverted ##### -->
 <para>
 
 </para>
@@ -164,27 +149,16 @@ Creates a new #GtkProgressBar.
 @Returns: 
 
 
-<!-- ##### ENUM GtkProgressBarOrientation ##### -->
-<para>
-An enumeration representing possible orientations and growth
-directions for the visible progress bar.
-</para>
-
-@GTK_PROGRESS_LEFT_TO_RIGHT: A horizontal progress bar growing from left to right.
-@GTK_PROGRESS_RIGHT_TO_LEFT: A horizontal progress bar growing from right to left.
-@GTK_PROGRESS_BOTTOM_TO_TOP: A vertical progress bar growing from bottom to top.
-@GTK_PROGRESS_TOP_TO_BOTTOM: A vertical progress bar growing from top to bottom.
-
-<!-- ##### FUNCTION gtk_progress_bar_set_orientation ##### -->
+<!-- ##### FUNCTION gtk_progress_bar_set_inverted ##### -->
 <para>
 
 </para>
 
 @pbar: 
-@orientation: 
+@inverted: 
 
 
-<!-- ##### FUNCTION gtk_progress_bar_get_orientation ##### -->
+<!-- ##### FUNCTION gtk_progress_bar_get_inverted ##### -->
 <para>
 
 </para>

docs/reference/gtk/tmpl/gtkradiomenuitem.sgml

@@ -140,11 +140,10 @@ Sets the group of a radio menu item, or changes it.
 
 <!-- ##### FUNCTION gtk_radio_menu_item_get_group ##### -->
 <para>
-Returns the group to which the radio menu item belongs, as a #GList of
-#GtkRadioMenuItem. The list belongs to GTK+ and should not be freed.
+
 </para>
 
-@radio_menu_item: a #GtkRadioMenuItem.
-@Returns: the group of @radio_menu_item.
+@radio_menu_item: 
+@Returns: 
 
 

docs/reference/gtk/tmpl/gtkscale.sgml

@@ -1,193 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkScale
-
-<!-- ##### SECTION Short_Description ##### -->
-Base class for GtkHScale and GtkVScale
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkScale is a slider control used to select a numeric value.
-To use it, you'll probably want to investigate the methods on
-its base class, #GtkRange, in addition to the methods for #GtkScale itself.
-To set the value of a scale, you would normally use gtk_range_set_value().
-To detect changes to the value, you would normally use the "value_changed"
-signal.
-</para>
-
-<refsect2 id="GtkScale-BUILDER-UI"><title>GtkScale as GtkBuildable</title>
-<para>
-GtkScale supports a custom &lt;marks&gt; element, which
-can contain multiple &lt;mark&gt; elements. The "value" and "position"
-attributes have the same meaning as gtk_scale_add_mark() parameters of the
-same name. If the element is not empty, its content is taken as the markup
-to show at the mark. It can be translated with the usual "translatable and
-"context" attributes.
-</para>
-</refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkScale ##### -->
-<para>
-The fields of the #GtkScale-struct struct should only be accessed via
-the accessor functions.
-</para>
-
-
-<!-- ##### SIGNAL GtkScale::format-value ##### -->
-<para>
-
-</para>
-
-@scale: 
-@value: 
-@Returns: 
-
-<!-- ##### ARG GtkScale:digits ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScale:draw-value ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScale:value-pos ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScale:slider-length ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScale:value-spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_scale_new ##### -->
-<para>
-
-</para>
-
-@orientation: 
-@adjustment: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_scale_new_with_range ##### -->
-<para>
-
-</para>
-
-@orientation: 
-@min: 
-@max: 
-@step: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_scale_set_digits ##### -->
-<para>
-
-</para>
-
-@scale: 
-@digits: 
-
-
-<!-- ##### FUNCTION gtk_scale_set_draw_value ##### -->
-<para>
-
-</para>
-
-@scale: 
-@draw_value: 
-
-
-<!-- ##### FUNCTION gtk_scale_set_value_pos ##### -->
-<para>
-
-</para>
-
-@scale: 
-@pos: 
-
-
-<!-- ##### FUNCTION gtk_scale_get_digits ##### -->
-<para>
-
-</para>
-
-@scale: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_scale_get_draw_value ##### -->
-<para>
-
-</para>
-
-@scale: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_scale_get_value_pos ##### -->
-<para>
-
-</para>
-
-@scale: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_scale_get_layout ##### -->
-<para>
-
-</para>
-
-@scale: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_scale_get_layout_offsets ##### -->
-<para>
-
-</para>
-
-@scale: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION gtk_scale_add_mark ##### -->
-<para>
-
-</para>
-
-@scale: 
-@value: 
-@position: 
-@markup: 
-
-
-<!-- ##### FUNCTION gtk_scale_clear_marks ##### -->
-<para>
-
-</para>
-
-@scale: 
-
-

docs/reference/gtk/tmpl/gtkscrolledwindow.sgml

@@ -1,282 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkScrolledWindow
-
-<!-- ##### SECTION Short_Description ##### -->
-Adds scrollbars to its child widget
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkScrolledWindow is a #GtkBin subclass: it's a container 
-the accepts a single child widget. #GtkScrolledWindow adds scrollbars
-to the child widget and optionally draws a beveled frame around the 
-child widget.
-</para>
-
-<para>
-The scrolled window can work in two ways. Some widgets have native
-scrolling support; these widgets have "slots" for #GtkAdjustment
-objects. 
-<footnote><para>The scrolled window installs #GtkAdjustment objects in
-the child window's slots using the set_scroll_adjustments_signal,
-found in #GtkWidgetClass. (Conceptually, these widgets implement a
-"Scrollable" interface; because GTK+ 1.2 lacked interface support in
-the object system, this interface is hackily implemented as a signal
-in #GtkWidgetClass. The GTK+ 2.0 object system would allow a clean
-implementation, but it wasn't worth breaking the
-API.)</para></footnote>
-Widgets with native scroll support include #GtkTreeView, #GtkTextView, 
-and #GtkLayout.
-</para>
-
-<para>
-For widgets that lack native scrolling support, the #GtkViewport
-widget acts as an adaptor class, implementing scrollability for child
-widgets that lack their own scrolling capabilities. Use #GtkViewport
-to scroll child widgets such as #GtkTable, #GtkBox, and so on.
-</para>
-
-<para>
-If a widget has native scrolling abilities, it can be added to the
-#GtkScrolledWindow with gtk_container_add(). If a widget does not, you
-must first add the widget to a #GtkViewport, then add the #GtkViewport
-to the scrolled window. The convenience function
-gtk_scrolled_window_add_with_viewport() does exactly this, so you can
-ignore the presence of the viewport.
-</para>
-
-<para>
-The position of the scrollbars is controlled by the scroll
-adjustments. See #GtkAdjustment for the fields in an adjustment - for
-#GtkScrollbar, used by #GtkScrolledWindow, the "value" field
-represents the position of the scrollbar, which must be between the
-"lower" field and "upper - page_size." The "page_size" field
-represents the size of the visible scrollable area. The
-"step_increment" and "page_increment" fields are used when the user
-asks to step down (using the small stepper arrows) or page down (using
-for example the PageDown key).
-</para>
-
-<para>
-If a #GtkScrolledWindow doesn't behave quite as you would like, or
-doesn't have exactly the right layout, it's very possible to set up
-your own scrolling with #GtkScrollbar and for example a #GtkTable.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkViewport, #GtkAdjustment, #GtkWidgetClass
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkScrolledWindow ##### -->
-<para>
-There are no public fields in the #GtkScrolledWindow struct; it should 
-only be accessed using the functions below.
-</para>
-
-
-<!-- ##### SIGNAL GtkScrolledWindow::move-focus-out ##### -->
-<para>
-
-</para>
-
-@scrolledwindow: 
-@arg1: 
-
-<!-- ##### SIGNAL GtkScrolledWindow::scroll-child ##### -->
-<para>
-
-</para>
-
-@scrolledwindow: 
-@arg1: 
-@arg2: 
-@Returns: 
-
-<!-- ##### ARG GtkScrolledWindow:hadjustment ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScrolledWindow:hscrollbar-policy ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScrolledWindow:shadow-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScrolledWindow:vadjustment ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScrolledWindow:vscrollbar-policy ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScrolledWindow:window-placement ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScrolledWindow:window-placement-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScrolledWindow:scrollbar-spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScrolledWindow:scrollbars-within-bevel ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_scrolled_window_new ##### -->
-<para>
-
-</para>
-
-@hadjustment: 
-@vadjustment: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_scrolled_window_get_hadjustment ##### -->
-<para>
-
-</para>
-
-@scrolled_window: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_scrolled_window_get_vadjustment ##### -->
-<para>
-
-</para>
-
-@scrolled_window: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_scrolled_window_get_hscrollbar ##### -->
-<para>
-
-</para>
-
-@scrolled_window: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_scrolled_window_get_vscrollbar ##### -->
-<para>
-
-</para>
-
-@scrolled_window: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_scrolled_window_set_policy ##### -->
-<para>
-
-</para>
-
-@scrolled_window: 
-@hscrollbar_policy: 
-@vscrollbar_policy: 
-
-
-<!-- ##### FUNCTION gtk_scrolled_window_add_with_viewport ##### -->
-<para>
-
-</para>
-
-@scrolled_window: 
-@child: 
-
-
-<!-- ##### FUNCTION gtk_scrolled_window_set_placement ##### -->
-<para>
-
-</para>
-
-@scrolled_window: 
-@window_placement: 
-
-
-<!-- ##### FUNCTION gtk_scrolled_window_unset_placement ##### -->
-<para>
-
-</para>
-
-@scrolled_window: 
-
-
-<!-- ##### FUNCTION gtk_scrolled_window_set_shadow_type ##### -->
-<para>
-
-</para>
-
-@scrolled_window: 
-@type: 
-
-
-<!-- ##### FUNCTION gtk_scrolled_window_set_hadjustment ##### -->
-<para>
-
-</para>
-
-@scrolled_window: 
-@hadjustment: 
-
-
-<!-- ##### FUNCTION gtk_scrolled_window_set_vadjustment ##### -->
-<para>
-
-</para>
-
-@scrolled_window: 
-@vadjustment: 
-
-
-<!-- ##### FUNCTION gtk_scrolled_window_get_placement ##### -->
-<para>
-
-</para>
-
-@scrolled_window: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_scrolled_window_get_policy ##### -->
-<para>
-
-</para>
-
-@scrolled_window: 
-@hscrollbar_policy: 
-@vscrollbar_policy: 
-
-
-<!-- ##### FUNCTION gtk_scrolled_window_get_shadow_type ##### -->
-<para>
-
-</para>
-
-@scrolled_window: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkselection.sgml

@@ -86,6 +86,34 @@ selection handling code.
 @flags: 
 @info: 
 
+<!-- ##### FUNCTION gtk_target_entry_new ##### -->
+<para>
+
+</para>
+
+@target: 
+@flags: 
+@info: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_target_entry_copy ##### -->
+<para>
+
+</para>
+
+@data: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_target_entry_free ##### -->
+<para>
+
+</para>
+
+@data: 
+
+
 <!-- ##### FUNCTION gtk_target_list_new ##### -->
 <para>
 </para>

docs/reference/gtk/tmpl/gtksizegroup.sgml

@@ -44,6 +44,21 @@ vertical size from the vertical requisition of all widgets that can be
 reached from the widget by a chain of size groups of type
 %GTK_SIZE_GROUP_VERTICAL or %GTK_SIZE_GROUP_BOTH.
 </para>
+<para>
+Note that only non-contextual sizes of every widget are ever consulted
+by size groups (since size groups have no knowledge of what size a widget
+will be allocated in one dimension, it cannot derive how much height
+a widget will receive for a given width). When grouping widgets that
+trade height for width in mode %GTK_SIZE_GROUP_VERTICAL or %GTK_SIZE_GROUP_BOTH: 
+the height for the minimum width will be the requested height for all 
+widgets in the group. The same is of course true when horizontally grouping
+width for height widgets.
+</para>
+<para>
+Widgets that trade height-for-width should set a reasonably large minimum width
+by way of GtkLabel:width-chars for instance. Widgets with static sizes as well 
+as widgets that grow (such as ellipsizing text) need no such considerations.
+</para>
 <refsect2 id="GtkSizeGroup-BUILDER-UI">
 <title>GtkSizeGroup as GtkBuildable</title>
 <para>