2.21.1

One hunk got lost when cherry-picking the icon view keynav changes.

NEWS

@@ -1,10 +1,85 @@
-Overview of Changes from GTK+ 2.20.x to 2.90.0
+Overview of Changes from GTK+ 2.21.0 to 2.21.1
 ==============================================
 
-* GtkExtendedLayout: Width-for-height geometry management
+* GDK has been sealed, with the addition of suitable accessors
 
-* gtk_icon_theme_load_symbolic: Support for 'symbolic' icons
+* Bugs:
+ 613132 GtkBoxChild should probably be deprecated
+ 592580 GDK needs sealing
+ 607628 DnD operation doesn't work when using offscreen.
+ 565559 Incorrect leave-notify signals for treeview
+ 618162 Description of GdkColor
+ 614581 Gtk print dialog freezes on start up
+ 533946 GtkHScale does not update correctly
+ 618271 Add gtk_window_has_group()
+ 618000 Sync paper size fallbacks with CLDR 1.8.1
+ 551322 configure does not use -lm in jasper (JPEG2000) testing
+ 619114 undefined reference to `XkbBell'
+ 618093 typo in gtkprintoperation.c, "selecion" should be "selection"
 
+* Updated translations:
+ Italian
+
+
+Overview of Changes from GTK+ 2.20.0 to 2.21.0
+==============================================
+
+* Support tracker 0.8 and 0.9 in the filechooser search code
+
+* New API:
+ - add API to convert coords between parent and child windows
+ - add gdk_window_get_effective_parent() and
+   gdk_window_get_effective_toplevel() which are offscreen aware
+ - add gtk_widget_send_focus_change
+ - add accessors for GtkTextView adjustments
+ - add API to reset the im context in GtkTextView and GtkEntry
+
+* Bug fixes:
+ 614513 Func to substitute GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_GRAB)?
+ 614510 Needed func for GTK_WIDGET_SET_FLAGS (widget, TOPLEVEL) ?
+ 614515 Func to substitute GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_DEFAULT)?
+ 163251 GtkTextView derivatives need some way to set the need_im_reset flag.
+  69872 GTK_WIDGET_SET_FLAGS should be deprecated
+ 615028 gdk/x11/gdkdnd-x11.c missing Xutil.h
+ 615128 gdk monitor order does not seem to be correct
+ 616565 Fix a typo in the offscreen windows docs
+ 616118 please expand documentation for gdk_event_free()
+ 615000 gtk_builder_value_from_string_type() returns FALSE without..
+ 580889 table cells do not implement action interface
+ 616053 GtkTextView lacks accessors for hadjustment and vadjustment
+ 613988 Compile error on DirectFB backend due to missing of gdk_...
+ 614894 Add heuristic for pre XRandR 1.3 drivers
+ 560147 GtkBuilder docs should say what GErrors they throw
+ 615999 Gail doesn't send state-changed events for ATK_STATE_ENABLED
+ 613974 GtkToolItemGroup devides by 0 when allocating space for...
+ 614540 configure wants gio-unix on all platform
+ 557689 In 'select folder' action, filechooser doesn't work when...
+ 615853 BadMatch when pressing keyboard volume keys while pointer...
+ 613887 Misprint in the description of the function gtk_cell_view_...
+ 615162 Fix tooltips on offscreen widgets
+ 616851 assertion `GTK_IS_MISC (misc)' failed
+ 607839 libpixbufloader-png.so not in library list
+ 605186 Use G_DEFINE_INTERFACE macro
+ 402349 FileChooser's default directory is not "active"
+        missing break statement in gtk_tool_item_group_set_property
+        missing default events in  GtkToolItemGroup
+        fix a filechooser crash when removing files
+
+* Translation updates:
+ Basque
+ Bengali India
+ Catalan
+ Catalan (Valencian)
+ Danish
+ Galician
+ Greek
+ Indonesian
+ Kannada
+ Kazakh
+ Latvian
+ Marathi
+ Thai
+ Ukrainian
 
 Overview of Changes from GTK+ 2.19.7 to 2.20.0
 ==============================================

configure.in

@@ -12,7 +12,7 @@ AC_PREREQ(2.62)
 
 m4_define([gtk_major_version], [2])
 m4_define([gtk_minor_version], [21])
-m4_define([gtk_micro_version], [0])
+m4_define([gtk_micro_version], [1])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -954,7 +954,7 @@ dnl Test for libpng
 
 dnl Test for libjasper
   if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
-    AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg)
+    AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg -lm)
   fi
 
   if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then

demos/gtk-demo/images.c

@@ -317,7 +317,6 @@ do_images (GtkWidget *do_widget)
   GtkWidget *align;
   GtkWidget *button;
   GdkPixbuf *pixbuf;
-  GIcon     *gicon;
   GError *error = NULL;
   char *filename;
 
@@ -416,26 +415,6 @@ do_images (GtkWidget *do_widget)
 
       gtk_container_add (GTK_CONTAINER (frame), image);
 
-      /* Symbolic icon */
-
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-			    "<u>Symbolic themed icon</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      /* The alignment keeps the frame from growing when users resize
-       * the window
-       */
-      align = gtk_alignment_new (0.5, 0.5, 0, 0);
-      gtk_container_add (GTK_CONTAINER (align), frame);
-      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
-
-      gicon = g_themed_icon_new_with_default_fallbacks ("battery-critical-charging-symbolic");
-      image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
-
-      gtk_container_add (GTK_CONTAINER (frame), image);
 
       /* Progressive */
 

demos/gtk-demo/list_store.c

@@ -29,9 +29,7 @@ enum
   COLUMN_SEVERITY,
   COLUMN_DESCRIPTION,
   COLUMN_PULSE,
-  COLUMN_ICON,
   COLUMN_ACTIVE,
-  COLUMN_SENSITIVE,
   NUM_COLUMNS
 };
 
@@ -94,24 +92,11 @@ create_model (void)
                               G_TYPE_STRING,
                               G_TYPE_STRING,
                               G_TYPE_UINT,
-                              G_TYPE_STRING,
-                              G_TYPE_BOOLEAN,
                               G_TYPE_BOOLEAN);
 
   /* add data to the list store */
   for (i = 0; i < G_N_ELEMENTS (data); i++)
     {
-      gchar *icon_name;
-      gboolean sensitive;
-
-      if (i == 1 || i == 3)
-        icon_name = "battery-critical-charging-symbolic";
-      else
-        icon_name = NULL;
-      if (i == 3)
-        sensitive = FALSE;
-      else
-        sensitive = TRUE;
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
                           COLUMN_FIXED, data[i].fixed,
@@ -119,9 +104,7 @@ create_model (void)
                           COLUMN_SEVERITY, data[i].severity,
                           COLUMN_DESCRIPTION, data[i].description,
                           COLUMN_PULSE, 0,
-                          COLUMN_ICON, icon_name,
                           COLUMN_ACTIVE, FALSE,
-                          COLUMN_SENSITIVE, sensitive,
                           -1);
     }
 
@@ -216,19 +199,6 @@ add_columns (GtkTreeView *treeview)
                                                      NULL);
   gtk_tree_view_column_set_sort_column_id (column, COLUMN_PULSE);
   gtk_tree_view_append_column (treeview, column);
-
-  /* column for symbolic icon */
-  renderer = gtk_cell_renderer_pixbuf_new ();
-  g_object_set (G_OBJECT (renderer), "follow-state", TRUE, NULL);
-  column = gtk_tree_view_column_new_with_attributes ("Symbolic icon",
-                                                     renderer,
-                                                     "icon-name",
-                                                     COLUMN_ICON,
-                                                     "sensitive",
-                                                     COLUMN_SENSITIVE,
-                                                     NULL);
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_ICON);
-  gtk_tree_view_append_column (treeview, column);
 }
 
 static gboolean

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

@@ -23,6 +23,9 @@ Animated images.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPixbufAnimation ##### -->
 <para>
 An opaque struct representing an animation.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -93,6 +93,9 @@ put_pixel (GdkPixbuf *pixbuf, int x, int y, guchar red, guchar green, guchar blu
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GdkPixbufError ##### -->
 <para>
 An error code in the #GDK_PIXBUF_ERROR domain. Many &gdk-pixbuf;

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

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

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

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

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

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

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

@@ -48,6 +48,9 @@ Functions for reference counting and memory management on pixbufs.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_ref ##### -->
   <para>
 

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

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

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

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

docs/reference/gdk/tmpl/cairo_interaction.sgml

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

docs/reference/gdk/tmpl/colors.sgml

@@ -46,6 +46,9 @@ gdk_color_change() will probably become aliases.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkColor ##### -->
 <para>
 The #GdkColor structure is used to describe an 
@@ -57,20 +60,14 @@ allocated or unallocated color.
 @red: The red component of the color. This is
   a value between 0 and 65535, with 65535 indicating
   full intensitiy.
-@green: The blue component of the color.
-@blue: The green component of the color.
+@green: The green component of the color.
+@blue: The blue component of the color.
 
 <!-- ##### STRUCT GdkColormap ##### -->
 <para>
 The colormap structure contains the following public fields.
 </para>
 
-@size: For pseudo-color colormaps, the number of colors
-  in the colormap.
-@colors: An array containing the current values in the
-  colormap. This can be used to map from pixel values
-  back to RGB values. This is only meaningful for
-  pseudo-color colormaps.
 
 <!-- ##### FUNCTION gdk_colormap_new ##### -->
 <para>
@@ -102,6 +99,7 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -109,6 +107,7 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/cursors.sgml

@@ -31,12 +31,14 @@ gdk_window_set_cursor() or by setting the cursor member of the
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkCursor ##### -->
 <para>
 A <type>GdkCursor</type> structure represents a cursor.
 </para>
 
-@type: the #GdkCursorType of the cursor
 
 <!-- ##### ENUM GdkCursorType ##### -->
 <para>

docs/reference/gdk/tmpl/dnd.sgml

@@ -25,6 +25,9 @@ the GTK+ documentation for more information.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_drag_get_selection ##### -->
 <para>
 </para>
@@ -54,6 +57,7 @@ the GTK+ documentation for more information.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -180,16 +184,6 @@ drag in progress. It is used on both source and destination sides.
 </para>
 
 @parent_instance: the parent instance
-@protocol: the DND protocol which governs this drag.
-@is_source: %TRUE if the context is used on the source side.
-@source_window: the source of this drag.
-@dest_window: the destination window of this drag.
-@targets: a list of targets offered by the source.
-@actions: a bitmask of actions proposed by the source when 
-   @suggested_action is %GDK_ACTION_ASK.
-@suggested_action: the action suggested by the source.
-@action: the action chosen by the destination.
-@start_time: a timestamp recording the start time of this drag.
 
 <!-- ##### ENUM GdkDragAction ##### -->
 <para>

docs/reference/gdk/tmpl/drawing.sgml

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

docs/reference/gdk/tmpl/event_structs.sgml

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

docs/reference/gdk/tmpl/events.sgml

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

docs/reference/gdk/tmpl/fonts.sgml

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

docs/reference/gdk/tmpl/gcs.sgml

@@ -33,6 +33,9 @@ be set by the latter method.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkGC ##### -->
 <para>
 The #GdkGC structure represents a graphics context.

docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml

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

docs/reference/gdk/tmpl/gdkdisplay.sgml

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

docs/reference/gdk/tmpl/gdkdisplaymanager.sgml

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

docs/reference/gdk/tmpl/gdkscreen.sgml

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

docs/reference/gdk/tmpl/gdktesting.sgml

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

docs/reference/gdk/tmpl/general.sgml

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

docs/reference/gdk/tmpl/images.sgml

@@ -58,23 +58,15 @@ displays.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkImage ##### -->
 <para>
 The #GdkImage struct contains information on the image and the pixel data.
 </para>
 
 @parent_instance: the parent instance
-@type: the type of the image.
-@visual: the visual.
-@byte_order: the byte order.
-@width: the width of the image in pixels.
-@height: the height of the image in pixels.
-@depth: the depth of the image, i.e. the number of bits per pixel.
-@bpp: the number of bytes per pixel.
-@bpl: the number of bytes per line of the image.
-@bits_per_pixel: the number of bits per pixel.
-@mem: the pixel data.
-@colormap: the #GdkColormap associated with the image
 
 <!-- ##### FUNCTION gdk_image_new ##### -->
 <para>

docs/reference/gdk/tmpl/input.sgml

@@ -34,6 +34,9 @@ callbacks.</para></listitem>
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_input_add_full ##### -->
 
 

docs/reference/gdk/tmpl/input_devices.sgml

@@ -87,6 +87,9 @@ and <structfield>ytilt</structfield>.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDevice ##### -->
 <para>
 A <structname>GdkDevice</structname> structure contains
@@ -97,15 +100,6 @@ to configure various aspects of the device.
 </para>
 
 @parent_instance: the parent instance
-@name: the name of this device.
-@source: the type of this device.
-@mode: the mode of this device
-@has_cursor: %TRUE if the pointer follows device motion.
-@num_axes: the length of the @axes array.
-@axes: an array of #GdkDeviceAxis, describing the axes of this device.
-@num_keys: the length of the @keys array.
-@keys: an array of #GdkDeviceKey, describing the mapped macro buttons 
-  of this device.
 
 <!-- ##### ENUM GdkInputSource ##### -->
 <para>
@@ -174,6 +168,7 @@ types that GTK+ understands.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -224,6 +219,7 @@ Specifies how an axis of a device is used.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/keys.sgml

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

docs/reference/gdk/tmpl/pango_interaction.sgml

@@ -132,6 +132,9 @@ g_object_unref (gc);
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPangoRenderer ##### -->
 <para>
 
@@ -210,6 +213,7 @@ g_object_unref (gc);
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/pixbufs.sgml

@@ -19,6 +19,9 @@ pixbufs, see the #GdkPixbuf API documentation.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_render_threshold_alpha ##### -->
 <para>
 

docs/reference/gdk/tmpl/pixmaps.sgml

@@ -21,6 +21,9 @@ pixel can be either on or off).
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPixmap ##### -->
 <para>
 An opaque structure representing an offscreen drawable.

docs/reference/gdk/tmpl/properties.sgml

@@ -45,6 +45,9 @@ data commonly stored in X window properties.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkAtom ##### -->
 <para>
 An opaque type representing a string as an index into a table

docs/reference/gdk/tmpl/regions.sgml

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

docs/reference/gdk/tmpl/rgb.sgml

@@ -125,12 +125,16 @@ colors.</para></listitem>
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_rgb_init ##### -->
 <para>
 This function no longer does anything at all. It's completely useless
 (and harmless).
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_draw_rgb_image ##### -->
@@ -399,6 +403,7 @@ private colormap.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -407,6 +412,7 @@ private colormap.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -427,6 +433,7 @@ dither mode is desired; if the display is not ditherable, it may make
 sense to gray out or hide the corresponding UI widget.
 </para>
 
+@void: 
 @Returns: %TRUE if the preferred visual is ditherable.
 
 

docs/reference/gdk/tmpl/selections.sgml

@@ -50,6 +50,9 @@ to the X Inter-client Communication Conventions Manual
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF GdkSelection ##### -->
 <para>
 The #GdkSelection enumeration contains predefined 

docs/reference/gdk/tmpl/threads.sgml

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

docs/reference/gdk/tmpl/visuals.sgml

@@ -54,6 +54,9 @@ then %GDK_VISUAL_STATIC_GRAY.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkVisual ##### -->
 <para>
 The <type>GdkVisual</type> structure contains information about
@@ -75,42 +78,6 @@ pixel_from_rgb (GdkVisual *visual,
 </example>
 
 @parent_instance: inherited portion from #GObject
-@type: The type of this visual.
-@depth: The number of bits per pixel.
-@byte_order: The byte-order for this visual.
-@colormap_size: The number of entries in the colormap, for
-    visuals of type %GDK_VISUAL_PSEUDO_COLOR or
-    %GDK_VISUAL_GRAY_SCALE. For other visual types, it
-    is the number of possible levels per color component.
-    If the visual has different numbers of levels for
-    different components, the value of this field is undefined.
-@bits_per_rgb: The number of significant bits per red, green, or blue
-    when specifying colors for this visual. (For instance, for 
-    gdk_colormap_alloc_color())
-@red_mask: A mask giving the bits in a pixel value that
-    correspond to the red field. Significant only for
-    %GDK_VISUAL_PSEUDOCOLOR and %GDK_VISUAL_DIRECTCOLOR.
-@red_shift: The <structfield>red_shift</structfield> and
-    <structfield>red_prec</structfield> give an alternate presentation
-    of the information in <structfield>red_mask</structfield>.
-    <structfield>red_mask</structfield> is a contiguous sequence
-    of <structfield>red_prec</structfield> bits starting at bit
-    number <structfield>red_shift</structfield>. For example,
-    <xref linkend="rgbmask"/> shows constructing a pixel value
-    out of three 16 bit color values.
-@red_prec: See above.
-@green_mask: A mask giving the bits in a pixel value that
-    correspond to the green field.
-@green_shift: The <structfield>green_shift</structfield> and
-    <structfield>green_prec</structfield> give an alternate presentation
-    of the information in <structfield>green_mask</structfield>.
-@green_prec: See above.
-@blue_mask: A mask giving the bits in a pixel value that
-    correspond to the blue field.
-@blue_shift: The <structfield>blue_shift</structfield> and
-    <structfield>blue_prec</structfield> give an alternate presentation
-    of the information in <structfield>blue_mask</structfield>.
-@blue_prec: See above.
 
 <!-- ##### ENUM GdkVisualType ##### -->
 <para>
@@ -171,6 +138,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -179,6 +147,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -187,6 +156,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -195,6 +165,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -203,6 +174,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/windows.sgml

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

docs/reference/gdk/tmpl/x_interaction.sgml

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

docs/reference/gtk/compiling.sgml

@@ -81,5 +81,14 @@ The same for <filename>gtkunixprint.h</filename> if you use the non-portable
 <link linkend="GtkPrintUnixDialog">GtkPrintUnixDialog</link> API.
 </para>
 
+<para>
+The next major version, GTK+ 3,  will remove many implementation details and
+struct members from its public headers. To ensure that your application will
+not have problems with this, you can define the preprocessor symbol
+GSEAL_ENABLE. This will make the compiler catch all uses of direct access to
+struct fields so that you can go through them one by one and replace them with
+a call to an accessor function instead.
+</para>
+
 </refsect1>
 </refentry>

docs/reference/gtk/gtk-docs.sgml

@@ -294,7 +294,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/gtkextendedlayout.xml" />
     </chapter>
 
     <chapter id="Ornaments">
@@ -505,10 +504,6 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <title>Index of new symbols in 2.20</title>
     <xi:include href="xml/api-index-2.22.xml"><xi:fallback /></xi:include>
   </index>
-  <index id="api-index-3-0" role="3.0">
-    <title>Index of new symbols in 3.0</title>
-    <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
-  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gtk/gtk-sections.txt

@@ -154,7 +154,6 @@ gtk_accel_label_accelerator_width
 <TITLE>GtkAccessible</TITLE>
 GtkAccessible
 gtk_accessible_connect_widget_destroyed
-gtk_accessible_get_widget
 
 <SUBSECTION Standard>
 GTK_ACCESSIBLE
@@ -1316,6 +1315,8 @@ gtk_entry_get_progress_fraction
 gtk_entry_set_progress_pulse_step
 gtk_entry_get_progress_pulse_step
 gtk_entry_progress_pulse
+gtk_entry_im_context_filter_keypress
+gtk_entry_reset_im_context
 GtkEntryIconPosition
 gtk_entry_set_icon_from_pixbuf
 gtk_entry_set_icon_from_stock
@@ -1375,9 +1376,7 @@ GTK_ENTRY_BUFFER_CLASS
 GTK_IS_ENTRY_BUFFER_CLASS
 GTK_ENTRY_BUFFER_GET_CLASS
 GTK_ENTRY_BUFFER_MAX_SIZE
-
 <SUBSECTION Private>
-GtkEntryBufferPrivate
 gtk_entry_buffer_get_type
 </SECTION>
 
@@ -1996,6 +1995,8 @@ gtk_icon_view_set_tooltip_cell
 gtk_icon_view_get_tooltip_context
 gtk_icon_view_set_tooltip_column
 gtk_icon_view_get_tooltip_column
+gtk_icon_view_get_item_row
+gtk_icon_view_get_item_column
 <SUBSECTION Dnd>
 GtkIconViewDropPosition
 gtk_icon_view_enable_model_drag_source
@@ -2661,8 +2662,8 @@ GTK_IS_INFO_BAR_CLASS
 GTK_INFO_BAR_GET_CLASS
 
 <SUBSECTION Private>
-GtkInfoBarPrivate
 gtk_info_bar_get_type
+GtkMessageAreaPrivate
 </SECTION>
 
 <SECTION>
@@ -3621,7 +3622,6 @@ GtkSpinner
 gtk_spinner_new
 gtk_spinner_start
 gtk_spinner_stop
-
 <SUBSECTION Standard>
 GTK_SPINNER
 GTK_IS_SPINNER
@@ -3629,10 +3629,7 @@ GTK_TYPE_SPINNER
 GTK_SPINNER_CLASS
 GTK_IS_SPINER_CLASS
 GTK_SPINNER_GET_CLASS
-GTK_IS_SPINNER_CLASS
-
 <SUBSECTION Private>
-GtkSpinnerPrivate
 gtk_spinner_get_type
 </SECTION>
 
@@ -4070,8 +4067,6 @@ gtk_text_view_new
 gtk_text_view_new_with_buffer
 gtk_text_view_set_buffer
 gtk_text_view_get_buffer
-gtk_text_view_get_hadjustment
-gtk_text_view_get_vadjustment
 gtk_text_view_scroll_to_mark
 gtk_text_view_scroll_to_iter
 gtk_text_view_scroll_mark_onscreen
@@ -4129,6 +4124,8 @@ gtk_text_view_get_tabs
 gtk_text_view_set_accepts_tab
 gtk_text_view_get_accepts_tab
 gtk_text_view_get_default_attributes
+gtk_text_view_im_context_filter_keypress
+gtk_text_view_reset_im_context
 GTK_TEXT_VIEW_PRIORITY_VALIDATE
 <SUBSECTION Standard>
 GTK_TEXT_VIEW
@@ -4521,7 +4518,6 @@ gtk_tool_item_group_set_item_position
 gtk_tool_item_group_set_label
 gtk_tool_item_group_set_label_widget
 gtk_tool_item_group_set_header_relief
-
 <SUBSECTION Standard>
 GtkToolItemGroupClass
 GTK_TOOL_ITEM_GROUP
@@ -4530,9 +4526,7 @@ GTK_TYPE_TOOL_ITEM_GROUP
 GTK_TOOL_ITEM_GROUP_CLASS
 GTK_IS_TOOL_ITEM_GROUP_CLASS
 GTK_TOOL_ITEM_GROUP_GET_CLASS
-
 <SUBSECTION Private>
-GtkToolItemGroupPrivate
 gtk_tool_item_group_get_type
 </SECTION>
 
@@ -4675,7 +4669,6 @@ gtk_tree_path_append_index
 gtk_tree_path_prepend_index
 gtk_tree_path_get_depth
 gtk_tree_path_get_indices
-gtk_tree_path_get_indices_with_depth
 gtk_tree_path_free
 gtk_tree_path_copy
 gtk_tree_path_compare
@@ -5674,7 +5667,6 @@ gtk_widget_modify_text
 gtk_widget_modify_base
 gtk_widget_modify_font
 gtk_widget_modify_cursor
-gtk_widget_modify_symbolic_color
 gtk_widget_create_pango_context
 gtk_widget_get_pango_context
 gtk_widget_create_pango_layout
@@ -6698,7 +6690,6 @@ gtk_icon_info_get_base_size
 gtk_icon_info_get_filename
 gtk_icon_info_get_builtin_pixbuf
 gtk_icon_info_load_icon
-gtk_icon_info_load_symbolic
 gtk_icon_info_set_raw_coordinates
 gtk_icon_info_get_embedded_rect
 gtk_icon_info_get_attach_points
@@ -6844,8 +6835,6 @@ GTK_IS_PRINT_OPERATION_PREVIEW
 GTK_PRINT_OPERATION_PREVIEW
 GTK_PRINT_OPERATION_PREVIEW_GET_IFACE
 GTK_TYPE_PRINT_OPERATION_PREVIEW
-GtkPrintOperationClass
-GtkPrintOperationPreviewIface
 
 <SUBSECTION Private>
 gtk_print_error_quark
@@ -7106,20 +7095,10 @@ gtk_paper_size_to_key_file
 
 <SUBSECTION Standard>
 GTK_TYPE_PAPER_SIZE
-GTK_CUSTOM_PAPER_UNIX_DIALOG
-GTK_CUSTOM_PAPER_UNIX_DIALOG_CLASS
-GTK_CUSTOM_PAPER_UNIX_DIALOG_GET_CLASS
-GTK_IS_CUSTOM_PAPER_UNIX_DIALOG
-GTK_IS_CUSTOM_PAPER_UNIX_DIALOG_CLASS
-GTK_TYPE_CUSTOM_PAPER_UNIX_DIALOG
-GtkCustomPaperUnixDialog
-GtkCustomPaperUnixDialogClass
-
 
 <SUBSECTION Private>
 gtk_paper_size_get_type
 gtk_custom_paper_unix_dialog_get_type
-GtkCustomPaperUnixDialogPrivate
 </SECTION>
 
 
@@ -7287,7 +7266,6 @@ GTK_MOUNT_OPERATION_CLASS
 GTK_MOUNT_OPERATION_GET_CLASS
 GTK_TYPE_MOUNT_OPERATION
 <SUBSECTION Private>
-GtkMountOperationLookupContext
 gtk_mount_operation_get_type
 GtkMountOperationPrivate
 </SECTION>
@@ -7311,26 +7289,3 @@ GTK_TYPE_ORIENTABLE
 <SUBSECTION Private>
 gtk_orientable_get_type
 </SECTION>
-
-<SECTION>
-<FILE>gtkextendedlayout</FILE>
-<TITLE>GtkExtendedLayout</TITLE>
-GtkExtendedLayout
-GtkExtendedLayoutIface
-gtk_extended_layout_get_desired_height
-gtk_extended_layout_get_desired_size
-gtk_extended_layout_get_desired_width
-gtk_extended_layout_get_height_for_width
-gtk_extended_layout_get_width_for_height
-gtk_extended_layout_is_height_for_width
-
-<SUBSECTION Standard>
-GTK_EXTENDED_LAYOUT
-GTK_EXTENDED_LAYOUT_CLASS
-GTK_EXTENDED_LAYOUT_GET_IFACE
-GTK_IS_EXTENDED_LAYOUT
-GTK_TYPE_EXTENDED_LAYOUT
-
-<SUBSECTION Private>
-gtk_extended_layout_get_type
-</SECTION>

docs/reference/gtk/gtk.types

@@ -54,7 +54,6 @@ gtk_entry_completion_get_type
 gtk_entry_get_type
 gtk_event_box_get_type
 gtk_expander_get_type
-gtk_extended_layout_get_type
 gtk_file_chooser_button_get_type
 gtk_file_chooser_dialog_get_type
 gtk_file_chooser_get_type

docs/reference/gtk/tmpl/.gitignore

@@ -1,6 +1,3 @@
-gtkbbox.sgml
-gtkbox.sgml
-gtkbuilder.sgml
 gtkhbox.sgml
 gtkmessagedialog.sgml
 gtktesting.sgml

docs/reference/gtk/tmpl/gtkaccelmap.sgml

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

docs/reference/gtk/tmpl/gtkactiongroup.sgml

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

docs/reference/gtk/tmpl/gtkadjustment.sgml

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

docs/reference/gtk/tmpl/gtkbbox.sgml

@@ -0,0 +1,213 @@
+<!-- ##### SECTION Title ##### -->
+GtkButtonBox
+
+<!-- ##### SECTION Short_Description ##### -->
+Base class for GtkHButtonBox and GtkVButtonBox
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+The primary purpose of this class is to keep track of the various properties
+of #GtkHButtonBox and #GtkVButtonBox widgets.
+</para>
+<para>
+gtk_button_box_get_child_size() retrieves the minimum width and height 
+for widgets in a given button box.
+</para>
+<para>
+The internal padding of buttons can be retrieved and changed per button box using
+gtk_button_box_get_child_ipadding() and gtk_button_box_set_child_ipadding()
+respectively.
+</para>
+<para>
+gtk_button_box_get_spacing() and gtk_button_box_set_spacing() retrieve and
+change default number of pixels between buttons, respectively.
+</para>
+<para>
+gtk_button_box_get_layout() and gtk_button_box_set_layout() retrieve and alter the method
+used to spread the buttons in a button box across the container, respectively.
+</para>
+
+<para>
+The main purpose of GtkButtonBox is to make sure the children have all the same size.
+Therefore it ignores the homogeneous property which it inherited from GtkBox, and always
+behaves as if homogeneous was %TRUE.
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+<variablelist>
+<varlistentry>
+<term>#GtkVButtonBox</term>
+<listitem><para>Vertical sub-class of #GtkButtonBox.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term>#GtkHButtonBox</term>
+<listitem><para>Horizontal sub-class of #GtkButtonBox.</para></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT GtkButtonBox ##### -->
+<para>
+This is a read-only struct; no members should be modified directly.
+</para>
+
+
+<!-- ##### ARG GtkButtonBox:layout-style ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButtonBox:secondary ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
+<para>
+
+</para>
+
+<!-- ##### MACRO GTK_BUTTONBOX_DEFAULT ##### -->
+<para>
+Used internally only.
+</para>
+
+
+
+<!-- ##### MACRO gtk_button_box_get_spacing ##### -->
+<para>
+Retrieves how much space a button box is placing between each child button.
+</para>
+
+@b: a #GtkButtonBox
+@Returns: the current spacing applied to the buttons in @widget
+@Deprecated: Use gtk_box_get_spacing() instead.
+
+
+<!-- ##### FUNCTION gtk_button_box_get_layout ##### -->
+<para>
+Retrieves the method being used to arrange the buttons in a button box.
+</para>
+
+@widget: a #GtkButtonBox.
+@Returns: the method used to layout buttons in @widget.
+
+
+<!-- ##### FUNCTION gtk_button_box_get_child_size ##### -->
+<para>
+Retrieves the current width and height of all child widgets in a button box.
+@min_width and @min_height are filled with those values, respectively.
+</para>
+
+@widget: a #GtkButtonBox.
+@min_width: the width of the buttons contained by @widget.
+@min_height: the height of the buttons contained by @widget.
+@Deprecated: Use the style properties
+<literal>"child-min-width/-height"</literal> instead.
+
+
+<!-- ##### FUNCTION gtk_button_box_get_child_ipadding ##### -->
+<para>
+Gets the default number of pixels that pad the buttons in a given button box.
+</para>
+
+@widget: a #GtkButtonBox.
+@ipad_x: the horizontal padding used by buttons in @widget.
+@ipad_y: the vertical padding used by buttons in @widget.
+@Deprecated: Use the style properties 
+  "<link linkend="GtkButtonBox--s-child-internal-pad-x">child-internal-pad-x</link>"
+  and
+  "<link linkend="GtkButtonBox--s-child-internal-pad-y">child-internal-pad-y</link>"
+  instead.
+
+
+<!-- ##### FUNCTION gtk_button_box_get_child_secondary ##### -->
+<para>
+
+</para>
+
+@widget: 
+@child: 
+@Returns: 
+
+
+<!-- ##### MACRO gtk_button_box_set_spacing ##### -->
+<para>
+Sets the amount of spacing between buttons in a given button box.
+</para>
+
+@b: a #GtkButtonBox
+@s: the number of pixels of spacing
+@Deprecated: Use gtk_box_set_spacing() instead.
+
+
+<!-- ##### FUNCTION gtk_button_box_set_layout ##### -->
+<para>
+Changes the way buttons are arranged in their container.
+</para>
+
+@widget: a #GtkButtonBox.
+@layout_style: the new layout style.
+
+
+<!-- ##### FUNCTION gtk_button_box_set_child_size ##### -->
+<para>
+Sets a new default size for the children of a given button box.
+</para>
+
+@widget: a #GtkButtonBox
+@min_width: a default width for buttons in @widget
+@min_height: a default height for buttons in @widget
+@Deprecated: This is not supported anymore and can only be set through the theme
+  changing the style properties:
+  "<link linkend="GtkButtonBox--s-child-min-width">child-min-width</link>"
+  and
+  "<link linkend="GtkButtonBox--s-child-min-height">child-min-height</link>"
+  instead.
+
+
+<!-- ##### FUNCTION gtk_button_box_set_child_ipadding ##### -->
+<para>
+Changes the amount of internal padding used by all buttons in a given button
+box.
+</para>
+
+@widget: a #GtkButtonBox.
+@ipad_x: the horizontal padding that should be used by each button in @widget.
+@ipad_y: the vertical padding that should be used by each button in @widget.
+@Deprecated: Use the style properties
+<literal>"child-internal-pad-x/-y"</literal> instead.
+
+
+<!-- ##### FUNCTION gtk_button_box_set_child_secondary ##### -->
+<para>
+
+</para>
+
+@widget: 
+@child: 
+@is_secondary: 
+
+

docs/reference/gtk/tmpl/gtkbindings.sgml

@@ -120,6 +120,9 @@ The "unbind" functionality has been introduced in GTK+ 2.12.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkBindingSet ##### -->
 <para>
 A binding set maintains a list of activatable key bindings.

docs/reference/gtk/tmpl/gtkbox.sgml

@@ -0,0 +1,294 @@
+<!-- ##### SECTION Title ##### -->
+GtkBox
+
+<!-- ##### SECTION Short_Description ##### -->
+Base class for box containers
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+GtkBox is an abstract widget which encapsulates functionality for a
+particular kind of container, one that organizes a variable number of
+widgets into a rectangular area.  GtkBox has a number of derived
+classes, e.g. #GtkHBox and #GtkVBox.
+</para>
+<para>
+The rectangular area of a GtkBox is organized into either a single row
+or a single column of child widgets depending upon whether the box is
+of type #GtkHBox or #GtkVBox, respectively.  Thus, all children of a
+GtkBox are allocated one dimension in common, which is the height of a
+row, or the width of a column.
+</para>
+<para>
+GtkBox uses a notion of <emphasis>packing</emphasis>.  Packing refers to
+adding widgets with reference to a particular position in a
+#GtkContainer.  For a GtkBox, there are two reference positions: the
+<emphasis>start</emphasis> and the <emphasis>end</emphasis> of the box.  
+For a #GtkVBox, the start is defined as the top of the box and the end is
+defined as the bottom.  For a #GtkHBox the start is defined as the
+left side and the end is defined as the right side.
+</para>
+<para>
+Use repeated calls to gtk_box_pack_start() to pack widgets into a
+GtkBox from start to end.  Use gtk_box_pack_end() to add widgets from
+end to start.  You may intersperse these calls and add widgets from
+both ends of the same GtkBox.
+</para>
+<para>
+Use gtk_box_pack_start_defaults() or gtk_box_pack_end_defaults()
+to pack widgets into a GtkBox if you do not need to specify the
+#GtkBox:expand, #GtkBox:fill, or #GtkBox:padding child properties 
+for the child to be added.
+</para>
+<para>
+Because GtkBox is a #GtkContainer, you may also use
+gtk_container_add() to insert widgets into the box, and they will be
+packed as if with gtk_box_pack_start_defaults().  Use
+gtk_container_remove() to remove widgets from the GtkBox.
+</para>
+<para>
+Use gtk_box_set_homogeneous() to specify whether or not all children
+of the GtkBox are forced to get the same amount of space.
+</para>
+<para>
+Use gtk_box_set_spacing() to determine how much space will be
+minimally placed between all children in the GtkBox.
+</para>
+<para>
+Use gtk_box_reorder_child() to move a GtkBox child to a different
+place in the box.
+</para>
+<para>
+Use gtk_box_set_child_packing() to reset the #GtkBox:expand, 
+#GtkBox:fill and #GtkBox:padding child properties.
+Use gtk_box_query_child_packing() to query these fields.
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+<variablelist>
+
+<varlistentry>
+<term>#GtkHBox</term>
+<listitem><para>a derived class that organizes widgets into a row.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>#GtkVBox</term>
+<listitem><para>a derived class that organizes widgets into a column.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>#GtkFrame</term>
+<listitem><para>a #GtkWidget useful for drawing a border around a GtkBox.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>#GtkTable</term>
+<listitem><para>a #GtkContainer for organizing widgets into a grid,
+rather than independent rows or columns.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>#GtkLayout</term>
+<listitem><para>a #GtkContainer for organizing widgets into arbitrary
+layouts.</para></listitem>
+</varlistentry>
+
+</variablelist>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT GtkBox ##### -->
+<para>
+The #GtkBox-struct describes an instance of GtkBox and contains the 
+following fields.  (These fields should be considered read-only. 
+They should never be set by an application.)
+</para>
+
+
+<!-- ##### ARG GtkBox:homogeneous ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkBox:spacing ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkBox:expand ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkBox:fill ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkBox:pack-type ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkBox:padding ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkBox:position ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT GtkBoxChild ##### -->
+<para>
+The #GtkBoxChild-struct holds a child widget of GtkBox and describes
+how the child is to be packed into the GtkBox.  Use
+gtk_box_query_child_packing() and gtk_box_set_child_packing() to query
+and reset the <structfield>padding</structfield>,
+<structfield>expand</structfield>, <structfield>fill</structfield>,
+and <structfield>pack</structfield> fields.
+</para>
+<para>
+#GtkBoxChild-struct contains the following fields.  (These fields
+should be considered read-only. They should never be directly set by an
+application.)
+</para>
+
+@widget: the child widget, packed into the GtkBox.
+@padding: the number of extra pixels to put between this child and its
+  neighbors, set when packed, zero by default.
+@expand: flag indicates whether extra space should be given to this
+  child. Any extra space given to the parent GtkBox is divided up 
+  among all children with this attribute set to %TRUE; set when packed, 
+  %TRUE by default.
+@fill: flag indicates whether any extra space given to this child due 
+  to its @expand attribute being set is actually allocated to the child, 
+  rather than being used as padding around the widget; set when packed, 
+  %TRUE by default.
+@pack: one of #GtkPackType indicating whether the child is packed with 
+  reference to the start (top/left) or end (bottom/right) of the GtkBox.
+@is_secondary: %TRUE if the child is secondary
+
+<!-- ##### FUNCTION gtk_box_pack_start ##### -->
+<para>
+
+</para>
+
+@box: 
+@child: 
+@expand: 
+@box
+@fill: 
+@padding: 
+
+
+<!-- ##### FUNCTION gtk_box_pack_end ##### -->
+<para>
+
+</para>
+
+@box: 
+@child: 
+@expand: 
+@fill: 
+@padding: 
+
+
+<!-- ##### FUNCTION gtk_box_pack_start_defaults ##### -->
+<para>
+
+</para>
+
+@box: 
+@widget: 
+
+
+<!-- ##### FUNCTION gtk_box_pack_end_defaults ##### -->
+<para>
+
+</para>
+
+@box: 
+@widget: 
+
+
+<!-- ##### FUNCTION gtk_box_get_homogeneous ##### -->
+<para>
+
+</para>
+
+@box: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_box_set_homogeneous ##### -->
+<para>
+
+</para>
+
+@box: 
+@homogeneous: 
+
+
+<!-- ##### FUNCTION gtk_box_get_spacing ##### -->
+<para>
+
+</para>
+
+@box: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_box_set_spacing ##### -->
+<para>
+
+</para>
+
+@box: 
+@spacing: 
+
+
+<!-- ##### FUNCTION gtk_box_reorder_child ##### -->
+<para>
+
+</para>
+
+@box: 
+@child: 
+@position: 
+
+
+<!-- ##### FUNCTION gtk_box_query_child_packing ##### -->
+<para>
+
+</para>
+
+@box: 
+@child: 
+@expand: 
+@fill: 
+@padding: 
+@pack_type: 
+
+
+<!-- ##### FUNCTION gtk_box_set_child_packing ##### -->
+<para>
+
+</para>
+
+@box: 
+@child: 
+@expand: 
+@fill: 
+@padding: 
+@pack_type: 
+
+

docs/reference/gtk/tmpl/gtkbuilder.sgml

@@ -0,0 +1,466 @@
+<!-- ##### SECTION Title ##### -->
+GtkBuilder
+
+<!-- ##### SECTION Short_Description ##### -->
+Build an interface from an XML UI definition
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+A GtkBuilder is an auxiliary object that reads textual descriptions
+of a user interface and instantiates the described objects. To pass a
+description to a GtkBuilder, call gtk_builder_add_from_file() or
+gtk_builder_add_from_string(). These functions can be called multiple
+times; the builder merges the content of all descriptions.
+</para>
+<para>
+A GtkBuilder holds a reference to all objects that it has constructed
+and drops these references when it is finalized. This finalization can
+cause the destruction of non-widget objects or widgets which are not
+contained in a toplevel window. For toplevel windows constructed by a
+builder, it is the responsibility of the user to call gtk_widget_destroy()
+to get rid of them and all the widgets they contain.
+</para>
+<para>
+The functions gtk_builder_get_object() and gtk_builder_get_objects()
+can be used to access the widgets in the interface by the names assigned
+to them inside the UI description. Toplevel windows returned by these
+functions will stay around until the user explicitly destroys them
+with gtk_widget_destroy(). Other widgets will either be part of a
+larger hierarchy constructed by the builder (in which case you should
+not have to worry about their lifecycle), or without a parent, in which
+case they have to be added to some container to make use of them.
+Non-widget objects need to be reffed with g_object_ref() to keep them
+beyond the lifespan of the builder.
+</para>
+<para>
+The function gtk_builder_connect_signals() and variants thereof can be
+used to connect handlers to the named signals in the description.
+</para>
+
+<refsect2 id="BUILDER-UI"><title>GtkBuilder UI Definitions</title>
+<para>
+GtkBuilder parses textual descriptions of user interfaces which
+are specified in an XML format which can be roughly described
+by the DTD below. We refer to these descriptions as
+<firstterm>GtkBuilder UI definitions</firstterm> or just
+<firstterm>UI definitions</firstterm> if the context is clear.
+Do not confuse GtkBuilder UI Definitions with
+<link linkend="XML-UI">GtkUIManager UI Definitions</link>,
+which are more limited in scope.
+</para>
+<para>
+<programlisting><![CDATA[
+<!ELEMENT interface (requires|object)* >
+<!ELEMENT object    (property|signal|child|ANY)* >
+<!ELEMENT property  PCDATA >
+<!ELEMENT signal    EMPTY >
+<!ELEMENT requires  EMPTY >
+<!ELEMENT child     (object|ANY*) >
+
+<!ATTLIST interface  domain         	    #IMPLIED >
+<!ATTLIST object     id             	    #REQUIRED
+                     class          	    #REQUIRED
+                     type-func      	    #IMPLIED
+                     constructor    	    #IMPLIED >
+<!ATTLIST requires   lib             	    #REQUIRED
+                     version          	    #REQUIRED >
+<!ATTLIST property   name           	    #REQUIRED
+                     translatable   	    #IMPLIED
+                     comments               #IMPLIED
+                     context                #IMPLIED >
+<!ATTLIST signal     name           	    #REQUIRED
+                     handler        	    #REQUIRED
+                     after          	    #IMPLIED
+                     swapped        	    #IMPLIED
+                     object         	    #IMPLIED
+                     last_modification_time #IMPLIED >
+<!ATTLIST child      type           	    #IMPLIED
+                     internal-child 	    #IMPLIED >
+]]></programlisting>
+</para>
+<para>
+The toplevel element is &lt;interface&gt;.
+It optionally takes a "domain" attribute, which will make
+the builder look for translated strings using dgettext() in the
+domain specified. This can also be done by calling
+gtk_builder_set_translation_domain() on the builder.
+Objects are described by &lt;object&gt; elements, which can
+contain &lt;property&gt; elements to set properties, &lt;signal&gt;
+elements which connect signals to handlers, and &lt;child&gt;
+elements, which describe child objects (most often widgets
+inside a container, but also e.g. actions in an action group,
+or columns in a tree model). A &lt;child&gt; element contains
+an &lt;object&gt; element which describes the child object.
+The target toolkit version(s) are described by &lt;requires&gt;
+elements, the "lib" attribute specifies the widget library in
+question (currently the only supported value is "gtk+") and the "version"
+attribute specifies the target version in the form "&lt;major&gt;.&lt;minor&gt;".
+The builder will error out if the version requirements are not met.
+</para>
+<para>
+Typically, the specific kind of object represented by an
+&lt;object&gt; element is specified by the "class" attribute.
+If the type has not been loaded yet, GTK+ tries to find the
+<function>_get_type()</function> from the class name by applying
+heuristics. This works in most cases, but if necessary, it is
+possible to specify the name of the <function>_get_type()</function>
+explictly with the "type-func" attribute. As a special case,
+GtkBuilder allows to use an object that has been constructed
+by a #GtkUIManager in another part of the UI definition by
+specifying the id of the #GtkUIManager in the "constructor"
+attribute and the name of the object in the "id" attribute.
+</para>
+<para>
+Objects must be given a name with the "id" attribute, which
+allows the application to retrieve them from the builder with
+gtk_builder_get_object(). An id is also necessary to use the
+object as property value in other parts of the UI definition.
+</para>
+<note><para>Prior to 2.20, GtkBuilder was setting the "name"
+property of constructed widgets to the "id" attribute. In GTK+
+2.20 or newer, you have to use gtk_buildable_get_name() instead
+of gtk_widget_get_name() to obtain the "id", or set the "name"
+property in your UI definition.
+</para></note>
+<para>
+Setting properties of objects is pretty straightforward with
+the &lt;property&gt; element: the "name" attribute specifies
+the name of the property, and the content of the element
+specifies the value. If the "translatable" attribute is
+set to a true value, GTK+ uses gettext() (or dgettext() if
+the builder has a translation domain set) to find a translation
+for the value. This happens before the value is parsed, so
+it can be used for properties of any type, but it is probably
+most useful for string properties. It is also possible to
+specify a context to disambiguate short strings, and comments
+which may help the translators.
+</para>
+<para>
+GtkBuilder can parse textual representations for the most
+common property types: characters, strings, integers, floating-point
+numbers, booleans (strings like "TRUE", "t", "yes", "y", "1" are
+interpreted as %TRUE, strings like "FALSE, "f", "no", "n", "0" are
+interpreted as %FALSE), enumerations (can be specified by their
+name, nick or integer value), flags (can be specified by their name,
+nick, integer value, optionally combined with "|", e.g.
+"GTK_VISIBLE|GTK_REALIZED")  and colors (in a format understood by
+gdk_color_parse()). Objects can be referred to by their name.
+Pixbufs can be specified as a filename of an image file to load.
+In general, GtkBuilder allows forward references to objects &mdash;
+an object doesn't have to constructed before it can be referred to.
+The exception to this rule is that an object has to be constructed
+before it can be used as the value of a construct-only property.
+</para>
+<para>
+Signal handlers are set up with the &lt;signal&gt; element.
+The "name" attribute specifies the name of the signal, and the
+"handler" attribute specifies the function to connect to the signal.
+By default, GTK+ tries to find the handler using g_module_symbol(),
+but this can be changed by passing a custom #GtkBuilderConnectFunc
+to gtk_builder_connect_signals_full(). The remaining attributes,
+"after", "swapped" and "object", have the same meaning as the
+corresponding parameters of the g_signal_connect_object() or
+g_signal_connect_data() functions. A "last_modification_time" attribute
+is also allowed, but it does not have a meaning to the builder.
+</para>
+<para>
+Sometimes it is necessary to refer to widgets which have implicitly
+been constructed by GTK+ as part of a composite widget, to set
+properties on them or to add further children (e.g. the @vbox
+of a #GtkDialog). This can be achieved by setting the "internal-child"
+propery of the &lt;child&gt; element to a true value. Note that
+GtkBuilder still requires an &lt;object&gt; element for the internal
+child, even if it has already been constructed.
+</para>
+<para>
+A number of widgets have different places where a child can be
+added (e.g. tabs vs. page content in notebooks). This can be reflected
+in a UI definition by specifying the "type" attribute on a &lt;child&gt;
+The possible values for the "type" attribute are described in
+the sections describing the widget-specific portions of UI definitions.
+</para>
+<example>
+<title>A GtkBuilder UI Definition</title>
+<programlisting><![CDATA[
+<interface>
+  <object class="GtkDialog" id="dialog1">
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="vbox1">
+        <property name="border-width">10</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="border-width">20</property>
+            <child>
+              <object class="GtkButton" id="ok_button">
+                <property name="label">gtk-ok</property>
+                <property name="use-stock">TRUE</property>
+                <signal name="clicked" handler="ok_button_clicked"/>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
+]]></programlisting>
+</example>
+<para>
+Beyond this general structure, several object classes define
+their own XML DTD fragments for filling in the ANY placeholders
+in the DTD above. Note that a custom element in a &lt;child&gt;
+element gets parsed by the custom tag handler of the parent
+object, while a custom element in an &lt;object&gt; element
+gets parsed by the custom tag handler of the object.
+</para>
+<para>
+These XML fragments are explained in the documentation of the
+respective objects, see
+<link linkend="GtkWidget-BUILDER-UI">GtkWidget</link>,
+<link linkend="GtkLabel-BUILDER-UI">GtkLabel</link>,
+<link linkend="GtkWindow-BUILDER-UI">GtkWindow</link>,
+<link linkend="GtkContainer-BUILDER-UI">GtkContainer</link>,
+<link linkend="GtkDialog-BUILDER-UI">GtkDialog</link>,
+<link linkend="GtkCellLayout-BUILDER-UI">GtkCellLayout</link>,
+<link linkend="GtkColorSelectionDialog-BUILDER-UI">GtkColorSelectionDialog</link>,
+<link linkend="GtkFontSelectionDialog-BUILDER-UI">GtkFontSelectionDialog</link>,
+<link linkend="GtkComboBoxEntry-BUILDER-UI">GtkComboBoxEntry</link>,
+<link linkend="GtkExpander-BUILDER-UI">GtkExpander</link>,
+<link linkend="GtkFrame-BUILDER-UI">GtkFrame</link>,
+<link linkend="GtkListStore-BUILDER-UI">GtkListStore</link>,
+<link linkend="GtkTreeStore-BUILDER-UI">GtkTreeStore</link>,
+<link linkend="GtkNotebook-BUILDER-UI">GtkNotebook</link>,
+<link linkend="GtkSizeGroup-BUILDER-UI">GtkSizeGroup</link>,
+<link linkend="GtkTreeView-BUILDER-UI">GtkTreeView</link>,
+<link linkend="GtkUIManager-BUILDER-UI">GtkUIManager</link>,
+<link linkend="GtkActionGroup-BUILDER-UI">GtkActionGroup</link>.
+<link linkend="GtkMenuItem-BUILDER-UI">GtkMenuItem</link>,
+<link linkend="GtkAssistant-BUILDER-UI">GtkAssistant</link>,
+<link linkend="GtkScale-BUILDER-UI">GtkScale</link>.
+</para>
+</refsect2>
+
+<!-- ##### SECTION See_Also ##### -->
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT GtkBuilder ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkBuilder:translation-domain ##### -->
+<para>
+
+</para>
+
+<!-- ##### USER_FUNCTION GtkBuilderConnectFunc ##### -->
+<para>
+
+</para>
+
+@builder: 
+@object: 
+@signal_name: 
+@handler_name: 
+@connect_object: 
+@flags: 
+@user_data: 
+
+
+<!-- ##### ENUM GtkBuilderError ##### -->
+<para>
+Error codes that identify various errors that can occur while
+using #GtkBuilder.
+</para>
+
+@GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION: A type-func attribute didn't name
+    a function that returns a #GType.
+@GTK_BUILDER_ERROR_UNHANDLED_TAG: The input contained a tag that #GtkBuilder
+    can't handle.
+@GTK_BUILDER_ERROR_MISSING_ATTRIBUTE: An attribute that is required by
+    #GtkBuilder was missing.
+@GTK_BUILDER_ERROR_INVALID_ATTRIBUTE: #GtkBuilder found an attribute that 
+    it doesn't understand.
+@GTK_BUILDER_ERROR_INVALID_TAG: #GtkBuilder found a tag that
+    it doesn't understand.
+@GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE: A required property value was 
+    missing.
+@GTK_BUILDER_ERROR_INVALID_VALUE: #GtkBuilder couldn't parse
+    some attribute value.
+@GTK_BUILDER_ERROR_VERSION_MISMATCH: The input file requires a newer version
+    of GTK+.
+@GTK_BUILDER_ERROR_DUPLICATE_ID: An object id occurred twice.
+
+<!-- ##### FUNCTION gtk_builder_new ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_builder_add_from_file ##### -->
+<para>
+
+</para>
+
+@builder: 
+@filename: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_builder_add_from_string ##### -->
+<para>
+
+</para>
+
+@builder: 
+@buffer: 
+@length: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_builder_add_objects_from_file ##### -->
+<para>
+
+</para>
+
+@builder: 
+@filename: 
+@object_ids: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_builder_add_objects_from_string ##### -->
+<para>
+
+</para>
+
+@builder: 
+@buffer: 
+@length: 
+@object_ids: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_builder_get_object ##### -->
+<para>
+
+</para>
+
+@builder: 
+@name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_builder_get_objects ##### -->
+<para>
+
+</para>
+
+@builder: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_builder_connect_signals ##### -->
+<para>
+
+</para>
+
+@builder: 
+@user_data: 
+
+
+<!-- ##### FUNCTION gtk_builder_connect_signals_full ##### -->
+<para>
+
+</para>
+
+@builder: 
+@func: 
+@user_data: 
+
+
+<!-- ##### FUNCTION gtk_builder_set_translation_domain ##### -->
+<para>
+
+</para>
+
+@builder: 
+@domain: 
+
+
+<!-- ##### FUNCTION gtk_builder_get_translation_domain ##### -->
+<para>
+
+</para>
+
+@builder: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_builder_get_type_from_name ##### -->
+<para>
+
+</para>
+
+@builder: 
+@type_name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_builder_value_from_string ##### -->
+<para>
+
+</para>
+
+@builder: 
+@pspec: 
+@string: 
+@value: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_builder_value_from_string_type ##### -->
+<para>
+
+</para>
+
+@builder: 
+@type: 
+@string: 
+@value: 
+@error: 
+@Returns: 
+
+
+<!-- ##### MACRO GTK_BUILDER_WARN_INVALID_CHILD_TYPE ##### -->
+<para>
+This macro should be used to emit a warning about and unexpected 
+@type value in a #GtkBuildable add_child implementation.
+</para>
+
+@object: the #GtkBuildable on which the warning ocurred
+@type: the unexpected type value
+
+
+<!-- ##### MACRO GTK_BUILDER_ERROR ##### -->
+<para>
+The #GError quark for #GtkBuilder errors
+</para>
+
+
+

docs/reference/gtk/tmpl/gtkbutton.sgml

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

docs/reference/gtk/tmpl/gtkcalendar.sgml

@@ -36,6 +36,9 @@ gtk_calendar_get_date().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCalendar ##### -->
 <para>
 <structfield>num_marked_dates</structfield> is an integer containing the
@@ -191,6 +194,7 @@ calendar.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcelleditable.sgml

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

docs/reference/gtk/tmpl/gtkcelllayout.sgml

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

docs/reference/gtk/tmpl/gtkcellrenderer.sgml

@@ -51,6 +51,9 @@ respectively.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GtkCellRendererState ##### -->
 <para>
 Tells how a cell is to be rendererd.

docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml

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

docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml

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

docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml

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

docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml

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

docs/reference/gtk/tmpl/gtkcellrendererspin.sgml

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

docs/reference/gtk/tmpl/gtkcellrenderertext.sgml

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

docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml

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

docs/reference/gtk/tmpl/gtkcellview.sgml

@@ -20,6 +20,9 @@ and drag and drop.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellView ##### -->
 <para>
 
@@ -51,6 +54,7 @@ and drag and drop.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcheckbutton.sgml

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

docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml

@@ -25,6 +25,9 @@ toggles the value.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCheckMenuItem ##### -->
 <para>
 The #GtkCheckMenuItem-struct struct contains the following fields.
@@ -81,6 +84,7 @@ field of the #GtkCheckMenuItem-struct struct to discover the new state.
 Creates a new #GtkCheckMenuItem.
 </para>
 
+@void: 
 @Returns: a new #GtkCheckMenuItem.
 
 

docs/reference/gtk/tmpl/gtkclipboard.sgml

@@ -87,6 +87,9 @@ Storing data on clipboards
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkClipboard ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkclist.sgml

@@ -23,6 +23,9 @@ in newly written code. Use #GtkTreeView instead.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCList ##### -->
 <para>
 This is the embodiment of the #GtkCList widget.  This structure contains

docs/reference/gtk/tmpl/gtkcolorbutton.sgml

@@ -19,6 +19,9 @@ widget for selecting a color in a preference dialog.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkColorButton ##### -->
 <para>
 The GtkColorButton struct has only private fields and 
@@ -58,6 +61,7 @@ should not be used directly.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcolorsel.sgml

@@ -21,6 +21,9 @@ color selection dialog box #GtkColorSelectionDialog.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkColorSelection ##### -->
 <para>
 The #GtkColorSelection-struct struct contains private data only, 
@@ -61,6 +64,7 @@ according to its update policy.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcolorseldlg.sgml

@@ -29,6 +29,9 @@ name "color_selection". It also exposes the buttons with the names
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkColorSelectionDialog ##### -->
 <para>
 The #GtkColorSelectionDialog-struct struct contains the following fields.

docs/reference/gtk/tmpl/gtkcombo.sgml

@@ -86,6 +86,9 @@ items.</title>
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCombo ##### -->
 <para>
 The #GtkCombo-struct struct contains the following fields.
@@ -127,6 +130,7 @@ an application.)
 Creates a new #GtkCombo.
 </para>
 
+@void: 
 @Returns: a new #GtkCombo.
 @Deprecated: 2.4: Use #GtkComboBox instead.
 

docs/reference/gtk/tmpl/gtkcombobox.sgml

@@ -42,6 +42,9 @@ gtk_combo_box_get_active_text().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkComboBox ##### -->
 <para>
 
@@ -153,6 +156,7 @@ gtk_combo_box_get_active_text().
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -279,6 +283,7 @@ gtk_combo_box_get_active_text().
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcomboboxentry.sgml

@@ -61,6 +61,9 @@ child with name "entry".
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkComboBoxEntry ##### -->
 <para>
 
@@ -77,6 +80,7 @@ child with name "entry".
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -95,6 +99,7 @@ child with name "entry".
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcontainer.sgml

@@ -6,107 +6,100 @@ 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
+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
+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
+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.
+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.
+To fulfill its task, a layout container must negotiate the size requirements 
+with its parent and its children. This negotiation is carried out in two 
+phases, <firstterm>size requisition</firstterm> and <firstterm>size 
+allocation</firstterm>. 
 </para>
 <refsect2 id="size-requisition"><title>Size Requisition</title>
 <para>
-The size requisition of a widget is it's desired width and height.
+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.
+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.
+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
+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
+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.
+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
+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
+<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
+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
+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
+gtk_container_child_get_valist(). To emit notification about child property 
 changes, use gtk_widget_child_notify().
 </para>
 </refsect2>
@@ -114,7 +107,7 @@ changes, use gtk_widget_child_notify().
 <refsect2 id="GtkContainer-BUILDER-UI">
 <title>GtkContainer as GtkBuildable</title>
 <para>
-The GtkContainer implementation of the GtkBuildable interface
+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.
@@ -147,6 +140,9 @@ for regular properties.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkContainer ##### -->
 <para>
 
@@ -159,7 +155,7 @@ for regular properties.
 </para>
 
 @container: the object which received the signal.
-@widget:
+@widget: 
 
 <!-- ##### SIGNAL GtkContainer::check-resize ##### -->
 <para>
@@ -174,7 +170,7 @@ for regular properties.
 </para>
 
 @container: the object which received the signal.
-@widget:
+@widget: 
 
 <!-- ##### SIGNAL GtkContainer::set-focus-child ##### -->
 <para>
@@ -182,7 +178,7 @@ for regular properties.
 </para>
 
 @container: the object which received the signal.
-@widget:
+@widget: 
 
 <!-- ##### ARG GtkContainer:border-width ##### -->
 <para>
@@ -204,7 +200,7 @@ for regular properties.
 
 </para>
 
-@widget:
+@widget: 
 
 
 <!-- ##### MACRO GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID ##### -->
@@ -213,7 +209,7 @@ 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()
+@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
@@ -232,8 +228,8 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container:
-@widget:
+@container: 
+@widget: 
 
 
 <!-- ##### FUNCTION gtk_container_remove ##### -->
@@ -241,8 +237,8 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container:
-@widget:
+@container: 
+@widget: 
 
 
 <!-- ##### FUNCTION gtk_container_add_with_properties ##### -->
@@ -250,10 +246,10 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container:
-@widget:
-@first_prop_name:
-@Varargs:
+@container: 
+@widget: 
+@first_prop_name: 
+@Varargs: 
 
 
 <!-- ##### FUNCTION gtk_container_get_resize_mode ##### -->
@@ -261,8 +257,8 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container:
-@Returns:
+@container: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_container_set_resize_mode ##### -->
@@ -270,8 +266,8 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container:
-@resize_mode:
+@container: 
+@resize_mode: 
 
 
 <!-- ##### FUNCTION gtk_container_check_resize ##### -->
@@ -279,7 +275,7 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container:
+@container: 
 
 
 <!-- ##### FUNCTION gtk_container_foreach ##### -->
@@ -287,9 +283,9 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container:
-@callback:
-@callback_data:
+@container: 
+@callback: 
+@callback_data: 
 
 
 <!-- ##### FUNCTION gtk_container_foreach_full ##### -->
@@ -297,11 +293,11 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container:
-@callback:
-@marshal:
-@callback_data:
-@notify:
+@container: 
+@callback: 
+@marshal: 
+@callback_data: 
+@notify: 
 @Deprecated: Use gtk_container_foreach() instead.
 
 
@@ -318,8 +314,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@Returns:
+@container: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_container_set_reallocate_redraws ##### -->
@@ -327,8 +323,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@needs_redraws:
+@container: 
+@needs_redraws: 
 
 
 <!-- ##### FUNCTION gtk_container_get_focus_child ##### -->
@@ -336,8 +332,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@Returns:
+@container: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_container_set_focus_child ##### -->
@@ -345,8 +341,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@child:
+@container: 
+@child: 
 
 
 <!-- ##### FUNCTION gtk_container_get_focus_vadjustment ##### -->
@@ -354,8 +350,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@Returns:
+@container: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_container_set_focus_vadjustment ##### -->
@@ -363,8 +359,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@adjustment:
+@container: 
+@adjustment: 
 
 
 <!-- ##### FUNCTION gtk_container_get_focus_hadjustment ##### -->
@@ -372,8 +368,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@Returns:
+@container: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_container_set_focus_hadjustment ##### -->
@@ -381,8 +377,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@adjustment:
+@container: 
+@adjustment: 
 
 
 <!-- ##### FUNCTION gtk_container_resize_children ##### -->
@@ -390,7 +386,7 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
+@container: 
 
 
 <!-- ##### FUNCTION gtk_container_child_type ##### -->
@@ -398,8 +394,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@Returns:
+@container: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_container_child_get ##### -->
@@ -407,10 +403,10 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@child:
-@first_prop_name:
-@Varargs:
+@container: 
+@child: 
+@first_prop_name: 
+@Varargs: 
 
 
 <!-- ##### FUNCTION gtk_container_child_set ##### -->
@@ -418,10 +414,10 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@child:
-@first_prop_name:
-@Varargs:
+@container: 
+@child: 
+@first_prop_name: 
+@Varargs: 
 
 
 <!-- ##### FUNCTION gtk_container_child_get_property ##### -->
@@ -429,10 +425,10 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@child:
-@property_name:
-@value:
+@container: 
+@child: 
+@property_name: 
+@value: 
 
 
 <!-- ##### FUNCTION gtk_container_child_set_property ##### -->
@@ -440,10 +436,10 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@child:
-@property_name:
-@value:
+@container: 
+@child: 
+@property_name: 
+@value: 
 
 
 <!-- ##### FUNCTION gtk_container_child_get_valist ##### -->
@@ -451,10 +447,10 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@child:
-@first_property_name:
-@var_args:
+@container: 
+@child: 
+@first_property_name: 
+@var_args: 
 
 
 <!-- ##### FUNCTION gtk_container_child_set_valist ##### -->
@@ -462,10 +458,10 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@child:
-@first_property_name:
-@var_args:
+@container: 
+@child: 
+@first_property_name: 
+@var_args: 
 
 
 <!-- ##### FUNCTION gtk_container_forall ##### -->
@@ -473,9 +469,9 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@callback:
-@callback_data:
+@container: 
+@callback: 
+@callback_data: 
 
 
 <!-- ##### FUNCTION gtk_container_get_border_width ##### -->
@@ -483,8 +479,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@Returns:
+@container: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_container_set_border_width ##### -->
@@ -492,8 +488,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@border_width:
+@container: 
+@border_width: 
 
 
 <!-- ##### FUNCTION gtk_container_propagate_expose ##### -->
@@ -501,9 +497,9 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@child:
-@event:
+@container: 
+@child: 
+@event: 
 
 
 <!-- ##### FUNCTION gtk_container_get_focus_chain ##### -->
@@ -511,9 +507,9 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@focusable_widgets:
-@Returns:
+@container: 
+@focusable_widgets: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_container_set_focus_chain ##### -->
@@ -521,8 +517,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
-@focusable_widgets:
+@container: 
+@focusable_widgets: 
 
 
 <!-- ##### FUNCTION gtk_container_unset_focus_chain ##### -->
@@ -530,7 +526,7 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container:
+@container: 
 
 
 <!-- ##### FUNCTION gtk_container_class_find_child_property ##### -->
@@ -538,9 +534,9 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@cclass:
-@property_name:
-@Returns:
+@cclass: 
+@property_name: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_container_class_install_child_property ##### -->
@@ -548,9 +544,9 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@cclass:
-@property_id:
-@pspec:
+@cclass: 
+@property_id: 
+@pspec: 
 
 
 <!-- ##### FUNCTION gtk_container_class_list_child_properties ##### -->
@@ -558,8 +554,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@cclass:
-@n_properties:
-@Returns:
+@cclass: 
+@n_properties: 
+@Returns: 
 
 

docs/reference/gtk/tmpl/gtkctree.sgml

@@ -36,6 +36,9 @@ in newly written code. Use #GtkTreeView instead.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCTree ##### -->
 <para>
 The #GtkCTree-struct contains the following user-accessible fields.

docs/reference/gtk/tmpl/gtkcurve.sgml

@@ -36,6 +36,9 @@ As of GTK+ 2.20, #GtkCurve has been deprecated since it is too specialized.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCurve ##### -->
 <para>
 The #GtkCurve-struct struct contains private data only, and
@@ -83,6 +86,7 @@ calling gtk_curve_reset() or gtk_curve_set_gamma().
 Creates a new #GtkCurve.
 </para>
 
+@void: 
 @Returns: a new #GtkCurve.
 @Deprecated: 2.20: Don't use this widget anymore.
 

docs/reference/gtk/tmpl/gtkdialog.sgml

@@ -165,6 +165,9 @@ response from the user.</para></listitem>
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkDialog ##### -->
 <para>
 <structfield>vbox</structfield> is a #GtkVBox - the main part of the
@@ -256,6 +259,7 @@ Creates a new dialog box. Widgets should not be packed into this #GtkWindow
 directly, but into the @vbox and @action_area, as described above. 
 </para>
 
+@void: 
 @Returns: a new #GtkDialog.
 
 

docs/reference/gtk/tmpl/gtkdnd.sgml

@@ -27,6 +27,9 @@ in the #GtkWidget class.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GtkDestDefaults ##### -->
 <para>
 The #GtkDestDefaults enumeration specifies the various
@@ -351,11 +354,11 @@ a widget.
 
 </para>
 
-@widget:
-@start_button_mask:
-@targets:
-@n_targets:
-@actions:
+@widget: 
+@start_button_mask: 
+@targets: 
+@n_targets: 
+@actions: 
 
 
 <!-- ##### FUNCTION gtk_drag_source_set_icon ##### -->

docs/reference/gtk/tmpl/gtkdrawingarea.sgml

@@ -107,6 +107,9 @@ refresh to the screen.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkDrawingArea ##### -->
 <para>
 The #GtkDrawingArea struct contains private data only, and
@@ -119,6 +122,7 @@ should be accessed using the functions below.
 Creates a new drawing area.
 </para>
 
+@void: 
 @Returns: a new #GtkDrawingArea
 
 

docs/reference/gtk/tmpl/gtkeditable.sgml

@@ -55,6 +55,9 @@ insert_text_handler (GtkEditable *editable,
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkEditable ##### -->
 <para>
 The #GtkEditable structure is an opaque structure whose members 

docs/reference/gtk/tmpl/gtkentry.sgml

@@ -67,6 +67,9 @@ via the context menu of the entry.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkEntry ##### -->
 <para>
 The #GtkEntry-struct struct contains only private data.
@@ -411,6 +414,7 @@ The #GtkEntry-struct struct contains only private data.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -810,6 +814,24 @@ The #GtkEntry-struct struct contains only private data.
 @entry: 
 
 
+<!-- ##### FUNCTION gtk_entry_im_context_filter_keypress ##### -->
+<para>
+
+</para>
+
+@entry: 
+@event: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_entry_reset_im_context ##### -->
+<para>
+
+</para>
+
+@entry: 
+
+
 <!-- ##### ENUM GtkEntryIconPosition ##### -->
 <para>
 Specifies the side of the entry at which an icon is placed.

docs/reference/gtk/tmpl/gtkentrybuffer.sgml

@@ -17,6 +17,9 @@ GtkEntryBuffer
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkEntryBuffer ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkentrycompletion.sgml

@@ -46,6 +46,9 @@ selected, the ::action-activated signal is emitted.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkEntryCompletion ##### -->
 <para>
 The GtkEntryCompletion struct contains only private data.
@@ -150,6 +153,7 @@ to the unmodified key via <literal>gtk_entry_get_text (GTK_ENTRY (gtk_entry_comp
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkenums.sgml

@@ -17,6 +17,9 @@ Public enumerated types used throughout GTK+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GtkAccelFlags ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkeventbox.sgml

@@ -19,6 +19,9 @@ have their own window.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkEventBox ##### -->
 <para>
 The #GtkEventBox-struct struct contains private data only, and
@@ -41,6 +44,7 @@ should be accessed using the functions below.
 Creates a new #GtkEventBox.
 </para>
 
+@void: 
 @Returns: a new #GtkEventBox.
 
 

docs/reference/gtk/tmpl/gtkexpander.sgml

@@ -89,6 +89,9 @@ a <child> type attribute.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkExpander ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkfeatures.sgml

@@ -19,6 +19,9 @@ typically use the features described here.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### VARIABLE gtk_major_version ##### -->
 <para>
 The major version number of the GTK+ library.  (e.g. in GTK+ version

docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml

@@ -51,6 +51,9 @@ such a way that other interface elements give space to the widget.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkFileChooserButton ##### -->
 <para>
 This should not be accessed directly.  Use the accessor functions below.