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



commit b4ba754d242f11139bd317bea489f7389c5b63e8
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Thu Jul 2 12:39:08 2020 +0200

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

 gdk/src/gdk_docs.xml                      |  140 +---
 gdk/src/gdk_enums.defs                    |   14 +-
 gdk/src/gdk_methods.defs                  |   41 +-
 gtk/src/gtk_docs.xml                      | 1299 ++++++++++++++++++++++-------
 gtk/src/gtk_enums.defs                    |  492 ++++++-----
 gtk/src/gtk_methods.defs                  |  917 +++++++++-----------
 gtk/src/gtk_signals.defs                  |   20 +-
 gtk/src/gtk_vfuncs.defs                   |   36 +-
 tools/extra_defs_gen/generate_defs_gtk.cc |    1 +
 9 files changed, 1687 insertions(+), 1273 deletions(-)
---
diff --git a/gdk/src/gdk_docs.xml b/gdk/src/gdk_docs.xml
index 92ec1b1d..e77cbeee 100644
--- a/gdk/src/gdk_docs.xml
+++ b/gdk/src/gdk_docs.xml
@@ -1187,27 +1187,6 @@ Error enumeration for #GdkGLContext.
 </parameters>
 </enum>
 
-<enum name="GdkGrabOwnership">
-<description>
-Defines how device grabs interact with other devices.
-
-</description>
-<parameters>
-<parameter name="GDK_OWNERSHIP_NONE">
-<parameter_description> All other devices’ events are allowed.
-</parameter_description>
-</parameter>
-<parameter name="GDK_OWNERSHIP_SURFACE">
-<parameter_description> Other devices’ events are blocked for the grab surface.
-</parameter_description>
-</parameter>
-<parameter name="GDK_OWNERSHIP_APPLICATION">
-<parameter_description> Other devices’ events are blocked for the whole application.
-</parameter_description>
-</parameter>
-</parameters>
-</enum>
-
 <enum name="GdkGrabStatus">
 <description>
 Returned by gdk_device_grab() to indicate success or the reason for the
@@ -1309,11 +1288,6 @@ pointer, even if it is something else, such as a trackball.)
 <parameter_description> the device is a stylus of a graphics tablet or similar device.
 </parameter_description>
 </parameter>
-<parameter name="GDK_SOURCE_ERASER">
-<parameter_description> the device is an eraser. Typically, this would be the other end
-of a stylus on a graphics tablet.
-</parameter_description>
-</parameter>
 <parameter name="GDK_SOURCE_CURSOR">
 <parameter_description> the device is a graphics tablet “puck” or similar device.
 </parameter_description>
@@ -1324,23 +1298,21 @@ of a stylus on a graphics tablet.
 </parameter>
 <parameter name="GDK_SOURCE_TOUCHSCREEN">
 <parameter_description> the device is a direct-input touch device, such
-as a touchscreen or tablet. This device type has been added in 3.4.
+as a touchscreen or tablet
 </parameter_description>
 </parameter>
 <parameter name="GDK_SOURCE_TOUCHPAD">
 <parameter_description> the device is an indirect touch device, such
-as a touchpad. This device type has been added in 3.4.
+as a touchpad
 </parameter_description>
 </parameter>
 <parameter name="GDK_SOURCE_TRACKPOINT">
-<parameter_description> the device is a trackpoint. This device type has been
-added in 3.22
+<parameter_description> the device is a trackpoint
 </parameter_description>
 </parameter>
 <parameter name="GDK_SOURCE_TABLET_PAD">
 <parameter_description> the device is a &quot;pad&quot;, a collection of buttons,
-rings and strips found in drawing tablets. This device type has been
-added in 3.22.
+rings and strips found in drawing tablets
 </parameter_description>
 </parameter>
 </parameters>
@@ -5229,26 +5201,6 @@ This is not meaningful for keyboard devices, which don't have a pointer.
 </return>
 </function>
 
-<function name="gdk_device_get_last_event_surface">
-<description>
-Gets information about which surface the given pointer device is in, based on events
-that have been received so far from the display server. If another application
-has a pointer grab, or this application has a grab with owner_events = %FALSE,
-%NULL may be returned even if the pointer is physically over one of this
-application's surfaces.
-
-
-</description>
-<parameters>
-<parameter name="device">
-<parameter_description> a #GdkDevice, with a source other than %GDK_SOURCE_KEYBOARD
-</parameter_description>
-</parameter>
-</parameters>
-<return> the last surface the device
-</return>
-</function>
-
 <function name="gdk_device_get_modifier_state">
 <description>
 Retrieves the current modifier state of the keyboard,
@@ -7417,6 +7369,22 @@ Extract the event surface relative x/y coordinates from an event.
 <return></return>
 </function>
 
+<function name="gdk_event_get_seat">
+<description>
+Returns the seat that originated the event.
+
+
+</description>
+<parameters>
+<parameter name="event">
+<parameter_description> a #GdkEvent
+</parameter_description>
+</parameter>
+</parameters>
+<return> a #GdkSeat.
+</return>
+</function>
+
 <function name="gdk_event_get_source_device">
 <description>
 This function returns the physical #GdkDevice that has triggered
@@ -14518,36 +14486,6 @@ capabilities. This object is owned by GTK and must not be freed.
 </return>
 </function>
 
-<function name="gdk_seat_get_logical_pointers">
-<description>
-Returns all logical pointers with the given capabilities driven by
-this @seat.
-
-On most windowing system backends this function will return a list
-with a single element (meaning that all input devices drive the same
-on-screen cursor).
-
-In other windowing systems where there can possibly be multiple
-foci (e.g. Wayland), this function will return all logical #GdkDevices
-that represent these.
-
-
-</description>
-<parameters>
-<parameter name="seat">
-<parameter_description> The #GdkSeat
-</parameter_description>
-</parameter>
-<parameter name="capabilities">
-<parameter_description> Queried capabilities
-</parameter_description>
-</parameter>
-</parameters>
-<return> A list
-of logical pointing devices
-</return>
-</function>
-
 <function name="gdk_seat_get_physical_devices">
 <description>
 Returns the physical devices that match the given capabilities.
@@ -15094,23 +15032,6 @@ a configure event will be sent to the toplevel surface.
 </return>
 </function>
 
-<function name="gdk_surface_get_support_multidevice">
-<description>
-Returns %TRUE if the surface is aware of the existence of multiple
-devices.
-
-
-</description>
-<parameters>
-<parameter name="surface">
-<parameter_description> a #GdkSurface.
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if the surface handles multidevice features.
-</return>
-</function>
-
 <function name="gdk_surface_get_width">
 <description>
 Returns the width of the given @surface.
@@ -15446,27 +15367,6 @@ to create toplevel surfaces.
 <return></return>
 </function>
 
-<function name="gdk_surface_set_support_multidevice">
-<description>
-This function will enable multidevice features in @surface.
-
-Multidevice aware surfaces will need to handle properly multiple,
-per device enter/leave events, device grabs and grab ownerships.
-
-</description>
-<parameters>
-<parameter name="surface">
-<parameter_description> a #GdkSurface.
-</parameter_description>
-</parameter>
-<parameter name="support_multidevice">
-<parameter_description> %TRUE to enable multidevice support in @surface.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gdk_surface_thaw_updates">
 <description>
 Thaws a surface frozen with gdk_surface_freeze_updates(). Note that this
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index ea601d51..75847fd9 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -5,7 +5,6 @@
 ;; {
 ;;   GDK_SOURCE_MOUSE,
 ;;   GDK_SOURCE_PEN,
-;;   GDK_SOURCE_ERASER,
 ;;   GDK_SOURCE_CURSOR,
 ;;   GDK_SOURCE_KEYBOARD,
 ;;   GDK_SOURCE_TOUCHSCREEN,
@@ -20,13 +19,12 @@
   (values
     '("mouse" "GDK_SOURCE_MOUSE" "0")
     '("pen" "GDK_SOURCE_PEN" "1")
-    '("eraser" "GDK_SOURCE_ERASER" "2")
-    '("cursor" "GDK_SOURCE_CURSOR" "3")
-    '("keyboard" "GDK_SOURCE_KEYBOARD" "4")
-    '("touchscreen" "GDK_SOURCE_TOUCHSCREEN" "5")
-    '("touchpad" "GDK_SOURCE_TOUCHPAD" "6")
-    '("trackpoint" "GDK_SOURCE_TRACKPOINT" "7")
-    '("tablet-pad" "GDK_SOURCE_TABLET_PAD" "8")
+    '("cursor" "GDK_SOURCE_CURSOR" "2")
+    '("keyboard" "GDK_SOURCE_KEYBOARD" "3")
+    '("touchscreen" "GDK_SOURCE_TOUCHSCREEN" "4")
+    '("touchpad" "GDK_SOURCE_TOUCHPAD" "5")
+    '("trackpoint" "GDK_SOURCE_TRACKPOINT" "6")
+    '("tablet-pad" "GDK_SOURCE_TABLET_PAD" "7")
   )
 )
 
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index 196b24b7..2bd03193 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -16,7 +16,6 @@
   (values
     '("mouse" "GDK_SOURCE_MOUSE")
     '("pen" "GDK_SOURCE_PEN")
-    '("eraser" "GDK_SOURCE_ERASER")
     '("cursor" "GDK_SOURCE_CURSOR")
     '("keyboard" "GDK_SOURCE_KEYBOARD")
     '("touchscreen" "GDK_SOURCE_TOUCHSCREEN")
@@ -1497,12 +1496,6 @@
   (return-type "GdkDeviceType")
 )
 
-(define-method get_last_event_surface
-  (of-object "GdkDevice")
-  (c-name "gdk_device_get_last_event_surface")
-  (return-type "GdkSurface*")
-)
-
 (define-method get_vendor_id
   (of-object "GdkDevice")
   (c-name "gdk_device_get_vendor_id")
@@ -2209,6 +2202,12 @@
   (return-type "GdkSurface*")
 )
 
+(define-method get_seat
+  (of-object "GdkEvent")
+  (c-name "gdk_event_get_seat")
+  (return-type "GdkSeat*")
+)
+
 (define-method get_device
   (of-object "GdkEvent")
   (c-name "gdk_event_get_device")
@@ -3601,15 +3600,6 @@
   (return-type "GdkDevice*")
 )
 
-(define-method get_logical_pointers
-  (of-object "GdkSeat")
-  (c-name "gdk_seat_get_logical_pointers")
-  (return-type "GList*")
-  (parameters
-    '("GdkSeatCapabilities" "capabilities")
-  )
-)
-
 
 
 ;; From gdksnapshot.h
@@ -3791,21 +3781,6 @@
   (return-type "none")
 )
 
-(define-method set_support_multidevice
-  (of-object "GdkSurface")
-  (c-name "gdk_surface_set_support_multidevice")
-  (return-type "none")
-  (parameters
-    '("gboolean" "support_multidevice")
-  )
-)
-
-(define-method get_support_multidevice
-  (of-object "GdkSurface")
-  (c-name "gdk_surface_get_support_multidevice")
-  (return-type "gboolean")
-)
-
 (define-method get_frame_clock
   (of-object "GdkSurface")
   (c-name "gdk_surface_get_frame_clock")
@@ -4280,10 +4255,6 @@
 
 
 
-;; From keyname-table.h
-
-
-
 ;; From gdkconfig.h
 
 
diff --git a/gtk/src/gtk_docs.xml b/gtk/src/gtk_docs.xml
index 9891a10a..a759b964 100644
--- a/gtk/src/gtk_docs.xml
+++ b/gtk/src/gtk_docs.xml
@@ -10572,13 +10572,6 @@ Name of the property used for lookups
 </description>
 </property>
 
-<property name="GtkPropertySelection:model">
-<description>
-The list managed by this selection
-
-</description>
-</property>
-
 <signal name="GtkRadioButton::group-changed">
 <description>
 Emitted when the group of radio buttons that a radio button belongs
@@ -12529,18 +12522,12 @@ Describes the type of order that a #GtkSorter may describe.
 </description>
 <parameters>
 <parameter name="GTK_SORTER_ORDER_PARTIAL">
-<parameter_description> A partial order. And #GtkOrdering is possible.
-</parameter_description>
-</parameter>
-<parameter name="GTK_SORTER_ORDER_INVALID">
-<parameter_description> An invalid order. gtk_sorter_compare() will
-always return %GTK_ORDERING_INVALID if both items are unequal.
+<parameter_description> A partial order. Any #GtkOrdering is possible.
 </parameter_description>
 </parameter>
 <parameter name="GTK_SORTER_ORDER_NONE">
 <parameter_description> No order, all elements are considered equal.
-gtk_sorter_compare() will only return %GTK_ORDERING_EQUAL or
-%GTK_ORDERING_INVALID.
+gtk_sorter_compare() will only return %GTK_ORDERING_EQUAL.
 </parameter_description>
 </parameter>
 <parameter name="GTK_SORTER_ORDER_TOTAL">
@@ -15509,32 +15496,6 @@ of a widget changes.
 <return></return>
 </signal>
 
-<signal name="GtkWidget::grab-notify">
-<description>
-The ::grab-notify signal is emitted when a widget becomes
-shadowed by a GTK+ grab (not a pointer or keyboard grab) on
-another widget, or when it becomes unshadowed due to a grab
-being removed.
-
-A widget is shadowed by a gtk_grab_add() when the topmost
-grab widget in the grab stack of its window group is not
-its ancestor.
-
-</description>
-<parameters>
-<parameter name="widget">
-<parameter_description> the object which received the signal
-</parameter_description>
-</parameter>
-<parameter name="was_grabbed">
-<parameter_description> %FALSE if the widget becomes shadowed, %TRUE
-if it becomes unshadowed
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</signal>
-
 <signal name="GtkWidget::hide">
 <description>
 The ::hide signal is emitted when @widget is hidden, for example with
@@ -20020,6 +19981,691 @@ Creates a new #GtkBinLayout instance.
 </return>
 </function>
 
+<function name="gtk_bitset_add">
+<description>
+Adds @value to @self if it wasn't part of it before.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> value to add
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if @value was not part of @self and @self
+was changed.
+</return>
+</function>
+
+<function name="gtk_bitset_add_range">
+<description>
+Adds all values from @start (inclusive) to @start + @n_items
+(exclusive) in @self.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="start">
+<parameter_description> first value to add
+</parameter_description>
+</parameter>
+<parameter name="n_items">
+<parameter_description> number of consecutive values to add
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bitset_add_range_closed">
+<description>
+Adds the closed range [@first, @last], so @first, @last and all
+values inbetween. @first must be smaller than @last.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="first">
+<parameter_description> first value to add
+</parameter_description>
+</parameter>
+<parameter name="last">
+<parameter_description> last value to add
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bitset_add_rectangle">
+<description>
+Interprets the values as a 2-dimensional boolean grid with the given @stride
+and inside that grid, adds a rectangle with the given @width and @height.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="start">
+<parameter_description> first value to add
+</parameter_description>
+</parameter>
+<parameter name="width">
+<parameter_description> width of the rectangle
+</parameter_description>
+</parameter>
+<parameter name="height">
+<parameter_description> height of the rectangle
+</parameter_description>
+</parameter>
+<parameter name="stride">
+<parameter_description> row stride of the grid
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bitset_contains">
+<description>
+Checks if the given @value has been added to @bitset
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> the value to check
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if @self contains @value
+</return>
+</function>
+
+<function name="gtk_bitset_copy">
+<description>
+Creates a copy of @self.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+</parameters>
+<return> A new bitset that contains the same
+values as @self
+</return>
+</function>
+
+<function name="gtk_bitset_difference">
+<description>
+Sets @self to be the symmetric difference of @self and @other, that
+is set @self to contain all values that were either contained in @self
+or in @other, but not in both.
+This operation is also called an XOR.
+
+It is allowed for @self and @other to be the same bitset. The bitset
+will be emptied in that case.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="other">
+<parameter_description> the #GtkBitset to compute the difference from
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bitset_equals">
+<description>
+Returns %TRUE if @self and @other contain the same values.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="other">
+<parameter_description> another #GtkBitset
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if @self and @other contain the same values
+</return>
+</function>
+
+<function name="gtk_bitset_get_maximum">
+<description>
+Returns the largest value in @self. If @self is empty,
+0 is returned.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+</parameters>
+<return> The largest value in @self
+</return>
+</function>
+
+<function name="gtk_bitset_get_minimum">
+<description>
+Returns the smallest value in @self. If @self is empty,
+G_MAXUINT is returned.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+</parameters>
+<return> The smallest value in @self
+</return>
+</function>
+
+<function name="gtk_bitset_intersect">
+<description>
+Sets @self to be the intersection of @self and @other, that is remove
+all values from @self that are not part of @other.
+
+It is allowed for @self and @other to be the same bitset. Nothing will
+happen in that case.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="other">
+<parameter_description> the #GtkBitset to intersect with
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bitset_is_empty">
+<description>
+Check if no value is contained in bitset.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if @self is empty
+</return>
+</function>
+
+<function name="gtk_bitset_iter_get_value">
+<description>
+Gets the current value that @iter points to.
+
+If @iter is not valid and gtk_bitset_iter_is_valid() returns
+%FALSE, this function returns 0.
+
+
+</description>
+<parameters>
+<parameter name="iter">
+<parameter_description> a #GtkBitsetIter
+</parameter_description>
+</parameter>
+</parameters>
+<return> The current value pointer to by @iter
+</return>
+</function>
+
+<function name="gtk_bitset_iter_init_at">
+<description>
+Initializes @iter to point to @target. If @target is not found, finds
+the next value after it. If no value &gt;= @target exists in @set, this
+function returns %FALSE.
+
+
+</description>
+<parameters>
+<parameter name="iter">
+<parameter_description> a pointer to an uninitialized #GtkBitsetIter
+</parameter_description>
+</parameter>
+<parameter name="set">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="target">
+<parameter_description> target value to start iterating at
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> Set to the found value in @set
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if a value was found.
+</return>
+</function>
+
+<function name="gtk_bitset_iter_init_first">
+<description>
+Initializes an iterator for @set and points it to the first
+value in @set. If @set is empty, %FALSE is returned and @value
+is set to %G_MAXUINT.
+
+
+</description>
+<parameters>
+<parameter name="iter">
+<parameter_description> a pointer to an uninitialized #GtkBitsetIter
+</parameter_description>
+</parameter>
+<parameter name="set">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> Set to the first value in @set
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if @set isn't empty.
+</return>
+</function>
+
+<function name="gtk_bitset_iter_init_last">
+<description>
+Initializes an iterator for @set and points it to the last
+value in @set. If @set is empty, %FALSE is returned.
+
+
+</description>
+<parameters>
+<parameter name="iter">
+<parameter_description> a pointer to an uninitialized #GtkBitsetIter
+</parameter_description>
+</parameter>
+<parameter name="set">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> Set to the last value in @set
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if @set isn't empty.
+</return>
+</function>
+
+<function name="gtk_bitset_iter_is_valid">
+<description>
+Checks if @iter points to a valid value.
+
+
+</description>
+<parameters>
+<parameter name="iter">
+<parameter_description> a #GtkBitsetIter
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if @iter points to a valid value
+</return>
+</function>
+
+<function name="gtk_bitset_iter_next">
+<description>
+Moves @iter to the next value in the set. If it was already
+pointing to the last value in the set, %FALSE is returned and
+@iter is invalidated.
+
+
+</description>
+<parameters>
+<parameter name="iter">
+<parameter_description> a pointer to a valid #GtkBitsetIter
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> Set to the next value
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if a next value existed
+</return>
+</function>
+
+<function name="gtk_bitset_iter_previous">
+<description>
+Moves @iter to the previous value in the set. If it was already
+pointing to the first value in the set, %FALSE is returned and
+@iter is invalidated.
+
+
+</description>
+<parameters>
+<parameter name="iter">
+<parameter_description> a pointer to a valid #GtkBitsetIter
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> Set to the previous value
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if a previous value existed
+</return>
+</function>
+
+<function name="gtk_bitset_new_empty">
+<description>
+Creates a new empty bitset.
+
+
+</description>
+<parameters>
+</parameters>
+<return> A new empty bitset.
+</return>
+</function>
+
+<function name="gtk_bitset_ref">
+<description>
+Acquires a reference on the given #GtkBitset.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+</parameters>
+<return> the #GtkBitset with an additional reference
+</return>
+</function>
+
+<function name="gtk_bitset_remove">
+<description>
+Removes @value from @self if it was part of it before.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> value to add
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if @value was part of @self and @self
+was changed.
+</return>
+</function>
+
+<function name="gtk_bitset_remove_all">
+<description>
+Removes all values from the bitset so that it is empty again.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bitset_remove_range">
+<description>
+Removes all values from @start (inclusive) to @start + @n_items (exclusive)
+in @self.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="start">
+<parameter_description> first value to remove
+</parameter_description>
+</parameter>
+<parameter name="n_items">
+<parameter_description> number of consecutive values to remove
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bitset_remove_range_closed">
+<description>
+Removes the closed range [@first, @last], so @first, @last and all
+values inbetween. @first must be smaller than @last.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="first">
+<parameter_description> first value to remove
+</parameter_description>
+</parameter>
+<parameter name="last">
+<parameter_description> last value to remove
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bitset_remove_rectangle">
+<description>
+Interprets the values as a 2-dimensional boolean grid with the given @stride
+and inside that grid, removes a rectangle with the given @width and @height.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="start">
+<parameter_description> first value to remove
+</parameter_description>
+</parameter>
+<parameter name="width">
+<parameter_description> width of the rectangle
+</parameter_description>
+</parameter>
+<parameter name="height">
+<parameter_description> height of the rectangle
+</parameter_description>
+</parameter>
+<parameter name="stride">
+<parameter_description> row stride of the grid
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bitset_shift_left">
+<description>
+Shifts all values in @self to the left by @amount. Values
+smaller than @amount are discarded.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a $GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="amount">
+<parameter_description> amount to shift all values to the left
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bitset_shift_right">
+<description>
+Shifts all values in @self to the right by @amount. Values
+that end up too large to be held in a #guint are discarded.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a $GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="amount">
+<parameter_description> amount to shift all values to the right
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bitset_slice">
+<description>
+This is a support function for #GListModel handling, by mirroring
+the #GlistModel::items-changed signal.
+
+First, it &quot;cuts&quot; the values from @position to @removed from
+the bitset. That is, it removes all those values and shifts
+all larger values to the left by @removed places.
+
+Then, it &quot;pastes&quot; new room into the bitset by shifting all values
+larger than @position by @added spaces to the right. This frees
+up space that can then be filled.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="position">
+<parameter_description> position at which to slice
+</parameter_description>
+</parameter>
+<parameter name="removed">
+<parameter_description> number of values to remove
+</parameter_description>
+</parameter>
+<parameter name="added">
+<parameter_description> number of values to add
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bitset_subtract">
+<description>
+Sets @self to be the subtraction of @other from @self, that is remove
+all values from @self that are part of @other.
+
+It is allowed for @self and @other to be the same bitset. The bitset
+will be emptied in that case.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="other">
+<parameter_description> the #GtkBitset to subtract
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bitset_union">
+<description>
+Sets @self to be the union of @self and @other, that is add all values
+from @other into @self that weren't part of it.
+
+It is allowed for @self and @other to be the same bitset. Nothing will
+happen in that case.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+<parameter name="other">
+<parameter_description> the #GtkBitset to union with
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bitset_unref">
+<description>
+Releases a reference on the given #GtkBitset.
+
+If the reference was the last, the resources associated to the @self are
+freed.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBitset
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_bookmark_list_get_attributes">
 <description>
 Gets the attributes queried on the children.
@@ -38100,34 +38746,6 @@ will appear embedded in the top edge of the frame as a title.
 <return></return>
 </function>
 
-<function name="gtk_functions_list_item_factory_new">
-<description>
-Creates a new #GtkListItemFactory with the given functions.
-
-
-</description>
-<parameters>
-<parameter name="setup_func">
-<parameter_description> the setup function for the list item factory
-</parameter_description>
-</parameter>
-<parameter name="bind_func">
-<parameter_description> the bind function for the list item factory
-</parameter_description>
-</parameter>
-<parameter name="user_data">
-<parameter_description> user data for the @setup_func and @bind_func functions
-</parameter_description>
-</parameter>
-<parameter name="user_destroy">
-<parameter_description> a function called to destroy @user_data
-</parameter_description>
-</parameter>
-</parameters>
-<return> the newly created list item factory object
-</return>
-</function>
-
 <function name="gtk_gesture_click_new">
 <description>
 Returns a newly created #GtkGesture that recognizes single and multiple
@@ -45798,6 +46416,42 @@ widgets kept alive is 2 * above_below + center + 1.
 <return></return>
 </function>
 
+<function name="gtk_list_base_size_allocate_child">
+<description>
+Allocates a child widget in the list coordinate system,
+but with the coordinates already offset by the scroll
+offset.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> The listbase
+</parameter_description>
+</parameter>
+<parameter name="child">
+<parameter_description> The child
+</parameter_description>
+</parameter>
+<parameter name="x">
+<parameter_description> top left coordinate in the across direction
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> top right coordinate in the along direction
+</parameter_description>
+</parameter>
+<parameter name="width">
+<parameter_description> size in the across direction
+</parameter_description>
+</parameter>
+<parameter name="height">
+<parameter_description> size in the along direction
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_list_box_bind_model">
 <description>
 Binds @model to @box.
@@ -46727,7 +47381,7 @@ currently bound to or %NULL if @self is unbound.
 <function name="gtk_list_item_get_position">
 <description>
 Gets the position in the model that @self currently displays.
-If @self is unbound, 0 is returned.
+If @self is unbound, %GTK_INVALID_LIST_POSITION is returned.
 
 
 </description>
@@ -46865,10 +47519,10 @@ the position of an item changes, like when new items are added before it.
 Sets @self to be activatable.
 
 If an item is activatable, double-clicking on the item, using
-the &lt;Return&gt; key or calling gtk_widget_activate() will activate
+the Return key or calling gtk_widget_activate() will activate
 the item. Activating instructs the containing view to handle
 activation. #GtkListView for example will be emitting the
-GtkListView::activate signal.
+#GtkListView::activate signal.
 
 By default, list items are activatable
 
@@ -49582,6 +50236,22 @@ the function returns.
 <return></return>
 </function>
 
+<function name="gtk_multi_selection_get_model">
+<description>
+Returns the underlying model of @self.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkMultiSelection
+</parameter_description>
+</parameter>
+</parameters>
+<return> the underlying model
+</return>
+</function>
+
 <function name="gtk_multi_selection_new">
 <description>
 Creates a new selection to handle @model.
@@ -58481,66 +59151,6 @@ query the `this` object
 </return>
 </function>
 
-<function name="gtk_property_selection_get_model">
-<description>
-Gets the underlying model.
-
-
-</description>
-<parameters>
-<parameter name="self">
-<parameter_description> a #GtkPropertySelection
-</parameter_description>
-</parameter>
-</parameters>
-<return> the underlying model
-</return>
-</function>
-
-<function name="gtk_property_selection_get_property">
-<description>
-Gets the name of the item property that @self stores
-the selection in.
-
-
-</description>
-<parameters>
-<parameter name="self">
-<parameter_description> a #GtkPropertySelection
-</parameter_description>
-</parameter>
-</parameters>
-<return> the name of the property
-</return>
-</function>
-
-<function name="gtk_property_selection_new">
-<description>
-Creates a new property selection to handle @model.
-
-@property must be the name of a writable boolean property
-of the item type of @model.
-
-Note that GtkPropertySelection does not monitor the property
-for changes while the item is part of the model, but it does
-inherit the initial value when an item is added to the model.
-
-
-</description>
-<parameters>
-<parameter name="model">
-<parameter_description> the #GListModel to manage
-</parameter_description>
-</parameter>
-<parameter name="property">
-<parameter_description> the item property to use
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new #GtkPropertySelection
-</return>
-</function>
-
 <function name="gtk_radio_button_get_group">
 <description>
 Retrieves the group assigned to a radio button.
@@ -61754,22 +62364,9 @@ Returns the vertical scrollbar of @scrolled_window.
 <description>
 Creates a new scrolled window.
 
-The two arguments are the scrolled window’s adjustments; these will be
-shared with the scrollbars and the child widget to keep the bars in sync
-with the child. Usually you want to pass %NULL for the adjustments, which
-will cause the scrolled window to create them for you.
-
 
 </description>
 <parameters>
-<parameter name="hadjustment">
-<parameter_description> horizontal adjustment
-</parameter_description>
-</parameter>
-<parameter name="vadjustment">
-<parameter_description> vertical adjustment
-</parameter_description>
-</parameter>
 </parameters>
 <return> a new scrolled window
 </return>
@@ -62349,9 +62946,13 @@ will reveal the entry in addition to triggering the search entry.
 <return></return>
 </function>
 
-<function name="gtk_selection_model_is_selected">
+<function name="gtk_selection_model_get_selection">
 <description>
-Checks if the given item is selected.
+Gets the set containing all currently selected items in the model.
+
+This function may be slow, so if you are only interested in single item,
+consider using gtk_selection_model_is_selected() or if you are only
+interested in a few consider gtk_selection_model_get_selection_in_range().
 
 
 </description>
@@ -62360,30 +62961,23 @@ Checks if the given item is selected.
 <parameter_description> a #GtkSelectionModel
 </parameter_description>
 </parameter>
-<parameter name="position">
-<parameter_description> the position of the item to query
-</parameter_description>
-</parameter>
 </parameters>
-<return> %TRUE if the item is selected
+<return> a #GtkBitset containing all the values currently
+selected in @model. If no items are selected, the bitset is empty.
+The bitset must not be modified.
 </return>
 </function>
 
-<function name="gtk_selection_model_query_range">
+<function name="gtk_selection_model_get_selection_in_range">
 <description>
-This function allows to query the selection status of multiple elements at once.
-It is passed a position and returns a range of elements of uniform selection status.
+Gets a set containing a set where the values in the range [position,
+position + n_items) match the selected state of the items in that range.
+All values outside that range are undefined.
 
-If @position is greater than the number of items in @model, @n_items is set to 0.
-Otherwise the returned range is guaranteed to include the passed-in position, so
-@n_items will be &gt;= 1.
+This function is an optimization for gtk_selection_model_get_selection() when
+you are only interested in part of the model's selected state. A common use
+case is in response to the :selection-changed signal.
 
-Positions directly adjacent to the returned range may have the same selection
-status as the returned range.
-
-This is an optimization function to make iterating over a model faster when few
-items are selected. However, it is valid behavior for implementations to use a
-naive implementation that only ever returns a single element.
 
 </description>
 <parameters>
@@ -62392,28 +62986,24 @@ naive implementation that only ever returns a single element.
 </parameter_description>
 </parameter>
 <parameter name="position">
-<parameter_description> the position inside the range
-</parameter_description>
-</parameter>
-<parameter name="start_range">
-<parameter_description> returns the position of the first element of the range
+<parameter_description> start of the queired range
 </parameter_description>
 </parameter>
 <parameter name="n_items">
-<parameter_description> returns the size of the range
-</parameter_description>
-</parameter>
-<parameter name="selected">
-<parameter_description> returns whether items in @range are selected
+<parameter_description> number of items in the queried range
 </parameter_description>
 </parameter>
 </parameters>
-<return></return>
+<return> A #GtkBitset that matches the selection state for the given state
+with all other values being undefined.
+The bitset must not be modified.
+</return>
 </function>
 
-<function name="gtk_selection_model_select_all">
+<function name="gtk_selection_model_is_selected">
 <description>
-Requests to select all items in the model.
+Checks if the given item is selected.
+
 
 </description>
 <parameters>
@@ -62421,14 +63011,19 @@ Requests to select all items in the model.
 <parameter_description> a #GtkSelectionModel
 </parameter_description>
 </parameter>
+<parameter name="position">
+<parameter_description> the position of the item to query
+</parameter_description>
+</parameter>
 </parameters>
-<return></return>
+<return> %TRUE if the item is selected
+</return>
 </function>
 
-<function name="gtk_selection_model_select_callback">
+<function name="gtk_selection_model_select_all">
 <description>
-Requests to select all items for which @callback returns
-@selected as TRUE.
+Requests to select all items in the model.
+
 
 </description>
 <parameters>
@@ -62436,26 +63031,17 @@ Requests to select all items for which @callback returns
 <parameter_description> a #GtkSelectionModel
 </parameter_description>
 </parameter>
-<parameter name="unselect_rest">
-<parameter_description> whether previously selected items should be unselected
-</parameter_description>
-</parameter>
-<parameter name="callback">
-<parameter_description> a #GtkSelectionCallback to determine items to select
-</parameter_description>
-</parameter>
-<parameter name="data">
-<parameter_description> data to pass to @callback
-</parameter_description>
-</parameter>
 </parameters>
-<return></return>
+<return> %TRUE if this action was supported and no fallback should be
+tried. This does not mean that all items are now selected.
+</return>
 </function>
 
 <function name="gtk_selection_model_select_item">
 <description>
 Requests to select an item in the model.
 
+
 </description>
 <parameters>
 <parameter name="model">
@@ -62471,13 +63057,16 @@ Requests to select an item in the model.
 </parameter_description>
 </parameter>
 </parameters>
-<return></return>
+<return> %TRUE if this action was supported and no fallback should be
+tried. This does not mean the item was selected.
+</return>
 </function>
 
 <function name="gtk_selection_model_select_range">
 <description>
 Requests to select a range of items in the model.
 
+
 </description>
 <parameters>
 <parameter name="model">
@@ -62497,7 +63086,9 @@ Requests to select a range of items in the model.
 </parameter_description>
 </parameter>
 </parameters>
-<return></return>
+<return> %TRUE if this action was supported and no fallback should be
+tried. This does not mean the range was selected.
+</return>
 </function>
 
 <function name="gtk_selection_model_selection_changed">
@@ -62524,9 +63115,37 @@ signal.
 <return></return>
 </function>
 
-<function name="gtk_selection_model_unselect_all">
+<function name="gtk_selection_model_set_selection">
 <description>
-Requests to unselect all items in the model.
+This is the most advanced selection updating method that allows
+the most fine-grained control over selection changes.
+If you can, you should try the simpler versions, as implementations
+are more likely to implement support for those.
+
+Requests that the selection state of all positions set in @mask be
+updated to the respecitve value in the @selected bitmask.  
+
+In pseudocode, it would look something like this:
+
+|[&lt;!-- language=&quot;C&quot; --&gt;
+for (i = 0; i &lt; n_items; i++)
+{
+// don't change values not in the mask
+if (!gtk_bitset_contains (mask, i))
+continue;
+
+if (gtk_bitset_contains (selected, i))
+select_item (i);
+else
+unselect_item (i);
+}
+
+gtk_selection_model_selection_changed (model, first_changed_item, n_changed_items);
+]|
+
+@mask and @selected must not be modified. They may refer to the same bitset,
+which would mean that every item in the set should be selected.
+
 
 </description>
 <parameters>
@@ -62534,14 +63153,26 @@ Requests to unselect all items in the model.
 <parameter_description> a #GtkSelectionModel
 </parameter_description>
 </parameter>
+<parameter name="selected">
+<parameter_description> bitmask specifying if items should be selected or
+unselected
+</parameter_description>
+</parameter>
+<parameter name="mask">
+<parameter_description> bitmask specifying which items should be updated
+</parameter_description>
+</parameter>
 </parameters>
-<return></return>
+<return> %TRUE if this action was supported and no fallback should be
+tried. This does not mean that all items were updated according
+to the inputs.
+</return>
 </function>
 
-<function name="gtk_selection_model_unselect_callback">
+<function name="gtk_selection_model_unselect_all">
 <description>
-Requests to unselect all items for which @callback returns
-@selected as TRUE.
+Requests to unselect all items in the model.
+
 
 </description>
 <parameters>
@@ -62549,22 +63180,17 @@ Requests to unselect all items for which @callback returns
 <parameter_description> a #GtkSelectionModel
 </parameter_description>
 </parameter>
-<parameter name="callback">
-<parameter_description> a #GtkSelectionCallback to determine items to select
-</parameter_description>
-</parameter>
-<parameter name="data">
-<parameter_description> data to pass to @callback
-</parameter_description>
-</parameter>
 </parameters>
-<return></return>
+<return> %TRUE if this action was supported and no fallback should be
+tried. This does not mean that all items are now unselected.
+</return>
 </function>
 
 <function name="gtk_selection_model_unselect_item">
 <description>
 Requests to unselect an item in the model.
 
+
 </description>
 <parameters>
 <parameter name="model">
@@ -62576,13 +63202,16 @@ Requests to unselect an item in the model.
 </parameter_description>
 </parameter>
 </parameters>
-<return></return>
+<return> %TRUE if this action was supported and no fallback should be
+tried. This does not mean the item was unselected.
+</return>
 </function>
 
 <function name="gtk_selection_model_unselect_range">
 <description>
 Requests to unselect a range of items in the model.
 
+
 </description>
 <parameters>
 <parameter name="model">
@@ -62598,7 +63227,9 @@ Requests to unselect a range of items in the model.
 </parameter_description>
 </parameter>
 </parameters>
-<return></return>
+<return> %TRUE if this action was supported and no fallback should be
+tried. This does not mean the range was unselected.
+</return>
 </function>
 
 <function name="gtk_separator_new">
@@ -66079,17 +66710,17 @@ Creates a new #GtkStack container.
 
 <function name="gtk_stack_page_get_child">
 <description>
-Returns the stack child to which @page belongs.
+Returns the stack child to which @self belongs.
 
 
 </description>
 <parameters>
-<parameter name="page">
+<parameter name="self">
 <parameter_description> a #GtkStackPage
 </parameter_description>
 </parameter>
 </parameters>
-<return> the child to which @page belongs
+<return> the child to which @self belongs
 </return>
 </function>
 
@@ -66184,14 +66815,16 @@ Returns whether @page is visible in its #GtkStack.
 This is independent from the #GtkWidget:visible value of its
 #GtkWidget.
 
+
 </description>
 <parameters>
-<parameter name="page">
+<parameter name="self">
 <parameter_description> a #GtkStackPage
 </parameter_description>
 </parameter>
 </parameters>
-<return></return>
+<return> %TRUE if @page is visible
+</return>
 </function>
 
 <function name="gtk_stack_page_set_icon_name">
@@ -66298,7 +66931,7 @@ to @visible.
 
 </description>
 <parameters>
-<parameter name="page">
+<parameter name="self">
 <parameter_description> a #GtkStackPage
 </parameter_description>
 </parameter>
@@ -66860,7 +67493,7 @@ Sets whether the filter ignores case differences.
 
 <function name="gtk_string_filter_set_match_mode">
 <description>
-Sets the match mode fot the filter.
+Sets the match mode for the filter.
 
 </description>
 <parameters>
@@ -66895,6 +67528,169 @@ or %NULL to clear the search
 <return></return>
 </function>
 
+<function name="gtk_string_list_append">
+<description>
+Appends @string to @self.
+
+The @string will be copied. See gtk_string_list_take()
+for a way to avoid that.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkStringList
+</parameter_description>
+</parameter>
+<parameter name="string">
+<parameter_description> the string to insert
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_string_list_get_string">
+<description>
+Gets the string that is at @position in @self. @position
+must be smaller than the current length of the list.
+
+This function returns the const char *. To get the
+object wrapping it, use g_list_model_get_item().
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkStringList
+</parameter_description>
+</parameter>
+<parameter name="position">
+<parameter_description> the position to get the string for
+</parameter_description>
+</parameter>
+</parameters>
+<return> the string at the given position
+</return>
+</function>
+
+<function name="gtk_string_list_new">
+<description>
+Creates a new #GtkStringList with the given @strings.
+
+
+</description>
+<parameters>
+<parameter name="strings">
+<parameter_description> The strings to put in the model
+</parameter_description>
+</parameter>
+</parameters>
+<return> a new #GtkStringList
+</return>
+</function>
+
+<function name="gtk_string_list_remove">
+<description>
+Removes the string at @position from @self. @position must
+be smaller than the current length of the list.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkStringList
+</parameter_description>
+</parameter>
+<parameter name="position">
+<parameter_description> the position of the string that is to be removed
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_string_list_splice">
+<description>
+Changes @self by removing @n_removals strings and adding @n_additions
+strings to it.
+
+This function is more efficient than gtk_string_list_insert() and
+gtk_string_list_remove(), because it only emits
+#GListModel::items-changed once for the change.
+
+This function takes a ref on each item in @additions.
+
+The parameters @position and @n_removals must be correct (ie:
+@position + @n_removals must be less than or equal to the length
+of the list at the time this function is called).
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkStringList
+</parameter_description>
+</parameter>
+<parameter name="position">
+<parameter_description> the position at which to make the change
+</parameter_description>
+</parameter>
+<parameter name="n_removals">
+<parameter_description> the number of strings to remove
+</parameter_description>
+</parameter>
+<parameter name="additions">
+<parameter_description> the strings to add
+</parameter_description>
+</parameter>
+<parameter name="n_additions">
+<parameter_description> the number of items to add
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_string_list_take">
+<description>
+Adds @string to self at the end, and takes
+ownership of it.
+
+This variant of gtk_string_list_append() is
+convenient for formatting strings:
+
+|[
+gtk_string_list_take (self, g_strdup_print (&quot;%d dollars&quot;, lots));
+]|
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkStringList
+</parameter_description>
+</parameter>
+<parameter name="string">
+<parameter_description> the string to insert
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_string_object_get_string">
+<description>
+Returns the string contained in a #GtkStringObject.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkStringObject
+</parameter_description>
+</parameter>
+</parameters>
+<return> the string of @self
+</return>
+</function>
+
 <function name="gtk_string_sorter_get_expression">
 <description>
 Gets the expression that is evaluated to obtain strings from items.
@@ -83565,31 +84361,6 @@ on the widget.
 </return>
 </function>
 
-<function name="gtk_widget_device_is_shadowed">
-<description>
-Returns %TRUE if @device has been shadowed by a GTK+
-device grab on another widget, so it would stop sending
-events to @widget. This may be used in the
-#GtkWidget::grab-notify signal to check for specific
-devices. See gtk_device_grab_add().
-
-
-</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 if there is an ongoing grab on @device
-by another #GtkWidget than @widget.
-</return>
-</function>
-
 <function name="gtk_widget_error_bell">
 <description>
 Notifies the user about an input-related error on this widget.
@@ -84714,23 +85485,6 @@ must not be freed.
 </return>
 </function>
 
-<function name="gtk_widget_get_support_multidevice">
-<description>
-Returns %TRUE if @widget is multiple pointer aware. See
-gtk_widget_set_support_multidevice() for more information.
-
-
-</description>
-<parameters>
-<parameter name="widget">
-<parameter_description> a #GtkWidget
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if @widget is multidevice aware.
-</return>
-</function>
-
 <function name="gtk_widget_get_template_child">
 <description>
 Fetch an object build from the template XML for @widget_type in this @widget instance.
@@ -86531,27 +87285,6 @@ gtk_widget_is_sensitive() will make use of these.
 <return></return>
 </function>
 
-<function name="gtk_widget_set_support_multidevice">
-<description>
-Enables or disables multiple pointer awareness. If this setting is %TRUE,
-@widget will start receiving multiple, per device enter/leave events. Note
-that if custom #GdkSurfaces are created in #GtkWidget::realize,
-gdk_surface_set_support_multidevice() will have to be called manually on them.
-
-</description>
-<parameters>
-<parameter name="widget">
-<parameter_description> a #GtkWidget
-</parameter_description>
-</parameter>
-<parameter name="support_multidevice">
-<parameter_description> %TRUE to support input from multiple devices.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_widget_set_tooltip_markup">
 <description>
 Sets @markup as the contents of the tooltip, which is marked up with
diff --git a/gtk/src/gtk_enums.defs b/gtk/src/gtk_enums.defs
index 82e9bd74..5bfd3cb8 100644
--- a/gtk/src/gtk_enums.defs
+++ b/gtk/src/gtk_enums.defs
@@ -1,23 +1,3 @@
-;; From gskpango.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GSK_PANGO_RENDERER_NORMAL,
-;;   GSK_PANGO_RENDERER_SELECTED,
-;;   GSK_PANGO_RENDERER_CURSOR
-;; } GskPangoRendererState;
-
-(define-enum-extended PangoRendererState
-  (in-module "Gsk")
-  (c-name "GskPangoRendererState")
-  (values
-    '("normal" "GSK_PANGO_RENDERER_NORMAL" "0")
-    '("selected" "GSK_PANGO_RENDERER_SELECTED" "1")
-    '("cursor" "GSK_PANGO_RENDERER_CURSOR" "2")
-  )
-)
-
 ;; From gtkaboutdialog.h
 
 ;; Original typedef:
@@ -49,8 +29,8 @@
 ;;   GTK_LICENSE_MPL_2_0
 ;; } GtkLicense;
 
-(define-enum-extended GtkLicense
-  (in-module "Gsk")
+(define-enum-extended License
+  (in-module "Gtk")
   (c-name "GtkLicense")
   (values
     '("unknown" "GTK_LICENSE_UNKNOWN" "0")
@@ -85,8 +65,8 @@
 ;;   GTK_APPLICATION_INHIBIT_IDLE    = (1 << 3)
 ;; } GtkApplicationInhibitFlags;
 
-(define-flags-extended GtkApplicationInhibitFlags
-  (in-module "Gsk")
+(define-flags-extended ApplicationInhibitFlags
+  (in-module "Gtk")
   (c-name "GtkApplicationInhibitFlags")
   (values
     '("logout" "GTK_APPLICATION_INHIBIT_LOGOUT" "(1 << 0)")
@@ -109,8 +89,8 @@
 ;;   GTK_ASSISTANT_PAGE_CUSTOM
 ;; } GtkAssistantPageType;
 
-(define-enum-extended GtkAssistantPageType
-  (in-module "Gsk")
+(define-enum-extended AssistantPageType
+  (in-module "Gtk")
   (c-name "GtkAssistantPageType")
   (values
     '("content" "GTK_ASSISTANT_PAGE_CONTENT" "0")
@@ -144,8 +124,8 @@
 ;;   GTK_BUILDER_ERROR_INVALID_FUNCTION
 ;; } GtkBuilderError;
 
-(define-enum-extended GtkBuilderError
-  (in-module "Gsk")
+(define-enum-extended BuilderError
+  (in-module "Gtk")
   (c-name "GtkBuilderError")
   (values
     '("invalid-type-function" "GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION" "0")
@@ -173,8 +153,8 @@
 ;;   GTK_BUILDER_CLOSURE_SWAPPED = (1 << 0)
 ;; } GtkBuilderClosureFlags;
 
-(define-flags-extended GtkBuilderClosureFlags
-  (in-module "Gsk")
+(define-flags-extended BuilderClosureFlags
+  (in-module "Gtk")
   (c-name "GtkBuilderClosureFlags")
   (values
     '("swapped" "GTK_BUILDER_CLOSURE_SWAPPED" "(1 << 0)")
@@ -190,8 +170,8 @@
 ;;   GTK_CELL_RENDERER_ACCEL_MODE_OTHER
 ;; } GtkCellRendererAccelMode;
 
-(define-enum-extended GtkCellRendererAccelMode
-  (in-module "Gsk")
+(define-enum-extended CellRendererAccelMode
+  (in-module "Gtk")
   (c-name "GtkCellRendererAccelMode")
   (values
     '("gtk" "GTK_CELL_RENDERER_ACCEL_MODE_GTK" "0")
@@ -214,8 +194,8 @@
 ;;   GTK_CELL_RENDERER_EXPANDED    = 1 << 6
 ;; } GtkCellRendererState;
 
-(define-flags-extended GtkCellRendererState
-  (in-module "Gsk")
+(define-flags-extended CellRendererState
+  (in-module "Gtk")
   (c-name "GtkCellRendererState")
   (values
     '("selected" "GTK_CELL_RENDERER_SELECTED" "1 << 0")
@@ -236,8 +216,8 @@
 ;;   GTK_CELL_RENDERER_MODE_EDITABLE
 ;; } GtkCellRendererMode;
 
-(define-enum-extended GtkCellRendererMode
-  (in-module "Gsk")
+(define-enum-extended CellRendererMode
+  (in-module "Gtk")
   (c-name "GtkCellRendererMode")
   (values
     '("inert" "GTK_CELL_RENDERER_MODE_INERT" "0")
@@ -260,18 +240,18 @@
 ;;   GTK_DEBUG_BUILDER         = 1 <<  7,
 ;;   GTK_DEBUG_SIZE_REQUEST    = 1 <<  8,
 ;;   GTK_DEBUG_NO_CSS_CACHE    = 1 <<  9,
-;;   GTK_DEBUG_SHORTCUTS       = 1 << 10,
-;;   GTK_DEBUG_INTERACTIVE     = 1 << 11,
-;;   GTK_DEBUG_TOUCHSCREEN     = 1 << 12,
-;;   GTK_DEBUG_ACTIONS         = 1 << 13,
-;;   GTK_DEBUG_RESIZE          = 1 << 14,
-;;   GTK_DEBUG_LAYOUT          = 1 << 15,
-;;   GTK_DEBUG_SNAPSHOT        = 1 << 16,
-;;   GTK_DEBUG_CONSTRAINTS     = 1 << 17,
+;;   GTK_DEBUG_INTERACTIVE     = 1 << 10,
+;;   GTK_DEBUG_TOUCHSCREEN     = 1 << 11,
+;;   GTK_DEBUG_ACTIONS         = 1 << 12,
+;;   GTK_DEBUG_RESIZE          = 1 << 13,
+;;   GTK_DEBUG_LAYOUT          = 1 << 14,
+;;   GTK_DEBUG_SNAPSHOT        = 1 << 15,
+;;   GTK_DEBUG_CONSTRAINTS     = 1 << 16,
+;;   GTK_DEBUG_BUILDER_OBJECTS = 1 << 17,
 ;; } GtkDebugFlag;
 
-(define-flags-extended GtkDebugFlag
-  (in-module "Gsk")
+(define-flags-extended DebugFlag
+  (in-module "Gtk")
   (c-name "GtkDebugFlag")
   (values
     '("text" "GTK_DEBUG_TEXT" "1 << 0")
@@ -284,14 +264,14 @@
     '("builder" "GTK_DEBUG_BUILDER" "1 << 7")
     '("size-request" "GTK_DEBUG_SIZE_REQUEST" "1 << 8")
     '("no-css-cache" "GTK_DEBUG_NO_CSS_CACHE" "1 << 9")
-    '("shortcuts" "GTK_DEBUG_SHORTCUTS" "1 << 10")
-    '("interactive" "GTK_DEBUG_INTERACTIVE" "1 << 11")
-    '("touchscreen" "GTK_DEBUG_TOUCHSCREEN" "1 << 12")
-    '("actions" "GTK_DEBUG_ACTIONS" "1 << 13")
-    '("resize" "GTK_DEBUG_RESIZE" "1 << 14")
-    '("layout" "GTK_DEBUG_LAYOUT" "1 << 15")
-    '("snapshot" "GTK_DEBUG_SNAPSHOT" "1 << 16")
-    '("constraints" "GTK_DEBUG_CONSTRAINTS" "1 << 17")
+    '("interactive" "GTK_DEBUG_INTERACTIVE" "1 << 10")
+    '("touchscreen" "GTK_DEBUG_TOUCHSCREEN" "1 << 11")
+    '("actions" "GTK_DEBUG_ACTIONS" "1 << 12")
+    '("resize" "GTK_DEBUG_RESIZE" "1 << 13")
+    '("layout" "GTK_DEBUG_LAYOUT" "1 << 14")
+    '("snapshot" "GTK_DEBUG_SNAPSHOT" "1 << 15")
+    '("constraints" "GTK_DEBUG_CONSTRAINTS" "1 << 16")
+    '("builder-objects" "GTK_DEBUG_BUILDER_OBJECTS" "1 << 17")
   )
 )
 
@@ -305,8 +285,8 @@
 ;;   GTK_DIALOG_USE_HEADER_BAR      = 1 << 2
 ;; } GtkDialogFlags;
 
-(define-flags-extended GtkDialogFlags
-  (in-module "Gsk")
+(define-flags-extended DialogFlags
+  (in-module "Gtk")
   (c-name "GtkDialogFlags")
   (values
     '("modal" "GTK_DIALOG_MODAL" "1 << 0")
@@ -331,8 +311,8 @@
 ;;   GTK_RESPONSE_HELP         = -11
 ;; } GtkResponseType;
 
-(define-enum-extended GtkResponseType
-  (in-module "Gsk")
+(define-enum-extended ResponseType
+  (in-module "Gtk")
   (c-name "GtkResponseType")
   (values
     '("none" "GTK_RESPONSE_NONE" "-1")
@@ -364,8 +344,8 @@
 ;;   GTK_EDITABLE_NUM_PROPERTIES
 ;; } GtkEditableProperties;
 
-(define-enum-extended GtkEditableProperties
-  (in-module "Gsk")
+(define-enum-extended EditableProperties
+  (in-module "Gtk")
   (c-name "GtkEditableProperties")
   (values
     '("prop-text" "GTK_EDITABLE_PROP_TEXT" "0")
@@ -389,8 +369,8 @@
 ;;   GTK_ENTRY_ICON_SECONDARY
 ;; } GtkEntryIconPosition;
 
-(define-enum-extended GtkEntryIconPosition
-  (in-module "Gsk")
+(define-enum-extended EntryIconPosition
+  (in-module "Gtk")
   (c-name "GtkEntryIconPosition")
   (values
     '("primary" "GTK_ENTRY_ICON_PRIMARY" "0")
@@ -410,8 +390,8 @@
 ;;   GTK_ALIGN_BASELINE
 ;; } GtkAlign;
 
-(define-enum-extended GtkAlign
-  (in-module "Gsk")
+(define-enum-extended Align
+  (in-module "Gtk")
   (c-name "GtkAlign")
   (values
     '("fill" "GTK_ALIGN_FILL" "0")
@@ -432,8 +412,8 @@
 ;;   GTK_ARROW_NONE
 ;; } GtkArrowType;
 
-(define-enum-extended GtkArrowType
-  (in-module "Gsk")
+(define-enum-extended ArrowType
+  (in-module "Gtk")
   (c-name "GtkArrowType")
   (values
     '("up" "GTK_ARROW_UP" "0")
@@ -452,8 +432,8 @@
 ;;   GTK_BASELINE_POSITION_BOTTOM
 ;; } GtkBaselinePosition;
 
-(define-enum-extended GtkBaselinePosition
-  (in-module "Gsk")
+(define-enum-extended BaselinePosition
+  (in-module "Gtk")
   (c-name "GtkBaselinePosition")
   (values
     '("top" "GTK_BASELINE_POSITION_TOP" "0")
@@ -475,8 +455,8 @@
 ;;   GTK_DELETE_WHITESPACE
 ;; } GtkDeleteType;
 
-(define-enum-extended GtkDeleteType
-  (in-module "Gsk")
+(define-enum-extended DeleteType
+  (in-module "Gtk")
   (c-name "GtkDeleteType")
   (values
     '("chars" "GTK_DELETE_CHARS" "0")
@@ -501,8 +481,8 @@
 ;;   GTK_DIR_RIGHT
 ;; } GtkDirectionType;
 
-(define-enum-extended GtkDirectionType
-  (in-module "Gsk")
+(define-enum-extended DirectionType
+  (in-module "Gtk")
   (c-name "GtkDirectionType")
   (values
     '("tab-forward" "GTK_DIR_TAB_FORWARD" "0")
@@ -522,8 +502,8 @@
 ;;   GTK_ICON_SIZE_LARGE
 ;; } GtkIconSize;
 
-(define-enum-extended GtkIconSize
-  (in-module "Gsk")
+(define-enum-extended IconSize
+  (in-module "Gtk")
   (c-name "GtkIconSize")
   (values
     '("inherit" "GTK_ICON_SIZE_INHERIT" "0")
@@ -540,8 +520,8 @@
 ;;   GTK_SENSITIVITY_OFF
 ;; } GtkSensitivityType;
 
-(define-enum-extended GtkSensitivityType
-  (in-module "Gsk")
+(define-enum-extended SensitivityType
+  (in-module "Gtk")
   (c-name "GtkSensitivityType")
   (values
     '("auto" "GTK_SENSITIVITY_AUTO" "0")
@@ -558,8 +538,8 @@
 ;;   GTK_TEXT_DIR_RTL
 ;; } GtkTextDirection;
 
-(define-enum-extended GtkTextDirection
-  (in-module "Gsk")
+(define-enum-extended TextDirection
+  (in-module "Gtk")
   (c-name "GtkTextDirection")
   (values
     '("none" "GTK_TEXT_DIR_NONE" "0")
@@ -577,8 +557,8 @@
 ;;   GTK_JUSTIFY_FILL
 ;; } GtkJustification;
 
-(define-enum-extended GtkJustification
-  (in-module "Gsk")
+(define-enum-extended Justification
+  (in-module "Gtk")
   (c-name "GtkJustification")
   (values
     '("left" "GTK_JUSTIFY_LEFT" "0")
@@ -597,8 +577,8 @@
 ;;   GTK_MENU_DIR_PREV
 ;; } GtkMenuDirectionType;
 
-(define-enum-extended GtkMenuDirectionType
-  (in-module "Gsk")
+(define-enum-extended MenuDirectionType
+  (in-module "Gtk")
   (c-name "GtkMenuDirectionType")
   (values
     '("parent" "GTK_MENU_DIR_PARENT" "0")
@@ -618,8 +598,8 @@
 ;;   GTK_MESSAGE_OTHER
 ;; } GtkMessageType;
 
-(define-enum-extended GtkMessageType
-  (in-module "Gsk")
+(define-enum-extended MessageType
+  (in-module "Gtk")
   (c-name "GtkMessageType")
   (values
     '("info" "GTK_MESSAGE_INFO" "0")
@@ -645,8 +625,8 @@
 ;;   GTK_MOVEMENT_HORIZONTAL_PAGES
 ;; } GtkMovementStep;
 
-(define-enum-extended GtkMovementStep
-  (in-module "Gsk")
+(define-enum-extended MovementStep
+  (in-module "Gtk")
   (c-name "GtkMovementStep")
   (values
     '("logical-positions" "GTK_MOVEMENT_LOGICAL_POSITIONS" "0")
@@ -673,8 +653,8 @@
 ;;   GTK_SCROLL_HORIZONTAL_ENDS
 ;; } GtkScrollStep;
 
-(define-enum-extended GtkScrollStep
-  (in-module "Gsk")
+(define-enum-extended ScrollStep
+  (in-module "Gtk")
   (c-name "GtkScrollStep")
   (values
     '("steps" "GTK_SCROLL_STEPS" "0")
@@ -693,8 +673,8 @@
 ;;   GTK_ORIENTATION_VERTICAL
 ;; } GtkOrientation;
 
-(define-enum-extended GtkOrientation
-  (in-module "Gsk")
+(define-enum-extended Orientation
+  (in-module "Gtk")
   (c-name "GtkOrientation")
   (values
     '("horizontal" "GTK_ORIENTATION_HORIZONTAL" "0")
@@ -709,8 +689,8 @@
 ;;   GTK_OVERFLOW_HIDDEN
 ;; } GtkOverflow;
 
-(define-enum-extended GtkOverflow
-  (in-module "Gsk")
+(define-enum-extended Overflow
+  (in-module "Gtk")
   (c-name "GtkOverflow")
   (values
     '("visible" "GTK_OVERFLOW_VISIBLE" "0")
@@ -725,8 +705,8 @@
 ;;   GTK_PACK_END
 ;; } GtkPackType;
 
-(define-enum-extended GtkPackType
-  (in-module "Gsk")
+(define-enum-extended PackType
+  (in-module "Gtk")
   (c-name "GtkPackType")
   (values
     '("start" "GTK_PACK_START" "0")
@@ -743,8 +723,8 @@
 ;;   GTK_POS_BOTTOM
 ;; } GtkPositionType;
 
-(define-enum-extended GtkPositionType
-  (in-module "Gsk")
+(define-enum-extended PositionType
+  (in-module "Gtk")
   (c-name "GtkPositionType")
   (values
     '("left" "GTK_POS_LEFT" "0")
@@ -775,8 +755,8 @@
 ;;   GTK_SCROLL_END
 ;; } GtkScrollType;
 
-(define-enum-extended GtkScrollType
-  (in-module "Gsk")
+(define-enum-extended ScrollType
+  (in-module "Gtk")
   (c-name "GtkScrollType")
   (values
     '("none" "GTK_SCROLL_NONE" "0")
@@ -807,8 +787,8 @@
 ;;   GTK_SELECTION_MULTIPLE
 ;; } GtkSelectionMode;
 
-(define-enum-extended GtkSelectionMode
-  (in-module "Gsk")
+(define-enum-extended SelectionMode
+  (in-module "Gtk")
   (c-name "GtkSelectionMode")
   (values
     '("none" "GTK_SELECTION_NONE" "0")
@@ -827,8 +807,8 @@
 ;;   GTK_WRAP_WORD_CHAR
 ;; } GtkWrapMode;
 
-(define-enum-extended GtkWrapMode
-  (in-module "Gsk")
+(define-enum-extended WrapMode
+  (in-module "Gtk")
   (c-name "GtkWrapMode")
   (values
     '("none" "GTK_WRAP_NONE" "0")
@@ -845,8 +825,8 @@
 ;;   GTK_SORT_DESCENDING
 ;; } GtkSortType;
 
-(define-enum-extended GtkSortType
-  (in-module "Gsk")
+(define-enum-extended SortType
+  (in-module "Gtk")
   (c-name "GtkSortType")
   (values
     '("ascending" "GTK_SORT_ASCENDING" "0")
@@ -863,8 +843,8 @@
 ;;   GTK_PRINT_PAGES_SELECTION
 ;; } GtkPrintPages;
 
-(define-enum-extended GtkPrintPages
-  (in-module "Gsk")
+(define-enum-extended PrintPages
+  (in-module "Gtk")
   (c-name "GtkPrintPages")
   (values
     '("all" "GTK_PRINT_PAGES_ALL" "0")
@@ -882,8 +862,8 @@
 ;;   GTK_PAGE_SET_ODD
 ;; } GtkPageSet;
 
-(define-enum-extended GtkPageSet
-  (in-module "Gsk")
+(define-enum-extended PageSet
+  (in-module "Gtk")
   (c-name "GtkPageSet")
   (values
     '("all" "GTK_PAGE_SET_ALL" "0")
@@ -905,8 +885,8 @@
 ;;   GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_RIGHT_TO_LEFT  /*< nick=btrl >*/
 ;; } GtkNumberUpLayout;
 
-(define-enum-extended GtkNumberUpLayout
-  (in-module "Gsk")
+(define-enum-extended NumberUpLayout
+  (in-module "Gtk")
   (c-name "GtkNumberUpLayout")
   (values
     '("left-to-right-top-to-bottom" "GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM" "0")
@@ -927,8 +907,8 @@
 ;;   GTK_ORDERING_LARGER = 1
 ;; } GtkOrdering;
 
-(define-enum-extended GtkOrdering
-  (in-module "Gsk")
+(define-enum-extended Ordering
+  (in-module "Gtk")
   (c-name "GtkOrdering")
   (values
     '("smaller" "GTK_ORDERING_SMALLER" "-1")
@@ -946,8 +926,8 @@
 ;;   GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE
 ;; } GtkPageOrientation;
 
-(define-enum-extended GtkPageOrientation
-  (in-module "Gsk")
+(define-enum-extended PageOrientation
+  (in-module "Gtk")
   (c-name "GtkPageOrientation")
   (values
     '("portrait" "GTK_PAGE_ORIENTATION_PORTRAIT" "0")
@@ -966,8 +946,8 @@
 ;;   GTK_PRINT_QUALITY_DRAFT
 ;; } GtkPrintQuality;
 
-(define-enum-extended GtkPrintQuality
-  (in-module "Gsk")
+(define-enum-extended PrintQuality
+  (in-module "Gtk")
   (c-name "GtkPrintQuality")
   (values
     '("low" "GTK_PRINT_QUALITY_LOW" "0")
@@ -985,8 +965,8 @@
 ;;   GTK_PRINT_DUPLEX_VERTICAL
 ;; } GtkPrintDuplex;
 
-(define-enum-extended GtkPrintDuplex
-  (in-module "Gsk")
+(define-enum-extended PrintDuplex
+  (in-module "Gtk")
   (c-name "GtkPrintDuplex")
   (values
     '("simplex" "GTK_PRINT_DUPLEX_SIMPLEX" "0")
@@ -1004,8 +984,8 @@
 ;;   GTK_UNIT_MM
 ;; } GtkUnit;
 
-(define-enum-extended GtkUnit
-  (in-module "Gsk")
+(define-enum-extended Unit
+  (in-module "Gtk")
   (c-name "GtkUnit")
   (values
     '("none" "GTK_UNIT_NONE" "0")
@@ -1024,8 +1004,8 @@
 ;;   GTK_TREE_VIEW_GRID_LINES_BOTH
 ;; } GtkTreeViewGridLines;
 
-(define-enum-extended GtkTreeViewGridLines
-  (in-module "Gsk")
+(define-enum-extended TreeViewGridLines
+  (in-module "Gtk")
   (c-name "GtkTreeViewGridLines")
   (values
     '("none" "GTK_TREE_VIEW_GRID_LINES_NONE" "0")
@@ -1043,8 +1023,8 @@
 ;;   GTK_SIZE_GROUP_BOTH
 ;; } GtkSizeGroupMode;
 
-(define-enum-extended GtkSizeGroupMode
-  (in-module "Gsk")
+(define-enum-extended SizeGroupMode
+  (in-module "Gtk")
   (c-name "GtkSizeGroupMode")
   (values
     '("none" "GTK_SIZE_GROUP_NONE" "0")
@@ -1062,8 +1042,8 @@
 ;;   GTK_SIZE_REQUEST_CONSTANT_SIZE
 ;; } GtkSizeRequestMode;
 
-(define-enum-extended GtkSizeRequestMode
-  (in-module "Gsk")
+(define-enum-extended SizeRequestMode
+  (in-module "Gtk")
   (c-name "GtkSizeRequestMode")
   (values
     '("height-for-width" "GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH" "0")
@@ -1079,8 +1059,8 @@
 ;;   GTK_SCROLL_NATURAL
 ;; } GtkScrollablePolicy;
 
-(define-enum-extended GtkScrollablePolicy
-  (in-module "Gsk")
+(define-enum-extended ScrollablePolicy
+  (in-module "Gtk")
   (c-name "GtkScrollablePolicy")
   (values
     '("minimum" "GTK_SCROLL_MINIMUM" "0")
@@ -1109,8 +1089,8 @@
 ;;   GTK_STATE_FLAG_FOCUS_WITHIN  = 1 << 14
 ;; } GtkStateFlags;
 
-(define-flags-extended GtkStateFlags
-  (in-module "Gsk")
+(define-flags-extended StateFlags
+  (in-module "Gtk")
   (c-name "GtkStateFlags")
   (values
     '("normal" "GTK_STATE_FLAG_NORMAL" "0x0")
@@ -1146,8 +1126,8 @@
 ;;   GTK_BORDER_STYLE_RIDGE
 ;; } GtkBorderStyle;
 
-(define-enum-extended GtkBorderStyle
-  (in-module "Gsk")
+(define-enum-extended BorderStyle
+  (in-module "Gtk")
   (c-name "GtkBorderStyle")
   (values
     '("none" "GTK_BORDER_STYLE_NONE" "0")
@@ -1169,8 +1149,8 @@
 ;;   GTK_LEVEL_BAR_MODE_DISCRETE
 ;; } GtkLevelBarMode;
 
-(define-enum-extended GtkLevelBarMode
-  (in-module "Gsk")
+(define-enum-extended LevelBarMode
+  (in-module "Gtk")
   (c-name "GtkLevelBarMode")
   (values
     '("continuous" "GTK_LEVEL_BAR_MODE_CONTINUOUS" "0")
@@ -1194,8 +1174,8 @@
 ;;   GTK_INPUT_PURPOSE_TERMINAL,
 ;; } GtkInputPurpose;
 
-(define-enum-extended GtkInputPurpose
-  (in-module "Gsk")
+(define-enum-extended InputPurpose
+  (in-module "Gtk")
   (c-name "GtkInputPurpose")
   (values
     '("free-form" "GTK_INPUT_PURPOSE_FREE_FORM" "0")
@@ -1229,8 +1209,8 @@
 ;;   GTK_INPUT_HINT_NO_EMOJI            = 1 << 10
 ;; } GtkInputHints;
 
-(define-flags-extended GtkInputHints
-  (in-module "Gsk")
+(define-flags-extended InputHints
+  (in-module "Gtk")
   (c-name "GtkInputHints")
   (values
     '("none" "GTK_INPUT_HINT_NONE" "0x0")
@@ -1257,8 +1237,8 @@
 ;;   GTK_PHASE_TARGET
 ;; } GtkPropagationPhase;
 
-(define-enum-extended GtkPropagationPhase
-  (in-module "Gsk")
+(define-enum-extended PropagationPhase
+  (in-module "Gtk")
   (c-name "GtkPropagationPhase")
   (values
     '("none" "GTK_PHASE_NONE" "0")
@@ -1275,8 +1255,8 @@
 ;;   GTK_LIMIT_SAME_NATIVE
 ;; } GtkPropagationLimit;
 
-(define-enum-extended GtkPropagationLimit
-  (in-module "Gsk")
+(define-enum-extended PropagationLimit
+  (in-module "Gtk")
   (c-name "GtkPropagationLimit")
   (values
     '("none" "GTK_LIMIT_NONE" "0")
@@ -1292,8 +1272,8 @@
 ;;   GTK_EVENT_SEQUENCE_DENIED
 ;; } GtkEventSequenceState;
 
-(define-enum-extended GtkEventSequenceState
-  (in-module "Gsk")
+(define-enum-extended EventSequenceState
+  (in-module "Gtk")
   (c-name "GtkEventSequenceState")
   (values
     '("none" "GTK_EVENT_SEQUENCE_NONE" "0")
@@ -1311,8 +1291,8 @@
 ;;   GTK_PAN_DIRECTION_DOWN
 ;; } GtkPanDirection;
 
-(define-enum-extended GtkPanDirection
-  (in-module "Gsk")
+(define-enum-extended PanDirection
+  (in-module "Gtk")
   (c-name "GtkPanDirection")
   (values
     '("left" "GTK_PAN_DIRECTION_LEFT" "0")
@@ -1330,8 +1310,8 @@
 ;;   GTK_SHORTCUT_SCOPE_GLOBAL
 ;; } GtkShortcutScope;
 
-(define-enum-extended GtkShortcutScope
-  (in-module "Gsk")
+(define-enum-extended ShortcutScope
+  (in-module "Gtk")
   (c-name "GtkShortcutScope")
   (values
     '("local" "GTK_SHORTCUT_SCOPE_LOCAL" "0")
@@ -1347,8 +1327,8 @@
 ;;   GTK_POPOVER_CONSTRAINT_WINDOW
 ;; } GtkPopoverConstraint;
 
-(define-enum-extended GtkPopoverConstraint
-  (in-module "Gsk")
+(define-enum-extended PopoverConstraint
+  (in-module "Gtk")
   (c-name "GtkPopoverConstraint")
   (values
     '("none" "GTK_POPOVER_CONSTRAINT_NONE" "0")
@@ -1363,8 +1343,8 @@
 ;;   GTK_PLACES_OPEN_NEW_WINDOW = 1 << 2
 ;; } GtkPlacesOpenFlags;
 
-(define-flags-extended GtkPlacesOpenFlags
-  (in-module "Gsk")
+(define-flags-extended PlacesOpenFlags
+  (in-module "Gtk")
   (c-name "GtkPlacesOpenFlags")
   (values
     '("normal" "GTK_PLACES_OPEN_NORMAL" "1 << 0")
@@ -1380,8 +1360,8 @@
 ;;   GTK_PICK_NON_TARGETABLE = 1 << 1
 ;; } GtkPickFlags;
 
-(define-flags-extended GtkPickFlags
-  (in-module "Gsk")
+(define-flags-extended PickFlags
+  (in-module "Gtk")
   (c-name "GtkPickFlags")
   (values
     '("default" "GTK_PICK_DEFAULT" "0x0")
@@ -1397,8 +1377,8 @@
 ;;   GTK_CONSTRAINT_RELATION_GE = 1
 ;; } GtkConstraintRelation;
 
-(define-enum-extended GtkConstraintRelation
-  (in-module "Gsk")
+(define-enum-extended ConstraintRelation
+  (in-module "Gtk")
   (c-name "GtkConstraintRelation")
   (values
     '("le" "GTK_CONSTRAINT_RELATION_LE" "-1")
@@ -1415,8 +1395,8 @@
 ;;   GTK_CONSTRAINT_STRENGTH_WEAK     = 1
 ;; } GtkConstraintStrength;
 
-(define-enum-extended GtkConstraintStrength
-  (in-module "Gsk")
+(define-enum-extended ConstraintStrength
+  (in-module "Gtk")
   (c-name "GtkConstraintStrength")
   (values
     '("required" "GTK_CONSTRAINT_STRENGTH_REQUIRED" "1001001000")
@@ -1442,8 +1422,8 @@
 ;;   GTK_CONSTRAINT_ATTRIBUTE_BASELINE
 ;; } GtkConstraintAttribute;
 
-(define-enum-extended GtkConstraintAttribute
-  (in-module "Gsk")
+(define-enum-extended ConstraintAttribute
+  (in-module "Gtk")
   (c-name "GtkConstraintAttribute")
   (values
     '("none" "GTK_CONSTRAINT_ATTRIBUTE_NONE" "0")
@@ -1471,8 +1451,8 @@
 ;;   GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_RELATION
 ;; } GtkConstraintVflParserError;
 
-(define-enum-extended GtkConstraintVflParserError
-  (in-module "Gsk")
+(define-enum-extended ConstraintVflParserError
+  (in-module "Gtk")
   (c-name "GtkConstraintVflParserError")
   (values
     '("symbol" "GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_SYMBOL" "0")
@@ -1493,8 +1473,8 @@
 ;;   GTK_SYSTEM_SETTING_ICON_THEME
 ;; } GtkSystemSetting;
 
-(define-enum-extended GtkSystemSetting
-  (in-module "Gsk")
+(define-enum-extended SystemSetting
+  (in-module "Gtk")
   (c-name "GtkSystemSetting")
   (values
     '("dpi" "GTK_SYSTEM_SETTING_DPI" "0")
@@ -1517,8 +1497,8 @@
 ;;   GTK_EVENT_CONTROLLER_SCROLL_BOTH_AXES  = (GTK_EVENT_CONTROLLER_SCROLL_VERTICAL | 
GTK_EVENT_CONTROLLER_SCROLL_HORIZONTAL),
 ;; } GtkEventControllerScrollFlags;
 
-(define-flags-extended GtkEventControllerScrollFlags
-  (in-module "Gsk")
+(define-flags-extended EventControllerScrollFlags
+  (in-module "Gtk")
   (c-name "GtkEventControllerScrollFlags")
   (values
     '("none" "GTK_EVENT_CONTROLLER_SCROLL_NONE" "0x0")
@@ -1540,8 +1520,8 @@
 ;;   GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
 ;; } GtkFileChooserAction;
 
-(define-enum-extended GtkFileChooserAction
-  (in-module "Gsk")
+(define-enum-extended FileChooserAction
+  (in-module "Gtk")
   (c-name "GtkFileChooserAction")
   (values
     '("open" "GTK_FILE_CHOOSER_ACTION_OPEN" "0")
@@ -1558,8 +1538,8 @@
 ;;   GTK_FILE_CHOOSER_ERROR_INCOMPLETE_HOSTNAME
 ;; } GtkFileChooserError;
 
-(define-enum-extended GtkFileChooserError
-  (in-module "Gsk")
+(define-enum-extended FileChooserError
+  (in-module "Gtk")
   (c-name "GtkFileChooserError")
   (values
     '("nonexistent" "GTK_FILE_CHOOSER_ERROR_NONEXISTENT" "0")
@@ -1581,8 +1561,8 @@
 ;;   GTK_FILE_CHOOSER_PROP_LAST                   = GTK_FILE_CHOOSER_PROP_CREATE_FOLDERS
 ;; } GtkFileChooserProp;
 
-(define-enum-extended GtkFileChooserProp
-  (in-module "Gsk")
+(define-enum-extended FileChooserProp
+  (in-module "Gtk")
   (c-name "GtkFileChooserProp")
   (values
     '("first" "GTK_FILE_CHOOSER_PROP_FIRST" "0x1000")
@@ -1604,8 +1584,8 @@
 ;;   GTK_FILE_FILTER_MIME_TYPE    = 1 << 3
 ;; } GtkFileFilterFlags;
 
-(define-flags-extended GtkFileFilterFlags
-  (in-module "Gsk")
+(define-flags-extended FileFilterFlags
+  (in-module "Gtk")
   (c-name "GtkFileFilterFlags")
   (values
     '("filename" "GTK_FILE_FILTER_FILENAME" "1 << 0")
@@ -1624,8 +1604,8 @@
 ;;   GTK_FILTER_MATCH_ALL
 ;; } GtkFilterMatch;
 
-(define-enum-extended GtkFilterMatch
-  (in-module "Gsk")
+(define-enum-extended FilterMatch
+  (in-module "Gtk")
   (c-name "GtkFilterMatch")
   (values
     '("some" "GTK_FILTER_MATCH_SOME" "0")
@@ -1641,8 +1621,8 @@
 ;;   GTK_FILTER_CHANGE_MORE_STRICT,
 ;; } GtkFilterChange;
 
-(define-enum-extended GtkFilterChange
-  (in-module "Gsk")
+(define-enum-extended FilterChange
+  (in-module "Gtk")
   (c-name "GtkFilterChange")
   (values
     '("different" "GTK_FILTER_CHANGE_DIFFERENT" "0")
@@ -1662,8 +1642,8 @@
 ;;   GTK_FONT_CHOOSER_LEVEL_FEATURES   = 1 << 3
 ;; } GtkFontChooserLevel;
 
-(define-flags-extended GtkFontChooserLevel
-  (in-module "Gsk")
+(define-flags-extended FontChooserLevel
+  (in-module "Gtk")
   (c-name "GtkFontChooserLevel")
   (values
     '("family" "GTK_FONT_CHOOSER_LEVEL_FAMILY" "0x0")
@@ -1689,8 +1669,8 @@
 ;;   GTK_FONT_CHOOSER_PROP_LAST
 ;; } GtkFontChooserProp;
 
-(define-enum-extended GtkFontChooserProp
-  (in-module "Gsk")
+(define-enum-extended FontChooserProp
+  (in-module "Gtk")
   (c-name "GtkFontChooserProp")
   (values
     '("first" "GTK_FONT_CHOOSER_PROP_FIRST" "0x4000")
@@ -1715,8 +1695,8 @@
 ;;   GTK_ICON_LOOKUP_PRELOAD        = 1 << 2,
 ;; } GtkIconLookupFlags;
 
-(define-flags-extended GtkIconLookupFlags
-  (in-module "Gsk")
+(define-flags-extended IconLookupFlags
+  (in-module "Gtk")
   (c-name "GtkIconLookupFlags")
   (values
     '("force-regular" "GTK_ICON_LOOKUP_FORCE_REGULAR" "1 << 0")
@@ -1731,8 +1711,8 @@
 ;;   GTK_ICON_THEME_FAILED
 ;; } GtkIconThemeError;
 
-(define-enum-extended GtkIconThemeError
-  (in-module "Gsk")
+(define-enum-extended IconThemeError
+  (in-module "Gtk")
   (c-name "GtkIconThemeError")
   (values
     '("not-found" "GTK_ICON_THEME_NOT_FOUND" "0")
@@ -1753,8 +1733,8 @@
 ;;   GTK_ICON_VIEW_DROP_BELOW
 ;; } GtkIconViewDropPosition;
 
-(define-enum-extended GtkIconViewDropPosition
-  (in-module "Gsk")
+(define-enum-extended IconViewDropPosition
+  (in-module "Gtk")
   (c-name "GtkIconViewDropPosition")
   (values
     '("no-drop" "GTK_ICON_VIEW_NO_DROP" "0")
@@ -1777,8 +1757,8 @@
 ;;   GTK_IMAGE_PAINTABLE
 ;; } GtkImageType;
 
-(define-enum-extended GtkImageType
-  (in-module "Gsk")
+(define-enum-extended ImageType
+  (in-module "Gtk")
   (c-name "GtkImageType")
   (values
     '("empty" "GTK_IMAGE_EMPTY" "0")
@@ -1801,8 +1781,8 @@
 ;;   GTK_BUTTONS_OK_CANCEL
 ;; } GtkButtonsType;
 
-(define-enum-extended GtkButtonsType
-  (in-module "Gsk")
+(define-enum-extended ButtonsType
+  (in-module "Gtk")
   (c-name "GtkButtonsType")
   (values
     '("none" "GTK_BUTTONS_NONE" "0")
@@ -1823,8 +1803,8 @@
 ;;   GTK_NOTEBOOK_TAB_LAST
 ;; } GtkNotebookTab;
 
-(define-enum-extended GtkNotebookTab
-  (in-module "Gsk")
+(define-enum-extended NotebookTab
+  (in-module "Gtk")
   (c-name "GtkNotebookTab")
   (values
     '("first" "GTK_NOTEBOOK_TAB_FIRST" "0")
@@ -1841,8 +1821,8 @@
 ;;   GTK_PAD_ACTION_STRIP
 ;; } GtkPadActionType;
 
-(define-enum-extended GtkPadActionType
-  (in-module "Gsk")
+(define-enum-extended PadActionType
+  (in-module "Gtk")
   (c-name "GtkPadActionType")
   (values
     '("button" "GTK_PAD_ACTION_BUTTON" "0")
@@ -1858,8 +1838,8 @@
 ;;   GTK_POPOVER_MENU_NESTED = 1 << 0
 ;; } GtkPopoverMenuFlags;
 
-(define-flags-extended GtkPopoverMenuFlags
-  (in-module "Gsk")
+(define-flags-extended PopoverMenuFlags
+  (in-module "Gtk")
   (c-name "GtkPopoverMenuFlags")
   (values
     '("nested" "GTK_POPOVER_MENU_NESTED" "1 << 0")
@@ -1883,8 +1863,8 @@
 ;;   GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT = 1 << 9
 ;; } GtkPrintCapabilities;
 
-(define-flags-extended GtkPrintCapabilities
-  (in-module "Gsk")
+(define-flags-extended PrintCapabilities
+  (in-module "Gtk")
   (c-name "GtkPrintCapabilities")
   (values
     '("page-set" "GTK_PRINT_CAPABILITY_PAGE_SET" "1 << 0")
@@ -1917,8 +1897,8 @@
 ;;   GTK_PRINTER_OPTION_TYPE_INFO
 ;; } GtkPrinterOptionType;
 
-(define-enum-extended GtkPrinterOptionType
-  (in-module "Gsk")
+(define-enum-extended PrinterOptionType
+  (in-module "Gtk")
   (c-name "GtkPrinterOptionType")
   (values
     '("boolean" "GTK_PRINTER_OPTION_TYPE_BOOLEAN" "0")
@@ -1950,8 +1930,8 @@
 ;;   GTK_PRINT_STATUS_FINISHED_ABORTED
 ;; } GtkPrintStatus;
 
-(define-enum-extended GtkPrintStatus
-  (in-module "Gsk")
+(define-enum-extended PrintStatus
+  (in-module "Gtk")
   (c-name "GtkPrintStatus")
   (values
     '("initial" "GTK_PRINT_STATUS_INITIAL" "0")
@@ -1974,8 +1954,8 @@
 ;;   GTK_PRINT_OPERATION_RESULT_IN_PROGRESS
 ;; } GtkPrintOperationResult;
 
-(define-enum-extended GtkPrintOperationResult
-  (in-module "Gsk")
+(define-enum-extended PrintOperationResult
+  (in-module "Gtk")
   (c-name "GtkPrintOperationResult")
   (values
     '("error" "GTK_PRINT_OPERATION_RESULT_ERROR" "0")
@@ -1993,8 +1973,8 @@
 ;;   GTK_PRINT_OPERATION_ACTION_EXPORT
 ;; } GtkPrintOperationAction;
 
-(define-enum-extended GtkPrintOperationAction
-  (in-module "Gsk")
+(define-enum-extended PrintOperationAction
+  (in-module "Gtk")
   (c-name "GtkPrintOperationAction")
   (values
     '("print-dialog" "GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG" "0")
@@ -2013,8 +1993,8 @@
 ;;   GTK_PRINT_ERROR_INVALID_FILE
 ;; } GtkPrintError;
 
-(define-enum-extended GtkPrintError
-  (in-module "Gsk")
+(define-enum-extended PrintError
+  (in-module "Gtk")
   (c-name "GtkPrintError")
   (values
     '("general" "GTK_PRINT_ERROR_GENERAL" "0")
@@ -2038,8 +2018,8 @@
 ;;   GTK_RECENT_MANAGER_ERROR_UNKNOWN
 ;; } GtkRecentManagerError;
 
-(define-enum-extended GtkRecentManagerError
-  (in-module "Gsk")
+(define-enum-extended RecentManagerError
+  (in-module "Gtk")
   (c-name "GtkRecentManagerError")
   (values
     '("not-found" "GTK_RECENT_MANAGER_ERROR_NOT_FOUND" "0")
@@ -2068,8 +2048,8 @@
 ;;   GTK_REVEALER_TRANSITION_TYPE_SWING_DOWN
 ;; } GtkRevealerTransitionType;
 
-(define-enum-extended GtkRevealerTransitionType
-  (in-module "Gsk")
+(define-enum-extended RevealerTransitionType
+  (in-module "Gtk")
   (c-name "GtkRevealerTransitionType")
   (values
     '("none" "GTK_REVEALER_TRANSITION_TYPE_NONE" "0")
@@ -2096,8 +2076,8 @@
 ;;   GTK_CORNER_BOTTOM_RIGHT
 ;; } GtkCornerType;
 
-(define-enum-extended GtkCornerType
-  (in-module "Gsk")
+(define-enum-extended CornerType
+  (in-module "Gtk")
   (c-name "GtkCornerType")
   (values
     '("top-left" "GTK_CORNER_TOP_LEFT" "0")
@@ -2116,8 +2096,8 @@
 ;;   GTK_POLICY_EXTERNAL
 ;; } GtkPolicyType;
 
-(define-enum-extended GtkPolicyType
-  (in-module "Gsk")
+(define-enum-extended PolicyType
+  (in-module "Gtk")
   (c-name "GtkPolicyType")
   (values
     '("always" "GTK_POLICY_ALWAYS" "0")
@@ -2134,8 +2114,8 @@
 ;;   GTK_SHORTCUT_ACTION_EXCLUSIVE = 1 << 0
 ;; } GtkShortcutActionFlags;
 
-(define-flags-extended GtkShortcutActionFlags
-  (in-module "Gsk")
+(define-flags-extended ShortcutActionFlags
+  (in-module "Gtk")
   (c-name "GtkShortcutActionFlags")
   (values
     '("exclusive" "GTK_SHORTCUT_ACTION_EXCLUSIVE" "1 << 0")
@@ -2158,8 +2138,8 @@
 ;;   GTK_SHORTCUT_GESTURE_SWIPE_RIGHT
 ;; } GtkShortcutType;
 
-(define-enum-extended GtkShortcutType
-  (in-module "Gsk")
+(define-enum-extended ShortcutType
+  (in-module "Gtk")
   (c-name "GtkShortcutType")
   (values
     '("accelerator" "GTK_SHORTCUT_ACCELERATOR" "0")
@@ -2184,8 +2164,8 @@
 ;;   GTK_SORTER_ORDER_TOTAL
 ;; } GtkSorterOrder;
 
-(define-enum-extended GtkSorterOrder
-  (in-module "Gsk")
+(define-enum-extended SorterOrder
+  (in-module "Gtk")
   (c-name "GtkSorterOrder")
   (values
     '("partial" "GTK_SORTER_ORDER_PARTIAL" "0")
@@ -2202,8 +2182,8 @@
 ;;   GTK_SORTER_CHANGE_MORE_STRICT
 ;; } GtkSorterChange;
 
-(define-enum-extended GtkSorterChange
-  (in-module "Gsk")
+(define-enum-extended SorterChange
+  (in-module "Gtk")
   (c-name "GtkSorterChange")
   (values
     '("different" "GTK_SORTER_CHANGE_DIFFERENT" "0")
@@ -2222,8 +2202,8 @@
 ;;   GTK_UPDATE_IF_VALID
 ;; } GtkSpinButtonUpdatePolicy;
 
-(define-enum-extended GtkSpinButtonUpdatePolicy
-  (in-module "Gsk")
+(define-enum-extended SpinButtonUpdatePolicy
+  (in-module "Gtk")
   (c-name "GtkSpinButtonUpdatePolicy")
   (values
     '("always" "GTK_UPDATE_ALWAYS" "0")
@@ -2243,8 +2223,8 @@
 ;;   GTK_SPIN_USER_DEFINED
 ;; } GtkSpinType;
 
-(define-enum-extended GtkSpinType
-  (in-module "Gsk")
+(define-enum-extended SpinType
+  (in-module "Gtk")
   (c-name "GtkSpinType")
   (values
     '("step-forward" "GTK_SPIN_STEP_FORWARD" "0")
@@ -2286,8 +2266,8 @@
 ;;   GTK_STACK_TRANSITION_TYPE_ROTATE_LEFT_RIGHT
 ;; } GtkStackTransitionType;
 
-(define-enum-extended GtkStackTransitionType
-  (in-module "Gsk")
+(define-enum-extended StackTransitionType
+  (in-module "Gtk")
   (c-name "GtkStackTransitionType")
   (values
     '("none" "GTK_STACK_TRANSITION_TYPE_NONE" "0")
@@ -2325,8 +2305,8 @@
 ;;   GTK_STRING_FILTER_MATCH_MODE_PREFIX
 ;; } GtkStringFilterMatchMode;
 
-(define-enum-extended GtkStringFilterMatchMode
-  (in-module "Gsk")
+(define-enum-extended StringFilterMatchMode
+  (in-module "Gtk")
   (c-name "GtkStringFilterMatchMode")
   (values
     '("exact" "GTK_STRING_FILTER_MATCH_MODE_EXACT" "0")
@@ -2345,8 +2325,8 @@
 ;;   GTK_STYLE_CONTEXT_PRINT_SHOW_CHANGE  = 1 << 2
 ;; } GtkStyleContextPrintFlags;
 
-(define-flags-extended GtkStyleContextPrintFlags
-  (in-module "Gsk")
+(define-flags-extended StyleContextPrintFlags
+  (in-module "Gtk")
   (c-name "GtkStyleContextPrintFlags")
   (values
     '("none" "GTK_STYLE_CONTEXT_PRINT_NONE" "0x0")
@@ -2366,8 +2346,8 @@
 ;;   GTK_TEXT_BUFFER_TARGET_INFO_TEXT            = - 3
 ;; } GtkTextBufferTargetInfo;
 
-(define-enum-extended GtkTextBufferTargetInfo
-  (in-module "Gsk")
+(define-enum-extended TextBufferTargetInfo
+  (in-module "Gtk")
   (c-name "GtkTextBufferTargetInfo")
   (values
     '("buffer-contents" "GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS" "-1")
@@ -2386,8 +2366,8 @@
 ;;   /* Possible future plans: SEARCH_REGEXP */
 ;; } GtkTextSearchFlags;
 
-(define-flags-extended GtkTextSearchFlags
-  (in-module "Gsk")
+(define-flags-extended TextSearchFlags
+  (in-module "Gtk")
   (c-name "GtkTextSearchFlags")
   (values
     '("visible-only" "GTK_TEXT_SEARCH_VISIBLE_ONLY" "1 << 0")
@@ -2409,8 +2389,8 @@
 ;;   GTK_TEXT_WINDOW_BOTTOM
 ;; } GtkTextWindowType;
 
-(define-enum-extended GtkTextWindowType
-  (in-module "Gsk")
+(define-enum-extended TextWindowType
+  (in-module "Gtk")
   (c-name "GtkTextWindowType")
   (values
     '("widget" "GTK_TEXT_WINDOW_WIDGET" "1")
@@ -2429,8 +2409,8 @@
 ;;   GTK_TEXT_VIEW_LAYER_ABOVE_TEXT
 ;; } GtkTextViewLayer;
 
-(define-enum-extended GtkTextViewLayer
-  (in-module "Gsk")
+(define-enum-extended TextViewLayer
+  (in-module "Gtk")
   (c-name "GtkTextViewLayer")
   (values
     '("below-text" "GTK_TEXT_VIEW_LAYER_BELOW_TEXT" "0")
@@ -2445,8 +2425,8 @@
 ;;   GTK_TEXT_EXTEND_SELECTION_LINE
 ;; } GtkTextExtendSelection;
 
-(define-enum-extended GtkTextExtendSelection
-  (in-module "Gsk")
+(define-enum-extended TextExtendSelection
+  (in-module "Gtk")
   (c-name "GtkTextExtendSelection")
   (values
     '("word" "GTK_TEXT_EXTEND_SELECTION_WORD" "0")
@@ -2463,8 +2443,8 @@
 ;;   GTK_TREE_MODEL_LIST_ONLY = 1 << 1
 ;; } GtkTreeModelFlags;
 
-(define-flags-extended GtkTreeModelFlags
-  (in-module "Gsk")
+(define-flags-extended TreeModelFlags
+  (in-module "Gtk")
   (c-name "GtkTreeModelFlags")
   (values
     '("iters-persist" "GTK_TREE_MODEL_ITERS_PERSIST" "1 << 0")
@@ -2482,8 +2462,8 @@
 ;;   GTK_TREE_VIEW_COLUMN_FIXED
 ;; } GtkTreeViewColumnSizing;
 
-(define-enum-extended GtkTreeViewColumnSizing
-  (in-module "Gsk")
+(define-enum-extended TreeViewColumnSizing
+  (in-module "Gtk")
   (c-name "GtkTreeViewColumnSizing")
   (values
     '("grow-only" "GTK_TREE_VIEW_COLUMN_GROW_ONLY" "0")
@@ -2507,8 +2487,8 @@
 ;;   GTK_TREE_VIEW_DROP_INTO_OR_AFTER
 ;; } GtkTreeViewDropPosition;
 
-(define-enum-extended GtkTreeViewDropPosition
-  (in-module "Gsk")
+(define-enum-extended TreeViewDropPosition
+  (in-module "Gtk")
   (c-name "GtkTreeViewDropPosition")
   (values
     '("before" "GTK_TREE_VIEW_DROP_BEFORE" "0")
@@ -2530,8 +2510,8 @@
 ;;   GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
 ;; } GtkCssParserError;
 
-(define-enum-extended GtkCssParserError
-  (in-module "Gsk")
+(define-enum-extended CssParserError
+  (in-module "Gtk")
   (c-name "GtkCssParserError")
   (values
     '("failed" "GTK_CSS_PARSER_ERROR_FAILED" "0")
@@ -2550,8 +2530,8 @@
 ;;   GTK_CSS_PARSER_WARNING_UNIMPLEMENTED
 ;; } GtkCssParserWarning;
 
-(define-enum-extended GtkCssParserWarning
-  (in-module "Gsk")
+(define-enum-extended CssParserWarning
+  (in-module "Gtk")
   (c-name "GtkCssParserWarning")
   (values
     '("deprecated" "GTK_CSS_PARSER_WARNING_DEPRECATED" "0")
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index f8a18420..2e6020d7 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -1,12 +1,5 @@
 ;; -*- scheme -*-
 ; object definitions ...
-(define-object PangoRenderer
-  (in-module "Gsk")
-  (parent "PangoRenderer")
-  (c-name "GskPangoRenderer")
-  (gtype-id "GSK_TYPE_PANGO_RENDERER")
-)
-
 (define-object Adjustment
   (in-module "Gtk")
   (parent "GInitiallyUnowned")
@@ -446,17 +439,6 @@
 
 ;; Enumerations and flags ...
 
-(define-enum PangoRendererState
-  (in-module "Gsk")
-  (c-name "GskPangoRendererState")
-  (gtype-id "GSK_TYPE_PANGO_RENDERER_STATE")
-  (values
-    '("normal" "GSK_PANGO_RENDERER_NORMAL")
-    '("selected" "GSK_PANGO_RENDERER_SELECTED")
-    '("cursor" "GSK_PANGO_RENDERER_CURSOR")
-  )
-)
-
 (define-enum License
   (in-module "Gtk")
   (c-name "GtkLicense")
@@ -592,7 +574,6 @@
     '("builder" "GTK_DEBUG_BUILDER")
     '("size-request" "GTK_DEBUG_SIZE_REQUEST")
     '("no-css-cache" "GTK_DEBUG_NO_CSS_CACHE")
-    '("shortcuts" "GTK_DEBUG_SHORTCUTS")
     '("interactive" "GTK_DEBUG_INTERACTIVE")
     '("touchscreen" "GTK_DEBUG_TOUCHSCREEN")
     '("actions" "GTK_DEBUG_ACTIONS")
@@ -600,6 +581,7 @@
     '("layout" "GTK_DEBUG_LAYOUT")
     '("snapshot" "GTK_DEBUG_SNAPSHOT")
     '("constraints" "GTK_DEBUG_CONSTRAINTS")
+    '("builder-objects" "GTK_DEBUG_BUILDER_OBJECTS")
   )
 )
 
@@ -1916,77 +1898,6 @@
 )
 
 
-;; From gsettings-mapping.h
-
-(define-function g_settings_set_mapping
-  (c-name "g_settings_set_mapping")
-  (return-type "GVariant*")
-  (parameters
-    '("const-GValue*" "value")
-    '("const-GVariantType*" "expected_type")
-    '("gpointer" "user_data")
-  )
-)
-
-(define-function g_settings_get_mapping
-  (c-name "g_settings_get_mapping")
-  (return-type "gboolean")
-  (parameters
-    '("GValue*" "value")
-    '("GVariant*" "variant")
-    '("gpointer" "user_data")
-  )
-)
-
-(define-function g_settings_mapping_is_compatible
-  (c-name "g_settings_mapping_is_compatible")
-  (return-type "gboolean")
-  (parameters
-    '("GType" "gvalue_type")
-    '("const-GVariantType*" "variant_type")
-  )
-)
-
-
-
-;; From gskpango.h
-
-(define-function gsk_pango_renderer_get_type
-  (c-name "gsk_pango_renderer_get_type")
-  (return-type "GType")
-)
-
-(define-method set_state
-  (of-object "GskPangoRenderer")
-  (c-name "gsk_pango_renderer_set_state")
-  (return-type "none")
-  (parameters
-    '("GskPangoRendererState" "state")
-  )
-)
-
-(define-method set_shape_handler
-  (of-object "GskPangoRenderer")
-  (c-name "gsk_pango_renderer_set_shape_handler")
-  (return-type "none")
-  (parameters
-    '("GskPangoShapeHandler" "handler")
-  )
-)
-
-(define-function gsk_pango_renderer_acquire
-  (c-name "gsk_pango_renderer_acquire")
-  (return-type "GskPangoRenderer*")
-)
-
-(define-method release
-  (of-object "GskPangoRenderer")
-  (c-name "gsk_pango_renderer_release")
-  (return-type "none")
-)
-
-
-
 ;; From gtk-a11y.h
 
 
@@ -3527,6 +3438,288 @@
 
 
 
+;; From gtkbitset.h
+
+(define-function gtk_bitset_get_type
+  (c-name "gtk_bitset_get_type")
+  (return-type "GType")
+)
+
+(define-method ref
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_ref")
+  (return-type "GtkBitset*")
+)
+
+(define-method unref
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_unref")
+  (return-type "none")
+)
+
+(define-method contains
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_contains")
+  (return-type "gboolean")
+  (parameters
+    '("guint" "value")
+  )
+)
+
+(define-method is_empty
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_is_empty")
+  (return-type "gboolean")
+)
+
+(define-method equals
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_equals")
+  (return-type "gboolean")
+  (parameters
+    '("const-GtkBitset*" "other")
+  )
+)
+
+(define-method get_minimum
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_get_minimum")
+  (return-type "guint")
+)
+
+(define-method get_maximum
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_get_maximum")
+  (return-type "guint")
+)
+
+(define-function gtk_bitset_new_empty
+  (c-name "gtk_bitset_new_empty")
+  (return-type "GtkBitset*")
+)
+
+(define-method copy
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_copy")
+  (return-type "GtkBitset*")
+)
+
+(define-method remove_all
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_remove_all")
+  (return-type "none")
+)
+
+(define-method add
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_add")
+  (return-type "gboolean")
+  (parameters
+    '("guint" "value")
+  )
+)
+
+(define-method remove
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_remove")
+  (return-type "gboolean")
+  (parameters
+    '("guint" "value")
+  )
+)
+
+(define-method add_range
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_add_range")
+  (return-type "none")
+  (parameters
+    '("guint" "start")
+    '("guint" "n_items")
+  )
+)
+
+(define-method remove_range
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_remove_range")
+  (return-type "none")
+  (parameters
+    '("guint" "start")
+    '("guint" "n_items")
+  )
+)
+
+(define-method add_range_closed
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_add_range_closed")
+  (return-type "none")
+  (parameters
+    '("guint" "first")
+    '("guint" "last")
+  )
+)
+
+(define-method remove_range_closed
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_remove_range_closed")
+  (return-type "none")
+  (parameters
+    '("guint" "first")
+    '("guint" "last")
+  )
+)
+
+(define-method add_rectangle
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_add_rectangle")
+  (return-type "none")
+  (parameters
+    '("guint" "start")
+    '("guint" "width")
+    '("guint" "height")
+    '("guint" "stride")
+  )
+)
+
+(define-method remove_rectangle
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_remove_rectangle")
+  (return-type "none")
+  (parameters
+    '("guint" "start")
+    '("guint" "width")
+    '("guint" "height")
+    '("guint" "stride")
+  )
+)
+
+(define-method union
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_union")
+  (return-type "none")
+  (parameters
+    '("const-GtkBitset*" "other")
+  )
+)
+
+(define-method intersect
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_intersect")
+  (return-type "none")
+  (parameters
+    '("const-GtkBitset*" "other")
+  )
+)
+
+(define-method subtract
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_subtract")
+  (return-type "none")
+  (parameters
+    '("const-GtkBitset*" "other")
+  )
+)
+
+(define-method difference
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_difference")
+  (return-type "none")
+  (parameters
+    '("const-GtkBitset*" "other")
+  )
+)
+
+(define-method shift_left
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_shift_left")
+  (return-type "none")
+  (parameters
+    '("guint" "amount")
+  )
+)
+
+(define-method shift_right
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_shift_right")
+  (return-type "none")
+  (parameters
+    '("guint" "amount")
+  )
+)
+
+(define-method slice
+  (of-object "GtkBitset")
+  (c-name "gtk_bitset_slice")
+  (return-type "none")
+  (parameters
+    '("guint" "position")
+    '("guint" "removed")
+    '("guint" "added")
+  )
+)
+
+(define-method init_first
+  (of-object "GtkBitsetIter")
+  (c-name "gtk_bitset_iter_init_first")
+  (return-type "gboolean")
+  (parameters
+    '("const-GtkBitset*" "set")
+    '("guint*" "value")
+  )
+)
+
+(define-method init_last
+  (of-object "GtkBitsetIter")
+  (c-name "gtk_bitset_iter_init_last")
+  (return-type "gboolean")
+  (parameters
+    '("const-GtkBitset*" "set")
+    '("guint*" "value")
+  )
+)
+
+(define-method init_at
+  (of-object "GtkBitsetIter")
+  (c-name "gtk_bitset_iter_init_at")
+  (return-type "gboolean")
+  (parameters
+    '("const-GtkBitset*" "set")
+    '("guint" "target")
+    '("guint*" "value")
+  )
+)
+
+(define-method next
+  (of-object "GtkBitsetIter")
+  (c-name "gtk_bitset_iter_next")
+  (return-type "gboolean")
+  (parameters
+    '("guint*" "value")
+  )
+)
+
+(define-method previous
+  (of-object "GtkBitsetIter")
+  (c-name "gtk_bitset_iter_previous")
+  (return-type "gboolean")
+  (parameters
+    '("guint*" "value")
+  )
+)
+
+(define-method get_value
+  (of-object "GtkBitsetIter")
+  (c-name "gtk_bitset_iter_get_value")
+  (return-type "guint")
+)
+
+(define-method is_valid
+  (of-object "GtkBitsetIter")
+  (c-name "gtk_bitset_iter_is_valid")
+  (return-type "gboolean")
+)
+
+
+
 ;; From gtkbookmarklist.h
 
 (define-function gtk_bookmark_list_new
@@ -11079,27 +11272,6 @@
 
 
 
-;; From gtkfunctionslistitemfactory.h
-
-(define-function gtk_functions_list_item_factory_get_type
-  (c-name "gtk_functions_list_item_factory_get_type")
-  (return-type "GType")
-)
-
-(define-function gtk_functions_list_item_factory_new
-  (c-name "gtk_functions_list_item_factory_new")
-  (is-constructor-of "GtkFunctionsListItemFactory")
-  (return-type "GtkListItemFactory*")
-  (parameters
-    '("GtkListItemSetupFunc" "setup_func")
-    '("GtkListItemBindFunc" "bind_func")
-    '("gpointer" "user_data")
-    '("GDestroyNotify" "user_destroy")
-  )
-)
-
-
-
 ;; From gtkgestureclick.h
 
 (define-function gtk_gesture_click_get_type
@@ -15773,6 +15945,12 @@
   )
 )
 
+(define-method get_model
+  (of-object "GtkMultiSelection")
+  (c-name "gtk_multi_selection_get_model")
+  (return-type "GListModel*")
+)
+
 
 
 ;; From gtkmultisorter.h
@@ -19672,32 +19850,6 @@
 
 
 
-;; From gtkpropertyselection.h
-
-(define-function gtk_property_selection_new
-  (c-name "gtk_property_selection_new")
-  (is-constructor-of "GtkPropertySelection")
-  (return-type "GListModel*")
-  (parameters
-    '("GListModel*" "model")
-    '("const-char*" "property")
-  )
-)
-
-(define-method get_model
-  (of-object "GtkPropertySelection")
-  (c-name "gtk_property_selection_get_model")
-  (return-type "GListModel*")
-)
-
-(define-method get_property
-  (of-object "GtkPropertySelection")
-  (c-name "gtk_property_selection_get_property")
-  (return-type "const-char*")
-)
-
-
-
 ;; From gtkquartz.h
 
 
@@ -20909,10 +21061,6 @@
   (c-name "gtk_scrolled_window_new")
   (is-constructor-of "GtkScrolledWindow")
   (return-type "GtkWidget*")
-  (parameters
-    '("GtkAdjustment*" "hadjustment")
-    '("GtkAdjustment*" "vadjustment")
-  )
 )
 
 (define-method set_hadjustment
@@ -21306,10 +21454,26 @@
   )
 )
 
-(define-method select_item
+(define-method get_selection
   (of-object "GtkSelectionModel")
-  (c-name "gtk_selection_model_select_item")
-  (return-type "gboolean")
+  (c-name "gtk_selection_model_get_selection")
+  (return-type "GtkBitset*")
+)
+
+(define-method get_selection_in_range
+  (of-object "GtkSelectionModel")
+  (c-name "gtk_selection_model_get_selection_in_range")
+  (return-type "GtkBitset*")
+  (parameters
+    '("guint" "position")
+    '("guint" "n_items")
+  )
+)
+
+(define-method select_item
+  (of-object "GtkSelectionModel")
+  (c-name "gtk_selection_model_select_item")
+  (return-type "gboolean")
   (parameters
     '("guint" "position")
     '("gboolean" "unselect_rest")
@@ -21358,36 +21522,13 @@
   (return-type "gboolean")
 )
 
-(define-method select_callback
+(define-method set_selection
   (of-object "GtkSelectionModel")
-  (c-name "gtk_selection_model_select_callback")
+  (c-name "gtk_selection_model_set_selection")
   (return-type "gboolean")
   (parameters
-    '("gboolean" "unselect_rest")
-    '("GtkSelectionCallback" "callback")
-    '("gpointer" "data")
-  )
-)
-
-(define-method unselect_callback
-  (of-object "GtkSelectionModel")
-  (c-name "gtk_selection_model_unselect_callback")
-  (return-type "gboolean")
-  (parameters
-    '("GtkSelectionCallback" "callback")
-    '("gpointer" "data")
-  )
-)
-
-(define-method query_range
-  (of-object "GtkSelectionModel")
-  (c-name "gtk_selection_model_query_range")
-  (return-type "none")
-  (parameters
-    '("guint" "position")
-    '("guint*" "start_range")
-    '("guint*" "n_items")
-    '("gboolean*" "selected")
+    '("GtkBitset*" "selected")
+    '("GtkBitset*" "mask")
   )
 )
 
@@ -21421,140 +21562,6 @@
 
 
 
-;; From gtkset.h
-
-(define-function gtk_set_new
-  (c-name "gtk_set_new")
-  (is-constructor-of "GtkSet")
-  (return-type "GtkSet*")
-)
-
-(define-method free
-  (of-object "GtkSet")
-  (c-name "gtk_set_free")
-  (return-type "none")
-)
-
-(define-method copy
-  (of-object "GtkSet")
-  (c-name "gtk_set_copy")
-  (return-type "GtkSet*")
-)
-
-(define-method contains
-  (of-object "GtkSet")
-  (c-name "gtk_set_contains")
-  (return-type "gboolean")
-  (parameters
-    '("guint" "item")
-  )
-)
-
-(define-method remove_all
-  (of-object "GtkSet")
-  (c-name "gtk_set_remove_all")
-  (return-type "none")
-)
-
-(define-method add_item
-  (of-object "GtkSet")
-  (c-name "gtk_set_add_item")
-  (return-type "none")
-  (parameters
-    '("guint" "item")
-  )
-)
-
-(define-method remove_item
-  (of-object "GtkSet")
-  (c-name "gtk_set_remove_item")
-  (return-type "none")
-  (parameters
-    '("guint" "item")
-  )
-)
-
-(define-method add_range
-  (of-object "GtkSet")
-  (c-name "gtk_set_add_range")
-  (return-type "none")
-  (parameters
-    '("guint" "first")
-    '("guint" "n")
-  )
-)
-
-(define-method remove_range
-  (of-object "GtkSet")
-  (c-name "gtk_set_remove_range")
-  (return-type "none")
-  (parameters
-    '("guint" "first")
-    '("guint" "n")
-  )
-)
-
-(define-method find_range
-  (of-object "GtkSet")
-  (c-name "gtk_set_find_range")
-  (return-type "none")
-  (parameters
-    '("guint" "position")
-    '("guint" "upper_bound")
-    '("guint*" "start")
-    '("guint*" "n_items")
-    '("gboolean*" "contained")
-  )
-)
-
-(define-method shift
-  (of-object "GtkSet")
-  (c-name "gtk_set_shift")
-  (return-type "none")
-  (parameters
-    '("guint" "first")
-    '("int" "shift")
-  )
-)
-
-(define-method init
-  (of-object "GtkSetIter")
-  (c-name "gtk_set_iter_init")
-  (return-type "none")
-  (parameters
-    '("GtkSet*" "set")
-  )
-)
-
-(define-method next
-  (of-object "GtkSetIter")
-  (c-name "gtk_set_iter_next")
-  (return-type "gboolean")
-  (parameters
-    '("guint*" "item")
-  )
-)
-
-(define-method is_empty
-  (of-object "GtkSet")
-  (c-name "gtk_set_is_empty")
-  (return-type "gboolean")
-)
-
-(define-method get_min
-  (of-object "GtkSet")
-  (c-name "gtk_set_get_min")
-  (return-type "guint")
-)
-
-(define-method get_max
-  (of-object "GtkSet")
-  (c-name "gtk_set_get_max")
-  (return-type "guint")
-)
-
-
-
 ;; From gtksettings.h
 
 (define-function gtk_settings_get_type
@@ -23172,21 +23179,6 @@
   )
 )
 
-(define-method set_homogeneous
-  (of-object "GtkStack")
-  (c-name "gtk_stack_set_homogeneous")
-  (return-type "none")
-  (parameters
-    '("gboolean" "homogeneous")
-  )
-)
-
-(define-method get_homogeneous
-  (of-object "GtkStack")
-  (c-name "gtk_stack_get_homogeneous")
-  (return-type "gboolean")
-)
-
 (define-method set_hhomogeneous
   (of-object "GtkStack")
   (c-name "gtk_stack_set_hhomogeneous")
@@ -23468,6 +23460,73 @@
 
 
 
+;; From gtkstringlist.h
+
+(define-method get_string
+  (of-object "GtkStringObject")
+  (c-name "gtk_string_object_get_string")
+  (return-type "const-char*")
+)
+
+(define-function gtk_string_list_new
+  (c-name "gtk_string_list_new")
+  (is-constructor-of "GtkStringList")
+  (return-type "GtkStringList*")
+  (parameters
+    '("const-char**" "strings")
+  )
+)
+
+(define-method append
+  (of-object "GtkStringList")
+  (c-name "gtk_string_list_append")
+  (return-type "none")
+  (parameters
+    '("const-char*" "string")
+  )
+)
+
+(define-method take
+  (of-object "GtkStringList")
+  (c-name "gtk_string_list_take")
+  (return-type "none")
+  (parameters
+    '("char*" "string")
+  )
+)
+
+(define-method remove
+  (of-object "GtkStringList")
+  (c-name "gtk_string_list_remove")
+  (return-type "none")
+  (parameters
+    '("guint" "position")
+  )
+)
+
+(define-method splice
+  (of-object "GtkStringList")
+  (c-name "gtk_string_list_splice")
+  (return-type "none")
+  (parameters
+    '("guint" "position")
+    '("guint" "n_removals")
+    '("const-char**" "additions")
+    '("guint" "n_additions")
+  )
+)
+
+(define-method get_string
+  (of-object "GtkStringList")
+  (c-name "gtk_string_list_get_string")
+  (return-type "const-char*")
+  (parameters
+    '("guint" "position")
+  )
+)
+
+
+
 ;; From gtkstringsorter.h
 
 (define-function gtk_string_sorter_new
@@ -29645,15 +29704,6 @@
   (return-type "gboolean")
 )
 
-(define-method device_is_shadowed
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_device_is_shadowed")
-  (return-type "gboolean")
-  (parameters
-    '("GdkDevice*" "device")
-  )
-)
-
 (define-method set_name
   (of-object "GtkWidget")
   (c-name "gtk_widget_set_name")
@@ -30057,21 +30107,6 @@
   )
 )
 
-(define-method get_support_multidevice
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_get_support_multidevice")
-  (return-type "gboolean")
-)
-
-(define-method set_support_multidevice
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_set_support_multidevice")
-  (return-type "none")
-  (parameters
-    '("gboolean" "support_multidevice")
-  )
-)
-
 (define-method set_accessible_type
   (of-object "GtkWidgetClass")
   (c-name "gtk_widget_class_set_accessible_type")
@@ -31363,54 +31398,6 @@
 
 
 
-;; From imm-extra.h
-
-
-
-;; From language-names.h
-
-(define-function get_language_name
-  (c-name "get_language_name")
-  (return-type "const-char*")
-  (parameters
-    '("PangoLanguage*" "language")
-  )
-)
-
-(define-function get_language_name_for_tag
-  (c-name "get_language_name_for_tag")
-  (return-type "const-char*")
-  (parameters
-    '("guint32" "tag")
-  )
-)
-
-
-
-;; From open-type-layout.h
-
-
-
-;; From script-names.h
-
-(define-function get_script_name
-  (c-name "get_script_name")
-  (return-type "const-char*")
-  (parameters
-    '("GUnicodeScript" "script")
-  )
-)
-
-(define-function get_script_name_for_tag
-  (c-name "get_script_name_for_tag")
-  (return-type "const-char*")
-  (parameters
-    '("guint32" "tag")
-  )
-)
-
-
-
 ;; From gtkcssenums.h
 
 
@@ -32052,152 +32039,6 @@
 
 
 
-;; From text-input-unstable-v3-client-protocol.h
-
-(define-function zwp_text_input_v3_add_listener
-  (c-name "zwp_text_input_v3_add_listener")
-  (return-type "int")
-  (parameters
-    '("struct-zwp_text_input_v3*" "zwp_text_input_v3")
-    '("const-struct-zwp_text_input_v3_listener*" "listener")
-    '("void*" "data")
-  )
-)
-
-(define-function zwp_text_input_v3_set_user_data
-  (c-name "zwp_text_input_v3_set_user_data")
-  (return-type "none")
-  (parameters
-    '("struct-zwp_text_input_v3*" "zwp_text_input_v3")
-    '("void*" "user_data")
-  )
-)
-
-(define-function zwp_text_input_v3_get_user_data
-  (c-name "zwp_text_input_v3_get_user_data")
-  (return-type "void*")
-  (parameters
-    '("struct-zwp_text_input_v3*" "zwp_text_input_v3")
-  )
-)
-
-(define-function zwp_text_input_v3_get_version
-  (c-name "zwp_text_input_v3_get_version")
-  (return-type "uint32_t")
-  (parameters
-    '("struct-zwp_text_input_v3*" "zwp_text_input_v3")
-  )
-)
-
-(define-function zwp_text_input_v3_destroy
-  (c-name "zwp_text_input_v3_destroy")
-  (return-type "none")
-  (parameters
-    '("struct-zwp_text_input_v3*" "zwp_text_input_v3")
-  )
-)
-
-(define-function zwp_text_input_v3_enable
-  (c-name "zwp_text_input_v3_enable")
-  (return-type "none")
-  (parameters
-    '("struct-zwp_text_input_v3*" "zwp_text_input_v3")
-  )
-)
-
-(define-function zwp_text_input_v3_disable
-  (c-name "zwp_text_input_v3_disable")
-  (return-type "none")
-  (parameters
-    '("struct-zwp_text_input_v3*" "zwp_text_input_v3")
-  )
-)
-
-(define-function zwp_text_input_v3_set_surrounding_text
-  (c-name "zwp_text_input_v3_set_surrounding_text")
-  (return-type "none")
-  (parameters
-    '("struct-zwp_text_input_v3*" "zwp_text_input_v3")
-    '("const-char*" "text")
-    '("int32_t" "cursor")
-    '("int32_t" "anchor")
-  )
-)
-
-(define-function zwp_text_input_v3_set_text_change_cause
-  (c-name "zwp_text_input_v3_set_text_change_cause")
-  (return-type "none")
-  (parameters
-    '("struct-zwp_text_input_v3*" "zwp_text_input_v3")
-    '("uint32_t" "cause")
-  )
-)
-
-(define-function zwp_text_input_v3_set_content_type
-  (c-name "zwp_text_input_v3_set_content_type")
-  (return-type "none")
-  (parameters
-    '("struct-zwp_text_input_v3*" "zwp_text_input_v3")
-    '("uint32_t" "hint")
-    '("uint32_t" "purpose")
-  )
-)
-
-(define-function zwp_text_input_v3_set_cursor_rectangle
-  (c-name "zwp_text_input_v3_set_cursor_rectangle")
-  (return-type "none")
-  (parameters
-    '("struct-zwp_text_input_v3*" "zwp_text_input_v3")
-    '("int32_t" "x")
-    '("int32_t" "y")
-    '("int32_t" "width")
-    '("int32_t" "height")
-  )
-)
-
-(define-function zwp_text_input_v3_commit
-  (c-name "zwp_text_input_v3_commit")
-  (return-type "none")
-  (parameters
-    '("struct-zwp_text_input_v3*" "zwp_text_input_v3")
-  )
-)
-
-(define-function zwp_text_input_manager_v3_set_user_data
-  (c-name "zwp_text_input_manager_v3_set_user_data")
-  (return-type "none")
-  (parameters
-    '("struct-zwp_text_input_manager_v3*" "zwp_text_input_manager_v3")
-    '("void*" "user_data")
-  )
-)
-
-(define-function zwp_text_input_manager_v3_get_user_data
-  (c-name "zwp_text_input_manager_v3_get_user_data")
-  (return-type "void*")
-  (parameters
-    '("struct-zwp_text_input_manager_v3*" "zwp_text_input_manager_v3")
-  )
-)
-
-(define-function zwp_text_input_manager_v3_get_version
-  (c-name "zwp_text_input_manager_v3_get_version")
-  (return-type "uint32_t")
-  (parameters
-    '("struct-zwp_text_input_manager_v3*" "zwp_text_input_manager_v3")
-  )
-)
-
-(define-function zwp_text_input_manager_v3_destroy
-  (c-name "zwp_text_input_manager_v3_destroy")
-  (return-type "none")
-  (parameters
-    '("struct-zwp_text_input_manager_v3*" "zwp_text_input_manager_v3")
-  )
-)
-
-
-
 ;; From gtkcssenumtypes.h
 
 (define-function gtk_css_parser_error_get_type
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index 6fbed485..2c07ee24 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -6398,6 +6398,17 @@
   (construct-only #f)
 )
 
+;; From GtkMultiSelection
+
+(define-property model
+  (of-object "GtkMultiSelection")
+  (prop-type "GParamObject")
+  (docs "List managed by this selection")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
 ;; From GtkNativeDialog
 
 (define-signal response
@@ -12100,15 +12111,6 @@
   )
 )
 
-(define-signal grab-notify
-  (of-object "GtkWidget")
-  (return-type "void")
-  (flags "Run First")
-  (parameters
-    '("gboolean" "p0")
-  )
-)
-
 (define-signal mnemonic-activate
   (of-object "GtkWidget")
   (return-type "gboolean")
diff --git a/gtk/src/gtk_vfuncs.defs b/gtk/src/gtk_vfuncs.defs
index 0b0052cb..b64cdc5e 100644
--- a/gtk/src/gtk_vfuncs.defs
+++ b/gtk/src/gtk_vfuncs.defs
@@ -490,6 +490,15 @@
   )
 )
 
+(define-vfunc get_selection_in_range
+  (of-object "GtkSelectionModel")
+  (return-type "GtkBitset*")
+  (parameters
+    '("guint" "position")
+    '("guint" "n_items")
+  )
+)
+
 (define-vfunc select_item
   (of-object "GtkSelectionModel")
   (return-type "gboolean")
@@ -536,33 +545,12 @@
   (return-type "gboolean")
 )
 
-(define-vfunc select_callback
+(define-vfunc set_selection
   (of-object "GtkSelectionModel")
   (return-type "gboolean")
   (parameters
-    '("gboolean" "unselect_rest")
-    '("GtkSelectionCallback" "callback")
-    '("gpointer" "data")
-  )
-)
-
-(define-vfunc unselect_callback
-  (of-object "GtkSelectionModel")
-  (return-type "gboolean")
-  (parameters
-    '("GtkSelectionCallback" "callback")
-    '("gpointer" "data")
-  )
-)
-
-(define-vfunc query_range
-  (of-object "GtkSelectionModel")
-  (return-type "void")
-  (parameters
-    '("guint" "position")
-    '("guint*" "start_range")
-    '("guint*" "n_items")
-    '("gboolean*" "selected")
+    '("GtkBitset*" "selected")
+    '("GtkBitset*" "mask")
   )
 )
 
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 1cfe874d..d47acaca 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -151,6 +151,7 @@ int main(int /* argc */, char** /* argv */)
             << get_defs( GTK_TYPE_MEDIA_STREAM )
             << get_defs( GTK_TYPE_MENU_BUTTON )
             << get_defs( GTK_TYPE_MESSAGE_DIALOG )
+            << get_defs( GTK_TYPE_MULTI_SELECTION )
             << get_defs( GTK_TYPE_NATIVE_DIALOG )
             << get_defs( GTK_TYPE_NO_SELECTION )
             << get_defs( GTK_TYPE_NOTEBOOK )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]