=== Released 2.3.2 ===

Thu Jan 22 18:46:05 2004 Owen Taylor <otaylor@redhat.com> * === Released 2.3.2 ===
Patch from Christian Neumair to make warning string more translator
2004-01-23 00:19:07 +00:00 · 2004-01-22 23:47:42 +00:00 · 2004-01-22 22:53:00 +00:00 · 2004-01-22 21:34:16 +00:00 · 2004-01-22 20:45:36 +00:00 · 2004-01-22 20:44:38 +00:00
531 changed files with 349705 additions and 277380 deletions
@@ -22,8 +22,8 @@ GTK+ requires the following packages:
 Simple install procedure
 ========================

-  % gzip -cd gtk+-2.3.0.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.3.0			   # change to the toplevel directory
+  % gzip -cd gtk+-2.3.2.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.3.2			   # change to the toplevel directory
  % ./configure				   # run the `configure' script
  % make				   # build GTK
  [ Become root if necessary ]
@@ -1,7 +1,7 @@
 ## Makefile.am for GTK+

 SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
+SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros

 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.7
@@ -1,3 +1,133 @@
+Overview of Changes from GTK+ 2.3.1 to GTK+ 2.3.2
+=================================================
+* GdkPixbuf
+ - Add functions to save pixbufs to non-file locations.  [Tim Evans]
+ - Add a function to determine the type and size of a file without
+   loading it completely.  [Matthias Clasen]
+ - Turn pixbuf attributes into construct-only properties. [Matthias]
+ - Fix building gdk-pixbuf with --disable-modules --with-included-loaders.
+   [Matthias, Owen Taylor]
+* Fix the logic for changing the toplevelness of a window.  [Soeren Sandmann]
+* Do not interpret distant clicks as double clicks, using a
+  new double-click-distance setting.  [Matthias]
+* Improve the GDK API for dealing with group leaders. [Matthias]
+* Utility function for application launching in multi-screen scenarios.
+  [Mark McLoughlin]
+* Support big and small and alpha-blended icons under Win32. [Tim Evans]
+* Misc Win32 improvements [Tor Lillquist, Hans]
+* GtkFileChooser [Federico]
+ - Fix new filename entry in Save mode [Jan Arne Petersen]
+ - Improved the look of GtkFileChooserDefault. [Tuomas Kuosmanen]
+ - Added support for file system volumes such as CD-ROMs, 
+   floppies, and network shares.
+ - Add a "New Folder" button for Save mode in GtkFileChooser.
+ - Better support for Folder mode.
+* GtkTreeView
+ - Speed up by adding a fixed height mode.  [Kristian Rietveld]
+ - Add a single-paragraph mode and a language property to 
+   GtkCellRendererText [Kristian Rietveld]
+ - Add a editing-canceled signal to GtkCellRenderer [Federico Mena Quintero]
+ - Misc GtkTreeView bug fixes [Kristian, Soeren, Jonathan Blandford]
+* Add a way to list the supported targets of a clipboard. [Dom Lachowicz]
+* Add stock icons: harddisk, indent, unindent.  [Hans Breuer, Jody Goldberg]
+* Improve the GtkCalendar drawing code.  [Matthias]
+* GtkCalendar supports starting the week on any day [Matthias]
+* Make GtkToolbar compatible with 2.2 again [Soeren]
+* Misc GtkToolbar fixes and API improvements [Christian Persch, 
+  Olivar Avramchenko, Jody, Soeren]
+* Misc GtkUIManager fixes and API improvements.  [Jody, Matthias, Jeff Franks]
+* Add a way to lock individual accelerator paths  [Matthias]
+* Add gtk_menu_shell_cancel() to emit the "cancel" signal on 
+  a menu shell.  [Matthias]
+* Fix dynamic menus. [Matthias, Michael Meeks]
+* Add xalign, yalign properties to GtkButton. [Jody]
+* Implement or improve RTL support in GtkComboBox, GtkCellView, 
+  GtkViewport [Semion Chichelnitsky, Matthias, Kristian]
+* Support for "no focus" windows. [Matthias]
+* Documentation improvements [Matthias, Federico, Manish, Murray Cumming, 
+  Theppitak Karoonboonyanan]
+* FAQ updates [Tony Gale]
+* Split the translations into two domains: ui strings and
+  error messages go to gtk20, property nicks and blurbs to 
+  gtk20-properties. [Matthias]
+* New and updated translations (af,ar,bn,br,cs,cy,da,de,es,et,fa,fr,ga,hr,
+  it,ja,ko,lt,mn,ms,nl,nn,no,pl,pt,pt_BR,ru,sr,sr@Latn,sv,sq,wa)
+Other contributors: Olivier Andrieu, Herman Bloggs, Anders Carlsson,
+  Marco Pesenti Gritti, Bill Haneman, Alexander Larsson, Noah Levitt, 
+  Kjartan Maraas, Evan Martin, Tim-Philipp Müller, Christian Neumair, 
+  Joshua N Pritikin, Sebastian Rittau, Daniel Rogers, Manish Singh, 
+  Torsten Schoenfeld, Alexander Winston, Johannes Weißl,  Morten Welinder, 
+  Adam Wright
+
+Overview of Changes in GTK+-2.3.1
+=================================
+* Improve sanity checks on gdk-pixbuf loaders [Matthias Clasen]
+* GDK
+ - Add GDK_DEBUG=xinerama that fakes a 2x2 Xinerama mode [Matthias]
+ - Make gdk_drawable_copy_to_image public [Matthias, Peter Zelezny]
+* Misc Win32 bug fixes [Tor Lillqvist, John Ehresman, Tim Evans]
+* Action-based menu/toolbar API [Matthias]
+ - Add "name" construct-only parameter to GtkActionGroup
+ - Bug fixes [Marco Pesenti Gritti, Christian Persch]
+* Change ranges for Saturation/Value to be 0-100 in GtkColorSelection
+  [Gregory Merchan, Matthias]
+* GtkComboBox [Kristian Rietveld]
+ - Make model and text_column properties not construct-only [Murray Cumming]
+ - Fix sizing
+ - Add mouse wheel support [Matthias]
+* Various GtkEntryCompletion bug fixes [Kristian, Piers Cornwell, Marco]
+* GtkExpander
+ - Add a "use_markup" property, gtk_expander_set/get_use_markup
+ - Fix bugs when unrealizing/destroying [Mark McLoughlin]
+* GtkFileChooser [Federico Mena Quintero]
+ - Add a GtkFileSystemWin32 [Hans]
+ - Use GtkEntryCompletion in GtkFileChooserEntry 
+ - Add a render_icon to GtkFileSystemIface to allow the 
+   GnomeVFS backend to supply appropriate icons
+ - Improve selection handling in bookmarks list [Federico, Owen Taylor]
+ - Support drops on the bookmarks list
+ - Display error dialogs on failed operations
+ - Many UI tweaks [Federico, Iain Holmes,Hans-Petter Jansson]
+ - Ignore filters for folders [Dave Malcom]
+ - Misc file chooser bug fixes [Owen, Christian Persch, Taavi Talvik]
+* Menus
+ - Make torn-off menus transient-for the window they were torn from
+   [Matthias, Jon-Kare Hellan]
+ - Fix menu positioning for Xinerama, add gtk_menu_set_monitor()
+   for use by position functions [Matthias]
+ - Tweak menu delay parameters, add a default width [Soeren Sandmann]
+* Make g_message_dialog_new_with_markup() automatically escape
+  arguments, add g_message_dialog_set_markup() [Owen]
+* Add read-only min-position/max-position properties to GtkPaned
+* GtkToolbar [Soeren]
+ - Support gaps in the toolbar with expand=true/draw=false separators
+ - Improve drop-location preview handling
+ - Take a GtkRadioToolButton as the parameter to
+   gtk_radio_tool_button_new_from_widget [Murray Cumming]
+ - Many misc toolbar bug fixes [Soeren, Marco]
+* GtkTreeView bug fixes [Morten Welinder, David Hampton]
+* Add gtk_window_is_active()/gtk_has_toplevel_focus() getters
+  to go along with properties [Owen Taylor]
+* Add gtk_widget_can_activate_accel() / ::can-activate-accel
+  signal to fix handling of accelerators on insensitive parent
+  menu-items. [Tim Janik]. (*Note*: the details here will probably
+  change, since similar problems for mnemonics aren't handled.)
+* Implement or improve RTL support in GtkAlignment, GtkCombo, 
+  GtkNotebook, GtkScrolledWindow, GtkTreeView, GtkViewport.
+  [IBM L3 NLS Support Team]
+* Fix string setters for self-assignment [Matthias, Soeren]
+* Finish multi-head handling in gtk-demo [Matthias]
+* Fix install rules for generating gdk-pixbuf.loaders [Manish Singh]
+* Reference doc improvements [Matthias, Soeren,
+  Federico Mena Quintero, Michael Natterer, Owen Taylor, Olexiy Avramchenko]
+* FAQ updates [Tony Gale]
+* New and updated translations (ca,cs,cy,de,el,es,ja,mn,nl,nn,no,pl,pt,sr,
+  sr@Latn,sv,th)
+
+Other contributors: Jorn Baayen,Damon Chaplin, Jeff Franks, Diego Gonzalez,
+  Richard Hult, Egmont Koblinger, Thomas Leonard, Ross McFarland, 
+  Padraig O'Briain, Tomas Ögren, Danilo Segan
+
 Overview of Changes from GTK+-2.2.x to GTK+-2.3.0
 =================================================

@@ -104,7 +234,7 @@ Overview of Changes from GTK+-2.2.x to GTK+-2.3.0
 - Allow "none" to be set for input method GtkSettings [Hidetoshi Tajima]
 - Convert build system to automake-1.7; many cleanups and
   improvements. [James Henstridge, Owen]
- - Win32 fixes for new widgets [Hans Breuer]
+ - Win32 fixes for new widgets [Hans]
 - Add right-to-left variants of some stock icons [Matthias]

 * Documentation
@@ -1,7 +1,7 @@
 General Information
 ===================

-This is GTK+ version 2.3.0. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.3.2. GTK+ is a multi-platform toolkit for
 creating graphical user interfaces. Offering a complete set of widgets,
 GTK+ is suitable for projects ranging from small one-off projects to
 complete application suites.
@@ -12,11 +12,11 @@ AC_PREREQ(2.54)

 m4_define([gtk_major_version], [2])
 m4_define([gtk_minor_version], [3])
-m4_define([gtk_micro_version], [0])
+m4_define([gtk_micro_version], [2])
 m4_define([gtk_version],
          [gtk_major_version.gtk_minor_version.gtk_micro_version])
 m4_define([gtk_interface_age], [0])
-m4_define([gtk_binary_age], [300])
+m4_define([gtk_binary_age], [302])
 # This is the X.Y used in -lgtk-FOO-X.Y
 m4_define([gtk_api_version], [2.0])

@@ -28,7 +28,7 @@ m4_define([gtk_api_version], [2.0])
 m4_define([gtk_binary_version], [2.2.0])

 # required versions of other packages
-m4_define([glib_required_version], [2.3.0])
+m4_define([glib_required_version], [2.3.2])
 m4_define([pango_required_version], [1.2.0])
 m4_define([atk_required_version], [1.0.1])

@@ -396,9 +396,12 @@ AC_SUBST(STRIP_BEGIN)
 AC_SUBST(STRIP_END)

 # i18n stuff
-ALL_LINGUAS="am ar az be bg ca cs cy da de el en_GB es et eu fa fi fr ga gl he hi hr hu ia id it ja ko li lt lv mk ml mn ms ne nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk uz uz@Cyrl vi wa yi zh_CN zh_TW"
+ALL_LINGUAS="af am ar az be bg bn br ca cs cy da de el en_GB es et eu fa fi fr ga gl he hi hr hu ia id it ja ko li lt lv mk ml mn ms ne nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta th tr uk uz uz@Cyrl vi wa yi zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 LIBS="$LIBS $INTLLIBS"
+AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*)
+        sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile
+      esac])

 AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR)

@@ -1540,6 +1543,7 @@ gdk-2.0-uninstalled.pc
 gtk+-2.0-uninstalled.pc
 m4macros/Makefile
 po/Makefile.in
+po-properties/Makefile.in
 build/Makefile
 build/win32/Makefile
 build/win32/dirent/Makefile
@@ -12,6 +12,7 @@ demos =						\
 	dialog.c				\
 	drawingarea.c				\
 	editable_cells.c			\
+	entry_completion.c			\
 	hypertext.c				\
 	images.c				\
 	list_store.c				\
@@ -0,0 +1,97 @@
+/* Entry Completion
+ *
+ * GtkEntryCompletion provides a mechanism for adding support for
+ * completion in GtkEntry.
+ *
+ */
+
+#include <gtk/gtk.h>
+
+static GtkWidget *window = NULL;
+
+/* Creates a tree model containing the completions */
+GtkTreeModel *
+create_completion_model (void)
+{
+  GtkListStore *store;
+  GtkTreeIter iter;
+  
+  store = gtk_list_store_new (1, G_TYPE_STRING);
+
+  /* Append one word */
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "GNOME", -1);
+
+  /* Append another word */
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "total", -1);
+
+  /* And another word */
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "totally", -1);
+  
+  return GTK_TREE_MODEL (store);
+}
+
+
+GtkWidget *
+do_entry_completion (GtkWidget *do_widget)
+{
+  GtkWidget *vbox;
+  GtkWidget *label;
+  GtkWidget *entry;
+  GtkEntryCompletion *completion;
+  GtkTreeModel *completion_model;
+  
+  if (!window)
+  {
+    window = gtk_dialog_new_with_buttons ("GtkEntryCompletion",
+					  GTK_WINDOW (do_widget),
+					  0,
+					  GTK_STOCK_CLOSE,
+					  GTK_RESPONSE_NONE,
+					  NULL);
+    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+
+    g_signal_connect (window, "response",
+		      G_CALLBACK (gtk_widget_destroy), NULL);
+    g_signal_connect (window, "destroy",
+		      G_CALLBACK (gtk_widget_destroyed), &window);
+
+    vbox = gtk_vbox_new (FALSE, 5);
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+
+    label = gtk_label_new (NULL);
+    gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
+    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+    /* Create our entry */
+    entry = gtk_entry_new ();
+    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+
+    /* Create the completion object */
+    completion = gtk_entry_completion_new ();
+
+    /* Assign the completion to the entry */
+    gtk_entry_set_completion (GTK_ENTRY (entry), completion);
+    g_object_unref (completion);
+    
+    /* Create a tree model and use it as the completion model */
+    completion_model = create_completion_model ();
+    gtk_entry_completion_set_model (completion, completion_model);
+    g_object_unref (completion_model);
+    
+    /* Use model column 0 as the text column */
+    gtk_entry_completion_set_text_column (completion, 0);
+  }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show_all (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}
+
+
@@ -67,18 +67,96 @@ compare_pixbufs (GdkPixbuf *pixbuf, GdkPixbuf *compare, const gchar *file_type)
        }
 }

+static gboolean
+save_to_loader (const gchar *buf, gsize count, GError **err, gpointer data)
+{
+        GdkPixbufLoader *loader = data;
+
+        return gdk_pixbuf_loader_write (loader, buf, count, err);
+}
+
+static GdkPixbuf *
+buffer_to_pixbuf (const gchar *buf, gsize count, GError **err)
+{
+        GdkPixbufLoader *loader;
+        GdkPixbuf *pixbuf;
+
+        loader = gdk_pixbuf_loader_new ();
+        if (gdk_pixbuf_loader_write (loader, buf, count, err) && 
+            gdk_pixbuf_loader_close (loader, err)) {
+                pixbuf = g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader));
+                g_object_unref (G_OBJECT (loader));
+                return pixbuf;
+        } else {
+                return NULL;
+        }
+}
+
+static void
+do_compare (GdkPixbuf *pixbuf, GdkPixbuf *compare, GError *err)
+{
+        if (compare == NULL) {
+                fprintf (stderr, "%s", err->message);
+                g_error_free (err);
+        } else {
+                compare_pixbufs (pixbuf, compare, "jpeg");
+                g_object_unref (compare);
+        }
+}
+
 static void
 keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
 {
        GdkPixbuf *pixbuf;
        GtkDrawingArea *da = (GtkDrawingArea*)data;
        GError *err = NULL;
-        
+        gchar *buffer;
+        gsize count;
+        GdkPixbufLoader *loader;
+
        pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (da), "pixbuf");

        if (evt->keyval == 'q')
                gtk_main_quit ();
-        if (evt->keyval == 's') {
+
+        if (evt->keyval == 's' && (evt->state & GDK_CONTROL_MASK)) {
+                /* save to callback */
+                if (pixbuf == NULL) {
+                        fprintf (stderr, "PIXBUF NULL\n");
+                        return;
+                }	
+
+                loader = gdk_pixbuf_loader_new ();
+                if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "jpeg",
+                                                  &err,
+                                                  "quality", "100",
+                                                  NULL) ||
+                    !gdk_pixbuf_loader_close (loader, &err)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                } else {
+                        do_compare (pixbuf,
+                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
+                                    err);
+                        g_object_unref (G_OBJECT (loader));
+                }
+        }
+        else if (evt->keyval == 'S') {
+                /* save to buffer */
+                if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "jpeg",
+                                                &err,
+                                                "quality", "100",
+                                                NULL)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                } else {
+                        do_compare (pixbuf,
+                                    buffer_to_pixbuf (buffer, count, &err),
+                                    err);
+                }
+        }
+        else if (evt->keyval == 's') {
+                /* save normally */
                if (pixbuf == NULL) {
                        fprintf (stderr, "PIXBUF NULL\n");
                        return;
@@ -91,20 +169,49 @@ keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
                        fprintf (stderr, "%s", err->message);
                        g_error_free (err);
                } else {
-                        GdkPixbuf *compare;
-
-                        compare = gdk_pixbuf_new_from_file ("foo.jpg", &err);
-
-                        if (!compare) {
-                                fprintf (stderr, "%s", err->message);
-                                g_error_free (err);
-                        } else {
-                                compare_pixbufs (pixbuf, compare, "jpeg");
-                                g_object_unref (compare);
-                        }
-                                        
+                        do_compare (pixbuf,
+                                    gdk_pixbuf_new_from_file ("foo.jpg", &err),
+                                    err);
                }
-        } else if (evt->keyval == 'p') {
+        }
+
+        if (evt->keyval == 'p' && (evt->state & GDK_CONTROL_MASK)) {
+                /* save to callback */
+                if (pixbuf == NULL) {
+                        fprintf (stderr, "PIXBUF NULL\n");
+                        return;
+                }
+
+                loader = gdk_pixbuf_loader_new ();
+                if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "png",
+                                                  &err,
+                                                  "tEXt::Software", "testpixbuf-save",
+                                                  NULL)
+                    || !gdk_pixbuf_loader_close (loader, &err)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                } else {
+                        do_compare (pixbuf,
+                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
+                                    err);
+                        g_object_unref (G_OBJECT (loader));
+                }
+        }
+        else if (evt->keyval == 'P') {
+                /* save to buffer */
+                if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "png",
+                                                &err,
+                                                "tEXt::Software", "testpixbuf-save",
+                                                NULL)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                } else {
+                        do_compare (pixbuf,
+                                    buffer_to_pixbuf (buffer, count, &err),
+                                    err);
+                }
+        }
+        else if (evt->keyval == 'p') {
                if (pixbuf == NULL) {
                        fprintf (stderr, "PIXBUF NULL\n");
                        return;
@@ -117,20 +224,65 @@ keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
                        fprintf (stderr, "%s", err->message);
                        g_error_free (err);
                } else {
-                        GdkPixbuf *compare;
-
-                        compare = gdk_pixbuf_new_from_file ("foo.png", &err);
-
-                        if (!compare) {
-                                fprintf (stderr, "%s", err->message);
-                                g_error_free (err);
-                        } else {
-                                compare_pixbufs (pixbuf, compare, "png");
-                                g_object_unref (compare);
-                        }
-                                        
+                        do_compare(pixbuf,
+                                   gdk_pixbuf_new_from_file ("foo.png", &err),
+                                   err);
                }
-        } else if (evt->keyval == 'a') {
+        }
+
+        if (evt->keyval == 'i' && (evt->state & GDK_CONTROL_MASK)) {
+                /* save to callback */
+                if (pixbuf == NULL) {
+                        fprintf (stderr, "PIXBUF NULL\n");
+                        return;
+                }
+
+                loader = gdk_pixbuf_loader_new ();
+                if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "ico",
+                                                  &err,
+                                                  NULL)
+                    || !gdk_pixbuf_loader_close (loader, &err)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                } else {
+                        do_compare (pixbuf,
+                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
+                                    err);
+                        g_object_unref (G_OBJECT (loader));
+                }
+        }
+        else if (evt->keyval == 'I') {
+                /* save to buffer */
+                if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "ico",
+                                                &err,
+                                                NULL)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                } else {
+                        do_compare (pixbuf,
+                                    buffer_to_pixbuf (buffer, count, &err),
+                                    err);
+                }
+        }
+        else if (evt->keyval == 'i') {
+                if (pixbuf == NULL) {
+                        fprintf (stderr, "PIXBUF NULL\n");
+                        return;
+                }
+
+                if (!gdk_pixbuf_save (pixbuf, "foo.ico", "ico", 
+                                      &err,
+                                      NULL)) {
+                        fprintf (stderr, "%s", err->message);
+                        g_error_free (err);
+                } else {
+                        do_compare(pixbuf,
+                                   gdk_pixbuf_new_from_file ("foo.ico", &err),
+                                   err);
+                }
+        }
+
+        if (evt->keyval == 'a') {
                if (pixbuf == NULL) {
                        fprintf (stderr, "PIXBUF NULL\n");
                        return;
@@ -2,7 +2,7 @@
 <book>

 <bookinfo>
-  <date>November 24th 2003</date>
+  <date>January 14th 2004</date>
  <title>GTK+ FAQ</title>
  <authorgroup>
    <author>
@@ -976,7 +976,7 @@ url="ftp://ftp.gnu.org/gnu/make/">ftp://ftp.gnu.org/gnu/make/</ulink>).</para>

 <sect1>
 <title>I want to add some configure stuff, how could I do
-this?</title>
+this? <emphasis>[GTK 2.x]</emphasis></title>

 <para>To use autoconf/automake, you must first install the
 relevant packages. These are:</para>
@@ -985,10 +985,10 @@ relevant packages. These are:</para>
 <listitem><simpara>the m4 preprocessor v1.4 or better</simpara>
 </listitem>

-<listitem><simpara>autoconf v2.13 or better</simpara>
+<listitem><simpara>autoconf v2.54 or better</simpara>
 </listitem>

-<listitem><simpara>automake v1.4 or better</simpara>
+<listitem><simpara>automake v1.7 or better suggested</simpara>
 </listitem>
 </itemizedlist>

@@ -1003,20 +1003,20 @@ you must create a configure.in which may look like:</para>
 dnl Process this file with autoconf to produce a configure script.
 dnl configure.in for a GTK+ based program

-AC_INIT(myprg.c)dnl
-AM_INIT_AUTOMAKE(mypkgname,0.0.1)dnl
-AM_CONFIG_HEADER(config.h)dnl
+AC_INIT(myprg.c)
+AM_INIT_AUTOMAKE(mypkgname, 0.0.1)
+AM_CONFIG_HEADER(config.h)

 dnl Checks for programs.
 AC_PROG_CC dnl check for the c compiler
 dnl you should add CFLAGS="" here, 'cos it is set to -g by PROG_CC

 dnl Checks for libraries.
-AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(mypkgname 0.1 needs GTK))dnl
+AM_PATH_GTK_2_0(2.2.0,,AC_MSG_ERROR(mypkgname 0.1 needs GTK+ 2.2.0))

 AC_OUTPUT(
 	Makefile
-)dnl
+)
 </programlisting>

 <para>You must add a Makefile.am file:</para>
@@ -1469,7 +1469,7 @@ in a priority of G_PRIORITY_HIGH.</para>

 <sect1>
 <title>Why does this strange 'x io error' occur when I
-<literal>fork()</literal> in my GTK+ app?</title>
+<literal>fork()</literal> in my GTK+ app? <emphasis>[GTK 2.x]</emphasis></title>

 <para>This is not really a GTK+ problem, and the problem is
 not related to <literal>fork()</literal> either. If the 'x io
@@ -1490,13 +1490,15 @@ illustrate handling fork() and exit().</para>
 <programlisting role="C">
 /*-------------------------------------------------------------------------
 * Filename:      gtk-fork.c
- * Version:       0.99.1
+ * Version:       0.99.2
 * Copyright:     Copyright (C) 1999, Erik Mouw
 * Author:        Erik Mouw &lt;J.A.K.Mouw@its.tudelft.nl&gt;
 * Description:   GTK+ fork example
 * Created at:    Thu Sep 23 21:37:55 1999
 * Modified by:   Erik Mouw &lt;J.A.K.Mouw@its.tudelft.nl&gt;
 * Modified at:   Thu Sep 23 22:39:39 1999
+ * Modified by:   Tony Gale &lt;gale@gtk.org&gt;
+ * Modified at:   Wed Jan 14 12:38:00 2004
 *-----------------------------------------------------------------------*/
 /*
 * Compile with:
@@ -1525,7 +1527,7 @@ void sigchld_handler(int num)
  sigprocmask(SIG_BLOCK, &amp;set, &amp;oldset);

  /* wait for child */
-  while((pid = waitpid((pid_t)-1, &amp;status, WNOHANG)) > 0)
+  while((pid = waitpid((pid_t)-1, &amp;status, WNOHANG)) &gt; 0)
    {
      if(WIFEXITED(status))
 	{
@@ -1622,13 +1624,13 @@ int main(int argc, char *argv[])
   */
  window = gtk_window_new(GTK_WINDOW_TOPLEVEL);

-  gtk_signal_connect(GTK_OBJECT (window), "delete_event",
-		     GTK_SIGNAL_FUNC(delete_event), NULL);
+  g_signal_connect(G_OBJECT (window), "delete_event",
+		     G_CALLBACK(delete_event), NULL);
          
-  gtk_signal_connect(GTK_OBJECT (window), "destroy",
-		     GTK_SIGNAL_FUNC(destroy), NULL);
+  g_signal_connect(G_OBJECT (window), "destroy",
+		     G_CALLBACK(destroy), NULL);

-#if (GTK_MAJOR_VERSION == 1) && (GTK_MINOR_VERSION == 0)
+#if (GTK_MAJOR_VERSION == 1) &amp;&amp; (GTK_MINOR_VERSION == 0)
  gtk_container_border_width(GTK_CONTAINER (window), 10);
 #else  
  gtk_container_set_border_width(GTK_CONTAINER (window), 10);
@@ -1637,8 +1639,8 @@ int main(int argc, char *argv[])
  /* add a button to do something usefull */
  button = gtk_button_new_with_label("Fork me!");
          
-  gtk_signal_connect(GTK_OBJECT (button), "clicked",
-		     GTK_SIGNAL_FUNC(fork_me), NULL);
+  g_signal_connect(G_OBJECT (button), "clicked",
+		     G_CALLBACK(fork_me), NULL);

  gtk_container_add(GTK_CONTAINER(window), button);
          
@@ -1663,7 +1665,7 @@ int main(int argc, char *argv[])

 <sect1>
 <title>Why don't the contents of a button move when the button
-is pressed? Here's a patch to make it work that way...</title>
+is pressed? Here's a patch to make it work that way... <emphasis>[GTK 2.x]</emphasis></title>

 <para>From: Peter Mattis</para>

@@ -1689,12 +1691,12 @@ and determined it didn't look good and removed it.</quote></para>

 <sect1>
 <title>How do I identifiy a widgets top level window or other
-ancestor?</title>
+ancestor? <emphasis>[GTK 2.x]</emphasis></title>

 <para>There are a couple of ways to find the top level parent
-of a widget. The easier way is to call the
+of a widget. The easiest way is to call the
 <literal>gtk_widget_get_toplevel()</literal> function that
-returns pointer to a GtkWidget that is the top level
+returns a pointer to a GtkWidget that is the top level
 window.</para>

 <para>A more complicated way to do this (but less limited, as
@@ -1718,12 +1720,16 @@ widget (entry, label, etc. To find the master hbox using the
      hbox = gtk_widget_get_ancestor(w, GTK_TYPE_HBOX);
 </programlisting>

+<para>You can also follow the a widgets ancestry by using the function
+<literal>gtk_widget_get_parent()</literal> that returns a pointer
+to a widgets parent widget.</para>
+
 </sect1>

 <!-- ----------------------------------------------------------------- -->

 <sect1>
-<title>How do I get the Window ID of a GtkWindow?</title>
+<title>How do I get the Window ID of a GtkWindow? <emphasis>[GTK 2.x]</emphasis></title>

 <para>The actual Gdk/X window will be created when the widget
 gets realized. You can get the Window ID with:</para>
@@ -1738,8 +1744,7 @@ Window xwin = GDK_WINDOW_XWINDOW (GTK_WIDGET (my_window)->window);
 <!-- ----------------------------------------------------------------- -->

 <sect1>
-<title>How do I catch a double click event (in a list widget,
-for example)?</title>
+<title>How do I catch a double click event? <emphasis>[GTK 2.x]</emphasis></title>

 <para>Tim Janik wrote to gtk-list (slightly modified):</para>

@@ -1749,10 +1754,10 @@ for example)?</title>
 gint
 signal_handler_event(GtkWidget *widget, GdkEventButton *event, gpointer func_data)
 {
-  if (GTK_IS_LIST_ITEM(widget) &&
+  if (GTK_IS_BUTTON(widget) &&
       (event->type==GDK_2BUTTON_PRESS ||
        event->type==GDK_3BUTTON_PRESS) ) {
-    printf("I feel %s clicked on button %d\n",
+    printf("I feel %s clicked with button %d\n",
           event->type==GDK_2BUTTON_PRESS ? "double" : "triple",
           event->button);
  }
@@ -1764,18 +1769,18 @@ signal_handler_event(GtkWidget *widget, GdkEventButton *event, gpointer func_dat

 <programlisting role="C">
 {
-  /* list, list item init stuff */     
+  /* button init stuff */     

-  gtk_signal_connect(GTK_OBJECT(list_item),
+  g_signal_connect(G_OBJECT(button),
                     "button_press_event",
-                     GTK_SIGNAL_FUNC(signal_handler_event),
+                     G_CALLBACK(signal_handler_event),
                     NULL);

  /* and/or */

-  gtk_signal_connect(GTK_OBJECT(list_item),
+  g_signal_connect(G_OBJECT(button),
                     "button_release_event",
-                     GTK_SIGNAL_FUNC(signal_handler_event),
+                     G_CALLBACK(signal_handler_event),
                     NULL);

  /* something else */
@@ -2870,7 +2875,7 @@ be:</para>
 <!-- ----------------------------------------------------------------- -->

 <sect1>
-<title>How do I validate/limit/filter the input to a GtkEntry?</title>
+<title>How do I validate/limit/filter the input to a GtkEntry? <emphasis>[GTK 2.x]</emphasis></title>

 <para>If you want to validate the text that a user enters into
 a GtkEntry widget you can attach to the "insert_text" signal
@@ -2901,16 +2906,16 @@ void insert_text_handler (GtkEntry    *entry,
  }
  
  if (count > 0) {
-    gtk_signal_handler_block_by_func (GTK_OBJECT (editable),
-				      GTK_SIGNAL_FUNC (insert_text_handler),
-				      data);
+    g_signal_handlers_block_by_func (G_OBJECT (editable),
+                                     G_CALLBACK (insert_text_handler),
+                                     data);
    gtk_editable_insert_text (editable, result, count, position);
-    gtk_signal_handler_unblock_by_func (GTK_OBJECT (editable),
-					GTK_SIGNAL_FUNC (insert_text_handler),
-					data);
+    g_signal_handlers_unblock_by_func (G_OBJECT (editable),
+                                       G_CALLBACK (insert_text_handler),
+                                       data);
  }
-  gtk_signal_emit_stop_by_name (GTK_OBJECT (editable), "insert_text");
-  
+  g_signal_stop_emission_by_name (G_OBJECT (editable), "insert_text");
+
  g_free (result);
 }

@@ -2925,12 +2930,13 @@ int main (int   argc,
  /* create a new window */
  window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
  gtk_window_set_title(GTK_WINDOW (window), "GTK Entry");
-  gtk_signal_connect(GTK_OBJECT (window), "delete_event",
-		     (GtkSignalFunc) gtk_exit, NULL);
-  
+  g_signal_connect (G_OBJECT (window), "destroy",
+                    G_CALLBACK (gtk_main_quit),
+                    NULL);
+
  entry = gtk_entry_new();
-  gtk_signal_connect(GTK_OBJECT(entry), "insert_text",
-		     GTK_SIGNAL_FUNC(insert_text_handler),
+  g_signal_connect(G_OBJECT(entry), "insert_text",
+		     G_CALLBACK(insert_text_handler),
 		     NULL);
  gtk_container_add(GTK_CONTAINER (window), entry);
  gtk_widget_show(entry);
@@ -1,3 +1,142 @@
+2004-01-22  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/migrating-checklist.sgml: Point to GtkEntry as an example of
+	a widget that uses a custom function to position its popup menu.
+
+2004-01-22  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/migrating-checklist.sgml: New chapter with a "Migration
+	Checklist" of things people need to do to be good citizens in the
+	GTK+ world.  This is mainly a way to tell people about interesting
+	APIs that they should use instead of hand-hacked approaches.
+
+	* gtk/gtk-docs.sgml: Added migrating-checklist.sgml.
+
+	* gtk/Makefile.am (content_files): Likewise.
+
+Thu Jan 22 01:46:45 2004  Jonathan Blandford  <jrb@gnome.org>
+
+	* gtk/tmpl/gtktreemodelsort.sgml: new introduction section.
+
+2004-01-20  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtk-sections.txt: Added gtk_paned_get_child[12].
+
+Thu Jan 15 23:54:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtk-docs.sgml: Move the old chapters about 1.2 and 2.0 
+	changes to Federicos new 'migrating' part.
+
+Fri Jan  9 00:38:58 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtk-sections.txt: Add gtk_ui_manager_get_toplevels.
+
+Thu Jan  8 00:14:02 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/tmpl/gtkmain.sgml (gtk_input_add_full): Fix link in deprecation
+	note.
+
+Wed Jan  7 22:25:45 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtk-sections.txt: Add gtk_action_new, gtk_toggle_action_new,
+	gtk_radio_action_new, gtk_action_group_add_action_with_accel.
+
+Wed Jan  7 01:56:33 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk-pixbuf/tmpl/file-saving.sgml: Document GdkPixbufSaveFunc.
+
+	* gdk-pixbuf/gdk-pixbuf-sections.txt: Add GdkPixbufSaveFunc,
+	gdk_pixbuf_save_to_callback, gdk_pixbuf_save_to_callbackv,
+	gdk_pixbuf_save_to_buffer and gdk_pixbuf_save_to_bufferv.
+
+Wed Jan  7 01:27:23 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk-pixbuf/tmpl/module_interface.sgml: Document expected
+	module behaviour if the size_func returns 0.
+
+Wed Jan  7 01:26:07 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk-pixbuf/gdk-pixbuf-sections.txt: Add gdk_pixbuf_get_file_info.
+
+2004-01-06  Federico Mena Quintero  <federico@ximian.com>
+
+	* gdk-pixbuf/tmpl/gdk-pixbuf.sgml: Added a section on how to
+	compute pixel offsets for gdk_pixbuf_get_pixels().
+
+Mon Dec 29 01:40:20 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtk-sections.txt: Add gtk_accel_map_{un,}lock_path.
+
+Wed Dec 24 01:12:12 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtk-sections.txt: Add GtkClipboardTargetReceivedFunc,
+	gtk_clipboard_request_targets, gtk_clipboard_wait_for_targets.
+
+Wed Dec 24 01:11:36 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/tmpl/gtkclipboard.sgml: Document GtkClipboardTargetReceivedFunc.
+
+Sun Dec 21 01:58:33 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtk-sections.txt: Add gtk_menu_shell_cancel.
+
+Thu Dec 18 01:24:35 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtk-sections.txt: Add gtk_message_dialog_set_markup
+
+Tue Dec 16 01:57:13 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/gdk-sections.txt: Add gdk_display_set_double_click_distance.
+
+Mon Dec 15 01:03:08 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtk-sections.txt: Add gtk_button_[sg]et_alignment.
+
+Sun Dec 14 01:25:49 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/gdk-sections.txt: Add gdk_x11_register_standard_event_type.
+
+Sat Dec 13 22:37:46 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/Makefile.am (HTML_IMAGES): Add 
+	stock_dialog_authentication_48.png.  (#129255, Olivier Andrieu)
+
+Fri Dec 12 00:52:25 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/gdk-sections.txt: Add the new gdk_spawn_* and
+	gdk_threads_* declarations.
+
+Thu Dec 11 01:57:55 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml: Signal documentation
+	moved inline.
+
+Thu Dec 11 00:04:10 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtk-sections.txt: Add gtk_window_[sg]et_accept_focus().
+	* gdk/gdk-sections.txt: Add gdk_window_set_accept_focus().
+
+Wed Dec 10 00:09:51 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/gdk-sections.txt: Add gdk_window_get_group(), 
+	gdk_display_get_default_group().
+
+2003-12-08  Federico Mena Quintero  <federico@ximian.com>
+ 
+ 	* gtk/migrating-GtkAction.sgml: New chapter about how to migrate
+ 	from gnome-ui/bonobo-ui/etc. to GtkAction.
+ 
+ 	* gtk/gtk-docs.sgml: Integrated the above.
+ 
+ 	* gtk/Makefile.am (content_files): Added migrating-GtkAction.sgml.
+ 
+Mon Dec  8 12:47:01 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/Makefile.am (IGNORE_HFILES): Add xdgmime directory,
+	gtkfilesystemwin32.
+
+	* gtk/gtk-sections.txt: Some updates.
+
 Sun Nov 23 20:59:57 2003  Matthias Clasen  <maclas@gmx.de>

 	* gtk/tree_widget.sgml: Add a missing comma.
@@ -57,12 +57,18 @@ GdkPixbufDestroyNotify
 <FILE>file-loading</FILE>
 gdk_pixbuf_new_from_file
 gdk_pixbuf_new_from_file_at_size
+gdk_pixbuf_get_file_info
 </SECTION>

 <SECTION>
 <FILE>file-saving</FILE>
 gdk_pixbuf_savev
 gdk_pixbuf_save
+GdkPixbufSaveFunc
+gdk_pixbuf_save_to_callback
+gdk_pixbuf_save_to_callbackv
+gdk_pixbuf_save_to_buffer
+gdk_pixbuf_save_to_bufferv
 </SECTION>

 <SECTION>
@@ -52,3 +52,14 @@ End:
@Returns: 


+<!-- ##### FUNCTION gdk_pixbuf_get_file_info ##### -->
+<para>
+
+</para>
+
+@filename: 
+@width: 
+@height: 
+@Returns: 
+
+
@@ -41,3 +41,79 @@ Saving a pixbuf to a file.
@Returns: 


+<!-- ##### USER_FUNCTION GdkPixbufSaveFunc ##### -->
+<para>
+Specifies the type of the function passed to
+gdk_pixbuf_save_to_callback().  It is called once for each block of
+bytes that is "written" by gdk_pixbuf_save_to_callback().  If
+successful it should return %TRUE.  If an error occurs it should set
+@error and return %FALSE, in which case gdk_pixbuf_save_to_callback()
+will fail with the same error.
+</para>
+
+@buf: bytes to be written.
+@count: number of bytes in @buf.
+@error: A location to return an error.
+@data: user data passed to gdk_pixbuf_save_to_callback().
+@Returns: %TRUE if successful, %FALSE (with @error set) if failed.
+@Since: 2.4
+
+
+<!-- ##### FUNCTION gdk_pixbuf_save_to_callback ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@save_func: 
+@user_data: 
+@type: 
+@error: 
+@Varargs: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_save_to_callbackv ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@save_func: 
+@user_data: 
+@type: 
+@option_keys: 
+@option_values: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_save_to_buffer ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@buffer: 
+@buffer_size: 
+@type: 
+@error: 
+@Varargs: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_save_to_bufferv ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@buffer: 
+@buffer_size: 
+@type: 
+@option_keys: 
+@option_values: 
+@error: 
+@Returns: 
+
+
@@ -78,65 +78,33 @@ fields.

 <!-- ##### SIGNAL GdkPixbufLoader::area-prepared ##### -->
  <para>
-    This signal is emitted when the pixbuf loader has allocated the pixbuf
-    in the desired size.  After this signal is emitted, applications can 
-    call gdk_pixbuf_loader_get_pixbuf() to fetch the partially-loaded pixbuf.
  </para>

-@gdkpixbufloader: the object which received the signal.
+@gdkpixbufloader: 

 <!-- ##### SIGNAL GdkPixbufLoader::area-updated ##### -->
  <para>
-    This signal is emitted when a significant area of the image being
-    loaded has been updated.  Normally it means that a complete
-    scanline has been read in, but it could be a different area as
-    well.  Applications can use this signal to know when to repaint
-    areas of an image that is being loaded.
  </para>

-@gdkpixbufloader: Loader which emitted the signal.
+@gdkpixbufloader: 
@arg1: 
@arg2: 
@arg3: 
@arg4: 
-<!-- # Unused Parameters # -->
-@x: X offset of upper-left corner of the updated area.
-@y: Y offset of upper-left corner of the updated area.
-@width: Width of updated area.
-@height: Height of updated area.

 <!-- ##### SIGNAL GdkPixbufLoader::closed ##### -->
  <para>
-    This signal is emitted when gdk_pixbuf_loader_close() is called.
-    It can be used by different parts of an application to receive
-    notification when an image loader is closed by the code that
-    drives it.
  </para>

-@gdkpixbufloader: the object which received the signal.
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
-->
+@gdkpixbufloader: 

 <!-- ##### SIGNAL GdkPixbufLoader::size-prepared ##### -->
  <para>
-    This signal is emitted when the pixbuf loader has been fed the
-    initial amount of data that is required to figure out the size
-    of the image that it will create.  Applications can call  
-    gdk_pixbuf_loader_set_size() in response to this signal to set
-    the desired size to which the image should be scaled.
  </para>

-@gdkpixbufloader: the object which received the signal.
+@gdkpixbufloader: 
@arg1: 
@arg2: 
-<!-- # Unused Parameters # -->
-@width: the original width of the image
-@height: the original height of the image

 <!-- ##### FUNCTION gdk_pixbuf_loader_new ##### -->
 <para>
@@ -224,4 +192,11 @@ End:
@error: 
@Returns: 

+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+

@@ -11,6 +11,81 @@ Information that describes an image.
    information that describes an image in memory.
  </para>

+  <section id="image-data">
+    <title>Image Data</title>
+
+    <para>
+      Image data in a pixbuf is stored in memory in uncompressed,
+      packed format.  Rows in the image are stored top to bottom, and
+      in each row pixels are stored from left to right.  There may be
+      padding at the end of a row.  The "rowstride" value of a pixbuf,
+      as returned by gdk_pixbuf_get_rowstride(), indicates the number
+      of bytes between rows.
+    </para>
+
+    <example id="put-pixel">
+      <title>put_pixel(<!-- -->) example</title>
+
+      <para>
+	The following code illustrates a simple put_pixel(<!-- -->)
+	function for RGB pixbufs with 8 bits per channel with an alpha
+	channel.  It is not included in the gdk-pixbuf library for
+	performance reasons; rather than making several function calls
+	for each pixel, your own code can take shortcuts.
+      </para>
+
+      <programlisting>
+static void
+put_pixel (GdkPixbuf *pixbuf, int x, int y, guchar red, guchar green, guchar blue, guchar alpha)
+{
+  int width, height, rowstride, n_channels;
+  guchar *pixels, *p;
+
+  n_channels = gdk_pixbuf_get_n_channels (pixbuf);
+
+  g_assert (gdk_pixbuf_get_colorspace (pixbuf) == GDK_COLORSPACE_RGB);
+  g_assert (gdk_pixbuf_get_bits_per_sample (pixbuf) == 8);
+  g_assert (gdk_pixbuf_get_has_alpha (pixbuf));
+  g_assert (n_channels == 4);
+
+  width = gdk_pixbuf_get_width (pixbuf);
+  height = gdk_pixbuf_get_height (pixbuf);
+
+  g_assert (x &gt;= 0 &amp;&amp; x &lt; width);
+  g_assert (y &gt;= 0 &amp;&amp; y &lt; height);
+
+  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+  pixels = gdk_pixbuf_get_pixels (pixbuf);
+
+  p = pixels + y * rowstride + x * n_channels;
+  p[0] = red;
+  p[1] = green;
+  p[2] = blue;
+  p[3] = alpha;
+}
+      </programlisting>
+
+      <para>
+	This function will not work for pixbufs with images that are
+	other than 8 bits per sample or channel, but it will work for
+	most of the pixbufs that GTK+ uses.
+      </para>
+    </example>
+
+    <note>
+      <para>
+	If you are doing memcpy() of raw pixbuf data, note that the
+	last row in the pixbuf may not be as wide as the full
+	rowstride, but rather just as wide as the pixel data needs to
+	be.  That is, it is unsafe to do <literal>memcpy (dest,
+	pixels, rowstride * height)</literal> to copy a whole pixbuf.
+	Use gdk_pixbuf_copy() instead, or compute the width in bytes
+	of the last row as <literal>width * ((n_channels *
+	bits_per_sample + 7) / 8)</literal>.
+      </para>
+    </note>
+  </section>
+
 <!-- ##### SECTION See_Also ##### -->
  <para>
  </para>
@@ -76,6 +151,46 @@ In the future it will do full alpha compositing.
  </para>


+<!-- ##### ARG GdkPixbuf:bits-per-sample ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GdkPixbuf:colorspace ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GdkPixbuf:has-alpha ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GdkPixbuf:height ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GdkPixbuf:n-channels ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GdkPixbuf:pixels ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GdkPixbuf:rowstride ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GdkPixbuf:width ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gdk_pixbuf_get_colorspace ##### -->
 <para>

@@ -163,3 +278,11 @@ End:
@Returns: 


+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2")
+End:
+-->
+
+
@@ -220,6 +220,12 @@ way to achieve the desired scaling during the loading of the image, it may
 either ignore the size request, or only approximate it -- &gdk-pixbuf; will
 then perform the required scaling on the completely loaded image. 
 </para>
+<para>
+If the function sets @width or @height to zero, the module should interpret
+this as a hint that it will be closed soon and shouldn't allocate further 
+resources. This convention is used to implement gdk_pixbuf_get_file_info()
+efficiently.
+</para>

@width: pointer to a location containing the current image width
@height: pointer to a location containing the current image height
@@ -288,6 +294,7 @@ is loaded and must set the function pointers of the #GdkPixbufModule.
@load_increment: continues an incremental load.
@load_animation: loads an animation from a file.
@save: saves a #GdkPixbuf to a file.
+@save_to_callback: 

 <!-- ##### STRUCT GdkPixbufAnimationClass ##### -->
 <para>
@@ -135,6 +135,7 @@ gdk_display_peek_event
 gdk_display_put_event
 gdk_display_add_client_message_filter
 gdk_display_set_double_click_time
+gdk_display_set_double_click_distance
 gdk_display_get_pointer
 gdk_display_get_window_at_pointer
 GdkDisplayPointerHooks
@@ -143,6 +144,7 @@ gdk_display_supports_cursor_color
 gdk_display_supports_cursor_alpha
 gdk_display_get_default_cursor_size
 gdk_display_get_maximal_cursor_size
+gdk_display_get_default_group

 <SUBSECTION Standard>
 GDK_DISPLAY_OBJECT
@@ -205,6 +207,11 @@ gdk_screen_get_monitor_at_point
 gdk_screen_get_monitor_at_window
 gdk_screen_broadcast_client_message
 gdk_screen_get_setting
+<SUBSECTION Spawning>
+gdk_spawn_on_screen
+gdk_spawn_on_screen_with_pipes
+gdk_spawn_command_line_on_screen
+
 <SUBSECTION Standard>
 GDK_SCREEN
 GDK_IS_SCREEN
@@ -657,6 +664,7 @@ gdk_window_get_internal_paint_info
 <SUBSECTION>
 gdk_window_set_user_data
 gdk_window_set_override_redirect
+gdk_window_set_accept_focus
 gdk_window_add_filter
 gdk_window_remove_filter
 GdkFilterFunc
@@ -704,6 +712,7 @@ gdk_window_set_icon_name
 gdk_window_set_transient_for
 gdk_window_set_role
 gdk_window_set_group
+gdk_window_get_group
 gdk_window_set_decorations
 gdk_window_get_decorations
 GdkWMDecoration
@@ -878,6 +887,11 @@ gdk_threads_init
 gdk_threads_enter
 gdk_threads_leave
 gdk_threads_mutex
+gdk_threads_set_lock_functions
+
+<SUBSECTION Private>
+gdk_threads_lock
+gdk_threads_unlock
 </SECTION>

 <SECTION>
@@ -1194,6 +1208,7 @@ gdk_x11_cursor_get_xdisplay
 gdk_x11_display_get_xdisplay
 gdk_x11_display_grab
 gdk_x11_display_ungrab
+gdk_x11_register_standard_event_type
 gdk_x11_drawable_get_xdisplay
 gdk_x11_drawable_get_xid
 gdk_x11_font_get_name
@@ -440,3 +440,19 @@ Draws a pixmap, or a part of a pixmap, onto another drawable.
@Returns: 


+<!-- ##### FUNCTION gdk_drawable_copy_to_image ##### -->
+<para>
+
+</para>
+
+@drawable: 
+@image: 
+@src_x: 
+@src_y: 
+@dest_x: 
+@dest_y: 
+@width: 
+@height: 
+@Returns: 
+
+
@@ -213,6 +213,15 @@ of an X display. All its fields are private and should not be accessed directly.
@msec: 


+<!-- ##### FUNCTION gdk_display_set_double_click_distance ##### -->
+<para>
+
+</para>
+
+@display: 
+@distance: 
+
+
 <!-- ##### FUNCTION gdk_display_get_pointer ##### -->
 <para>

@@ -306,3 +315,12 @@ Applications should never have any reason to use this facility
@height: 


+<!-- ##### FUNCTION gdk_display_get_default_group ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
@@ -254,3 +254,51 @@ when GDK gets multihead support.
@Returns: 


+<!-- ##### FUNCTION gdk_spawn_on_screen ##### -->
+<para>
+
+</para>
+
+@screen: 
+@working_directory: 
+@argv: 
+@envp: 
+@flags: 
+@child_setup: 
+@user_data: 
+@child_pid: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_spawn_on_screen_with_pipes ##### -->
+<para>
+
+</para>
+
+@screen: 
+@working_directory: 
+@argv: 
+@envp: 
+@flags: 
+@child_setup: 
+@user_data: 
+@child_pid: 
+@standard_input: 
+@standard_output: 
+@standard_error: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_spawn_command_line_on_screen ##### -->
+<para>
+
+</para>
+
+@screen: 
+@command_line: 
+@error: 
+@Returns: 
+
+
@@ -291,3 +291,12 @@ used directly &mdash; consider it private.
 </para>


+<!-- ##### FUNCTION gdk_threads_set_lock_functions ##### -->
+<para>
+
+</para>
+
+@enter_fn: 
+@leave_fn: 
+
+
@@ -741,6 +741,15 @@ Registers a window as a potential drop destination.
@override_redirect: 


+<!-- ##### FUNCTION gdk_window_set_accept_focus ##### -->
+<para>
+
+</para>
+
+@window: 
+@accept_focus: 
+
+
 <!-- ##### FUNCTION gdk_window_add_filter ##### -->
 <para>

@@ -1220,6 +1229,15 @@ Like the X Window System, GDK supports 8 modifier keys and 5 mouse buttons.
@leader: 


+<!-- ##### FUNCTION gdk_window_get_group ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_window_set_decorations ##### -->
 <para>

@@ -507,6 +507,16 @@ Since: 2.2
@display: 


+<!-- ##### FUNCTION gdk_x11_register_standard_event_type ##### -->
+<para>
+
+</para>
+
+@display: 
+@event_base: 
+@n_events: 
+
+
 <!-- ##### FUNCTION gdk_x11_drawable_get_xdisplay ##### -->
 <para>

@@ -33,6 +33,7 @@ IGNORE_HFILES=				\
 	gtkfilesystem.h			\
 	gtkfilesystemmodel.h		\
 	gtkfilesystemunix.h		\
+	gtkfilesystemwin32.h		\
 	gtkhsv.h			\
 	gtkiconthemeparser.h		\
 	gtkimmodule.h			\
@@ -54,6 +55,7 @@ IGNORE_HFILES=				\
 	gtktextutil.h			\
 	gtktypebuiltins.h		\
 	gtkxembed.h			\
+	xdgmime				\
 	xembed.h			\
 	gtktoggleactionprivate.h

@@ -85,6 +87,8 @@ content_files =					\
 	changes-2.0.sgml			\
 	compiling.sgml				\
 	framebuffer.sgml			\
+	migrating-checklist.sgml		\
+	migrating-GtkAction.sgml		\
 	migrating-GtkFileChooser.sgml		\
 	objects_grouped.sgml			\
 	question_index.sgml			\
@@ -108,6 +112,7 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/stock_copy_24.png			\
 	$(top_srcdir)/gtk/stock-icons/stock_cut_24.png			\
 	$(top_srcdir)/gtk/stock-icons/stock_trash_24.png		\
+	$(top_srcdir)/gtk/stock-icons/stock_dialog_authentication_48.png \
 	$(top_srcdir)/gtk/stock-icons/stock_dialog_error_48.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_dialog_info_48.png		\
 	$(top_srcdir)/gtk/stock-icons/stock_dialog_question_48.png	\
@@ -179,7 +179,9 @@
 <!ENTITY gtk-Questions SYSTEM "question_index.sgml">
 <!ENTITY gtk-Changes-1-2 SYSTEM "changes-1.2.sgml">
 <!ENTITY gtk-Changes-2-0 SYSTEM "changes-2.0.sgml">
+<!ENTITY gtk-migrating-checklist SYSTEM "migrating-checklist.sgml">
 <!ENTITY gtk-migrating-GtkFileChooser SYSTEM "migrating-GtkFileChooser.sgml">
+<!ENTITY gtk-migrating-GtkAction SYSTEM "migrating-GtkAction.sgml">
 <!ENTITY version SYSTEM "version.xml">
 <!ENTITY gtk-query-immodules SYSTEM "gtk-query-immodules-2.0.xml">
 ]>
@@ -281,11 +283,8 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
    &gtk-Windows;
    &gtk-Framebuffer;
    &gtk-X11;
-    &gtk-Changes-1-2;
-    &gtk-Changes-2-0;
    &gtk-Resources;
    &gtk-Questions;
-
  </part>


@@ -309,7 +308,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
    &gtk-Feature-Test-Macros;
    &gtk-Signals;
    &gtk-Types;
-
  </part>

  <part id="gtkobjects">
@@ -544,7 +542,11 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
      </para>
    </partintro>

+    &gtk-migrating-checklist;
+    &gtk-Changes-1-2;
+    &gtk-Changes-2-0;
    &gtk-migrating-GtkFileChooser;
+    &gtk-migrating-GtkAction;
  </part>

  <part>
@@ -102,7 +102,12 @@ gtk_accessible_get_type
 <FILE>gtkaction</FILE>
 <TITLE>GtkAction</TITLE>
 GtkAction
+gtk_action_new
 gtk_action_get_name
+gtk_action_is_sensitive
+gtk_action_get_sensitive
+gtk_action_is_visible
+gtk_action_get_visible
 gtk_action_activate
 gtk_action_create_icon
 gtk_action_create_menu_item
@@ -135,9 +140,14 @@ GtkActionPrivate
 GtkActionGroup
 gtk_action_group_new
 gtk_action_group_get_name
+gtk_action_group_get_sensitive
+gtk_action_group_set_sensitive
+gtk_action_group_get_visible
+gtk_action_group_set_visible
 gtk_action_group_get_action
 gtk_action_group_list_actions
 gtk_action_group_add_action
+gtk_action_group_add_action_with_accel
 gtk_action_group_remove_action
 GtkActionEntry
 gtk_action_group_add_actions
@@ -330,6 +340,8 @@ gtk_button_get_use_underline
 gtk_button_set_use_underline
 gtk_button_set_focus_on_click
 gtk_button_get_focus_on_click
+gtk_button_set_alignment
+gtk_button_get_alignment

 <SUBSECTION Standard>
 GTK_BUTTON
@@ -649,12 +661,15 @@ gtk_combo_box_set_row_span_column
 gtk_combo_box_set_column_span_column
 gtk_combo_box_get_active
 gtk_combo_box_set_active
+gtk_combo_box_get_active_iter
+gtk_combo_box_set_active_iter
 gtk_combo_box_get_model
 gtk_combo_box_set_model
 gtk_combo_box_new_text
 gtk_combo_box_append_text
 gtk_combo_box_insert_text
 gtk_combo_box_prepend_text
+gtk_combo_box_remove_text
 <SUBSECTION Standard>
 GTK_TYPE_COMBO_BOX
 GTK_COMBO_BOX
@@ -672,6 +687,8 @@ gtk_combo_box_get_type
 <TITLE>GtkComboBoxEntry</TITLE>
 GtkComboBoxEntry
 gtk_combo_box_entry_new
+gtk_combo_box_entry_new_with_model
+gtk_combo_box_entry_set_text_column
 gtk_combo_box_entry_get_text_column
 <SUBSECTION Standard>
 GTK_TYPE_COMBO_BOX_ENTRY
@@ -1052,6 +1069,8 @@ gtk_expander_set_label
 gtk_expander_get_label
 gtk_expander_set_use_underline
 gtk_expander_get_use_underline
+gtk_expander_set_use_markup
+gtk_expander_get_use_markup
 gtk_expander_set_label_widget
 gtk_expander_get_label_widget
 <SUBSECTION Standard>
@@ -1940,6 +1959,7 @@ gtk_ui_manager_remove_action_group
 gtk_ui_manager_get_action_groups
 gtk_ui_manager_get_accel_group
 gtk_ui_manager_get_widget
+gtk_ui_manager_get_toplevels
 gtk_ui_manager_get_action
 gtk_ui_manager_add_ui_from_string
 gtk_ui_manager_add_ui_from_file
@@ -1974,6 +1994,7 @@ gtk_menu_shell_select_item
 gtk_menu_shell_select_first
 gtk_menu_shell_deselect
 gtk_menu_shell_activate_item
+gtk_menu_shell_cancel
 GtkMenuDirectionType
 <SUBSECTION Standard>
 GTK_MENU_SHELL
@@ -1994,6 +2015,7 @@ GtkMessageType
 GtkButtonsType
 gtk_message_dialog_new
 gtk_message_dialog_new_with_markup
+gtk_message_dialog_set_markup
 <SUBSECTION Standard>
 GTK_MESSAGE_DIALOG
 GTK_IS_MESSAGE_DIALOG
@@ -2162,6 +2184,8 @@ gtk_paned_add2
 gtk_paned_gutter_size
 gtk_paned_pack1
 gtk_paned_pack2
+gtk_paned_get_child1
+gtk_paned_get_child2
 gtk_paned_set_gutter_size
 gtk_paned_set_position
 gtk_paned_get_position
@@ -2314,6 +2338,7 @@ gtk_progress_bar_get_type
 <FILE>gtkradioaction</FILE>
 <TITLE>GtkRadioAction</TITLE>
 GtkRadioAction
+gtk_radio_action_new
 gtk_radio_action_get_group
 gtk_radio_action_set_group
 gtk_radio_action_get_current_value
@@ -3096,6 +3121,7 @@ gtk_tips_query_get_type
 <FILE>gtktoggleaction</FILE>
 <TITLE>GtkToggleAction</TITLE>
 GtkToggleAction
+gtk_toggle_action_new
 gtk_toggle_action_toggled
 gtk_toggle_action_set_active
 gtk_toggle_action_get_active
@@ -3155,6 +3181,7 @@ gtk_toolbar_get_item_index
 gtk_toolbar_get_n_items
 gtk_toolbar_get_nth_item
 gtk_toolbar_get_drop_index
+gtk_toolbar_set_drop_highlight_item
 gtk_toolbar_set_show_arrow
 gtk_toolbar_set_orientation
 gtk_toolbar_set_tooltips
@@ -3240,6 +3267,8 @@ GtkToolItemPrivate
 <TITLE>GtkSeparatorToolItem</TITLE>
 GtkSeparatorToolItem
 gtk_separator_tool_item_new
+gtk_separator_tool_item_set_draw
+gtk_separator_tool_item_get_draw

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

+  <title>Migrating from GtkFileSelection to GtkFileChooser</title>
+
  <para>
    #GtkFileChooser, starting with GTK+ 2.4, is the new set of APIs
    for file selection widgets and dialogs.  Previous versions of GTK+
@@ -0,0 +1,142 @@
+<chapter id="gtk-migrating-checklist">
+  <title>Migration Checklist</title>
+
+  <para>
+    This chapter includes a checklist of things you need to do to
+    ensure that your programs are good citizens in the GTK+ world.  By
+    paying attention to the points in the checklist, you ensure that
+    many automatic features of GTK+ will work correctly in your
+    program.
+  </para>
+
+  <section id="checklist-popup-menu">
+    <title>Implement GtkWidget::popup_menu</title>
+
+    <formalpara>
+      <title>Why</title>
+      <para>
+	By handling this signal, you let widgets have
+	context-sensitive menus that can be invoked with the standard
+	key bindings.
+      </para>
+    </formalpara>
+
+    <para>
+      The <link
+      linkend="GtkWidget-popup-menu">GtkWidget::popup_menu</link>
+      signal instructs the widget for which it is emitted to create a
+      context-sensitive popup menu.  By default, the <link
+      linkend="gtk-bindings">key binding mechanism</link> is set to
+      emit this signal when the
+      <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>
+      or <keycap>Menu</keycap> keys are pressed while a widget has the
+      focus.  If a widget in your application shows a popup menu when
+      you press a mouse button, you can make it work as well through
+      the normal key binding mechanism in the following fahion:
+    </para>
+
+    <orderedlist>
+      <listitem>
+	<para>
+	  Write a function to create and show a popup menu.  This
+	  function needs to know the button number and the event's
+	  time to pass them to gtk_menu_popup().  You can implement
+	  such a function like this:
+	</para>
+
+	<programlisting id="do_popup_menu">
+static void
+do_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
+{
+  GtkWidget *menu;
+  int button, event_time;
+
+  menu = gtk_menu_new ();
+  g_signal_connect (menu, "deactivate", 
+                    G_CALLBACK (gtk_widget_destroy), NULL);
+
+  /* ... add menu items ... */
+
+  if (event)
+    {
+      button = event->button;
+      event_time = event->time;
+    }
+  else
+    {
+      button = 0;
+      event_time = gtk_get_current_event_time ();
+    }
+
+  gtk_menu_popup (GTK_MENU (popup), NULL, NULL, NULL, NULL, 
+                  button, event_time);
+}
+	</programlisting>
+      </listitem>
+
+      <listitem>
+	<para>
+	  In your button_press handler, call this function when you
+	  need to pop up a menu:
+	</para>
+
+	<programlisting>
+static gboolean
+my_widget_button_press_event_handler (GtkWidget *widget, GdkEventButton *event)
+{
+  /* Ignore double-clicks and triple-clicks */
+  if (event->button == 3 &amp;&amp; event->type == GDK_BUTTON_PRESS)
+    {
+      do_popup_menu (widget, event);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+	</programlisting>
+      </listitem>
+
+      <listitem>
+	<para>
+	  Implement a handler for the popup_menu signal:
+	</para>
+
+	<programlisting>
+static gboolean
+my_widget_popup_menu_handler (GtkWidget *widget)
+{
+  do_popup_menu (widget, NULL);
+  return TRUE;
+}
+	</programlisting>
+      </listitem>
+    </orderedlist>
+
+    <note>
+      <para>
+	If you do not pass a positioning function to gtk_menu_popup(),
+	it will show the menu at the mouse position by default.  This
+	is what you usually want when the menu is shown as a result of
+	pressing a mouse button.  However, if you press the
+	<keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>
+	or <keycap>Menu</keycap> keys while the widget is focused, the
+	mouse cursor may not be near the widget at all.  In the <link
+	linkend="do_popup_menu">example above</link>, you may want to
+	provide your own <link
+	linkend="GtkMenuPositionFunc">menu-positioning function</link>
+	in the case where the <parameter>event</parameter> is
+	<constant>NULL</constant>.  This function should compute the
+	desired position for a menu when it is invoked through the
+	keyboard.  For example, <xref linkend="GtkEntry"/> aligns the
+	top edge of its popup menu with the bottom edge of the entry.
+      </para>
+    </note>
+  </section>
+</chapter>
+
+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
+End:
+-->
@@ -525,27 +525,6 @@ This is a private struct used by GTK+ internally, don't worry about it.
@object: 
@signal_id: 

-<!-- ##### SIGNAL GtkAccelGroup::accel-activate ##### -->
-<para>
-
-</para>
-
-@accelgroup: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@Returns: 
-
-<!-- ##### SIGNAL GtkAccelGroup::accel-changed ##### -->
-<para>
-
-</para>
-
-@accelgroup: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
 <!-- ##### ARG GtkAccelLabel:accel-object ##### -->
 <para>

@@ -571,6 +550,22 @@ This is a private struct used by GTK+ internally, don't worry about it.
@old_accel_key: 
@old_accel_mods: 

+<!-- ##### SIGNAL GtkAction::connect-proxy ##### -->
+<para>
+
+</para>
+
+@action: the object which received the signal.
+@widget: 
+
+<!-- ##### SIGNAL GtkAction::disconnect-proxy ##### -->
+<para>
+
+</para>
+
+@action: the object which received the signal.
+@widget: 
+
 <!-- ##### USER_FUNCTION GtkArgGetFunc ##### -->
 <para>
 Define a function pointer.  Deprecated.
@@ -1086,138 +1081,24 @@ after other user handlers and the default handler.
 </para>


-<!-- ##### ARG GtkSettings:gtk-can-change-accels ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-color-palette ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-cursor-blink ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-cursor-blink-time ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-dnd-drag-threshold ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-double-click-time ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-entry-select-on-focus ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-font-name ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-icon-sizes ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-icon-theme-name ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-key-theme-name ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-menu-bar-accel ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### ARG GtkSettings:gtk-menu-bar-popout-delay ##### -->
 <para>

 </para>


-<!-- ##### ARG GtkSettings:gtk-menu-bar-popup-delay ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-menu-popdown-delay ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### ARG GtkSettings:gtk-menu-popout-delay ##### -->
 <para>

 </para>


-<!-- ##### ARG GtkSettings:gtk-menu-popup-delay ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### ARG GtkSettings:gtk-menu-submenu-hysteresis ##### -->
 <para>

 </para>


-<!-- ##### ARG GtkSettings:gtk-split-cursor ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-theme-name ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-toolbar-icon-size ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:gtk-toolbar-style ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### STRUCT GtkSettingsClass ##### -->
 <para>

@@ -37,6 +37,27 @@ An object representing and maintaining a group of accelerators.
 </para>


+<!-- ##### SIGNAL GtkAccelGroup::accel-activate ##### -->
+<para>
+
+</para>
+
+@accelgroup: the object which received the signal.
+@arg1: 
+@arg2: 
+@arg3: 
+@Returns: 
+
+<!-- ##### SIGNAL GtkAccelGroup::accel-changed ##### -->
+<para>
+
+</para>
+
+@accelgroup: the object which received the signal.
+@arg1: 
+@arg2: 
+@arg3: 
+
 <!-- ##### FUNCTION gtk_accel_group_new ##### -->
 <para>

@@ -85,6 +85,16 @@ should be accessed using the functions below.
 </para>


+<!-- ##### ARG GtkAccelLabel:accel-closure ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAccelLabel:accel-widget ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_accel_label_new ##### -->
 <para>
 Creates a new #GtkAccelLabel.
@@ -145,13 +155,3 @@ accelerators are added or removed from the associated widget.
@Returns: always returns %FALSE.


-<!-- ##### ARG GtkAccelLabel:accel-closure ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAccelLabel:accel-widget ##### -->
-<para>
-
-</para>
-
@@ -55,6 +55,85 @@ and should not be accessed directly.
 </para>


+<!-- ##### SIGNAL GtkAction::activate ##### -->
+<para>
+
+</para>
+
+@action: the object which received the signal.
+
+<!-- ##### ARG GtkAction:action-group ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:hide-if-empty ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:is-important ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:label ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:name ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:sensitive ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:short-label ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:stock-id ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:tooltip ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:visible ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:visible-horizontal ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:visible-vertical ##### -->
+<para>
+
+</para>
+
+<!-- ##### FUNCTION gtk_action_new ##### -->
+<para>
+
+</para>
+
+@name: 
+@label: 
+@tooltip: 
+@stock_id: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_action_get_name ##### -->
 <para>

@@ -64,6 +143,42 @@ and should not be accessed directly.
@Returns: 


+<!-- ##### FUNCTION gtk_action_is_sensitive ##### -->
+<para>
+
+</para>
+
+@action: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_action_get_sensitive ##### -->
+<para>
+
+</para>
+
+@action: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_action_is_visible ##### -->
+<para>
+
+</para>
+
+@action: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_action_get_visible ##### -->
+<para>
+
+</para>
+
+@action: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_action_activate ##### -->
 <para>

@@ -179,71 +294,3 @@ and should not be accessed directly.
@accel_group: 


-<!-- ##### SIGNAL GtkAction::activate ##### -->
-<para>
-
-</para>
-
-@action: the object which received the signal.
-
-<!-- ##### SIGNAL GtkAction::connect-proxy ##### -->
-<para>
-
-</para>
-
-@action: the object which received the signal.
-@widget: 
-
-<!-- ##### SIGNAL GtkAction::disconnect-proxy ##### -->
-<para>
-
-</para>
-
-@action: the object which received the signal.
-@widget: 
-
-<!-- ##### ARG GtkAction:hide-if-empty ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:is-important ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:sensitive ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:short-label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:stock-id ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:tooltip ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:visible ##### -->
-<para>
-
-</para>
-
@@ -40,6 +40,55 @@ members and should not be accessed directly.
 </para>


+<!-- ##### SIGNAL GtkActionGroup::connect-proxy ##### -->
+<para>
+
+</para>
+
+@actiongroup: the object which received the signal.
+@arg1: 
+@widget: 
+
+<!-- ##### SIGNAL GtkActionGroup::disconnect-proxy ##### -->
+<para>
+
+</para>
+
+@actiongroup: the object which received the signal.
+@arg1: 
+@widget: 
+
+<!-- ##### SIGNAL GtkActionGroup::post-activate ##### -->
+<para>
+
+</para>
+
+@actiongroup: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL GtkActionGroup::pre-activate ##### -->
+<para>
+
+</para>
+
+@actiongroup: the object which received the signal.
+@arg1: 
+
+<!-- ##### ARG GtkActionGroup:name ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkActionGroup:sensitive ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkActionGroup:visible ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_action_group_new ##### -->
 <para>

@@ -58,6 +107,42 @@ members and should not be accessed directly.
@Returns: 


+<!-- ##### FUNCTION gtk_action_group_get_sensitive ##### -->
+<para>
+
+</para>
+
+@action_group: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_action_group_set_sensitive ##### -->
+<para>
+
+</para>
+
+@action_group: 
+@sensitive: 
+
+
+<!-- ##### FUNCTION gtk_action_group_get_visible ##### -->
+<para>
+
+</para>
+
+@action_group: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_action_group_set_visible ##### -->
+<para>
+
+</para>
+
+@action_group: 
+@visible: 
+
+
 <!-- ##### FUNCTION gtk_action_group_get_action ##### -->
 <para>

@@ -86,6 +171,16 @@ members and should not be accessed directly.
@action: 


+<!-- ##### FUNCTION gtk_action_group_add_action_with_accel ##### -->
+<para>
+
+</para>
+
+@action_group: 
+@action: 
+@accelerator: 
+
+
 <!-- ##### FUNCTION gtk_action_group_remove_action ##### -->
 <para>

@@ -79,6 +79,21 @@ In a #GtkScrollbar this is the size of the area which is currently visible.
 </para>


+<!-- ##### SIGNAL GtkAdjustment::changed ##### -->
+<para>
+Emitted when one or more of the #GtkAdjustment fields have been changed,
+other than the value field.
+</para>
+
+@adjustment: the object which received the signal.
+
+<!-- ##### SIGNAL GtkAdjustment::value-changed ##### -->
+<para>
+Emitted when the #GtkAdjustment value field has been changed.
+</para>
+
+@adjustment: the object which received the signal.
+
 <!-- ##### FUNCTION gtk_adjustment_new ##### -->
 <para>
 Creates a new #GtkAdjustment.
@@ -153,18 +168,3 @@ changed the #GtkAdjustment value field.
@adjustment: 


-<!-- ##### SIGNAL GtkAdjustment::changed ##### -->
-<para>
-Emitted when one or more of the #GtkAdjustment fields have been changed,
-other than the value field.
-</para>
-
-@adjustment: the object which received the signal.
-
-<!-- ##### SIGNAL GtkAdjustment::value-changed ##### -->
-<para>
-Emitted when the #GtkAdjustment value field has been changed.
-</para>
-
-@adjustment: the object which received the signal.
-
@@ -34,6 +34,46 @@ be accessed using the functions below.
 </para>


+<!-- ##### ARG GtkAlignment:bottom-padding ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAlignment:left-padding ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAlignment:right-padding ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAlignment:top-padding ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAlignment:xalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAlignment:xscale ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAlignment:yalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAlignment:yscale ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_alignment_new ##### -->
 <para>
 Creates a new #GtkAlignment.
@@ -96,43 +136,3 @@ unused space, from 0 to 1. The values are similar to @xscale.
@padding_right: 


-<!-- ##### ARG GtkAlignment:bottom-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:left-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:right-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:top-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:xalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:xscale ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:yalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:yscale ##### -->
-<para>
-
-</para>
-
@@ -57,6 +57,16 @@ an application.)
 </para>


+<!-- ##### ARG GtkArrow:arrow-type ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkArrow:shadow-type ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_arrow_new ##### -->
 <para>
 Creates a new arrow widget.
@@ -77,13 +87,3 @@ Sets the direction and style of the #GtkArrow, @arrow.
@shadow_type: a valid #GtkShadowType.


-<!-- ##### ARG GtkArrow:arrow-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkArrow:shadow-type ##### -->
-<para>
-
-</para>
-
@@ -26,6 +26,26 @@ a frame around the child. The frame will be
 </para>


+<!-- ##### ARG GtkAspectFrame:obey-child ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAspectFrame:ratio ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAspectFrame:xalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAspectFrame:yalign ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_aspect_frame_new ##### -->
 <para>
 Create a new #GtkAspectFrame.
@@ -63,23 +83,3 @@ to 1.0 (right aligned)
    ratio is taken from the requistion of the child.


-<!-- ##### ARG GtkAspectFrame:obey-child ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAspectFrame:ratio ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAspectFrame:xalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAspectFrame:yalign ##### -->
-<para>
-
-</para>
-
@@ -52,6 +52,36 @@ 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.
@@ -170,33 +200,3 @@ box.
@is_secondary: 


-<!-- ##### 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>
-
@@ -135,6 +135,41 @@ field.</entry>
@spacing: 
@homogeneous: 

+<!-- ##### 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
@@ -373,38 +408,3 @@ field in #GtkBoxChild-struct.
 in #GtkBoxChild-struct.


-<!-- ##### 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>
-
@@ -27,6 +27,106 @@ This should not be accessed directly.  Use the accessor functions below.
 </para>


+<!-- ##### SIGNAL GtkButton::activate ##### -->
+<para>
+
+</para>
+
+@button: the object which received the signal.
+
+<!-- ##### SIGNAL GtkButton::clicked ##### -->
+<para>
+Emitted when a button clicked on by the mouse and the cursor stays on the
+button.  If the cursor is not on the button when the mouse button is released,
+the signal is not emitted.
+</para>
+
+@button: the object which received the signal.
+
+<!-- ##### SIGNAL GtkButton::enter ##### -->
+<para>
+Emitted when the mouse cursor enters the region of the button.
+</para>
+
+@button: the object which received the signal.
+
+<!-- ##### SIGNAL GtkButton::leave ##### -->
+<para>
+Emitted when the mouse cursor leaves the region of the button.
+</para>
+
+@button: the object which received the signal.
+
+<!-- ##### SIGNAL GtkButton::pressed ##### -->
+<para>
+Emitted when the button is initially pressed.
+</para>
+
+@button: the object which received the signal.
+
+<!-- ##### SIGNAL GtkButton::released ##### -->
+<para>
+Emitted when a button which is pressed is released, no matter where the
+mouse cursor is.
+</para>
+
+@button: the object which received the signal.
+
+<!-- ##### ARG GtkButton:focus-on-click ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButton:label ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButton:relief ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButton:use-stock ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButton:use-underline ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButton:xalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButton:yalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButton:child-displacement-x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButton:child-displacement-y ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButton:default-border ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButton:default-outside-border ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_button_new ##### -->
 <para>
 Creates a new #GtkButton widget. To add a child widget to the button,
@@ -202,93 +302,23 @@ Returns the current relief style of the given #GtkButton.
@Returns: 


-<!-- ##### SIGNAL GtkButton::activate ##### -->
+<!-- ##### FUNCTION gtk_button_set_alignment ##### -->
 <para>

 </para>

-@button: the object which received the signal.
+@button: 
+@xalign: 
+@yalign: 

-<!-- ##### SIGNAL GtkButton::clicked ##### -->
-<para>
-Emitted when a button clicked on by the mouse and the cursor stays on the
-button.  If the cursor is not on the button when the mouse button is released,
-the signal is not emitted.
-</para>

-@button: the object which received the signal.
-
-<!-- ##### SIGNAL GtkButton::enter ##### -->
-<para>
-Emitted when the mouse cursor enters the region of the button.
-</para>
-
-@button: the object which received the signal.
-
-<!-- ##### SIGNAL GtkButton::leave ##### -->
-<para>
-Emitted when the mouse cursor leaves the region of the button.
-</para>
-
-@button: the object which received the signal.
-
-<!-- ##### SIGNAL GtkButton::pressed ##### -->
-<para>
-Emitted when the button is initially pressed.
-</para>
-
-@button: the object which received the signal.
-
-<!-- ##### SIGNAL GtkButton::released ##### -->
-<para>
-Emitted when a button which is pressed is released, no matter where the
-mouse cursor is.
-</para>
-
-@button: the object which received the signal.
-
-<!-- ##### ARG GtkButton:focus-on-click ##### -->
+<!-- ##### FUNCTION gtk_button_get_alignment ##### -->
 <para>

 </para>

-<!-- ##### ARG GtkButton:label ##### -->
-<para>
+@button: 
+@xalign: 
+@yalign: 

-</para>
-
-<!-- ##### ARG GtkButton:relief ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:use-stock ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:use-underline ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:child-displacement-x ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:child-displacement-y ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:default-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:default-outside-border ##### -->
-<para>
-
-</para>

@@ -65,6 +65,91 @@ are 0-11) while <structfield>selected_day</structfield> is one-based
 </note>


+<!-- ##### SIGNAL GtkCalendar::day-selected ##### -->
+<para>
+Emitted when the user selects a day.
+</para>
+
+@calendar: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCalendar::day-selected-double-click ##### -->
+<para>
+
+</para>
+
+@calendar: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCalendar::month-changed ##### -->
+<para>
+Emitted when the user clicks a button to change the selected month on a
+calendar.
+</para>
+
+@calendar: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCalendar::next-month ##### -->
+<para>
+
+</para>
+
+@calendar: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCalendar::next-year ##### -->
+<para>
+
+</para>
+
+@calendar: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCalendar::prev-month ##### -->
+<para>
+
+</para>
+
+@calendar: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCalendar::prev-year ##### -->
+<para>
+
+</para>
+
+@calendar: the object which received the signal.
+
+<!-- ##### ARG GtkCalendar:day ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCalendar:month ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCalendar:no-month-change ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCalendar:show-day-names ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCalendar:show-heading ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCalendar:show-week-numbers ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCalendar:year ##### -->
+<para>
+
+</para>
+
 <!-- ##### ENUM GtkCalendarDisplayOptions ##### -->
 <para>
 These options can be used to influence the display and behaviour of a #GtkCalendar.
@@ -191,88 +276,3 @@ gtk_calendar_freeze() are displayed.
@calendar: a #GtkCalendar.


-<!-- ##### SIGNAL GtkCalendar::day-selected ##### -->
-<para>
-Emitted when the user selects a day.
-</para>
-
-@calendar: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCalendar::day-selected-double-click ##### -->
-<para>
-
-</para>
-
-@calendar: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCalendar::month-changed ##### -->
-<para>
-Emitted when the user clicks a button to change the selected month on a
-calendar.
-</para>
-
-@calendar: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCalendar::next-month ##### -->
-<para>
-
-</para>
-
-@calendar: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCalendar::next-year ##### -->
-<para>
-
-</para>
-
-@calendar: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCalendar::prev-month ##### -->
-<para>
-
-</para>
-
-@calendar: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCalendar::prev-year ##### -->
-<para>
-
-</para>
-
-@calendar: the object which received the signal.
-
-<!-- ##### ARG GtkCalendar:day ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:month ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:no-month-change ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:show-day-names ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:show-heading ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:show-week-numbers ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:year ##### -->
-<para>
-
-</para>
-
@@ -20,6 +20,20 @@ Interface for widgets which can are used for editing cells
 </para>


+<!-- ##### SIGNAL GtkCellEditable::editing-done ##### -->
+<para>
+
+</para>
+
+@celleditable: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCellEditable::remove-widget ##### -->
+<para>
+
+</para>
+
+@celleditable: the object which received the signal.
+
 <!-- ##### STRUCT GtkCellEditableIface ##### -->
 <para>

@@ -55,17 +69,3 @@ Interface for widgets which can are used for editing cells
@cell_editable: 


-<!-- ##### SIGNAL GtkCellEditable::editing-done ##### -->
-<para>
-
-</para>
-
-@celleditable: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCellEditable::remove-widget ##### -->
-<para>
-
-</para>
-
-@celleditable: the object which received the signal.
-
@@ -32,6 +32,7 @@ GtkCellLayout
@add_attribute: 
@set_cell_data_func: 
@clear_attributes: 
+@reorder: 

 <!-- ##### USER_FUNCTION GtkCellLayoutDataFunc ##### -->
 <para>
@@ -66,6 +66,78 @@ it cannot be individually modified.
 </para>


+<!-- ##### SIGNAL GtkCellRenderer::editing-canceled ##### -->
+<para>
+
+</para>
+
+@cellrenderer: the object which received the signal.
+
+<!-- ##### ARG GtkCellRenderer:cell-background ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:cell-background-gdk ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:cell-background-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:height ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:is-expanded ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:is-expander ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:mode ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:visible ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:width ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:xalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:xpad ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:yalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:ypad ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_cell_renderer_get_size ##### -->
 <para>

@@ -144,68 +216,3 @@ it cannot be individually modified.
@height: 


-<!-- ##### ARG GtkCellRenderer:cell-background ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:cell-background-gdk ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:cell-background-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:height ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:is-expanded ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:is-expander ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:visible ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:xalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:xpad ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:yalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:ypad ##### -->
-<para>
-
-</para>
-
@@ -20,14 +20,6 @@ Renders a pixbuf in a cell
 </para>


-<!-- ##### FUNCTION gtk_cell_renderer_pixbuf_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
 <!-- ##### ARG GtkCellRendererPixbuf:pixbuf ##### -->
 <para>

@@ -58,3 +50,11 @@ Renders a pixbuf in a cell

 </para>

+<!-- ##### FUNCTION gtk_cell_renderer_pixbuf_new ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
@@ -20,23 +20,6 @@ Renders text in a cell
 </para>


-<!-- ##### FUNCTION gtk_cell_renderer_text_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_text_set_fixed_height_from_font ##### -->
-<para>
-
-</para>
-
-@renderer: 
-@number_of_rows: 
-
-
 <!-- ##### SIGNAL GtkCellRendererText::edited ##### -->
 <para>

@@ -111,6 +94,16 @@ Renders text in a cell

 </para>

+<!-- ##### ARG GtkCellRendererText:language ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererText:language-set ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkCellRendererText:markup ##### -->
 <para>

@@ -136,6 +129,11 @@ Renders text in a cell

 </para>

+<!-- ##### ARG GtkCellRendererText:single-paragraph-mode ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkCellRendererText:size ##### -->
 <para>

@@ -216,3 +214,20 @@ Renders text in a cell

 </para>

+<!-- ##### FUNCTION gtk_cell_renderer_text_new ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_cell_renderer_text_set_fixed_height_from_font ##### -->
+<para>
+
+</para>
+
+@renderer: 
+@number_of_rows: 
+
+
@@ -20,6 +20,34 @@ Renders a toggle button in a cell
 </para>


+<!-- ##### SIGNAL GtkCellRendererToggle::toggled ##### -->
+<para>
+
+</para>
+
+@cellrenderertoggle: the object which received the signal.
+@arg1: 
+
+<!-- ##### ARG GtkCellRendererToggle:activatable ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererToggle:active ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererToggle:inconsistent ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererToggle:radio ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_cell_renderer_toggle_new ##### -->
 <para>

@@ -64,31 +92,3 @@ Renders a toggle button in a cell
@setting: 


-<!-- ##### SIGNAL GtkCellRendererToggle::toggled ##### -->
-<para>
-
-</para>
-
-@cellrenderertoggle: the object which received the signal.
-@arg1: 
-
-<!-- ##### ARG GtkCellRendererToggle:activatable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererToggle:active ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererToggle:inconsistent ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererToggle:radio ##### -->
-<para>
-
-</para>
-
@@ -40,6 +40,16 @@ The important signal ('toggled') is also inherited from #GtkToggleButton.
 </para>


+<!-- ##### ARG GtkCheckButton:indicator-size ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_check_button_new ##### -->
 <para>
 Creates a new #GtkCheckButton.
@@ -66,13 +76,3 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it.
@Returns: 


-<!-- ##### ARG GtkCheckButton:indicator-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
-<para>
-
-</para>
-
@@ -41,6 +41,33 @@ an application.)
 </para>


+<!-- ##### SIGNAL GtkCheckMenuItem::toggled ##### -->
+<para>
+This signal is emitted when the state of the check box is changed.
+</para>
+
+<para>
+A signal handler can examine the <structfield>active</structfield> 
+field of the #GtkCheckMenuItem-struct struct to discover the new state.
+</para>
+
+@checkmenuitem: the object which received the signal.
+
+<!-- ##### ARG GtkCheckMenuItem:active ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCheckMenuItem:draw-as-radio ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCheckMenuItem:inconsistent ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_check_menu_item_new ##### -->
 <para>
 Creates a new #GtkCheckMenuItem.
@@ -148,30 +175,3 @@ Emits the GtkCheckMenuItem::toggled signal.
@Returns: 


-<!-- ##### SIGNAL GtkCheckMenuItem::toggled ##### -->
-<para>
-This signal is emitted when the state of the check box is changed.
-</para>
-
-<para>
-A signal handler can examine the <structfield>active</structfield> 
-field of the #GtkCheckMenuItem-struct struct to discover the new state.
-</para>
-
-@checkmenuitem: the object which received the signal.
-
-<!-- ##### ARG GtkCheckMenuItem:active ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCheckMenuItem:draw-as-radio ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCheckMenuItem:inconsistent ##### -->
-<para>
-
-</para>
-
@@ -115,6 +115,20 @@ Storing data on clipboards
@data: the @user_data supplied to gtk_clipboard_request_text().


+<!-- ##### USER_FUNCTION GtkClipboardTargetsReceivedFunc ##### -->
+<para>
+    A function to be called when the results of gtk_clipboard_request_targets()
+    are received, or when the request fails.
+</para>
+
+@clipboard: the #GtkClipboard
+@atoms: the supported targets, as array of #GdkAtom, or %NULL 
+            if retrieving the data failed.
+@n_atoms: the length of the @atoms array.
+@data: the @user_data supplied to gtk_clipboard_request_targets().
+@Since: 2.4
+
+
 <!-- ##### USER_FUNCTION GtkClipboardGetFunc ##### -->
 <para>
 A function that will be called to provide the contents of the selection.
@@ -253,6 +267,16 @@ will not be used again.
@user_data: 


+<!-- ##### FUNCTION gtk_clipboard_request_targets ##### -->
+<para>
+
+</para>
+
+@clipboard: 
+@callback: 
+@user_data: 
+
+
 <!-- ##### FUNCTION gtk_clipboard_wait_for_contents ##### -->
 <para>

@@ -269,12 +293,7 @@ will not be used again.
 </para>

@clipboard: 
-@Returns: <!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gtk-docs.sgml" "book" "refsect2" "")
-End:
-->
+@Returns: 


 <!-- ##### FUNCTION gtk_clipboard_wait_is_text_available ##### -->
@@ -286,3 +305,21 @@ End:
@Returns: 


+<!-- ##### FUNCTION gtk_clipboard_wait_for_targets ##### -->
+<para>
+
+</para>
+
+@clipboard: 
+@targets: 
+@n_targets: 
+@Returns: 
+
+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gtk-docs.sgml" "book" "refsect2" "")
+End:
+-->
+
+
@@ -22,6 +22,197 @@ only private data, and should be accessed only via the CList API.
 </para>


+<!-- ##### SIGNAL GtkCList::abort-column-resize ##### -->
+<para>
+This signal is emitted when a column resize is aborted.
+</para>
+
+@clist: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::click-column ##### -->
+<para>
+This signal is emitted when a column title is clicked.
+</para>
+
+@clist: The object which received the signal.
+@column: The number of the column.
+
+<!-- ##### SIGNAL GtkCList::end-selection ##### -->
+<para>
+This signal is emitted when a selection ends in a 
+multiple selection CList.
+</para>
+
+@clist: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::extend-selection ##### -->
+<para>
+This signal is emitted when the selection is extended.
+</para>
+
+@clist: the object which received the signal.
+@scroll_type: A #GtkScrollType value of any scrolling operation the
+occured during the selection.
+@position: A value between 0.0 and 1.0.
+@auto_start_selection: %TRUE or %FALSE.
+
+<!-- ##### SIGNAL GtkCList::resize-column ##### -->
+<para>
+This signal is emitted when a column is resized.
+</para>
+
+@clist: The object which received the signal.
+@column: The number of the column
+@width: The new width of the column.
+
+<!-- ##### SIGNAL GtkCList::row-move ##### -->
+<para>
+This signal is emitted when a row is moved.
+</para>
+
+@clist: The object which received the signal.
+@arg1: The source position of the row.
+@arg2: The destination position of the row.
+
+<!-- ##### SIGNAL GtkCList::scroll-horizontal ##### -->
+<para>
+This signal is emitted when the CList is scrolled horizontally.
+</para>
+
+@clist: the object which received the signal.
+@scroll_type: A #GtkScrollType value of how the scroll operation occured.
+@position: a value between 0.0 and 1.0.
+
+<!-- ##### SIGNAL GtkCList::scroll-vertical ##### -->
+<para>
+This signal is emitted when the CList is scrolled vertically.
+</para>
+
+@clist: the object which received the signal.
+@scroll_type: A #GtkScrollType value of how the scroll operation occured.
+@position: A value between 0.0 and 1.0.
+
+<!-- ##### SIGNAL GtkCList::select-all ##### -->
+<para>
+This signal is emitted when all the rows are selected in a CList.
+</para>
+
+@clist: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::select-row ##### -->
+<para>
+This signal is emitted when the user selects a row in the list.  
+It is emitted for every row that is selected in a multi-selection or
+by calling gtk_clist_select_all().
+</para>
+
+@clist: The object which received the signal.
+@row: The row selected.
+@column: The column where the selection occured.
+@event: A #GdkEvent structure for the selection.
+
+<!-- ##### SIGNAL GtkCList::set-scroll-adjustments ##### -->
+<para>
+
+</para>
+
+@clist: the object which received the signal.
+@arg1: 
+@arg2: 
+
+<!-- ##### SIGNAL GtkCList::start-selection ##### -->
+<para>
+This signal is emitted when a drag-selection is started in 
+a multiple-selection CList.
+</para>
+
+@clist: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::toggle-add-mode ##### -->
+<para>
+This signal is emitted when "add mode" is toggled.
+</para>
+
+@clist: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::toggle-focus-row ##### -->
+<para>
+
+</para>
+
+@clist: The object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::undo-selection ##### -->
+<para>
+This signal is emitted when an undo selection occurs in the CList,
+probably via calling gtk_clist_undo_selection().
+</para>
+
+@clist: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::unselect-all ##### -->
+<para>
+This signal is emitted when all rows are unselected in a CList.
+</para>
+
+@clist: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::unselect-row ##### -->
+<para>
+This signal is emitted when the user unselects a row in the list.  
+It is emitted for every row that is unselected in a multi-selection or
+by calling gtk_clist_unselect_all().  It is also emitted for the
+previously selected row in a "single" or "browse" mode CList.
+</para>
+
+@clist: The object which received the signal.
+@row: The selected row
+@column: The column where the selection occured.
+@event: 
+
+<!-- ##### ARG GtkCList:n-columns ##### -->
+<para>
+An integer value for a column.
+</para>
+
+<!-- ##### ARG GtkCList:reorderable ##### -->
+<para>
+A boolean value for determining if the user can re-order the CList's
+columns.
+</para>
+
+<!-- ##### ARG GtkCList:row-height ##### -->
+<para>
+An integer value representing the height of a row in pixels.
+</para>
+
+<!-- ##### ARG GtkCList:selection-mode ##### -->
+<para>
+Sets the type of selection mode for the CList.
+</para>
+
+<!-- ##### ARG GtkCList:shadow-type ##### -->
+<para>
+Sets the shadowing for the CList.
+</para>
+
+<!-- ##### ARG GtkCList:sort-type ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCList:titles-active ##### -->
+<para>
+A boolean value for setting whether the column titles can be
+clicked.
+</para>
+
+<!-- ##### ARG GtkCList:use-drag-icons ##### -->
+<para>
+A boolean value for setting whether to use icons during drag
+operations.
+</para>
+
 <!-- ##### ENUM GtkCellType ##### -->
 <para>
 Identifies the type of element in the current cell of the CList.  Cells can
@@ -1111,194 +1302,3 @@ aspect of the #GtkCList widget.
@adjustment: A pointer to a #GtkAdjustment widget, or NULL.


-<!-- ##### SIGNAL GtkCList::abort-column-resize ##### -->
-<para>
-This signal is emitted when a column resize is aborted.
-</para>
-
-@clist: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCList::click-column ##### -->
-<para>
-This signal is emitted when a column title is clicked.
-</para>
-
-@clist: The object which received the signal.
-@column: The number of the column.
-
-<!-- ##### SIGNAL GtkCList::end-selection ##### -->
-<para>
-This signal is emitted when a selection ends in a 
-multiple selection CList.
-</para>
-
-@clist: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCList::extend-selection ##### -->
-<para>
-This signal is emitted when the selection is extended.
-</para>
-
-@clist: the object which received the signal.
-@scroll_type: A #GtkScrollType value of any scrolling operation the
-occured during the selection.
-@position: A value between 0.0 and 1.0.
-@auto_start_selection: %TRUE or %FALSE.
-
-<!-- ##### SIGNAL GtkCList::resize-column ##### -->
-<para>
-This signal is emitted when a column is resized.
-</para>
-
-@clist: The object which received the signal.
-@column: The number of the column
-@width: The new width of the column.
-
-<!-- ##### SIGNAL GtkCList::row-move ##### -->
-<para>
-This signal is emitted when a row is moved.
-</para>
-
-@clist: The object which received the signal.
-@arg1: The source position of the row.
-@arg2: The destination position of the row.
-
-<!-- ##### SIGNAL GtkCList::scroll-horizontal ##### -->
-<para>
-This signal is emitted when the CList is scrolled horizontally.
-</para>
-
-@clist: the object which received the signal.
-@scroll_type: A #GtkScrollType value of how the scroll operation occured.
-@position: a value between 0.0 and 1.0.
-
-<!-- ##### SIGNAL GtkCList::scroll-vertical ##### -->
-<para>
-This signal is emitted when the CList is scrolled vertically.
-</para>
-
-@clist: the object which received the signal.
-@scroll_type: A #GtkScrollType value of how the scroll operation occured.
-@position: A value between 0.0 and 1.0.
-
-<!-- ##### SIGNAL GtkCList::select-all ##### -->
-<para>
-This signal is emitted when all the rows are selected in a CList.
-</para>
-
-@clist: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCList::select-row ##### -->
-<para>
-This signal is emitted when the user selects a row in the list.  
-It is emitted for every row that is selected in a multi-selection or
-by calling gtk_clist_select_all().
-</para>
-
-@clist: The object which received the signal.
-@row: The row selected.
-@column: The column where the selection occured.
-@event: A #GdkEvent structure for the selection.
-
-<!-- ##### SIGNAL GtkCList::set-scroll-adjustments ##### -->
-<para>
-
-</para>
-
-@clist: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### SIGNAL GtkCList::start-selection ##### -->
-<para>
-This signal is emitted when a drag-selection is started in 
-a multiple-selection CList.
-</para>
-
-@clist: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCList::toggle-add-mode ##### -->
-<para>
-This signal is emitted when "add mode" is toggled.
-</para>
-
-@clist: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCList::toggle-focus-row ##### -->
-<para>
-
-</para>
-
-@clist: The object which received the signal.
-
-<!-- ##### SIGNAL GtkCList::undo-selection ##### -->
-<para>
-This signal is emitted when an undo selection occurs in the CList,
-probably via calling gtk_clist_undo_selection().
-</para>
-
-@clist: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCList::unselect-all ##### -->
-<para>
-This signal is emitted when all rows are unselected in a CList.
-</para>
-
-@clist: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCList::unselect-row ##### -->
-<para>
-This signal is emitted when the user unselects a row in the list.  
-It is emitted for every row that is unselected in a multi-selection or
-by calling gtk_clist_unselect_all().  It is also emitted for the
-previously selected row in a "single" or "browse" mode CList.
-</para>
-
-@clist: The object which received the signal.
-@row: The selected row
-@column: The column where the selection occured.
-@event: 
-
-<!-- ##### ARG GtkCList:n-columns ##### -->
-<para>
-An integer value for a column.
-</para>
-
-<!-- ##### ARG GtkCList:reorderable ##### -->
-<para>
-A boolean value for determining if the user can re-order the CList's
-columns.
-</para>
-
-<!-- ##### ARG GtkCList:row-height ##### -->
-<para>
-An integer value representing the height of a row in pixels.
-</para>
-
-<!-- ##### ARG GtkCList:selection-mode ##### -->
-<para>
-Sets the type of selection mode for the CList.
-</para>
-
-<!-- ##### ARG GtkCList:shadow-type ##### -->
-<para>
-Sets the shadowing for the CList.
-</para>
-
-<!-- ##### ARG GtkCList:sort-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCList:titles-active ##### -->
-<para>
-A boolean value for setting whether the column titles can be
-clicked.
-</para>
-
-<!-- ##### ARG GtkCList:use-drag-icons ##### -->
-<para>
-A boolean value for setting whether to use icons during drag
-operations.
-</para>
-
@@ -21,6 +21,33 @@ selection dialog to change the color. It is suitable widget for selecting a colo
 </para>


+<!-- ##### SIGNAL GtkColorButton::color-set ##### -->
+<para>
+
+</para>
+
+@colorbutton: the object which received the signal.
+
+<!-- ##### ARG GtkColorButton:alpha ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkColorButton:color ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkColorButton:title ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkColorButton:use-alpha ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_color_button_new ##### -->
 <para>

@@ -110,30 +137,3 @@ selection dialog to change the color. It is suitable widget for selecting a colo
@Returns: 


-<!-- ##### SIGNAL GtkColorButton::color-set ##### -->
-<para>
-
-</para>
-
-@colorbutton: the object which received the signal.
-
-<!-- ##### ARG GtkColorButton:alpha ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorButton:color ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorButton:title ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorButton:use-alpha ##### -->
-<para>
-
-</para>
-
@@ -25,6 +25,34 @@ and should be accessed using the functions below.
 </para>


+<!-- ##### SIGNAL GtkColorSelection::color-changed ##### -->
+<para>
+This signal is emitted when the color changes in the #GtkColorSelection
+according to its update policy.
+</para>
+
+@colorselection: the object which received the signal.
+
+<!-- ##### ARG GtkColorSelection:current-alpha ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkColorSelection:current-color ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkColorSelection:has-opacity-control ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkColorSelection:has-palette ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_color_selection_new ##### -->
 <para>

@@ -258,31 +286,3 @@ time.
@color: 


-<!-- ##### SIGNAL GtkColorSelection::color-changed ##### -->
-<para>
-This signal is emitted when the color changes in the #GtkColorSelection
-according to its update policy.
-</para>
-
-@colorselection: the object which received the signal.
-
-<!-- ##### ARG GtkColorSelection:current-alpha ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorSelection:current-color ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorSelection:has-opacity-control ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorSelection:has-palette ##### -->
-<para>
-
-</para>
-
@@ -106,6 +106,31 @@ an application.)
@entry: 
@list: 

+<!-- ##### ARG GtkCombo:allow-empty ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCombo:case-sensitive ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCombo:enable-arrow-keys ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCombo:enable-arrows-always ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCombo:value-in-list ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_combo_new ##### -->
 <para>
 Creates a new #GtkCombo.
@@ -195,28 +220,3 @@ instead.
@combo: a #GtkCombo.


-<!-- ##### ARG GtkCombo:allow-empty ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCombo:case-sensitive ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCombo:enable-arrow-keys ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCombo:enable-arrows-always ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCombo:value-in-list ##### -->
-<para>
-
-</para>
-
@@ -20,11 +20,58 @@ GtkComboBox
 </para>


+<!-- ##### SIGNAL GtkComboBox::changed ##### -->
+<para>
+
+</para>
+
+@combobox: the object which received the signal.
+
+<!-- ##### ARG GtkComboBox:active ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkComboBox:column-span-column ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkComboBox:model ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkComboBox:row-span-column ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkComboBox:wrap-width ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkComboBox:appearance ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_combo_box_new ##### -->
 <para>

 </para>

+@Returns: 
+<!-- # Unused Parameters # -->
+@model: 
+
+
+<!-- ##### FUNCTION gtk_combo_box_new_with_model ##### -->
+<para>
+
+</para>
+
@model: 
@Returns: 

@@ -74,6 +121,25 @@ GtkComboBox
@index: 


+<!-- ##### FUNCTION gtk_combo_box_get_active_iter ##### -->
+<para>
+
+</para>
+
+@combo_box: 
+@iter: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_combo_box_set_active_iter ##### -->
+<para>
+
+</para>
+
+@combo_box: 
+@iter: 
+
+
 <!-- ##### FUNCTION gtk_combo_box_get_model ##### -->
 <para>

@@ -83,6 +149,15 @@ GtkComboBox
@Returns: 


+<!-- ##### FUNCTION gtk_combo_box_set_model ##### -->
+<para>
+
+</para>
+
+@combo_box: 
+@model: 
+
+
 <!-- ##### FUNCTION gtk_combo_box_new_text ##### -->
 <para>

@@ -119,40 +194,12 @@ GtkComboBox
@text: 


-<!-- ##### SIGNAL GtkComboBox::changed ##### -->
+<!-- ##### FUNCTION gtk_combo_box_remove_text ##### -->
 <para>

 </para>

-@combobox: the object which received the signal.
+@combo_box: 
+@position: 

-<!-- ##### ARG GtkComboBox:active ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:column-span-column ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:model ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:row-span-column ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:wrap-width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkComboBox:appearance ##### -->
-<para>
-
-</para>

@@ -20,16 +20,41 @@ GtkComboBoxEntry
 </para>


+<!-- ##### ARG GtkComboBoxEntry:text-column ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_combo_box_entry_new ##### -->
 <para>

 </para>

+@Returns: 
+<!-- # Unused Parameters # -->
+@model: 
+@text_column: 
+
+
+<!-- ##### FUNCTION gtk_combo_box_entry_new_with_model ##### -->
+<para>
+
+</para>
+
@model: 
@text_column: 
@Returns: 


+<!-- ##### FUNCTION gtk_combo_box_entry_set_text_column ##### -->
+<para>
+
+</para>
+
+@entry_box: 
+@text_column: 
+
+
 <!-- ##### FUNCTION gtk_combo_box_entry_get_text_column ##### -->
 <para>

@@ -39,8 +64,3 @@ GtkComboBoxEntry
@Returns: 


-<!-- ##### ARG GtkComboBoxEntry:text-column ##### -->
-<para>
-
-</para>
-
@@ -102,6 +102,52 @@ changes, use gtk_widget_child_notify().
 </para>


+<!-- ##### SIGNAL GtkContainer::add ##### -->
+<para>
+
+</para>
+
+@container: the object which received the signal.
+@widget: 
+
+<!-- ##### SIGNAL GtkContainer::check-resize ##### -->
+<para>
+
+</para>
+
+@container: the object which received the signal.
+
+<!-- ##### SIGNAL GtkContainer::remove ##### -->
+<para>
+
+</para>
+
+@container: the object which received the signal.
+@widget: 
+
+<!-- ##### SIGNAL GtkContainer::set-focus-child ##### -->
+<para>
+
+</para>
+
+@container: the object which received the signal.
+@widget: 
+
+<!-- ##### ARG GtkContainer:border-width ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkContainer:child ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkContainer:resize-mode ##### -->
+<para>
+
+</para>
+
 <!-- ##### MACRO GTK_IS_RESIZE_CONTAINER ##### -->
 <para>

@@ -464,49 +510,3 @@ Does the same as gtk_container_get_children().
@class: 


-<!-- ##### SIGNAL GtkContainer::add ##### -->
-<para>
-
-</para>
-
-@container: the object which received the signal.
-@widget: 
-
-<!-- ##### SIGNAL GtkContainer::check-resize ##### -->
-<para>
-
-</para>
-
-@container: the object which received the signal.
-
-<!-- ##### SIGNAL GtkContainer::remove ##### -->
-<para>
-
-</para>
-
-@container: the object which received the signal.
-@widget: 
-
-<!-- ##### SIGNAL GtkContainer::set-focus-child ##### -->
-<para>
-
-</para>
-
-@container: the object which received the signal.
-@widget: 
-
-<!-- ##### ARG GtkContainer:border-width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkContainer:child ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkContainer:resize-mode ##### -->
-<para>
-
-</para>
-
@@ -75,6 +75,94 @@ node.</entry>
 </para>


+<!-- ##### SIGNAL GtkCTree::change-focus-row-expansion ##### -->
+<para>
+The row which has the focus is either collapsed or expanded
+or toggled.
+</para>
+
+@ctree: the object which received the signal.
+@expansion: What is being done.
+
+<!-- ##### SIGNAL GtkCTree::tree-collapse ##### -->
+<para>
+Emitted when a node is collapsed.
+</para>
+
+@ctree: the object which received the signal.
+@node: 
+
+<!-- ##### SIGNAL GtkCTree::tree-expand ##### -->
+<para>
+Emitted when a node is expanded.
+</para>
+
+@ctree: the object which received the signal.
+@node: 
+
+<!-- ##### SIGNAL GtkCTree::tree-move ##### -->
+<para>
+Emitted when a node is moved.
+</para>
+
+@ctree: the object which received the signal.
+@node: The node that is moved.
+@new_parent: The new parent of the node.
+@new_sibling: The new sibling of the node.
+
+<!-- ##### SIGNAL GtkCTree::tree-select-row ##### -->
+<para>
+Emitted when a row is selected.
+</para>
+
+@ctree: the object which received the signal.
+@node: The node corresponding to the selected row.
+@column: The column which was selected.
+
+<!-- ##### SIGNAL GtkCTree::tree-unselect-row ##### -->
+<para>
+Emitted when a node is unselected.
+</para>
+
+@ctree: the object which received the signal.
+@node: The node  corresponding to the selected row.
+@column: 
+
+<!-- ##### ARG GtkCTree:expander-style ##### -->
+<para>
+The style of the expander buttons.
+</para>
+
+<!-- ##### ARG GtkCTree:indent ##### -->
+<para>
+The number of pixels to indent the tree levels.
+</para>
+
+<!-- ##### ARG GtkCTree:line-style ##### -->
+<para>
+The style of the lines in the tree graphic.
+</para>
+
+<!-- ##### ARG GtkCTree:n-columns ##### -->
+<para>
+The number of columns in the tree.
+</para>
+
+<!-- ##### ARG GtkCTree:show-stub ##### -->
+<para>
+FIXME
+</para>
+
+<!-- ##### ARG GtkCTree:spacing ##### -->
+<para>
+The number of pixels between the tree and the columns.
+</para>
+
+<!-- ##### ARG GtkCTree:tree-column ##### -->
+<para>
+The column in which the actual tree graphic appears.
+</para>
+
 <!-- ##### MACRO GTK_CTREE_ROW ##### -->
 <para>
 Used to get the #GtkCTreeRow structure corresponding to the given #GtkCTreeNode.
@@ -1163,91 +1251,3 @@ criteria etc.
@show_stub: 


-<!-- ##### SIGNAL GtkCTree::change-focus-row-expansion ##### -->
-<para>
-The row which has the focus is either collapsed or expanded
-or toggled.
-</para>
-
-@ctree: the object which received the signal.
-@expansion: What is being done.
-
-<!-- ##### SIGNAL GtkCTree::tree-collapse ##### -->
-<para>
-Emitted when a node is collapsed.
-</para>
-
-@ctree: the object which received the signal.
-@node: 
-
-<!-- ##### SIGNAL GtkCTree::tree-expand ##### -->
-<para>
-Emitted when a node is expanded.
-</para>
-
-@ctree: the object which received the signal.
-@node: 
-
-<!-- ##### SIGNAL GtkCTree::tree-move ##### -->
-<para>
-Emitted when a node is moved.
-</para>
-
-@ctree: the object which received the signal.
-@node: The node that is moved.
-@new_parent: The new parent of the node.
-@new_sibling: The new sibling of the node.
-
-<!-- ##### SIGNAL GtkCTree::tree-select-row ##### -->
-<para>
-Emitted when a row is selected.
-</para>
-
-@ctree: the object which received the signal.
-@node: The node corresponding to the selected row.
-@column: The column which was selected.
-
-<!-- ##### SIGNAL GtkCTree::tree-unselect-row ##### -->
-<para>
-Emitted when a node is unselected.
-</para>
-
-@ctree: the object which received the signal.
-@node: The node  corresponding to the selected row.
-@column: 
-
-<!-- ##### ARG GtkCTree:expander-style ##### -->
-<para>
-The style of the expander buttons.
-</para>
-
-<!-- ##### ARG GtkCTree:indent ##### -->
-<para>
-The number of pixels to indent the tree levels.
-</para>
-
-<!-- ##### ARG GtkCTree:line-style ##### -->
-<para>
-The style of the lines in the tree graphic.
-</para>
-
-<!-- ##### ARG GtkCTree:n-columns ##### -->
-<para>
-The number of columns in the tree.
-</para>
-
-<!-- ##### ARG GtkCTree:show-stub ##### -->
-<para>
-FIXME
-</para>
-
-<!-- ##### ARG GtkCTree:spacing ##### -->
-<para>
-The number of pixels between the tree and the columns.
-</para>
-
-<!-- ##### ARG GtkCTree:tree-column ##### -->
-<para>
-The column in which the actual tree graphic appears.
-</para>
-
@@ -48,6 +48,41 @@ should be accessed using the functions below.
 </para>


+<!-- ##### SIGNAL GtkCurve::curve-type-changed ##### -->
+<para>
+Emitted when the curve type has been changed.
+The curve type can be changed explicitly with a call to
+gtk_curve_set_curve_type(). It is also changed as a side-effect of
+calling gtk_curve_reset() or gtk_curve_set_gamma().
+</para>
+
+@curve: the object which received the signal.
+
+<!-- ##### ARG GtkCurve:curve-type ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCurve:max-x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCurve:max-y ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCurve:min-x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCurve:min-y ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_curve_new ##### -->
 <para>
 Creates a new #GtkCurve.
@@ -124,38 +159,3 @@ curve will be changed as little as possible.
@type: the type of the curve.


-<!-- ##### SIGNAL GtkCurve::curve-type-changed ##### -->
-<para>
-Emitted when the curve type has been changed.
-The curve type can be changed explicitly with a call to
-gtk_curve_set_curve_type(). It is also changed as a side-effect of
-calling gtk_curve_reset() or gtk_curve_set_gamma().
-</para>
-
-@curve: the object which received the signal.
-
-<!-- ##### ARG GtkCurve:curve-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCurve:max-x ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCurve:max-y ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCurve:min-x ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCurve:min-y ##### -->
-<para>
-
-</para>
-
@@ -140,6 +140,44 @@ as any other #GtkHButtonBox.
@vbox: 
@action_area: 

+<!-- ##### SIGNAL GtkDialog::close ##### -->
+<para>
+
+</para>
+
+@dialog: the object which received the signal.
+
+<!-- ##### SIGNAL GtkDialog::response ##### -->
+<para>
+Emitted when an action widget is clicked, the dialog receives a delete event, or
+the application programmer calls gtk_dialog_response(). On a delete event, the
+response ID is #GTK_RESPONSE_NONE. Otherwise, it depends on which action widget
+was clicked.
+</para>
+
+@dialog: the object which received the signal.
+@arg1: the response ID
+
+<!-- ##### ARG GtkDialog:has-separator ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkDialog:action-area-border ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkDialog:button-spacing ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkDialog:content-area-border ##### -->
+<para>
+
+</para>
+
 <!-- ##### ENUM GtkDialogFlags ##### -->
 <para>

@@ -276,41 +314,3 @@ directly, but into the @vbox and @action_area, as described above.
@setting: 


-<!-- ##### SIGNAL GtkDialog::close ##### -->
-<para>
-
-</para>
-
-@dialog: the object which received the signal.
-
-<!-- ##### SIGNAL GtkDialog::response ##### -->
-<para>
-Emitted when an action widget is clicked, the dialog receives a delete event, or
-the application programmer calls gtk_dialog_response(). On a delete event, the
-response ID is #GTK_RESPONSE_NONE. Otherwise, it depends on which action widget
-was clicked.
-</para>
-
-@dialog: the object which received the signal.
-@arg1: the response ID
-
-<!-- ##### ARG GtkDialog:has-separator ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkDialog:action-area-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkDialog:button-spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkDialog:content-area-border ##### -->
-<para>
-
-</para>
-
@@ -87,6 +87,50 @@ editable by the user.</entry>
 </para>


+<!-- ##### SIGNAL GtkEditable::changed ##### -->
+<para>
+Indicates that the user has changed the contents
+of the widget.
+</para>
+
+@editable: the object which received the signal.
+
+<!-- ##### SIGNAL GtkEditable::delete-text ##### -->
+<para>
+This signal is emitted when text is deleted from
+the widget by the user. The default handler for
+this signal will normally be responsible for inserting
+the text, so by connecting to this signal and then
+stopping the signal with gtk_signal_emit_stop(), it
+is possible to modify the inserted text, or prevent
+it from being inserted entirely. The @start_pos
+and @end_pos parameters are interpreted as for
+gtk_editable_delete_text()
+</para>
+
+@editable: the object which received the signal.
+@start_pos: the starting position.
+@end_pos: the end position.
+
+<!-- ##### SIGNAL GtkEditable::insert-text ##### -->
+<para>
+This signal is emitted when text is inserted into
+the widget by the user. The default handler for
+this signal will normally be responsible for inserting
+the text, so by connecting to this signal and then
+stopping the signal with gtk_signal_emit_stop(), it
+is possible to modify the inserted text, or prevent
+it from being inserted entirely.
+</para>
+
+@editable: the object which received the signal.
+@new_text: the new text to insert.
+@new_text_length: the length of the new text.
+@position: the position at which to insert the new text.
+           this is an in-out paramter. After the signal
+           emission is finished, it should point after   
+           the newly inserted text.
+
 <!-- ##### FUNCTION gtk_editable_select_region ##### -->
 <para>
 Selects a region of text. The characters that
@@ -247,47 +291,3 @@ widget or not.
@Returns: 


-<!-- ##### SIGNAL GtkEditable::changed ##### -->
-<para>
-Indicates that the user has changed the contents
-of the widget.
-</para>
-
-@editable: the object which received the signal.
-
-<!-- ##### SIGNAL GtkEditable::delete-text ##### -->
-<para>
-This signal is emitted when text is deleted from
-the widget by the user. The default handler for
-this signal will normally be responsible for inserting
-the text, so by connecting to this signal and then
-stopping the signal with gtk_signal_emit_stop(), it
-is possible to modify the inserted text, or prevent
-it from being inserted entirely. The @start_pos
-and @end_pos parameters are interpreted as for
-gtk_editable_delete_text()
-</para>
-
-@editable: the object which received the signal.
-@start_pos: the starting position.
-@end_pos: the end position.
-
-<!-- ##### SIGNAL GtkEditable::insert-text ##### -->
-<para>
-This signal is emitted when text is inserted into
-the widget by the user. The default handler for
-this signal will normally be responsible for inserting
-the text, so by connecting to this signal and then
-stopping the signal with gtk_signal_emit_stop(), it
-is possible to modify the inserted text, or prevent
-it from being inserted entirely.
-</para>
-
-@editable: the object which received the signal.
-@new_text: the new text to insert.
-@new_text_length: the length of the new text.
-@position: the position at which to insert the new text.
-           this is an in-out paramter. After the signal
-           emission is finished, it should point after   
-           the newly inserted text.
-
@@ -31,6 +31,131 @@ The #GtkEntry-struct struct contains only private data.
 </para>


+<!-- ##### SIGNAL GtkEntry::activate ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+
+<!-- ##### SIGNAL GtkEntry::copy-clipboard ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+
+<!-- ##### SIGNAL GtkEntry::cut-clipboard ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+
+<!-- ##### SIGNAL GtkEntry::delete-from-cursor ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+@arg1: 
+@arg2: 
+
+<!-- ##### SIGNAL GtkEntry::insert-at-cursor ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL GtkEntry::move-cursor ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+@arg1: 
+@arg2: 
+@arg3: 
+
+<!-- ##### SIGNAL GtkEntry::paste-clipboard ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+
+<!-- ##### SIGNAL GtkEntry::populate-popup ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL GtkEntry::toggle-overwrite ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+
+<!-- ##### ARG GtkEntry:activates-default ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEntry:cursor-position ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEntry:editable ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEntry:has-frame ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEntry:invisible-char ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEntry:max-length ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEntry:scroll-offset ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEntry:selection-bound ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEntry:text ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEntry:visibility ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEntry:width-chars ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_entry_new ##### -->
 <para>
 Creates a new #GtkEntry widget.
@@ -283,128 +408,3 @@ use gtk_editable_set_editable() instead.
@Returns: 


-<!-- ##### SIGNAL GtkEntry::activate ##### -->
-<para>
-
-</para>
-
-@entry: the object which received the signal.
-
-<!-- ##### SIGNAL GtkEntry::copy-clipboard ##### -->
-<para>
-
-</para>
-
-@entry: the object which received the signal.
-
-<!-- ##### SIGNAL GtkEntry::cut-clipboard ##### -->
-<para>
-
-</para>
-
-@entry: the object which received the signal.
-
-<!-- ##### SIGNAL GtkEntry::delete-from-cursor ##### -->
-<para>
-
-</para>
-
-@entry: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### SIGNAL GtkEntry::insert-at-cursor ##### -->
-<para>
-
-</para>
-
-@entry: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkEntry::move-cursor ##### -->
-<para>
-
-</para>
-
-@entry: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-<!-- ##### SIGNAL GtkEntry::paste-clipboard ##### -->
-<para>
-
-</para>
-
-@entry: the object which received the signal.
-
-<!-- ##### SIGNAL GtkEntry::populate-popup ##### -->
-<para>
-
-</para>
-
-@entry: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkEntry::toggle-overwrite ##### -->
-<para>
-
-</para>
-
-@entry: the object which received the signal.
-
-<!-- ##### ARG GtkEntry:activates-default ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntry:cursor-position ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntry:editable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntry:has-frame ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntry:invisible-char ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntry:max-length ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntry:scroll-offset ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntry:selection-bound ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntry:text ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntry:visibility ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntry:width-chars ##### -->
-<para>
-
-</para>
-
@@ -20,6 +20,34 @@ GtkEntryCompletion
 </para>


+<!-- ##### SIGNAL GtkEntryCompletion::action-activated ##### -->
+<para>
+
+</para>
+
+@entrycompletion: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL GtkEntryCompletion::match-selected ##### -->
+<para>
+
+</para>
+
+@entrycompletion: the object which received the signal.
+@arg1: 
+@arg2: 
+@Returns: 
+
+<!-- ##### ARG GtkEntryCompletion:minimum-key-length ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEntryCompletion:model ##### -->
+<para>
+
+</para>
+
 <!-- ##### USER_FUNCTION GtkEntryCompletionMatchFunc ##### -->
 <para>

@@ -45,8 +73,10 @@ GtkEntryCompletion

 </para>

-@entry: 
+@completion: 
@Returns: 
+<!-- # Unused Parameters # -->
+@entry: 


 <!-- ##### FUNCTION gtk_entry_completion_set_model ##### -->
@@ -142,31 +172,3 @@ GtkEntryCompletion
@column: 


-<!-- ##### SIGNAL GtkEntryCompletion::action-activated ##### -->
-<para>
-
-</para>
-
-@entrycompletion: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkEntryCompletion::match-selected ##### -->
-<para>
-
-</para>
-
-@entrycompletion: the object which received the signal.
-@arg1: 
-@arg2: 
-@Returns: 
-
-<!-- ##### ARG GtkEntryCompletion:minimum-key-length ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntryCompletion:model ##### -->
-<para>
-
-</para>
-
@@ -23,6 +23,16 @@ should be accessed using the functions below.
 </para>


+<!-- ##### ARG GtkEventBox:above-child ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEventBox:visible-window ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_event_box_new ##### -->
 <para>
 Creates a new #GtkEventBox.
@@ -67,13 +77,3 @@ Creates a new #GtkEventBox.
@Returns: 


-<!-- ##### ARG GtkEventBox:above-child ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEventBox:visible-window ##### -->
-<para>
-
-</para>
-
@@ -21,6 +21,53 @@ the triangles used in a #GtkTreeView.
 </para>


+<!-- ##### SIGNAL GtkExpander::activate ##### -->
+<para>
+
+</para>
+
+@expander: the object which received the signal.
+
+<!-- ##### ARG GtkExpander:expanded ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkExpander:label ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkExpander:label-widget ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkExpander:spacing ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkExpander:use-markup ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkExpander:use-underline ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkExpander:expander-size ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkExpander:expander-spacing ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_expander_new ##### -->
 <para>

@@ -111,6 +158,24 @@ the triangles used in a #GtkTreeView.
@Returns: 


+<!-- ##### FUNCTION gtk_expander_set_use_markup ##### -->
+<para>
+
+</para>
+
+@expander: 
+@use_markup: 
+
+
+<!-- ##### FUNCTION gtk_expander_get_use_markup ##### -->
+<para>
+
+</para>
+
+@expander: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_expander_set_label_widget ##### -->
 <para>

@@ -129,45 +194,3 @@ the triangles used in a #GtkTreeView.
@Returns: 


-<!-- ##### SIGNAL GtkExpander::activate ##### -->
-<para>
-
-</para>
-
-@expander: the object which received the signal.
-
-<!-- ##### ARG GtkExpander:expanded ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkExpander:label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkExpander:label-widget ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkExpander:spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkExpander:use-underline ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkExpander:expander-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkExpander:expander-spacing ##### -->
-<para>
-
-</para>
-
@@ -79,9 +79,9 @@ about it. ;-)
 </para>

@required_major: 
-@required_minor:
-@required_micro:
-@Returns:
+@required_minor: 
+@required_micro: 
+@Returns: 


 <!-- ##### MACRO GTK_MAJOR_VERSION ##### -->
@@ -116,13 +116,11 @@ update_preview_cb (GtkFileChooser *file_chooser, gpointer data)
      </note>
    </refsect2>

-
 <!-- ##### SECTION See_Also ##### -->
    <para>
      #GtkFileChooserDialog, #GtkFileChooserWidget
    </para>

-
 <!-- ##### STRUCT GtkFileChooser ##### -->
 <para>

@@ -140,6 +140,21 @@ The #GtkFileSelection struct contains the following #GtkWidget fields:
@button_area: 
@action_area: 

+<!-- ##### ARG GtkFileSelection:filename ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFileSelection:select-multiple ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFileSelection:show-fileops ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_file_selection_new ##### -->
 <para>
 Creates a new file selection dialog box. By default it will contain a #GtkTreeView of the application's current working directory, and a file listing. Operation buttons that allow the user to create a directory, delete files and rename files, are also present.
@@ -220,18 +235,3 @@ Hides the file operation buttons that normally appear at the top of the dialog.
@Returns: 


-<!-- ##### ARG GtkFileSelection:filename ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileSelection:select-multiple ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileSelection:show-fileops ##### -->
-<para>
-
-</para>
-
@@ -84,6 +84,16 @@ their positions.</entry>
 </para>


+<!-- ##### ARG GtkFixed:x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFixed:y ##### -->
+<para>
+
+</para>
+
 <!-- ##### STRUCT GtkFixedChild ##### -->
 <para>
 The #GtkFixedChild-struct struct contains the following fields.
@@ -166,13 +176,3 @@ Moves a child of a #GtkFixed container to the given position.
@has_window: 


-<!-- ##### ARG GtkFixed:x ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFixed:y ##### -->
-<para>
-
-</para>
-
@@ -21,6 +21,43 @@ dialog to change the font. It is suitable widget for selecting a font in a prefe
 </para>


+<!-- ##### SIGNAL GtkFontButton::font-set ##### -->
+<para>
+
+</para>
+
+@fontbutton: the object which received the signal.
+
+<!-- ##### ARG GtkFontButton:font-name ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFontButton:show-size ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFontButton:show-style ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFontButton:title ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFontButton:use-font ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFontButton:use-size ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_font_button_new ##### -->
 <para>

@@ -147,40 +184,3 @@ dialog to change the font. It is suitable widget for selecting a font in a prefe
@Returns: 


-<!-- ##### SIGNAL GtkFontButton::font-set ##### -->
-<para>
-
-</para>
-
-@fontbutton: the object which received the signal.
-
-<!-- ##### ARG GtkFontButton:font-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:show-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:show-style ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:title ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:use-font ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:use-size ##### -->
-<para>
-
-</para>
-
@@ -43,6 +43,21 @@ only be accessed using the functions below.
 </para>


+<!-- ##### ARG GtkFontSelection:font ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFontSelection:font-name ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFontSelection:preview-text ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_font_selection_new ##### -->
 <para>
 Creates a new #GtkFontSelection.
@@ -98,18 +113,3 @@ Sets the text displayed in the preview area.
@text: the text to display in the preview area.


-<!-- ##### ARG GtkFontSelection:font ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontSelection:font-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontSelection:preview-text ##### -->
-<para>
-
-</para>
-
@@ -24,6 +24,36 @@ label can be controlled with gtk_frame_set_label_align().
 </para>


+<!-- ##### ARG GtkFrame:label ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFrame:label-widget ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFrame:label-xalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFrame:label-yalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFrame:shadow ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFrame:shadow-type ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_frame_new ##### -->
 <para>
 Create a new Frame, with optional label @label.
@@ -115,33 +145,3 @@ Set the shadow type for the Frame widget.
@Returns: 


-<!-- ##### ARG GtkFrame:label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFrame:label-widget ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFrame:label-xalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFrame:label-yalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFrame:shadow ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFrame:shadow-type ##### -->
-<para>
-
-</para>
-
@@ -77,6 +77,53 @@ child is attached or detached.</entry>
 </para>


+<!-- ##### SIGNAL GtkHandleBox::child-attached ##### -->
+<para>
+This signal is emitted when the contents of the
+handlebox are reattached to the main window.
+</para>
+
+@handlebox: the object which received the signal.
+@widget: the child widget of the handlebox.
+         (this argument provides no extra information
+          and is here only for backwards-compatibility)
+
+<!-- ##### SIGNAL GtkHandleBox::child-detached ##### -->
+<para>
+This signal is emitted when the contents of the
+handlebox are detached from the main window.
+</para>
+
+@handlebox: the object which received the signal.
+@widget: the child widget of the handlebox. 
+         (this argument provides no extra information
+          and is here only for backwards-compatibility)
+
+<!-- ##### ARG GtkHandleBox:handle-position ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkHandleBox:shadow ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkHandleBox:shadow-type ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkHandleBox:snap-edge ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkHandleBox:snap-edge-set ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_handle_box_new ##### -->
 <para>
 Create a new handle box.
@@ -155,50 +202,3 @@ in the future.
@Returns: 


-<!-- ##### SIGNAL GtkHandleBox::child-attached ##### -->
-<para>
-This signal is emitted when the contents of the
-handlebox are reattached to the main window.
-</para>
-
-@handlebox: the object which received the signal.
-@widget: the child widget of the handlebox.
-         (this argument provides no extra information
-          and is here only for backwards-compatibility)
-
-<!-- ##### SIGNAL GtkHandleBox::child-detached ##### -->
-<para>
-This signal is emitted when the contents of the
-handlebox are detached from the main window.
-</para>
-
-@handlebox: the object which received the signal.
-@widget: the child widget of the handlebox. 
-         (this argument provides no extra information
-          and is here only for backwards-compatibility)
-
-<!-- ##### ARG GtkHandleBox:handle-position ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkHandleBox:shadow ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkHandleBox:shadow-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkHandleBox:snap-edge ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkHandleBox:snap-edge-set ##### -->
-<para>
-
-</para>
-
@@ -118,6 +118,13 @@ gtk_icon_theme_set_custom_theme().
 </para>


+<!-- ##### SIGNAL GtkIconTheme::changed ##### -->
+<para>
+
+</para>
+
+@icontheme: the object which received the signal.
+
 <!-- ##### ENUM GtkIconLookupFlags ##### -->
 <para>

@@ -389,10 +396,3 @@ gtk_icon_theme_set_custom_theme().
@Returns: 


-<!-- ##### SIGNAL GtkIconTheme::changed ##### -->
-<para>
-
-</para>
-
-@icontheme: the object which received the signal.
-
@@ -108,6 +108,56 @@ below.
 </para>


+<!-- ##### ARG GtkImage:file ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkImage:icon-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkImage:icon-size ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkImage:image ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkImage:mask ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkImage:pixbuf ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkImage:pixbuf-animation ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkImage:pixmap ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkImage:stock ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkImage:storage-type ##### -->
+<para>
+
+</para>
+
 <!-- ##### ENUM GtkImageType ##### -->
 <para>
 Describes the image data representation used by a #GtkImage. If you
@@ -359,53 +409,3 @@ Gets the #GtkImage.
@mask: a #GdkBitmap that indicates which parts of the image should be transparent.


-<!-- ##### ARG GtkImage:file ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:icon-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:icon-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:image ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:mask ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:pixbuf ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:pixbuf-animation ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:pixmap ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:stock ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:storage-type ##### -->
-<para>
-
-</para>
-
@@ -24,6 +24,11 @@ fill in the text label.
 </para>


+<!-- ##### ARG GtkImageMenuItem:image ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_image_menu_item_set_image ##### -->
 <para>

@@ -81,8 +86,3 @@ fill in the text label.
@Returns: 


-<!-- ##### ARG GtkImageMenuItem:image ##### -->
-<para>
-
-</para>
-
@@ -20,6 +20,53 @@ Base class for input method contexts
 </para>


+<!-- ##### SIGNAL GtkIMContext::commit ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL GtkIMContext::delete-surrounding ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+@arg1: 
+@arg2: 
+@Returns: 
+
+<!-- ##### SIGNAL GtkIMContext::preedit-changed ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+
+<!-- ##### SIGNAL GtkIMContext::preedit-end ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+
+<!-- ##### SIGNAL GtkIMContext::preedit-start ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+
+<!-- ##### SIGNAL GtkIMContext::retrieve-surrounding ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+@Returns: 
+
 <!-- ##### FUNCTION gtk_im_context_set_client_window ##### -->
 <para>

@@ -125,50 +172,3 @@ Base class for input method contexts
@Returns: 


-<!-- ##### SIGNAL GtkIMContext::commit ##### -->
-<para>
-
-</para>
-
-@imcontext: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkIMContext::delete-surrounding ##### -->
-<para>
-
-</para>
-
-@imcontext: the object which received the signal.
-@arg1: 
-@arg2: 
-@Returns: 
-
-<!-- ##### SIGNAL GtkIMContext::preedit-changed ##### -->
-<para>
-
-</para>
-
-@imcontext: the object which received the signal.
-
-<!-- ##### SIGNAL GtkIMContext::preedit-end ##### -->
-<para>
-
-</para>
-
-@imcontext: the object which received the signal.
-
-<!-- ##### SIGNAL GtkIMContext::preedit-start ##### -->
-<para>
-
-</para>
-
-@imcontext: the object which received the signal.
-
-<!-- ##### SIGNAL GtkIMContext::retrieve-surrounding ##### -->
-<para>
-
-</para>
-
-@imcontext: the object which received the signal.
-@Returns: 
-
@@ -43,14 +43,6 @@ immediately.
 </para>


-<!-- ##### FUNCTION gtk_input_dialog_new ##### -->
-<para>
-Creates a new #GtkInputDialog.
-</para>
-
-@Returns: the new #GtkInputDialog.
-
-
 <!-- ##### SIGNAL GtkInputDialog::disable-device ##### -->
 <para>
 This signal is emitted when the user changes the 
@@ -71,3 +63,11 @@ mode of a device from #GDK_MODE_DISABLED to a
@inputdialog: the object which received the signal.
@deviceid: The ID of the newly enabled device.

+<!-- ##### FUNCTION gtk_input_dialog_new ##### -->
+<para>
+Creates a new #GtkInputDialog.
+</para>
+
+@Returns: the new #GtkInputDialog.
+
+
@@ -25,6 +25,11 @@ The #GtkInvisible-struct struct contains no public fields.
 </para>


+<!-- ##### ARG GtkInvisible:screen ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_invisible_new ##### -->
 <para>
 </para>
@@ -59,8 +64,3 @@ The #GtkInvisible-struct struct contains no public fields.
@Returns: 


-<!-- ##### ARG GtkInvisible:screen ##### -->
-<para>
-
-</para>
-
@@ -22,6 +22,27 @@ should be accessed using the functions below.
 </para>


+<!-- ##### SIGNAL GtkItem::deselect ##### -->
+<para>
+Emitted when the item is deselected.
+</para>
+
+@item: the object which received the signal.
+
+<!-- ##### SIGNAL GtkItem::select ##### -->
+<para>
+Emitted when the item is selected.
+</para>
+
+@item: the object which received the signal.
+
+<!-- ##### SIGNAL GtkItem::toggle ##### -->
+<para>
+Emitted when the item is toggled.
+</para>
+
+@item: the object which received the signal.
+
 <!-- ##### FUNCTION gtk_item_select ##### -->
 <para>
 Emits the "select" signal on the given item.
@@ -46,24 +67,3 @@ Emits the "toggle" signal on the given item.
@item: a #GtkItem.


-<!-- ##### SIGNAL GtkItem::deselect ##### -->
-<para>
-Emitted when the item is deselected.
-</para>
-
-@item: the object which received the signal.
-
-<!-- ##### SIGNAL GtkItem::select ##### -->
-<para>
-Emitted when the item is selected.
-</para>
-
-@item: the object which received the signal.
-
-<!-- ##### SIGNAL GtkItem::toggle ##### -->
-<para>
-Emitted when the item is toggled.
-</para>
-
-@item: the object which received the signal.
-
@@ -145,6 +145,91 @@ described below.
 </para>


+<!-- ##### SIGNAL GtkLabel::copy-clipboard ##### -->
+<para>
+
+</para>
+
+@label: the object which received the signal.
+
+<!-- ##### SIGNAL GtkLabel::move-cursor ##### -->
+<para>
+
+</para>
+
+@label: the object which received the signal.
+@arg1: 
+@arg2: 
+@arg3: 
+
+<!-- ##### SIGNAL GtkLabel::populate-popup ##### -->
+<para>
+
+</para>
+
+@label: the object which received the signal.
+@arg1: 
+
+<!-- ##### ARG GtkLabel:attributes ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:cursor-position ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:justify ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:label ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:mnemonic-keyval ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:mnemonic-widget ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:pattern ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:selectable ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:selection-bound ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:use-markup ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:use-underline ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:wrap ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_label_new ##### -->
 <para>

@@ -446,88 +531,3 @@ Gtk+ 1.0.x.
@setting: 


-<!-- ##### SIGNAL GtkLabel::copy-clipboard ##### -->
-<para>
-
-</para>
-
-@label: the object which received the signal.
-
-<!-- ##### SIGNAL GtkLabel::move-cursor ##### -->
-<para>
-
-</para>
-
-@label: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-<!-- ##### SIGNAL GtkLabel::populate-popup ##### -->
-<para>
-
-</para>
-
-@label: the object which received the signal.
-@arg1: 
-
-<!-- ##### ARG GtkLabel:attributes ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLabel:cursor-position ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLabel:justify ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLabel:label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLabel:mnemonic-keyval ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLabel:mnemonic-widget ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLabel:pattern ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLabel:selectable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLabel:selection-bound ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLabel:use-markup ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLabel:use-underline ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLabel:wrap ##### -->
-<para>
-
-</para>
-
@@ -34,6 +34,45 @@ area.

@bin_window: 

+<!-- ##### SIGNAL GtkLayout::set-scroll-adjustments ##### -->
+<para>
+
+</para>
+
+@layout: the object which received the signal.
+@arg1: 
+@arg2: 
+
+<!-- ##### ARG GtkLayout:hadjustment ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLayout:height ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLayout:vadjustment ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLayout:width ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLayout:x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLayout:y ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_layout_new ##### -->
 <para>

@@ -142,42 +181,3 @@ area.
@adjustment: 


-<!-- ##### SIGNAL GtkLayout::set-scroll-adjustments ##### -->
-<para>
-
-</para>
-
-@layout: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### ARG GtkLayout:hadjustment ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLayout:height ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLayout:vadjustment ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLayout:width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLayout:x ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLayout:y ##### -->
-<para>
-
-</para>
-
@@ -35,6 +35,34 @@ type.</para></listitem>
 </para>


+<!-- ##### SIGNAL GtkList::select-child ##### -->
+<para>
+The child @widget has just been selected.
+</para>
+
+@list: the object which received the signal.
+@widget: the newly selected child.
+
+<!-- ##### SIGNAL GtkList::selection-changed ##### -->
+<para>
+The selection of the widget has just changed.
+</para>
+
+@list: the object which received the signal.
+
+<!-- ##### SIGNAL GtkList::unselect-child ##### -->
+<para>
+The child @widget has just been unselected.
+</para>
+
+@list: the object which received the signal.
+@widget: the newly unselected child.
+
+<!-- ##### ARG GtkList:selection-mode ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_list_new ##### -->
 <para>
 Creates a new #GtkList.
@@ -332,31 +360,3 @@ effect if a drag selection is not active.
@list: the list widget.


-<!-- ##### SIGNAL GtkList::select-child ##### -->
-<para>
-The child @widget has just been selected.
-</para>
-
-@list: the object which received the signal.
-@widget: the newly selected child.
-
-<!-- ##### SIGNAL GtkList::selection-changed ##### -->
-<para>
-The selection of the widget has just changed.
-</para>
-
-@list: the object which received the signal.
-
-<!-- ##### SIGNAL GtkList::unselect-child ##### -->
-<para>
-The child @widget has just been unselected.
-</para>
-
-@list: the object which received the signal.
-@widget: the newly unselected child.
-
-<!-- ##### ARG GtkList:selection-mode ##### -->
-<para>
-
-</para>
-
@@ -30,42 +30,6 @@ only be accessed using the functions below.
 </para>


-<!-- ##### FUNCTION gtk_list_item_new ##### -->
-<para>
-Creates a new #GtkListitem.
-</para>
-
-@Returns: a new #GtkListItem.
-
-
-<!-- ##### FUNCTION gtk_list_item_new_with_label ##### -->
-<para>
-Creates a new #GtkListItem with a child label containing the given string.
-</para>
-
-@label: the string to use for the child label.
-@Returns: a new #GtkListItem with a child #GtkLabel with the text set to
-@label.
-
-
-<!-- ##### FUNCTION gtk_list_item_select ##### -->
-<para>
-Selects the item, by emitting the item's "select" signal.
-Depending on the selection mode of the list, this may cause other items to
-be deselected.
-</para>
-
-@list_item: a #GtkListItem.
-
-
-<!-- ##### FUNCTION gtk_list_item_deselect ##### -->
-<para>
-Deselects the item, by emitting the item's "deselect" signal.
-</para>
-
-@list_item: a #GtkListItem.
-
-
 <!-- ##### SIGNAL GtkListItem::end-selection ##### -->
 <para>

@@ -143,3 +107,39 @@ Deselects the item, by emitting the item's "deselect" signal.

@listitem: the object which received the signal.

+<!-- ##### FUNCTION gtk_list_item_new ##### -->
+<para>
+Creates a new #GtkListitem.
+</para>
+
+@Returns: a new #GtkListItem.
+
+
+<!-- ##### FUNCTION gtk_list_item_new_with_label ##### -->
+<para>
+Creates a new #GtkListItem with a child label containing the given string.
+</para>
+
+@label: the string to use for the child label.
+@Returns: a new #GtkListItem with a child #GtkLabel with the text set to
+@label.
+
+
+<!-- ##### FUNCTION gtk_list_item_select ##### -->
+<para>
+Selects the item, by emitting the item's "select" signal.
+Depending on the selection mode of the list, this may cause other items to
+be deselected.
+</para>
+
+@list_item: a #GtkListItem.
+
+
+<!-- ##### FUNCTION gtk_list_item_deselect ##### -->
+<para>
+Deselects the item, by emitting the item's "deselect" signal.
+</para>
+
+@list_item: a #GtkListItem.
+
+
@@ -562,7 +562,7 @@ on a file descriptor.
@destroy: callback function to call with @data when the input
  handler is removed, or %NULL.
@Returns: A unique id for the event source; to be used with gtk_input_remove().
-@Deprecated: Use g_io_watch_full() instead.
+@Deprecated: Use g_io_add_watch_full() instead.


 <!-- ##### FUNCTION gtk_input_remove ##### -->
@@ -83,6 +83,54 @@ should be accessed using the functions below.
 </para>


+<!-- ##### SIGNAL GtkMenu::move-scroll ##### -->
+<para>
+
+</para>
+
+@menu: the object which received the signal.
+@arg1: 
+
+<!-- ##### ARG GtkMenu:tearoff-title ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenu:bottom-attach ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenu:left-attach ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenu:right-attach ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenu:top-attach ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenu:horizontal-offset ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenu:vertical-offset ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenu:vertical-padding ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_menu_new ##### -->
 <para>
 Creates a new #GtkMenu.
@@ -340,51 +388,12 @@ will be called when the menu is later detached from the widget.
@menu: the #GtkMenu being detached.


-<!-- ##### SIGNAL GtkMenu::move-scroll ##### -->
+<!-- ##### FUNCTION gtk_menu_set_monitor ##### -->
 <para>

 </para>

-@menu: the object which received the signal.
-@arg1: 
+@menu: 
+@monitor_num: 

-<!-- ##### ARG GtkMenu:tearoff-title ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMenu:bottom-attach ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMenu:left-attach ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMenu:right-attach ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMenu:top-attach ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMenu:horizontal-offset ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMenu:vertical-offset ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMenu:vertical-padding ##### -->
-<para>
-
-</para>

@@ -20,6 +20,16 @@ The #GtkMenuBar struct contains the following fields. (These fields should be co
 </para>


+<!-- ##### ARG GtkMenuBar:internal-padding ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenuBar:shadow-type ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_menu_bar_new ##### -->
 <para>
 Creates the new #GtkMenuBar
@@ -64,13 +74,3 @@ Adds a new #GtkMenuItem to the GtkMenuBar at the position defined by @position
@position: the position in the item list where the @child is added.


-<!-- ##### ARG GtkMenuBar:internal-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMenuBar:shadow-type ##### -->
-<para>
-
-</para>
-
@@ -39,6 +39,57 @@ only a few are really useful.
 </para>


+<!-- ##### SIGNAL GtkMenuItem::activate ##### -->
+<para>
+Emitted when the item is activated.
+</para>
+
+@menuitem: the object which received the signal.
+
+<!-- ##### SIGNAL GtkMenuItem::activate-item ##### -->
+<para>
+Emitted when the item is activated, but also if the menu item has a
+submenu. For normal applications, the relevant signal is "activate".
+</para>
+
+@menuitem: the object which received the signal.
+
+<!-- ##### SIGNAL GtkMenuItem::toggle-size-allocate ##### -->
+<para>
+
+</para>
+
+@menuitem: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL GtkMenuItem::toggle-size-request ##### -->
+<para>
+
+</para>
+
+@menuitem: the object which received the signal.
+@arg1: 
+
+<!-- ##### ARG GtkMenuItem:arrow-spacing ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenuItem:horizontal-padding ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenuItem:selected-shadow-type ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenuItem:toggle-spacing ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_menu_item_new ##### -->
 <para>
 Creates a new #GtkMenuItem.
@@ -170,54 +221,3 @@ Sets the menu item to be right-justified. Only useful for menu bars.
@Returns: 


-<!-- ##### SIGNAL GtkMenuItem::activate ##### -->
-<para>
-Emitted when the item is activated.
-</para>
-
-@menuitem: the object which received the signal.
-
-<!-- ##### SIGNAL GtkMenuItem::activate-item ##### -->
-<para>
-Emitted when the item is activated, but also if the menu item has a
-submenu. For normal applications, the relevant signal is "activate".
-</para>
-
-@menuitem: the object which received the signal.
-
-<!-- ##### SIGNAL GtkMenuItem::toggle-size-allocate ##### -->
-<para>
-
-</para>
-
-@menuitem: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkMenuItem::toggle-size-request ##### -->
-<para>
-
-</para>
-
-@menuitem: the object which received the signal.
-@arg1: 
-
-<!-- ##### ARG GtkMenuItem:arrow-spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMenuItem:horizontal-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMenuItem:selected-shadow-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMenuItem:toggle-spacing ##### -->
-<para>
-
-</para>
-
@@ -41,6 +41,55 @@ an application.)
 </para>


+<!-- ##### SIGNAL GtkMenuShell::activate-current ##### -->
+<para>
+An action signal that activates the current menu item within the menu
+shell.
+</para>
+
+@menushell: the object which received the signal.
+@force_hide: if TRUE, hide the menu after activating the menu item.
+
+<!-- ##### SIGNAL GtkMenuShell::cancel ##### -->
+<para>
+An action signal which cancels the selection within the menu shell.
+Causes the GtkMenuShell::selection-done signal to be emitted.
+</para>
+
+@menushell: the object which received the signal.
+
+<!-- ##### SIGNAL GtkMenuShell::cycle-focus ##### -->
+<para>
+
+</para>
+
+@menushell: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL GtkMenuShell::deactivate ##### -->
+<para>
+This signal is emitted when a menu shell is deactivated.
+</para>
+
+@menushell: the object which received the signal.
+
+<!-- ##### SIGNAL GtkMenuShell::move-current ##### -->
+<para>
+An action signal which moves the current menu item in the direction 
+specified by @direction.
+</para>
+
+@menushell: the object which received the signal.
+@direction: the direction to move.
+
+<!-- ##### SIGNAL GtkMenuShell::selection-done ##### -->
+<para>
+This signal is emitted when a selection has been completed within a menu
+shell.
+</para>
+
+@menushell: the object which received the signal.
+
 <!-- ##### FUNCTION gtk_menu_shell_append ##### -->
 <para>
 Adds a new #GtkMenuItem to the end of the menu shell's item list.
@@ -117,6 +166,14 @@ Activates the menu item within the menu shell.
 after the menu item is activated.


+<!-- ##### FUNCTION gtk_menu_shell_cancel ##### -->
+<para>
+
+</para>
+
+@menu_shell: 
+
+
 <!-- ##### ENUM GtkMenuDirectionType ##### -->
 <para>
 An enumeration representing directional movements within a menu.
@@ -153,52 +210,3 @@ An enumeration representing directional movements within a menu.
@GTK_MENU_DIR_NEXT: 
@GTK_MENU_DIR_PREV: 

-<!-- ##### SIGNAL GtkMenuShell::activate-current ##### -->
-<para>
-An action signal that activates the current menu item within the menu
-shell.
-</para>
-
-@menushell: the object which received the signal.
-@force_hide: if TRUE, hide the menu after activating the menu item.
-
-<!-- ##### SIGNAL GtkMenuShell::cancel ##### -->
-<para>
-An action signal which cancels the selection within the menu shell.
-Causes the GtkMenuShell::selection-done signal to be emitted.
-</para>
-
-@menushell: the object which received the signal.
-
-<!-- ##### SIGNAL GtkMenuShell::cycle-focus ##### -->
-<para>
-
-</para>
-
-@menushell: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkMenuShell::deactivate ##### -->
-<para>
-This signal is emitted when a menu shell is deactivated.
-</para>
-
-@menushell: the object which received the signal.
-
-<!-- ##### SIGNAL GtkMenuShell::move-current ##### -->
-<para>
-An action signal which moves the current menu item in the direction 
-specified by @direction.
-</para>
-
-@menushell: the object which received the signal.
-@direction: the direction to move.
-
-<!-- ##### SIGNAL GtkMenuShell::selection-done ##### -->
-<para>
-This signal is emitted when a selection has been completed within a menu
-shell.
-</para>
-
-@menushell: the object which received the signal.
-
@@ -64,6 +64,21 @@ You might do a non-modal #GtkMessageDialog as follows:
 </para>


+<!-- ##### ARG GtkMessageDialog:buttons ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMessageDialog:message-type ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMessageDialog:message-border ##### -->
+<para>
+
+</para>
+
 <!-- ##### ENUM GtkMessageType ##### -->
 <para>
 The type of message being displayed in the dialog.
@@ -116,18 +131,12 @@ then call gtk_dialog_add_buttons().
@Returns: 


-<!-- ##### ARG GtkMessageDialog:buttons ##### -->
+<!-- ##### FUNCTION gtk_message_dialog_set_markup ##### -->
 <para>

 </para>

-<!-- ##### ARG GtkMessageDialog:message-type ##### -->
-<para>
+@message_dialog: 
+@str: 

-</para>
-
-<!-- ##### ARG GtkMessageDialog:message-border ##### -->
-<para>
-
-</para>

@@ -60,6 +60,26 @@ in pixels.</entry>
 </para>


+<!-- ##### ARG GtkMisc:xalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMisc:xpad ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMisc:yalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMisc:ypad ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_misc_set_alignment ##### -->
 <para>
 Sets the alignment of the widget.
@@ -102,23 +122,3 @@ in pixels.
@ypad: 


-<!-- ##### ARG GtkMisc:xalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMisc:xpad ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMisc:yalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMisc:ypad ##### -->
-<para>
-
-</para>
-
@@ -36,6 +36,151 @@ will be a popup menu allowing the users to switch pages.
 </para>


+<!-- ##### SIGNAL GtkNotebook::change-current-page ##### -->
+<para>
+
+</para>
+
+@notebook: the object which received the signal.
+@arg1: 
+<!-- # Unused Parameters # -->
+@Returns: 
+
+<!-- ##### SIGNAL GtkNotebook::focus-tab ##### -->
+<para>
+
+</para>
+
+@notebook: the object which received the signal.
+@arg1: 
+@Returns: 
+
+<!-- ##### SIGNAL GtkNotebook::move-focus-out ##### -->
+<para>
+
+</para>
+
+@notebook: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL GtkNotebook::select-page ##### -->
+<para>
+
+</para>
+
+@notebook: the object which received the signal.
+@arg1: 
+@Returns: 
+
+<!-- ##### SIGNAL GtkNotebook::switch-page ##### -->
+<para>
+Emitted when the user or a function changes the current page.
+</para>
+
+@notebook: the object which received the signal.
+@page: the new current page
+@page_num: the index of the page
+
+<!-- ##### ARG GtkNotebook:enable-popup ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:homogeneous ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:page ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:scrollable ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:show-border ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:show-tabs ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:tab-border ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:tab-hborder ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:tab-pos ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:tab-vborder ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:menu-label ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:position ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:tab-expand ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:tab-fill ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:tab-label ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:tab-pack ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:has-backward-stepper ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:has-forward-stepper ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:has-secondary-backward-stepper ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:has-secondary-forward-stepper ##### -->
+<para>
+
+</para>
+
 <!-- ##### STRUCT GtkNotebookPage ##### -->
 <para>
 The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
@@ -56,6 +201,7 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
@notebook: 
@child: 
@tab_label: 
+@Returns: 


 <!-- ##### FUNCTION gtk_notebook_append_page_menu ##### -->
@@ -66,6 +212,7 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
@child: 
@tab_label: 
@menu_label: 
+@Returns: 


 <!-- ##### FUNCTION gtk_notebook_prepend_page ##### -->
@@ -75,6 +222,7 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
@notebook: 
@child: the
@tab_label: 
+@Returns: 


 <!-- ##### FUNCTION gtk_notebook_prepend_page_menu ##### -->
@@ -85,6 +233,7 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
@child: 
@tab_label: 
@menu_label: 
+@Returns: 


 <!-- ##### FUNCTION gtk_notebook_insert_page ##### -->
@@ -95,6 +244,7 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
@child: 
@tab_label: 
@position: 
+@Returns: 


 <!-- ##### FUNCTION gtk_notebook_insert_page_menu ##### -->
@@ -106,6 +256,7 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
@tab_label: 
@menu_label: 
@position: 
+@Returns: 


 <!-- ##### FUNCTION gtk_notebook_remove_page ##### -->
@@ -409,148 +560,3 @@ gtk_notebook_set_current_page() instead.
@page_num: 


-<!-- ##### SIGNAL GtkNotebook::change-current-page ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@arg1: 
-<!-- # Unused Parameters # -->
-@Returns: 
-
-<!-- ##### SIGNAL GtkNotebook::focus-tab ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@arg1: 
-@Returns: 
-
-<!-- ##### SIGNAL GtkNotebook::move-focus-out ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkNotebook::select-page ##### -->
-<para>
-
-</para>
-
-@notebook: the object which received the signal.
-@arg1: 
-@Returns: 
-
-<!-- ##### SIGNAL GtkNotebook::switch-page ##### -->
-<para>
-Emitted when the user or a function changes the current page.
-</para>
-
-@notebook: the object which received the signal.
-@page: the new current page
-@page_num: the index of the page
-
-<!-- ##### ARG GtkNotebook:enable-popup ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:homogeneous ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:page ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:scrollable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:show-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:show-tabs ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-hborder ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-pos ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-vborder ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:menu-label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:position ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-expand ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-fill ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-pack ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:has-backward-stepper ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:has-forward-stepper ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:has-secondary-backward-stepper ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:has-secondary-forward-stepper ##### -->
-<para>
-
-</para>
-
@@ -98,6 +98,20 @@ The object itself.  You should never use these members directly -
 </para>


+<!-- ##### SIGNAL GtkObject::destroy ##### -->
+<para>
+Signals that all holders of a reference to the #GtkObject should release
+the reference that they hold. May result in finalization of the object
+if all references are released.
+</para>
+
+@object: the object which received the signal.
+
+<!-- ##### ARG GtkObject:user-data ##### -->
+<para>
+
+</para>
+
 <!-- ##### MACRO GTK_OBJECT_TYPE ##### -->
 <para>
 Gets the type of an object.
@@ -497,17 +511,3 @@ Useless deprecated macro. Ignore it.



-<!-- ##### SIGNAL GtkObject::destroy ##### -->
-<para>
-Signals that all holders of a reference to the #GtkObject should release
-the reference that they hold. May result in finalization of the object
-if all references are released.
-</para>
-
-@object: the object which received the signal.
-
-<!-- ##### ARG GtkObject:user-data ##### -->
-<para>
-
-</para>
-
@@ -24,33 +24,6 @@ Base class for text-editing widgets
@selection_end_pos: 
@has_selection: 

-<!-- ##### USER_FUNCTION GtkTextFunction ##### -->
-<para>
-
-</para>
-
-@editable: 
-@time_: 
-
-
-<!-- ##### FUNCTION gtk_old_editable_claim_selection ##### -->
-<para>
-
-</para>
-
-@old_editable: 
-@claim: 
-@time_: 
-
-
-<!-- ##### FUNCTION gtk_old_editable_changed ##### -->
-<para>
-
-</para>
-
-@old_editable: 
-
-
 <!-- ##### SIGNAL GtkOldEditable::activate ##### -->
 <para>

@@ -163,3 +136,30 @@ Base class for text-editing widgets

 </para>

+<!-- ##### USER_FUNCTION GtkTextFunction ##### -->
+<para>
+
+</para>
+
+@editable: 
+@time_: 
+
+
+<!-- ##### FUNCTION gtk_old_editable_claim_selection ##### -->
+<para>
+
+</para>
+
+@old_editable: 
+@claim: 
+@time_: 
+
+
+<!-- ##### FUNCTION gtk_old_editable_changed ##### -->
+<para>
+
+</para>
+
+@old_editable: 
+
+
--- a/Show More
+++ b/Show More