[gtkmm] Gdk, Gtk: Regenerate docs.xml and .defs files

[Kjell Ahlstedt <kjellahl src gnome org>]

commit f2c6b531af0a961ed7c01e4b53b1b15b3f30b121
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Mon Nov 20 10:52:03 2017 +0100

    Gdk, Gtk: Regenerate docs.xml and .defs files
    
    and update gtk_docs_override.xml and gtk_vfuncs.defs.

 gdk/src/gdk_docs.xml           |  262 +--------------
 gdk/src/gdk_enums.defs         |    4 +-
 gdk/src/gdk_methods.defs       |  143 ++------
 gtk/src/gtk_docs.xml           |  738 +++++++---------------------------------
 gtk/src/gtk_docs_override.xml  |   84 +++--
 gtk/src/gtk_enums.defs         |   20 +-
 gtk/src/gtk_methods.defs       |  703 +++------------------------------------
 gtk/src/gtk_signals.defs       |   92 +-----
 gtk/src/gtk_signals.defs.patch |   63 ++--
 gtk/src/gtk_vfuncs.defs        |    5 -
 10 files changed, 315 insertions(+), 1799 deletions(-)
---
diff --git a/gdk/src/gdk_docs.xml b/gdk/src/gdk_docs.xml
index 38c50d3..7fd863e 100644
--- a/gdk/src/gdk_docs.xml
+++ b/gdk/src/gdk_docs.xml
@@ -3372,7 +3372,7 @@ Finds or creates an atom corresponding to a given string.
 </parameter>
 <parameter name="only_if_exists">
 <parameter_description> if %TRUE, GDK is allowed to not create a new atom, but
-just return %GDK_NONE if the requested atom doesn’t already
+just return %NULL if the requested atom doesn’t already
 exists. Currently, the flag is ignored, since checking the
 existance of an atom is as expensive as creating it.
 </parameter_description>
@@ -3427,16 +3427,6 @@ return value, you should free it using g_free().
 </return>
 </function>
 
-<function name="gdk_beep">
-<description>
-Emits a short beep on the default display.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="gdk_cairo_draw_from_gl">
 <description>
 This is the main way to draw GL content in GTK+. It takes a render buffer ID 
@@ -5056,8 +5046,8 @@ Since: 3.0
 <function name="gdk_disable_multidevice">
 <description>
 Disables multidevice support in GDK. This call must happen prior
-to gdk_display_open(), gtk_init() or
-gtk_init_check() in order to take effect.
+to gdk_display_open(), gtk_init() or gtk_init_check() in order to
+take effect.
 
 Most common GTK+ applications won’t ever need to call this. Only
 applications that do mixed GDK/Xlib calls could want to disable
@@ -5782,51 +5772,6 @@ be sent.
 </return>
 </function>
 
-<function name="gdk_display_set_double_click_distance">
-<description>
-Sets the double click distance (two clicks within this distance
-count as a double click). See also gdk_display_set_double_click_time().
-Applications should not set this, it is a global 
-user-configured setting.
-
-Since: 2.4
-
-</description>
-<parameters>
-<parameter name="display">
-<parameter_description> a #GdkDisplay
-</parameter_description>
-</parameter>
-<parameter name="distance">
-<parameter_description> distance in pixels
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
-<function name="gdk_display_set_double_click_time">
-<description>
-Sets the double click time (two clicks within this time interval
-count as a double click). Applications should not set this, it is a global
-user-configured setting.
-
-Since: 2.2
-
-</description>
-<parameters>
-<parameter name="display">
-<parameter_description> a #GdkDisplay
-</parameter_description>
-</parameter>
-<parameter name="msec">
-<parameter_description> double click time in milliseconds (thousandths of a second) 
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gdk_display_store_clipboard">
 <description>
 Issues a request to the clipboard manager to store the
@@ -6498,7 +6443,7 @@ Returns the selection atom for the current source window.
 </parameter_description>
 </parameter>
 </parameters>
-<return> the selection atom, or %GDK_NONE
+<return> the selection atom, or %NULL
 </return>
 </function>
 
@@ -6765,79 +6710,6 @@ to a drop initiated by the drag source.
 <return></return>
 </function>
 
-<function name="gdk_error_trap_pop">
-<description>
-Removes an error trap pushed with gdk_error_trap_push().
-May block until an error has been definitively received
-or not received from the X server. gdk_error_trap_pop_ignored()
-is preferred if you don’t need to know whether an error
-occurred, because it never has to block. If you don't
-need the return value of gdk_error_trap_pop(), use
-gdk_error_trap_pop_ignored().
-
-Prior to GDK 3.0, this function would not automatically
-sync for you, so you had to gdk_flush() if your last
-call to Xlib was not a blocking round trip.
-
-
-</description>
-<parameters>
-</parameters>
-<return> X error code or 0 on success
-</return>
-</function>
-
-<function name="gdk_error_trap_pop_ignored">
-<description>
-Removes an error trap pushed with gdk_error_trap_push(), but
-without bothering to wait and see whether an error occurred.  If an
-error arrives later asynchronously that was triggered while the
-trap was pushed, that error will be ignored.
-
-Since: 3.0
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
-<function name="gdk_error_trap_push">
-<description>
-This function allows X errors to be trapped instead of the normal
-behavior of exiting the application. It should only be used if it
-is not possible to avoid the X error in any other way. Errors are
-ignored on all #GdkDisplay currently known to the
-#GdkDisplayManager. If you don’t care which error happens and just
-want to ignore everything, pop with gdk_error_trap_pop_ignored().
-If you need the error code, use gdk_error_trap_pop() which may have
-to block and wait for the error to arrive from the X server.
-
-This API exists on all platforms but only does anything on X.
-
-You can use gdk_x11_display_error_trap_push() to ignore errors
-on only a single display.
-
-## Trapping an X error
-
-|[&lt;!-- language=&quot;C&quot; --&gt;
-gdk_error_trap_push ();
-
-// ... Call the X function which may cause an error here ...
-
-
-if (gdk_error_trap_pop ())
-{
-// ... Handle the error here ...
-}
-]|
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="gdk_event_copy">
 <description>
 Copies a #GdkEvent, copying or incrementing the reference count of the
@@ -8058,18 +7930,6 @@ Checks if any events are ready to be processed for any display.
 </return>
 </function>
 
-<function name="gdk_flush">
-<description>
-Flushes the output buffers of all display connections and waits
-until all requests have been processed.
-This is rarely needed by applications.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="gdk_frame_clock_begin_updating">
 <description>
 Starts updates for an animation. Until a matching call to
@@ -8451,21 +8311,6 @@ Since: 3.8
 <return></return>
 </function>
 
-<function name="gdk_get_program_class">
-<description>
-Gets the program class. Unless the program class has explicitly
-been set with gdk_set_program_class() or with the `--class`
-commandline option, the default value is the program name (determined
-with g_get_prgname()) with the first character converted to uppercase.
-
-
-</description>
-<parameters>
-</parameters>
-<return> the program class.
-</return>
-</function>
-
 <function name="gdk_get_show_events">
 <description>
 Gets whether event debugging output is enabled.
@@ -9712,48 +9557,6 @@ Since: 3.94
 </return>
 </function>
 
-<function name="gdk_notify_startup_complete">
-<description>
-Indicates to the GUI environment that the application has finished
-loading. If the applications opens windows, this function is
-normally called after opening the application’s initial set of
-windows.
-
-GTK+ will call this function automatically after opening the first
-#GtkWindow unless gtk_window_set_auto_startup_notification() is called
-to disable that feature.
-
-Since: 2.2
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
-<function name="gdk_notify_startup_complete_with_id">
-<description>
-Indicates to the GUI environment that the application has
-finished loading, using a given identifier.
-
-GTK+ will call this function automatically for #GtkWindow
-with custom startup-notification identifier unless
-gtk_window_set_auto_startup_notification() is called to
-disable that feature.
-
-Since: 2.12
-
-</description>
-<parameters>
-<parameter name="startup_id">
-<parameter_description> a startup-notification identifier, for which
-notification process should be completed
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gdk_pango_layout_get_clip_region">
 <description>
 Obtains a clip region which contains the areas where the given ranges
@@ -13813,7 +13616,7 @@ Deletes a property from a window.
 <description>
 Retrieves a portion of the contents of a property. If the
 property does not exist, then the function returns %FALSE,
-and %GDK_NONE will be stored in @actual_property_type.
+and %NULL will be stored in @actual_property_type.
 
 The XGetWindowProperty() function that gdk_property_get()
 uses has a very confusing and complicated set of semantics.
@@ -13836,7 +13639,7 @@ gdk_property_get() is provided.
 </parameter_description>
 </parameter>
 <parameter name="type">
-<parameter_description> the desired property type, or %GDK_NONE, if any type of data
+<parameter_description> the desired property type, or %NULL, if any type of data
 is acceptable. If this does not match the actual
 type, then @actual_format and @actual_length will
 be filled in, a warning will be printed to stderr
@@ -14586,7 +14389,7 @@ Sends a response to SelectionRequest event.
 </parameter>
 <parameter name="property">
 <parameter_description> property in which the selection owner stored the
-data, or %GDK_NONE to indicate that the request
+data, or %NULL to indicate that the request
 was rejected.
 </parameter_description>
 </parameter>
@@ -14624,7 +14427,7 @@ Since: 2.2
 </parameter>
 <parameter name="property">
 <parameter_description> property in which the selection owner stored the data,
-or %GDK_NONE to indicate that the request was rejected
+or %NULL to indicate that the request was rejected
 </parameter_description>
 </parameter>
 <parameter name="time_">
@@ -14677,43 +14480,6 @@ Since: 3.10
 <return></return>
 </function>
 
-<function name="gdk_set_double_click_time">
-<description>
-Set the double click time for the default display. See
-gdk_display_set_double_click_time(). 
-See also gdk_display_set_double_click_distance().
-Applications should not set this, it is a 
-global user-configured setting.
-
-</description>
-<parameters>
-<parameter name="msec">
-<parameter_description> double click time in milliseconds (thousandths of a second)
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
-<function name="gdk_set_program_class">
-<description>
-Sets the program class. The X11 backend uses the program class to set
-the class name part of the `WM_CLASS` property on
-toplevel windows; see the ICCCM.
-
-The program class can still be overridden with the --class command
-line option.
-
-</description>
-<parameters>
-<parameter name="program_class">
-<parameter_description> a string.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gdk_set_show_events">
 <description>
 Sets whether a trace of received events is output.
@@ -17454,10 +17220,6 @@ Since: 3.90
 <parameter_description> the parent window
 </parameter_description>
 </parameter>
-<parameter name="event_mask">
-<parameter_description> event mask (see gdk_window_set_events())
-</parameter_description>
-</parameter>
 <parameter name="position">
 <parameter_description> placement of the window inside @parent
 </parameter_description>
@@ -17481,10 +17243,6 @@ Since: 3.90
 <parameter_description> the display to create the window on
 </parameter_description>
 </parameter>
-<parameter name="event_mask">
-<parameter_description> event mask (see gdk_window_set_events())
-</parameter_description>
-</parameter>
 <parameter name="position">
 <parameter_description> position of the window on screen
 </parameter_description>
@@ -17529,10 +17287,6 @@ Since: 3.90
 <parameter_description> the display to create the window on
 </parameter_description>
 </parameter>
-<parameter name="event_mask">
-<parameter_description> event mask (see gdk_window_set_events())
-</parameter_description>
-</parameter>
 <parameter name="width">
 <parameter_description> width of new window
 </parameter_description>
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index 3ff5ea5..f22b10d 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -805,7 +805,7 @@
 ;;   GDK_SMOOTH_SCROLL_MASK        = 1 << 23,
 ;;   GDK_TOUCHPAD_GESTURE_MASK     = 1 << 24,
 ;;   GDK_TABLET_PAD_MASK           = 1 << 25,
-;;   GDK_ALL_EVENTS_MASK           = 0xFFFFFE
+;;   GDK_ALL_EVENTS_MASK           = 0x3FFFFFE
 ;; } GdkEventMask;
 
 (define-flags-extended EventMask
@@ -835,7 +835,7 @@
     '("smooth-scroll-mask" "GDK_SMOOTH_SCROLL_MASK" "1 << 23")
     '("touchpad-gesture-mask" "GDK_TOUCHPAD_GESTURE_MASK" "1 << 24")
     '("tablet-pad-mask" "GDK_TABLET_PAD_MASK" "1 << 25")
-    '("all-events-mask" "GDK_ALL_EVENTS_MASK" "0xFFFFFE")
+    '("all-events-mask" "GDK_ALL_EVENTS_MASK" "0x3FFFFFE")
   )
 )
 
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index 428714f..32f5809 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -1207,6 +1207,11 @@
   )
 )
 
+(define-function gdk_disable_multidevice
+  (c-name "gdk_disable_multidevice")
+  (return-type "none")
+)
+
 
 
 ;; From gdkdevicepad.h
@@ -1378,24 +1383,6 @@
   (return-type "gboolean")
 )
 
-(define-method set_double_click_time
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_set_double_click_time")
-  (return-type "none")
-  (parameters
-    '("guint" "msec")
-  )
-)
-
-(define-method set_double_click_distance
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_set_double_click_distance")
-  (return-type "none")
-  (parameters
-    '("guint" "distance")
-  )
-)
-
 (define-function gdk_display_get_default
   (c-name "gdk_display_get_default")
   (return-type "GdkDisplay*")
@@ -1607,6 +1594,14 @@
   )
 )
 
+(define-function gdk_set_allowed_backends
+  (c-name "gdk_set_allowed_backends")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "backends")
+  )
+)
+
 
 
 ;; From gdkdnd.h
@@ -2981,82 +2976,6 @@
 
 
 
-;; From gdkmain.h
-
-(define-function gdk_get_program_class
-  (c-name "gdk_get_program_class")
-  (return-type "const-gchar*")
-)
-
-(define-function gdk_set_program_class
-  (c-name "gdk_set_program_class")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "program_class")
-  )
-)
-
-(define-function gdk_notify_startup_complete
-  (c-name "gdk_notify_startup_complete")
-  (return-type "none")
-)
-
-(define-function gdk_notify_startup_complete_with_id
-  (c-name "gdk_notify_startup_complete_with_id")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "startup_id")
-  )
-)
-
-(define-function gdk_error_trap_push
-  (c-name "gdk_error_trap_push")
-  (return-type "none")
-)
-
-(define-function gdk_error_trap_pop
-  (c-name "gdk_error_trap_pop")
-  (return-type "gint")
-)
-
-(define-function gdk_error_trap_pop_ignored
-  (c-name "gdk_error_trap_pop_ignored")
-  (return-type "none")
-)
-
-(define-function gdk_set_double_click_time
-  (c-name "gdk_set_double_click_time")
-  (return-type "none")
-  (parameters
-    '("guint" "msec")
-  )
-)
-
-(define-function gdk_beep
-  (c-name "gdk_beep")
-  (return-type "none")
-)
-
-(define-function gdk_flush
-  (c-name "gdk_flush")
-  (return-type "none")
-)
-
-(define-function gdk_disable_multidevice
-  (c-name "gdk_disable_multidevice")
-  (return-type "none")
-)
-
-(define-function gdk_set_allowed_backends
-  (c-name "gdk_set_allowed_backends")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "backends")
-  )
-)
-
-
-
 ;; From gdkmonitor.h
 
 (define-function gdk_monitor_get_type
@@ -3389,15 +3308,6 @@
 
 
 
-;; From gdkscreen.h
-
-(define-function gdk_screen_get_type
-  (c-name "gdk_screen_get_type")
-  (return-type "GType")
-)
-
-
-
 ;; From gdkseat.h
 
 (define-function gdk_seat_get_type
@@ -3550,6 +3460,26 @@
   )
 )
 
+(define-function gdk_selection_clear_targets
+  (c-name "gdk_selection_clear_targets")
+  (return-type "none")
+  (parameters
+    '("GdkDisplay*" "display")
+    '("GdkAtom" "selection")
+  )
+)
+
+(define-function gdk_selection_add_targets
+  (c-name "gdk_selection_add_targets")
+  (return-type "none")
+  (parameters
+    '("GdkWindow*" "window")
+    '("GdkAtom" "selection")
+    '("GdkAtom*" "targets")
+    '("guint" "n_targets")
+  )
+)
+
 
 
 ;; From gdktexture.h
@@ -3798,7 +3728,6 @@
   (return-type "GdkWindow*")
   (parameters
     '("GdkDisplay*" "display")
-    '("gint" "event_mask")
     '("int" "width")
     '("int" "height")
   )
@@ -3809,7 +3738,6 @@
   (return-type "GdkWindow*")
   (parameters
     '("GdkDisplay*" "display")
-    '("gint" "event_mask")
     '("const-GdkRectangle*" "position")
   )
 )
@@ -3827,7 +3755,6 @@
   (c-name "gdk_window_new_child")
   (return-type "GdkWindow*")
   (parameters
-    '("gint" "event_mask")
     '("const-GdkRectangle*" "position")
   )
 )
@@ -4933,10 +4860,6 @@
 
 
 
-;; From gdkx.h
-
-
-
 ;; From keyname-table.h
 
 
diff --git a/gtk/src/gtk_docs.xml b/gtk/src/gtk_docs.xml
index 0d723d9..c003878 100644
--- a/gtk/src/gtk_docs.xml
+++ b/gtk/src/gtk_docs.xml
@@ -3603,6 +3603,24 @@ This signal has no default bindings.
 <return></return>
 </signal>
 
+<signal name="GtkEntry::insert-emoji">
+<description>
+The ::insert-emoji signal is a
+[keybinding signal][GtkBindingSignal]
+which gets emitted to present the Emoji chooser for the entry.
+
+The default bindings for this signal are Ctrl-. and Ctrl-;
+
+</description>
+<parameters>
+<parameter name="entry">
+<parameter_description> the object which received the signal
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</signal>
+
 <signal name="GtkEntry::move-cursor">
 <description>
 The ::move-cursor signal is a
@@ -6314,36 +6332,23 @@ text direction. Since 3.14.
 
 <enum name="GtkIconSize">
 <description>
-Built-in stock icon sizes.
+Built-in icon sizes.
+
+Icon sizes default to being inherited. Where they cannot be
+inherited, text size is the default.
 
 </description>
 <parameters>
-<parameter name="GTK_ICON_SIZE_INVALID">
-<parameter_description> Invalid size.
-</parameter_description>
-</parameter>
-<parameter name="GTK_ICON_SIZE_MENU">
-<parameter_description> Size appropriate for menus (16px).
-</parameter_description>
-</parameter>
-<parameter name="GTK_ICON_SIZE_SMALL_TOOLBAR">
-<parameter_description> Size appropriate for small toolbars (16px).
-</parameter_description>
-</parameter>
-<parameter name="GTK_ICON_SIZE_LARGE_TOOLBAR">
-<parameter_description> Size appropriate for large toolbars (24px)
-</parameter_description>
-</parameter>
-<parameter name="GTK_ICON_SIZE_BUTTON">
-<parameter_description> Size appropriate for buttons (16px)
+<parameter name="GTK_ICON_SIZE_INHERIT">
+<parameter_description> Keep the size of the parent element
 </parameter_description>
 </parameter>
-<parameter name="GTK_ICON_SIZE_DND">
-<parameter_description> Size appropriate for drag and drop (32px)
+<parameter name="GTK_ICON_SIZE_NORMAL">
+<parameter_description> Size similar to text size
 </parameter_description>
 </parameter>
-<parameter name="GTK_ICON_SIZE_DIALOG">
-<parameter_description> Size appropriate for dialogs (48px)
+<parameter name="GTK_ICON_SIZE_LARGE">
+<parameter_description> Large size, for example in an icon view
 </parameter_description>
 </parameter>
 </parameters>
@@ -13765,36 +13770,6 @@ what case it is in.
 </parameters>
 </enum>
 
-<signal name="GtkTextTag::event">
-<description>
-The ::event signal is emitted when an event occurs on a region of the
-buffer marked with this tag.
-
-
-</description>
-<parameters>
-<parameter name="tag">
-<parameter_description> the #GtkTextTag on which the signal is emitted
-</parameter_description>
-</parameter>
-<parameter name="object">
-<parameter_description> the object the event was fired from (typically a #GtkTextView)
-</parameter_description>
-</parameter>
-<parameter name="event">
-<parameter_description> the event which triggered the signal
-</parameter_description>
-</parameter>
-<parameter name="iter">
-<parameter_description> a #GtkTextIter pointing at the location the event occurred
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE to stop other handlers from being invoked for the
-event. %FALSE to propagate the event further.
-</return>
-</signal>
-
 <property name="GtkTextTag:accumulative-margin">
 <description>
 Whether the margins accumulate or override each other.
@@ -14699,29 +14674,6 @@ Since: 2.20
 </description>
 </property>
 
-<property name="GtkToolPalette:icon-size">
-<description>
-The size of the icons in a tool palette. When this property is set,
-it overrides the default setting.
-
-This should only be used for special-purpose tool palettes, normal
-application tool palettes should respect the user preferences for the
-size of icons.
-
-Since: 2.20
-
-</description>
-</property>
-
-<property name="GtkToolPalette:icon-size-set">
-<description>
-Is %TRUE if the #GtkToolPalette:icon-size property has been set.
-
-Since: 2.20
-
-</description>
-</property>
-
 <property name="GtkToolPalette:toolbar-style">
 <description>
 The style of items in the tool palette.
@@ -14840,30 +14792,6 @@ Emitted when the style of the toolbar changes.
 <return></return>
 </signal>
 
-<property name="GtkToolbar:icon-size">
-<description>
-The size of the icons in a toolbar is normally determined by
-the toolbar-icon-size setting. When this property is set, it 
-overrides the setting. 
-
-This should only be used for special-purpose toolbars, normal
-application toolbars should respect the user preferences for the
-size of icons.
-
-Since: 2.10
-
-</description>
-</property>
-
-<property name="GtkToolbar:icon-size-set">
-<description>
-Is %TRUE if the icon-size property has been set.
-
-Since: 2.10
-
-</description>
-</property>
-
 <enum name="GtkToolbarStyle">
 <description>
 Used to customize the appearance of a #GtkToolbar. Note that
@@ -15905,11 +15833,6 @@ gtk_drag_finish (context, FALSE, FALSE, time);
 <parameter_description> the received data
 </parameter_description>
 </parameter>
-<parameter name="info">
-<parameter_description> the info that has been registered with the target in the
-#GtkTargetList
-</parameter_description>
-</parameter>
 <parameter name="time">
 <parameter_description> the timestamp at which the data was received
 </parameter_description>
@@ -16081,7 +16004,7 @@ gtk_drag_highlight (widget);
 }
 
 target = gtk_drag_dest_find_target (widget, context, NULL);
-if (target == GDK_NONE)
+if (target == NULL)
 gdk_drag_status (context, 0, time);
 else
 {
@@ -24284,10 +24207,6 @@ Since: 3.10
 <parameter_description> an icon name or %NULL
 </parameter_description>
 </parameter>
-<parameter name="size">
-<parameter_description> an icon size (#GtkIconSize)
-</parameter_description>
-</parameter>
 </parameters>
 <return> a new #GtkButton displaying the themed icon
 
@@ -28687,7 +28606,7 @@ Since: 2.2
 Returns the clipboard object for the given selection.
 Cut/copy/paste menu items and keyboard shortcuts should use
 the default clipboard, returned by passing %GDK_SELECTION_CLIPBOARD for @selection.
-(%GDK_NONE is supported as a synonym for GDK_SELECTION_CLIPBOARD
+(%NULL is supported as a synonym for GDK_SELECTION_CLIPBOARD
 for backwards compatibility reasons.)
 The currently-selected object or text should be provided on the clipboard
 identified by #GDK_SELECTION_PRIMARY. Cut/copy/paste menu items
@@ -28695,7 +28614,7 @@ conceptually copy the contents of the #GDK_SELECTION_PRIMARY clipboard
 to the default clipboard, i.e. they copy the selection to what the
 user sees as the clipboard.
 
-(Passing #GDK_NONE is the same as using `gdk_atom_intern
+(Passing #NULL is the same as using `gdk_atom_intern
 (&quot;CLIPBOARD&quot;, FALSE)`.
 
 See the
@@ -28979,8 +28898,8 @@ Since: 2.6
 </parameter_description>
 </parameter>
 <parameter name="targets">
-<parameter_description> array containing
-information about which forms should be stored or %NULL
+<parameter_description> The targets (data formats) in which the
+functions can provide the data or %NULL
 to indicate that all forms should be stored.
 </parameter_description>
 </parameter>
@@ -29077,12 +28996,8 @@ to call to get the actual data when it is requested.
 </parameter_description>
 </parameter>
 <parameter name="targets">
-<parameter_description> array containing information
-about the available forms for the clipboard data
-</parameter_description>
-</parameter>
-<parameter name="n_targets">
-<parameter_description> number of elements in @targets
+<parameter_description> The targets (data formats) in which the
+functions can provide the data
 </parameter_description>
 </parameter>
 <parameter name="get_func">
@@ -29124,12 +29039,8 @@ in.
 </parameter_description>
 </parameter>
 <parameter name="targets">
-<parameter_description> array containing information
-about the available forms for the clipboard data
-</parameter_description>
-</parameter>
-<parameter name="n_targets">
-<parameter_description> number of elements in @targets
+<parameter_description> The targets (data formats) in which the
+functions can provide the data
 </parameter_description>
 </parameter>
 <parameter name="get_func">
@@ -32411,7 +32322,7 @@ Since: 2.6
 <description>
 Looks for a match between the supported targets of @context and the
 @dest_target_list, returning the first matching target, otherwise
-returning %GDK_NONE. @dest_target_list should usually be the return
+returning %NULL. @dest_target_list should usually be the return
 value from gtk_drag_dest_get_target_list(), but some widgets may
 have different valid targets for different parts of the widget; in
 that case, they will have to implement a drag_motion handler that
@@ -32435,7 +32346,7 @@ gtk_drag_dest_get_target_list (@widget).
 </parameter>
 </parameters>
 <return> first target that the source offers
-and the dest can accept, or %GDK_NONE
+and the dest can accept, or %NULL
 </return>
 </function>
 
@@ -32529,16 +32440,11 @@ gdk_drag_status (context, GDK_ACTION_MOVE, time);
 </parameter_description>
 </parameter>
 <parameter name="targets">
-<parameter_description> a pointer to an array of
-#GtkTargetEntrys indicating the drop types that this @widget will
+<parameter_description> the drop types that this @widget will
 accept, or %NULL. Later you can access the list with
 gtk_drag_dest_get_target_list() and gtk_drag_dest_find_target().
 </parameter_description>
 </parameter>
-<parameter name="n_targets">
-<parameter_description> the number of entries in @targets
-</parameter_description>
-</parameter>
 <parameter name="actions">
 <parameter_description> a bitmask of possible actions for a drop onto this @widget.
 </parameter_description>
@@ -32947,12 +32853,8 @@ clicks and drags on the widget. The widget must have a window.
 </parameter_description>
 </parameter>
 <parameter name="targets">
-<parameter_description> the table of targets
-that the drag will support, may be %NULL
-</parameter_description>
-</parameter>
-<parameter name="n_targets">
-<parameter_description> the number of items in @targets
+<parameter_description> the targets that the drag will support,
+may be %NULL
 </parameter_description>
 </parameter>
 <parameter name="actions">
@@ -43446,37 +43348,6 @@ Since: 2.14
 </return>
 </function>
 
-<function name="gtk_icon_size_lookup">
-<description>
-Obtains the pixel size of a semantic icon size @size:
-#GTK_ICON_SIZE_MENU, #GTK_ICON_SIZE_BUTTON, etc.  This function
-isn’t normally needed, gtk_icon_theme_load_icon() is the usual
-way to get an icon for rendering, then just look at the size of
-the rendered pixbuf. The rendered pixbuf may not even correspond to
-the width/height returned by gtk_icon_size_lookup(), because themes
-are free to render the pixbuf however they like, including changing
-the usual size.
-
-
-</description>
-<parameters>
-<parameter name="size">
-<parameter_description> an icon size (#GtkIconSize)
-</parameter_description>
-</parameter>
-<parameter name="width">
-<parameter_description> location to store icon width
-</parameter_description>
-</parameter>
-<parameter name="height">
-<parameter_description> location to store icon height
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if @size was a valid size
-</return>
-</function>
-
 <function name="gtk_icon_theme_add_resource_path">
 <description>
 Adds a resource path that will be looked at when looking
@@ -44318,12 +44189,7 @@ Since: 2.8
 </parameter_description>
 </parameter>
 <parameter name="targets">
-<parameter_description> the table of targets that the drag will
-support
-</parameter_description>
-</parameter>
-<parameter name="n_targets">
-<parameter_description> the number of items in @targets
+<parameter_description> the targets that the drag will support
 </parameter_description>
 </parameter>
 <parameter name="actions">
@@ -44353,12 +44219,7 @@ Since: 2.8
 </parameter_description>
 </parameter>
 <parameter name="targets">
-<parameter_description> the table of targets that the drag will
-support
-</parameter_description>
-</parameter>
-<parameter name="n_targets">
-<parameter_description> the number of items in @targets
+<parameter_description> the targets that the drag will support
 </parameter_description>
 </parameter>
 <parameter name="actions">
@@ -46155,6 +46016,10 @@ The storage type of the image must be %GTK_IMAGE_EMPTY or
 The caller of this function does not own a reference to the
 returned #GIcon.
 
+Note: This function was changed in 3.94 not to use out parameters
+anymore, but return the GIcon directly. See gtk_image_get_icon_size()
+for a way to get the icon size.
+
 Since: 2.14
 
 </description>
@@ -46163,18 +46028,10 @@ Since: 2.14
 <parameter_description> a #GtkImage
 </parameter_description>
 </parameter>
-<parameter name="gicon">
-<parameter_description> place to store a
-#GIcon, or %NULL
-</parameter_description>
-</parameter>
-<parameter name="size">
-<parameter_description> place to store an icon size
-(#GtkIconSize), or %NULL
-</parameter_description>
-</parameter>
 </parameters>
-<return></return>
+<return> a #GIcon, or %NULL
+
+</return>
 </function>
 
 <function name="gtk_image_get_icon_name">
@@ -46185,6 +46042,10 @@ The storage type of the image must be %GTK_IMAGE_EMPTY or
 The returned string is owned by the #GtkImage and should not
 be freed.
 
+Note: This function was changed in 3.94 not to use out parameters
+anymore, but return the icon name directly. See gtk_image_get_icon_size()
+for a way to get the icon size.
+
 Since: 2.6
 
 </description>
@@ -46193,18 +46054,28 @@ Since: 2.6
 <parameter_description> a #GtkImage
 </parameter_description>
 </parameter>
-<parameter name="icon_name">
-<parameter_description> place to store an
-icon name, or %NULL
-</parameter_description>
-</parameter>
-<parameter name="size">
-<parameter_description> place to store an icon size
-(#GtkIconSize), or %NULL
+</parameters>
+<return> the icon name, or %NULL
+
+</return>
+</function>
+
+<function name="gtk_image_get_icon_size">
+<description>
+Gets the icon size used by the @image when rendering icons.
+
+Since: 3.90
+
+</description>
+<parameters>
+<parameter name="image">
+<parameter_description> a #GtkImage
 </parameter_description>
 </parameter>
 </parameters>
-<return></return>
+<return> the image size used by icons
+
+</return>
 </function>
 
 <function name="gtk_image_get_pixel_size">
@@ -46334,6 +46205,10 @@ If the icon name isn’t known, a “broken image” icon will be
 displayed instead.  If the current icon theme is changed, the icon
 will be updated appropriately.
 
+Note: Before 3.94, this function was taking an extra icon size
+argument. See gtk_image_set_icon_size() for another way to set
+the icon size.
+
 Since: 2.14
 
 </description>
@@ -46342,10 +46217,6 @@ Since: 2.14
 <parameter_description> an icon
 </parameter_description>
 </parameter>
-<parameter name="size">
-<parameter_description> a stock icon size (#GtkIconSize)
-</parameter_description>
-</parameter>
 </parameters>
 <return> a new #GtkImage displaying the themed icon
 
@@ -46359,6 +46230,10 @@ If the icon name isn’t known, a “broken image” icon will be
 displayed instead.  If the current icon theme is changed, the icon
 will be updated appropriately.
 
+Note: Before 3.94, this function was taking an extra icon size
+argument. See gtk_image_set_icon_size() for another way to set
+the icon size.
+
 Since: 2.6
 
 </description>
@@ -46367,10 +46242,6 @@ Since: 2.6
 <parameter_description> an icon name or %NULL
 </parameter_description>
 </parameter>
-<parameter name="size">
-<parameter_description> a stock icon size (#GtkIconSize)
-</parameter_description>
-</parameter>
 </parameters>
 <return> a new #GtkImage displaying the themed icon
 
@@ -46475,6 +46346,10 @@ See gtk_image_new_from_file() for details.
 <description>
 See gtk_image_new_from_gicon() for details.
 
+Note: Before 3.94, this function was taking an extra icon size
+argument. See gtk_image_set_icon_size() for another way to set
+the icon size.
+
 Since: 2.14
 
 </description>
@@ -46487,10 +46362,6 @@ Since: 2.14
 <parameter_description> an icon
 </parameter_description>
 </parameter>
-<parameter name="size">
-<parameter_description> an icon size (#GtkIconSize)
-</parameter_description>
-</parameter>
 </parameters>
 <return></return>
 </function>
@@ -46499,6 +46370,10 @@ Since: 2.14
 <description>
 See gtk_image_new_from_icon_name() for details.
 
+Note: Before 3.94, this function was taking an extra icon size
+argument. See gtk_image_set_icon_size() for another way to set
+the icon size.
+
 Since: 2.6
 
 </description>
@@ -46511,10 +46386,6 @@ Since: 2.6
 <parameter_description> an icon name or %NULL
 </parameter_description>
 </parameter>
-<parameter name="size">
-<parameter_description> an icon size (#GtkIconSize)
-</parameter_description>
-</parameter>
 </parameters>
 <return></return>
 </function>
@@ -46599,6 +46470,26 @@ Since: 3.94
 <return></return>
 </function>
 
+<function name="gtk_image_set_icon_size">
+<description>
+Suggests an icon size to the theme for named icons.
+
+Since: 3.94
+
+</description>
+<parameters>
+<parameter name="image">
+<parameter_description> a #GtkImage
+</parameter_description>
+</parameter>
+<parameter name="icon_size">
+<parameter_description> the new icon size
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_image_set_pixel_size">
 <description>
 Sets the pixel size to use for named icons. If the pixel size is set
@@ -51746,7 +51637,7 @@ Since: 3.94
 <parameter_description> a #GtkMenu
 </parameter_description>
 </parameter>
-<parameter name="screen">
+<parameter name="display">
 <parameter_description> a #GdkDisplay, or %NULL if the display should be
 determined by the widget the menu is attached to
 </parameter_description>
@@ -53792,7 +53683,6 @@ GdkDragContext   *context,
 gint              x,
 gint              y,
 GtkSelectionData *data,
-guint             info,
 guint             time,
 gpointer          user_data)
 {
@@ -65530,10 +65420,6 @@ Since: 2.12
 
 </description>
 <parameters>
-<parameter name="size">
-<parameter_description> a stock icon size (#GtkIconSize)
-</parameter_description>
-</parameter>
 <parameter name="min">
 <parameter_description> the minimum value of the scale (usually 0)
 </parameter_description>
@@ -67052,10 +66938,6 @@ given widget and selection.
 <parameter_description> target to add.
 </parameter_description>
 </parameter>
-<parameter name="info">
-<parameter_description> A unsigned integer which will be passed back to the application.
-</parameter_description>
-</parameter>
 </parameters>
 <return></return>
 </function>
@@ -67076,11 +66958,7 @@ for a given widget and selection.
 </parameter_description>
 </parameter>
 <parameter name="targets">
-<parameter_description> a table of targets to add
-</parameter_description>
-</parameter>
-<parameter name="ntargets">
-<parameter_description>  number of entries in @targets
+<parameter_description> the targets to add
 </parameter_description>
 </parameter>
 </parameters>
@@ -71111,63 +70989,6 @@ Since: 3.14
 <return></return>
 </function>
 
-<function name="gtk_target_entry_copy">
-<description>
-Makes a copy of a #GtkTargetEntry and its data.
-
-
-</description>
-<parameters>
-<parameter name="data">
-<parameter_description> a pointer to a #GtkTargetEntry
-</parameter_description>
-</parameter>
-</parameters>
-<return> a pointer to a copy of @data.
-Free with gtk_target_entry_free()
-</return>
-</function>
-
-<function name="gtk_target_entry_free">
-<description>
-Frees a #GtkTargetEntry returned from
-gtk_target_entry_new() or gtk_target_entry_copy().
-
-</description>
-<parameters>
-<parameter name="data">
-<parameter_description> a pointer to a #GtkTargetEntry.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
-<function name="gtk_target_entry_new">
-<description>
-Makes a new #GtkTargetEntry.
-
-
-</description>
-<parameters>
-<parameter name="target">
-<parameter_description> String identifier for target
-</parameter_description>
-</parameter>
-<parameter name="flags">
-<parameter_description> Set of flags, see #GtkTargetFlags
-</parameter_description>
-</parameter>
-<parameter name="info">
-<parameter_description> an ID that will be passed back to the application
-</parameter_description>
-</parameter>
-</parameters>
-<return> a pointer to a new #GtkTargetEntry.
-Free with gtk_target_entry_free()
-</return>
-</function>
-
 <function name="gtk_target_list_add">
 <description>
 Appends another target to a #GtkTargetList.
@@ -71186,10 +71007,6 @@ Appends another target to a #GtkTargetList.
 <parameter_description> the flags for this target
 </parameter_description>
 </parameter>
-<parameter name="info">
-<parameter_description> an ID that will be passed back to the application
-</parameter_description>
-</parameter>
 </parameters>
 <return></return>
 </function>
@@ -71207,10 +71024,6 @@ Since: 2.6
 <parameter_description> a #GtkTargetList
 </parameter_description>
 </parameter>
-<parameter name="info">
-<parameter_description> an ID that will be passed back to the application
-</parameter_description>
-</parameter>
 <parameter name="writable">
 <parameter_description> whether to add only targets for which GTK+ knows
 how to convert a pixbuf into the format
@@ -71235,10 +71048,6 @@ Since: 2.10
 <parameter_description> a #GtkTargetList
 </parameter_description>
 </parameter>
-<parameter name="info">
-<parameter_description> an ID that will be passed back to the application
-</parameter_description>
-</parameter>
 <parameter name="deserializable">
 <parameter_description> if %TRUE, then deserializable rich text formats
 will be added, serializable formats otherwise.
@@ -71287,10 +71096,6 @@ Since: 2.6
 <parameter_description> a #GtkTargetList
 </parameter_description>
 </parameter>
-<parameter name="info">
-<parameter_description> an ID that will be passed back to the application
-</parameter_description>
-</parameter>
 </parameters>
 <return></return>
 </function>
@@ -71331,16 +71136,29 @@ Looks up a given target in a #GtkTargetList.
 <parameter_description> an interned atom representing the target to search for
 </parameter_description>
 </parameter>
-<parameter name="info">
-<parameter_description> a pointer to the location to store
-application info for target, or %NULL
-</parameter_description>
-</parameter>
 </parameters>
 <return> %TRUE if the target was found, otherwise %FALSE
 </return>
 </function>
 
+<function name="gtk_target_list_merge">
+<description>
+Merges all targets from @source into @target.
+
+</description>
+<parameters>
+<parameter name="target">
+<parameter_description> the #GtkTargetList to merge into
+</parameter_description>
+</parameter>
+<parameter name="source">
+<parameter_description> the #GtkTargeList to merge from
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_target_list_new">
 <description>
 Creates a new #GtkTargetList from an array of #GtkTargetEntry.
@@ -71411,52 +71229,6 @@ If the resulting reference count is zero, frees the list.
 <return></return>
 </function>
 
-<function name="gtk_target_table_free">
-<description>
-This function frees a target table as returned by
-gtk_target_table_new_from_list()
-
-Since: 2.10
-
-</description>
-<parameters>
-<parameter name="targets">
-<parameter_description> a #GtkTargetEntry array
-</parameter_description>
-</parameter>
-<parameter name="n_targets">
-<parameter_description> the number of entries in the array
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
-<function name="gtk_target_table_new_from_list">
-<description>
-This function creates an #GtkTargetEntry array that contains the
-same targets as the passed %list. The returned table is newly
-allocated and should be freed using gtk_target_table_free() when no
-longer needed.
-
-Since: 2.10
-
-</description>
-<parameters>
-<parameter name="list">
-<parameter_description> a #GtkTargetList
-</parameter_description>
-</parameter>
-<parameter name="n_targets">
-<parameter_description> return location for the number ot targets in the table
-</parameter_description>
-</parameter>
-</parameters>
-<return> the new table.
-
-</return>
-</function>
-
 <function name="gtk_targets_include_image">
 <description>
 Determines if any of the targets in @targets can be used to
@@ -76531,34 +76303,6 @@ Since: 3.20
 <return></return>
 </function>
 
-<function name="gtk_text_tag_event">
-<description>
-Emits the “event” signal on the #GtkTextTag.
-
-
-</description>
-<parameters>
-<parameter name="tag">
-<parameter_description> a #GtkTextTag
-</parameter_description>
-</parameter>
-<parameter name="event_object">
-<parameter_description> object that received the event, such as a widget
-</parameter_description>
-</parameter>
-<parameter name="event">
-<parameter_description> the event
-</parameter_description>
-</parameter>
-<parameter name="iter">
-<parameter_description> location where the event was received
-</parameter_description>
-</parameter>
-</parameters>
-<return> result of signal emission (whether the event was handled)
-</return>
-</function>
-
 <function name="gtk_text_tag_get_priority">
 <description>
 Get the tag priority.
@@ -78805,27 +78549,6 @@ items.
 </return>
 </function>
 
-<function name="gtk_tool_item_get_icon_size">
-<description>
-Returns the icon size used for @tool_item. Custom subclasses of
-#GtkToolItem should call this function to find out what size icons
-they should use.
-
-Since: 2.4
-
-</description>
-<parameters>
-<parameter name="tool_item">
-<parameter_description> a #GtkToolItem
-</parameter_description>
-</parameter>
-</parameters>
-<return> a #GtkIconSize indicating the icon size
-used for @tool_item
-
-</return>
-</function>
-
 <function name="gtk_tool_item_get_is_important">
 <description>
 Returns whether @tool_item is considered important. See
@@ -79849,25 +79572,6 @@ Since: 2.20
 </return>
 </function>
 
-<function name="gtk_tool_palette_get_icon_size">
-<description>
-Gets the size of icons in the tool palette.
-See gtk_tool_palette_set_icon_size().
-
-Since: 2.20
-
-</description>
-<parameters>
-<parameter name="palette">
-<parameter_description> a #GtkToolPalette
-</parameter_description>
-</parameter>
-</parameters>
-<return> the #GtkIconSize of icons in the tool palette
-
-</return>
-</function>
-
 <function name="gtk_tool_palette_get_style">
 <description>
 Gets the style (icons, text or both) of items in the tool palette.
@@ -79999,27 +79703,6 @@ Since: 2.20
 <return></return>
 </function>
 
-<function name="gtk_tool_palette_set_icon_size">
-<description>
-Sets the size of icons in the tool palette.
-
-Since: 2.20
-
-</description>
-<parameters>
-<parameter name="palette">
-<parameter_description> a #GtkToolPalette
-</parameter_description>
-</parameter>
-<parameter name="icon_size">
-<parameter_description> the #GtkIconSize that icons in the tool
-palette shall have
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_tool_palette_set_style">
 <description>
 Sets the style (text, icons or both) of items in the tool palette.
@@ -80040,23 +79723,6 @@ Since: 2.20
 <return></return>
 </function>
 
-<function name="gtk_tool_palette_unset_icon_size">
-<description>
-Unsets the tool palette icon size set with gtk_tool_palette_set_icon_size(),
-so that user preferences will be used to determine the icon size.
-
-Since: 2.20
-
-</description>
-<parameters>
-<parameter name="palette">
-<parameter_description> a #GtkToolPalette
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_tool_palette_unset_style">
 <description>
 Unsets a toolbar style set with gtk_tool_palette_set_style(),
@@ -80094,25 +79760,6 @@ Since: 2.20
 </return>
 </function>
 
-<function name="gtk_tool_shell_get_icon_size">
-<description>
-Retrieves the icon size for the tool shell. Tool items must not call this
-function directly, but rely on gtk_tool_item_get_icon_size() instead.
-
-Since: 2.14
-
-</description>
-<parameters>
-<parameter name="shell">
-<parameter_description> a #GtkToolShell
-</parameter_description>
-</parameter>
-</parameters>
-<return> the current size (#GtkIconSize) for icons of @shell
-
-</return>
-</function>
-
 <function name="gtk_tool_shell_get_orientation">
 <description>
 Retrieves the current orientation for the tool shell. Tool items must not
@@ -80265,22 +79912,6 @@ Since: 2.4
 </return>
 </function>
 
-<function name="gtk_toolbar_get_icon_size">
-<description>
-Retrieves the icon size for the toolbar. See gtk_toolbar_set_icon_size().
-
-
-</description>
-<parameters>
-<parameter name="toolbar">
-<parameter_description> a #GtkToolbar
-</parameter_description>
-</parameter>
-</parameters>
-<return> the current icon size for the icons on the toolbar.
-</return>
-</function>
-
 <function name="gtk_toolbar_get_item_index">
 <description>
 Returns the position of @item on the toolbar, starting from 0.
@@ -80452,31 +80083,6 @@ Since: 2.4
 <return></return>
 </function>
 
-<function name="gtk_toolbar_set_icon_size">
-<description>
-This function sets the size of stock icons in the toolbar. You
-can call it both before you add the icons and after they’ve been
-added. The size you set will override user preferences for the default
-icon size.
-
-This should only be used for special-purpose toolbars, normal
-application toolbars should respect the user preferences for the
-size of icons.
-
-</description>
-<parameters>
-<parameter name="toolbar">
-<parameter_description> A #GtkToolbar
-</parameter_description>
-</parameter>
-<parameter name="icon_size">
-<parameter_description> The #GtkIconSize that stock icons in the toolbar shall have.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_toolbar_set_show_arrow">
 <description>
 Sets whether to show an overflow menu when @toolbar isn’t allocated enough
@@ -80520,21 +80126,6 @@ Alters the view of @toolbar to display either icons only, text only, or both.
 <return></return>
 </function>
 
-<function name="gtk_toolbar_unset_icon_size">
-<description>
-Unsets toolbar icon size set with gtk_toolbar_set_icon_size(), so that
-user preferences will be used to determine the icon size.
-
-</description>
-<parameters>
-<parameter name="toolbar">
-<parameter_description> a #GtkToolbar
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_toolbar_unset_style">
 <description>
 Unsets a toolbar style set with gtk_toolbar_set_style(), so that
@@ -80615,10 +80206,6 @@ Since: 2.20
 <parameter_description> a #GIcon representing the icon, or %NULL
 </parameter_description>
 </parameter>
-<parameter name="size">
-<parameter_description> a stock icon size (#GtkIconSize)
-</parameter_description>
-</parameter>
 </parameters>
 <return></return>
 </function>
@@ -80641,10 +80228,6 @@ Since: 2.14
 <parameter_description> an icon name, or %NULL
 </parameter_description>
 </parameter>
-<parameter name="size">
-<parameter_description> a stock icon size (#GtkIconSize)
-</parameter_description>
-</parameter>
 </parameters>
 <return></return>
 </function>
@@ -85455,8 +85038,7 @@ this method sets #GtkTreeView:reorderable to %FALSE.
 </parameter_description>
 </parameter>
 <parameter name="targets">
-<parameter_description> the table of targets that
-the drag will support
+<parameter_description> the targets that the drag will support
 </parameter_description>
 </parameter>
 <parameter name="n_targets">
@@ -85488,11 +85070,7 @@ method sets #GtkTreeView:reorderable to %FALSE.
 </parameter_description>
 </parameter>
 <parameter name="targets">
-<parameter_description> the table of targets that the drag will support
-</parameter_description>
-</parameter>
-<parameter name="n_targets">
-<parameter_description> the number of items in @targets
+<parameter_description> the targets that the drag will support
 </parameter_description>
 </parameter>
 <parameter name="actions">
@@ -88920,29 +88498,6 @@ gtk_widget_set_default_direction().
 </return>
 </function>
 
-<function name="gtk_widget_get_device_enabled">
-<description>
-Returns whether @device can interact with @widget and its
-children. See gtk_widget_set_device_enabled().
-
-Since: 3.0
-
-</description>
-<parameters>
-<parameter name="widget">
-<parameter_description> a #GtkWidget
-</parameter_description>
-</parameter>
-<parameter name="device">
-<parameter_description> a #GdkDevice
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE is @device is enabled for @widget
-
-</return>
-</function>
-
 <function name="gtk_widget_get_direction">
 <description>
 Gets the reading direction for a particular widget. See
@@ -92074,35 +91629,6 @@ direction has not been explicitly set by gtk_widget_set_direction().
 <return></return>
 </function>
 
-<function name="gtk_widget_set_device_enabled">
-<description>
-Enables or disables a #GdkDevice to interact with @widget
-and all its children.
-
-It does so by descending through the #GdkWindow hierarchy
-and enabling the same mask that is has for core events
-(i.e. the one that gdk_window_get_events() returns).
-
-Since: 3.0
-
-</description>
-<parameters>
-<parameter name="widget">
-<parameter_description> a #GtkWidget
-</parameter_description>
-</parameter>
-<parameter name="device">
-<parameter_description> a #GdkDevice
-</parameter_description>
-</parameter>
-<parameter name="enabled">
-<parameter_description> whether to enable the device
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_widget_set_direction">
 <description>
 Sets the reading direction on a particular widget. This direction
diff --git a/gtk/src/gtk_docs_override.xml b/gtk/src/gtk_docs_override.xml
index 97935aa..4eaea7f 100644
--- a/gtk/src/gtk_docs_override.xml
+++ b/gtk/src/gtk_docs_override.xml
@@ -51,7 +51,7 @@
 <substitute_enumerator_name from_prefix="GTK_PACK_" to_prefix="Gtk::PackType::" />
 <substitute_enumerator_name from_prefix="GTK_PACK_DIRECTION_" to_prefix="Gtk::PackDirection::" />
 <substitute_enumerator_name from_prefix="GTK_RELIEF_" to_prefix="Gtk::ReliefStyle::" />
-<substitute_enumerator_name from_prefix="GTK_ICON_SIZE_" to_prefix="Gtk::BuiltinIconSize::" />
+<substitute_enumerator_name from_prefix="GTK_ICON_SIZE_" to_prefix="Gtk::IconSize::" />
 <substitute_enumerator_name from_prefix="GTK_BUTTONBOX_" to_prefix="Gtk::ButtonBoxStyle::" />
 <substitute_enumerator_name from_prefix="GTK_CELL_RENDERER_MODE_" to_prefix="Gtk::CellRendererMode::" />
 <substitute_enumerator_name from_prefix="PANGO_ELLIPSIZE_" to_prefix="Pango::EllipsizeMode::" />
@@ -1353,32 +1353,6 @@ Since: 2.6
   </description>
 </function>
 
-<function name="gtk_image_get_icon_name">
-<description>
-Gets the icon name and size being displayed by the #GtkImage.
-The storage type of the image must be %GTK_IMAGE_EMPTY or
-%GTK_IMAGE_ICON_NAME (see gtk_image_get_storage_type()).
-
-Since: 2.6
-
-</description>
-<parameters>
-<parameter name="image">
-<parameter_description> a #GtkImage
-</parameter_description>
-</parameter>
-<parameter name="icon_name">
-<parameter_description> place to store an icon name
-</parameter_description>
-</parameter>
-<parameter name="size">
-<parameter_description> place to store an icon size
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_progress_bar_get_text">
 <description>
 Retrieves the text displayed superimposed on the progress bar,
@@ -1772,4 +1746,60 @@ constructed by the Gtk::Builder instance.
 </return>
 </function>
 
+
+<!-- TODO: Remove this signal description when gtk+'s description contains -->
+<!-- the correct number of parameters (no @info). -->
+<signal name="GtkWidget::selection-get">
+<description>
+
+</description>
+<parameters>
+<parameter name="widget">
+<parameter_description> the object which received the signal.
+</parameter_description>
+</parameter>
+<parameter name="selection_data">
+<parameter_description>
+</parameter_description>
+</parameter>
+<parameter name="time">
+<parameter_description>
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</signal>
+
+<!-- TODO: Remove this signal description when gtk+'s description contains -->
+<!-- the correct number of parameters (no @info). -->
+<signal name="GtkWidget::drag-data-get">
+<description>
+The ::drag-data-get signal is emitted on the drag source when the drop
+site requests the data which is dragged. It is the responsibility of
+the signal handler to fill @selection_data with the data.
+See gtk_selection_data_set() and gtk_selection_data_set_text().
+
+</description>
+<parameters>
+<parameter name="widget">
+<parameter_description> the object which received the signal
+</parameter_description>
+</parameter>
+<parameter name="context">
+<parameter_description> the drag context
+</parameter_description>
+</parameter>
+<parameter name="selection_data">
+<parameter_description> the #GtkSelectionData to be filled with the dragged data
+</parameter_description>
+</parameter>
+<parameter name="time">
+<parameter_description> the timestamp at which the data was requested
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</signal>
+
+
 </root>
diff --git a/gtk/src/gtk_enums.defs b/gtk/src/gtk_enums.defs
index 3b6d4db..c122e37 100644
--- a/gtk/src/gtk_enums.defs
+++ b/gtk/src/gtk_enums.defs
@@ -593,26 +593,18 @@
 ;; Original typedef:
 ;; typedef enum
 ;; {
-;;   GTK_ICON_SIZE_INVALID,
-;;   GTK_ICON_SIZE_MENU,
-;;   GTK_ICON_SIZE_SMALL_TOOLBAR,
-;;   GTK_ICON_SIZE_LARGE_TOOLBAR,
-;;   GTK_ICON_SIZE_BUTTON,
-;;   GTK_ICON_SIZE_DND,
-;;   GTK_ICON_SIZE_DIALOG
+;;   GTK_ICON_SIZE_INHERIT,
+;;   GTK_ICON_SIZE_NORMAL,
+;;   GTK_ICON_SIZE_LARGE
 ;; } GtkIconSize;
 
 (define-enum-extended IconSize
   (in-module "Gtk")
   (c-name "GtkIconSize")
   (values
-    '("invalid" "GTK_ICON_SIZE_INVALID" "0")
-    '("menu" "GTK_ICON_SIZE_MENU" "1")
-    '("small-toolbar" "GTK_ICON_SIZE_SMALL_TOOLBAR" "2")
-    '("large-toolbar" "GTK_ICON_SIZE_LARGE_TOOLBAR" "3")
-    '("button" "GTK_ICON_SIZE_BUTTON" "4")
-    '("dnd" "GTK_ICON_SIZE_DND" "5")
-    '("dialog" "GTK_ICON_SIZE_DIALOG" "6")
+    '("inherit" "GTK_ICON_SIZE_INHERIT" "0")
+    '("normal" "GTK_ICON_SIZE_NORMAL" "1")
+    '("large" "GTK_ICON_SIZE_LARGE" "2")
   )
 )
 
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index 3f63425..ecb4646 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -335,13 +335,6 @@
   (gtype-id "GTK_TYPE_TEXT_CHILD_ANCHOR")
 )
 
-(define-object TextLayout
-  (in-module "Gtk")
-  (parent "GObject")
-  (c-name "GtkTextLayout")
-  (gtype-id "GTK_TYPE_TEXT_LAYOUT")
-)
-
 (define-object TextMark
   (in-module "Gtk")
   (parent "GObject")
@@ -1513,13 +1506,9 @@
   (c-name "GtkIconSize")
   (gtype-id "GTK_TYPE_ICON_SIZE")
   (values
-    '("invalid" "GTK_ICON_SIZE_INVALID")
-    '("menu" "GTK_ICON_SIZE_MENU")
-    '("small-toolbar" "GTK_ICON_SIZE_SMALL_TOOLBAR")
-    '("large-toolbar" "GTK_ICON_SIZE_LARGE_TOOLBAR")
-    '("button" "GTK_ICON_SIZE_BUTTON")
-    '("dnd" "GTK_ICON_SIZE_DND")
-    '("dialog" "GTK_ICON_SIZE_DIALOG")
+    '("inherit" "GTK_ICON_SIZE_INHERIT")
+    '("normal" "GTK_ICON_SIZE_NORMAL")
+    '("large" "GTK_ICON_SIZE_LARGE")
   )
 )
 
@@ -5459,7 +5448,6 @@
   (return-type "GtkWidget*")
   (parameters
     '("const-gchar*" "icon_name")
-    '("GtkIconSize" "size")
   )
 )
 
@@ -7241,8 +7229,7 @@
   (c-name "gtk_clipboard_set_with_data")
   (return-type "gboolean")
   (parameters
-    '("const-GtkTargetEntry*" "targets")
-    '("guint" "n_targets")
+    '("GtkTargetList*" "targets")
     '("GtkClipboardGetFunc" "get_func")
     '("GtkClipboardClearFunc" "clear_func")
     '("gpointer" "user_data")
@@ -7254,8 +7241,7 @@
   (c-name "gtk_clipboard_set_with_owner")
   (return-type "gboolean")
   (parameters
-    '("const-GtkTargetEntry*" "targets")
-    '("guint" "n_targets")
+    '("GtkTargetList*" "targets")
     '("GtkClipboardGetFunc" "get_func")
     '("GtkClipboardClearFunc" "clear_func")
     '("GObject*" "owner")
@@ -7459,8 +7445,7 @@
   (c-name "gtk_clipboard_set_can_store")
   (return-type "none")
   (parameters
-    '("const-GtkTargetEntry*" "targets")
-    '("gint" "n_targets")
+    '("GtkTargetList*" "targets")
   )
 )
 
@@ -8712,8 +8697,7 @@
   (parameters
     '("GtkWidget*" "widget")
     '("GtkDestDefaults" "flags")
-    '("const-GtkTargetEntry*" "targets")
-    '("gint" "n_targets")
+    '("GtkTargetList*" "targets")
     '("GdkDragAction" "actions")
   )
 )
@@ -8804,8 +8788,7 @@
   (parameters
     '("GtkWidget*" "widget")
     '("GdkModifierType" "start_button_mask")
-    '("const-GtkTargetEntry*" "targets")
-    '("gint" "n_targets")
+    '("GtkTargetList*" "targets")
     '("GdkDragAction" "actions")
   )
 )
@@ -12922,16 +12905,6 @@
   )
 )
 
-(define-method lookup
-  (of-object "GtkIconSize")
-  (c-name "gtk_icon_size_lookup")
-  (return-type "gboolean")
-  (parameters
-    '("gint*" "width")
-    '("gint*" "height")
-  )
-)
-
 
 
 ;; From gtkiconview.h
@@ -13326,8 +13299,7 @@
   (return-type "none")
   (parameters
     '("GdkModifierType" "start_button_mask")
-    '("const-GtkTargetEntry*" "targets")
-    '("gint" "n_targets")
+    '("GtkTargetList*" "targets")
     '("GdkDragAction" "actions")
   )
 )
@@ -13337,8 +13309,7 @@
   (c-name "gtk_icon_view_enable_model_drag_dest")
   (return-type "none")
   (parameters
-    '("const-GtkTargetEntry*" "targets")
-    '("gint" "n_targets")
+    '("GtkTargetList*" "targets")
     '("GdkDragAction" "actions")
   )
 )
@@ -13524,7 +13495,6 @@
   (return-type "GtkWidget*")
   (parameters
     '("const-gchar*" "icon_name")
-    '("GtkIconSize" "size")
   )
 )
 
@@ -13533,7 +13503,6 @@
   (return-type "GtkWidget*")
   (parameters
     '("GIcon*" "icon")
-    '("GtkIconSize" "size")
   )
 )
 
@@ -13593,7 +13562,6 @@
   (return-type "none")
   (parameters
     '("const-gchar*" "icon_name")
-    '("GtkIconSize" "size")
   )
 )
 
@@ -13603,7 +13571,6 @@
   (return-type "none")
   (parameters
     '("GIcon*" "icon")
-    '("GtkIconSize" "size")
   )
 )
 
@@ -13625,6 +13592,15 @@
   )
 )
 
+(define-method set_icon_size
+  (of-object "GtkImage")
+  (c-name "gtk_image_set_icon_size")
+  (return-type "none")
+  (parameters
+    '("GtkIconSize" "icon_size")
+  )
+)
+
 (define-method get_storage_type
   (of-object "GtkImage")
   (c-name "gtk_image_get_storage_type")
@@ -13646,21 +13622,13 @@
 (define-method get_icon_name
   (of-object "GtkImage")
   (c-name "gtk_image_get_icon_name")
-  (return-type "none")
-  (parameters
-    '("const-gchar**" "icon_name")
-    '("GtkIconSize*" "size")
-  )
+  (return-type "const-char*")
 )
 
 (define-method get_gicon
   (of-object "GtkImage")
   (c-name "gtk_image_get_gicon")
-  (return-type "none")
-  (parameters
-    '("GIcon**" "gicon")
-    '("GtkIconSize*" "size")
-  )
+  (return-type "GIcon*")
 )
 
 (define-method get_pixel_size
@@ -13669,6 +13637,12 @@
   (return-type "gint")
 )
 
+(define-method get_icon_size
+  (of-object "GtkImage")
+  (c-name "gtk_image_get_icon_size")
+  (return-type "GtkIconSize")
+)
+
 
 
 ;; From gtkimcontext.h
@@ -21832,7 +21806,6 @@
   (is-constructor-of "GtkScaleButton")
   (return-type "GtkWidget*")
   (parameters
-    '("GtkIconSize" "size")
     '("gdouble" "min")
     '("gdouble" "max")
     '("gdouble" "step")
@@ -22531,6 +22504,15 @@
   (return-type "none")
 )
 
+(define-method merge
+  (of-object "GtkTargetList")
+  (c-name "gtk_target_list_merge")
+  (return-type "none")
+  (parameters
+    '("const-GtkTargetList*" "source")
+  )
+)
+
 (define-method add
   (of-object "GtkTargetList")
   (c-name "gtk_target_list_add")
@@ -22538,7 +22520,6 @@
   (parameters
     '("GdkAtom" "target")
     '("guint" "flags")
-    '("guint" "info")
   )
 )
 
@@ -22546,9 +22527,6 @@
   (of-object "GtkTargetList")
   (c-name "gtk_target_list_add_text_targets")
   (return-type "none")
-  (parameters
-    '("guint" "info")
-  )
 )
 
 (define-method add_rich_text_targets
@@ -22556,7 +22534,6 @@
   (c-name "gtk_target_list_add_rich_text_targets")
   (return-type "none")
   (parameters
-    '("guint" "info")
     '("gboolean" "deserializable")
     '("GtkTextBuffer*" "buffer")
   )
@@ -22567,7 +22544,6 @@
   (c-name "gtk_target_list_add_image_targets")
   (return-type "none")
   (parameters
-    '("guint" "info")
     '("gboolean" "writable")
   )
 )
@@ -22576,9 +22552,6 @@
   (of-object "GtkTargetList")
   (c-name "gtk_target_list_add_uri_targets")
   (return-type "none")
-  (parameters
-    '("guint" "info")
-  )
 )
 
 (define-method add_table
@@ -22606,25 +22579,6 @@
   (return-type "gboolean")
   (parameters
     '("GdkAtom" "target")
-    '("guint*" "info")
-  )
-)
-
-(define-function gtk_target_table_new_from_list
-  (c-name "gtk_target_table_new_from_list")
-  (return-type "GtkTargetEntry*")
-  (parameters
-    '("GtkTargetList*" "list")
-    '("gint*" "n_targets")
-  )
-)
-
-(define-function gtk_target_table_free
-  (c-name "gtk_target_table_free")
-  (return-type "none")
-  (parameters
-    '("GtkTargetEntry*" "targets")
-    '("gint" "n_targets")
   )
 )
 
@@ -22656,7 +22610,6 @@
     '("GtkWidget*" "widget")
     '("GdkAtom" "selection")
     '("GdkAtom" "target")
-    '("guint" "info")
   )
 )
 
@@ -22666,8 +22619,7 @@
   (parameters
     '("GtkWidget*" "widget")
     '("GdkAtom" "selection")
-    '("const-GtkTargetEntry*" "targets")
-    '("guint" "ntargets")
+    '("GtkTargetList*" "targets")
   )
 )
 
@@ -22918,34 +22870,6 @@
   (return-type "none")
 )
 
-(define-function gtk_target_entry_get_type
-  (c-name "gtk_target_entry_get_type")
-  (return-type "GType")
-)
-
-(define-function gtk_target_entry_new
-  (c-name "gtk_target_entry_new")
-  (is-constructor-of "GtkTargetEntry")
-  (return-type "GtkTargetEntry*")
-  (parameters
-    '("const-gchar*" "target")
-    '("guint" "flags")
-    '("guint" "info")
-  )
-)
-
-(define-method copy
-  (of-object "GtkTargetEntry")
-  (c-name "gtk_target_entry_copy")
-  (return-type "GtkTargetEntry*")
-)
-
-(define-method free
-  (of-object "GtkTargetEntry")
-  (c-name "gtk_target_entry_free")
-  (return-type "none")
-)
-
 
 
 ;; From gtkseparator.h
@@ -25351,20 +25275,6 @@
 
 
 
-;; From gtktextdisplay.h
-
-(define-method draw
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_draw")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-    '("cairo_t*" "cr")
-  )
-)
-
-
-
 ;; From gtktextiter.h
 
 (define-method get_buffer
@@ -26059,451 +25969,6 @@
 
 
 
-;; From gtktextlayout.h
-
-(define-function gtk_text_layout_get_type
-  (c-name "gtk_text_layout_get_type")
-  (return-type "GType")
-)
-
-(define-function gtk_text_layout_new
-  (c-name "gtk_text_layout_new")
-  (is-constructor-of "GtkTextLayout")
-  (return-type "GtkTextLayout*")
-)
-
-(define-method set_buffer
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_set_buffer")
-  (return-type "none")
-  (parameters
-    '("GtkTextBuffer*" "buffer")
-  )
-)
-
-(define-method get_buffer
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_get_buffer")
-  (return-type "GtkTextBuffer*")
-)
-
-(define-method set_default_style
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_set_default_style")
-  (return-type "none")
-  (parameters
-    '("GtkTextAttributes*" "values")
-  )
-)
-
-(define-method set_contexts
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_set_contexts")
-  (return-type "none")
-  (parameters
-    '("PangoContext*" "ltr_context")
-    '("PangoContext*" "rtl_context")
-  )
-)
-
-(define-method set_cursor_direction
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_set_cursor_direction")
-  (return-type "none")
-  (parameters
-    '("GtkTextDirection" "direction")
-  )
-)
-
-(define-method set_overwrite_mode
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_set_overwrite_mode")
-  (return-type "none")
-  (parameters
-    '("gboolean" "overwrite")
-  )
-)
-
-(define-method set_keyboard_direction
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_set_keyboard_direction")
-  (return-type "none")
-  (parameters
-    '("GtkTextDirection" "keyboard_dir")
-  )
-)
-
-(define-method default_style_changed
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_default_style_changed")
-  (return-type "none")
-)
-
-(define-method set_screen_width
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_set_screen_width")
-  (return-type "none")
-  (parameters
-    '("gint" "width")
-  )
-)
-
-(define-method set_preedit_string
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_set_preedit_string")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "preedit_string")
-    '("PangoAttrList*" "preedit_attrs")
-    '("gint" "cursor_pos")
-  )
-)
-
-(define-method set_cursor_visible
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_set_cursor_visible")
-  (return-type "none")
-  (parameters
-    '("gboolean" "cursor_visible")
-  )
-)
-
-(define-method get_cursor_visible
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_get_cursor_visible")
-  (return-type "gboolean")
-)
-
-(define-method get_size
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_get_size")
-  (return-type "none")
-  (parameters
-    '("gint*" "width")
-    '("gint*" "height")
-  )
-)
-
-(define-method get_lines
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_get_lines")
-  (return-type "GSList*")
-  (parameters
-    '("gint" "top_y")
-    '("gint" "bottom_y")
-    '("gint*" "first_line_y")
-  )
-)
-
-(define-method wrap_loop_start
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_wrap_loop_start")
-  (return-type "none")
-)
-
-(define-method wrap_loop_end
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_wrap_loop_end")
-  (return-type "none")
-)
-
-(define-method get_line_display
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_get_line_display")
-  (return-type "GtkTextLineDisplay*")
-  (parameters
-    '("GtkTextLine*" "line")
-    '("gboolean" "size_only")
-  )
-)
-
-(define-method free_line_display
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_free_line_display")
-  (return-type "none")
-  (parameters
-    '("GtkTextLineDisplay*" "display")
-  )
-)
-
-(define-method get_line_at_y
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_get_line_at_y")
-  (return-type "none")
-  (parameters
-    '("GtkTextIter*" "target_iter")
-    '("gint" "y")
-    '("gint*" "line_top")
-  )
-)
-
-(define-method get_iter_at_pixel
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_get_iter_at_pixel")
-  (return-type "gboolean")
-  (parameters
-    '("GtkTextIter*" "iter")
-    '("gint" "x")
-    '("gint" "y")
-  )
-)
-
-(define-method get_iter_at_position
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_get_iter_at_position")
-  (return-type "gboolean")
-  (parameters
-    '("GtkTextIter*" "iter")
-    '("gint*" "trailing")
-    '("gint" "x")
-    '("gint" "y")
-  )
-)
-
-(define-method invalidate
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_invalidate")
-  (return-type "none")
-  (parameters
-    '("const-GtkTextIter*" "start")
-    '("const-GtkTextIter*" "end")
-  )
-)
-
-(define-method invalidate_cursors
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_invalidate_cursors")
-  (return-type "none")
-  (parameters
-    '("const-GtkTextIter*" "start")
-    '("const-GtkTextIter*" "end")
-  )
-)
-
-(define-method free_line_data
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_free_line_data")
-  (return-type "none")
-  (parameters
-    '("GtkTextLine*" "line")
-    '("GtkTextLineData*" "line_data")
-  )
-)
-
-(define-method is_valid
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_is_valid")
-  (return-type "gboolean")
-)
-
-(define-method validate_yrange
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_validate_yrange")
-  (return-type "none")
-  (parameters
-    '("GtkTextIter*" "anchor_line")
-    '("gint" "y0_")
-    '("gint" "y1_")
-  )
-)
-
-(define-method validate
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_validate")
-  (return-type "none")
-  (parameters
-    '("gint" "max_pixels")
-  )
-)
-
-(define-method wrap
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_wrap")
-  (return-type "GtkTextLineData*")
-  (parameters
-    '("GtkTextLine*" "line")
-    '("GtkTextLineData*" "line_data")
-  )
-)
-
-(define-method changed
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_changed")
-  (return-type "none")
-  (parameters
-    '("gint" "y")
-    '("gint" "old_height")
-    '("gint" "new_height")
-  )
-)
-
-(define-method cursors_changed
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_cursors_changed")
-  (return-type "none")
-  (parameters
-    '("gint" "y")
-    '("gint" "old_height")
-    '("gint" "new_height")
-  )
-)
-
-(define-method get_iter_location
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_get_iter_location")
-  (return-type "none")
-  (parameters
-    '("const-GtkTextIter*" "iter")
-    '("GdkRectangle*" "rect")
-  )
-)
-
-(define-method get_line_yrange
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_get_line_yrange")
-  (return-type "none")
-  (parameters
-    '("const-GtkTextIter*" "iter")
-    '("gint*" "y")
-    '("gint*" "height")
-  )
-)
-
-(define-method get_cursor_locations
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_get_cursor_locations")
-  (return-type "none")
-  (parameters
-    '("GtkTextIter*" "iter")
-    '("GdkRectangle*" "strong_pos")
-    '("GdkRectangle*" "weak_pos")
-  )
-)
-
-(define-method clamp_iter_to_vrange
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_clamp_iter_to_vrange")
-  (return-type "gboolean")
-  (parameters
-    '("GtkTextIter*" "iter")
-    '("gint" "top")
-    '("gint" "bottom")
-  )
-)
-
-(define-method move_iter_to_line_end
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_move_iter_to_line_end")
-  (return-type "gboolean")
-  (parameters
-    '("GtkTextIter*" "iter")
-    '("gint" "direction")
-  )
-)
-
-(define-method move_iter_to_previous_line
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_move_iter_to_previous_line")
-  (return-type "gboolean")
-  (parameters
-    '("GtkTextIter*" "iter")
-  )
-)
-
-(define-method move_iter_to_next_line
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_move_iter_to_next_line")
-  (return-type "gboolean")
-  (parameters
-    '("GtkTextIter*" "iter")
-  )
-)
-
-(define-method move_iter_to_x
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_move_iter_to_x")
-  (return-type "none")
-  (parameters
-    '("GtkTextIter*" "iter")
-    '("gint" "x")
-  )
-)
-
-(define-method move_iter_visually
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_move_iter_visually")
-  (return-type "gboolean")
-  (parameters
-    '("GtkTextIter*" "iter")
-    '("gint" "count")
-  )
-)
-
-(define-method iter_starts_line
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_iter_starts_line")
-  (return-type "gboolean")
-  (parameters
-    '("const-GtkTextIter*" "iter")
-  )
-)
-
-(define-method get_iter_at_line
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_get_iter_at_line")
-  (return-type "none")
-  (parameters
-    '("GtkTextIter*" "iter")
-    '("GtkTextLine*" "line")
-    '("gint" "byte_offset")
-  )
-)
-
-(define-method register_child
-  (of-object "GtkTextChildAnchor")
-  (c-name "gtk_text_child_anchor_register_child")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "child")
-    '("GtkTextLayout*" "layout")
-  )
-)
-
-(define-method unregister_child
-  (of-object "GtkTextChildAnchor")
-  (c-name "gtk_text_child_anchor_unregister_child")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "child")
-  )
-)
-
-(define-method queue_resize
-  (of-object "GtkTextChildAnchor")
-  (c-name "gtk_text_child_anchor_queue_resize")
-  (return-type "none")
-  (parameters
-    '("GtkTextLayout*" "layout")
-  )
-)
-
-(define-function gtk_text_anchored_child_set_layout
-  (c-name "gtk_text_anchored_child_set_layout")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "child")
-    '("GtkTextLayout*" "layout")
-  )
-)
-
-(define-method spew
-  (of-object "GtkTextLayout")
-  (c-name "gtk_text_layout_spew")
-  (return-type "none")
-)
-
-
-
 ;; From gtktextmark.h
 
 (define-function gtk_text_mark_get_type
@@ -26605,17 +26070,6 @@
   )
 )
 
-(define-method event
-  (of-object "GtkTextTag")
-  (c-name "gtk_text_tag_event")
-  (return-type "gboolean")
-  (parameters
-    '("GObject*" "event_object")
-    '("GdkEvent*" "event")
-    '("const-GtkTextIter*" "iter")
-  )
-)
-
 (define-method changed
   (of-object "GtkTextTag")
   (c-name "gtk_text_tag_changed")
@@ -27458,27 +26912,6 @@
   (return-type "none")
 )
 
-(define-method get_icon_size
-  (of-object "GtkToolbar")
-  (c-name "gtk_toolbar_get_icon_size")
-  (return-type "GtkIconSize")
-)
-
-(define-method set_icon_size
-  (of-object "GtkToolbar")
-  (c-name "gtk_toolbar_set_icon_size")
-  (return-type "none")
-  (parameters
-    '("GtkIconSize" "icon_size")
-  )
-)
-
-(define-method unset_icon_size
-  (of-object "GtkToolbar")
-  (c-name "gtk_toolbar_unset_icon_size")
-  (return-type "none")
-)
-
 (define-method get_drop_index
   (of-object "GtkToolbar")
   (c-name "gtk_toolbar_get_drop_index")
@@ -27854,12 +27287,6 @@
   (return-type "PangoEllipsizeMode")
 )
 
-(define-method get_icon_size
-  (of-object "GtkToolItem")
-  (c-name "gtk_tool_item_get_icon_size")
-  (return-type "GtkIconSize")
-)
-
 (define-method get_orientation
   (of-object "GtkToolItem")
   (c-name "gtk_tool_item_get_orientation")
@@ -27999,21 +27426,6 @@
   )
 )
 
-(define-method set_icon_size
-  (of-object "GtkToolPalette")
-  (c-name "gtk_tool_palette_set_icon_size")
-  (return-type "none")
-  (parameters
-    '("GtkIconSize" "icon_size")
-  )
-)
-
-(define-method unset_icon_size
-  (of-object "GtkToolPalette")
-  (c-name "gtk_tool_palette_unset_icon_size")
-  (return-type "none")
-)
-
 (define-method set_style
   (of-object "GtkToolPalette")
   (c-name "gtk_tool_palette_set_style")
@@ -28029,12 +27441,6 @@
   (return-type "none")
 )
 
-(define-method get_icon_size
-  (of-object "GtkToolPalette")
-  (c-name "gtk_tool_palette_get_icon_size")
-  (return-type "GtkIconSize")
-)
-
 (define-method get_style
   (of-object "GtkToolPalette")
   (c-name "gtk_tool_palette_get_style")
@@ -28110,12 +27516,6 @@
   (return-type "GType")
 )
 
-(define-method get_icon_size
-  (of-object "GtkToolShell")
-  (c-name "gtk_tool_shell_get_icon_size")
-  (return-type "GtkIconSize")
-)
-
 (define-method get_orientation
   (of-object "GtkToolShell")
   (c-name "gtk_tool_shell_get_orientation")
@@ -28200,7 +27600,6 @@
   (return-type "none")
   (parameters
     '("const-gchar*" "icon_name")
-    '("GtkIconSize" "size")
   )
 )
 
@@ -28210,7 +27609,6 @@
   (return-type "none")
   (parameters
     '("GIcon*" "gicon")
-    '("GtkIconSize" "size")
   )
 )
 
@@ -30367,8 +29765,7 @@
   (return-type "none")
   (parameters
     '("GdkModifierType" "start_button_mask")
-    '("const-GtkTargetEntry*" "targets")
-    '("gint" "n_targets")
+    '("GtkTargetList*" "targets")
     '("GdkDragAction" "actions")
   )
 )
@@ -30378,8 +29775,7 @@
   (c-name "gtk_tree_view_enable_model_drag_dest")
   (return-type "none")
   (parameters
-    '("const-GtkTargetEntry*" "targets")
-    '("gint" "n_targets")
+    '("GtkTargetList*" "targets")
     '("GdkDragAction" "actions")
   )
 )
@@ -31576,25 +30972,6 @@
   (return-type "double")
 )
 
-(define-method set_device_enabled
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_set_device_enabled")
-  (return-type "none")
-  (parameters
-    '("GdkDevice*" "device")
-    '("gboolean" "enabled")
-  )
-)
-
-(define-method get_device_enabled
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_get_device_enabled")
-  (return-type "gboolean")
-  (parameters
-    '("GdkDevice*" "device")
-  )
-)
-
 (define-method get_toplevel
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_toplevel")
@@ -33069,7 +32446,7 @@
   (c-name "gtk_window_set_icon")
   (return-type "none")
   (parameters
-    '("GdkTexture*" "texture")
+    '("GdkTexture*" "icon")
   )
 )
 
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index 941fd87..13c0fc3 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -2065,17 +2065,7 @@
   (readable #t)
   (writable #t)
   (construct-only #f)
-  (default-value "1")
-)
-
-(define-property stock-detail
-  (of-object "GtkCellRendererPixbuf")
-  (prop-type "GParamString")
-  (docs "Render detail to pass to the theme engine")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-  (default-value "")
+  (default-value "0")
 )
 
 (define-property icon-name
@@ -2219,7 +2209,7 @@
   (readable #t)
   (writable #t)
   (construct-only #f)
-  (default-value "GTK_ICON_SIZE_MENU")
+  (default-value "GTK_ICON_SIZE_INHERIT")
 )
 
 ;; From GtkCenterBox
@@ -2781,6 +2771,12 @@
   )
 )
 
+(define-signal insert-emoji
+  (of-object "GtkEntry")
+  (return-type "void")
+  (flags "Run Last, Action")
+)
+
 (define-property buffer
   (of-object "GtkEntry")
   (prop-type "GParamObject")
@@ -4620,12 +4616,12 @@
 
 (define-property icon-size
   (of-object "GtkImage")
-  (prop-type "GParamInt")
+  (prop-type "GParamEnum")
   (docs "Symbolic size to use for icon set or named icon")
   (readable #t)
   (writable #t)
   (construct-only #f)
-  (default-value "4")
+  (default-value "GTK_ICON_SIZE_INHERIT")
 )
 
 (define-property pixel-size
@@ -7708,16 +7704,6 @@
   (default-value "0")
 )
 
-(define-property size
-  (of-object "GtkScaleButton")
-  (prop-type "GParamEnum")
-  (docs "The icon size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-  (default-value "GTK_ICON_SIZE_SMALL_TOOLBAR")
-)
-
 (define-property adjustment
   (of-object "GtkScaleButton")
   (prop-type "GParamObject")
@@ -9061,12 +9047,12 @@
 
 (define-property icon-size
   (of-object "GtkStackSwitcher")
-  (prop-type "GParamInt")
+  (prop-type "GParamEnum")
   (docs "Symbolic size to use for named icon")
   (readable #t)
   (writable #t)
   (construct-only #f)
-  (default-value "1")
+  (default-value "GTK_ICON_SIZE_INHERIT")
 )
 
 (define-property stack
@@ -9258,26 +9244,6 @@
   (default-value "TRUE")
 )
 
-(define-property icon-size
-  (of-object "GtkToolbar")
-  (prop-type "GParamEnum")
-  (docs "Size of icons in this toolbar")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-  (default-value "GTK_ICON_SIZE_LARGE_TOOLBAR")
-)
-
-(define-property icon-size-set
-  (of-object "GtkToolbar")
-  (prop-type "GParamBoolean")
-  (docs "Whether the icon-size property has been set")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-  (default-value "FALSE")
-)
-
 ;; From GtkToolItem
 
 (define-signal create-menu-proxy
@@ -9375,26 +9341,6 @@
 
 ;; From GtkToolPalette
 
-(define-property icon-size
-  (of-object "GtkToolPalette")
-  (prop-type "GParamEnum")
-  (docs "Size of icons in this tool palette")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-  (default-value "GTK_ICON_SIZE_SMALL_TOOLBAR")
-)
-
-(define-property icon-size-set
-  (of-object "GtkToolPalette")
-  (prop-type "GParamBoolean")
-  (docs "Whether the icon-size property has been set")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-  (default-value "FALSE")
-)
-
 (define-property toolbar-style
   (of-object "GtkToolPalette")
   (prop-type "GParamEnum")
@@ -9659,17 +9605,6 @@
 
 ;; From GtkTextTag
 
-(define-signal event
-  (of-object "GtkTextTag")
-  (return-type "gboolean")
-  (flags "Run Last")
-  (parameters
-    '("GObject*" "p0")
-    '("GdkEvent*" "p1")
-    '("const-GtkTextIter*" "p2")
-  )
-)
-
 (define-property name
   (of-object "GtkTextTag")
   (prop-type "GParamString")
@@ -11768,7 +11703,6 @@
   (parameters
     '("GtkSelectionData*" "p0")
     '("guint" "p1")
-    '("guint" "p2")
   )
 )
 
@@ -11869,7 +11803,6 @@
     '("GdkDragContext*" "p0")
     '("GtkSelectionData*" "p1")
     '("guint" "p2")
-    '("guint" "p3")
   )
 )
 
@@ -11883,7 +11816,6 @@
     '("gint" "p2")
     '("GtkSelectionData*" "p3")
     '("guint" "p4")
-    '("guint" "p5")
   )
 )
 
diff --git a/gtk/src/gtk_signals.defs.patch b/gtk/src/gtk_signals.defs.patch
index 77814e0..8f48a83 100644
--- a/gtk/src/gtk_signals.defs.patch
+++ b/gtk/src/gtk_signals.defs.patch
@@ -1,6 +1,6 @@
---- ./../../gtk/src/gtk_signals.defs.orig      2017-09-11 18:41:47.558112861 +0200
-+++ ./../../gtk/src/gtk_signals.defs   2017-09-11 18:56:32.080452809 +0200
-@@ -2230,11 +2230,11 @@
+--- ./../../gtk/src/gtk_signals.defs.orig      2017-11-20 10:06:38.456060031 +0100
++++ ./../../gtk/src/gtk_signals.defs   2017-11-20 10:06:38.508060018 +0100
+@@ -2229,11 +2229,11 @@
  (define-signal owner-change
    (of-object "GtkClipboard")
    (return-type "void")
@@ -13,7 +13,7 @@
  
  ;; From GtkColorButton
  
-@@ -2288,11 +2288,11 @@
+@@ -2287,11 +2287,11 @@
  (define-signal color-activated
    (of-object "GtkColorChooser")
    (return-type "void")
@@ -26,8 +26,8 @@
  
  (define-property rgba
    (of-object "GtkColorChooser")
-@@ -2354,11 +2354,11 @@
-   )
+@@ -2353,11 +2353,11 @@
+   (flags "Run Last, Action")
  )
  
  (define-signal format-entry-text
@@ -39,7 +39,7 @@
      '("const-gchar*" "p0")
    )
  )
-@@ -2582,11 +2582,11 @@
+@@ -2581,11 +2581,11 @@
    (of-object "GtkCssProvider")
    (return-type "void")
    (flags "Run Last")
@@ -52,7 +52,7 @@
  
  ;; From GtkDialog
  
-@@ -2756,21 +2756,21 @@
+@@ -2746,21 +2746,21 @@
    (of-object "GtkEntry")
    (return-type "void")
    (flags "Run Last")
@@ -74,9 +74,9 @@
    )
  )
  
- (define-property buffer
+ (define-signal preedit-changed
    (of-object "GtkEntry")
-@@ -5720,11 +5720,11 @@
+@@ -5716,11 +5716,11 @@
  (define-signal toggle-size-request
    (of-object "GtkMenuItem")
    (return-type "void")
@@ -89,7 +89,7 @@
  
  (define-signal toggle-size-allocate
    (of-object "GtkMenuItem")
-@@ -6387,11 +6387,11 @@
+@@ -6383,11 +6383,11 @@
  (define-signal open-location
    (of-object "GtkPlacesSidebar")
    (return-type "void")
@@ -102,7 +102,7 @@
  )
  
  (define-signal show-error-message
-@@ -6414,12 +6414,12 @@
+@@ -6410,12 +6410,12 @@
    (of-object "GtkPlacesSidebar")
    (return-type "gint")
    (flags "Run Last")
@@ -117,7 +117,7 @@
  
  (define-signal drag-action-ask
    (of-object "GtkPlacesSidebar")
-@@ -6433,12 +6433,12 @@
+@@ -6429,12 +6429,12 @@
  (define-signal drag-perform-drop
    (of-object "GtkPlacesSidebar")
    (return-type "void")
@@ -132,8 +132,8 @@
  )
  
  (define-signal show-other-locations-with-flags
-@@ -6865,11 +6865,11 @@
-   (flags "Run Last")
+@@ -6880,11 +6880,11 @@
+   )
  )
  
  (define-signal create-custom-widget
@@ -145,7 +145,7 @@
  
  (define-signal update-custom-widget
    (of-object "GtkPrintOperation")
-@@ -7607,11 +7607,11 @@
+@@ -7622,11 +7622,11 @@
  
  ;; From GtkScale
  
@@ -158,7 +158,7 @@
      '("gdouble" "p0")
    )
  )
-@@ -8800,11 +8800,11 @@
+@@ -8814,11 +8814,11 @@
  (define-signal input
    (of-object "GtkSpinButton")
    (return-type "gint")
@@ -171,7 +171,7 @@
  
  (define-signal output
    (of-object "GtkSpinButton")
-@@ -9494,11 +9494,11 @@
+@@ -9465,11 +9465,11 @@
  (define-signal mark-set
    (of-object "GtkTextBuffer")
    (return-type "void")
@@ -184,7 +184,7 @@
  )
  
  (define-signal mark-deleted
-@@ -9514,23 +9514,23 @@
+@@ -9485,23 +9485,23 @@
    (of-object "GtkTextBuffer")
    (return-type "void")
    (flags "Run Last")
@@ -212,20 +212,7 @@
  
  (define-signal begin-user-action
    (of-object "GtkTextBuffer")
-@@ -9639,11 +9639,11 @@
-   (return-type "gboolean")
-   (flags "Run Last")
-   (parameters
-     '("GObject*" "p0")
-     '("GdkEvent*" "p1")
--    '("GtkTextIter*" "p2")
-+    '("const-GtkTextIter*" "p2")
-   )
- )
- 
- (define-property name
-   (of-object "GtkTextTag")
-@@ -10793,11 +10793,11 @@
+@@ -10753,11 +10753,11 @@
    (return-type "void")
    (flags "Run First")
    (parameters
@@ -238,7 +225,7 @@
  
  ;; From GtkTreeSelection
  
-@@ -11417,11 +11417,11 @@
+@@ -11377,11 +11377,11 @@
  (define-signal size-allocate
    (of-object "GtkWidget")
    (return-type "void")
@@ -251,7 +238,7 @@
    )
  )
  
-@@ -11480,20 +11480,20 @@
+@@ -11431,20 +11431,20 @@
    (of-object "GtkWidget")
    (return-type "void")
    (flags "Run First, No Recurse, No Hooks")
@@ -274,7 +261,7 @@
  
  (define-signal mnemonic-activate
    (of-object "GtkWidget")
-@@ -11558,182 +11558,182 @@
+@@ -11509,182 +11509,182 @@
  (define-signal button-press-event
    (of-object "GtkWidget")
    (return-type "gboolean")
@@ -477,7 +464,7 @@
  
  (define-signal selection-received
    (of-object "GtkWidget")
-@@ -11759,20 +11759,20 @@
+@@ -11709,20 +11709,20 @@
  (define-signal proximity-in-event
    (of-object "GtkWidget")
    (return-type "gboolean")
@@ -500,7 +487,7 @@
  
  (define-signal drag-leave
    (of-object "GtkWidget")
-@@ -11874,20 +11874,20 @@
+@@ -11822,20 +11822,20 @@
  (define-signal window-state-event
    (of-object "GtkWidget")
    (return-type "gboolean")
diff --git a/gtk/src/gtk_vfuncs.defs b/gtk/src/gtk_vfuncs.defs
index 702919b..73971fd 100644
--- a/gtk/src/gtk_vfuncs.defs
+++ b/gtk/src/gtk_vfuncs.defs
@@ -403,11 +403,6 @@
 
 ; GtkToolShell
 
-(define-vfunc get_icon_size
-  (of-object "GtkToolShell")
-  (return-type "GtkIconSize")
-)
-
 (define-vfunc get_orientation
   (of-object "GtkToolShell")
   (return-type "GtkOrientation")