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




commit 43dd05c4cb7c0911df189d38b2c7a84688f34706
Author: Andreas Persson <andreasp56 outlook com>
Date:   Tue Jul 28 17:56:10 2020 +0200

    Gdk, Gtk: Regenerate docs.xml and .defs files
    
    A lot of changes because of the gtk change to use char, int, float and
    double instead of the corresponding Glib types.

 gdk/src/gdk_docs.xml     |  105 +-
 gdk/src/gdk_enums.defs   |   12 +-
 gdk/src/gdk_methods.defs |  144 +--
 gdk/src/gdk_signals.defs |   10 -
 gtk/src/gtk_docs.xml     | 1931 ++++++++++++++++++++++++-----
 gtk/src/gtk_enums.defs   |  380 +++++-
 gtk/src/gtk_methods.defs | 3026 +++++++++++++++++++++++++++-------------------
 gtk/src/gtk_signals.defs |   18 +-
 8 files changed, 3847 insertions(+), 1779 deletions(-)
---
diff --git a/gdk/src/gdk_docs.xml b/gdk/src/gdk_docs.xml
index e77cbeee9..6fe1848f0 100644
--- a/gdk/src/gdk_docs.xml
+++ b/gdk/src/gdk_docs.xml
@@ -357,13 +357,6 @@ Other device types will have a %NULL associated device.
 </description>
 </property>
 
-<property name="GdkDevice:axes">
-<description>
-The axes currently available for this device.
-
-</description>
-</property>
-
 <property name="GdkDevice:display">
 <description>
 The #GdkDisplay the #GdkDevice pertains to.
@@ -1288,10 +1281,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_CURSOR">
-<parameter_description> the device is a graphics tablet “puck” or similar device.
-</parameter_description>
-</parameter>
 <parameter name="GDK_SOURCE_KEYBOARD">
 <parameter_description> the device is a keyboard.
 </parameter_description>
@@ -5033,20 +5022,6 @@ returned, as there is no associated device.
 </return>
 </function>
 
-<function name="gdk_device_get_axes">
-<description>
-Returns the axes currently available on the device.
-
-</description>
-<parameters>
-<parameter name="device">
-<parameter_description> a #GdkDevice
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gdk_device_get_axis">
 <description>
 Interprets an array of double as axis values for a given device,
@@ -5351,38 +5326,6 @@ Determines the type of the device.
 </return>
 </function>
 
-<function name="gdk_device_get_state">
-<description>
-Gets the current state of a pointer device relative to @surface. As a
-physical device’s coordinates are those of its logical pointer, this
-function may not be called on devices of type %GDK_DEVICE_TYPE_PHYSICAL,
-unless there is an ongoing grab on them.
-
-See also: gdk_seat_grab().
-
-</description>
-<parameters>
-<parameter name="device">
-<parameter_description> a #GdkDevice.
-</parameter_description>
-</parameter>
-<parameter name="surface">
-<parameter_description> a #GdkSurface.
-</parameter_description>
-</parameter>
-<parameter name="axes">
-<parameter_description> an array of doubles to store the values of
-the axes of @device in, or %NULL.
-</parameter_description>
-</parameter>
-<parameter name="mask">
-<parameter_description> location to store the modifiers, or %NULL.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gdk_device_get_surface_at_position">
 <description>
 Obtains the surface underneath @device, returning the location of the device in @win_x and @win_y in
@@ -5429,10 +5372,10 @@ compose #GSettings paths to store settings for this device.
 static GSettings *
 get_device_settings (GdkDevice *device)
 {
-const gchar *vendor, *product;
+const char *vendor, *product;
 GSettings *settings;
 GdkDevice *device;
-gchar *path;
+char *path;
 
 vendor = gdk_device_get_vendor_id (device);
 product = gdk_device_get_product_id (device);
@@ -7385,30 +7328,6 @@ Returns the seat that originated the event.
 </return>
 </function>
 
-<function name="gdk_event_get_source_device">
-<description>
-This function returns the physical #GdkDevice that has triggered
-the event, falling back to the logical device, as returned by
-gdk_event_get_device(), if the event wasn’t caused by
-interaction with a hardware device. This may happen for example
-in synthesized crossing events after a #GdkSurface updates its
-geometry or a grab is acquired/released.
-
-If the event does not contain a device field, this function will
-return %NULL.
-
-
-</description>
-<parameters>
-<parameter name="event">
-<parameter_description> a #GdkEvent
-</parameter_description>
-</parameter>
-</parameters>
-<return> a #GdkDevice, or %NULL.
-</return>
-</function>
-
 <function name="gdk_event_get_surface">
 <description>
 Extracts the #GdkSurface associated with an event.
@@ -14347,7 +14266,7 @@ a is a floating point value in the range 0 to 1.
 <description>
 Returns a textual specification of @rgba in the form
 `rgb(r,g,b)` or
-`rgba(r g,b,a)`,
+`rgba(r,g,b,a)`,
 where “r”, “g”, “b” and “a” represent the red, green,
 blue and alpha values respectively. “r”, “g”, and “b” are
 represented as integers in the range 0 to 255, and “a”
@@ -14525,6 +14444,24 @@ capabilities. This object is owned by GTK and must not be freed.
 </return>
 </function>
 
+<function name="gdk_seat_get_tools">
+<description>
+Returns all #GdkDeviceTool&lt;!-- --&gt;s that are known to the
+application.
+
+
+</description>
+<parameters>
+<parameter name="seat">
+<parameter_description> A #GdkSeat
+</parameter_description>
+</parameter>
+</parameters>
+<return> A list of tools. Free with
+g_list_free().
+</return>
+</function>
+
 <function name="gdk_seat_grab">
 <description>
 Grabs the seat so that all events corresponding to the given @capabilities
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index 75847fd97..b6e7d54c4 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_CURSOR,
 ;;   GDK_SOURCE_KEYBOARD,
 ;;   GDK_SOURCE_TOUCHSCREEN,
 ;;   GDK_SOURCE_TOUCHPAD,
@@ -19,12 +18,11 @@
   (values
     '("mouse" "GDK_SOURCE_MOUSE" "0")
     '("pen" "GDK_SOURCE_PEN" "1")
-    '("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")
+    '("keyboard" "GDK_SOURCE_KEYBOARD" "2")
+    '("touchscreen" "GDK_SOURCE_TOUCHSCREEN" "3")
+    '("touchpad" "GDK_SOURCE_TOUCHPAD" "4")
+    '("trackpoint" "GDK_SOURCE_TRACKPOINT" "5")
+    '("tablet-pad" "GDK_SOURCE_TABLET_PAD" "6")
   )
 )
 
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index 2bd03193e..749739d3c 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")
-    '("cursor" "GDK_SOURCE_CURSOR")
     '("keyboard" "GDK_SOURCE_KEYBOARD")
     '("touchscreen" "GDK_SOURCE_TOUCHSCREEN")
     '("touchpad" "GDK_SOURCE_TOUCHPAD")
@@ -447,7 +446,7 @@
   (c-name "gdk_app_launch_context_set_desktop")
   (return-type "none")
   (parameters
-    '("gint" "desktop")
+    '("int" "desktop")
   )
 )
 
@@ -516,8 +515,8 @@
   (parameters
     '("cairo_t*" "cr")
     '("const-GdkPixbuf*" "pixbuf")
-    '("gdouble" "pixbuf_x")
-    '("gdouble" "pixbuf_y")
+    '("double" "pixbuf_x")
+    '("double" "pixbuf_y")
   )
 )
 
@@ -1363,7 +1362,7 @@
   (c-name "gdk_cursor_new_from_name")
   (return-type "GdkCursor*")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
     '("GdkCursor*" "fallback")
   )
 )
@@ -1410,7 +1409,7 @@
 (define-method get_name
   (of-object "GdkDevice")
   (c-name "gdk_device_get_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_has_cursor
@@ -1425,26 +1424,6 @@
   (return-type "GdkInputSource")
 )
 
-(define-method get_axis_use
-  (of-object "GdkDevice")
-  (c-name "gdk_device_get_axis_use")
-  (return-type "GdkAxisUse")
-  (parameters
-    '("guint" "index_")
-  )
-)
-
-(define-method get_state
-  (of-object "GdkDevice")
-  (c-name "gdk_device_get_state")
-  (return-type "none")
-  (parameters
-    '("GdkSurface*" "surface")
-    '("gdouble*" "axes")
-    '("GdkModifierType*" "mask")
-  )
-)
-
 (define-method get_surface_at_position
   (of-object "GdkDevice")
   (c-name "gdk_device_get_surface_at_position")
@@ -1455,23 +1434,6 @@
   )
 )
 
-(define-method get_n_axes
-  (of-object "GdkDevice")
-  (c-name "gdk_device_get_n_axes")
-  (return-type "gint")
-)
-
-(define-method get_axis
-  (of-object "GdkDevice")
-  (c-name "gdk_device_get_axis")
-  (return-type "gboolean")
-  (parameters
-    '("gdouble*" "axes")
-    '("GdkAxisUse" "use")
-    '("gdouble*" "value")
-  )
-)
-
 (define-method get_display
   (of-object "GdkDevice")
   (c-name "gdk_device_get_display")
@@ -1499,13 +1461,13 @@
 (define-method get_vendor_id
   (of-object "GdkDevice")
   (c-name "gdk_device_get_vendor_id")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_product_id
   (of-object "GdkDevice")
   (c-name "gdk_device_get_product_id")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_seat
@@ -1514,12 +1476,6 @@
   (return-type "GdkSeat*")
 )
 
-(define-method get_axes
-  (of-object "GdkDevice")
-  (c-name "gdk_device_get_axes")
-  (return-type "GdkAxisFlags")
-)
-
 (define-method get_num_touches
   (of-object "GdkDevice")
   (c-name "gdk_device_get_num_touches")
@@ -1580,22 +1536,22 @@
 (define-method get_n_groups
   (of-object "GdkDevicePad")
   (c-name "gdk_device_pad_get_n_groups")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_group_n_modes
   (of-object "GdkDevicePad")
   (c-name "gdk_device_pad_get_group_n_modes")
-  (return-type "gint")
+  (return-type "int")
   (parameters
-    '("gint" "group_idx")
+    '("int" "group_idx")
   )
 )
 
 (define-method get_n_features
   (of-object "GdkDevicePad")
   (c-name "gdk_device_pad_get_n_features")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GdkDevicePadFeature" "feature")
   )
@@ -1604,10 +1560,10 @@
 (define-method get_feature_group
   (of-object "GdkDevicePad")
   (c-name "gdk_device_pad_get_feature_group")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GdkDevicePadFeature" "feature")
-    '("gint" "feature_idx")
+    '("int" "feature_idx")
   )
 )
 
@@ -1638,6 +1594,12 @@
   (return-type "GdkDeviceToolType")
 )
 
+(define-method get_axes
+  (of-object "GdkDeviceTool")
+  (c-name "gdk_device_tool_get_axes")
+  (return-type "GdkAxisFlags")
+)
+
 
 
 ;; From gdkdisplay.h
@@ -1651,14 +1613,14 @@
   (c-name "gdk_display_open")
   (return-type "GdkDisplay*")
   (parameters
-    '("const-gchar*" "display_name")
+    '("const-char*" "display_name")
   )
 )
 
 (define-method get_name
   (of-object "GdkDisplay")
   (c-name "gdk_display_get_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method device_is_grabbed
@@ -1746,14 +1708,14 @@
   (c-name "gdk_display_notify_startup_complete")
   (return-type "none")
   (parameters
-    '("const-gchar*" "startup_id")
+    '("const-char*" "startup_id")
   )
 )
 
 (define-method get_startup_notification_id
   (of-object "GdkDisplay")
   (c-name "gdk_display_get_startup_notification_id")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_app_launch_context
@@ -1886,7 +1848,7 @@
   (c-name "gdk_display_manager_open_display")
   (return-type "GdkDisplay*")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
@@ -1894,7 +1856,7 @@
   (c-name "gdk_set_allowed_backends")
   (return-type "none")
   (parameters
-    '("const-gchar*" "backends")
+    '("const-char*" "backends")
   )
 )
 
@@ -1979,8 +1941,8 @@
   (c-name "gdk_drag_set_hotspot")
   (return-type "none")
   (parameters
-    '("gint" "hot_x")
-    '("gint" "hot_y")
+    '("int" "hot_x")
+    '("int" "hot_y")
   )
 )
 
@@ -2214,12 +2176,6 @@
   (return-type "GdkDevice*")
 )
 
-(define-method get_source_device
-  (of-object "GdkEvent")
-  (c-name "gdk_event_get_source_device")
-  (return-type "GdkDevice*")
-)
-
 (define-method get_device_tool
   (of-object "GdkEvent")
   (c-name "gdk_event_get_device_tool")
@@ -2965,7 +2921,7 @@
   (c-name "gdk_keyval_from_name")
   (return-type "guint")
   (parameters
-    '("const-gchar*" "keyval_name")
+    '("const-char*" "keyval_name")
   )
 )
 
@@ -3224,10 +3180,10 @@
   (return-type "cairo_region_t*")
   (parameters
     '("PangoLayoutLine*" "line")
-    '("gint" "x_origin")
-    '("gint" "y_origin")
-    '("const-gint*" "index_ranges")
-    '("gint" "n_ranges")
+    '("int" "x_origin")
+    '("int" "y_origin")
+    '("const-int*" "index_ranges")
+    '("int" "n_ranges")
   )
 )
 
@@ -3236,10 +3192,10 @@
   (return-type "cairo_region_t*")
   (parameters
     '("PangoLayout*" "layout")
-    '("gint" "x_origin")
-    '("gint" "y_origin")
-    '("const-gint*" "index_ranges")
-    '("gint" "n_ranges")
+    '("int" "x_origin")
+    '("int" "y_origin")
+    '("const-int*" "index_ranges")
+    '("int" "n_ranges")
   )
 )
 
@@ -3252,10 +3208,10 @@
   (return-type "GdkPixbuf*")
   (parameters
     '("cairo_surface_t*" "surface")
-    '("gint" "src_x")
-    '("gint" "src_y")
-    '("gint" "width")
-    '("gint" "height")
+    '("int" "src_x")
+    '("int" "src_y")
+    '("int" "width")
+    '("int" "height")
   )
 )
 
@@ -3548,14 +3504,14 @@
   (c-name "gdk_rgba_parse")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "spec")
+    '("const-char*" "spec")
   )
 )
 
 (define-method to_string
   (of-object "GdkRGBA")
   (c-name "gdk_rgba_to_string")
-  (return-type "gchar*")
+  (return-type "char*")
 )
 
 
@@ -3588,6 +3544,12 @@
   )
 )
 
+(define-method get_tools
+  (of-object "GdkSeat")
+  (c-name "gdk_seat_get_tools")
+  (return-type "GList*")
+)
+
 (define-method get_pointer
   (of-object "GdkSeat")
   (c-name "gdk_seat_get_pointer")
@@ -3731,7 +3693,7 @@
 (define-method get_scale_factor
   (of-object "GdkSurface")
   (c-name "gdk_surface_get_scale_factor")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_device_position
@@ -3801,10 +3763,10 @@
   (c-name "gdk_surface_set_shadow_width")
   (return-type "none")
   (parameters
-    '("gint" "left")
-    '("gint" "right")
-    '("gint" "top")
-    '("gint" "bottom")
+    '("int" "left")
+    '("int" "right")
+    '("int" "top")
+    '("int" "bottom")
   )
 )
 
diff --git a/gdk/src/gdk_signals.defs b/gdk/src/gdk_signals.defs
index 3b391b280..729659a31 100644
--- a/gdk/src/gdk_signals.defs
+++ b/gdk/src/gdk_signals.defs
@@ -254,16 +254,6 @@
   (default-value "0")
 )
 
-(define-property axes
-  (of-object "GdkDevice")
-  (prop-type "GParamFlags")
-  (docs "Axes")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-  (default-value "0")
-)
-
 (define-property tool
   (of-object "GdkDevice")
   (prop-type "GParamObject")
diff --git a/gtk/src/gtk_docs.xml b/gtk/src/gtk_docs.xml
index 084a2c0c1..4e7f35c67 100644
--- a/gtk/src/gtk_docs.xml
+++ b/gtk/src/gtk_docs.xml
@@ -1,4 +1,21 @@
 <root>
+<property name="GtkATContext:accessible">
+<description>
+The #GtkAccessible that created the #GtkATContext instance.
+
+</description>
+</property>
+
+<property name="GtkATContext:accessible-role">
+<description>
+The accessible role used by the AT context.
+
+Depending on the given role, different states and properties can be
+set or retrieved.
+
+</description>
+</property>
+
 <signal name="GtkAboutDialog::activate-link">
 <description>
 The signal which gets emitted to activate a URI.
@@ -179,6 +196,732 @@ Whether to wrap the text in the license dialog.
 </description>
 </property>
 
+<enum name="GtkAccessibleAutocomplete">
+<description>
+The possible values for the %GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE
+accessible property.
+
+</description>
+<parameters>
+<parameter name="GTK_ACCESSIBLE_AUTOCOMPLETE_NONE">
+<parameter_description> Automatic suggestions are not displayed.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_AUTOCOMPLETE_INLINE">
+<parameter_description> When a user is providing input, text
+suggesting one way to complete the provided input may be dynamically
+inserted after the caret.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_AUTOCOMPLETE_LIST">
+<parameter_description> When a user is providing input, an element
+containing a collection of values that could complete the provided input
+may be displayed.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_AUTOCOMPLETE_BOTH">
+<parameter_description> When a user is providing input, an element
+containing a collection of values that could complete the provided input
+may be displayed. If displayed, one value in the collection is automatically
+selected, and the text needed to complete the automatically selected value
+appears after the caret in the input.
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
+<enum name="GtkAccessibleInvalidState">
+<description>
+The possible values for the %GTK_ACCESSIBLE_STATE_INVALID
+accessible state.
+
+Note that the %GTK_ACCESSIBLE_INVALID_FALSE and
+%GTK_ACCESSIBLE_INVALID_TRUE have the same values
+as %FALSE and %TRUE.
+
+</description>
+<parameters>
+<parameter name="GTK_ACCESSIBLE_INVALID_FALSE">
+<parameter_description> There are no detected errors in the value
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_INVALID_TRUE">
+<parameter_description> The value entered by the user has failed validation
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_INVALID_GRAMMAR">
+<parameter_description> A grammatical error was detected
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_INVALID_SPELLING">
+<parameter_description> A spelling error was detected
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
+<enum name="GtkAccessibleProperty">
+<description>
+The possible accessible properties of a #GtkAccessible.
+
+</description>
+<parameters>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE">
+<parameter_description> Indicates whether inputting text
+could trigger display of one or more predictions of the user's intended
+value for a combobox, searchbox, or textbox and specifies how predictions
+would be presented if they were made. Value type: #GtkAccessibleAutocomplete
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_DESCRIPTION">
+<parameter_description> Defines a string value that describes
+or annotates the current element. Value type: string
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_HAS_POPUP">
+<parameter_description> Indicates the availability and type of
+interactive popup element, such as menu or dialog, that can be triggered
+by an element.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_KEY_SHORTCUTS">
+<parameter_description> Indicates keyboard shortcuts that an
+author has implemented to activate or give focus to an element. Value type:
+string
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_LABEL">
+<parameter_description> Defines a string value that labels the current
+element. Value type: string
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_LEVEL">
+<parameter_description> Defines the hierarchical level of an element
+within a structure. Value type: integer
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_MODAL">
+<parameter_description> Indicates whether an element is modal when
+displayed. Value type: boolean
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_MULTI_LINE">
+<parameter_description> Indicates whether a text box accepts
+multiple lines of input or only a single line. Value type: boolean
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_MULTI_SELECTABLE">
+<parameter_description> Indicates that the user may select
+more than one item from the current selectable descendants. Value type:
+boolean
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_ORIENTATION">
+<parameter_description> Indicates whether the element's
+orientation is horizontal, vertical, or unknown/ambiguous. Value type:
+#GtkOrientation
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_PLACEHOLDER">
+<parameter_description> Defines a short hint (a word or short
+phrase) intended to aid the user with data entry when the control has no
+value. A hint could be a sample value or a brief description of the expected
+format. Value type: string
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_READ_ONLY">
+<parameter_description> Indicates that the element is not editable,
+but is otherwise operable. Value type: boolean
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_REQUIRED">
+<parameter_description> Indicates that user input is required on
+the element before a form may be submitted. Value type: boolean
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_ROLE_DESCRIPTION">
+<parameter_description> Defines a human-readable,
+author-localized description for the role of an element. Value type: string
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_SORT">
+<parameter_description> Indicates if items in a table or grid are
+sorted in ascending or descending order. Possible property values are in
+the #GtkAccessibleSort enumeration. Value type: #GtkAccessibleSort
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_VALUE_MAX">
+<parameter_description> Defines the maximum allowed value for a
+range widget. Value type: double
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_VALUE_MIN">
+<parameter_description> Defines the minimum allowed value for a
+range widget. Value type: double
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_VALUE_NOW">
+<parameter_description> Defines the current value for a range widget.
+Value type: double
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_PROPERTY_VALUE_TEXT">
+<parameter_description> Defines the human readable text alternative
+of aria-valuenow for a range widget. Value type: string
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
+<enum name="GtkAccessibleRelation">
+<description>
+The possible accessible relations of a #GtkAccessible.
+Accessible relations can be references to other widgets,
+integers or strings.
+
+</description>
+<parameters>
+<parameter name="GTK_ACCESSIBLE_RELATION_ACTIVE_DESCENDANT">
+<parameter_description> Identifies the currently active
+element when focus is on a composite widget, combobox, textbox, group,
+or application. Value type: reference
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_COL_COUNT">
+<parameter_description> Defines the total number of columns
+in a table, grid, or treegrid. Value type: integer
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_COL_INDEX">
+<parameter_description> Defines an element's column index or
+position with respect to the total number of columns within a table,
+grid, or treegrid. Value type: integer
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_COL_INDEX_TEXT">
+<parameter_description> Defines a human readable text
+alternative of @GTK_ACCESSIBLE_RELATION_COL_INDEX. Value type: string
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_COL_SPAN">
+<parameter_description> Defines the number of columns spanned
+by a cell or gridcell within a table, grid, or treegrid. Value type: integer
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_CONTROLS">
+<parameter_description> Identifies the element (or elements) whose
+contents or presence are controlled by the current element. Value type: reference
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_DESCRIBED_BY">
+<parameter_description> Identifies the element (or elements)
+that describes the object. Value type: reference
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_DETAILS">
+<parameter_description> Identifies the element (or elements) that
+provide additional information related to the object. Value type: reference
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE">
+<parameter_description> Identifies the element that provides
+an error message for an object. Value type: reference
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_FLOW_TO">
+<parameter_description> Identifies the next element (or elements)
+in an alternate reading order of content which, at the user's discretion,
+allows assistive technology to override the general default of reading in
+document source order. Value type: reference
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_LABELLED_BY">
+<parameter_description> Identifies the element (or elements)
+that labels the current element. Value type: reference
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_OWNS">
+<parameter_description> Identifies an element (or elements) in order
+to define a visual, functional, or contextual parent/child relationship
+between elements where the widget hierarchy cannot be used to represent
+the relationship. Value type: reference
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_POS_IN_SET">
+<parameter_description> Defines an element's number or position
+in the current set of listitems or treeitems. Value type: integer
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_ROW_COUNT">
+<parameter_description> Defines the total number of rows in a table,
+grid, or treegrid. Value type: integer
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_ROW_INDEX">
+<parameter_description> Defines an element's row index or position
+with respect to the total number of rows within a table, grid, or treegrid.
+Value type: integer
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_ROW_INDEX_TEXT">
+<parameter_description> Defines a human readable text
+alternative of aria-rowindex. Value type: string
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_ROW_SPAN">
+<parameter_description> Defines the number of rows spanned by a
+cell or gridcell within a table, grid, or treegrid. Value type: integer
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_RELATION_SET_SIZE">
+<parameter_description> Defines the number of items in the current
+set of listitems or treeitems. Value type: integer
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
+<enum name="GtkAccessibleRole">
+<description>
+The accessible role for a #GtkAccessible implementation.
+
+Abstract roles are only used as part of the ontology; application
+developers must not use abstract roles in their code.
+
+</description>
+<parameters>
+<parameter name="GTK_ACCESSIBLE_ROLE_ALERT">
+<parameter_description> An element with important, and usually
+time-sensitive, information
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_ALERT_DIALOG">
+<parameter_description> A type of dialog that contains an
+alert message
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_BANNER">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_BUTTON">
+<parameter_description> An input element that allows for
+user-triggered actions when clicked or pressed
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_CAPTION">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_CELL">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_CHECKBOX">
+<parameter_description> A checkable input element that has
+three possible values: `true`, `false`, or `mixed`
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_COLUMN_HEADER">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_COMBO_BOX">
+<parameter_description> An input that controls another element,
+such as a list or a grid, that can dynamically pop up to help the user
+set the value of the input
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_COMMAND">
+<parameter_description> An abstract widget that performs an
+action, but does not receive input
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_COMPOSITE">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_DIALOG">
+<parameter_description> A dialog is a window that is designed to interrupt
+the current processing of an application in order to prompt the user to enter
+information or require a response.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_DOCUMENT">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_FEED">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_FORM">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_GENERIC">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_GRID">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_GRID_CELL">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_GROUP">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_HEADING">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_IMG">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_INPUT">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_LABEL">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_LANDMARK">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_LEGEND">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_LINK">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_LIST_BOX">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_LIST_ITEM">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_LOG">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_MAIN">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_MARQUEE">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_METER">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_MATH">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_MENU">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_MENU_BAR">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_MENU_ITEM">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_MENU_ITEM_CHECKBOX">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_MENU_ITEM_RADIO">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_NAVIGATION">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_NOTE">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_OPTION">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_PRESENTATION">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_PROGRESS_BAR">
+<parameter_description> An element that displays the progress
+status for tasks that take a long time.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_RADIO">
+<parameter_description> A checkable input in a group of radio roles,
+only one of which can be checked at a time.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_RADIO_GROUP">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_RANGE">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_REGION">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_ROW">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_ROW_GROUP">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_ROW_HEADER">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_SCROLLBAR">
+<parameter_description> A graphical object that controls the scrolling
+of content within a viewing area, regardless of whether the content is fully
+displayed within the viewing area.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_SEARCH">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_SEARCH_BOX">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_SECTION">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_SECTION_HEAD">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_SELECT">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_SEPARATOR">
+<parameter_description> A divider that separates and distinguishes
+sections of content or groups of menuitems.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_SLIDER">
+<parameter_description> A user input where the user selects a value
+from within a given range.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_SPIN_BUTTON">
+<parameter_description> A form of range that expects the user to
+select from among discrete choices.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_STATUS">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_STRUCTURE">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_SWITCH">
+<parameter_description> A type of checkbox that represents on/off values,
+as opposed to checked/unchecked values.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_TAB">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_TABLE">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_TAB_LIST">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_TAB_PANEL">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_TEXT_BOX">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_TIME">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_TIMER">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_TOOLBAR">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_TOOLTIP">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_TREE">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_TREE_GRID">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_TREE_ITEM">
+<parameter_description> Unused
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_WIDGET">
+<parameter_description> An interactive component of a graphical user
+interface. This is the role that GTK uses by default for widgets.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_ROLE_WINDOW">
+<parameter_description> An application window.
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
+<enum name="GtkAccessibleSort">
+<description>
+The possible values for the %GTK_ACCESSIBLE_PROPERTY_SORT
+accessible property.
+
+</description>
+<parameters>
+<parameter name="GTK_ACCESSIBLE_SORT_NONE">
+<parameter_description> There is no defined sort applied to the column.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_SORT_ASCENDING">
+<parameter_description> Items are sorted in ascending order by this column.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_SORT_DESCENDING">
+<parameter_description> Items are sorted in descending order by this column.
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_SORT_OTHER">
+<parameter_description> A sort algorithm other than ascending or
+descending has been applied.
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
+<enum name="GtkAccessibleState">
+<description>
+The possible accessible states of a #GtkAccessible.
+
+</description>
+<parameters>
+<parameter name="GTK_ACCESSIBLE_STATE_BUSY">
+<parameter_description> A “busy” state. This state has boolean values
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_STATE_CHECKED">
+<parameter_description> A “checked” state; indicates the current
+state of a #GtkCheckButton. Value type: #GtkAccessibleTristate
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_STATE_DISABLED">
+<parameter_description> A “disabled” state; corresponds to the
+#GtkWidget:sensitive property on #GtkWidget. It indicates a UI element
+that is perceivable, but not editable or operable. Value type: boolean
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_STATE_EXPANDED">
+<parameter_description> An “expanded” state; corresponds to the
+#GtkExpander:expanded property on #GtkExpander. Value type: boolean
+or undefined
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_STATE_HIDDEN">
+<parameter_description> A “hidden” state; corresponds to the
+#GtkWidget:visible property on #GtkWidget. You can use this state
+explicitly on UI elements that should not be exposed to an assistive
+technology. Value type: boolean
+See also: %GTK_ACCESSIBLE_STATE_DISABLED
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_STATE_INVALID">
+<parameter_description> An “invalid” state; set when a widget
+is showing an error. Value type: #GtkAccessibleInvalidState
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_STATE_PRESSED">
+<parameter_description> A “pressed” state; indicates the current
+state of a #GtkToggleButton. Value type: #GtkAccessibleTristate
+enumeration
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_STATE_SELECTED">
+<parameter_description> A “selected” state; set when a widget
+is selected. Value type: boolean or undefined
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
+<enum name="GtkAccessibleTristate">
+<description>
+The possible values for the %GTK_ACCESSIBLE_STATE_PRESSED
+accessible state.
+
+Note that the %GTK_ACCESSIBLE_TRISTATE_FALSE and
+%GTK_ACCESSIBLE_TRISTATE_TRUE have the same values
+as %FALSE and %TRUE.
+
+</description>
+<parameters>
+<parameter name="GTK_ACCESSIBLE_TRISTATE_FALSE">
+<parameter_description> The state is `false`
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_TRISTATE_TRUE">
+<parameter_description> The state is `true`
+</parameter_description>
+</parameter>
+<parameter name="GTK_ACCESSIBLE_TRISTATE_MIXED">
+<parameter_description> The state is `mixed`
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
 <signal name="GtkAdjustment::changed">
 <description>
 Emitted when one or more of the #GtkAdjustment properties have been
@@ -841,6 +1584,20 @@ Priority used when loading
 </description>
 </property>
 
+<property name="GtkBoolFilter:expression">
+<description>
+The boolean expression to evalute on item
+
+</description>
+</property>
+
+<property name="GtkBoolFilter:invert">
+<description>
+If the expression result should be inverted
+
+</description>
+</property>
+
 <enum name="GtkBorderStyle">
 <description>
 Describes how the border of a UI element should be rendered.
@@ -1588,7 +2345,7 @@ before doing any specific setup, as in the following example:
 static void
 text_editing_started (GtkCellRenderer *cell,
 GtkCellEditable *editable,
-const gchar     *path,
+const char      *path,
 gpointer         data)
 {
 if (GTK_IS_ENTRY (editable)) 
@@ -2454,14 +3211,14 @@ model column.
 Here's an example signal handler which fetches data from the model and
 displays it in the entry.
 |[&lt;!-- language=&quot;C&quot; --&gt;
-static gchar*
+static char *
 format_entry_text_callback (GtkComboBox *combo,
-const gchar *path,
+const char *path,
 gpointer     user_data)
 {
 GtkTreeIter iter;
 GtkTreeModel model;
-gdouble      value;
+double       value;
 
 model = gtk_combo_box_get_model (combo);
 
@@ -8405,13 +9162,6 @@ Volume of the audio stream.
 </description>
 </property>
 
-<property name="GtkMenuButton:align-widget">
-<description>
-The #GtkWidget to use to align the menu with.
-
-</description>
-</property>
-
 <property name="GtkMenuButton:direction">
 <description>
 The #GtkArrowType representing the direction in which the
@@ -9724,13 +10474,13 @@ from @context using gtk_print_context_get_cairo_context().
 static void
 draw_page (GtkPrintOperation *operation,
 GtkPrintContext   *context,
-gint               page_nr,
+int                page_nr,
 gpointer           user_data)
 {
 cairo_t *cr;
 PangoLayout *layout;
-gdouble width, text_height;
-gint layout_height;
+double width, text_height;
+int layout_height;
 PangoFontDescription *desc;
 
 cr = gtk_print_context_get_cairo_context (context);
@@ -9752,7 +10502,7 @@ pango_layout_set_width (layout, width * PANGO_SCALE);
 pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
 
 pango_layout_get_size (layout, NULL, &amp;layout_height);
-text_height = (gdouble)layout_height / PANGO_SCALE;
+text_height = (double)layout_height / PANGO_SCALE;
 
 cairo_move_to (cr, width / 2,  (HEADER_HEIGHT - text_height) / 2);
 pango_cairo_show_layout (cr, layout);
@@ -11353,13 +12103,6 @@ The default bindings for this signal is Escape.
 <return></return>
 </signal>
 
-<property name="GtkSelectionFilterModel:item-type">
-<description>
-The #GType for elements of this object
-
-</description>
-</property>
-
 <property name="GtkSelectionFilterModel:model">
 <description>
 The model being filtered
@@ -12357,6 +13100,13 @@ Maximum size of slice
 </description>
 </property>
 
+<property name="GtkSortListModel:incremental">
+<description>
+If the model should sort items incrementally
+
+</description>
+</property>
+
 <property name="GtkSortListModel:model">
 <description>
 The model being sorted
@@ -12364,6 +13114,13 @@ The model being sorted
 </description>
 </property>
 
+<property name="GtkSortListModel:pending">
+<description>
+Estimate of unsorted items remaining
+
+</description>
+</property>
+
 <property name="GtkSortListModel:sorter">
 <description>
 The sorter for this model
@@ -12530,7 +13287,7 @@ on_output (GtkSpinButton *spin,
 gpointer       data)
 {
 GtkAdjustment *adjustment;
-gchar *text;
+char *text;
 int value;
 
 adjustment = gtk_spin_button_get_adjustment (spin);
@@ -17186,42 +17943,244 @@ as an accelerator.
 </return>
 </function>
 
-<function name="gtk_accessible_get_widget">
+<function name="gtk_accessible_get_accessible_role">
 <description>
-Gets the #GtkWidget corresponding to the #GtkAccessible.
-The returned widget does not have a reference added, so
-you do not need to unref it.
+Retrieves the #GtkAccessibleRole for the given #GtkAccessible.
 
 
 </description>
 <parameters>
-<parameter name="accessible">
+<parameter name="self">
 <parameter_description> a #GtkAccessible
 </parameter_description>
 </parameter>
 </parameters>
-<return> pointer to the #GtkWidget
-corresponding to the #GtkAccessible, or %NULL.
+<return> a #GtkAccessibleRole
 </return>
 </function>
 
-<function name="gtk_accessible_set_widget">
+<function name="gtk_accessible_reset_property">
 <description>
-Sets the #GtkWidget corresponding to the #GtkAccessible.
+Resets the accessible @property to its default value.
 
-@accessible will not hold a reference to @widget.
-It is the caller’s responsibility to ensure that when @widget
-is destroyed, the widget is unset by calling this function
-again with @widget set to %NULL.
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="property">
+<parameter_description> a #GtkAccessibleProperty
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_accessible_reset_relation">
+<description>
+Resets the accessible @relation to its default value.
 
 </description>
 <parameters>
-<parameter name="accessible">
+<parameter name="self">
 <parameter_description> a #GtkAccessible
 </parameter_description>
 </parameter>
-<parameter name="widget">
-<parameter_description> a #GtkWidget or %NULL to unset
+<parameter name="relation">
+<parameter_description> a #GtkAccessibleRelation
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_accessible_reset_state">
+<description>
+Resets the accessible @state to its default value.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="state">
+<parameter_description> a #GtkAccessibleState
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_accessible_update_property">
+<description>
+Updates a list of accessible properties. See the #GtkAccessibleProperty
+documentation for the value types of accessible properties.
+
+This function should be called by #GtkWidget types whenever an accessible
+property change must be communicated to assistive technologies.
+
+Example:
+|[
+value = gtk_adjustment_get_value (adjustment);
+gtk_accessible_update_property (GTK_ACCESSIBLE (spin_button),
+                                     GTK_ACCESSIBLE_PROPERTY_VALUE_NOW, value,
+                                     -1);
+]|
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="first_property">
+<parameter_description> the first #GtkAccessibleProperty
+</parameter_description>
+</parameter>
+<parameter name="Varargs">
+<parameter_description> a list of property and value pairs, terminated by -1
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_accessible_update_property_value">
+<description>
+Updates an accessible property.
+
+This function should be called by #GtkWidget types whenever an accessible
+property change must be communicated to assistive technologies.
+
+This function is meant to be used by language bindings.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="property">
+<parameter_description> a #GtkAccessibleProperty
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> a #GValue with the value for @property
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_accessible_update_relation">
+<description>
+Updates a list of accessible relations.
+
+This function should be called by #GtkWidget types whenever an accessible
+relation change must be communicated to assistive technologies.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="first_relation">
+<parameter_description> the first #GtkAccessibleRelation
+</parameter_description>
+</parameter>
+<parameter name="Varargs">
+<parameter_description> a list of relation and value pairs, terminated by -1
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_accessible_update_relation_value">
+<description>
+Updates an accessible relation.
+
+This function should be called by #GtkWidget types whenever an accessible
+relation change must be communicated to assistive technologies.
+
+This function is meant to be used by language bindings.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="relation">
+<parameter_description> a #GtkAccessibleRelation
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> a #GValue with the value for @relation
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_accessible_update_state">
+<description>
+Updates a list of accessible states. See the #GtkAccessibleState
+documentation for the value types of accessible states.
+
+This function should be called by #GtkWidget types whenever an accessible
+state change must be communicated to assistive technologies.
+
+Example:
+|[
+value = GTK_ACCESSIBLE_TRISTATE_MIXED;
+gtk_accessible_update_state (GTK_ACCESSIBLE (check_button),
+GTK_ACCESSIBLE_STATE_CHECKED, value,
+-1);
+]|
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="first_state">
+<parameter_description> the first #GtkAccessibleState
+</parameter_description>
+</parameter>
+<parameter name="Varargs">
+<parameter_description> a list of state and value pairs, terminated by -1
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_accessible_update_state_value">
+<description>
+Updates an accessible state.
+
+This function should be called by #GtkWidget types whenever an accessible
+state change must be communicated to assistive technologies.
+
+This function is meant to be used by language bindings.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="state">
+<parameter_description> a #GtkAccessibleState
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> a #GValue with the value for @state
 </parameter_description>
 </parameter>
 </parameters>
@@ -19898,6 +20857,62 @@ affects the future page flow of the assistant.
 <return></return>
 </function>
 
+<function name="gtk_at_context_create">
+<description>
+Creates a new #GtkATContext instance for the given accessible role and
+accessible instance.
+
+The #GtkATContext implementation being instantiated will depend on the
+platform.
+
+
+</description>
+<parameters>
+<parameter name="accessible_role">
+<parameter_description> the accessible role used by the #GtkATContext
+</parameter_description>
+</parameter>
+<parameter name="accessible">
+<parameter_description> the #GtkAccessible implementation using the #GtkATContext
+</parameter_description>
+</parameter>
+</parameters>
+<return> the #GtkATContext
+</return>
+</function>
+
+<function name="gtk_at_context_get_accessible">
+<description>
+Retrieves the #GtkAccessible using this context.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkATContext
+</parameter_description>
+</parameter>
+</parameters>
+<return> a #GtkAccessible
+</return>
+</function>
+
+<function name="gtk_at_context_get_accessible_role">
+<description>
+Retrieves the accessible role of this context.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkATContext
+</parameter_description>
+</parameter>
+</parameters>
+<return> a #GtkAccessibleRole
+</return>
+</function>
+
 <function name="gtk_bin_layout_new">
 <description>
 Creates a new #GtkBinLayout instance.
@@ -20817,6 +21832,94 @@ The default IO priority is %G_PRIORITY_DEFAULT.
 <return></return>
 </function>
 
+<function name="gtk_bool_filter_get_expression">
+<description>
+Gets the expression that the filter uses to evaluate if
+an item should be filtered.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBoolFilter
+</parameter_description>
+</parameter>
+</parameters>
+<return> a #GtkExpression
+</return>
+</function>
+
+<function name="gtk_bool_filter_get_invert">
+<description>
+Returns whether the filter inverts the expression.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBoolFilter
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the filter inverts
+</return>
+</function>
+
+<function name="gtk_bool_filter_new">
+<description>
+Creates a new bool filter.
+
+
+</description>
+<parameters>
+<parameter name="expression">
+<parameter_description> The expression to evaluate
+or %NULL for none
+</parameter_description>
+</parameter>
+</parameters>
+<return> a new #GtkBoolFilter
+</return>
+</function>
+
+<function name="gtk_bool_filter_set_expression">
+<description>
+Sets the expression that the filter uses to
+check if items should be filtered. The expression must have
+a value type of #G_TYPE_BOOLEAN.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBoolFilter
+</parameter_description>
+</parameter>
+<parameter name="expression">
+<parameter_description> a #GtkExpression
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_bool_filter_set_invert">
+<description>
+Sets whether the filter should invert the expression.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkBoolFilter
+</parameter_description>
+</parameter>
+<parameter name="invert">
+<parameter_description> %TRUE to invert
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_border_copy">
 <description>
 Copies a #GtkBorder-struct.
@@ -25123,30 +26226,6 @@ e.g. for #GtkTreeView, a string representation of #GtkTreePath
 </return>
 </function>
 
-<function name="gtk_cell_renderer_class_set_accessible_type">
-<description>
-Sets the type to be used for creating accessibles for cells rendered by
-cell renderers of @renderer_class. Note that multiple accessibles will
-be created.
-
-This function should only be called from class init functions of cell
-renderers.
-
-</description>
-<parameters>
-<parameter name="renderer_class">
-<parameter_description> class to set the accessible type for
-</parameter_description>
-</parameter>
-<parameter name="type">
-<parameter_description> The object type that implements the accessible for @widget_class.
-The type must be a subtype of #GtkRendererCellAccessible
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_cell_renderer_combo_new">
 <description>
 Creates a new #GtkCellRendererCombo. 
@@ -27371,7 +28450,7 @@ Sets whether this column should be visible in views.
 <description>
 Gets the list of columns in this column view. This list is constant over
 the lifetime of @self and can be used to monitor changes to the columns
-of @self by connecting to the GListModel:items-changed signal.
+of @self by connecting to the #GListModel:items-changed signal.
 
 
 </description>
@@ -27486,17 +28565,26 @@ selected on hover.
 
 <function name="gtk_column_view_get_sorter">
 <description>
-Returns the sorter associated with users sorting choices in
-the column view.
+Returns a special sorter that reflects the users sorting
+choices in the column view.
 
 To allow users to customizable sorting by clicking on column
-headers, this sorter needs to be set on the sort
-model(s) underneath the model that is displayed
-by the view.
+headers, this sorter needs to be set on the sort model underneath
+the model that is displayed by the view.
 
-See gtk_column_view_column_get_sorter() for setting up
+See gtk_column_view_column_set_sorter() for setting up
 per-column sorting.
 
+Here is an example:
+|[
+gtk_column_view_column_set_sorter (column, sorter);
+gtk_column_view_append_column (view, column);
+sorter = g_object_ref (gtk_column_view_get_sorter (view)));
+model = gtk_sort_list_model_new (store, sorter);
+selection = gtk_no_selection_new (model);
+gtk_column_view_set_model (view, selection);
+]|
+
 
 </description>
 <parameters>
@@ -27535,15 +28623,18 @@ If @column is already a column of @self, it will be repositioned.
 
 <function name="gtk_column_view_new">
 <description>
-Creates a new empty #GtkColumnView.
+Creates a new #GtkColumnView.
 
-You most likely want to call gtk_column_view_set_factory() to
-set up a way to map its items to widgets and gtk_column_view_set_model()
-to set a model to provide items next.
+You most likely want to call gtk_column_view_append_column() to
+add columns next.
 
 
 </description>
 <parameters>
+<parameter name="model">
+<parameter_description> the list model to use, or %NULL
+</parameter_description>
+</parameter>
 </parameters>
 <return> a new #GtkColumnView
 </return>
@@ -27884,26 +28975,6 @@ during construction.
 </return>
 </function>
 
-<function name="gtk_combo_box_get_popup_accessible">
-<description>
-Gets the accessible object corresponding to the combo box’s popup.
-
-This function is mostly intended for use by accessibility technologies;
-applications should have little use for it.
-
-
-</description>
-<parameters>
-<parameter name="combo_box">
-<parameter_description> a #GtkComboBox
-</parameter_description>
-</parameter>
-</parameters>
-<return> the accessible object corresponding
-to the combo box’s popup.
-</return>
-</function>
-
 <function name="gtk_combo_box_get_popup_fixed_width">
 <description>
 Gets whether the popup uses a fixed width matching
@@ -28497,6 +29568,22 @@ Removes all the text entries from the combo box.
 <return></return>
 </function>
 
+<function name="gtk_constant_expression_get_value">
+<description>
+Gets the value that a constant expression evaluates to.
+
+
+</description>
+<parameters>
+<parameter name="expression">
+<parameter_description> a constant #GtkExpression
+</parameter_description>
+</parameter>
+</parameters>
+<return> the value
+</return>
+</function>
+
 <function name="gtk_constant_expression_new">
 <description>
 Creates a GtkExpression that evaluates to the
@@ -30091,6 +31178,8 @@ Use gtk_css_value_get_dynamic_value() to get the value for a given timestamp.
 Creates a new filter using the given @match_func to filter
 items.
 
+If @match_func is %NULL, the filter matches all items.
+
 If the filter func changes its filtering behavior,
 gtk_filter_changed() needs to be called.
 
@@ -30106,7 +31195,7 @@ gtk_filter_changed() needs to be called.
 </parameter_description>
 </parameter>
 <parameter name="user_destroy">
-<parameter_description> destory notify
+<parameter_description> destroy notify for @user_data
 </parameter_description>
 </parameter>
 </parameters>
@@ -30118,6 +31207,8 @@ gtk_filter_changed() needs to be called.
 <description>
 Sets (or unsets) the function used for filtering items.
 
+If @match_func is %NULL, the filter matches all items.
+
 If the filter func changes its filtering behavior,
 gtk_filter_changed() needs to be called.
 
@@ -30139,7 +31230,7 @@ called now.
 </parameter_description>
 </parameter>
 <parameter name="user_destroy">
-<parameter_description> destory notify
+<parameter_description> destroy notify for @user_data
 </parameter_description>
 </parameter>
 </parameters>
@@ -30202,6 +31293,8 @@ Creates a new custom paper dialog.
 Creates a new #GtkSorter that works by calling
 @sort_func to compare items.
 
+If @sort_func is %NULL, all items are considered equal.
+
 
 </description>
 <parameters>
@@ -30218,7 +31311,7 @@ Creates a new #GtkSorter that works by calling
 </parameter_description>
 </parameter>
 </parameters>
-<return> a new #GTkSorter
+<return> a new #GtkSorter
 </return>
 </function>
 
@@ -30226,6 +31319,8 @@ Creates a new #GtkSorter that works by calling
 <description>
 Sets (or unsets) the function used for sorting items.
 
+If @sort_func is %NULL, all items are considered equal.
+
 If the sort func changes its sorting behavior,
 gtk_sorter_changed() needs to be called.
 
@@ -30247,7 +31342,7 @@ called now.
 </parameter_description>
 </parameter>
 <parameter name="user_destroy">
-<parameter_description> destory notify
+<parameter_description> destroy notify for @user_data
 </parameter_description>
 </parameter>
 </parameters>
@@ -31440,15 +32535,39 @@ Gets the selected item. If no item is selected, %NULL is returned.
 
 <function name="gtk_drop_down_new">
 <description>
-Creates a new empty #GtkDropDown.
+Creates a new #GtkDropDown.
 
-You most likely want to call gtk_drop_down_set_factory() to
-set up a way to map its items to widgets and gtk_drop_down_set_model()
-to set a model to provide items next.
+You may want to call gtk_drop_down_set_factory()
+to set up a way to map its items to widgets.
 
 
 </description>
 <parameters>
+<parameter name="model">
+<parameter_description> the model to use or %NULL for none
+</parameter_description>
+</parameter>
+<parameter name="expression">
+<parameter_description> the expression to use or %NULL for none
+</parameter_description>
+</parameter>
+</parameters>
+<return> a new #GtkDropDown
+</return>
+</function>
+
+<function name="gtk_drop_down_new_from_strings">
+<description>
+Creates a new #GtkDropDown that is populated with
+the strings in @strings.
+
+
+</description>
+<parameters>
+<parameter name="strings">
+<parameter_description> The strings to put in the dropdown
+</parameter_description>
+</parameter>
 </parameters>
 <return> a new #GtkDropDown
 </return>
@@ -31513,25 +32632,6 @@ Sets the #GtkListItemFactory to use for populating list items.
 <return></return>
 </function>
 
-<function name="gtk_drop_down_set_from_strings">
-<description>
-Populates @self with the strings in @text,
-by creating a suitable model and factory.
-
-</description>
-<parameters>
-<parameter name="self">
-<parameter_description> a #GtkDropDown
-</parameter_description>
-</parameter>
-<parameter name="texts">
-<parameter_description> a %NULL-terminated string array
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_drop_down_set_list_factory">
 <description>
 Sets the #GtkListItemFactory to use for populating list items in the popup.
@@ -35030,7 +36130,7 @@ the events can be managed by calling gtk_event_controller_handle_event().
 
 <function name="gtk_every_filter_new">
 <description>
-Creates a new empty &quot;every&quot; filter.  
+Creates a new empty &quot;every&quot; filter.
 Use gtk_multi_filter_append() to add filters to it.
 
 This filter matches an item if each of the filters added to it
@@ -36775,7 +37875,7 @@ should not be called from other functions.
 Gets the known strictness of @filters. If the strictness is not known,
 %GTK_FILTER_MATCH_SOME is returned.
 
-This value may change after emission of the GtkFilter:changed signal.
+This value may change after emission of the #GtkFilter:changed signal.
 
 This function is meant purely for optimization purposes, filters can
 choose to omit implementing it, but #GtkFilterListModel uses it.
@@ -36850,8 +37950,14 @@ When incremental filtering is not enabled, this always returns 0.
 
 You can use this value to check if @self is busy filtering by
 comparing the return value to 0 or you can compute the percentage
-of the filter remaining by dividing the return value by
-g_list_model_get_n_items(gtk_filter_list_model_get_model (self)).
+of the filter remaining by dividing the return value by the total
+number of items in the underlying model:
+
+|[
+pending = gtk_filter_list_model_get_pending (self);
+model = gtk_filter_list_model_get_model (self);
+percentage = pending / (double) g_list_model_get_n_items (model);
+]|
 
 
 </description>
@@ -36874,7 +37980,7 @@ Creates a new #GtkFilterListModel that will filter @model using the given
 </description>
 <parameters>
 <parameter name="model">
-<parameter_description> the model to sort
+<parameter_description> the model to sort, or %NULL
 </parameter_description>
 </parameter>
 <parameter name="filter">
@@ -36906,8 +38012,8 @@ Sets the filter used to filter items.
 
 <function name="gtk_filter_list_model_set_incremental">
 <description>
-When incremental filtering is enabled, the filterlistmodel will not run
-filters immediately, but will instead queue an idle handler that
+When incremental filtering is enabled, the GtkFilterListModel will not
+run filters immediately, but will instead queue an idle handler that
 incrementally filters the items and adds them to the list. This of course
 means that items are not instantly added to the list, but only appear
 incrementally.
@@ -36957,7 +38063,7 @@ types match.
 
 <function name="gtk_filter_match">
 <description>
-Checks if the given @item is matched by the filter or not. 
+Checks if the given @item is matched by the filter or not.
 
 
 </description>
@@ -41252,15 +42358,18 @@ selected on hover.
 
 <function name="gtk_grid_view_new">
 <description>
-Creates a new empty #GtkGridView.
+Creates a new #GtkGridView.
 
 You most likely want to call gtk_grid_view_set_factory() to
-set up a way to map its items to widgets and gtk_grid_view_set_model()
-to set a model to provide items next.
+set up a way to map its items to widgets next.
 
 
 </description>
 <parameters>
+<parameter name="model">
+<parameter_description> the model to use, or %NULL
+</parameter_description>
+</parameter>
 </parameters>
 <return> a new #GtkGridView
 </return>
@@ -41271,21 +42380,22 @@ to set a model to provide items next.
 Creates a new #GtkGridView that uses the given @factory for
 mapping items to widgets.
 
-You most likely want to call gtk_grid_view_set_model() to set
-a model next.
-
 The function takes ownership of the
 argument, so you can write code like
 ```
-grid_view = gtk_grid_view_new_with_factory (
-gtk_builder_list_item_factory_newfrom_resource (&quot;/resource.ui&quot;));
+grid_view = gtk_grid_view_new_with_factory (create_model (),
+gtk_builder_list_item_factory_new_from_resource (&quot;/resource.ui&quot;));
 ```
 
 
 </description>
 <parameters>
+<parameter name="model">
+<parameter_description> the model to use, or %NULL
+</parameter_description>
+</parameter>
 <parameter name="factory">
-<parameter_description> The factory to populate items with
+<parameter_description> The factory to populate items with, or %NULL
 </parameter_description>
 </parameter>
 </parameters>
@@ -48276,15 +49386,18 @@ selected on hover.
 
 <function name="gtk_list_view_new">
 <description>
-Creates a new empty #GtkListView.
+Creates a new #GtkListView.
 
-You most likely want to call gtk_list_view_set_factory() to
-set up a way to map its items to widgets and gtk_list_view_set_model()
-to set a model to provide items next.
+You most likely want to call gtk_list_view_set_factory()
+to set up a way to map its items to widgets.
 
 
 </description>
 <parameters>
+<parameter name="model">
+<parameter_description> the model to use, or %NULL
+</parameter_description>
+</parameter>
 </parameters>
 <return> a new #GtkListView
 </return>
@@ -48295,21 +49408,22 @@ to set a model to provide items next.
 Creates a new #GtkListView that uses the given @factory for
 mapping items to widgets.
 
-You most likely want to call gtk_list_view_set_model() to set
-a model next.
-
 The function takes ownership of the
 argument, so you can write code like
 ```
-list_view = gtk_list_view_new_with_factory (
-gtk_builder_list_item_factory_newfrom_resource (&quot;/resource.ui&quot;));
+list_view = gtk_list_view_new_with_factory (create_model (),
+gtk_builder_list_item_factory_new_from_resource (&quot;/resource.ui&quot;));
 ```
 
 
 </description>
 <parameters>
+<parameter name="model">
+<parameter_description> the model to use, or %NULL
+</parameter_description>
+</parameter>
 <parameter name="factory">
-<parameter_description> The factory to populate items with
+<parameter_description> The factory to populate items with, or %NULL
 </parameter_description>
 </parameter>
 </parameters>
@@ -49494,22 +50608,6 @@ implementations to call this at the frequency they deem appropriate.
 <return></return>
 </function>
 
-<function name="gtk_menu_button_get_align_widget">
-<description>
-Returns the parent #GtkWidget to use to line up with menu.
-
-
-</description>
-<parameters>
-<parameter name="menu_button">
-<parameter_description> a #GtkMenuButton
-</parameter_description>
-</parameter>
-</parameters>
-<return> a #GtkWidget value or %NULL
-</return>
-</function>
-
 <function name="gtk_menu_button_get_direction">
 <description>
 Returns the direction the popup will be pointing at when popped up.
@@ -49668,31 +50766,6 @@ Pop up the menu.
 <return></return>
 </function>
 
-<function name="gtk_menu_button_set_align_widget">
-<description>
-Sets the #GtkWidget to use to line the menu with when popped up.
-Note that the @align_widget must contain the #GtkMenuButton itself.
-
-Setting it to %NULL means that the menu will be aligned with the
-button itself.
-
-Note that this property is only used with menus currently,
-and not for popovers.
-
-</description>
-<parameters>
-<parameter name="menu_button">
-<parameter_description> a #GtkMenuButton
-</parameter_description>
-</parameter>
-<parameter name="align_widget">
-<parameter_description> a #GtkWidget
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_menu_button_set_create_popup_func">
 <description>
 Sets @func to be called when a popup is about to be shown.
@@ -49890,7 +50963,7 @@ may contain special XML characters, you should use g_markup_printf_escaped()
 to escape it.
 
 |[&lt;!-- language=&quot;C&quot; --&gt;
-gchar *msg;
+char *msg;
 
 msg = g_markup_printf_escaped (message_format, ...);
 gtk_message_dialog_format_secondary_markup (message_dialog,
@@ -50306,7 +51379,7 @@ Creates a new selection to handle @model.
 </description>
 <parameters>
 <parameter name="model">
-<parameter_description> the #GListModel to manage
+<parameter_description> the #GListModel to manage, or %NULL
 </parameter_description>
 </parameter>
 </parameters>
@@ -50744,7 +51817,7 @@ Creates a new selection to handle @model.
 </description>
 <parameters>
 <parameter name="model">
-<parameter_description> the #GListModel to manage
+<parameter_description> the #GListModel to manage, or %NULL
 </parameter_description>
 </parameter>
 </parameters>
@@ -50754,8 +51827,8 @@ Creates a new selection to handle @model.
 
 <function name="gtk_no_selection_set_model">
 <description>
-Sets the model that @self should wrap. If @model is %NULL, this
-model will be empty.
+Sets the model that @self should wrap.
+If @model is %NULL, this model will be empty.
 
 </description>
 <parameters>
@@ -51913,6 +52986,22 @@ Sets whether to sort smaller numbers before larger ones.
 <return></return>
 </function>
 
+<function name="gtk_object_expression_get_object">
+<description>
+Gets the object that the expression evaluates to.
+
+
+</description>
+<parameters>
+<parameter name="expression">
+<parameter_description> an object #GtkExpression
+</parameter_description>
+</parameter>
+</parameters>
+<return> the object, or %NULL
+</return>
+</function>
+
 <function name="gtk_object_expression_new">
 <description>
 Creates an expression evaluating to the given @object with a weak reference.
@@ -59173,6 +60262,40 @@ of making up expose events.
 </return>
 </function>
 
+<function name="gtk_property_expression_get_expression">
+<description>
+Gets the expression specifying the object of
+a property expression.
+
+
+</description>
+<parameters>
+<parameter name="expression">
+<parameter_description> a property #GtkExpression
+</parameter_description>
+</parameter>
+</parameters>
+<return> the object expression
+</return>
+</function>
+
+<function name="gtk_property_expression_get_pspec">
+<description>
+Gets the #GParamSpec specifying the property of
+a property expression.
+
+
+</description>
+<parameters>
+<parameter name="expression">
+<parameter_description> a property #GtkExpression
+</parameter_description>
+</parameter>
+</parameters>
+<return> the #GParamSpec
+</return>
+</function>
+
 <function name="gtk_property_expression_new">
 <description>
 Creates an expression that looks up a property via the
@@ -63055,25 +64178,7 @@ selected items from the underlying selection model.
 </description>
 <parameters>
 <parameter name="model">
-<parameter_description> the selection model to filter
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new #GtkSelectionFilterModel
-</return>
-</function>
-
-<function name="gtk_selection_filter_model_new_for_type">
-<description>
-Creates a new empty selection filter model set up to return items
-of type @item_type. It is up to the application to set a proper
-selection model to ensure the item type is matched.
-
-
-</description>
-<parameters>
-<parameter name="item_type">
-<parameter_description> the type of the items that will be returned
+<parameter_description> the selection model to filter, or %NULL
 </parameter_description>
 </parameter>
 </parameters>
@@ -64060,6 +65165,10 @@ The accepted strings are:
 - two valid trigger strings, separated by a `|` character, for a
 #GtkAlternativeTrigger: `&lt;Control&gt;q|&lt;Control&gt;w`
 
+Note that you will have to escape the `&lt;` and `&gt;` characters when specifying
+triggers in XML files, such as GtkBuilder ui files. Use `&lt;` instead of
+`&lt;` and `&gt;` instead of `&gt;`.
+
 
 </description>
 <parameters>
@@ -64471,7 +65580,7 @@ Creates a new selection to handle @model.
 </description>
 <parameters>
 <parameter name="model">
-<parameter_description> the #GListModel to manage
+<parameter_description> the #GListModel to manage, or %NULL
 </parameter_description>
 </parameter>
 </parameters>
@@ -64735,7 +65844,7 @@ Creates a new slice model that presents the slice from @offset to
 </description>
 <parameters>
 <parameter name="model">
-<parameter_description> The model to use
+<parameter_description> The model to use, or %NULL
 </parameter_description>
 </parameter>
 <parameter name="offset">
@@ -65856,6 +66965,23 @@ Translates @snapshot's coordinate system by @point.
 <return></return>
 </function>
 
+<function name="gtk_sort_list_model_get_incremental">
+<description>
+Returns whether incremental sorting was enabled via
+gtk_sort_list_model_set_incremental().
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkSortListModel
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if incremental sorting is enabled
+</return>
+</function>
+
 <function name="gtk_sort_list_model_get_model">
 <description>
 Gets the model currently sorted or %NULL if none.
@@ -65872,6 +66998,36 @@ Gets the model currently sorted or %NULL if none.
 </return>
 </function>
 
+<function name="gtk_sort_list_model_get_pending">
+<description>
+Estimates progress of an ongoing sorting operation
+
+The estimate is the number of items that would still need to be
+sorted to finish the sorting operation if this was a linear
+algorithm. So this number is not related to how many items are
+already correctly sorted.
+
+If you want to estimate the progress, you can use code like this:
+|[&lt;!-- language=&quot;C&quot; --&gt;
+double progress = 1.0 - (double) gtk_sort_list_model_get_pending (self) 
+/ MAX (1, g_list_model_get_n_items (G_LIST_MODEL (sort)));
+]|
+
+If no sort operation is ongoing - in particular when
+#GtkSortListModel:incremental is %FALSE - this function returns 0.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkSortListModel
+</parameter_description>
+</parameter>
+</parameters>
+<return> a progress estimate of remaining items to sort
+</return>
+</function>
+
 <function name="gtk_sort_list_model_get_sorter">
 <description>
 Gets the sorter that is used to sort @self.
@@ -65880,7 +67036,7 @@ Gets the sorter that is used to sort @self.
 </description>
 <parameters>
 <parameter name="self">
-<parameter_description> a #GtkSortLisTModel
+<parameter_description> a #GtkSortListModel
 </parameter_description>
 </parameter>
 </parameters>
@@ -65896,11 +67052,11 @@ Creates a new sort list model that uses the @sorter to sort @model.
 </description>
 <parameters>
 <parameter name="model">
-<parameter_description> the model to sort
+<parameter_description> the model to sort, or %NULL
 </parameter_description>
 </parameter>
 <parameter name="sorter">
-<parameter_description> the #GtkSorter to sort @model with
+<parameter_description> the #GtkSorter to sort @model with, or %NULL
 </parameter_description>
 </parameter>
 </parameters>
@@ -65908,6 +67064,36 @@ Creates a new sort list model that uses the @sorter to sort @model.
 </return>
 </function>
 
+<function name="gtk_sort_list_model_set_incremental">
+<description>
+Sets the sort model to do an incremental sort.
+
+When incremental sorting is enabled, the sortlistmodel will not do
+a complete sort immediately, but will instead queue an idle handler that
+incrementally sorts the items towards their correct position. This of
+course means that items do not instantly appear in the right place. It
+also means that the total sorting time is a lot slower.
+
+When your filter blocks the UI while sorting, you might consider
+turning this on. Depending on your model and sorters, this may become
+interesting around 10,000 to 100,000 items.
+
+By default, incremental sorting is disabled.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkSortListModel
+</parameter_description>
+</parameter>
+<parameter name="incremental">
+<parameter_description> %TRUE to sort incrementally
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_sort_list_model_set_model">
 <description>
 Sets the model to be sorted. The @model's item type must conform to
@@ -67590,6 +68776,11 @@ and by providing a property to look up on the item.
 
 </description>
 <parameters>
+<parameter name="expression">
+<parameter_description> The expression to evaluate
+or %NULL for none
+</parameter_description>
+</parameter>
 </parameters>
 <return> a new #GtkStringFilter
 </return>
@@ -68481,6 +69672,172 @@ See #GtkSwitch::state-set for details.
 <return></return>
 </function>
 
+<function name="gtk_test_accessible_assert_property">
+<description>
+Checks whether a #GtkAccessible implementation has its accessible
+property set to the expected @value, and raises an assertion if the
+condition is not satisfied.
+
+</description>
+<parameters>
+<parameter name="accessible">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="property">
+<parameter_description> a #GtkAccessibleProperty
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> the value of @property
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_test_accessible_assert_relation">
+<description>
+Checks whether a #GtkAccessible implementation has its accessible
+relation set to the expected @value, and raises an assertion if the
+condition is not satisfied.
+
+</description>
+<parameters>
+<parameter name="accessible">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="relation">
+<parameter_description> a #GtkAccessibleRelation
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> the expected value of @relation
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_test_accessible_assert_role">
+<description>
+Checks whether a #GtkAccessible implementation has the given @role,
+and raises an assertion if the condition is failed.
+
+</description>
+<parameters>
+<parameter name="accessible">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="role">
+<parameter_description> a #GtkAccessibleRole
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_test_accessible_assert_state">
+<description>
+Checks whether a #GtkAccessible implementation has its accessible
+state set to the expected @value, and raises an assertion if the
+condition is not satisfied.
+
+</description>
+<parameters>
+<parameter name="accessible">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="state">
+<parameter_description> a #GtkAccessibleRelation
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> the expected value of @state
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_test_accessible_check_property">
+<description>
+Checks whether the accessible @property of @accessible is set to
+a specific value.
+
+
+</description>
+<parameters>
+<parameter name="accessible">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="property">
+<parameter_description> a #GtkAccessibleProperty
+</parameter_description>
+</parameter>
+<parameter name="Varargs">
+<parameter_description> the expected value of @property
+</parameter_description>
+</parameter>
+</parameters>
+<return> the value of the accessible property
+</return>
+</function>
+
+<function name="gtk_test_accessible_check_relation">
+<description>
+Checks whether the accessible @relation of @accessible is set to
+a specific value.
+
+
+</description>
+<parameters>
+<parameter name="accessible">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="relation">
+<parameter_description> a #GtkAccessibleRelation
+</parameter_description>
+</parameter>
+<parameter name="Varargs">
+<parameter_description> the expected value of @relation
+</parameter_description>
+</parameter>
+</parameters>
+<return> the value of the accessible relation
+</return>
+</function>
+
+<function name="gtk_test_accessible_check_state">
+<description>
+Checks whether the accessible @state of @accessible is set to
+a specific value.
+
+
+</description>
+<parameters>
+<parameter name="accessible">
+<parameter_description> a #GtkAccessible
+</parameter_description>
+</parameter>
+<parameter name="state">
+<parameter_description> a #GtkAccessibleState
+</parameter_description>
+</parameter>
+<parameter name="Varargs">
+<parameter_description> the expected value of @state
+</parameter_description>
+</parameter>
+</parameters>
+<return> the value of the accessible state
+</return>
+</function>
+
 <function name="gtk_test_init">
 <description>
 This function is used to initialize a GTK+ test program.
@@ -73895,7 +75252,7 @@ Creates a drag and drop icon from @text.
 </parameter_description>
 </parameter>
 <parameter name="text">
-<parameter_description> a #gchar to render the icon
+<parameter_description> a #char to render the icon
 </parameter_description>
 </parameter>
 <parameter name="len">
@@ -75531,6 +76888,32 @@ gtk_text_view_set_border_window_size()).
 <return></return>
 </function>
 
+<function name="gtk_tim_sort_get_progress">
+<description>
+Does a progress estimate about sort progress, estimates relative
+to the number of items to sort.
+
+Note that this is entirely a progress estimate and does not have
+a relationship with items put in their correct place.  
+It is also an estimate, so no guarantees are made about accuracy,
+other than that it will only report 100% completion when it is
+indeed done sorting.
+
+To get a percentage, you need to divide this number by the total
+number of elements that are being sorted.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkTimSort
+</parameter_description>
+</parameter>
+</parameters>
+<return> Rough guess of sort progress
+</return>
+</function>
+
 <function name="gtk_toggle_button_get_active">
 <description>
 Queries a #GtkToggleButton and returns its current state. Returns %TRUE if
@@ -76229,14 +77612,14 @@ Creates a new empty #GtkTreeListModel displaying @root with all rows collapsed.
 
 </description>
 <parameters>
-<parameter name="passthrough">
-<parameter_description> %TRUE to pass through items from the models
-</parameter_description>
-</parameter>
 <parameter name="root">
 <parameter_description> The #GListModel to use as root
 </parameter_description>
 </parameter>
+<parameter name="passthrough">
+<parameter_description> %TRUE to pass through items from the models
+</parameter_description>
+</parameter>
 <parameter name="autoexpand">
 <parameter_description> %TRUE to set the autoexpand property and expand the @root model
 </parameter_description>
@@ -76255,7 +77638,7 @@ of an item
 </parameter_description>
 </parameter>
 </parameters>
-<return> a newly created #GtkTreeListModel. 
+<return> a newly created #GtkTreeListModel.
 </return>
 </function>
 
@@ -76746,7 +78129,7 @@ once for a given filter model.
 </parameter_description>
 </parameter>
 <parameter name="column">
-<parameter_description> A #gint which is the column containing the visible information
+<parameter_description> A #int which is the column containing the visible information
 </parameter_description>
 </parameter>
 </parameters>
@@ -76775,7 +78158,7 @@ GtkTreeIter  *iter,
 gpointer      data)
 {
 // Visible if row is non-empty and first column is “HI”
-gchar *str;
+char *str;
 gboolean visible = FALSE;
 
 gtk_tree_model_get (model, iter, 0, &amp;str, -1);
@@ -79241,7 +80624,7 @@ are supported.
 
 As an example, `gtk_tree_store_new (3, G_TYPE_INT, G_TYPE_STRING,
 GDK_TYPE_TEXTURE);` will create a new #GtkTreeStore with three columns, of type
-#gint, #gchararray, and #GdkTexture respectively.
+#int, #gchararray, and #GdkTexture respectively.
 
 
 </description>
@@ -83990,6 +85373,27 @@ must be added with G_ADD_PRIVATE()).
 <return></return>
 </function>
 
+<function name="gtk_widget_class_get_accessible_role">
+<description>
+Retrieves the accessible role used by the given #GtkWidget class.
+
+Different accessible roles have different states, and are rendered
+differently by assistive technologies.
+
+See also: gtk_accessible_get_accessible_role()
+
+
+</description>
+<parameters>
+<parameter name="widget_class">
+<parameter_description> a #GtkWidgetClass
+</parameter_description>
+</parameter>
+</parameters>
+<return> the accessible role for the widget class
+</return>
+</function>
+
 <function name="gtk_widget_class_get_css_name">
 <description>
 Gets the name used by this class for matching in CSS code. See
@@ -84137,51 +85541,19 @@ at @owner.
 
 <function name="gtk_widget_class_set_accessible_role">
 <description>
-Sets the default #AtkRole to be set on accessibles created for
-widgets of @widget_class. Accessibles may decide to not honor this
-setting if their role reporting is more refined. Calls to 
-gtk_widget_class_set_accessible_type() will reset this value.
-
-In cases where you want more fine-grained control over the role of
-accessibles created for @widget_class, you should provide your own
-accessible type and use gtk_widget_class_set_accessible_type()
-instead.
-
-If @role is #ATK_ROLE_INVALID, the default role will not be changed
-and the accessible’s default role will be used instead.
-
-This function should only be called from class init functions of widgets.
-
-</description>
-<parameters>
-<parameter name="widget_class">
-<parameter_description> class to set the accessible role for
-</parameter_description>
-</parameter>
-<parameter name="role">
-<parameter_description> The role to use for accessibles created for @widget_class
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
-<function name="gtk_widget_class_set_accessible_type">
-<description>
-Sets the type to be used for creating accessibles for widgets of
-@widget_class. The given @type must be a subtype of the type used for
-accessibles of the parent class.
+Sets the accessible role used by the given #GtkWidget class.
 
-This function should only be called from class init functions of widgets.
+Different accessible roles have different states, and are rendered
+differently by assistive technologies.
 
 </description>
 <parameters>
 <parameter name="widget_class">
-<parameter_description> class to set the accessible type for
+<parameter_description> a #GtkWidgetClass
 </parameter_description>
 </parameter>
-<parameter name="type">
-<parameter_description> The object type that implements the accessible for @widget_class
+<parameter name="accessible_role">
+<parameter_description> the #GtkAccessibleRole used by the @widget_class
 </parameter_description>
 </parameter>
 </parameters>
@@ -84535,33 +85907,6 @@ or window manager that is used.
 <return></return>
 </function>
 
-<function name="gtk_widget_get_accessible">
-<description>
-Returns the accessible object that describes the widget to an
-assistive technology.
-
-If accessibility support is not available, this #AtkObject
-instance may be a no-op. Likewise, if no class-specific #AtkObject
-implementation is available for the widget instance in question,
-it will inherit an #AtkObject implementation from the first ancestor
-class for which such an implementation is defined.
-
-The documentation of the
-[ATK](http://developer.gnome.org/atk/stable/)
-library contains more information about accessible objects and their uses.
-
-
-</description>
-<parameters>
-<parameter name="widget">
-<parameter_description> a #GtkWidget
-</parameter_description>
-</parameter>
-</parameters>
-<return> the #AtkObject associated with @widget
-</return>
-</function>
-
 <function name="gtk_widget_get_allocated_baseline">
 <description>
 Returns the baseline that has currently been allocated to @widget.
@@ -89174,8 +90519,6 @@ gtk_window_set_transient_for() to make the dialog transient for the
 parent; most [window managers][gtk-X11-arch]
 will then disallow lowering the dialog below the parent.
 
-
-
 </description>
 <parameters>
 <parameter name="window">
diff --git a/gtk/src/gtk_enums.defs b/gtk/src/gtk_enums.defs
index 481c9851e..c88688f86 100644
--- a/gtk/src/gtk_enums.defs
+++ b/gtk/src/gtk_enums.defs
@@ -243,11 +243,11 @@
 ;;   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,
+;;   GTK_DEBUG_LAYOUT          = 1 << 13,
+;;   GTK_DEBUG_SNAPSHOT        = 1 << 14,
+;;   GTK_DEBUG_CONSTRAINTS     = 1 << 15,
+;;   GTK_DEBUG_BUILDER_OBJECTS = 1 << 16,
+;;   GTK_DEBUG_A11Y            = 1 << 17,
 ;; } GtkDebugFlag;
 
 (define-flags-extended DebugFlag
@@ -267,11 +267,11 @@
     '("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")
+    '("layout" "GTK_DEBUG_LAYOUT" "1 << 13")
+    '("snapshot" "GTK_DEBUG_SNAPSHOT" "1 << 14")
+    '("constraints" "GTK_DEBUG_CONSTRAINTS" "1 << 15")
+    '("builder-objects" "GTK_DEBUG_BUILDER_OBJECTS" "1 << 16")
+    '("a11y" "GTK_DEBUG_A11Y" "1 << 17")
   )
 )
 
@@ -1485,6 +1485,366 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   GTK_ACCESSIBLE_ROLE_ALERT,
+;;   GTK_ACCESSIBLE_ROLE_ALERT_DIALOG,
+;;   GTK_ACCESSIBLE_ROLE_BANNER,
+;;   GTK_ACCESSIBLE_ROLE_BUTTON,
+;;   GTK_ACCESSIBLE_ROLE_CAPTION,
+;;   GTK_ACCESSIBLE_ROLE_CELL,
+;;   GTK_ACCESSIBLE_ROLE_CHECKBOX,
+;;   GTK_ACCESSIBLE_ROLE_COLUMN_HEADER,
+;;   GTK_ACCESSIBLE_ROLE_COMBO_BOX,
+;;   GTK_ACCESSIBLE_ROLE_COMMAND,
+;;   GTK_ACCESSIBLE_ROLE_COMPOSITE,
+;;   GTK_ACCESSIBLE_ROLE_DIALOG,
+;;   GTK_ACCESSIBLE_ROLE_DOCUMENT,
+;;   GTK_ACCESSIBLE_ROLE_FEED,
+;;   GTK_ACCESSIBLE_ROLE_FORM,
+;;   GTK_ACCESSIBLE_ROLE_GENERIC,
+;;   GTK_ACCESSIBLE_ROLE_GRID,
+;;   GTK_ACCESSIBLE_ROLE_GRID_CELL,
+;;   GTK_ACCESSIBLE_ROLE_GROUP,
+;;   GTK_ACCESSIBLE_ROLE_HEADING,
+;;   GTK_ACCESSIBLE_ROLE_IMG,
+;;   GTK_ACCESSIBLE_ROLE_INPUT,
+;;   GTK_ACCESSIBLE_ROLE_LABEL,
+;;   GTK_ACCESSIBLE_ROLE_LANDMARK,
+;;   GTK_ACCESSIBLE_ROLE_LEGEND,
+;;   GTK_ACCESSIBLE_ROLE_LINK,
+;;   GTK_ACCESSIBLE_ROLE_LIST,
+;;   GTK_ACCESSIBLE_ROLE_LIST_BOX,
+;;   GTK_ACCESSIBLE_ROLE_LIST_ITEM,
+;;   GTK_ACCESSIBLE_ROLE_LOG,
+;;   GTK_ACCESSIBLE_ROLE_MAIN,
+;;   GTK_ACCESSIBLE_ROLE_MARQUEE,
+;;   GTK_ACCESSIBLE_ROLE_METER,
+;;   GTK_ACCESSIBLE_ROLE_MENU,
+;;   GTK_ACCESSIBLE_ROLE_MENU_BAR,
+;;   GTK_ACCESSIBLE_ROLE_MENU_ITEM,
+;;   GTK_ACCESSIBLE_ROLE_MENU_ITEM_CHECKBOX,
+;;   GTK_ACCESSIBLE_ROLE_MENU_ITEM_RADIO,
+;;   GTK_ACCESSIBLE_ROLE_NAVIGATION,
+;;   GTK_ACCESSIBLE_ROLE_NONE,
+;;   GTK_ACCESSIBLE_ROLE_OPTION,
+;;   GTK_ACCESSIBLE_ROLE_PRESENTATION,
+;;   GTK_ACCESSIBLE_ROLE_PROGRESS_BAR,
+;;   GTK_ACCESSIBLE_ROLE_RADIO,
+;;   GTK_ACCESSIBLE_ROLE_RADIO_GROUP,
+;;   GTK_ACCESSIBLE_ROLE_RANGE,
+;;   GTK_ACCESSIBLE_ROLE_REGION,
+;;   GTK_ACCESSIBLE_ROLE_ROW,
+;;   GTK_ACCESSIBLE_ROLE_ROW_GROUP,
+;;   GTK_ACCESSIBLE_ROLE_ROW_HEADER,
+;;   GTK_ACCESSIBLE_ROLE_SCROLLBAR,
+;;   GTK_ACCESSIBLE_ROLE_SEARCH,
+;;   GTK_ACCESSIBLE_ROLE_SEARCH_BOX,
+;;   GTK_ACCESSIBLE_ROLE_SECTION,
+;;   GTK_ACCESSIBLE_ROLE_SECTION_HEAD,
+;;   GTK_ACCESSIBLE_ROLE_SELECT,
+;;   GTK_ACCESSIBLE_ROLE_SEPARATOR,
+;;   GTK_ACCESSIBLE_ROLE_SLIDER,
+;;   GTK_ACCESSIBLE_ROLE_SPIN_BUTTON,
+;;   GTK_ACCESSIBLE_ROLE_STATUS,
+;;   GTK_ACCESSIBLE_ROLE_STRUCTURE,
+;;   GTK_ACCESSIBLE_ROLE_SWITCH,
+;;   GTK_ACCESSIBLE_ROLE_TAB,
+;;   GTK_ACCESSIBLE_ROLE_TABLE,
+;;   GTK_ACCESSIBLE_ROLE_TAB_LIST,
+;;   GTK_ACCESSIBLE_ROLE_TAB_PANEL,
+;;   GTK_ACCESSIBLE_ROLE_TEXT_BOX,
+;;   GTK_ACCESSIBLE_ROLE_TIME,
+;;   GTK_ACCESSIBLE_ROLE_TIMER,
+;;   GTK_ACCESSIBLE_ROLE_TOOLBAR,
+;;   GTK_ACCESSIBLE_ROLE_TOOLTIP,
+;;   GTK_ACCESSIBLE_ROLE_TREE,
+;;   GTK_ACCESSIBLE_ROLE_TREE_GRID,
+;;   GTK_ACCESSIBLE_ROLE_TREE_ITEM,
+;;   GTK_ACCESSIBLE_ROLE_WIDGET,
+;;   GTK_ACCESSIBLE_ROLE_WINDOW
+;; } GtkAccessibleRole;
+
+(define-enum-extended AccessibleRole
+  (in-module "Gtk")
+  (c-name "GtkAccessibleRole")
+  (values
+    '("alert" "GTK_ACCESSIBLE_ROLE_ALERT" "0")
+    '("alert-dialog" "GTK_ACCESSIBLE_ROLE_ALERT_DIALOG" "1")
+    '("banner" "GTK_ACCESSIBLE_ROLE_BANNER" "2")
+    '("button" "GTK_ACCESSIBLE_ROLE_BUTTON" "3")
+    '("caption" "GTK_ACCESSIBLE_ROLE_CAPTION" "4")
+    '("cell" "GTK_ACCESSIBLE_ROLE_CELL" "5")
+    '("checkbox" "GTK_ACCESSIBLE_ROLE_CHECKBOX" "6")
+    '("column-header" "GTK_ACCESSIBLE_ROLE_COLUMN_HEADER" "7")
+    '("combo-box" "GTK_ACCESSIBLE_ROLE_COMBO_BOX" "8")
+    '("command" "GTK_ACCESSIBLE_ROLE_COMMAND" "9")
+    '("composite" "GTK_ACCESSIBLE_ROLE_COMPOSITE" "10")
+    '("dialog" "GTK_ACCESSIBLE_ROLE_DIALOG" "11")
+    '("document" "GTK_ACCESSIBLE_ROLE_DOCUMENT" "12")
+    '("feed" "GTK_ACCESSIBLE_ROLE_FEED" "13")
+    '("form" "GTK_ACCESSIBLE_ROLE_FORM" "14")
+    '("generic" "GTK_ACCESSIBLE_ROLE_GENERIC" "15")
+    '("grid" "GTK_ACCESSIBLE_ROLE_GRID" "16")
+    '("grid-cell" "GTK_ACCESSIBLE_ROLE_GRID_CELL" "17")
+    '("group" "GTK_ACCESSIBLE_ROLE_GROUP" "18")
+    '("heading" "GTK_ACCESSIBLE_ROLE_HEADING" "19")
+    '("img" "GTK_ACCESSIBLE_ROLE_IMG" "20")
+    '("input" "GTK_ACCESSIBLE_ROLE_INPUT" "21")
+    '("label" "GTK_ACCESSIBLE_ROLE_LABEL" "22")
+    '("landmark" "GTK_ACCESSIBLE_ROLE_LANDMARK" "23")
+    '("legend" "GTK_ACCESSIBLE_ROLE_LEGEND" "24")
+    '("link" "GTK_ACCESSIBLE_ROLE_LINK" "25")
+    '("list" "GTK_ACCESSIBLE_ROLE_LIST" "26")
+    '("list-box" "GTK_ACCESSIBLE_ROLE_LIST_BOX" "27")
+    '("list-item" "GTK_ACCESSIBLE_ROLE_LIST_ITEM" "28")
+    '("log" "GTK_ACCESSIBLE_ROLE_LOG" "29")
+    '("main" "GTK_ACCESSIBLE_ROLE_MAIN" "30")
+    '("marquee" "GTK_ACCESSIBLE_ROLE_MARQUEE" "31")
+    '("meter" "GTK_ACCESSIBLE_ROLE_METER" "32")
+    '("menu" "GTK_ACCESSIBLE_ROLE_MENU" "33")
+    '("menu-bar" "GTK_ACCESSIBLE_ROLE_MENU_BAR" "34")
+    '("menu-item" "GTK_ACCESSIBLE_ROLE_MENU_ITEM" "35")
+    '("menu-item-checkbox" "GTK_ACCESSIBLE_ROLE_MENU_ITEM_CHECKBOX" "36")
+    '("menu-item-radio" "GTK_ACCESSIBLE_ROLE_MENU_ITEM_RADIO" "37")
+    '("navigation" "GTK_ACCESSIBLE_ROLE_NAVIGATION" "38")
+    '("none" "GTK_ACCESSIBLE_ROLE_NONE" "39")
+    '("option" "GTK_ACCESSIBLE_ROLE_OPTION" "40")
+    '("presentation" "GTK_ACCESSIBLE_ROLE_PRESENTATION" "41")
+    '("progress-bar" "GTK_ACCESSIBLE_ROLE_PROGRESS_BAR" "42")
+    '("radio" "GTK_ACCESSIBLE_ROLE_RADIO" "43")
+    '("radio-group" "GTK_ACCESSIBLE_ROLE_RADIO_GROUP" "44")
+    '("range" "GTK_ACCESSIBLE_ROLE_RANGE" "45")
+    '("region" "GTK_ACCESSIBLE_ROLE_REGION" "46")
+    '("row" "GTK_ACCESSIBLE_ROLE_ROW" "47")
+    '("row-group" "GTK_ACCESSIBLE_ROLE_ROW_GROUP" "48")
+    '("row-header" "GTK_ACCESSIBLE_ROLE_ROW_HEADER" "49")
+    '("scrollbar" "GTK_ACCESSIBLE_ROLE_SCROLLBAR" "50")
+    '("search" "GTK_ACCESSIBLE_ROLE_SEARCH" "51")
+    '("search-box" "GTK_ACCESSIBLE_ROLE_SEARCH_BOX" "52")
+    '("section" "GTK_ACCESSIBLE_ROLE_SECTION" "53")
+    '("section-head" "GTK_ACCESSIBLE_ROLE_SECTION_HEAD" "54")
+    '("select" "GTK_ACCESSIBLE_ROLE_SELECT" "55")
+    '("separator" "GTK_ACCESSIBLE_ROLE_SEPARATOR" "56")
+    '("slider" "GTK_ACCESSIBLE_ROLE_SLIDER" "57")
+    '("spin-button" "GTK_ACCESSIBLE_ROLE_SPIN_BUTTON" "58")
+    '("status" "GTK_ACCESSIBLE_ROLE_STATUS" "59")
+    '("structure" "GTK_ACCESSIBLE_ROLE_STRUCTURE" "60")
+    '("switch" "GTK_ACCESSIBLE_ROLE_SWITCH" "61")
+    '("tab" "GTK_ACCESSIBLE_ROLE_TAB" "62")
+    '("table" "GTK_ACCESSIBLE_ROLE_TABLE" "63")
+    '("tab-list" "GTK_ACCESSIBLE_ROLE_TAB_LIST" "64")
+    '("tab-panel" "GTK_ACCESSIBLE_ROLE_TAB_PANEL" "65")
+    '("text-box" "GTK_ACCESSIBLE_ROLE_TEXT_BOX" "66")
+    '("time" "GTK_ACCESSIBLE_ROLE_TIME" "67")
+    '("timer" "GTK_ACCESSIBLE_ROLE_TIMER" "68")
+    '("toolbar" "GTK_ACCESSIBLE_ROLE_TOOLBAR" "69")
+    '("tooltip" "GTK_ACCESSIBLE_ROLE_TOOLTIP" "70")
+    '("tree" "GTK_ACCESSIBLE_ROLE_TREE" "71")
+    '("tree-grid" "GTK_ACCESSIBLE_ROLE_TREE_GRID" "72")
+    '("tree-item" "GTK_ACCESSIBLE_ROLE_TREE_ITEM" "73")
+    '("widget" "GTK_ACCESSIBLE_ROLE_WIDGET" "74")
+    '("window" "GTK_ACCESSIBLE_ROLE_WINDOW" "75")
+  )
+)
+
+;; Original typedef:
+;; typedef enum {
+;;   GTK_ACCESSIBLE_STATE_BUSY,
+;;   GTK_ACCESSIBLE_STATE_CHECKED,
+;;   GTK_ACCESSIBLE_STATE_DISABLED,
+;;   GTK_ACCESSIBLE_STATE_EXPANDED,
+;;   GTK_ACCESSIBLE_STATE_HIDDEN,
+;;   GTK_ACCESSIBLE_STATE_INVALID,
+;;   GTK_ACCESSIBLE_STATE_PRESSED,
+;;   GTK_ACCESSIBLE_STATE_SELECTED
+;; } GtkAccessibleState;
+
+(define-enum-extended AccessibleState
+  (in-module "Gtk")
+  (c-name "GtkAccessibleState")
+  (values
+    '("busy" "GTK_ACCESSIBLE_STATE_BUSY" "0")
+    '("checked" "GTK_ACCESSIBLE_STATE_CHECKED" "1")
+    '("disabled" "GTK_ACCESSIBLE_STATE_DISABLED" "2")
+    '("expanded" "GTK_ACCESSIBLE_STATE_EXPANDED" "3")
+    '("hidden" "GTK_ACCESSIBLE_STATE_HIDDEN" "4")
+    '("invalid" "GTK_ACCESSIBLE_STATE_INVALID" "5")
+    '("pressed" "GTK_ACCESSIBLE_STATE_PRESSED" "6")
+    '("selected" "GTK_ACCESSIBLE_STATE_SELECTED" "7")
+  )
+)
+
+;; Original typedef:
+;; typedef enum {
+;;   GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE,
+;;   GTK_ACCESSIBLE_PROPERTY_DESCRIPTION,
+;;   GTK_ACCESSIBLE_PROPERTY_HAS_POPUP,
+;;   GTK_ACCESSIBLE_PROPERTY_KEY_SHORTCUTS,
+;;   GTK_ACCESSIBLE_PROPERTY_LABEL,
+;;   GTK_ACCESSIBLE_PROPERTY_LEVEL,
+;;   GTK_ACCESSIBLE_PROPERTY_MODAL,
+;;   GTK_ACCESSIBLE_PROPERTY_MULTI_LINE,
+;;   GTK_ACCESSIBLE_PROPERTY_MULTI_SELECTABLE,
+;;   GTK_ACCESSIBLE_PROPERTY_ORIENTATION,
+;;   GTK_ACCESSIBLE_PROPERTY_PLACEHOLDER,
+;;   GTK_ACCESSIBLE_PROPERTY_READ_ONLY,
+;;   GTK_ACCESSIBLE_PROPERTY_REQUIRED,
+;;   GTK_ACCESSIBLE_PROPERTY_ROLE_DESCRIPTION,
+;;   GTK_ACCESSIBLE_PROPERTY_SORT,
+;;   GTK_ACCESSIBLE_PROPERTY_VALUE_MAX,
+;;   GTK_ACCESSIBLE_PROPERTY_VALUE_MIN,
+;;   GTK_ACCESSIBLE_PROPERTY_VALUE_NOW,
+;;   GTK_ACCESSIBLE_PROPERTY_VALUE_TEXT
+;; } GtkAccessibleProperty;
+
+(define-enum-extended AccessibleProperty
+  (in-module "Gtk")
+  (c-name "GtkAccessibleProperty")
+  (values
+    '("autocomplete" "GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE" "0")
+    '("description" "GTK_ACCESSIBLE_PROPERTY_DESCRIPTION" "1")
+    '("has-popup" "GTK_ACCESSIBLE_PROPERTY_HAS_POPUP" "2")
+    '("key-shortcuts" "GTK_ACCESSIBLE_PROPERTY_KEY_SHORTCUTS" "3")
+    '("label" "GTK_ACCESSIBLE_PROPERTY_LABEL" "4")
+    '("level" "GTK_ACCESSIBLE_PROPERTY_LEVEL" "5")
+    '("modal" "GTK_ACCESSIBLE_PROPERTY_MODAL" "6")
+    '("multi-line" "GTK_ACCESSIBLE_PROPERTY_MULTI_LINE" "7")
+    '("multi-selectable" "GTK_ACCESSIBLE_PROPERTY_MULTI_SELECTABLE" "8")
+    '("orientation" "GTK_ACCESSIBLE_PROPERTY_ORIENTATION" "9")
+    '("placeholder" "GTK_ACCESSIBLE_PROPERTY_PLACEHOLDER" "10")
+    '("read-only" "GTK_ACCESSIBLE_PROPERTY_READ_ONLY" "11")
+    '("required" "GTK_ACCESSIBLE_PROPERTY_REQUIRED" "12")
+    '("role-description" "GTK_ACCESSIBLE_PROPERTY_ROLE_DESCRIPTION" "13")
+    '("sort" "GTK_ACCESSIBLE_PROPERTY_SORT" "14")
+    '("value-max" "GTK_ACCESSIBLE_PROPERTY_VALUE_MAX" "15")
+    '("value-min" "GTK_ACCESSIBLE_PROPERTY_VALUE_MIN" "16")
+    '("value-now" "GTK_ACCESSIBLE_PROPERTY_VALUE_NOW" "17")
+    '("value-text" "GTK_ACCESSIBLE_PROPERTY_VALUE_TEXT" "18")
+  )
+)
+
+;; Original typedef:
+;; typedef enum {
+;;   GTK_ACCESSIBLE_RELATION_ACTIVE_DESCENDANT,
+;;   GTK_ACCESSIBLE_RELATION_COL_COUNT,
+;;   GTK_ACCESSIBLE_RELATION_COL_INDEX,
+;;   GTK_ACCESSIBLE_RELATION_COL_INDEX_TEXT,
+;;   GTK_ACCESSIBLE_RELATION_COL_SPAN,
+;;   GTK_ACCESSIBLE_RELATION_CONTROLS,
+;;   GTK_ACCESSIBLE_RELATION_DESCRIBED_BY,
+;;   GTK_ACCESSIBLE_RELATION_DETAILS,
+;;   GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE,
+;;   GTK_ACCESSIBLE_RELATION_FLOW_TO,
+;;   GTK_ACCESSIBLE_RELATION_LABELLED_BY,
+;;   GTK_ACCESSIBLE_RELATION_OWNS,
+;;   GTK_ACCESSIBLE_RELATION_POS_IN_SET,
+;;   GTK_ACCESSIBLE_RELATION_ROW_COUNT,
+;;   GTK_ACCESSIBLE_RELATION_ROW_INDEX,
+;;   GTK_ACCESSIBLE_RELATION_ROW_INDEX_TEXT,
+;;   GTK_ACCESSIBLE_RELATION_ROW_SPAN,
+;;   GTK_ACCESSIBLE_RELATION_SET_SIZE
+;; } GtkAccessibleRelation;
+
+(define-enum-extended AccessibleRelation
+  (in-module "Gtk")
+  (c-name "GtkAccessibleRelation")
+  (values
+    '("active-descendant" "GTK_ACCESSIBLE_RELATION_ACTIVE_DESCENDANT" "0")
+    '("col-count" "GTK_ACCESSIBLE_RELATION_COL_COUNT" "1")
+    '("col-index" "GTK_ACCESSIBLE_RELATION_COL_INDEX" "2")
+    '("col-index-text" "GTK_ACCESSIBLE_RELATION_COL_INDEX_TEXT" "3")
+    '("col-span" "GTK_ACCESSIBLE_RELATION_COL_SPAN" "4")
+    '("controls" "GTK_ACCESSIBLE_RELATION_CONTROLS" "5")
+    '("described-by" "GTK_ACCESSIBLE_RELATION_DESCRIBED_BY" "6")
+    '("details" "GTK_ACCESSIBLE_RELATION_DETAILS" "7")
+    '("error-message" "GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE" "8")
+    '("flow-to" "GTK_ACCESSIBLE_RELATION_FLOW_TO" "9")
+    '("labelled-by" "GTK_ACCESSIBLE_RELATION_LABELLED_BY" "10")
+    '("owns" "GTK_ACCESSIBLE_RELATION_OWNS" "11")
+    '("pos-in-set" "GTK_ACCESSIBLE_RELATION_POS_IN_SET" "12")
+    '("row-count" "GTK_ACCESSIBLE_RELATION_ROW_COUNT" "13")
+    '("row-index" "GTK_ACCESSIBLE_RELATION_ROW_INDEX" "14")
+    '("row-index-text" "GTK_ACCESSIBLE_RELATION_ROW_INDEX_TEXT" "15")
+    '("row-span" "GTK_ACCESSIBLE_RELATION_ROW_SPAN" "16")
+    '("set-size" "GTK_ACCESSIBLE_RELATION_SET_SIZE" "17")
+  )
+)
+
+;; Original typedef:
+;; typedef enum {
+;;   GTK_ACCESSIBLE_TRISTATE_FALSE,
+;;   GTK_ACCESSIBLE_TRISTATE_TRUE,
+;;   GTK_ACCESSIBLE_TRISTATE_MIXED
+;; } GtkAccessibleTristate;
+
+(define-enum-extended AccessibleTristate
+  (in-module "Gtk")
+  (c-name "GtkAccessibleTristate")
+  (values
+    '("false" "GTK_ACCESSIBLE_TRISTATE_FALSE" "0")
+    '("true" "GTK_ACCESSIBLE_TRISTATE_TRUE" "1")
+    '("mixed" "GTK_ACCESSIBLE_TRISTATE_MIXED" "2")
+  )
+)
+
+;; Original typedef:
+;; typedef enum { /*< prefix=GTK_ACCESSIBLE_INVALID >*/
+;;   GTK_ACCESSIBLE_INVALID_FALSE,
+;;   GTK_ACCESSIBLE_INVALID_TRUE,
+;;   GTK_ACCESSIBLE_INVALID_GRAMMAR,
+;;   GTK_ACCESSIBLE_INVALID_SPELLING,
+;; } GtkAccessibleInvalidState;
+
+(define-enum-extended AccessibleInvalidState
+  (in-module "Gtk")
+  (c-name "GtkAccessibleInvalidState")
+  (values
+    '("false" "GTK_ACCESSIBLE_INVALID_FALSE" "0")
+    '("true" "GTK_ACCESSIBLE_INVALID_TRUE" "1")
+    '("grammar" "GTK_ACCESSIBLE_INVALID_GRAMMAR" "2")
+    '("spelling" "GTK_ACCESSIBLE_INVALID_SPELLING" "3")
+  )
+)
+
+;; Original typedef:
+;; typedef enum { /*< prefix=GTK_ACCESSIBLE_AUTOCOMPLETE >*/
+;;   GTK_ACCESSIBLE_AUTOCOMPLETE_NONE,
+;;   GTK_ACCESSIBLE_AUTOCOMPLETE_INLINE,
+;;   GTK_ACCESSIBLE_AUTOCOMPLETE_LIST,
+;;   GTK_ACCESSIBLE_AUTOCOMPLETE_BOTH
+;; } GtkAccessibleAutocomplete;
+
+(define-enum-extended AccessibleAutocomplete
+  (in-module "Gtk")
+  (c-name "GtkAccessibleAutocomplete")
+  (values
+    '("none" "GTK_ACCESSIBLE_AUTOCOMPLETE_NONE" "0")
+    '("inline" "GTK_ACCESSIBLE_AUTOCOMPLETE_INLINE" "1")
+    '("list" "GTK_ACCESSIBLE_AUTOCOMPLETE_LIST" "2")
+    '("both" "GTK_ACCESSIBLE_AUTOCOMPLETE_BOTH" "3")
+  )
+)
+
+;; Original typedef:
+;; typedef enum { /*< prefix=GTK_ACCESSIBLE_SORT >*/
+;;   GTK_ACCESSIBLE_SORT_NONE,
+;;   GTK_ACCESSIBLE_SORT_ASCENDING,
+;;   GTK_ACCESSIBLE_SORT_DESCENDING,
+;;   GTK_ACCESSIBLE_SORT_OTHER
+;; } GtkAccessibleSort;
+
+(define-enum-extended AccessibleSort
+  (in-module "Gtk")
+  (c-name "GtkAccessibleSort")
+  (values
+    '("none" "GTK_ACCESSIBLE_SORT_NONE" "0")
+    '("ascending" "GTK_ACCESSIBLE_SORT_ASCENDING" "1")
+    '("descending" "GTK_ACCESSIBLE_SORT_DESCENDING" "2")
+    '("other" "GTK_ACCESSIBLE_SORT_OTHER" "3")
+  )
+)
+
 ;; From gtkeventcontrollerscroll.h
 
 ;; Original typedef:
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index 36a9318c6..2ded269a7 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -67,12 +67,6 @@
   (gtype-id "GTK_TYPE_ENTRY_BUFFER")
 )
 
-(define-object FileChooserEmbed
-  (in-module "Gtk")
-  (c-name "GtkFileChooserEmbed")
-  (gtype-id "GTK_TYPE_FILE_CHOOSER_EMBED")
-)
-
 (define-object FontChooser
   (in-module "Gtk")
   (c-name "GtkFontChooser")
@@ -269,6 +263,13 @@
   (gtype-id "GTK_TYPE_WIDGET")
 )
 
+(define-object TreeView
+  (in-module "Gtk")
+  (parent "GtkWidget")
+  (c-name "GtkTreeView")
+  (gtype-id "GTK_TYPE_TREE_VIEW")
+)
+
 (define-object TextView
   (in-module "Gtk")
   (parent "GtkWidget")
@@ -297,13 +298,6 @@
   (gtype-id "GTK_TYPE_POPOVER")
 )
 
-(define-object PathBar
-  (in-module "Gtk")
-  (parent "GtkWidget")
-  (c-name "GtkPathBar")
-  (gtype-id "GTK_TYPE_PATH_BAR")
-)
-
 (define-object ListBoxRow
   (in-module "Gtk")
   (parent "GtkWidget")
@@ -577,11 +571,11 @@
     '("interactive" "GTK_DEBUG_INTERACTIVE")
     '("touchscreen" "GTK_DEBUG_TOUCHSCREEN")
     '("actions" "GTK_DEBUG_ACTIONS")
-    '("resize" "GTK_DEBUG_RESIZE")
     '("layout" "GTK_DEBUG_LAYOUT")
     '("snapshot" "GTK_DEBUG_SNAPSHOT")
     '("constraints" "GTK_DEBUG_CONSTRAINTS")
     '("builder-objects" "GTK_DEBUG_BUILDER_OBJECTS")
+    '("a11y" "GTK_DEBUG_A11Y")
   )
 )
 
@@ -1302,6 +1296,206 @@
   )
 )
 
+(define-enum AccessibleRole
+  (in-module "Gtk")
+  (c-name "GtkAccessibleRole")
+  (gtype-id "GTK_TYPE_ACCESSIBLE_ROLE")
+  (values
+    '("alert" "GTK_ACCESSIBLE_ROLE_ALERT")
+    '("alert-dialog" "GTK_ACCESSIBLE_ROLE_ALERT_DIALOG")
+    '("banner" "GTK_ACCESSIBLE_ROLE_BANNER")
+    '("button" "GTK_ACCESSIBLE_ROLE_BUTTON")
+    '("caption" "GTK_ACCESSIBLE_ROLE_CAPTION")
+    '("cell" "GTK_ACCESSIBLE_ROLE_CELL")
+    '("checkbox" "GTK_ACCESSIBLE_ROLE_CHECKBOX")
+    '("column-header" "GTK_ACCESSIBLE_ROLE_COLUMN_HEADER")
+    '("combo-box" "GTK_ACCESSIBLE_ROLE_COMBO_BOX")
+    '("command" "GTK_ACCESSIBLE_ROLE_COMMAND")
+    '("composite" "GTK_ACCESSIBLE_ROLE_COMPOSITE")
+    '("dialog" "GTK_ACCESSIBLE_ROLE_DIALOG")
+    '("document" "GTK_ACCESSIBLE_ROLE_DOCUMENT")
+    '("feed" "GTK_ACCESSIBLE_ROLE_FEED")
+    '("form" "GTK_ACCESSIBLE_ROLE_FORM")
+    '("generic" "GTK_ACCESSIBLE_ROLE_GENERIC")
+    '("grid" "GTK_ACCESSIBLE_ROLE_GRID")
+    '("grid-cell" "GTK_ACCESSIBLE_ROLE_GRID_CELL")
+    '("group" "GTK_ACCESSIBLE_ROLE_GROUP")
+    '("heading" "GTK_ACCESSIBLE_ROLE_HEADING")
+    '("img" "GTK_ACCESSIBLE_ROLE_IMG")
+    '("input" "GTK_ACCESSIBLE_ROLE_INPUT")
+    '("label" "GTK_ACCESSIBLE_ROLE_LABEL")
+    '("landmark" "GTK_ACCESSIBLE_ROLE_LANDMARK")
+    '("legend" "GTK_ACCESSIBLE_ROLE_LEGEND")
+    '("link" "GTK_ACCESSIBLE_ROLE_LINK")
+    '("list" "GTK_ACCESSIBLE_ROLE_LIST")
+    '("list-box" "GTK_ACCESSIBLE_ROLE_LIST_BOX")
+    '("list-item" "GTK_ACCESSIBLE_ROLE_LIST_ITEM")
+    '("log" "GTK_ACCESSIBLE_ROLE_LOG")
+    '("main" "GTK_ACCESSIBLE_ROLE_MAIN")
+    '("marquee" "GTK_ACCESSIBLE_ROLE_MARQUEE")
+    '("meter" "GTK_ACCESSIBLE_ROLE_METER")
+    '("menu" "GTK_ACCESSIBLE_ROLE_MENU")
+    '("menu-bar" "GTK_ACCESSIBLE_ROLE_MENU_BAR")
+    '("menu-item" "GTK_ACCESSIBLE_ROLE_MENU_ITEM")
+    '("menu-item-checkbox" "GTK_ACCESSIBLE_ROLE_MENU_ITEM_CHECKBOX")
+    '("menu-item-radio" "GTK_ACCESSIBLE_ROLE_MENU_ITEM_RADIO")
+    '("navigation" "GTK_ACCESSIBLE_ROLE_NAVIGATION")
+    '("none" "GTK_ACCESSIBLE_ROLE_NONE")
+    '("option" "GTK_ACCESSIBLE_ROLE_OPTION")
+    '("presentation" "GTK_ACCESSIBLE_ROLE_PRESENTATION")
+    '("progress-bar" "GTK_ACCESSIBLE_ROLE_PROGRESS_BAR")
+    '("radio" "GTK_ACCESSIBLE_ROLE_RADIO")
+    '("radio-group" "GTK_ACCESSIBLE_ROLE_RADIO_GROUP")
+    '("range" "GTK_ACCESSIBLE_ROLE_RANGE")
+    '("region" "GTK_ACCESSIBLE_ROLE_REGION")
+    '("row" "GTK_ACCESSIBLE_ROLE_ROW")
+    '("row-group" "GTK_ACCESSIBLE_ROLE_ROW_GROUP")
+    '("row-header" "GTK_ACCESSIBLE_ROLE_ROW_HEADER")
+    '("scrollbar" "GTK_ACCESSIBLE_ROLE_SCROLLBAR")
+    '("search" "GTK_ACCESSIBLE_ROLE_SEARCH")
+    '("search-box" "GTK_ACCESSIBLE_ROLE_SEARCH_BOX")
+    '("section" "GTK_ACCESSIBLE_ROLE_SECTION")
+    '("section-head" "GTK_ACCESSIBLE_ROLE_SECTION_HEAD")
+    '("select" "GTK_ACCESSIBLE_ROLE_SELECT")
+    '("separator" "GTK_ACCESSIBLE_ROLE_SEPARATOR")
+    '("slider" "GTK_ACCESSIBLE_ROLE_SLIDER")
+    '("spin-button" "GTK_ACCESSIBLE_ROLE_SPIN_BUTTON")
+    '("status" "GTK_ACCESSIBLE_ROLE_STATUS")
+    '("structure" "GTK_ACCESSIBLE_ROLE_STRUCTURE")
+    '("switch" "GTK_ACCESSIBLE_ROLE_SWITCH")
+    '("tab" "GTK_ACCESSIBLE_ROLE_TAB")
+    '("table" "GTK_ACCESSIBLE_ROLE_TABLE")
+    '("tab-list" "GTK_ACCESSIBLE_ROLE_TAB_LIST")
+    '("tab-panel" "GTK_ACCESSIBLE_ROLE_TAB_PANEL")
+    '("text-box" "GTK_ACCESSIBLE_ROLE_TEXT_BOX")
+    '("time" "GTK_ACCESSIBLE_ROLE_TIME")
+    '("timer" "GTK_ACCESSIBLE_ROLE_TIMER")
+    '("toolbar" "GTK_ACCESSIBLE_ROLE_TOOLBAR")
+    '("tooltip" "GTK_ACCESSIBLE_ROLE_TOOLTIP")
+    '("tree" "GTK_ACCESSIBLE_ROLE_TREE")
+    '("tree-grid" "GTK_ACCESSIBLE_ROLE_TREE_GRID")
+    '("tree-item" "GTK_ACCESSIBLE_ROLE_TREE_ITEM")
+    '("widget" "GTK_ACCESSIBLE_ROLE_WIDGET")
+    '("window" "GTK_ACCESSIBLE_ROLE_WINDOW")
+  )
+)
+
+(define-enum AccessibleState
+  (in-module "Gtk")
+  (c-name "GtkAccessibleState")
+  (gtype-id "GTK_TYPE_ACCESSIBLE_STATE")
+  (values
+    '("busy" "GTK_ACCESSIBLE_STATE_BUSY")
+    '("checked" "GTK_ACCESSIBLE_STATE_CHECKED")
+    '("disabled" "GTK_ACCESSIBLE_STATE_DISABLED")
+    '("expanded" "GTK_ACCESSIBLE_STATE_EXPANDED")
+    '("hidden" "GTK_ACCESSIBLE_STATE_HIDDEN")
+    '("invalid" "GTK_ACCESSIBLE_STATE_INVALID")
+    '("pressed" "GTK_ACCESSIBLE_STATE_PRESSED")
+    '("selected" "GTK_ACCESSIBLE_STATE_SELECTED")
+  )
+)
+
+(define-enum AccessibleProperty
+  (in-module "Gtk")
+  (c-name "GtkAccessibleProperty")
+  (gtype-id "GTK_TYPE_ACCESSIBLE_PROPERTY")
+  (values
+    '("autocomplete" "GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE")
+    '("description" "GTK_ACCESSIBLE_PROPERTY_DESCRIPTION")
+    '("has-popup" "GTK_ACCESSIBLE_PROPERTY_HAS_POPUP")
+    '("key-shortcuts" "GTK_ACCESSIBLE_PROPERTY_KEY_SHORTCUTS")
+    '("label" "GTK_ACCESSIBLE_PROPERTY_LABEL")
+    '("level" "GTK_ACCESSIBLE_PROPERTY_LEVEL")
+    '("modal" "GTK_ACCESSIBLE_PROPERTY_MODAL")
+    '("multi-line" "GTK_ACCESSIBLE_PROPERTY_MULTI_LINE")
+    '("multi-selectable" "GTK_ACCESSIBLE_PROPERTY_MULTI_SELECTABLE")
+    '("orientation" "GTK_ACCESSIBLE_PROPERTY_ORIENTATION")
+    '("placeholder" "GTK_ACCESSIBLE_PROPERTY_PLACEHOLDER")
+    '("read-only" "GTK_ACCESSIBLE_PROPERTY_READ_ONLY")
+    '("required" "GTK_ACCESSIBLE_PROPERTY_REQUIRED")
+    '("role-description" "GTK_ACCESSIBLE_PROPERTY_ROLE_DESCRIPTION")
+    '("sort" "GTK_ACCESSIBLE_PROPERTY_SORT")
+    '("value-max" "GTK_ACCESSIBLE_PROPERTY_VALUE_MAX")
+    '("value-min" "GTK_ACCESSIBLE_PROPERTY_VALUE_MIN")
+    '("value-now" "GTK_ACCESSIBLE_PROPERTY_VALUE_NOW")
+    '("value-text" "GTK_ACCESSIBLE_PROPERTY_VALUE_TEXT")
+  )
+)
+
+(define-enum AccessibleRelation
+  (in-module "Gtk")
+  (c-name "GtkAccessibleRelation")
+  (gtype-id "GTK_TYPE_ACCESSIBLE_RELATION")
+  (values
+    '("active-descendant" "GTK_ACCESSIBLE_RELATION_ACTIVE_DESCENDANT")
+    '("col-count" "GTK_ACCESSIBLE_RELATION_COL_COUNT")
+    '("col-index" "GTK_ACCESSIBLE_RELATION_COL_INDEX")
+    '("col-index-text" "GTK_ACCESSIBLE_RELATION_COL_INDEX_TEXT")
+    '("col-span" "GTK_ACCESSIBLE_RELATION_COL_SPAN")
+    '("controls" "GTK_ACCESSIBLE_RELATION_CONTROLS")
+    '("described-by" "GTK_ACCESSIBLE_RELATION_DESCRIBED_BY")
+    '("details" "GTK_ACCESSIBLE_RELATION_DETAILS")
+    '("error-message" "GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE")
+    '("flow-to" "GTK_ACCESSIBLE_RELATION_FLOW_TO")
+    '("labelled-by" "GTK_ACCESSIBLE_RELATION_LABELLED_BY")
+    '("owns" "GTK_ACCESSIBLE_RELATION_OWNS")
+    '("pos-in-set" "GTK_ACCESSIBLE_RELATION_POS_IN_SET")
+    '("row-count" "GTK_ACCESSIBLE_RELATION_ROW_COUNT")
+    '("row-index" "GTK_ACCESSIBLE_RELATION_ROW_INDEX")
+    '("row-index-text" "GTK_ACCESSIBLE_RELATION_ROW_INDEX_TEXT")
+    '("row-span" "GTK_ACCESSIBLE_RELATION_ROW_SPAN")
+    '("set-size" "GTK_ACCESSIBLE_RELATION_SET_SIZE")
+  )
+)
+
+(define-enum AccessibleTristate
+  (in-module "Gtk")
+  (c-name "GtkAccessibleTristate")
+  (gtype-id "GTK_TYPE_ACCESSIBLE_TRISTATE")
+  (values
+    '("false" "GTK_ACCESSIBLE_TRISTATE_FALSE")
+    '("true" "GTK_ACCESSIBLE_TRISTATE_TRUE")
+    '("mixed" "GTK_ACCESSIBLE_TRISTATE_MIXED")
+  )
+)
+
+(define-enum AccessibleInvalidState
+  (in-module "Gtk")
+  (c-name "GtkAccessibleInvalidState")
+  (gtype-id "GTK_TYPE_ACCESSIBLE_INVALID_STATE")
+  (values
+    '("false" "GTK_ACCESSIBLE_INVALID_FALSE")
+    '("true" "GTK_ACCESSIBLE_INVALID_TRUE")
+    '("grammar" "GTK_ACCESSIBLE_INVALID_GRAMMAR")
+    '("spelling" "GTK_ACCESSIBLE_INVALID_SPELLING")
+  )
+)
+
+(define-enum AccessibleAutocomplete
+  (in-module "Gtk")
+  (c-name "GtkAccessibleAutocomplete")
+  (gtype-id "GTK_TYPE_ACCESSIBLE_AUTOCOMPLETE")
+  (values
+    '("none" "GTK_ACCESSIBLE_AUTOCOMPLETE_NONE")
+    '("inline" "GTK_ACCESSIBLE_AUTOCOMPLETE_INLINE")
+    '("list" "GTK_ACCESSIBLE_AUTOCOMPLETE_LIST")
+    '("both" "GTK_ACCESSIBLE_AUTOCOMPLETE_BOTH")
+  )
+)
+
+(define-enum AccessibleSort
+  (in-module "Gtk")
+  (c-name "GtkAccessibleSort")
+  (gtype-id "GTK_TYPE_ACCESSIBLE_SORT")
+  (values
+    '("none" "GTK_ACCESSIBLE_SORT_NONE")
+    '("ascending" "GTK_ACCESSIBLE_SORT_ASCENDING")
+    '("descending" "GTK_ACCESSIBLE_SORT_DESCENDING")
+    '("other" "GTK_ACCESSIBLE_SORT_OTHER")
+  )
+)
+
 (define-flags EventControllerScrollFlags
   (in-module "Gtk")
   (c-name "GtkEventControllerScrollFlags")
@@ -1888,10 +2082,6 @@
 )
 
 
-;; From gtk-a11y.h
-
-
-
 ;; From gtkaboutdialog.h
 
 (define-function gtk_about_dialog_get_type
@@ -1910,7 +2100,7 @@
   (return-type "none")
   (parameters
     '("GtkWindow*" "parent")
-    '("const-gchar*" "first_property_name")
+    '("const-char*" "first_property_name")
   )
   (varargs #t)
 )
@@ -1918,7 +2108,7 @@
 (define-method get_program_name
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_program_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_program_name
@@ -1926,14 +2116,14 @@
   (c-name "gtk_about_dialog_set_program_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
 (define-method get_version
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_version")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_version
@@ -1941,14 +2131,14 @@
   (c-name "gtk_about_dialog_set_version")
   (return-type "none")
   (parameters
-    '("const-gchar*" "version")
+    '("const-char*" "version")
   )
 )
 
 (define-method get_copyright
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_copyright")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_copyright
@@ -1956,14 +2146,14 @@
   (c-name "gtk_about_dialog_set_copyright")
   (return-type "none")
   (parameters
-    '("const-gchar*" "copyright")
+    '("const-char*" "copyright")
   )
 )
 
 (define-method get_comments
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_comments")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_comments
@@ -1971,14 +2161,14 @@
   (c-name "gtk_about_dialog_set_comments")
   (return-type "none")
   (parameters
-    '("const-gchar*" "comments")
+    '("const-char*" "comments")
   )
 )
 
 (define-method get_license
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_license")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_license
@@ -1986,7 +2176,7 @@
   (c-name "gtk_about_dialog_set_license")
   (return-type "none")
   (parameters
-    '("const-gchar*" "license")
+    '("const-char*" "license")
   )
 )
 
@@ -2023,7 +2213,7 @@
 (define-method get_system_information
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_system_information")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_system_information
@@ -2031,14 +2221,14 @@
   (c-name "gtk_about_dialog_set_system_information")
   (return-type "none")
   (parameters
-    '("const-gchar*" "system_information")
+    '("const-char*" "system_information")
   )
 )
 
 (define-method get_website
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_website")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_website
@@ -2046,14 +2236,14 @@
   (c-name "gtk_about_dialog_set_website")
   (return-type "none")
   (parameters
-    '("const-gchar*" "website")
+    '("const-char*" "website")
   )
 )
 
 (define-method get_website_label
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_website_label")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_website_label
@@ -2061,14 +2251,14 @@
   (c-name "gtk_about_dialog_set_website_label")
   (return-type "none")
   (parameters
-    '("const-gchar*" "website_label")
+    '("const-char*" "website_label")
   )
 )
 
 (define-method get_authors
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_authors")
-  (return-type "const-gchar*-const*")
+  (return-type "const-char*-const*")
 )
 
 (define-method set_authors
@@ -2076,14 +2266,14 @@
   (c-name "gtk_about_dialog_set_authors")
   (return-type "none")
   (parameters
-    '("const-gchar**" "authors")
+    '("const-char**" "authors")
   )
 )
 
 (define-method get_documenters
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_documenters")
-  (return-type "const-gchar*-const*")
+  (return-type "const-char*-const*")
 )
 
 (define-method set_documenters
@@ -2091,14 +2281,14 @@
   (c-name "gtk_about_dialog_set_documenters")
   (return-type "none")
   (parameters
-    '("const-gchar**" "documenters")
+    '("const-char**" "documenters")
   )
 )
 
 (define-method get_artists
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_artists")
-  (return-type "const-gchar*-const*")
+  (return-type "const-char*-const*")
 )
 
 (define-method set_artists
@@ -2106,14 +2296,14 @@
   (c-name "gtk_about_dialog_set_artists")
   (return-type "none")
   (parameters
-    '("const-gchar**" "artists")
+    '("const-char**" "artists")
   )
 )
 
 (define-method get_translator_credits
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_translator_credits")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_translator_credits
@@ -2121,7 +2311,7 @@
   (c-name "gtk_about_dialog_set_translator_credits")
   (return-type "none")
   (parameters
-    '("const-gchar*" "translator_credits")
+    '("const-char*" "translator_credits")
   )
 )
 
@@ -2143,7 +2333,7 @@
 (define-method get_logo_icon_name
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_logo_icon_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_logo_icon_name
@@ -2151,7 +2341,7 @@
   (c-name "gtk_about_dialog_set_logo_icon_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "icon_name")
+    '("const-char*" "icon_name")
   )
 )
 
@@ -2160,8 +2350,8 @@
   (c-name "gtk_about_dialog_add_credit_section")
   (return-type "none")
   (parameters
-    '("const-gchar*" "section_name")
-    '("const-gchar**" "people")
+    '("const-char*" "section_name")
+    '("const-char**" "people")
   )
 )
 
@@ -2182,7 +2372,7 @@
   (c-name "gtk_accelerator_parse")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "accelerator")
+    '("const-char*" "accelerator")
     '("guint*" "accelerator_key")
     '("GdkModifierType*" "accelerator_mods")
   )
@@ -2192,7 +2382,7 @@
   (c-name "gtk_accelerator_parse_with_keycode")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "accelerator")
+    '("const-char*" "accelerator")
     '("GdkDisplay*" "display")
     '("guint*" "accelerator_key")
     '("guint**" "accelerator_codes")
@@ -2202,7 +2392,7 @@
 
 (define-function gtk_accelerator_name
   (c-name "gtk_accelerator_name")
-  (return-type "gchar*")
+  (return-type "char*")
   (parameters
     '("guint" "accelerator_key")
     '("GdkModifierType" "accelerator_mods")
@@ -2211,7 +2401,7 @@
 
 (define-function gtk_accelerator_name_with_keycode
   (c-name "gtk_accelerator_name_with_keycode")
-  (return-type "gchar*")
+  (return-type "char*")
   (parameters
     '("GdkDisplay*" "display")
     '("guint" "accelerator_key")
@@ -2222,7 +2412,7 @@
 
 (define-function gtk_accelerator_get_label
   (c-name "gtk_accelerator_get_label")
-  (return-type "gchar*")
+  (return-type "char*")
   (parameters
     '("guint" "accelerator_key")
     '("GdkModifierType" "accelerator_mods")
@@ -2231,7 +2421,7 @@
 
 (define-function gtk_accelerator_get_label_with_keycode
   (c-name "gtk_accelerator_get_label_with_keycode")
-  (return-type "gchar*")
+  (return-type "char*")
   (parameters
     '("GdkDisplay*" "display")
     '("guint" "accelerator_key")
@@ -2259,7 +2449,7 @@
   (is-constructor-of "GtkAccelLabel")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "string")
+    '("const-char*" "string")
   )
 )
 
@@ -2329,19 +2519,97 @@
 
 ;; From gtkaccessible.h
 
-(define-method set_widget
+(define-method get_accessible_role
   (of-object "GtkAccessible")
-  (c-name "gtk_accessible_set_widget")
+  (c-name "gtk_accessible_get_accessible_role")
+  (return-type "GtkAccessibleRole")
+)
+
+(define-method update_state
+  (of-object "GtkAccessible")
+  (c-name "gtk_accessible_update_state")
   (return-type "none")
   (parameters
-    '("GtkWidget*" "widget")
+    '("GtkAccessibleState" "first_state")
   )
+  (varargs #t)
 )
 
-(define-method get_widget
+(define-method update_property
   (of-object "GtkAccessible")
-  (c-name "gtk_accessible_get_widget")
-  (return-type "GtkWidget*")
+  (c-name "gtk_accessible_update_property")
+  (return-type "none")
+  (parameters
+    '("GtkAccessibleProperty" "first_property")
+  )
+  (varargs #t)
+)
+
+(define-method update_relation
+  (of-object "GtkAccessible")
+  (c-name "gtk_accessible_update_relation")
+  (return-type "none")
+  (parameters
+    '("GtkAccessibleRelation" "first_relation")
+  )
+  (varargs #t)
+)
+
+(define-method update_state_value
+  (of-object "GtkAccessible")
+  (c-name "gtk_accessible_update_state_value")
+  (return-type "none")
+  (parameters
+    '("GtkAccessibleState" "state")
+    '("const-GValue*" "value")
+  )
+)
+
+(define-method update_property_value
+  (of-object "GtkAccessible")
+  (c-name "gtk_accessible_update_property_value")
+  (return-type "none")
+  (parameters
+    '("GtkAccessibleProperty" "property")
+    '("const-GValue*" "value")
+  )
+)
+
+(define-method update_relation_value
+  (of-object "GtkAccessible")
+  (c-name "gtk_accessible_update_relation_value")
+  (return-type "none")
+  (parameters
+    '("GtkAccessibleRelation" "relation")
+    '("const-GValue*" "value")
+  )
+)
+
+(define-method reset_state
+  (of-object "GtkAccessible")
+  (c-name "gtk_accessible_reset_state")
+  (return-type "none")
+  (parameters
+    '("GtkAccessibleState" "state")
+  )
+)
+
+(define-method reset_property
+  (of-object "GtkAccessible")
+  (c-name "gtk_accessible_reset_property")
+  (return-type "none")
+  (parameters
+    '("GtkAccessibleProperty" "property")
+  )
+)
+
+(define-method reset_relation
+  (of-object "GtkAccessible")
+  (c-name "gtk_accessible_reset_relation")
+  (return-type "none")
+  (parameters
+    '("GtkAccessibleRelation" "relation")
+  )
 )
 
 
@@ -2356,7 +2624,7 @@
 (define-method get_action_name
   (of-object "GtkActionable")
   (c-name "gtk_actionable_get_action_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_action_name
@@ -2364,7 +2632,7 @@
   (c-name "gtk_actionable_set_action_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "action_name")
+    '("const-char*" "action_name")
   )
 )
 
@@ -2388,7 +2656,7 @@
   (c-name "gtk_actionable_set_action_target")
   (return-type "none")
   (parameters
-    '("const-gchar*" "format_string")
+    '("const-char*" "format_string")
   )
   (varargs #t)
 )
@@ -2398,7 +2666,7 @@
   (c-name "gtk_actionable_set_detailed_action_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "detailed_action_name")
+    '("const-char*" "detailed_action_name")
   )
 )
 
@@ -2488,12 +2756,12 @@
   (is-constructor-of "GtkAdjustment")
   (return-type "GtkAdjustment*")
   (parameters
-    '("gdouble" "value")
-    '("gdouble" "lower")
-    '("gdouble" "upper")
-    '("gdouble" "step_increment")
-    '("gdouble" "page_increment")
-    '("gdouble" "page_size")
+    '("double" "value")
+    '("double" "lower")
+    '("double" "upper")
+    '("double" "step_increment")
+    '("double" "page_increment")
+    '("double" "page_size")
   )
 )
 
@@ -2502,15 +2770,15 @@
   (c-name "gtk_adjustment_clamp_page")
   (return-type "none")
   (parameters
-    '("gdouble" "lower")
-    '("gdouble" "upper")
+    '("double" "lower")
+    '("double" "upper")
   )
 )
 
 (define-method get_value
   (of-object "GtkAdjustment")
   (c-name "gtk_adjustment_get_value")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_value
@@ -2518,14 +2786,14 @@
   (c-name "gtk_adjustment_set_value")
   (return-type "none")
   (parameters
-    '("gdouble" "value")
+    '("double" "value")
   )
 )
 
 (define-method get_lower
   (of-object "GtkAdjustment")
   (c-name "gtk_adjustment_get_lower")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_lower
@@ -2533,14 +2801,14 @@
   (c-name "gtk_adjustment_set_lower")
   (return-type "none")
   (parameters
-    '("gdouble" "lower")
+    '("double" "lower")
   )
 )
 
 (define-method get_upper
   (of-object "GtkAdjustment")
   (c-name "gtk_adjustment_get_upper")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_upper
@@ -2548,14 +2816,14 @@
   (c-name "gtk_adjustment_set_upper")
   (return-type "none")
   (parameters
-    '("gdouble" "upper")
+    '("double" "upper")
   )
 )
 
 (define-method get_step_increment
   (of-object "GtkAdjustment")
   (c-name "gtk_adjustment_get_step_increment")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_step_increment
@@ -2563,14 +2831,14 @@
   (c-name "gtk_adjustment_set_step_increment")
   (return-type "none")
   (parameters
-    '("gdouble" "step_increment")
+    '("double" "step_increment")
   )
 )
 
 (define-method get_page_increment
   (of-object "GtkAdjustment")
   (c-name "gtk_adjustment_get_page_increment")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_page_increment
@@ -2578,14 +2846,14 @@
   (c-name "gtk_adjustment_set_page_increment")
   (return-type "none")
   (parameters
-    '("gdouble" "page_increment")
+    '("double" "page_increment")
   )
 )
 
 (define-method get_page_size
   (of-object "GtkAdjustment")
   (c-name "gtk_adjustment_get_page_size")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_page_size
@@ -2593,7 +2861,7 @@
   (c-name "gtk_adjustment_set_page_size")
   (return-type "none")
   (parameters
-    '("gdouble" "page_size")
+    '("double" "page_size")
   )
 )
 
@@ -2602,19 +2870,19 @@
   (c-name "gtk_adjustment_configure")
   (return-type "none")
   (parameters
-    '("gdouble" "value")
-    '("gdouble" "lower")
-    '("gdouble" "upper")
-    '("gdouble" "step_increment")
-    '("gdouble" "page_increment")
-    '("gdouble" "page_size")
+    '("double" "value")
+    '("double" "lower")
+    '("double" "upper")
+    '("double" "step_increment")
+    '("double" "page_increment")
+    '("double" "page_size")
   )
 )
 
 (define-method get_minimum_increment
   (of-object "GtkAdjustment")
   (c-name "gtk_adjustment_get_minimum_increment")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 
@@ -2631,7 +2899,7 @@
   (is-constructor-of "GtkAppChooserButton")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "content_type")
+    '("const-char*" "content_type")
   )
 )
 
@@ -2646,8 +2914,8 @@
   (c-name "gtk_app_chooser_button_append_custom_item")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("const-gchar*" "label")
+    '("const-char*" "name")
+    '("const-char*" "label")
     '("GIcon*" "icon")
   )
 )
@@ -2657,7 +2925,7 @@
   (c-name "gtk_app_chooser_button_set_active_custom_item")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
@@ -2681,14 +2949,14 @@
   (c-name "gtk_app_chooser_button_set_heading")
   (return-type "none")
   (parameters
-    '("const-gchar*" "heading")
+    '("const-char*" "heading")
   )
 )
 
 (define-method get_heading
   (of-object "GtkAppChooserButton")
   (c-name "gtk_app_chooser_button_get_heading")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_show_default_item
@@ -2747,7 +3015,7 @@
   (parameters
     '("GtkWindow*" "parent")
     '("GtkDialogFlags" "flags")
-    '("const-gchar*" "content_type")
+    '("const-char*" "content_type")
   )
 )
 
@@ -2762,14 +3030,14 @@
   (c-name "gtk_app_chooser_dialog_set_heading")
   (return-type "none")
   (parameters
-    '("const-gchar*" "heading")
+    '("const-char*" "heading")
   )
 )
 
 (define-method get_heading
   (of-object "GtkAppChooserDialog")
   (c-name "gtk_app_chooser_dialog_get_heading")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 
@@ -2790,7 +3058,7 @@
 (define-method get_content_type
   (of-object "GtkAppChooser")
   (c-name "gtk_app_chooser_get_content_type")
-  (return-type "gchar*")
+  (return-type "char*")
 )
 
 (define-method refresh
@@ -2813,7 +3081,7 @@
   (is-constructor-of "GtkAppChooserWidget")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "content_type")
+    '("const-char*" "content_type")
   )
 )
 
@@ -2897,14 +3165,14 @@
   (c-name "gtk_app_chooser_widget_set_default_text")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
+    '("const-char*" "text")
   )
 )
 
 (define-method get_default_text
   (of-object "GtkAppChooserWidget")
   (c-name "gtk_app_chooser_widget_get_default_text")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 
@@ -2921,7 +3189,7 @@
   (is-constructor-of "GtkApplication")
   (return-type "GtkApplication*")
   (parameters
-    '("const-gchar*" "application_id")
+    '("const-char*" "application_id")
     '("GApplicationFlags" "flags")
   )
 )
@@ -2972,7 +3240,7 @@
   (parameters
     '("GtkWindow*" "window")
     '("GtkApplicationInhibitFlags" "flags")
-    '("const-gchar*" "reason")
+    '("const-char*" "reason")
   )
 )
 
@@ -3003,24 +3271,24 @@
 (define-method list_action_descriptions
   (of-object "GtkApplication")
   (c-name "gtk_application_list_action_descriptions")
-  (return-type "gchar**")
+  (return-type "char**")
 )
 
 (define-method get_accels_for_action
   (of-object "GtkApplication")
   (c-name "gtk_application_get_accels_for_action")
-  (return-type "gchar**")
+  (return-type "char**")
   (parameters
-    '("const-gchar*" "detailed_action_name")
+    '("const-char*" "detailed_action_name")
   )
 )
 
 (define-method get_actions_for_accel
   (of-object "GtkApplication")
   (c-name "gtk_application_get_actions_for_accel")
-  (return-type "gchar**")
+  (return-type "char**")
   (parameters
-    '("const-gchar*" "accel")
+    '("const-char*" "accel")
   )
 )
 
@@ -3029,8 +3297,8 @@
   (c-name "gtk_application_set_accels_for_action")
   (return-type "none")
   (parameters
-    '("const-gchar*" "detailed_action_name")
-    '("const-gchar*-const*" "accels")
+    '("const-char*" "detailed_action_name")
+    '("const-char*-const*" "accels")
   )
 )
 
@@ -3039,7 +3307,7 @@
   (c-name "gtk_application_get_menu_by_id")
   (return-type "GMenu*")
   (parameters
-    '("const-gchar*" "id")
+    '("const-char*" "id")
   )
 )
 
@@ -3225,7 +3493,7 @@
 (define-method get_current_page
   (of-object "GtkAssistant")
   (c-name "gtk_assistant_get_current_page")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_current_page
@@ -3233,14 +3501,14 @@
   (c-name "gtk_assistant_set_current_page")
   (return-type "none")
   (parameters
-    '("gint" "page_num")
+    '("int" "page_num")
   )
 )
 
 (define-method get_n_pages
   (of-object "GtkAssistant")
   (c-name "gtk_assistant_get_n_pages")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_nth_page
@@ -3248,14 +3516,14 @@
   (c-name "gtk_assistant_get_nth_page")
   (return-type "GtkWidget*")
   (parameters
-    '("gint" "page_num")
+    '("int" "page_num")
   )
 )
 
 (define-method prepend_page
   (of-object "GtkAssistant")
   (c-name "gtk_assistant_prepend_page")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkWidget*" "page")
   )
@@ -3264,7 +3532,7 @@
 (define-method append_page
   (of-object "GtkAssistant")
   (c-name "gtk_assistant_append_page")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkWidget*" "page")
   )
@@ -3273,10 +3541,10 @@
 (define-method insert_page
   (of-object "GtkAssistant")
   (c-name "gtk_assistant_insert_page")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkWidget*" "page")
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
@@ -3285,7 +3553,7 @@
   (c-name "gtk_assistant_remove_page")
   (return-type "none")
   (parameters
-    '("gint" "page_num")
+    '("int" "page_num")
   )
 )
 
@@ -3325,14 +3593,14 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "page")
-    '("const-gchar*" "title")
+    '("const-char*" "title")
   )
 )
 
 (define-method get_page_title
   (of-object "GtkAssistant")
   (c-name "gtk_assistant_get_page_title")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
   (parameters
     '("GtkWidget*" "page")
   )
@@ -3410,6 +3678,25 @@
 
 
 
+;; From gtkatcontext.h
+
+(define-method get_accessible_role
+  (of-object "GtkATContext")
+  (c-name "gtk_at_context_get_accessible_role")
+  (return-type "GtkAccessibleRole")
+)
+
+(define-function gtk_at_context_create
+  (c-name "gtk_at_context_create")
+  (return-type "GtkATContext*")
+  (parameters
+    '("GtkAccessibleRole" "accessible_role")
+    '("GtkAccessible*" "accessible")
+  )
+)
+
+
+
 ;; From gtk-autocleanups.h
 
 
@@ -3800,6 +4087,49 @@
 
 
 
+;; From gtkboolfilter.h
+
+(define-function gtk_bool_filter_new
+  (c-name "gtk_bool_filter_new")
+  (is-constructor-of "GtkBoolFilter")
+  (return-type "GtkFilter*")
+  (parameters
+    '("GtkExpression*" "expression")
+  )
+)
+
+(define-method get_expression
+  (of-object "GtkBoolFilter")
+  (c-name "gtk_bool_filter_get_expression")
+  (return-type "GtkExpression*")
+)
+
+(define-method set_expression
+  (of-object "GtkBoolFilter")
+  (c-name "gtk_bool_filter_set_expression")
+  (return-type "none")
+  (parameters
+    '("GtkExpression*" "expression")
+  )
+)
+
+(define-method get_invert
+  (of-object "GtkBoolFilter")
+  (c-name "gtk_bool_filter_get_invert")
+  (return-type "gboolean")
+)
+
+(define-method set_invert
+  (of-object "GtkBoolFilter")
+  (c-name "gtk_bool_filter_set_invert")
+  (return-type "none")
+  (parameters
+    '("gboolean" "invert")
+  )
+)
+
+
+
 ;; From gtkborder.h
 
 (define-function gtk_border_get_type
@@ -3840,7 +4170,7 @@
   (return-type "GtkWidget*")
   (parameters
     '("GtkOrientation" "orientation")
-    '("gint" "spacing")
+    '("int" "spacing")
   )
 )
 
@@ -3864,14 +4194,14 @@
   (c-name "gtk_box_set_spacing")
   (return-type "none")
   (parameters
-    '("gint" "spacing")
+    '("int" "spacing")
   )
 )
 
 (define-method get_spacing
   (of-object "GtkBox")
   (c-name "gtk_box_get_spacing")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_baseline_position
@@ -4008,14 +4338,14 @@
   (c-name "gtk_buildable_set_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
 (define-method get_name
   (of-object "GtkBuildable")
   (c-name "gtk_buildable_get_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method add_child
@@ -4025,7 +4355,7 @@
   (parameters
     '("GtkBuilder*" "builder")
     '("GObject*" "child")
-    '("const-gchar*" "type")
+    '("const-char*" "type")
   )
 )
 
@@ -4035,7 +4365,7 @@
   (return-type "none")
   (parameters
     '("GtkBuilder*" "builder")
-    '("const-gchar*" "name")
+    '("const-char*" "name")
     '("const-GValue*" "value")
   )
 )
@@ -4046,7 +4376,7 @@
   (return-type "GObject*")
   (parameters
     '("GtkBuilder*" "builder")
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
@@ -4057,7 +4387,7 @@
   (parameters
     '("GtkBuilder*" "builder")
     '("GObject*" "child")
-    '("const-gchar*" "tagname")
+    '("const-char*" "tagname")
     '("GtkBuildableParser*" "parser")
     '("gpointer*" "data")
   )
@@ -4070,7 +4400,7 @@
   (parameters
     '("GtkBuilder*" "builder")
     '("GObject*" "child")
-    '("const-gchar*" "tagname")
+    '("const-char*" "tagname")
     '("gpointer" "data")
   )
 )
@@ -4082,7 +4412,7 @@
   (parameters
     '("GtkBuilder*" "builder")
     '("GObject*" "child")
-    '("const-gchar*" "tagname")
+    '("const-char*" "tagname")
     '("gpointer" "data")
   )
 )
@@ -4102,7 +4432,7 @@
   (return-type "GObject*")
   (parameters
     '("GtkBuilder*" "builder")
-    '("const-gchar*" "childname")
+    '("const-char*" "childname")
   )
 )
 
@@ -4139,8 +4469,8 @@
   (c-name "gtk_buildable_parse_context_get_position")
   (return-type "none")
   (parameters
-    '("gint*" "line_number")
-    '("gint*" "char_number")
+    '("int*" "line_number")
+    '("int*" "char_number")
   )
 )
 
@@ -4169,7 +4499,7 @@
   (c-name "gtk_builder_add_from_file")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "filename")
+    '("const-char*" "filename")
     '("GError**" "error")
   )
 )
@@ -4179,7 +4509,7 @@
   (c-name "gtk_builder_add_from_resource")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "resource_path")
+    '("const-char*" "resource_path")
     '("GError**" "error")
   )
 )
@@ -4189,7 +4519,7 @@
   (c-name "gtk_builder_add_from_string")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "buffer")
+    '("const-char*" "buffer")
     '("gssize" "length")
     '("GError**" "error")
   )
@@ -4200,7 +4530,7 @@
   (c-name "gtk_builder_add_objects_from_file")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "filename")
+    '("const-char*" "filename")
     '("const-char**" "object_ids")
     '("GError**" "error")
   )
@@ -4211,7 +4541,7 @@
   (c-name "gtk_builder_add_objects_from_resource")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "resource_path")
+    '("const-char*" "resource_path")
     '("const-char**" "object_ids")
     '("GError**" "error")
   )
@@ -4222,7 +4552,7 @@
   (c-name "gtk_builder_add_objects_from_string")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "buffer")
+    '("const-char*" "buffer")
     '("gssize" "length")
     '("const-char**" "object_ids")
     '("GError**" "error")
@@ -4234,7 +4564,7 @@
   (c-name "gtk_builder_get_object")
   (return-type "GObject*")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
@@ -4249,7 +4579,7 @@
   (c-name "gtk_builder_expose_object")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
     '("GObject*" "object")
   )
 )
@@ -4274,14 +4604,14 @@
   (c-name "gtk_builder_set_translation_domain")
   (return-type "none")
   (parameters
-    '("const-gchar*" "domain")
+    '("const-char*" "domain")
   )
 )
 
 (define-method get_translation_domain
   (of-object "GtkBuilder")
   (c-name "gtk_builder_get_translation_domain")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_scope
@@ -4314,7 +4644,7 @@
   (return-type "gboolean")
   (parameters
     '("GParamSpec*" "pspec")
-    '("const-gchar*" "string")
+    '("const-char*" "string")
     '("GValue*" "value")
     '("GError**" "error")
   )
@@ -4326,7 +4656,7 @@
   (return-type "gboolean")
   (parameters
     '("GType" "type")
-    '("const-gchar*" "string")
+    '("const-char*" "string")
     '("GValue*" "value")
     '("GError**" "error")
   )
@@ -4336,7 +4666,7 @@
   (c-name "gtk_builder_new_from_file")
   (return-type "GtkBuilder*")
   (parameters
-    '("const-gchar*" "filename")
+    '("const-char*" "filename")
   )
 )
 
@@ -4344,7 +4674,7 @@
   (c-name "gtk_builder_new_from_resource")
   (return-type "GtkBuilder*")
   (parameters
-    '("const-gchar*" "resource_path")
+    '("const-char*" "resource_path")
   )
 )
 
@@ -4352,7 +4682,7 @@
   (c-name "gtk_builder_new_from_string")
   (return-type "GtkBuilder*")
   (parameters
-    '("const-gchar*" "string")
+    '("const-char*" "string")
     '("gssize" "length")
   )
 )
@@ -4376,7 +4706,7 @@
   (parameters
     '("GObject*" "object")
     '("GType" "template_type")
-    '("const-gchar*" "buffer")
+    '("const-char*" "buffer")
     '("gssize" "length")
     '("GError**" "error")
   )
@@ -4436,7 +4766,7 @@
   (c-name "gtk_builder_cscope_add_callback_symbol")
   (return-type "none")
   (parameters
-    '("const-gchar*" "callback_name")
+    '("const-char*" "callback_name")
     '("GCallback" "callback_symbol")
   )
 )
@@ -4446,7 +4776,7 @@
   (c-name "gtk_builder_cscope_add_callback_symbols")
   (return-type "none")
   (parameters
-    '("const-gchar*" "first_callback_name")
+    '("const-char*" "first_callback_name")
     '("GCallback" "first_callback_symbol")
   )
   (varargs #t)
@@ -4457,7 +4787,7 @@
   (c-name "gtk_builder_cscope_lookup_callback_symbol")
   (return-type "GCallback")
   (parameters
-    '("const-gchar*" "callback_name")
+    '("const-char*" "callback_name")
   )
 )
 
@@ -4480,7 +4810,7 @@
   (c-name "gtk_button_new_with_label")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
@@ -4488,7 +4818,7 @@
   (c-name "gtk_button_new_from_icon_name")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "icon_name")
+    '("const-char*" "icon_name")
   )
 )
 
@@ -4496,7 +4826,7 @@
   (c-name "gtk_button_new_with_mnemonic")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
@@ -4520,14 +4850,14 @@
   (c-name "gtk_button_set_label")
   (return-type "none")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
 (define-method get_label
   (of-object "GtkButton")
   (c-name "gtk_button_get_label")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_use_underline
@@ -4725,7 +5055,7 @@
 (define-method get_spacing
   (of-object "GtkCellAreaBox")
   (c-name "gtk_cell_area_box_get_spacing")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_spacing
@@ -4733,7 +5063,7 @@
   (c-name "gtk_cell_area_box_set_spacing")
   (return-type "none")
   (parameters
-    '("gint" "spacing")
+    '("int" "spacing")
   )
 )
 
@@ -4757,8 +5087,8 @@
   (c-name "gtk_cell_area_context_allocate")
   (return-type "none")
   (parameters
-    '("gint" "width")
-    '("gint" "height")
+    '("int" "width")
+    '("int" "height")
   )
 )
 
@@ -4773,8 +5103,8 @@
   (c-name "gtk_cell_area_context_get_preferred_width")
   (return-type "none")
   (parameters
-    '("gint*" "minimum_width")
-    '("gint*" "natural_width")
+    '("int*" "minimum_width")
+    '("int*" "natural_width")
   )
 )
 
@@ -4783,8 +5113,8 @@
   (c-name "gtk_cell_area_context_get_preferred_height")
   (return-type "none")
   (parameters
-    '("gint*" "minimum_height")
-    '("gint*" "natural_height")
+    '("int*" "minimum_height")
+    '("int*" "natural_height")
   )
 )
 
@@ -4793,9 +5123,9 @@
   (c-name "gtk_cell_area_context_get_preferred_height_for_width")
   (return-type "none")
   (parameters
-    '("gint" "width")
-    '("gint*" "minimum_height")
-    '("gint*" "natural_height")
+    '("int" "width")
+    '("int*" "minimum_height")
+    '("int*" "natural_height")
   )
 )
 
@@ -4804,9 +5134,9 @@
   (c-name "gtk_cell_area_context_get_preferred_width_for_height")
   (return-type "none")
   (parameters
-    '("gint" "height")
-    '("gint*" "minimum_width")
-    '("gint*" "natural_width")
+    '("int" "height")
+    '("int*" "minimum_width")
+    '("int*" "natural_width")
   )
 )
 
@@ -4815,8 +5145,8 @@
   (c-name "gtk_cell_area_context_get_allocation")
   (return-type "none")
   (parameters
-    '("gint*" "width")
-    '("gint*" "height")
+    '("int*" "width")
+    '("int*" "height")
   )
 )
 
@@ -4825,8 +5155,8 @@
   (c-name "gtk_cell_area_context_push_preferred_width")
   (return-type "none")
   (parameters
-    '("gint" "minimum_width")
-    '("gint" "natural_width")
+    '("int" "minimum_width")
+    '("int" "natural_width")
   )
 )
 
@@ -4835,8 +5165,8 @@
   (c-name "gtk_cell_area_context_push_preferred_height")
   (return-type "none")
   (parameters
-    '("gint" "minimum_height")
-    '("gint" "natural_height")
+    '("int" "minimum_height")
+    '("int" "natural_height")
   )
 )
 
@@ -4903,7 +5233,7 @@
 (define-method event
   (of-object "GtkCellArea")
   (c-name "gtk_cell_area_event")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkCellAreaContext*" "context")
     '("GtkWidget*" "widget")
@@ -4949,8 +5279,8 @@
     '("GtkCellAreaContext*" "context")
     '("GtkWidget*" "widget")
     '("const-GdkRectangle*" "cell_area")
-    '("gint" "x")
-    '("gint" "y")
+    '("int" "x")
+    '("int" "y")
     '("GdkRectangle*" "alloc_area")
   )
 )
@@ -4983,8 +5313,8 @@
   (parameters
     '("GtkCellAreaContext*" "context")
     '("GtkWidget*" "widget")
-    '("gint*" "minimum_width")
-    '("gint*" "natural_width")
+    '("int*" "minimum_width")
+    '("int*" "natural_width")
   )
 )
 
@@ -4995,9 +5325,9 @@
   (parameters
     '("GtkCellAreaContext*" "context")
     '("GtkWidget*" "widget")
-    '("gint" "width")
-    '("gint*" "minimum_height")
-    '("gint*" "natural_height")
+    '("int" "width")
+    '("int*" "minimum_height")
+    '("int*" "natural_height")
   )
 )
 
@@ -5008,8 +5338,8 @@
   (parameters
     '("GtkCellAreaContext*" "context")
     '("GtkWidget*" "widget")
-    '("gint*" "minimum_height")
-    '("gint*" "natural_height")
+    '("int*" "minimum_height")
+    '("int*" "natural_height")
   )
 )
 
@@ -5020,16 +5350,16 @@
   (parameters
     '("GtkCellAreaContext*" "context")
     '("GtkWidget*" "widget")
-    '("gint" "height")
-    '("gint*" "minimum_width")
-    '("gint*" "natural_width")
+    '("int" "height")
+    '("int*" "minimum_width")
+    '("int*" "natural_width")
   )
 )
 
 (define-method get_current_path_string
   (of-object "GtkCellArea")
   (c-name "gtk_cell_area_get_current_path_string")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method apply_attributes
@@ -5050,8 +5380,8 @@
   (return-type "none")
   (parameters
     '("GtkCellRenderer*" "renderer")
-    '("const-gchar*" "attribute")
-    '("gint" "column")
+    '("const-char*" "attribute")
+    '("int" "column")
   )
 )
 
@@ -5061,17 +5391,17 @@
   (return-type "none")
   (parameters
     '("GtkCellRenderer*" "renderer")
-    '("const-gchar*" "attribute")
+    '("const-char*" "attribute")
   )
 )
 
 (define-method attribute_get_column
   (of-object "GtkCellArea")
   (c-name "gtk_cell_area_attribute_get_column")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkCellRenderer*" "renderer")
-    '("const-gchar*" "attribute")
+    '("const-char*" "attribute")
   )
 )
 
@@ -5090,7 +5420,7 @@
   (c-name "gtk_cell_area_class_find_cell_property")
   (return-type "GParamSpec*")
   (parameters
-    '("const-gchar*" "property_name")
+    '("const-char*" "property_name")
   )
 )
 
@@ -5109,7 +5439,7 @@
   (return-type "none")
   (parameters
     '("GtkCellRenderer*" "renderer")
-    '("const-gchar*" "first_prop_name")
+    '("const-char*" "first_prop_name")
   )
   (varargs #t)
 )
@@ -5120,7 +5450,7 @@
   (return-type "none")
   (parameters
     '("GtkCellRenderer*" "renderer")
-    '("const-gchar*" "first_prop_name")
+    '("const-char*" "first_prop_name")
   )
   (varargs #t)
 )
@@ -5131,7 +5461,7 @@
   (return-type "none")
   (parameters
     '("GtkCellRenderer*" "renderer")
-    '("const-gchar*" "first_prop_name")
+    '("const-char*" "first_prop_name")
   )
   (varargs #t)
 )
@@ -5142,7 +5472,7 @@
   (return-type "none")
   (parameters
     '("GtkCellRenderer*" "renderer")
-    '("const-gchar*" "first_property_name")
+    '("const-char*" "first_property_name")
     '("va_list" "var_args")
   )
 )
@@ -5153,7 +5483,7 @@
   (return-type "none")
   (parameters
     '("GtkCellRenderer*" "renderer")
-    '("const-gchar*" "first_property_name")
+    '("const-char*" "first_property_name")
     '("va_list" "var_args")
   )
 )
@@ -5164,7 +5494,7 @@
   (return-type "none")
   (parameters
     '("GtkCellRenderer*" "renderer")
-    '("const-gchar*" "property_name")
+    '("const-char*" "property_name")
     '("const-GValue*" "value")
   )
 )
@@ -5175,7 +5505,7 @@
   (return-type "none")
   (parameters
     '("GtkCellRenderer*" "renderer")
-    '("const-gchar*" "property_name")
+    '("const-char*" "property_name")
     '("GValue*" "value")
   )
 )
@@ -5324,9 +5654,9 @@
     '("GtkCellRenderer*" "renderer")
     '("GtkOrientation" "orientation")
     '("GtkWidget*" "widget")
-    '("gint" "for_size")
-    '("gint*" "minimum_size")
-    '("gint*" "natural_size")
+    '("int" "for_size")
+    '("int*" "minimum_size")
+    '("int*" "natural_size")
   )
 )
 
@@ -5417,8 +5747,8 @@
   (return-type "none")
   (parameters
     '("GtkCellRenderer*" "cell")
-    '("const-gchar*" "attribute")
-    '("gint" "column")
+    '("const-char*" "attribute")
+    '("int" "column")
   )
 )
 
@@ -5449,7 +5779,7 @@
   (return-type "none")
   (parameters
     '("GtkCellRenderer*" "cell")
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
@@ -5510,8 +5840,8 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "widget")
-    '("gint*" "minimum_size")
-    '("gint*" "natural_size")
+    '("int*" "minimum_size")
+    '("int*" "natural_size")
   )
 )
 
@@ -5521,9 +5851,9 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "widget")
-    '("gint" "width")
-    '("gint*" "minimum_height")
-    '("gint*" "natural_height")
+    '("int" "width")
+    '("int*" "minimum_height")
+    '("int*" "natural_height")
   )
 )
 
@@ -5533,8 +5863,8 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "widget")
-    '("gint*" "minimum_size")
-    '("gint*" "natural_size")
+    '("int*" "minimum_size")
+    '("int*" "natural_size")
   )
 )
 
@@ -5544,9 +5874,9 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "widget")
-    '("gint" "height")
-    '("gint*" "minimum_width")
-    '("gint*" "natural_width")
+    '("int" "height")
+    '("int*" "minimum_width")
+    '("int*" "natural_width")
   )
 )
 
@@ -5593,7 +5923,7 @@
   (parameters
     '("GdkEvent*" "event")
     '("GtkWidget*" "widget")
-    '("const-gchar*" "path")
+    '("const-char*" "path")
     '("const-GdkRectangle*" "background_area")
     '("const-GdkRectangle*" "cell_area")
     '("GtkCellRendererState" "flags")
@@ -5607,7 +5937,7 @@
   (parameters
     '("GdkEvent*" "event")
     '("GtkWidget*" "widget")
-    '("const-gchar*" "path")
+    '("const-char*" "path")
     '("const-GdkRectangle*" "background_area")
     '("const-GdkRectangle*" "cell_area")
     '("GtkCellRendererState" "flags")
@@ -5619,8 +5949,8 @@
   (c-name "gtk_cell_renderer_set_fixed_size")
   (return-type "none")
   (parameters
-    '("gint" "width")
-    '("gint" "height")
+    '("int" "width")
+    '("int" "height")
   )
 )
 
@@ -5629,8 +5959,8 @@
   (c-name "gtk_cell_renderer_get_fixed_size")
   (return-type "none")
   (parameters
-    '("gint*" "width")
-    '("gint*" "height")
+    '("int*" "width")
+    '("int*" "height")
   )
 )
 
@@ -5639,8 +5969,8 @@
   (c-name "gtk_cell_renderer_set_alignment")
   (return-type "none")
   (parameters
-    '("gfloat" "xalign")
-    '("gfloat" "yalign")
+    '("float" "xalign")
+    '("float" "yalign")
   )
 )
 
@@ -5649,8 +5979,8 @@
   (c-name "gtk_cell_renderer_get_alignment")
   (return-type "none")
   (parameters
-    '("gfloat*" "xalign")
-    '("gfloat*" "yalign")
+    '("float*" "xalign")
+    '("float*" "yalign")
   )
 )
 
@@ -5659,8 +5989,8 @@
   (c-name "gtk_cell_renderer_set_padding")
   (return-type "none")
   (parameters
-    '("gint" "xpad")
-    '("gint" "ypad")
+    '("int" "xpad")
+    '("int" "ypad")
   )
 )
 
@@ -5669,8 +5999,8 @@
   (c-name "gtk_cell_renderer_get_padding")
   (return-type "none")
   (parameters
-    '("gint*" "xpad")
-    '("gint*" "ypad")
+    '("int*" "xpad")
+    '("int*" "ypad")
   )
 )
 
@@ -5759,15 +6089,6 @@
   )
 )
 
-(define-method set_accessible_type
-  (of-object "GtkCellRendererClass")
-  (c-name "gtk_cell_renderer_class_set_accessible_type")
-  (return-type "none")
-  (parameters
-    '("GType" "type")
-  )
-)
-
 
 
 ;; From gtkcellrendererpixbuf.h
@@ -5848,7 +6169,7 @@
   (c-name "gtk_cell_renderer_text_set_fixed_height_from_font")
   (return-type "none")
   (parameters
-    '("gint" "number_of_rows")
+    '("int" "number_of_rows")
   )
 )
 
@@ -5940,7 +6261,7 @@
   (c-name "gtk_cell_view_new_with_text")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "text")
+    '("const-char*" "text")
   )
 )
 
@@ -5948,7 +6269,7 @@
   (c-name "gtk_cell_view_new_with_markup")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "markup")
+    '("const-char*" "markup")
   )
 )
 
@@ -6199,7 +6520,7 @@
   (c-name "gtk_check_button_new_with_label")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
@@ -6207,7 +6528,7 @@
   (c-name "gtk_check_button_new_with_mnemonic")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
@@ -6269,14 +6590,14 @@
   (c-name "gtk_color_button_set_title")
   (return-type "none")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
   )
 )
 
 (define-method get_title
   (of-object "GtkColorButton")
   (c-name "gtk_color_button_get_title")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_modal
@@ -6308,7 +6629,7 @@
   (is-constructor-of "GtkColorChooserDialog")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
     '("GtkWindow*" "parent")
   )
 )
@@ -6361,8 +6682,8 @@
   (return-type "none")
   (parameters
     '("GtkOrientation" "orientation")
-    '("gint" "colors_per_line")
-    '("gint" "n_colors")
+    '("int" "colors_per_line")
+    '("int" "n_colors")
     '("GdkRGBA*" "colors")
   )
 )
@@ -6578,6 +6899,9 @@
   (c-name "gtk_column_view_new")
   (is-constructor-of "GtkColumnView")
   (return-type "GtkWidget*")
+  (parameters
+    '("GListModel*" "model")
+  )
 )
 
 (define-method get_columns
@@ -6759,7 +7083,7 @@
 (define-method get_active
   (of-object "GtkComboBox")
   (c-name "gtk_combo_box_get_active")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_active
@@ -6767,7 +7091,7 @@
   (c-name "gtk_combo_box_set_active")
   (return-type "none")
   (parameters
-    '("gint" "index_")
+    '("int" "index_")
   )
 )
 
@@ -6847,14 +7171,14 @@
   (c-name "gtk_combo_box_set_entry_text_column")
   (return-type "none")
   (parameters
-    '("gint" "text_column")
+    '("int" "text_column")
   )
 )
 
 (define-method get_entry_text_column
   (of-object "GtkComboBox")
   (c-name "gtk_combo_box_get_entry_text_column")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_popup_fixed_width
@@ -6893,16 +7217,10 @@
   (return-type "none")
 )
 
-(define-method get_popup_accessible
-  (of-object "GtkComboBox")
-  (c-name "gtk_combo_box_get_popup_accessible")
-  (return-type "AtkObject*")
-)
-
 (define-method get_id_column
   (of-object "GtkComboBox")
   (c-name "gtk_combo_box_get_id_column")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_id_column
@@ -6910,14 +7228,14 @@
   (c-name "gtk_combo_box_set_id_column")
   (return-type "none")
   (parameters
-    '("gint" "id_column")
+    '("int" "id_column")
   )
 )
 
 (define-method get_active_id
   (of-object "GtkComboBox")
   (c-name "gtk_combo_box_get_active_id")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_active_id
@@ -6925,7 +7243,7 @@
   (c-name "gtk_combo_box_set_active_id")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "active_id")
+    '("const-char*" "active_id")
   )
 )
 
@@ -6969,7 +7287,7 @@
   (c-name "gtk_combo_box_text_append_text")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
+    '("const-char*" "text")
   )
 )
 
@@ -6978,8 +7296,8 @@
   (c-name "gtk_combo_box_text_insert_text")
   (return-type "none")
   (parameters
-    '("gint" "position")
-    '("const-gchar*" "text")
+    '("int" "position")
+    '("const-char*" "text")
   )
 )
 
@@ -6988,7 +7306,7 @@
   (c-name "gtk_combo_box_text_prepend_text")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
+    '("const-char*" "text")
   )
 )
 
@@ -6997,7 +7315,7 @@
   (c-name "gtk_combo_box_text_remove")
   (return-type "none")
   (parameters
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
@@ -7010,7 +7328,7 @@
 (define-method get_active_text
   (of-object "GtkComboBoxText")
   (c-name "gtk_combo_box_text_get_active_text")
-  (return-type "gchar*")
+  (return-type "char*")
 )
 
 (define-method insert
@@ -7018,9 +7336,9 @@
   (c-name "gtk_combo_box_text_insert")
   (return-type "none")
   (parameters
-    '("gint" "position")
-    '("const-gchar*" "id")
-    '("const-gchar*" "text")
+    '("int" "position")
+    '("const-char*" "id")
+    '("const-char*" "text")
   )
 )
 
@@ -7029,8 +7347,8 @@
   (c-name "gtk_combo_box_text_append")
   (return-type "none")
   (parameters
-    '("const-gchar*" "id")
-    '("const-gchar*" "text")
+    '("const-char*" "id")
+    '("const-char*" "text")
   )
 )
 
@@ -7039,8 +7357,8 @@
   (c-name "gtk_combo_box_text_prepend")
   (return-type "none")
   (parameters
-    '("const-gchar*" "id")
-    '("const-gchar*" "text")
+    '("const-char*" "id")
+    '("const-char*" "text")
   )
 )
 
@@ -7052,7 +7370,7 @@
   (c-name "gtk_compose_table_new_with_file")
   (return-type "GtkComposeTable*")
   (parameters
-    '("const-gchar*" "compose_file")
+    '("const-char*" "compose_file")
   )
 )
 
@@ -7062,8 +7380,8 @@
   (parameters
     '("GSList*" "compose_tables")
     '("const-guint16*" "data")
-    '("gint" "max_seq_len")
-    '("gint" "n_seqs")
+    '("int" "max_seq_len")
+    '("int" "n_seqs")
   )
 )
 
@@ -7072,7 +7390,7 @@
   (return-type "GSList*")
   (parameters
     '("GSList*" "compose_tables")
-    '("const-gchar*" "compose_file")
+    '("const-char*" "compose_file")
   )
 )
 
@@ -7398,7 +7716,7 @@
   (c-name "gtk_css_provider_load_from_data")
   (return-type "none")
   (parameters
-    '("const-gchar*" "data")
+    '("const-char*" "data")
     '("gssize" "length")
   )
 )
@@ -7417,7 +7735,7 @@
   (c-name "gtk_css_provider_load_from_path")
   (return-type "none")
   (parameters
-    '("const-gchar*" "path")
+    '("const-char*" "path")
   )
 )
 
@@ -7426,7 +7744,7 @@
   (c-name "gtk_css_provider_load_from_resource")
   (return-type "none")
   (parameters
-    '("const-gchar*" "resource_path")
+    '("const-char*" "resource_path")
   )
 )
 
@@ -7560,10 +7878,10 @@
   (c-name "gtk_dialog_new_with_buttons")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
     '("GtkWindow*" "parent")
     '("GtkDialogFlags" "flags")
-    '("const-gchar*" "first_button_text")
+    '("const-char*" "first_button_text")
   )
   (varargs #t)
 )
@@ -7574,7 +7892,7 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "child")
-    '("gint" "response_id")
+    '("int" "response_id")
   )
 )
 
@@ -7583,8 +7901,8 @@
   (c-name "gtk_dialog_add_button")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "button_text")
-    '("gint" "response_id")
+    '("const-char*" "button_text")
+    '("int" "response_id")
   )
 )
 
@@ -7593,7 +7911,7 @@
   (c-name "gtk_dialog_add_buttons")
   (return-type "none")
   (parameters
-    '("const-gchar*" "first_button_text")
+    '("const-char*" "first_button_text")
   )
   (varargs #t)
 )
@@ -7603,7 +7921,7 @@
   (c-name "gtk_dialog_set_response_sensitive")
   (return-type "none")
   (parameters
-    '("gint" "response_id")
+    '("int" "response_id")
     '("gboolean" "setting")
   )
 )
@@ -7613,7 +7931,7 @@
   (c-name "gtk_dialog_set_default_response")
   (return-type "none")
   (parameters
-    '("gint" "response_id")
+    '("int" "response_id")
   )
 )
 
@@ -7622,14 +7940,14 @@
   (c-name "gtk_dialog_get_widget_for_response")
   (return-type "GtkWidget*")
   (parameters
-    '("gint" "response_id")
+    '("int" "response_id")
   )
 )
 
 (define-method get_response_for_widget
   (of-object "GtkDialog")
   (c-name "gtk_dialog_get_response_for_widget")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkWidget*" "widget")
   )
@@ -7640,7 +7958,7 @@
   (c-name "gtk_dialog_response")
   (return-type "none")
   (parameters
-    '("gint" "response_id")
+    '("int" "response_id")
   )
 )
 
@@ -7965,14 +8283,17 @@
   (c-name "gtk_drop_down_new")
   (is-constructor-of "GtkDropDown")
   (return-type "GtkWidget*")
+  (parameters
+    '("GListModel*" "model")
+    '("GtkExpression*" "expression")
+  )
 )
 
-(define-method set_from_strings
-  (of-object "GtkDropDown")
-  (c-name "gtk_drop_down_set_from_strings")
-  (return-type "none")
+(define-function gtk_drop_down_new_from_strings
+  (c-name "gtk_drop_down_new_from_strings")
+  (return-type "GtkWidget*")
   (parameters
-    '("const-char*-const*" "texts")
+    '("const-char*-const*" "strings")
   )
 )
 
@@ -8517,8 +8838,8 @@
   (is-constructor-of "GtkEntryBuffer")
   (return-type "GtkEntryBuffer*")
   (parameters
-    '("const-gchar*" "initial_chars")
-    '("gint" "n_initial_chars")
+    '("const-char*" "initial_chars")
+    '("int" "n_initial_chars")
   )
 )
 
@@ -8537,7 +8858,7 @@
 (define-method get_text
   (of-object "GtkEntryBuffer")
   (c-name "gtk_entry_buffer_get_text")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_text
@@ -8545,8 +8866,8 @@
   (c-name "gtk_entry_buffer_set_text")
   (return-type "none")
   (parameters
-    '("const-gchar*" "chars")
-    '("gint" "n_chars")
+    '("const-char*" "chars")
+    '("int" "n_chars")
   )
 )
 
@@ -8555,14 +8876,14 @@
   (c-name "gtk_entry_buffer_set_max_length")
   (return-type "none")
   (parameters
-    '("gint" "max_length")
+    '("int" "max_length")
   )
 )
 
 (define-method get_max_length
   (of-object "GtkEntryBuffer")
   (c-name "gtk_entry_buffer_get_max_length")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method insert_text
@@ -8571,8 +8892,8 @@
   (return-type "guint")
   (parameters
     '("guint" "position")
-    '("const-gchar*" "chars")
-    '("gint" "n_chars")
+    '("const-char*" "chars")
+    '("int" "n_chars")
   )
 )
 
@@ -8582,7 +8903,7 @@
   (return-type "guint")
   (parameters
     '("guint" "position")
-    '("gint" "n_chars")
+    '("int" "n_chars")
   )
 )
 
@@ -8592,7 +8913,7 @@
   (return-type "none")
   (parameters
     '("guint" "position")
-    '("const-gchar*" "chars")
+    '("const-char*" "chars")
     '("guint" "n_chars")
   )
 )
@@ -8667,20 +8988,20 @@
   (c-name "gtk_entry_completion_set_minimum_key_length")
   (return-type "none")
   (parameters
-    '("gint" "length")
+    '("int" "length")
   )
 )
 
 (define-method get_minimum_key_length
   (of-object "GtkEntryCompletion")
   (c-name "gtk_entry_completion_get_minimum_key_length")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method compute_prefix
   (of-object "GtkEntryCompletion")
   (c-name "gtk_entry_completion_compute_prefix")
-  (return-type "gchar*")
+  (return-type "char*")
   (parameters
     '("const-char*" "key")
   )
@@ -8776,7 +9097,7 @@
 (define-method get_completion_prefix
   (of-object "GtkEntryCompletion")
   (c-name "gtk_entry_completion_get_completion_prefix")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_text_column
@@ -8784,14 +9105,14 @@
   (c-name "gtk_entry_completion_set_text_column")
   (return-type "none")
   (parameters
-    '("gint" "column")
+    '("int" "column")
   )
 )
 
 (define-method get_text_column
   (of-object "GtkEntryCompletion")
   (c-name "gtk_entry_completion_get_text_column")
-  (return-type "gint")
+  (return-type "int")
 )
 
 
@@ -8903,14 +9224,14 @@
   (c-name "gtk_entry_set_max_length")
   (return-type "none")
   (parameters
-    '("gint" "max")
+    '("int" "max")
   )
 )
 
 (define-method get_max_length
   (of-object "GtkEntry")
   (c-name "gtk_entry_get_max_length")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_text_length
@@ -8939,14 +9260,14 @@
   (c-name "gtk_entry_set_alignment")
   (return-type "none")
   (parameters
-    '("gfloat" "xalign")
+    '("float" "xalign")
   )
 )
 
 (define-method get_alignment
   (of-object "GtkEntry")
   (c-name "gtk_entry_get_alignment")
-  (return-type "gfloat")
+  (return-type "float")
 )
 
 (define-method set_completion
@@ -8969,14 +9290,14 @@
   (c-name "gtk_entry_set_progress_fraction")
   (return-type "none")
   (parameters
-    '("gdouble" "fraction")
+    '("double" "fraction")
   )
 )
 
 (define-method get_progress_fraction
   (of-object "GtkEntry")
   (c-name "gtk_entry_get_progress_fraction")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_progress_pulse_step
@@ -8984,14 +9305,14 @@
   (c-name "gtk_entry_set_progress_pulse_step")
   (return-type "none")
   (parameters
-    '("gdouble" "fraction")
+    '("double" "fraction")
   )
 )
 
 (define-method get_progress_pulse_step
   (of-object "GtkEntry")
   (c-name "gtk_entry_get_progress_pulse_step")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method progress_pulse
@@ -9003,7 +9324,7 @@
 (define-method get_placeholder_text
   (of-object "GtkEntry")
   (c-name "gtk_entry_get_placeholder_text")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_placeholder_text
@@ -9011,7 +9332,7 @@
   (c-name "gtk_entry_set_placeholder_text")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
+    '("const-char*" "text")
   )
 )
 
@@ -9031,7 +9352,7 @@
   (return-type "none")
   (parameters
     '("GtkEntryIconPosition" "icon_pos")
-    '("const-gchar*" "icon_name")
+    '("const-char*" "icon_name")
   )
 )
 
@@ -9066,7 +9387,7 @@
 (define-method get_icon_name
   (of-object "GtkEntry")
   (c-name "gtk_entry_get_icon_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
   (parameters
     '("GtkEntryIconPosition" "icon_pos")
   )
@@ -9122,10 +9443,10 @@
 (define-method get_icon_at_pos
   (of-object "GtkEntry")
   (c-name "gtk_entry_get_icon_at_pos")
-  (return-type "gint")
+  (return-type "int")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("int" "x")
+    '("int" "y")
   )
 )
 
@@ -9135,14 +9456,14 @@
   (return-type "none")
   (parameters
     '("GtkEntryIconPosition" "icon_pos")
-    '("const-gchar*" "tooltip")
+    '("const-char*" "tooltip")
   )
 )
 
 (define-method get_icon_tooltip_text
   (of-object "GtkEntry")
   (c-name "gtk_entry_get_icon_tooltip_text")
-  (return-type "gchar*")
+  (return-type "char*")
   (parameters
     '("GtkEntryIconPosition" "icon_pos")
   )
@@ -9154,14 +9475,14 @@
   (return-type "none")
   (parameters
     '("GtkEntryIconPosition" "icon_pos")
-    '("const-gchar*" "tooltip")
+    '("const-char*" "tooltip")
   )
 )
 
 (define-method get_icon_tooltip_markup
   (of-object "GtkEntry")
   (c-name "gtk_entry_get_icon_tooltip_markup")
-  (return-type "gchar*")
+  (return-type "char*")
   (parameters
     '("GtkEntryIconPosition" "icon_pos")
   )
@@ -9181,7 +9502,7 @@
 (define-method get_current_icon_drag_source
   (of-object "GtkEntry")
   (c-name "gtk_entry_get_current_icon_drag_source")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_icon_area
@@ -9549,7 +9870,7 @@
   (is-constructor-of "GtkExpander")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
@@ -9557,7 +9878,7 @@
   (c-name "gtk_expander_new_with_mnemonic")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
@@ -9581,14 +9902,14 @@
   (c-name "gtk_expander_set_label")
   (return-type "none")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
 (define-method get_label
   (of-object "GtkExpander")
   (c-name "gtk_expander_get_label")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_use_underline
@@ -9784,6 +10105,22 @@
   )
 )
 
+(define-function gtk_property_expression_get_expression
+  (c-name "gtk_property_expression_get_expression")
+  (return-type "GtkExpression*")
+  (parameters
+    '("GtkExpression*" "expression")
+  )
+)
+
+(define-function gtk_property_expression_get_pspec
+  (c-name "gtk_property_expression_get_pspec")
+  (return-type "GParamSpec*")
+  (parameters
+    '("GtkExpression*" "expression")
+  )
+)
+
 (define-function gtk_constant_expression_get_type
   (c-name "gtk_constant_expression_get_type")
   (return-type "GType")
@@ -9807,6 +10144,14 @@
   )
 )
 
+(define-function gtk_constant_expression_get_value
+  (c-name "gtk_constant_expression_get_value")
+  (return-type "const-GValue*")
+  (parameters
+    '("GtkExpression*" "expression")
+  )
+)
+
 (define-function gtk_object_expression_get_type
   (c-name "gtk_object_expression_get_type")
   (return-type "GType")
@@ -9821,6 +10166,14 @@
   )
 )
 
+(define-function gtk_object_expression_get_object
+  (c-name "gtk_object_expression_get_object")
+  (return-type "GObject*")
+  (parameters
+    '("GtkExpression*" "expression")
+  )
+)
+
 (define-function gtk_closure_expression_get_type
   (c-name "gtk_closure_expression_get_type")
   (return-type "GType")
@@ -9922,7 +10275,7 @@
   (is-constructor-of "GtkFileChooserButton")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
     '("GtkFileChooserAction" "action")
   )
 )
@@ -9938,7 +10291,7 @@
 (define-method get_title
   (of-object "GtkFileChooserButton")
   (c-name "gtk_file_chooser_button_get_title")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_title
@@ -9946,14 +10299,14 @@
   (c-name "gtk_file_chooser_button_set_title")
   (return-type "none")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
   )
 )
 
 (define-method get_width_chars
   (of-object "GtkFileChooserButton")
   (c-name "gtk_file_chooser_button_get_width_chars")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_width_chars
@@ -9961,7 +10314,7 @@
   (c-name "gtk_file_chooser_button_set_width_chars")
   (return-type "none")
   (parameters
-    '("gint" "n_chars")
+    '("int" "n_chars")
   )
 )
 
@@ -9994,20 +10347,16 @@
   (is-constructor-of "GtkFileChooserDialog")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
     '("GtkWindow*" "parent")
     '("GtkFileChooserAction" "action")
-    '("const-gchar*" "first_button_text")
+    '("const-char*" "first_button_text")
   )
   (varargs #t)
 )
 
 
 
-;; From gtkfilechooserembed.h
-
-
-
 ;; From gtkfilechooserentry.h
 
 
@@ -10236,11 +10585,11 @@
   (is-constructor-of "GtkFileChooserNative")
   (return-type "GtkFileChooserNative*")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
     '("GtkWindow*" "parent")
     '("GtkFileChooserAction" "action")
-    '("const-gchar*" "accept_label")
-    '("const-gchar*" "cancel_label")
+    '("const-char*" "accept_label")
+    '("const-char*" "cancel_label")
   )
 )
 
@@ -10372,10 +10721,6 @@
 
 
 
-;; From gtkfilesystem.h
-
-
-
 ;; From gtkfilesystemmodel.h
 
 
@@ -10642,7 +10987,7 @@
 (define-method get_index
   (of-object "GtkFlowBoxChild")
   (c-name "gtk_flow_box_child_get_index")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method is_selected
@@ -10776,7 +11121,7 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "widget")
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
@@ -10794,7 +11139,7 @@
   (c-name "gtk_flow_box_get_child_at_index")
   (return-type "GtkFlowBoxChild*")
   (parameters
-    '("gint" "idx")
+    '("int" "idx")
   )
 )
 
@@ -10803,8 +11148,8 @@
   (c-name "gtk_flow_box_get_child_at_pos")
   (return-type "GtkFlowBoxChild*")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("int" "x")
+    '("int" "y")
   )
 )
 
@@ -10940,14 +11285,14 @@
   (c-name "gtk_font_button_new_with_font")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "fontname")
+    '("const-char*" "fontname")
   )
 )
 
 (define-method get_title
   (of-object "GtkFontButton")
   (c-name "gtk_font_button_get_title")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_title
@@ -10955,7 +11300,7 @@
   (c-name "gtk_font_button_set_title")
   (return-type "none")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
   )
 )
 
@@ -11018,7 +11363,7 @@
   (is-constructor-of "GtkFontChooserDialog")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
     '("GtkWindow*" "parent")
   )
 )
@@ -11047,7 +11392,7 @@
 (define-method get_font_size
   (of-object "GtkFontChooser")
   (c-name "gtk_font_chooser_get_font_size")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_font_desc
@@ -11068,7 +11413,7 @@
 (define-method get_font
   (of-object "GtkFontChooser")
   (c-name "gtk_font_chooser_get_font")
-  (return-type "gchar*")
+  (return-type "char*")
 )
 
 (define-method set_font
@@ -11076,14 +11421,14 @@
   (c-name "gtk_font_chooser_set_font")
   (return-type "none")
   (parameters
-    '("const-gchar*" "fontname")
+    '("const-char*" "fontname")
   )
 )
 
 (define-method get_preview_text
   (of-object "GtkFontChooser")
   (c-name "gtk_font_chooser_get_preview_text")
-  (return-type "gchar*")
+  (return-type "char*")
 )
 
 (define-method set_preview_text
@@ -11091,7 +11436,7 @@
   (c-name "gtk_font_chooser_set_preview_text")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
+    '("const-char*" "text")
   )
 )
 
@@ -11205,7 +11550,7 @@
   (is-constructor-of "GtkFrame")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
@@ -11214,14 +11559,14 @@
   (c-name "gtk_frame_set_label")
   (return-type "none")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
 (define-method get_label
   (of-object "GtkFrame")
   (c-name "gtk_frame_get_label")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_label_widget
@@ -11244,14 +11589,14 @@
   (c-name "gtk_frame_set_label_align")
   (return-type "none")
   (parameters
-    '("gfloat" "xalign")
+    '("float" "xalign")
   )
 )
 
 (define-method get_label_align
   (of-object "GtkFrame")
   (c-name "gtk_frame_get_label_align")
-  (return-type "gfloat")
+  (return-type "float")
 )
 
 (define-method set_child
@@ -11304,8 +11649,8 @@
   (c-name "gtk_gesture_drag_get_start_point")
   (return-type "gboolean")
   (parameters
-    '("gdouble*" "x")
-    '("gdouble*" "y")
+    '("double*" "x")
+    '("double*" "y")
   )
 )
 
@@ -11314,8 +11659,8 @@
   (c-name "gtk_gesture_drag_get_offset")
   (return-type "gboolean")
   (parameters
-    '("gdouble*" "x")
-    '("gdouble*" "y")
+    '("double*" "x")
+    '("double*" "y")
   )
 )
 
@@ -11398,8 +11743,8 @@
   (return-type "gboolean")
   (parameters
     '("GdkEventSequence*" "sequence")
-    '("gdouble*" "x")
-    '("gdouble*" "y")
+    '("double*" "x")
+    '("double*" "y")
   )
 )
 
@@ -11417,8 +11762,8 @@
   (c-name "gtk_gesture_get_bounding_box_center")
   (return-type "gboolean")
   (parameters
-    '("gdouble*" "x")
-    '("gdouble*" "y")
+    '("double*" "x")
+    '("double*" "y")
   )
 )
 
@@ -11545,7 +11890,7 @@
 (define-method get_angle_delta
   (of-object "GtkGestureRotate")
   (c-name "gtk_gesture_rotate_get_angle_delta")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 
@@ -11635,7 +11980,7 @@
   (return-type "gboolean")
   (parameters
     '("GdkAxisUse" "axis")
-    '("gdouble*" "value")
+    '("double*" "value")
   )
 )
 
@@ -11645,7 +11990,7 @@
   (return-type "gboolean")
   (parameters
     '("GdkAxisUse[]" "axes")
-    '("gdouble**" "values")
+    '("double**" "values")
   )
 )
 
@@ -11685,8 +12030,8 @@
   (c-name "gtk_gesture_swipe_get_velocity")
   (return-type "gboolean")
   (parameters
-    '("gdouble*" "velocity_x")
-    '("gdouble*" "velocity_y")
+    '("double*" "velocity_x")
+    '("double*" "velocity_y")
   )
 )
 
@@ -11708,7 +12053,7 @@
 (define-method get_scale_delta
   (of-object "GtkGestureZoom")
   (c-name "gtk_gesture_zoom_get_scale_delta")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 
@@ -11746,8 +12091,8 @@
   (c-name "gtk_gl_area_set_required_version")
   (return-type "none")
   (parameters
-    '("gint" "major")
-    '("gint" "minor")
+    '("int" "major")
+    '("int" "minor")
   )
 )
 
@@ -11756,8 +12101,8 @@
   (c-name "gtk_gl_area_get_required_version")
   (return-type "none")
   (parameters
-    '("gint*" "major")
-    '("gint*" "minor")
+    '("int*" "major")
+    '("int*" "minor")
   )
 )
 
@@ -11866,10 +12211,10 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "child")
-    '("gint" "left")
-    '("gint" "top")
-    '("gint" "width")
-    '("gint" "height")
+    '("int" "left")
+    '("int" "top")
+    '("int" "width")
+    '("int" "height")
   )
 )
 
@@ -11881,8 +12226,8 @@
     '("GtkWidget*" "child")
     '("GtkWidget*" "sibling")
     '("GtkPositionType" "side")
-    '("gint" "width")
-    '("gint" "height")
+    '("int" "width")
+    '("int" "height")
   )
 )
 
@@ -11891,8 +12236,8 @@
   (c-name "gtk_grid_get_child_at")
   (return-type "GtkWidget*")
   (parameters
-    '("gint" "left")
-    '("gint" "top")
+    '("int" "left")
+    '("int" "top")
   )
 )
 
@@ -11910,7 +12255,7 @@
   (c-name "gtk_grid_insert_row")
   (return-type "none")
   (parameters
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
@@ -11919,7 +12264,7 @@
   (c-name "gtk_grid_insert_column")
   (return-type "none")
   (parameters
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
@@ -11928,7 +12273,7 @@
   (c-name "gtk_grid_remove_row")
   (return-type "none")
   (parameters
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
@@ -11937,7 +12282,7 @@
   (c-name "gtk_grid_remove_column")
   (return-type "none")
   (parameters
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
@@ -12016,7 +12361,7 @@
   (c-name "gtk_grid_set_row_baseline_position")
   (return-type "none")
   (parameters
-    '("gint" "row")
+    '("int" "row")
     '("GtkBaselinePosition" "pos")
   )
 )
@@ -12026,7 +12371,7 @@
   (c-name "gtk_grid_get_row_baseline_position")
   (return-type "GtkBaselinePosition")
   (parameters
-    '("gint" "row")
+    '("int" "row")
   )
 )
 
@@ -12035,14 +12380,14 @@
   (c-name "gtk_grid_set_baseline_row")
   (return-type "none")
   (parameters
-    '("gint" "row")
+    '("int" "row")
   )
 )
 
 (define-method get_baseline_row
   (of-object "GtkGrid")
   (c-name "gtk_grid_get_baseline_row")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method query_child
@@ -12051,10 +12396,10 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "child")
-    '("gint*" "left")
-    '("gint*" "top")
-    '("gint*" "width")
-    '("gint*" "height")
+    '("int*" "left")
+    '("int*" "top")
+    '("int*" "width")
+    '("int*" "height")
   )
 )
 
@@ -12235,12 +12580,16 @@
   (c-name "gtk_grid_view_new")
   (is-constructor-of "GtkGridView")
   (return-type "GtkWidget*")
+  (parameters
+    '("GListModel*" "model")
+  )
 )
 
 (define-function gtk_grid_view_new_with_factory
   (c-name "gtk_grid_view_new_with_factory")
   (return-type "GtkWidget*")
   (parameters
+    '("GListModel*" "model")
     '("GtkListItemFactory*" "factory")
   )
 )
@@ -12416,14 +12765,14 @@
   (c-name "gtk_header_bar_set_decoration_layout")
   (return-type "none")
   (parameters
-    '("const-gchar*" "layout")
+    '("const-char*" "layout")
   )
 )
 
 (define-method get_decoration_layout
   (of-object "GtkHeaderBar")
   (c-name "gtk_header_bar_get_decoration_layout")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 
@@ -12522,16 +12871,16 @@
   (c-name "gtk_icon_theme_has_icon")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "icon_name")
+    '("const-char*" "icon_name")
   )
 )
 
 (define-method get_icon_sizes
   (of-object "GtkIconTheme")
   (c-name "gtk_icon_theme_get_icon_sizes")
-  (return-type "gint*")
+  (return-type "int*")
   (parameters
-    '("const-gchar*" "icon_name")
+    '("const-char*" "icon_name")
   )
 )
 
@@ -12542,8 +12891,8 @@
   (parameters
     '("const-char*" "icon_name")
     '("const-char*[]" "fallbacks")
-    '("gint" "size")
-    '("gint" "scale")
+    '("int" "size")
+    '("int" "scale")
     '("GtkTextDirection" "direction")
     '("GtkIconLookupFlags" "flags")
   )
@@ -12555,8 +12904,8 @@
   (return-type "GtkIconPaintable*")
   (parameters
     '("GIcon*" "icon")
-    '("gint" "size")
-    '("gint" "scale")
+    '("int" "size")
+    '("int" "scale")
     '("GtkTextDirection" "direction")
     '("GtkIconLookupFlags" "flags")
   )
@@ -12567,8 +12916,8 @@
   (return-type "GtkIconPaintable*")
   (parameters
     '("GFile*" "file")
-    '("gint" "size")
-    '("gint" "scale")
+    '("int" "size")
+    '("int" "scale")
   )
 )
 
@@ -12592,7 +12941,7 @@
 (define-method get_icon_name
   (of-object "GtkIconPaintable")
   (c-name "gtk_icon_paintable_get_icon_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method is_symbolic
@@ -12652,14 +13001,14 @@
   (c-name "gtk_icon_view_set_text_column")
   (return-type "none")
   (parameters
-    '("gint" "column")
+    '("int" "column")
   )
 )
 
 (define-method get_text_column
   (of-object "GtkIconView")
   (c-name "gtk_icon_view_get_text_column")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_markup_column
@@ -12667,14 +13016,14 @@
   (c-name "gtk_icon_view_set_markup_column")
   (return-type "none")
   (parameters
-    '("gint" "column")
+    '("int" "column")
   )
 )
 
 (define-method get_markup_column
   (of-object "GtkIconView")
   (c-name "gtk_icon_view_get_markup_column")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_pixbuf_column
@@ -12682,14 +13031,14 @@
   (c-name "gtk_icon_view_set_pixbuf_column")
   (return-type "none")
   (parameters
-    '("gint" "column")
+    '("int" "column")
   )
 )
 
 (define-method get_pixbuf_column
   (of-object "GtkIconView")
   (c-name "gtk_icon_view_get_pixbuf_column")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_item_orientation
@@ -12712,14 +13061,14 @@
   (c-name "gtk_icon_view_set_columns")
   (return-type "none")
   (parameters
-    '("gint" "columns")
+    '("int" "columns")
   )
 )
 
 (define-method get_columns
   (of-object "GtkIconView")
   (c-name "gtk_icon_view_get_columns")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_item_width
@@ -12727,14 +13076,14 @@
   (c-name "gtk_icon_view_set_item_width")
   (return-type "none")
   (parameters
-    '("gint" "item_width")
+    '("int" "item_width")
   )
 )
 
 (define-method get_item_width
   (of-object "GtkIconView")
   (c-name "gtk_icon_view_get_item_width")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_spacing
@@ -12742,14 +13091,14 @@
   (c-name "gtk_icon_view_set_spacing")
   (return-type "none")
   (parameters
-    '("gint" "spacing")
+    '("int" "spacing")
   )
 )
 
 (define-method get_spacing
   (of-object "GtkIconView")
   (c-name "gtk_icon_view_get_spacing")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_row_spacing
@@ -12757,14 +13106,14 @@
   (c-name "gtk_icon_view_set_row_spacing")
   (return-type "none")
   (parameters
-    '("gint" "row_spacing")
+    '("int" "row_spacing")
   )
 )
 
 (define-method get_row_spacing
   (of-object "GtkIconView")
   (c-name "gtk_icon_view_get_row_spacing")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_column_spacing
@@ -12772,14 +13121,14 @@
   (c-name "gtk_icon_view_set_column_spacing")
   (return-type "none")
   (parameters
-    '("gint" "column_spacing")
+    '("int" "column_spacing")
   )
 )
 
 (define-method get_column_spacing
   (of-object "GtkIconView")
   (c-name "gtk_icon_view_get_column_spacing")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_margin
@@ -12787,14 +13136,14 @@
   (c-name "gtk_icon_view_set_margin")
   (return-type "none")
   (parameters
-    '("gint" "margin")
+    '("int" "margin")
   )
 )
 
 (define-method get_margin
   (of-object "GtkIconView")
   (c-name "gtk_icon_view_get_margin")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_item_padding
@@ -12802,14 +13151,14 @@
   (c-name "gtk_icon_view_set_item_padding")
   (return-type "none")
   (parameters
-    '("gint" "item_padding")
+    '("int" "item_padding")
   )
 )
 
 (define-method get_item_padding
   (of-object "GtkIconView")
   (c-name "gtk_icon_view_get_item_padding")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_path_at_pos
@@ -12817,8 +13166,8 @@
   (c-name "gtk_icon_view_get_path_at_pos")
   (return-type "GtkTreePath*")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("int" "x")
+    '("int" "y")
   )
 )
 
@@ -12827,8 +13176,8 @@
   (c-name "gtk_icon_view_get_item_at_pos")
   (return-type "gboolean")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("int" "x")
+    '("int" "y")
     '("GtkTreePath**" "path")
     '("GtkCellRenderer**" "cell")
   )
@@ -12914,7 +13263,7 @@
 (define-method get_item_row
   (of-object "GtkIconView")
   (c-name "gtk_icon_view_get_item_row")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkTreePath*" "path")
   )
@@ -12923,7 +13272,7 @@
 (define-method get_item_column
   (of-object "GtkIconView")
   (c-name "gtk_icon_view_get_item_column")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkTreePath*" "path")
   )
@@ -12984,8 +13333,8 @@
   (parameters
     '("GtkTreePath*" "path")
     '("gboolean" "use_align")
-    '("gfloat" "row_align")
-    '("gfloat" "col_align")
+    '("float" "row_align")
+    '("float" "col_align")
   )
 )
 
@@ -13062,8 +13411,8 @@
   (c-name "gtk_icon_view_get_dest_item_at_pos")
   (return-type "gboolean")
   (parameters
-    '("gint" "drag_x")
-    '("gint" "drag_y")
+    '("int" "drag_x")
+    '("int" "drag_y")
     '("GtkTreePath**" "path")
     '("GtkIconViewDropPosition*" "pos")
   )
@@ -13115,8 +13464,8 @@
   (c-name "gtk_icon_view_get_tooltip_context")
   (return-type "gboolean")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
+    '("int*" "x")
+    '("int*" "y")
     '("gboolean" "keyboard_tip")
     '("GtkTreeModel**" "model")
     '("GtkTreePath**" "path")
@@ -13129,14 +13478,14 @@
   (c-name "gtk_icon_view_set_tooltip_column")
   (return-type "none")
   (parameters
-    '("gint" "column")
+    '("int" "column")
   )
 )
 
 (define-method get_tooltip_column
   (of-object "GtkIconView")
   (c-name "gtk_icon_view_get_tooltip_column")
-  (return-type "gint")
+  (return-type "int")
 )
 
 
@@ -13158,7 +13507,7 @@
   (c-name "gtk_image_new_from_file")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "filename")
+    '("const-char*" "filename")
   )
 )
 
@@ -13166,7 +13515,7 @@
   (c-name "gtk_image_new_from_resource")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "resource_path")
+    '("const-char*" "resource_path")
   )
 )
 
@@ -13190,7 +13539,7 @@
   (c-name "gtk_image_new_from_icon_name")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "icon_name")
+    '("const-char*" "icon_name")
   )
 )
 
@@ -13213,7 +13562,7 @@
   (c-name "gtk_image_set_from_file")
   (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
+    '("const-char*" "filename")
   )
 )
 
@@ -13222,7 +13571,7 @@
   (c-name "gtk_image_set_from_resource")
   (return-type "none")
   (parameters
-    '("const-gchar*" "resource_path")
+    '("const-char*" "resource_path")
   )
 )
 
@@ -13249,7 +13598,7 @@
   (c-name "gtk_image_set_from_icon_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "icon_name")
+    '("const-char*" "icon_name")
   )
 )
 
@@ -13267,7 +13616,7 @@
   (c-name "gtk_image_set_pixel_size")
   (return-type "none")
   (parameters
-    '("gint" "pixel_size")
+    '("int" "pixel_size")
   )
 )
 
@@ -13307,7 +13656,7 @@
 (define-method get_pixel_size
   (of-object "GtkImage")
   (c-name "gtk_image_get_pixel_size")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_icon_size
@@ -13348,9 +13697,9 @@
   (c-name "gtk_im_context_get_preedit_string")
   (return-type "none")
   (parameters
-    '("gchar**" "str")
+    '("char**" "str")
     '("PangoAttrList**" "attrs")
-    '("gint*" "cursor_pos")
+    '("int*" "cursor_pos")
   )
 )
 
@@ -13419,9 +13768,9 @@
   (c-name "gtk_im_context_set_surrounding")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
-    '("gint" "len")
-    '("gint" "cursor_index")
+    '("const-char*" "text")
+    '("int" "len")
+    '("int" "cursor_index")
   )
 )
 
@@ -13430,8 +13779,8 @@
   (c-name "gtk_im_context_get_surrounding")
   (return-type "gboolean")
   (parameters
-    '("gchar**" "text")
-    '("gint*" "cursor_index")
+    '("char**" "text")
+    '("int*" "cursor_index")
   )
 )
 
@@ -13440,8 +13789,8 @@
   (c-name "gtk_im_context_delete_surrounding")
   (return-type "gboolean")
   (parameters
-    '("gint" "offset")
-    '("gint" "n_chars")
+    '("int" "offset")
+    '("int" "n_chars")
   )
 )
 
@@ -13498,8 +13847,8 @@
   (return-type "none")
   (parameters
     '("guint16*" "data")
-    '("gint" "max_seq_len")
-    '("gint" "n_seqs")
+    '("int" "max_seq_len")
+    '("int" "n_seqs")
   )
 )
 
@@ -13508,7 +13857,7 @@
   (c-name "gtk_im_context_simple_add_compose_file")
   (return-type "none")
   (parameters
-    '("const-gchar*" "compose_file")
+    '("const-char*" "compose_file")
   )
 )
 
@@ -13583,7 +13932,7 @@
   (c-name "gtk_info_bar_new_with_buttons")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "first_button_text")
+    '("const-char*" "first_button_text")
   )
   (varargs #t)
 )
@@ -13594,7 +13943,7 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "child")
-    '("gint" "response_id")
+    '("int" "response_id")
   )
 )
 
@@ -13612,8 +13961,8 @@
   (c-name "gtk_info_bar_add_button")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "button_text")
-    '("gint" "response_id")
+    '("const-char*" "button_text")
+    '("int" "response_id")
   )
 )
 
@@ -13622,7 +13971,7 @@
   (c-name "gtk_info_bar_add_buttons")
   (return-type "none")
   (parameters
-    '("const-gchar*" "first_button_text")
+    '("const-char*" "first_button_text")
   )
   (varargs #t)
 )
@@ -13650,7 +13999,7 @@
   (c-name "gtk_info_bar_set_response_sensitive")
   (return-type "none")
   (parameters
-    '("gint" "response_id")
+    '("int" "response_id")
     '("gboolean" "setting")
   )
 )
@@ -13660,7 +14009,7 @@
   (c-name "gtk_info_bar_set_default_response")
   (return-type "none")
   (parameters
-    '("gint" "response_id")
+    '("int" "response_id")
   )
 )
 
@@ -13669,7 +14018,7 @@
   (c-name "gtk_info_bar_response")
   (return-type "none")
   (parameters
-    '("gint" "response_id")
+    '("int" "response_id")
   )
 )
 
@@ -13736,7 +14085,7 @@
   (is-constructor-of "GtkLabel")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "str")
+    '("const-char*" "str")
   )
 )
 
@@ -13744,7 +14093,7 @@
   (c-name "gtk_label_new_with_mnemonic")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "str")
+    '("const-char*" "str")
   )
 )
 
@@ -13753,14 +14102,14 @@
   (c-name "gtk_label_set_text")
   (return-type "none")
   (parameters
-    '("const-gchar*" "str")
+    '("const-char*" "str")
   )
 )
 
 (define-method get_text
   (of-object "GtkLabel")
   (c-name "gtk_label_get_text")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_attributes
@@ -13783,14 +14132,14 @@
   (c-name "gtk_label_set_label")
   (return-type "none")
   (parameters
-    '("const-gchar*" "str")
+    '("const-char*" "str")
   )
 )
 
 (define-method get_label
   (of-object "GtkLabel")
   (c-name "gtk_label_get_label")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_markup
@@ -13798,7 +14147,7 @@
   (c-name "gtk_label_set_markup")
   (return-type "none")
   (parameters
-    '("const-gchar*" "str")
+    '("const-char*" "str")
   )
 )
 
@@ -13837,7 +14186,7 @@
   (c-name "gtk_label_set_markup_with_mnemonic")
   (return-type "none")
   (parameters
-    '("const-gchar*" "str")
+    '("const-char*" "str")
   )
 )
 
@@ -13867,7 +14216,7 @@
   (c-name "gtk_label_set_text_with_mnemonic")
   (return-type "none")
   (parameters
-    '("const-gchar*" "str")
+    '("const-char*" "str")
   )
 )
 
@@ -13913,7 +14262,7 @@
 (define-method get_width_chars
   (of-object "GtkLabel")
   (c-name "gtk_label_get_width_chars")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_max_width_chars
@@ -13928,7 +14277,7 @@
 (define-method get_max_width_chars
   (of-object "GtkLabel")
   (c-name "gtk_label_get_max_width_chars")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_lines
@@ -13936,14 +14285,14 @@
   (c-name "gtk_label_set_lines")
   (return-type "none")
   (parameters
-    '("gint" "lines")
+    '("int" "lines")
   )
 )
 
 (define-method get_lines
   (of-object "GtkLabel")
   (c-name "gtk_label_get_lines")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_wrap
@@ -13996,8 +14345,8 @@
   (c-name "gtk_label_select_region")
   (return-type "none")
   (parameters
-    '("gint" "start_offset")
-    '("gint" "end_offset")
+    '("int" "start_offset")
+    '("int" "end_offset")
   )
 )
 
@@ -14006,8 +14355,8 @@
   (c-name "gtk_label_get_selection_bounds")
   (return-type "gboolean")
   (parameters
-    '("gint*" "start")
-    '("gint*" "end")
+    '("int*" "start")
+    '("int*" "end")
   )
 )
 
@@ -14022,8 +14371,8 @@
   (c-name "gtk_label_get_layout_offsets")
   (return-type "none")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
+    '("int*" "x")
+    '("int*" "y")
   )
 )
 
@@ -14045,7 +14394,7 @@
 (define-method get_current_uri
   (of-object "GtkLabel")
   (c-name "gtk_label_get_current_uri")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_xalign
@@ -14053,14 +14402,14 @@
   (c-name "gtk_label_set_xalign")
   (return-type "none")
   (parameters
-    '("gfloat" "xalign")
+    '("float" "xalign")
   )
 )
 
 (define-method get_xalign
   (of-object "GtkLabel")
   (c-name "gtk_label_get_xalign")
-  (return-type "gfloat")
+  (return-type "float")
 )
 
 (define-method set_yalign
@@ -14068,14 +14417,14 @@
   (c-name "gtk_label_set_yalign")
   (return-type "none")
   (parameters
-    '("gfloat" "yalign")
+    '("float" "yalign")
   )
 )
 
 (define-method get_yalign
   (of-object "GtkLabel")
   (c-name "gtk_label_get_yalign")
-  (return-type "gfloat")
+  (return-type "float")
 )
 
 (define-method set_extra_menu
@@ -14186,8 +14535,8 @@
   (c-name "gtk_level_bar_new_for_interval")
   (return-type "GtkWidget*")
   (parameters
-    '("gdouble" "min_value")
-    '("gdouble" "max_value")
+    '("double" "min_value")
+    '("double" "max_value")
   )
 )
 
@@ -14211,14 +14560,14 @@
   (c-name "gtk_level_bar_set_value")
   (return-type "none")
   (parameters
-    '("gdouble" "value")
+    '("double" "value")
   )
 )
 
 (define-method get_value
   (of-object "GtkLevelBar")
   (c-name "gtk_level_bar_get_value")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_min_value
@@ -14226,14 +14575,14 @@
   (c-name "gtk_level_bar_set_min_value")
   (return-type "none")
   (parameters
-    '("gdouble" "value")
+    '("double" "value")
   )
 )
 
 (define-method get_min_value
   (of-object "GtkLevelBar")
   (c-name "gtk_level_bar_get_min_value")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_max_value
@@ -14241,14 +14590,14 @@
   (c-name "gtk_level_bar_set_max_value")
   (return-type "none")
   (parameters
-    '("gdouble" "value")
+    '("double" "value")
   )
 )
 
 (define-method get_max_value
   (of-object "GtkLevelBar")
   (c-name "gtk_level_bar_get_max_value")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_inverted
@@ -14271,8 +14620,8 @@
   (c-name "gtk_level_bar_add_offset_value")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("gdouble" "value")
+    '("const-char*" "name")
+    '("double" "value")
   )
 )
 
@@ -14281,7 +14630,7 @@
   (c-name "gtk_level_bar_remove_offset_value")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
@@ -14290,8 +14639,8 @@
   (c-name "gtk_level_bar_get_offset_value")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "name")
-    '("gdouble*" "value")
+    '("const-char*" "name")
+    '("double*" "value")
   )
 )
 
@@ -14309,7 +14658,7 @@
   (is-constructor-of "GtkLinkButton")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "uri")
+    '("const-char*" "uri")
   )
 )
 
@@ -14317,15 +14666,15 @@
   (c-name "gtk_link_button_new_with_label")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "uri")
-    '("const-gchar*" "label")
+    '("const-char*" "uri")
+    '("const-char*" "label")
   )
 )
 
 (define-method get_uri
   (of-object "GtkLinkButton")
   (c-name "gtk_link_button_get_uri")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_uri
@@ -14333,7 +14682,7 @@
   (c-name "gtk_link_button_set_uri")
   (return-type "none")
   (parameters
-    '("const-gchar*" "uri")
+    '("const-char*" "uri")
   )
 )
 
@@ -14409,7 +14758,7 @@
 (define-method get_index
   (of-object "GtkListBoxRow")
   (c-name "gtk_list_box_row_get_index")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method changed
@@ -14474,7 +14823,7 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "child")
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
@@ -14498,7 +14847,7 @@
   (c-name "gtk_list_box_get_row_at_index")
   (return-type "GtkListBoxRow*")
   (parameters
-    '("gint" "index_")
+    '("int" "index_")
   )
 )
 
@@ -14507,7 +14856,7 @@
   (c-name "gtk_list_box_get_row_at_y")
   (return-type "GtkListBoxRow*")
   (parameters
-    '("gint" "y")
+    '("int" "y")
   )
 )
 
@@ -14805,7 +15154,7 @@
   (is-constructor-of "GtkListStore")
   (return-type "GtkListStore*")
   (parameters
-    '("gint" "n_columns")
+    '("int" "n_columns")
   )
   (varargs #t)
 )
@@ -14814,7 +15163,7 @@
   (c-name "gtk_list_store_newv")
   (return-type "GtkListStore*")
   (parameters
-    '("gint" "n_columns")
+    '("int" "n_columns")
     '("GType*" "types")
   )
 )
@@ -14824,7 +15173,7 @@
   (c-name "gtk_list_store_set_column_types")
   (return-type "none")
   (parameters
-    '("gint" "n_columns")
+    '("int" "n_columns")
     '("GType*" "types")
   )
 )
@@ -14835,7 +15184,7 @@
   (return-type "none")
   (parameters
     '("GtkTreeIter*" "iter")
-    '("gint" "column")
+    '("int" "column")
     '("GValue*" "value")
   )
 )
@@ -14856,9 +15205,9 @@
   (return-type "none")
   (parameters
     '("GtkTreeIter*" "iter")
-    '("gint*" "columns")
+    '("int*" "columns")
     '("GValue*" "values")
-    '("gint" "n_values")
+    '("int" "n_values")
   )
 )
 
@@ -14887,7 +15236,7 @@
   (return-type "none")
   (parameters
     '("GtkTreeIter*" "iter")
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
@@ -14917,7 +15266,7 @@
   (return-type "none")
   (parameters
     '("GtkTreeIter*" "iter")
-    '("gint" "position")
+    '("int" "position")
   )
   (varargs #t)
 )
@@ -14928,10 +15277,10 @@
   (return-type "none")
   (parameters
     '("GtkTreeIter*" "iter")
-    '("gint" "position")
-    '("gint*" "columns")
+    '("int" "position")
+    '("int*" "columns")
     '("GValue*" "values")
-    '("gint" "n_values")
+    '("int" "n_values")
   )
 )
 
@@ -14973,7 +15322,7 @@
   (c-name "gtk_list_store_reorder")
   (return-type "none")
   (parameters
-    '("gint*" "new_order")
+    '("int*" "new_order")
   )
 )
 
@@ -15020,12 +15369,16 @@
   (c-name "gtk_list_view_new")
   (is-constructor-of "GtkListView")
   (return-type "GtkWidget*")
+  (parameters
+    '("GListModel*" "model")
+  )
 )
 
 (define-function gtk_list_view_new_with_factory
   (c-name "gtk_list_view_new_with_factory")
   (return-type "GtkWidget*")
   (parameters
+    '("GListModel*" "model")
     '("GtkListItemFactory*" "factory")
   )
 )
@@ -15169,7 +15522,7 @@
 
 (define-function gtk_check_version
   (c-name "gtk_check_version")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
   (parameters
     '("guint" "required_major")
     '("guint" "required_minor")
@@ -15616,8 +15969,8 @@
   (return-type "none")
   (parameters
     '("GQuark" "domain")
-    '("gint" "code")
-    '("const-gchar*" "format")
+    '("int" "code")
+    '("const-char*" "format")
   )
   (varargs #t)
 )
@@ -15628,8 +15981,8 @@
   (return-type "none")
   (parameters
     '("GQuark" "domain")
-    '("gint" "code")
-    '("const-gchar*" "format")
+    '("int" "code")
+    '("const-char*" "format")
     '("va_list" "args")
   )
 )
@@ -15694,21 +16047,6 @@
   (return-type "GMenuModel*")
 )
 
-(define-method set_align_widget
-  (of-object "GtkMenuButton")
-  (c-name "gtk_menu_button_set_align_widget")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "align_widget")
-  )
-)
-
-(define-method get_align_widget
-  (of-object "GtkMenuButton")
-  (c-name "gtk_menu_button_get_align_widget")
-  (return-type "GtkWidget*")
-)
-
 (define-method set_icon_name
   (of-object "GtkMenuButton")
   (c-name "gtk_menu_button_set_icon_name")
@@ -15810,7 +16148,7 @@
     '("GtkDialogFlags" "flags")
     '("GtkMessageType" "type")
     '("GtkButtonsType" "buttons")
-    '("const-gchar*" "message_format")
+    '("const-char*" "message_format")
   )
   (varargs #t)
 )
@@ -15823,7 +16161,7 @@
     '("GtkDialogFlags" "flags")
     '("GtkMessageType" "type")
     '("GtkButtonsType" "buttons")
-    '("const-gchar*" "message_format")
+    '("const-char*" "message_format")
   )
   (varargs #t)
 )
@@ -15833,7 +16171,7 @@
   (c-name "gtk_message_dialog_set_markup")
   (return-type "none")
   (parameters
-    '("const-gchar*" "str")
+    '("const-char*" "str")
   )
 )
 
@@ -15842,7 +16180,7 @@
   (c-name "gtk_message_dialog_format_secondary_text")
   (return-type "none")
   (parameters
-    '("const-gchar*" "message_format")
+    '("const-char*" "message_format")
   )
   (varargs #t)
 )
@@ -15852,7 +16190,7 @@
   (c-name "gtk_message_dialog_format_secondary_markup")
   (return-type "none")
   (parameters
-    '("const-gchar*" "message_format")
+    '("const-char*" "message_format")
   )
   (varargs #t)
 )
@@ -15937,7 +16275,7 @@
 (define-function gtk_multi_selection_new
   (c-name "gtk_multi_selection_new")
   (is-constructor-of "GtkMultiSelection")
-  (return-type "GListModel*")
+  (return-type "GtkMultiSelection*")
   (parameters
     '("GListModel*" "model")
   )
@@ -16145,7 +16483,7 @@
 (define-method append_page
   (of-object "GtkNotebook")
   (c-name "gtk_notebook_append_page")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkWidget*" "child")
     '("GtkWidget*" "tab_label")
@@ -16155,7 +16493,7 @@
 (define-method append_page_menu
   (of-object "GtkNotebook")
   (c-name "gtk_notebook_append_page_menu")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkWidget*" "child")
     '("GtkWidget*" "tab_label")
@@ -16166,7 +16504,7 @@
 (define-method prepend_page
   (of-object "GtkNotebook")
   (c-name "gtk_notebook_prepend_page")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkWidget*" "child")
     '("GtkWidget*" "tab_label")
@@ -16176,7 +16514,7 @@
 (define-method prepend_page_menu
   (of-object "GtkNotebook")
   (c-name "gtk_notebook_prepend_page_menu")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkWidget*" "child")
     '("GtkWidget*" "tab_label")
@@ -16187,23 +16525,23 @@
 (define-method insert_page
   (of-object "GtkNotebook")
   (c-name "gtk_notebook_insert_page")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkWidget*" "child")
     '("GtkWidget*" "tab_label")
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
 (define-method insert_page_menu
   (of-object "GtkNotebook")
   (c-name "gtk_notebook_insert_page_menu")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkWidget*" "child")
     '("GtkWidget*" "tab_label")
     '("GtkWidget*" "menu_label")
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
@@ -16212,7 +16550,7 @@
   (c-name "gtk_notebook_remove_page")
   (return-type "none")
   (parameters
-    '("gint" "page_num")
+    '("int" "page_num")
   )
 )
 
@@ -16221,20 +16559,20 @@
   (c-name "gtk_notebook_set_group_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "group_name")
+    '("const-char*" "group_name")
   )
 )
 
 (define-method get_group_name
   (of-object "GtkNotebook")
   (c-name "gtk_notebook_get_group_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_current_page
   (of-object "GtkNotebook")
   (c-name "gtk_notebook_get_current_page")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_nth_page
@@ -16242,20 +16580,20 @@
   (c-name "gtk_notebook_get_nth_page")
   (return-type "GtkWidget*")
   (parameters
-    '("gint" "page_num")
+    '("int" "page_num")
   )
 )
 
 (define-method get_n_pages
   (of-object "GtkNotebook")
   (c-name "gtk_notebook_get_n_pages")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method page_num
   (of-object "GtkNotebook")
   (c-name "gtk_notebook_page_num")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkWidget*" "child")
   )
@@ -16266,7 +16604,7 @@
   (c-name "gtk_notebook_set_current_page")
   (return-type "none")
   (parameters
-    '("gint" "page_num")
+    '("int" "page_num")
   )
 )
 
@@ -16379,14 +16717,14 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "child")
-    '("const-gchar*" "tab_text")
+    '("const-char*" "tab_text")
   )
 )
 
 (define-method get_tab_label_text
   (of-object "GtkNotebook")
   (c-name "gtk_notebook_get_tab_label_text")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
   (parameters
     '("GtkWidget*" "child")
   )
@@ -16417,14 +16755,14 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "child")
-    '("const-gchar*" "menu_text")
+    '("const-char*" "menu_text")
   )
 )
 
 (define-method get_menu_label_text
   (of-object "GtkNotebook")
   (c-name "gtk_notebook_get_menu_label_text")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
   (parameters
     '("GtkWidget*" "child")
   )
@@ -16436,7 +16774,7 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "child")
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
@@ -16750,7 +17088,7 @@
   (return-type "none")
   (parameters
     '("const-GtkPadActionEntry*" "entries")
-    '("gint" "n_entries")
+    '("int" "n_entries")
   )
 )
 
@@ -16760,10 +17098,10 @@
   (return-type "none")
   (parameters
     '("GtkPadActionType" "type")
-    '("gint" "index")
-    '("gint" "mode")
-    '("const-gchar*" "label")
-    '("const-gchar*" "action_name")
+    '("int" "index")
+    '("int" "mode")
+    '("const-char*" "label")
+    '("const-char*" "action_name")
   )
 )
 
@@ -16821,7 +17159,7 @@
 (define-method get_top_margin
   (of-object "GtkPageSetup")
   (c-name "gtk_page_setup_get_top_margin")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -16832,7 +17170,7 @@
   (c-name "gtk_page_setup_set_top_margin")
   (return-type "none")
   (parameters
-    '("gdouble" "margin")
+    '("double" "margin")
     '("GtkUnit" "unit")
   )
 )
@@ -16840,7 +17178,7 @@
 (define-method get_bottom_margin
   (of-object "GtkPageSetup")
   (c-name "gtk_page_setup_get_bottom_margin")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -16851,7 +17189,7 @@
   (c-name "gtk_page_setup_set_bottom_margin")
   (return-type "none")
   (parameters
-    '("gdouble" "margin")
+    '("double" "margin")
     '("GtkUnit" "unit")
   )
 )
@@ -16859,7 +17197,7 @@
 (define-method get_left_margin
   (of-object "GtkPageSetup")
   (c-name "gtk_page_setup_get_left_margin")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -16870,7 +17208,7 @@
   (c-name "gtk_page_setup_set_left_margin")
   (return-type "none")
   (parameters
-    '("gdouble" "margin")
+    '("double" "margin")
     '("GtkUnit" "unit")
   )
 )
@@ -16878,7 +17216,7 @@
 (define-method get_right_margin
   (of-object "GtkPageSetup")
   (c-name "gtk_page_setup_get_right_margin")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -16889,7 +17227,7 @@
   (c-name "gtk_page_setup_set_right_margin")
   (return-type "none")
   (parameters
-    '("gdouble" "margin")
+    '("double" "margin")
     '("GtkUnit" "unit")
   )
 )
@@ -16906,7 +17244,7 @@
 (define-method get_paper_width
   (of-object "GtkPageSetup")
   (c-name "gtk_page_setup_get_paper_width")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -16915,7 +17253,7 @@
 (define-method get_paper_height
   (of-object "GtkPageSetup")
   (c-name "gtk_page_setup_get_paper_height")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -16924,7 +17262,7 @@
 (define-method get_page_width
   (of-object "GtkPageSetup")
   (c-name "gtk_page_setup_get_page_width")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -16933,7 +17271,7 @@
 (define-method get_page_height
   (of-object "GtkPageSetup")
   (c-name "gtk_page_setup_get_page_height")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -16943,7 +17281,7 @@
   (c-name "gtk_page_setup_new_from_file")
   (return-type "GtkPageSetup*")
   (parameters
-    '("const-gchar*" "file_name")
+    '("const-char*" "file_name")
     '("GError**" "error")
   )
 )
@@ -16973,7 +17311,7 @@
   (return-type "GtkPageSetup*")
   (parameters
     '("GKeyFile*" "key_file")
-    '("const-gchar*" "group_name")
+    '("const-char*" "group_name")
     '("GError**" "error")
   )
 )
@@ -16984,7 +17322,7 @@
   (return-type "gboolean")
   (parameters
     '("GKeyFile*" "key_file")
-    '("const-gchar*" "group_name")
+    '("const-char*" "group_name")
     '("GError**" "error")
   )
 )
@@ -16995,7 +17333,7 @@
   (return-type "none")
   (parameters
     '("GKeyFile*" "key_file")
-    '("const-gchar*" "group_name")
+    '("const-char*" "group_name")
   )
 )
 
@@ -17027,7 +17365,7 @@
   (is-constructor-of "GtkPageSetupUnixDialog")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
     '("GtkWindow*" "parent")
   )
 )
@@ -17173,7 +17511,7 @@
 (define-method get_position
   (of-object "GtkPaned")
   (c-name "gtk_paned_get_position")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_position
@@ -17181,7 +17519,7 @@
   (c-name "gtk_paned_set_position")
   (return-type "none")
   (parameters
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
@@ -17211,7 +17549,7 @@
   (parameters
     '("GtkBuilder*" "builder")
     '("GObject*" "child")
-    '("const-gchar*" "tagname")
+    '("const-char*" "tagname")
     '("GtkBuildableParser*" "parser")
     '("gpointer*" "data")
   )
@@ -17244,7 +17582,7 @@
   (is-constructor-of "GtkPaperSize")
   (return-type "GtkPaperSize*")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
@@ -17252,10 +17590,10 @@
   (c-name "gtk_paper_size_new_from_ppd")
   (return-type "GtkPaperSize*")
   (parameters
-    '("const-gchar*" "ppd_name")
-    '("const-gchar*" "ppd_display_name")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("const-char*" "ppd_name")
+    '("const-char*" "ppd_display_name")
+    '("double" "width")
+    '("double" "height")
   )
 )
 
@@ -17263,9 +17601,9 @@
   (c-name "gtk_paper_size_new_from_ipp")
   (return-type "GtkPaperSize*")
   (parameters
-    '("const-gchar*" "ipp_name")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("const-char*" "ipp_name")
+    '("double" "width")
+    '("double" "height")
   )
 )
 
@@ -17273,10 +17611,10 @@
   (c-name "gtk_paper_size_new_custom")
   (return-type "GtkPaperSize*")
   (parameters
-    '("const-gchar*" "name")
-    '("const-gchar*" "display_name")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("const-char*" "name")
+    '("const-char*" "display_name")
+    '("double" "width")
+    '("double" "height")
     '("GtkUnit" "unit")
   )
 )
@@ -17313,25 +17651,25 @@
 (define-method get_name
   (of-object "GtkPaperSize")
   (c-name "gtk_paper_size_get_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_display_name
   (of-object "GtkPaperSize")
   (c-name "gtk_paper_size_get_display_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_ppd_name
   (of-object "GtkPaperSize")
   (c-name "gtk_paper_size_get_ppd_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_width
   (of-object "GtkPaperSize")
   (c-name "gtk_paper_size_get_width")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -17340,7 +17678,7 @@
 (define-method get_height
   (of-object "GtkPaperSize")
   (c-name "gtk_paper_size_get_height")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -17363,8 +17701,8 @@
   (c-name "gtk_paper_size_set_size")
   (return-type "none")
   (parameters
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("double" "width")
+    '("double" "height")
     '("GtkUnit" "unit")
   )
 )
@@ -17372,7 +17710,7 @@
 (define-method get_default_top_margin
   (of-object "GtkPaperSize")
   (c-name "gtk_paper_size_get_default_top_margin")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -17381,7 +17719,7 @@
 (define-method get_default_bottom_margin
   (of-object "GtkPaperSize")
   (c-name "gtk_paper_size_get_default_bottom_margin")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -17390,7 +17728,7 @@
 (define-method get_default_left_margin
   (of-object "GtkPaperSize")
   (c-name "gtk_paper_size_get_default_left_margin")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -17399,7 +17737,7 @@
 (define-method get_default_right_margin
   (of-object "GtkPaperSize")
   (c-name "gtk_paper_size_get_default_right_margin")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -17407,7 +17745,7 @@
 
 (define-function gtk_paper_size_get_default
   (c-name "gtk_paper_size_get_default")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-function gtk_paper_size_new_from_key_file
@@ -17415,7 +17753,7 @@
   (return-type "GtkPaperSize*")
   (parameters
     '("GKeyFile*" "key_file")
-    '("const-gchar*" "group_name")
+    '("const-char*" "group_name")
     '("GError**" "error")
   )
 )
@@ -17426,7 +17764,7 @@
   (return-type "none")
   (parameters
     '("GKeyFile*" "key_file")
-    '("const-gchar*" "group_name")
+    '("const-char*" "group_name")
   )
 )
 
@@ -17536,7 +17874,7 @@
   (c-name "gtk_picture_new_for_filename")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "filename")
+    '("const-char*" "filename")
   )
 )
 
@@ -17544,7 +17882,7 @@
   (c-name "gtk_picture_new_for_resource")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "resource_path")
+    '("const-char*" "resource_path")
   )
 )
 
@@ -17583,7 +17921,7 @@
   (c-name "gtk_picture_set_filename")
   (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
+    '("const-char*" "filename")
   )
 )
 
@@ -17592,7 +17930,7 @@
   (c-name "gtk_picture_set_resource")
   (return-type "none")
   (parameters
-    '("const-gchar*" "resource_path")
+    '("const-char*" "resource_path")
   )
 )
 
@@ -17876,25 +18214,25 @@
 (define-method get_width
   (of-object "GtkPrintContext")
   (c-name "gtk_print_context_get_width")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method get_height
   (of-object "GtkPrintContext")
   (c-name "gtk_print_context_get_height")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method get_dpi_x
   (of-object "GtkPrintContext")
   (c-name "gtk_print_context_get_dpi_x")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method get_dpi_y
   (of-object "GtkPrintContext")
   (c-name "gtk_print_context_get_dpi_y")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method get_hard_margins
@@ -17902,10 +18240,10 @@
   (c-name "gtk_print_context_get_hard_margins")
   (return-type "gboolean")
   (parameters
-    '("gdouble*" "top")
-    '("gdouble*" "bottom")
-    '("gdouble*" "left")
-    '("gdouble*" "right")
+    '("double*" "top")
+    '("double*" "bottom")
+    '("double*" "left")
+    '("double*" "right")
   )
 )
 
@@ -17957,7 +18295,7 @@
   (is-constructor-of "GtkPrinter")
   (return-type "GtkPrinter*")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
     '("GtkPrintBackend*" "backend")
     '("gboolean" "virtual_")
   )
@@ -17972,37 +18310,37 @@
 (define-method get_name
   (of-object "GtkPrinter")
   (c-name "gtk_printer_get_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_state_message
   (of-object "GtkPrinter")
   (c-name "gtk_printer_get_state_message")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_description
   (of-object "GtkPrinter")
   (c-name "gtk_printer_get_description")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_location
   (of-object "GtkPrinter")
   (c-name "gtk_printer_get_location")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_icon_name
   (of-object "GtkPrinter")
   (c-name "gtk_printer_get_icon_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_job_count
   (of-object "GtkPrinter")
   (c-name "gtk_printer_get_job_count")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method is_active
@@ -18062,7 +18400,7 @@
 (define-method compare
   (of-object "GtkPrinter")
   (c-name "gtk_printer_compare")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkPrinter*" "b")
   )
@@ -18091,10 +18429,10 @@
   (c-name "gtk_printer_get_hard_margins")
   (return-type "gboolean")
   (parameters
-    '("gdouble*" "top")
-    '("gdouble*" "bottom")
-    '("gdouble*" "left")
-    '("gdouble*" "right")
+    '("double*" "top")
+    '("double*" "bottom")
+    '("double*" "left")
+    '("double*" "right")
   )
 )
 
@@ -18104,10 +18442,10 @@
   (return-type "gboolean")
   (parameters
     '("GtkPaperSize*" "paper_size")
-    '("gdouble*" "top")
-    '("gdouble*" "bottom")
-    '("gdouble*" "left")
-    '("gdouble*" "right")
+    '("double*" "top")
+    '("double*" "bottom")
+    '("double*" "left")
+    '("double*" "right")
   )
 )
 
@@ -18333,7 +18671,7 @@
 (define-method get_value
   (of-object "GtkPrinterOptionWidget")
   (c-name "gtk_printer_option_widget_get_value")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 
@@ -18350,7 +18688,7 @@
   (is-constructor-of "GtkPrintJob")
   (return-type "GtkPrintJob*")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
     '("GtkPrinter*" "printer")
     '("GtkPrintSettings*" "settings")
     '("GtkPageSetup*" "page_setup")
@@ -18372,7 +18710,7 @@
 (define-method get_title
   (of-object "GtkPrintJob")
   (c-name "gtk_print_job_get_title")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_status
@@ -18386,7 +18724,7 @@
   (c-name "gtk_print_job_set_source_file")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "filename")
+    '("const-char*" "filename")
     '("GError**" "error")
   )
 )
@@ -18456,7 +18794,7 @@
   (c-name "gtk_print_job_get_page_ranges")
   (return-type "GtkPageRange*")
   (parameters
-    '("gint*" "n_ranges")
+    '("int*" "n_ranges")
   )
 )
 
@@ -18466,7 +18804,7 @@
   (return-type "none")
   (parameters
     '("GtkPageRange*" "ranges")
-    '("gint" "n_ranges")
+    '("int" "n_ranges")
   )
 )
 
@@ -18488,7 +18826,7 @@
 (define-method get_num_copies
   (of-object "GtkPrintJob")
   (c-name "gtk_print_job_get_num_copies")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_num_copies
@@ -18496,14 +18834,14 @@
   (c-name "gtk_print_job_set_num_copies")
   (return-type "none")
   (parameters
-    '("gint" "num_copies")
+    '("int" "num_copies")
   )
 )
 
 (define-method get_scale
   (of-object "GtkPrintJob")
   (c-name "gtk_print_job_get_scale")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_scale
@@ -18511,7 +18849,7 @@
   (c-name "gtk_print_job_set_scale")
   (return-type "none")
   (parameters
-    '("gdouble" "scale")
+    '("double" "scale")
   )
 )
 
@@ -18645,7 +18983,7 @@
   (c-name "gtk_print_operation_set_job_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "job_name")
+    '("const-char*" "job_name")
   )
 )
 
@@ -18654,7 +18992,7 @@
   (c-name "gtk_print_operation_set_n_pages")
   (return-type "none")
   (parameters
-    '("gint" "n_pages")
+    '("int" "n_pages")
   )
 )
 
@@ -18663,7 +19001,7 @@
   (c-name "gtk_print_operation_set_current_page")
   (return-type "none")
   (parameters
-    '("gint" "current_page")
+    '("int" "current_page")
   )
 )
 
@@ -18690,7 +19028,7 @@
   (c-name "gtk_print_operation_set_export_filename")
   (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
+    '("const-char*" "filename")
   )
 )
 
@@ -18726,7 +19064,7 @@
   (c-name "gtk_print_operation_set_custom_tab_label")
   (return-type "none")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
@@ -18759,7 +19097,7 @@
 (define-method get_status_string
   (of-object "GtkPrintOperation")
   (c-name "gtk_print_operation_get_status_string")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method is_finished
@@ -18834,7 +19172,7 @@
 (define-method get_n_pages_to_print
   (of-object "GtkPrintOperation")
   (c-name "gtk_print_operation_get_n_pages_to_print")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-function gtk_print_run_page_setup_dialog
@@ -18910,7 +19248,7 @@
   (c-name "gtk_print_operation_preview_render_page")
   (return-type "none")
   (parameters
-    '("gint" "page_nr")
+    '("int" "page_nr")
   )
 )
 
@@ -18925,7 +19263,7 @@
   (c-name "gtk_print_operation_preview_is_selected")
   (return-type "gboolean")
   (parameters
-    '("gint" "page_nr")
+    '("int" "page_nr")
   )
 )
 
@@ -18954,7 +19292,7 @@
   (c-name "gtk_print_settings_new_from_file")
   (return-type "GtkPrintSettings*")
   (parameters
-    '("const-gchar*" "file_name")
+    '("const-char*" "file_name")
     '("GError**" "error")
   )
 )
@@ -18964,7 +19302,7 @@
   (c-name "gtk_print_settings_load_file")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "file_name")
+    '("const-char*" "file_name")
     '("GError**" "error")
   )
 )
@@ -18974,7 +19312,7 @@
   (c-name "gtk_print_settings_to_file")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "file_name")
+    '("const-char*" "file_name")
     '("GError**" "error")
   )
 )
@@ -18984,7 +19322,7 @@
   (return-type "GtkPrintSettings*")
   (parameters
     '("GKeyFile*" "key_file")
-    '("const-gchar*" "group_name")
+    '("const-char*" "group_name")
     '("GError**" "error")
   )
 )
@@ -18995,7 +19333,7 @@
   (return-type "gboolean")
   (parameters
     '("GKeyFile*" "key_file")
-    '("const-gchar*" "group_name")
+    '("const-char*" "group_name")
     '("GError**" "error")
   )
 )
@@ -19006,7 +19344,7 @@
   (return-type "none")
   (parameters
     '("GKeyFile*" "key_file")
-    '("const-gchar*" "group_name")
+    '("const-char*" "group_name")
   )
 )
 
@@ -19015,16 +19353,16 @@
   (c-name "gtk_print_settings_has_key")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "key")
+    '("const-char*" "key")
   )
 )
 
 (define-method get
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
   (parameters
-    '("const-gchar*" "key")
+    '("const-char*" "key")
   )
 )
 
@@ -19033,8 +19371,8 @@
   (c-name "gtk_print_settings_set")
   (return-type "none")
   (parameters
-    '("const-gchar*" "key")
-    '("const-gchar*" "value")
+    '("const-char*" "key")
+    '("const-char*" "value")
   )
 )
 
@@ -19043,7 +19381,7 @@
   (c-name "gtk_print_settings_unset")
   (return-type "none")
   (parameters
-    '("const-gchar*" "key")
+    '("const-char*" "key")
   )
 )
 
@@ -19062,7 +19400,7 @@
   (c-name "gtk_print_settings_get_bool")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "key")
+    '("const-char*" "key")
   )
 )
 
@@ -19071,7 +19409,7 @@
   (c-name "gtk_print_settings_set_bool")
   (return-type "none")
   (parameters
-    '("const-gchar*" "key")
+    '("const-char*" "key")
     '("gboolean" "value")
   )
 )
@@ -19079,19 +19417,19 @@
 (define-method get_double
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_double")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
-    '("const-gchar*" "key")
+    '("const-char*" "key")
   )
 )
 
 (define-method get_double_with_default
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_double_with_default")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
-    '("const-gchar*" "key")
-    '("gdouble" "def")
+    '("const-char*" "key")
+    '("double" "def")
   )
 )
 
@@ -19100,17 +19438,17 @@
   (c-name "gtk_print_settings_set_double")
   (return-type "none")
   (parameters
-    '("const-gchar*" "key")
-    '("gdouble" "value")
+    '("const-char*" "key")
+    '("double" "value")
   )
 )
 
 (define-method get_length
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_length")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
-    '("const-gchar*" "key")
+    '("const-char*" "key")
     '("GtkUnit" "unit")
   )
 )
@@ -19120,8 +19458,8 @@
   (c-name "gtk_print_settings_set_length")
   (return-type "none")
   (parameters
-    '("const-gchar*" "key")
-    '("gdouble" "value")
+    '("const-char*" "key")
+    '("double" "value")
     '("GtkUnit" "unit")
   )
 )
@@ -19129,19 +19467,19 @@
 (define-method get_int
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_int")
-  (return-type "gint")
+  (return-type "int")
   (parameters
-    '("const-gchar*" "key")
+    '("const-char*" "key")
   )
 )
 
 (define-method get_int_with_default
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_int_with_default")
-  (return-type "gint")
+  (return-type "int")
   (parameters
-    '("const-gchar*" "key")
-    '("gint" "def")
+    '("const-char*" "key")
+    '("int" "def")
   )
 )
 
@@ -19150,15 +19488,15 @@
   (c-name "gtk_print_settings_set_int")
   (return-type "none")
   (parameters
-    '("const-gchar*" "key")
-    '("gint" "value")
+    '("const-char*" "key")
+    '("int" "value")
   )
 )
 
 (define-method get_printer
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_printer")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_printer
@@ -19166,7 +19504,7 @@
   (c-name "gtk_print_settings_set_printer")
   (return-type "none")
   (parameters
-    '("const-gchar*" "printer")
+    '("const-char*" "printer")
   )
 )
 
@@ -19203,7 +19541,7 @@
 (define-method get_paper_width
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_paper_width")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -19214,7 +19552,7 @@
   (c-name "gtk_print_settings_set_paper_width")
   (return-type "none")
   (parameters
-    '("gdouble" "width")
+    '("double" "width")
     '("GtkUnit" "unit")
   )
 )
@@ -19222,7 +19560,7 @@
 (define-method get_paper_height
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_paper_height")
-  (return-type "gdouble")
+  (return-type "double")
   (parameters
     '("GtkUnit" "unit")
   )
@@ -19233,7 +19571,7 @@
   (c-name "gtk_print_settings_set_paper_height")
   (return-type "none")
   (parameters
-    '("gdouble" "height")
+    '("double" "height")
     '("GtkUnit" "unit")
   )
 )
@@ -19316,7 +19654,7 @@
 (define-method get_n_copies
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_n_copies")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_n_copies
@@ -19324,14 +19662,14 @@
   (c-name "gtk_print_settings_set_n_copies")
   (return-type "none")
   (parameters
-    '("gint" "num_copies")
+    '("int" "num_copies")
   )
 )
 
 (define-method get_number_up
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_number_up")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_number_up
@@ -19339,7 +19677,7 @@
   (c-name "gtk_print_settings_set_number_up")
   (return-type "none")
   (parameters
-    '("gint" "number_up")
+    '("int" "number_up")
   )
 )
 
@@ -19361,7 +19699,7 @@
 (define-method get_resolution
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_resolution")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_resolution
@@ -19369,20 +19707,20 @@
   (c-name "gtk_print_settings_set_resolution")
   (return-type "none")
   (parameters
-    '("gint" "resolution")
+    '("int" "resolution")
   )
 )
 
 (define-method get_resolution_x
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_resolution_x")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_resolution_y
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_resolution_y")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_resolution_xy
@@ -19390,15 +19728,15 @@
   (c-name "gtk_print_settings_set_resolution_xy")
   (return-type "none")
   (parameters
-    '("gint" "resolution_x")
-    '("gint" "resolution_y")
+    '("int" "resolution_x")
+    '("int" "resolution_y")
   )
 )
 
 (define-method get_printer_lpi
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_printer_lpi")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_printer_lpi
@@ -19406,14 +19744,14 @@
   (c-name "gtk_print_settings_set_printer_lpi")
   (return-type "none")
   (parameters
-    '("gdouble" "lpi")
+    '("double" "lpi")
   )
 )
 
 (define-method get_scale
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_scale")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_scale
@@ -19421,7 +19759,7 @@
   (c-name "gtk_print_settings_set_scale")
   (return-type "none")
   (parameters
-    '("gdouble" "scale")
+    '("double" "scale")
   )
 )
 
@@ -19445,7 +19783,7 @@
   (c-name "gtk_print_settings_get_page_ranges")
   (return-type "GtkPageRange*")
   (parameters
-    '("gint*" "num_ranges")
+    '("int*" "num_ranges")
   )
 )
 
@@ -19455,7 +19793,7 @@
   (return-type "none")
   (parameters
     '("GtkPageRange*" "page_ranges")
-    '("gint" "num_ranges")
+    '("int" "num_ranges")
   )
 )
 
@@ -19477,7 +19815,7 @@
 (define-method get_default_source
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_default_source")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_default_source
@@ -19485,14 +19823,14 @@
   (c-name "gtk_print_settings_set_default_source")
   (return-type "none")
   (parameters
-    '("const-gchar*" "default_source")
+    '("const-char*" "default_source")
   )
 )
 
 (define-method get_media_type
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_media_type")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_media_type
@@ -19500,14 +19838,14 @@
   (c-name "gtk_print_settings_set_media_type")
   (return-type "none")
   (parameters
-    '("const-gchar*" "media_type")
+    '("const-char*" "media_type")
   )
 )
 
 (define-method get_dither
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_dither")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_dither
@@ -19515,14 +19853,14 @@
   (c-name "gtk_print_settings_set_dither")
   (return-type "none")
   (parameters
-    '("const-gchar*" "dither")
+    '("const-char*" "dither")
   )
 )
 
 (define-method get_finishings
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_finishings")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_finishings
@@ -19530,14 +19868,14 @@
   (c-name "gtk_print_settings_set_finishings")
   (return-type "none")
   (parameters
-    '("const-gchar*" "finishings")
+    '("const-char*" "finishings")
   )
 )
 
 (define-method get_output_bin
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_output_bin")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_output_bin
@@ -19545,7 +19883,7 @@
   (c-name "gtk_print_settings_set_output_bin")
   (return-type "none")
   (parameters
-    '("const-gchar*" "output_bin")
+    '("const-char*" "output_bin")
   )
 )
 
@@ -19577,7 +19915,7 @@
   (is-constructor-of "GtkPrintUnixDialog")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
     '("GtkWindow*" "parent")
   )
 )
@@ -19602,14 +19940,14 @@
   (c-name "gtk_print_unix_dialog_set_current_page")
   (return-type "none")
   (parameters
-    '("gint" "current_page")
+    '("int" "current_page")
   )
 )
 
 (define-method get_current_page
   (of-object "GtkPrintUnixDialog")
   (c-name "gtk_print_unix_dialog_get_current_page")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_settings
@@ -19779,7 +20117,7 @@
   (c-name "gtk_progress_bar_set_text")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
+    '("const-char*" "text")
   )
 )
 
@@ -19788,7 +20126,7 @@
   (c-name "gtk_progress_bar_set_fraction")
   (return-type "none")
   (parameters
-    '("gdouble" "fraction")
+    '("double" "fraction")
   )
 )
 
@@ -19797,7 +20135,7 @@
   (c-name "gtk_progress_bar_set_pulse_step")
   (return-type "none")
   (parameters
-    '("gdouble" "fraction")
+    '("double" "fraction")
   )
 )
 
@@ -19813,19 +20151,19 @@
 (define-method get_text
   (of-object "GtkProgressBar")
   (c-name "gtk_progress_bar_get_text")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_fraction
   (of-object "GtkProgressBar")
   (c-name "gtk_progress_bar_get_fraction")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method get_pulse_step
   (of-object "GtkProgressBar")
   (c-name "gtk_progress_bar_get_pulse_step")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method get_inverted
@@ -19886,7 +20224,7 @@
 (define-method get_text
   (of-object "GtkQuery")
   (c-name "gtk_query_get_text")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_text
@@ -19894,7 +20232,7 @@
   (c-name "gtk_query_set_text")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
+    '("const-char*" "text")
   )
 )
 
@@ -19918,7 +20256,7 @@
   (c-name "gtk_query_matches_string")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "string")
+    '("const-char*" "string")
   )
 )
 
@@ -19951,7 +20289,7 @@
   (return-type "GtkWidget*")
   (parameters
     '("GSList*" "group")
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
@@ -19960,7 +20298,7 @@
   (c-name "gtk_radio_button_new_with_label_from_widget")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
@@ -19969,7 +20307,7 @@
   (return-type "GtkWidget*")
   (parameters
     '("GSList*" "group")
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
@@ -19978,7 +20316,7 @@
   (c-name "gtk_radio_button_new_with_mnemonic_from_widget")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
@@ -20089,8 +20427,8 @@
   (c-name "gtk_range_get_slider_range")
   (return-type "none")
   (parameters
-    '("gint*" "slider_start")
-    '("gint*" "slider_end")
+    '("int*" "slider_start")
+    '("int*" "slider_end")
   )
 )
 
@@ -20099,8 +20437,8 @@
   (c-name "gtk_range_set_increments")
   (return-type "none")
   (parameters
-    '("gdouble" "step")
-    '("gdouble" "page")
+    '("double" "step")
+    '("double" "page")
   )
 )
 
@@ -20109,8 +20447,8 @@
   (c-name "gtk_range_set_range")
   (return-type "none")
   (parameters
-    '("gdouble" "min")
-    '("gdouble" "max")
+    '("double" "min")
+    '("double" "max")
   )
 )
 
@@ -20119,14 +20457,14 @@
   (c-name "gtk_range_set_value")
   (return-type "none")
   (parameters
-    '("gdouble" "value")
+    '("double" "value")
   )
 )
 
 (define-method get_value
   (of-object "GtkRange")
   (c-name "gtk_range_get_value")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_show_fill_level
@@ -20164,14 +20502,14 @@
   (c-name "gtk_range_set_fill_level")
   (return-type "none")
   (parameters
-    '("gdouble" "fill_level")
+    '("double" "fill_level")
   )
 )
 
 (define-method get_fill_level
   (of-object "GtkRange")
   (c-name "gtk_range_get_fill_level")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_round_digits
@@ -20179,14 +20517,14 @@
   (c-name "gtk_range_set_round_digits")
   (return-type "none")
   (parameters
-    '("gint" "round_digits")
+    '("int" "round_digits")
   )
 )
 
 (define-method get_round_digits
   (of-object "GtkRange")
   (c-name "gtk_range_get_round_digits")
-  (return-type "gint")
+  (return-type "int")
 )
 
 
@@ -20219,7 +20557,7 @@
   (c-name "gtk_recent_manager_add_item")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "uri")
+    '("const-char*" "uri")
   )
 )
 
@@ -20228,7 +20566,7 @@
   (c-name "gtk_recent_manager_add_full")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "uri")
+    '("const-char*" "uri")
     '("const-GtkRecentData*" "recent_data")
   )
 )
@@ -20238,7 +20576,7 @@
   (c-name "gtk_recent_manager_remove_item")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "uri")
+    '("const-char*" "uri")
     '("GError**" "error")
   )
 )
@@ -20248,7 +20586,7 @@
   (c-name "gtk_recent_manager_lookup_item")
   (return-type "GtkRecentInfo*")
   (parameters
-    '("const-gchar*" "uri")
+    '("const-char*" "uri")
     '("GError**" "error")
   )
 )
@@ -20258,7 +20596,7 @@
   (c-name "gtk_recent_manager_has_item")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "uri")
+    '("const-char*" "uri")
   )
 )
 
@@ -20267,8 +20605,8 @@
   (c-name "gtk_recent_manager_move_item")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "uri")
-    '("const-gchar*" "new_uri")
+    '("const-char*" "uri")
+    '("const-char*" "new_uri")
     '("GError**" "error")
   )
 )
@@ -20282,7 +20620,7 @@
 (define-method purge_items
   (of-object "GtkRecentManager")
   (c-name "gtk_recent_manager_purge_items")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GError**" "error")
   )
@@ -20308,25 +20646,25 @@
 (define-method get_uri
   (of-object "GtkRecentInfo")
   (c-name "gtk_recent_info_get_uri")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_display_name
   (of-object "GtkRecentInfo")
   (c-name "gtk_recent_info_get_display_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_description
   (of-object "GtkRecentInfo")
   (c-name "gtk_recent_info_get_description")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_mime_type
   (of-object "GtkRecentInfo")
   (c-name "gtk_recent_info_get_mime_type")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_added
@@ -20358,8 +20696,8 @@
   (c-name "gtk_recent_info_get_application_info")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "app_name")
-    '("const-gchar**" "app_exec")
+    '("const-char*" "app_name")
+    '("const-char**" "app_exec")
     '("guint*" "count")
     '("time_t*" "time_")
   )
@@ -20370,7 +20708,7 @@
   (c-name "gtk_recent_info_create_app_info")
   (return-type "GAppInfo*")
   (parameters
-    '("const-gchar*" "app_name")
+    '("const-char*" "app_name")
     '("GError**" "error")
   )
 )
@@ -20378,7 +20716,7 @@
 (define-method get_applications
   (of-object "GtkRecentInfo")
   (c-name "gtk_recent_info_get_applications")
-  (return-type "gchar**")
+  (return-type "char**")
   (parameters
     '("gsize*" "length")
   )
@@ -20387,7 +20725,7 @@
 (define-method last_application
   (of-object "GtkRecentInfo")
   (c-name "gtk_recent_info_last_application")
-  (return-type "gchar*")
+  (return-type "char*")
 )
 
 (define-method has_application
@@ -20395,14 +20733,14 @@
   (c-name "gtk_recent_info_has_application")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "app_name")
+    '("const-char*" "app_name")
   )
 )
 
 (define-method get_groups
   (of-object "GtkRecentInfo")
   (c-name "gtk_recent_info_get_groups")
-  (return-type "gchar**")
+  (return-type "char**")
   (parameters
     '("gsize*" "length")
   )
@@ -20413,7 +20751,7 @@
   (c-name "gtk_recent_info_has_group")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "group_name")
+    '("const-char*" "group_name")
   )
 )
 
@@ -20426,19 +20764,19 @@
 (define-method get_short_name
   (of-object "GtkRecentInfo")
   (c-name "gtk_recent_info_get_short_name")
-  (return-type "gchar*")
+  (return-type "char*")
 )
 
 (define-method get_uri_display
   (of-object "GtkRecentInfo")
   (c-name "gtk_recent_info_get_uri_display")
-  (return-type "gchar*")
+  (return-type "char*")
 )
 
 (define-method get_age
   (of-object "GtkRecentInfo")
   (c-name "gtk_recent_info_get_age")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method is_local
@@ -20472,10 +20810,10 @@
   (parameters
     '("GtkStyleContext*" "context")
     '("cairo_t*" "cr")
-    '("gdouble" "x")
-    '("gdouble" "y")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("double" "x")
+    '("double" "y")
+    '("double" "width")
+    '("double" "height")
   )
 )
 
@@ -20485,10 +20823,10 @@
   (parameters
     '("GtkStyleContext*" "context")
     '("cairo_t*" "cr")
-    '("gdouble" "x")
-    '("gdouble" "y")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("double" "x")
+    '("double" "y")
+    '("double" "width")
+    '("double" "height")
   )
 )
 
@@ -20498,10 +20836,10 @@
   (parameters
     '("GtkStyleContext*" "context")
     '("cairo_t*" "cr")
-    '("gdouble" "angle")
-    '("gdouble" "x")
-    '("gdouble" "y")
-    '("gdouble" "size")
+    '("double" "angle")
+    '("double" "x")
+    '("double" "y")
+    '("double" "size")
   )
 )
 
@@ -20511,10 +20849,10 @@
   (parameters
     '("GtkStyleContext*" "context")
     '("cairo_t*" "cr")
-    '("gdouble" "x")
-    '("gdouble" "y")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("double" "x")
+    '("double" "y")
+    '("double" "width")
+    '("double" "height")
   )
 )
 
@@ -20524,10 +20862,10 @@
   (parameters
     '("GtkStyleContext*" "context")
     '("cairo_t*" "cr")
-    '("gdouble" "x")
-    '("gdouble" "y")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("double" "x")
+    '("double" "y")
+    '("double" "width")
+    '("double" "height")
   )
 )
 
@@ -20537,10 +20875,10 @@
   (parameters
     '("GtkStyleContext*" "context")
     '("cairo_t*" "cr")
-    '("gdouble" "x")
-    '("gdouble" "y")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("double" "x")
+    '("double" "y")
+    '("double" "width")
+    '("double" "height")
   )
 )
 
@@ -20550,10 +20888,10 @@
   (parameters
     '("GtkStyleContext*" "context")
     '("cairo_t*" "cr")
-    '("gdouble" "x")
-    '("gdouble" "y")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("double" "x")
+    '("double" "y")
+    '("double" "width")
+    '("double" "height")
   )
 )
 
@@ -20563,8 +20901,8 @@
   (parameters
     '("GtkStyleContext*" "context")
     '("cairo_t*" "cr")
-    '("gdouble" "x")
-    '("gdouble" "y")
+    '("double" "x")
+    '("double" "y")
     '("PangoLayout*" "layout")
   )
 )
@@ -20575,10 +20913,10 @@
   (parameters
     '("GtkStyleContext*" "context")
     '("cairo_t*" "cr")
-    '("gdouble" "x0")
-    '("gdouble" "y0")
-    '("gdouble" "x1")
-    '("gdouble" "y1")
+    '("double" "x0")
+    '("double" "y0")
+    '("double" "x1")
+    '("double" "y1")
   )
 )
 
@@ -20588,10 +20926,10 @@
   (parameters
     '("GtkStyleContext*" "context")
     '("cairo_t*" "cr")
-    '("gdouble" "x")
-    '("gdouble" "y")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("double" "x")
+    '("double" "y")
+    '("double" "width")
+    '("double" "height")
     '("GtkOrientation" "orientation")
   )
 )
@@ -20602,10 +20940,10 @@
   (parameters
     '("GtkStyleContext*" "context")
     '("cairo_t*" "cr")
-    '("gdouble" "x")
-    '("gdouble" "y")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("double" "x")
+    '("double" "y")
+    '("double" "width")
+    '("double" "height")
   )
 )
 
@@ -20615,10 +20953,10 @@
   (parameters
     '("GtkStyleContext*" "context")
     '("cairo_t*" "cr")
-    '("gdouble" "x")
-    '("gdouble" "y")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("double" "x")
+    '("double" "y")
+    '("double" "width")
+    '("double" "height")
   )
 )
 
@@ -20629,8 +20967,8 @@
     '("GtkStyleContext*" "context")
     '("cairo_t*" "cr")
     '("GdkTexture*" "texture")
-    '("gdouble" "x")
-    '("gdouble" "y")
+    '("double" "x")
+    '("double" "y")
   )
 )
 
@@ -20754,10 +21092,10 @@
   (is-constructor-of "GtkScaleButton")
   (return-type "GtkWidget*")
   (parameters
-    '("gdouble" "min")
-    '("gdouble" "max")
-    '("gdouble" "step")
-    '("const-gchar**" "icons")
+    '("double" "min")
+    '("double" "max")
+    '("double" "step")
+    '("const-char**" "icons")
   )
 )
 
@@ -20766,14 +21104,14 @@
   (c-name "gtk_scale_button_set_icons")
   (return-type "none")
   (parameters
-    '("const-gchar**" "icons")
+    '("const-char**" "icons")
   )
 )
 
 (define-method get_value
   (of-object "GtkScaleButton")
   (c-name "gtk_scale_button_get_value")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method set_value
@@ -20781,7 +21119,7 @@
   (c-name "gtk_scale_button_set_value")
   (return-type "none")
   (parameters
-    '("gdouble" "value")
+    '("double" "value")
   )
 )
 
@@ -20842,9 +21180,9 @@
   (return-type "GtkWidget*")
   (parameters
     '("GtkOrientation" "orientation")
-    '("gdouble" "min")
-    '("gdouble" "max")
-    '("gdouble" "step")
+    '("double" "min")
+    '("double" "max")
+    '("double" "step")
   )
 )
 
@@ -20853,14 +21191,14 @@
   (c-name "gtk_scale_set_digits")
   (return-type "none")
   (parameters
-    '("gint" "digits")
+    '("int" "digits")
   )
 )
 
 (define-method get_digits
   (of-object "GtkScale")
   (c-name "gtk_scale_get_digits")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_draw_value
@@ -20919,8 +21257,8 @@
   (c-name "gtk_scale_get_layout_offsets")
   (return-type "none")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
+    '("int*" "x")
+    '("int*" "y")
   )
 )
 
@@ -20929,9 +21267,9 @@
   (c-name "gtk_scale_add_mark")
   (return-type "none")
   (parameters
-    '("gdouble" "value")
+    '("double" "value")
     '("GtkPositionType" "position")
-    '("const-gchar*" "markup")
+    '("const-char*" "markup")
   )
 )
 
@@ -21180,7 +21518,7 @@
 (define-method get_min_content_width
   (of-object "GtkScrolledWindow")
   (c-name "gtk_scrolled_window_get_min_content_width")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_min_content_width
@@ -21188,14 +21526,14 @@
   (c-name "gtk_scrolled_window_set_min_content_width")
   (return-type "none")
   (parameters
-    '("gint" "width")
+    '("int" "width")
   )
 )
 
 (define-method get_min_content_height
   (of-object "GtkScrolledWindow")
   (c-name "gtk_scrolled_window_get_min_content_height")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_min_content_height
@@ -21203,7 +21541,7 @@
   (c-name "gtk_scrolled_window_set_min_content_height")
   (return-type "none")
   (parameters
-    '("gint" "height")
+    '("int" "height")
   )
 )
 
@@ -21257,14 +21595,14 @@
   (c-name "gtk_scrolled_window_set_max_content_width")
   (return-type "none")
   (parameters
-    '("gint" "width")
+    '("int" "width")
   )
 )
 
 (define-method get_max_content_width
   (of-object "GtkScrolledWindow")
   (c-name "gtk_scrolled_window_get_max_content_width")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_max_content_height
@@ -21272,14 +21610,14 @@
   (c-name "gtk_scrolled_window_set_max_content_height")
   (return-type "none")
   (parameters
-    '("gint" "height")
+    '("int" "height")
   )
 )
 
 (define-method get_max_content_height
   (of-object "GtkScrolledWindow")
   (c-name "gtk_scrolled_window_get_max_content_height")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_propagate_natural_width
@@ -21639,7 +21977,7 @@
   (c-name "gtk_settings_reset_property")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
@@ -21778,7 +22116,7 @@
   (parameters
     '("GtkShortcutTrigger*" "trigger")
     '("GtkShortcutAction*" "action")
-    '("const-gchar*" "format_string")
+    '("const-char*" "format_string")
   )
   (varargs #t)
 )
@@ -21842,14 +22180,14 @@
   (is-constructor-of "GtkShortcutLabel")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "accelerator")
+    '("const-char*" "accelerator")
   )
 )
 
 (define-method get_accelerator
   (of-object "GtkShortcutLabel")
   (c-name "gtk_shortcut_label_get_accelerator")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_accelerator
@@ -21857,14 +22195,14 @@
   (c-name "gtk_shortcut_label_set_accelerator")
   (return-type "none")
   (parameters
-    '("const-gchar*" "accelerator")
+    '("const-char*" "accelerator")
   )
 )
 
 (define-method get_disabled_text
   (of-object "GtkShortcutLabel")
   (c-name "gtk_shortcut_label_get_disabled_text")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_disabled_text
@@ -21872,7 +22210,7 @@
   (c-name "gtk_shortcut_label_set_disabled_text")
   (return-type "none")
   (parameters
-    '("const-gchar*" "disabled_text")
+    '("const-char*" "disabled_text")
   )
 )
 
@@ -21973,7 +22311,7 @@
 
 (define-function gtk_shortcut_trigger_compare
   (c-name "gtk_shortcut_trigger_compare")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("gconstpointer" "trigger1")
     '("gconstpointer" "trigger2")
@@ -22214,9 +22552,9 @@
 
 (define-function gtk_distribute_natural_allocation
   (c-name "gtk_distribute_natural_allocation")
-  (return-type "gint")
+  (return-type "int")
   (parameters
-    '("gint" "extra_space")
+    '("int" "extra_space")
     '("guint" "n_requested_sizes")
     '("GtkRequestedSize*" "sizes")
   )
@@ -22638,10 +22976,10 @@
   (return-type "none")
   (parameters
     '("GtkStyleContext*" "context")
-    '("gdouble" "x")
-    '("gdouble" "y")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("double" "x")
+    '("double" "y")
+    '("double" "width")
+    '("double" "height")
   )
 )
 
@@ -22651,10 +22989,10 @@
   (return-type "none")
   (parameters
     '("GtkStyleContext*" "context")
-    '("gdouble" "x")
-    '("gdouble" "y")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("double" "x")
+    '("double" "y")
+    '("double" "width")
+    '("double" "height")
   )
 )
 
@@ -22664,10 +23002,10 @@
   (return-type "none")
   (parameters
     '("GtkStyleContext*" "context")
-    '("gdouble" "x")
-    '("gdouble" "y")
-    '("gdouble" "width")
-    '("gdouble" "height")
+    '("double" "x")
+    '("double" "y")
+    '("double" "width")
+    '("double" "height")
   )
 )
 
@@ -22677,8 +23015,8 @@
   (return-type "none")
   (parameters
     '("GtkStyleContext*" "context")
-    '("gdouble" "x")
-    '("gdouble" "y")
+    '("double" "x")
+    '("double" "y")
     '("PangoLayout*" "layout")
   )
 )
@@ -22689,8 +23027,8 @@
   (return-type "none")
   (parameters
     '("GtkStyleContext*" "context")
-    '("gdouble" "x")
-    '("gdouble" "y")
+    '("double" "x")
+    '("double" "y")
     '("PangoLayout*" "layout")
     '("int" "index")
     '("PangoDirection" "direction")
@@ -22764,10 +23102,31 @@
   )
 )
 
-(define-method get_model
+(define-method get_model
+  (of-object "GtkSortListModel")
+  (c-name "gtk_sort_list_model_get_model")
+  (return-type "GListModel*")
+)
+
+(define-method set_incremental
+  (of-object "GtkSortListModel")
+  (c-name "gtk_sort_list_model_set_incremental")
+  (return-type "none")
+  (parameters
+    '("gboolean" "incremental")
+  )
+)
+
+(define-method get_incremental
+  (of-object "GtkSortListModel")
+  (c-name "gtk_sort_list_model_get_incremental")
+  (return-type "gboolean")
+)
+
+(define-method get_pending
   (of-object "GtkSortListModel")
-  (c-name "gtk_sort_list_model_get_model")
-  (return-type "GListModel*")
+  (c-name "gtk_sort_list_model_get_pending")
+  (return-type "guint")
 )
 
 
@@ -22785,7 +23144,7 @@
   (return-type "none")
   (parameters
     '("GtkAdjustment*" "adjustment")
-    '("gdouble" "climb_rate")
+    '("double" "climb_rate")
     '("guint" "digits")
   )
 )
@@ -22796,7 +23155,7 @@
   (return-type "GtkWidget*")
   (parameters
     '("GtkAdjustment*" "adjustment")
-    '("gdouble" "climb_rate")
+    '("double" "climb_rate")
     '("guint" "digits")
   )
 )
@@ -22805,9 +23164,9 @@
   (c-name "gtk_spin_button_new_with_range")
   (return-type "GtkWidget*")
   (parameters
-    '("gdouble" "min")
-    '("gdouble" "max")
-    '("gdouble" "step")
+    '("double" "min")
+    '("double" "max")
+    '("double" "step")
   )
 )
 
@@ -22846,8 +23205,8 @@
   (c-name "gtk_spin_button_set_increments")
   (return-type "none")
   (parameters
-    '("gdouble" "step")
-    '("gdouble" "page")
+    '("double" "step")
+    '("double" "page")
   )
 )
 
@@ -22856,8 +23215,8 @@
   (c-name "gtk_spin_button_get_increments")
   (return-type "none")
   (parameters
-    '("gdouble*" "step")
-    '("gdouble*" "page")
+    '("double*" "step")
+    '("double*" "page")
   )
 )
 
@@ -22866,8 +23225,8 @@
   (c-name "gtk_spin_button_set_range")
   (return-type "none")
   (parameters
-    '("gdouble" "min")
-    '("gdouble" "max")
+    '("double" "min")
+    '("double" "max")
   )
 )
 
@@ -22876,21 +23235,21 @@
   (c-name "gtk_spin_button_get_range")
   (return-type "none")
   (parameters
-    '("gdouble*" "min")
-    '("gdouble*" "max")
+    '("double*" "min")
+    '("double*" "max")
   )
 )
 
 (define-method get_value
   (of-object "GtkSpinButton")
   (c-name "gtk_spin_button_get_value")
-  (return-type "gdouble")
+  (return-type "double")
 )
 
 (define-method get_value_as_int
   (of-object "GtkSpinButton")
   (c-name "gtk_spin_button_get_value_as_int")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_value
@@ -22898,7 +23257,7 @@
   (c-name "gtk_spin_button_set_value")
   (return-type "none")
   (parameters
-    '("gdouble" "value")
+    '("double" "value")
   )
 )
 
@@ -22938,7 +23297,7 @@
   (return-type "none")
   (parameters
     '("GtkSpinType" "direction")
-    '("gdouble" "increment")
+    '("double" "increment")
   )
 )
 
@@ -23142,7 +23501,7 @@
   (return-type "GtkStackPage*")
   (parameters
     '("GtkWidget*" "child")
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
@@ -23152,8 +23511,8 @@
   (return-type "GtkStackPage*")
   (parameters
     '("GtkWidget*" "child")
-    '("const-gchar*" "name")
-    '("const-gchar*" "title")
+    '("const-char*" "name")
+    '("const-char*" "title")
   )
 )
 
@@ -23180,7 +23539,7 @@
   (c-name "gtk_stack_get_child_by_name")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
@@ -23204,14 +23563,14 @@
   (c-name "gtk_stack_set_visible_child_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
 (define-method get_visible_child_name
   (of-object "GtkStack")
   (c-name "gtk_stack_get_visible_child_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_visible_child_full
@@ -23219,7 +23578,7 @@
   (c-name "gtk_stack_set_visible_child_full")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
     '("GtkStackTransitionType" "transition")
   )
 )
@@ -23391,7 +23750,7 @@
   (c-name "gtk_statusbar_get_context_id")
   (return-type "guint")
   (parameters
-    '("const-gchar*" "context_description")
+    '("const-char*" "context_description")
   )
 )
 
@@ -23401,7 +23760,7 @@
   (return-type "guint")
   (parameters
     '("guint" "context_id")
-    '("const-gchar*" "text")
+    '("const-char*" "text")
   )
 )
 
@@ -23441,6 +23800,9 @@
   (c-name "gtk_string_filter_new")
   (is-constructor-of "GtkStringFilter")
   (return-type "GtkFilter*")
+  (parameters
+    '("GtkExpression*" "expression")
+  )
 )
 
 (define-method get_search
@@ -23700,14 +24062,14 @@
   (c-name "gtk_style_context_set_scale")
   (return-type "none")
   (parameters
-    '("gint" "scale")
+    '("int" "scale")
   )
 )
 
 (define-method get_scale
   (of-object "GtkStyleContext")
   (c-name "gtk_style_context_get_scale")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method add_class
@@ -23715,7 +24077,7 @@
   (c-name "gtk_style_context_add_class")
   (return-type "none")
   (parameters
-    '("const-gchar*" "class_name")
+    '("const-char*" "class_name")
   )
 )
 
@@ -23724,7 +24086,7 @@
   (c-name "gtk_style_context_remove_class")
   (return-type "none")
   (parameters
-    '("const-gchar*" "class_name")
+    '("const-char*" "class_name")
   )
 )
 
@@ -23733,7 +24095,7 @@
   (c-name "gtk_style_context_has_class")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "class_name")
+    '("const-char*" "class_name")
   )
 )
 
@@ -23757,7 +24119,7 @@
   (c-name "gtk_style_context_lookup_color")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "color_name")
+    '("const-char*" "color_name")
     '("GdkRGBA*" "color")
   )
 )
@@ -23804,8 +24166,8 @@
   (parameters
     '("GtkStyleContext*" "context")
     '("cairo_t*" "cr")
-    '("gdouble" "x")
-    '("gdouble" "y")
+    '("double" "x")
+    '("double" "y")
     '("PangoLayout*" "layout")
     '("int" "index")
     '("PangoDirection" "direction")
@@ -23877,6 +24239,91 @@
 
 
 
+;; From gtktestatcontext.h
+
+(define-function gtk_test_accessible_has_role
+  (c-name "gtk_test_accessible_has_role")
+  (return-type "gboolean")
+  (parameters
+    '("GtkAccessible*" "accessible")
+    '("GtkAccessibleRole" "role")
+  )
+)
+
+(define-function gtk_test_accessible_has_property
+  (c-name "gtk_test_accessible_has_property")
+  (return-type "gboolean")
+  (parameters
+    '("GtkAccessible*" "accessible")
+    '("GtkAccessibleProperty" "property")
+  )
+)
+
+(define-function gtk_test_accessible_has_relation
+  (c-name "gtk_test_accessible_has_relation")
+  (return-type "gboolean")
+  (parameters
+    '("GtkAccessible*" "accessible")
+    '("GtkAccessibleRelation" "relation")
+  )
+)
+
+(define-function gtk_test_accessible_has_state
+  (c-name "gtk_test_accessible_has_state")
+  (return-type "gboolean")
+  (parameters
+    '("GtkAccessible*" "accessible")
+    '("GtkAccessibleState" "state")
+  )
+)
+
+(define-function gtk_test_accessible_check_property
+  (c-name "gtk_test_accessible_check_property")
+  (return-type "char*")
+  (parameters
+    '("GtkAccessible*" "accessible")
+    '("GtkAccessibleProperty" "property")
+  )
+  (varargs #t)
+)
+
+(define-function gtk_test_accessible_check_relation
+  (c-name "gtk_test_accessible_check_relation")
+  (return-type "char*")
+  (parameters
+    '("GtkAccessible*" "accessible")
+    '("GtkAccessibleRelation" "relation")
+  )
+  (varargs #t)
+)
+
+(define-function gtk_test_accessible_check_state
+  (c-name "gtk_test_accessible_check_state")
+  (return-type "char*")
+  (parameters
+    '("GtkAccessible*" "accessible")
+    '("GtkAccessibleState" "state")
+  )
+  (varargs #t)
+)
+
+(define-function gtk_test_accessible_assertion_message_role
+  (c-name "gtk_test_accessible_assertion_message_role")
+  (return-type "none")
+  (parameters
+    '("const-char*" "domain")
+    '("const-char*" "file")
+    '("int" "line")
+    '("const-char*" "func")
+    '("const-char*" "expr")
+    '("GtkAccessible*" "accessible")
+    '("GtkAccessibleRole" "expected_role")
+    '("GtkAccessibleRole" "actual_role")
+  )
+)
+
+
+
 ;; From gtktestutils.h
 
 (define-function gtk_test_init
@@ -23977,13 +24424,13 @@
 (define-method get_line_count
   (of-object "GtkTextBuffer")
   (c-name "gtk_text_buffer_get_line_count")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_char_count
   (of-object "GtkTextBuffer")
   (c-name "gtk_text_buffer_get_char_count")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_tag_table
@@ -23997,8 +24444,8 @@
   (c-name "gtk_text_buffer_set_text")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
-    '("gint" "len")
+    '("const-char*" "text")
+    '("int" "len")
   )
 )
 
@@ -24008,8 +24455,8 @@
   (return-type "none")
   (parameters
     '("GtkTextIter*" "iter")
-    '("const-gchar*" "text")
-    '("gint" "len")
+    '("const-char*" "text")
+    '("int" "len")
   )
 )
 
@@ -24018,8 +24465,8 @@
   (c-name "gtk_text_buffer_insert_at_cursor")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
-    '("gint" "len")
+    '("const-char*" "text")
+    '("int" "len")
   )
 )
 
@@ -24029,8 +24476,8 @@
   (return-type "gboolean")
   (parameters
     '("GtkTextIter*" "iter")
-    '("const-gchar*" "text")
-    '("gint" "len")
+    '("const-char*" "text")
+    '("int" "len")
     '("gboolean" "default_editable")
   )
 )
@@ -24040,8 +24487,8 @@
   (c-name "gtk_text_buffer_insert_interactive_at_cursor")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "text")
-    '("gint" "len")
+    '("const-char*" "text")
+    '("int" "len")
     '("gboolean" "default_editable")
   )
 )
@@ -24075,8 +24522,8 @@
   (return-type "none")
   (parameters
     '("GtkTextIter*" "iter")
-    '("const-gchar*" "text")
-    '("gint" "len")
+    '("const-char*" "text")
+    '("int" "len")
     '("GtkTextTag*" "first_tag")
   )
   (varargs #t)
@@ -24088,9 +24535,9 @@
   (return-type "none")
   (parameters
     '("GtkTextIter*" "iter")
-    '("const-gchar*" "text")
-    '("gint" "len")
-    '("const-gchar*" "first_tag_name")
+    '("const-char*" "text")
+    '("int" "len")
+    '("const-char*" "first_tag_name")
   )
   (varargs #t)
 )
@@ -24101,8 +24548,8 @@
   (return-type "none")
   (parameters
     '("GtkTextIter*" "iter")
-    '("const-gchar*" "markup")
-    '("gint" "len")
+    '("const-char*" "markup")
+    '("int" "len")
   )
 )
 
@@ -24141,7 +24588,7 @@
 (define-method get_text
   (of-object "GtkTextBuffer")
   (c-name "gtk_text_buffer_get_text")
-  (return-type "gchar*")
+  (return-type "char*")
   (parameters
     '("const-GtkTextIter*" "start")
     '("const-GtkTextIter*" "end")
@@ -24152,7 +24599,7 @@
 (define-method get_slice
   (of-object "GtkTextBuffer")
   (c-name "gtk_text_buffer_get_slice")
-  (return-type "gchar*")
+  (return-type "char*")
   (parameters
     '("const-GtkTextIter*" "start")
     '("const-GtkTextIter*" "end")
@@ -24204,7 +24651,7 @@
   (c-name "gtk_text_buffer_create_mark")
   (return-type "GtkTextMark*")
   (parameters
-    '("const-gchar*" "mark_name")
+    '("const-char*" "mark_name")
     '("const-GtkTextIter*" "where")
     '("gboolean" "left_gravity")
   )
@@ -24234,7 +24681,7 @@
   (c-name "gtk_text_buffer_get_mark")
   (return-type "GtkTextMark*")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
@@ -24243,7 +24690,7 @@
   (c-name "gtk_text_buffer_move_mark_by_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
     '("const-GtkTextIter*" "where")
   )
 )
@@ -24253,7 +24700,7 @@
   (c-name "gtk_text_buffer_delete_mark_by_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
@@ -24315,7 +24762,7 @@
   (c-name "gtk_text_buffer_apply_tag_by_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
     '("const-GtkTextIter*" "start")
     '("const-GtkTextIter*" "end")
   )
@@ -24326,7 +24773,7 @@
   (c-name "gtk_text_buffer_remove_tag_by_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
     '("const-GtkTextIter*" "start")
     '("const-GtkTextIter*" "end")
   )
@@ -24347,8 +24794,8 @@
   (c-name "gtk_text_buffer_create_tag")
   (return-type "GtkTextTag*")
   (parameters
-    '("const-gchar*" "tag_name")
-    '("const-gchar*" "first_property_name")
+    '("const-char*" "tag_name")
+    '("const-char*" "first_property_name")
   )
   (varargs #t)
 )
@@ -24359,8 +24806,8 @@
   (return-type "none")
   (parameters
     '("GtkTextIter*" "iter")
-    '("gint" "line_number")
-    '("gint" "char_offset")
+    '("int" "line_number")
+    '("int" "char_offset")
   )
 )
 
@@ -24370,8 +24817,8 @@
   (return-type "none")
   (parameters
     '("GtkTextIter*" "iter")
-    '("gint" "line_number")
-    '("gint" "byte_index")
+    '("int" "line_number")
+    '("int" "byte_index")
   )
 )
 
@@ -24381,7 +24828,7 @@
   (return-type "none")
   (parameters
     '("GtkTextIter*" "iter")
-    '("gint" "char_offset")
+    '("int" "char_offset")
   )
 )
 
@@ -24391,7 +24838,7 @@
   (return-type "none")
   (parameters
     '("GtkTextIter*" "iter")
-    '("gint" "line_number")
+    '("int" "line_number")
   )
 )
 
@@ -24747,7 +25194,7 @@
 (define-method get_max_length
   (of-object "GtkText")
   (c-name "gtk_text_get_max_length")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_text_length
@@ -24906,37 +25353,37 @@
 (define-method get_offset
   (of-object "GtkTextIter")
   (c-name "gtk_text_iter_get_offset")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_line
   (of-object "GtkTextIter")
   (c-name "gtk_text_iter_get_line")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_line_offset
   (of-object "GtkTextIter")
   (c-name "gtk_text_iter_get_line_offset")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_line_index
   (of-object "GtkTextIter")
   (c-name "gtk_text_iter_get_line_index")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_visible_line_offset
   (of-object "GtkTextIter")
   (c-name "gtk_text_iter_get_visible_line_offset")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_visible_line_index
   (of-object "GtkTextIter")
   (c-name "gtk_text_iter_get_visible_line_index")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_char
@@ -24948,7 +25395,7 @@
 (define-method get_slice
   (of-object "GtkTextIter")
   (c-name "gtk_text_iter_get_slice")
-  (return-type "gchar*")
+  (return-type "char*")
   (parameters
     '("const-GtkTextIter*" "end")
   )
@@ -24957,7 +25404,7 @@
 (define-method get_text
   (of-object "GtkTextIter")
   (c-name "gtk_text_iter_get_text")
-  (return-type "gchar*")
+  (return-type "char*")
   (parameters
     '("const-GtkTextIter*" "end")
   )
@@ -24966,7 +25413,7 @@
 (define-method get_visible_slice
   (of-object "GtkTextIter")
   (c-name "gtk_text_iter_get_visible_slice")
-  (return-type "gchar*")
+  (return-type "char*")
   (parameters
     '("const-GtkTextIter*" "end")
   )
@@ -24975,7 +25422,7 @@
 (define-method get_visible_text
   (of-object "GtkTextIter")
   (c-name "gtk_text_iter_get_visible_text")
-  (return-type "gchar*")
+  (return-type "char*")
   (parameters
     '("const-GtkTextIter*" "end")
   )
@@ -25125,13 +25572,13 @@
 (define-method get_chars_in_line
   (of-object "GtkTextIter")
   (c-name "gtk_text_iter_get_chars_in_line")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_bytes_in_line
   (of-object "GtkTextIter")
   (c-name "gtk_text_iter_get_bytes_in_line")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_language
@@ -25169,7 +25616,7 @@
   (c-name "gtk_text_iter_forward_chars")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25178,7 +25625,7 @@
   (c-name "gtk_text_iter_backward_chars")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25199,7 +25646,7 @@
   (c-name "gtk_text_iter_forward_lines")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25208,7 +25655,7 @@
   (c-name "gtk_text_iter_backward_lines")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25229,7 +25676,7 @@
   (c-name "gtk_text_iter_forward_word_ends")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25238,7 +25685,7 @@
   (c-name "gtk_text_iter_backward_word_starts")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25259,7 +25706,7 @@
   (c-name "gtk_text_iter_forward_visible_lines")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25268,7 +25715,7 @@
   (c-name "gtk_text_iter_backward_visible_lines")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25289,7 +25736,7 @@
   (c-name "gtk_text_iter_forward_visible_word_ends")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25298,7 +25745,7 @@
   (c-name "gtk_text_iter_backward_visible_word_starts")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25319,7 +25766,7 @@
   (c-name "gtk_text_iter_forward_sentence_ends")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25328,7 +25775,7 @@
   (c-name "gtk_text_iter_backward_sentence_starts")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25349,7 +25796,7 @@
   (c-name "gtk_text_iter_forward_cursor_positions")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25358,7 +25805,7 @@
   (c-name "gtk_text_iter_backward_cursor_positions")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25379,7 +25826,7 @@
   (c-name "gtk_text_iter_forward_visible_cursor_positions")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25388,7 +25835,7 @@
   (c-name "gtk_text_iter_backward_visible_cursor_positions")
   (return-type "gboolean")
   (parameters
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -25397,7 +25844,7 @@
   (c-name "gtk_text_iter_set_offset")
   (return-type "none")
   (parameters
-    '("gint" "char_offset")
+    '("int" "char_offset")
   )
 )
 
@@ -25406,7 +25853,7 @@
   (c-name "gtk_text_iter_set_line")
   (return-type "none")
   (parameters
-    '("gint" "line_number")
+    '("int" "line_number")
   )
 )
 
@@ -25415,7 +25862,7 @@
   (c-name "gtk_text_iter_set_line_offset")
   (return-type "none")
   (parameters
-    '("gint" "char_on_line")
+    '("int" "char_on_line")
   )
 )
 
@@ -25424,7 +25871,7 @@
   (c-name "gtk_text_iter_set_line_index")
   (return-type "none")
   (parameters
-    '("gint" "byte_on_line")
+    '("int" "byte_on_line")
   )
 )
 
@@ -25445,7 +25892,7 @@
   (c-name "gtk_text_iter_set_visible_line_offset")
   (return-type "none")
   (parameters
-    '("gint" "char_on_line")
+    '("int" "char_on_line")
   )
 )
 
@@ -25454,7 +25901,7 @@
   (c-name "gtk_text_iter_set_visible_line_index")
   (return-type "none")
   (parameters
-    '("gint" "byte_on_line")
+    '("int" "byte_on_line")
   )
 )
 
@@ -25503,7 +25950,7 @@
   (c-name "gtk_text_iter_forward_search")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "str")
+    '("const-char*" "str")
     '("GtkTextSearchFlags" "flags")
     '("GtkTextIter*" "match_start")
     '("GtkTextIter*" "match_end")
@@ -25516,7 +25963,7 @@
   (c-name "gtk_text_iter_backward_search")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "str")
+    '("const-char*" "str")
     '("GtkTextSearchFlags" "flags")
     '("GtkTextIter*" "match_start")
     '("GtkTextIter*" "match_end")
@@ -25536,7 +25983,7 @@
 (define-method compare
   (of-object "GtkTextIter")
   (c-name "gtk_text_iter_compare")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("const-GtkTextIter*" "rhs")
   )
@@ -25575,7 +26022,7 @@
   (is-constructor-of "GtkTextMark")
   (return-type "GtkTextMark*")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
     '("gboolean" "left_gravity")
   )
 )
@@ -25598,7 +26045,7 @@
 (define-method get_name
   (of-object "GtkTextMark")
   (c-name "gtk_text_mark_get_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method get_deleted
@@ -25645,14 +26092,14 @@
   (is-constructor-of "GtkTextTag")
   (return-type "GtkTextTag*")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
 (define-method get_priority
   (of-object "GtkTextTag")
   (c-name "gtk_text_tag_get_priority")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_priority
@@ -25660,7 +26107,7 @@
   (c-name "gtk_text_tag_set_priority")
   (return-type "none")
   (parameters
-    '("gint" "priority")
+    '("int" "priority")
   )
 )
 
@@ -25711,7 +26158,7 @@
   (c-name "gtk_text_tag_table_lookup")
   (return-type "GtkTextTag*")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
@@ -25728,7 +26175,7 @@
 (define-method get_size
   (of-object "GtkTextTagTable")
   (c-name "gtk_text_tag_table_get_size")
-  (return-type "gint")
+  (return-type "int")
 )
 
 
@@ -25737,14 +26184,14 @@
 
 (define-function gtk_text_unknown_char_utf8_gtk_tests_only
   (c-name "gtk_text_unknown_char_utf8_gtk_tests_only")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-function gtk_text_byte_begins_utf8_char
   (c-name "gtk_text_byte_begins_utf8_char")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "byte")
+    '("const-char*" "byte")
   )
 )
 
@@ -25757,7 +26204,7 @@
   (return-type "GdkPaintable*")
   (parameters
     '("GtkWidget*" "widget")
-    '("gchar*" "text")
+    '("char*" "text")
     '("gssize" "len")
   )
 )
@@ -25817,10 +26264,10 @@
   (return-type "gboolean")
   (parameters
     '("GtkTextIter*" "iter")
-    '("gdouble" "within_margin")
+    '("double" "within_margin")
     '("gboolean" "use_align")
-    '("gdouble" "xalign")
-    '("gdouble" "yalign")
+    '("double" "xalign")
+    '("double" "yalign")
   )
 )
 
@@ -25830,10 +26277,10 @@
   (return-type "none")
   (parameters
     '("GtkTextMark*" "mark")
-    '("gdouble" "within_margin")
+    '("double" "within_margin")
     '("gboolean" "use_align")
-    '("gdouble" "xalign")
-    '("gdouble" "yalign")
+    '("double" "xalign")
+    '("double" "yalign")
   )
 )
 
@@ -25918,8 +26365,8 @@
   (return-type "gboolean")
   (parameters
     '("GtkTextIter*" "iter")
-    '("gint" "x")
-    '("gint" "y")
+    '("int" "x")
+    '("int" "y")
   )
 )
 
@@ -25929,9 +26376,9 @@
   (return-type "gboolean")
   (parameters
     '("GtkTextIter*" "iter")
-    '("gint*" "trailing")
-    '("gint" "x")
-    '("gint" "y")
+    '("int*" "trailing")
+    '("int" "x")
+    '("int" "y")
   )
 )
 
@@ -25941,8 +26388,8 @@
   (return-type "none")
   (parameters
     '("const-GtkTextIter*" "iter")
-    '("gint*" "y")
-    '("gint*" "height")
+    '("int*" "y")
+    '("int*" "height")
   )
 )
 
@@ -25952,8 +26399,8 @@
   (return-type "none")
   (parameters
     '("GtkTextIter*" "target_iter")
-    '("gint" "y")
-    '("gint*" "line_top")
+    '("int" "y")
+    '("int*" "line_top")
   )
 )
 
@@ -25963,10 +26410,10 @@
   (return-type "none")
   (parameters
     '("GtkTextWindowType" "win")
-    '("gint" "buffer_x")
-    '("gint" "buffer_y")
-    '("gint*" "window_x")
-    '("gint*" "window_y")
+    '("int" "buffer_x")
+    '("int" "buffer_y")
+    '("int*" "window_x")
+    '("int*" "window_y")
   )
 )
 
@@ -25976,10 +26423,10 @@
   (return-type "none")
   (parameters
     '("GtkTextWindowType" "win")
-    '("gint" "window_x")
-    '("gint" "window_y")
-    '("gint*" "buffer_x")
-    '("gint*" "buffer_y")
+    '("int" "window_x")
+    '("int" "window_y")
+    '("int*" "buffer_x")
+    '("int*" "buffer_y")
   )
 )
 
@@ -26034,7 +26481,7 @@
   (return-type "gboolean")
   (parameters
     '("GtkTextIter*" "iter")
-    '("gint" "count")
+    '("int" "count")
   )
 )
 
@@ -26088,8 +26535,8 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "child")
-    '("gint" "xpos")
-    '("gint" "ypos")
+    '("int" "xpos")
+    '("int" "ypos")
   )
 )
 
@@ -26099,8 +26546,8 @@
   (return-type "none")
   (parameters
     '("GtkWidget*" "child")
-    '("gint" "xpos")
-    '("gint" "ypos")
+    '("int" "xpos")
+    '("int" "ypos")
   )
 )
 
@@ -26178,14 +26625,14 @@
   (c-name "gtk_text_view_set_pixels_above_lines")
   (return-type "none")
   (parameters
-    '("gint" "pixels_above_lines")
+    '("int" "pixels_above_lines")
   )
 )
 
 (define-method get_pixels_above_lines
   (of-object "GtkTextView")
   (c-name "gtk_text_view_get_pixels_above_lines")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_pixels_below_lines
@@ -26193,14 +26640,14 @@
   (c-name "gtk_text_view_set_pixels_below_lines")
   (return-type "none")
   (parameters
-    '("gint" "pixels_below_lines")
+    '("int" "pixels_below_lines")
   )
 )
 
 (define-method get_pixels_below_lines
   (of-object "GtkTextView")
   (c-name "gtk_text_view_get_pixels_below_lines")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_pixels_inside_wrap
@@ -26208,14 +26655,14 @@
   (c-name "gtk_text_view_set_pixels_inside_wrap")
   (return-type "none")
   (parameters
-    '("gint" "pixels_inside_wrap")
+    '("int" "pixels_inside_wrap")
   )
 )
 
 (define-method get_pixels_inside_wrap
   (of-object "GtkTextView")
   (c-name "gtk_text_view_get_pixels_inside_wrap")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_justification
@@ -26238,14 +26685,14 @@
   (c-name "gtk_text_view_set_left_margin")
   (return-type "none")
   (parameters
-    '("gint" "left_margin")
+    '("int" "left_margin")
   )
 )
 
 (define-method get_left_margin
   (of-object "GtkTextView")
   (c-name "gtk_text_view_get_left_margin")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_right_margin
@@ -26253,14 +26700,14 @@
   (c-name "gtk_text_view_set_right_margin")
   (return-type "none")
   (parameters
-    '("gint" "right_margin")
+    '("int" "right_margin")
   )
 )
 
 (define-method get_right_margin
   (of-object "GtkTextView")
   (c-name "gtk_text_view_get_right_margin")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_top_margin
@@ -26268,14 +26715,14 @@
   (c-name "gtk_text_view_set_top_margin")
   (return-type "none")
   (parameters
-    '("gint" "top_margin")
+    '("int" "top_margin")
   )
 )
 
 (define-method get_top_margin
   (of-object "GtkTextView")
   (c-name "gtk_text_view_get_top_margin")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_bottom_margin
@@ -26283,14 +26730,14 @@
   (c-name "gtk_text_view_set_bottom_margin")
   (return-type "none")
   (parameters
-    '("gint" "bottom_margin")
+    '("int" "bottom_margin")
   )
 )
 
 (define-method get_bottom_margin
   (of-object "GtkTextView")
   (c-name "gtk_text_view_get_bottom_margin")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_indent
@@ -26298,14 +26745,14 @@
   (c-name "gtk_text_view_set_indent")
   (return-type "none")
   (parameters
-    '("gint" "indent")
+    '("int" "indent")
   )
 )
 
 (define-method get_indent
   (of-object "GtkTextView")
   (c-name "gtk_text_view_get_indent")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_tabs
@@ -26402,7 +26849,7 @@
   (c-name "gtk_toggle_button_new_with_label")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
@@ -26410,7 +26857,7 @@
   (c-name "gtk_toggle_button_new_with_mnemonic")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "label")
+    '("const-char*" "label")
   )
 )
 
@@ -26449,7 +26896,7 @@
   (c-name "gtk_tooltip_set_markup")
   (return-type "none")
   (parameters
-    '("const-gchar*" "markup")
+    '("const-char*" "markup")
   )
 )
 
@@ -26458,7 +26905,7 @@
   (c-name "gtk_tooltip_set_text")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
+    '("const-char*" "text")
   )
 )
 
@@ -26476,7 +26923,7 @@
   (c-name "gtk_tooltip_set_icon_from_icon_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "icon_name")
+    '("const-char*" "icon_name")
   )
 )
 
@@ -26655,8 +27102,8 @@
   (is-constructor-of "GtkTreeListModel")
   (return-type "GtkTreeListModel*")
   (parameters
-    '("gboolean" "passthrough")
     '("GListModel*" "root")
+    '("gboolean" "passthrough")
     '("gboolean" "autoexpand")
     '("GtkTreeListModelCreateModelFunc" "create_func")
     '("gpointer" "user_data")
@@ -26831,7 +27278,7 @@
   (c-name "gtk_tree_model_filter_set_modify_func")
   (return-type "none")
   (parameters
-    '("gint" "n_columns")
+    '("int" "n_columns")
     '("GType*" "types")
     '("GtkTreeModelFilterModifyFunc" "func")
     '("gpointer" "data")
@@ -26844,7 +27291,7 @@
   (c-name "gtk_tree_model_filter_set_visible_column")
   (return-type "none")
   (parameters
-    '("gint" "column")
+    '("int" "column")
   )
 )
 
@@ -26918,7 +27365,7 @@
   (c-name "gtk_tree_path_new_from_string")
   (return-type "GtkTreePath*")
   (parameters
-    '("const-gchar*" "path")
+    '("const-char*" "path")
   )
 )
 
@@ -26926,7 +27373,7 @@
   (c-name "gtk_tree_path_new_from_indices")
   (return-type "GtkTreePath*")
   (parameters
-    '("gint" "first_index")
+    '("int" "first_index")
   )
   (varargs #t)
 )
@@ -26935,7 +27382,7 @@
   (c-name "gtk_tree_path_new_from_indicesv")
   (return-type "GtkTreePath*")
   (parameters
-    '("gint*" "indices")
+    '("int*" "indices")
     '("gsize" "length")
   )
 )
@@ -26943,7 +27390,7 @@
 (define-method to_string
   (of-object "GtkTreePath")
   (c-name "gtk_tree_path_to_string")
-  (return-type "gchar*")
+  (return-type "char*")
 )
 
 (define-function gtk_tree_path_new_first
@@ -26956,7 +27403,7 @@
   (c-name "gtk_tree_path_append_index")
   (return-type "none")
   (parameters
-    '("gint" "index_")
+    '("int" "index_")
   )
 )
 
@@ -26965,28 +27412,28 @@
   (c-name "gtk_tree_path_prepend_index")
   (return-type "none")
   (parameters
-    '("gint" "index_")
+    '("int" "index_")
   )
 )
 
 (define-method get_depth
   (of-object "GtkTreePath")
   (c-name "gtk_tree_path_get_depth")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_indices
   (of-object "GtkTreePath")
   (c-name "gtk_tree_path_get_indices")
-  (return-type "gint*")
+  (return-type "int*")
 )
 
 (define-method get_indices_with_depth
   (of-object "GtkTreePath")
   (c-name "gtk_tree_path_get_indices_with_depth")
-  (return-type "gint*")
+  (return-type "int*")
   (parameters
-    '("gint*" "depth")
+    '("int*" "depth")
   )
 )
 
@@ -27010,7 +27457,7 @@
 (define-method compare
   (of-object "GtkTreePath")
   (c-name "gtk_tree_path_compare")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("const-GtkTreePath*" "b")
   )
@@ -27138,7 +27585,7 @@
     '("GObject*" "proxy")
     '("GtkTreePath*" "path")
     '("GtkTreeIter*" "iter")
-    '("gint*" "new_order")
+    '("int*" "new_order")
   )
 )
 
@@ -27173,7 +27620,7 @@
 (define-method get_n_columns
   (of-object "GtkTreeModel")
   (c-name "gtk_tree_model_get_n_columns")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_column_type
@@ -27181,7 +27628,7 @@
   (c-name "gtk_tree_model_get_column_type")
   (return-type "GType")
   (parameters
-    '("gint" "index_")
+    '("int" "index_")
   )
 )
 
@@ -27201,14 +27648,14 @@
   (return-type "gboolean")
   (parameters
     '("GtkTreeIter*" "iter")
-    '("const-gchar*" "path_string")
+    '("const-char*" "path_string")
   )
 )
 
 (define-method get_string_from_iter
   (of-object "GtkTreeModel")
   (c-name "gtk_tree_model_get_string_from_iter")
-  (return-type "gchar*")
+  (return-type "char*")
   (parameters
     '("GtkTreeIter*" "iter")
   )
@@ -27238,7 +27685,7 @@
   (return-type "none")
   (parameters
     '("GtkTreeIter*" "iter")
-    '("gint" "column")
+    '("int" "column")
     '("GValue*" "value")
   )
 )
@@ -27283,7 +27730,7 @@
 (define-method iter_n_children
   (of-object "GtkTreeModel")
   (c-name "gtk_tree_model_iter_n_children")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkTreeIter*" "iter")
   )
@@ -27296,7 +27743,7 @@
   (parameters
     '("GtkTreeIter*" "iter")
     '("GtkTreeIter*" "parent")
-    '("gint" "n")
+    '("int" "n")
   )
 )
 
@@ -27404,7 +27851,7 @@
   (parameters
     '("GtkTreePath*" "path")
     '("GtkTreeIter*" "iter")
-    '("gint*" "new_order")
+    '("int*" "new_order")
   )
 )
 
@@ -27415,8 +27862,8 @@
   (parameters
     '("GtkTreePath*" "path")
     '("GtkTreeIter*" "iter")
-    '("gint*" "new_order")
-    '("gint" "length")
+    '("int*" "new_order")
+    '("int" "length")
   )
 )
 
@@ -27575,7 +28022,7 @@
 (define-method count_selected_rows
   (of-object "GtkTreeSelection")
   (c-name "gtk_tree_selection_count_selected_rows")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method selected_foreach
@@ -27694,7 +28141,7 @@
   (c-name "gtk_tree_sortable_get_sort_column_id")
   (return-type "gboolean")
   (parameters
-    '("gint*" "sort_column_id")
+    '("int*" "sort_column_id")
     '("GtkSortType*" "order")
   )
 )
@@ -27704,7 +28151,7 @@
   (c-name "gtk_tree_sortable_set_sort_column_id")
   (return-type "none")
   (parameters
-    '("gint" "sort_column_id")
+    '("int" "sort_column_id")
     '("GtkSortType" "order")
   )
 )
@@ -27714,7 +28161,7 @@
   (c-name "gtk_tree_sortable_set_sort_func")
   (return-type "none")
   (parameters
-    '("gint" "sort_column_id")
+    '("int" "sort_column_id")
     '("GtkTreeIterCompareFunc" "sort_func")
     '("gpointer" "user_data")
     '("GDestroyNotify" "destroy")
@@ -27752,7 +28199,7 @@
   (is-constructor-of "GtkTreeStore")
   (return-type "GtkTreeStore*")
   (parameters
-    '("gint" "n_columns")
+    '("int" "n_columns")
   )
   (varargs #t)
 )
@@ -27761,7 +28208,7 @@
   (c-name "gtk_tree_store_newv")
   (return-type "GtkTreeStore*")
   (parameters
-    '("gint" "n_columns")
+    '("int" "n_columns")
     '("GType*" "types")
   )
 )
@@ -27771,7 +28218,7 @@
   (c-name "gtk_tree_store_set_column_types")
   (return-type "none")
   (parameters
-    '("gint" "n_columns")
+    '("int" "n_columns")
     '("GType*" "types")
   )
 )
@@ -27782,7 +28229,7 @@
   (return-type "none")
   (parameters
     '("GtkTreeIter*" "iter")
-    '("gint" "column")
+    '("int" "column")
     '("GValue*" "value")
   )
 )
@@ -27803,9 +28250,9 @@
   (return-type "none")
   (parameters
     '("GtkTreeIter*" "iter")
-    '("gint*" "columns")
+    '("int*" "columns")
     '("GValue*" "values")
-    '("gint" "n_values")
+    '("int" "n_values")
   )
 )
 
@@ -27835,7 +28282,7 @@
   (parameters
     '("GtkTreeIter*" "iter")
     '("GtkTreeIter*" "parent")
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
@@ -27868,7 +28315,7 @@
   (parameters
     '("GtkTreeIter*" "iter")
     '("GtkTreeIter*" "parent")
-    '("gint" "position")
+    '("int" "position")
   )
   (varargs #t)
 )
@@ -27880,10 +28327,10 @@
   (parameters
     '("GtkTreeIter*" "iter")
     '("GtkTreeIter*" "parent")
-    '("gint" "position")
-    '("gint*" "columns")
+    '("int" "position")
+    '("int*" "columns")
     '("GValue*" "values")
-    '("gint" "n_values")
+    '("int" "n_values")
   )
 )
 
@@ -27920,7 +28367,7 @@
 (define-method iter_depth
   (of-object "GtkTreeStore")
   (c-name "gtk_tree_store_iter_depth")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkTreeIter*" "iter")
   )
@@ -27947,7 +28394,7 @@
   (return-type "none")
   (parameters
     '("GtkTreeIter*" "parent")
-    '("gint*" "new_order")
+    '("int*" "new_order")
   )
 )
 
@@ -28008,7 +28455,7 @@
   (c-name "gtk_tree_view_column_new_with_attributes")
   (return-type "GtkTreeViewColumn*")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
     '("GtkCellRenderer*" "cell")
   )
   (varargs #t)
@@ -28046,8 +28493,8 @@
   (return-type "none")
   (parameters
     '("GtkCellRenderer*" "cell_renderer")
-    '("const-gchar*" "attribute")
-    '("gint" "column")
+    '("const-char*" "attribute")
+    '("int" "column")
   )
 )
 
@@ -28087,14 +28534,14 @@
   (c-name "gtk_tree_view_column_set_spacing")
   (return-type "none")
   (parameters
-    '("gint" "spacing")
+    '("int" "spacing")
   )
 )
 
 (define-method get_spacing
   (of-object "GtkTreeViewColumn")
   (c-name "gtk_tree_view_column_get_spacing")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_visible
@@ -28145,19 +28592,19 @@
 (define-method get_x_offset
   (of-object "GtkTreeViewColumn")
   (c-name "gtk_tree_view_column_get_x_offset")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_width
   (of-object "GtkTreeViewColumn")
   (c-name "gtk_tree_view_column_get_width")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_fixed_width
   (of-object "GtkTreeViewColumn")
   (c-name "gtk_tree_view_column_get_fixed_width")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_fixed_width
@@ -28165,7 +28612,7 @@
   (c-name "gtk_tree_view_column_set_fixed_width")
   (return-type "none")
   (parameters
-    '("gint" "fixed_width")
+    '("int" "fixed_width")
   )
 )
 
@@ -28174,14 +28621,14 @@
   (c-name "gtk_tree_view_column_set_min_width")
   (return-type "none")
   (parameters
-    '("gint" "min_width")
+    '("int" "min_width")
   )
 )
 
 (define-method get_min_width
   (of-object "GtkTreeViewColumn")
   (c-name "gtk_tree_view_column_get_min_width")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_max_width
@@ -28189,14 +28636,14 @@
   (c-name "gtk_tree_view_column_set_max_width")
   (return-type "none")
   (parameters
-    '("gint" "max_width")
+    '("int" "max_width")
   )
 )
 
 (define-method get_max_width
   (of-object "GtkTreeViewColumn")
   (c-name "gtk_tree_view_column_get_max_width")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method clicked
@@ -28210,14 +28657,14 @@
   (c-name "gtk_tree_view_column_set_title")
   (return-type "none")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
   )
 )
 
 (define-method get_title
   (of-object "GtkTreeViewColumn")
   (c-name "gtk_tree_view_column_get_title")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_expand
@@ -28270,14 +28717,14 @@
   (c-name "gtk_tree_view_column_set_alignment")
   (return-type "none")
   (parameters
-    '("gfloat" "xalign")
+    '("float" "xalign")
   )
 )
 
 (define-method get_alignment
   (of-object "GtkTreeViewColumn")
   (c-name "gtk_tree_view_column_get_alignment")
-  (return-type "gfloat")
+  (return-type "float")
 )
 
 (define-method set_reorderable
@@ -28300,14 +28747,14 @@
   (c-name "gtk_tree_view_column_set_sort_column_id")
   (return-type "none")
   (parameters
-    '("gint" "sort_column_id")
+    '("int" "sort_column_id")
   )
 )
 
 (define-method get_sort_column_id
   (of-object "GtkTreeViewColumn")
   (c-name "gtk_tree_view_column_get_sort_column_id")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_sort_indicator
@@ -28385,8 +28832,8 @@
   (return-type "gboolean")
   (parameters
     '("GtkCellRenderer*" "cell_renderer")
-    '("gint*" "x_offset")
-    '("gint*" "width")
+    '("int*" "x_offset")
+    '("int*" "width")
   )
 )
 
@@ -28506,7 +28953,7 @@
 (define-method append_column
   (of-object "GtkTreeView")
   (c-name "gtk_tree_view_append_column")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkTreeViewColumn*" "column")
   )
@@ -28515,7 +28962,7 @@
 (define-method remove_column
   (of-object "GtkTreeView")
   (c-name "gtk_tree_view_remove_column")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkTreeViewColumn*" "column")
   )
@@ -28524,20 +28971,20 @@
 (define-method insert_column
   (of-object "GtkTreeView")
   (c-name "gtk_tree_view_insert_column")
-  (return-type "gint")
+  (return-type "int")
   (parameters
     '("GtkTreeViewColumn*" "column")
-    '("gint" "position")
+    '("int" "position")
   )
 )
 
 (define-method insert_column_with_attributes
   (of-object "GtkTreeView")
   (c-name "gtk_tree_view_insert_column_with_attributes")
-  (return-type "gint")
+  (return-type "int")
   (parameters
-    '("gint" "position")
-    '("const-gchar*" "title")
+    '("int" "position")
+    '("const-char*" "title")
     '("GtkCellRenderer*" "cell")
   )
   (varargs #t)
@@ -28546,10 +28993,10 @@
 (define-method insert_column_with_data_func
   (of-object "GtkTreeView")
   (c-name "gtk_tree_view_insert_column_with_data_func")
-  (return-type "gint")
+  (return-type "int")
   (parameters
-    '("gint" "position")
-    '("const-gchar*" "title")
+    '("int" "position")
+    '("const-char*" "title")
     '("GtkCellRenderer*" "cell")
     '("GtkTreeCellDataFunc" "func")
     '("gpointer" "data")
@@ -28568,7 +29015,7 @@
   (c-name "gtk_tree_view_get_column")
   (return-type "GtkTreeViewColumn*")
   (parameters
-    '("gint" "n")
+    '("int" "n")
   )
 )
 
@@ -28619,8 +29066,8 @@
   (c-name "gtk_tree_view_scroll_to_point")
   (return-type "none")
   (parameters
-    '("gint" "tree_x")
-    '("gint" "tree_y")
+    '("int" "tree_x")
+    '("int" "tree_y")
   )
 )
 
@@ -28632,8 +29079,8 @@
     '("GtkTreePath*" "path")
     '("GtkTreeViewColumn*" "column")
     '("gboolean" "use_align")
-    '("gfloat" "row_align")
-    '("gfloat" "col_align")
+    '("float" "row_align")
+    '("float" "col_align")
   )
 )
 
@@ -28759,12 +29206,12 @@
   (c-name "gtk_tree_view_get_path_at_pos")
   (return-type "gboolean")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("int" "x")
+    '("int" "y")
     '("GtkTreePath**" "path")
     '("GtkTreeViewColumn**" "column")
-    '("gint*" "cell_x")
-    '("gint*" "cell_y")
+    '("int*" "cell_x")
+    '("int*" "cell_y")
   )
 )
 
@@ -28814,12 +29261,12 @@
   (c-name "gtk_tree_view_is_blank_at_pos")
   (return-type "gboolean")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("int" "x")
+    '("int" "y")
     '("GtkTreePath**" "path")
     '("GtkTreeViewColumn**" "column")
-    '("gint*" "cell_x")
-    '("gint*" "cell_y")
+    '("int*" "cell_x")
+    '("int*" "cell_y")
   )
 )
 
@@ -28881,8 +29328,8 @@
   (c-name "gtk_tree_view_get_dest_row_at_pos")
   (return-type "gboolean")
   (parameters
-    '("gint" "drag_x")
-    '("gint" "drag_y")
+    '("int" "drag_x")
+    '("int" "drag_y")
     '("GtkTreePath**" "path")
     '("GtkTreeViewDropPosition*" "pos")
   )
@@ -28915,7 +29362,7 @@
 (define-method get_search_column
   (of-object "GtkTreeView")
   (c-name "gtk_tree_view_get_search_column")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_search_column
@@ -28923,7 +29370,7 @@
   (c-name "gtk_tree_view_set_search_column")
   (return-type "none")
   (parameters
-    '("gint" "column")
+    '("int" "column")
   )
 )
 
@@ -28964,10 +29411,10 @@
   (c-name "gtk_tree_view_convert_widget_to_tree_coords")
   (return-type "none")
   (parameters
-    '("gint" "wx")
-    '("gint" "wy")
-    '("gint*" "tx")
-    '("gint*" "ty")
+    '("int" "wx")
+    '("int" "wy")
+    '("int*" "tx")
+    '("int*" "ty")
   )
 )
 
@@ -28976,10 +29423,10 @@
   (c-name "gtk_tree_view_convert_tree_to_widget_coords")
   (return-type "none")
   (parameters
-    '("gint" "tx")
-    '("gint" "ty")
-    '("gint*" "wx")
-    '("gint*" "wy")
+    '("int" "tx")
+    '("int" "ty")
+    '("int*" "wx")
+    '("int*" "wy")
   )
 )
 
@@ -28988,10 +29435,10 @@
   (c-name "gtk_tree_view_convert_widget_to_bin_window_coords")
   (return-type "none")
   (parameters
-    '("gint" "wx")
-    '("gint" "wy")
-    '("gint*" "bx")
-    '("gint*" "by")
+    '("int" "wx")
+    '("int" "wy")
+    '("int*" "bx")
+    '("int*" "by")
   )
 )
 
@@ -29000,10 +29447,10 @@
   (c-name "gtk_tree_view_convert_bin_window_to_widget_coords")
   (return-type "none")
   (parameters
-    '("gint" "bx")
-    '("gint" "by")
-    '("gint*" "wx")
-    '("gint*" "wy")
+    '("int" "bx")
+    '("int" "by")
+    '("int*" "wx")
+    '("int*" "wy")
   )
 )
 
@@ -29012,10 +29459,10 @@
   (c-name "gtk_tree_view_convert_tree_to_bin_window_coords")
   (return-type "none")
   (parameters
-    '("gint" "tx")
-    '("gint" "ty")
-    '("gint*" "bx")
-    '("gint*" "by")
+    '("int" "tx")
+    '("int" "ty")
+    '("int*" "bx")
+    '("int*" "by")
   )
 )
 
@@ -29024,10 +29471,10 @@
   (c-name "gtk_tree_view_convert_bin_window_to_tree_coords")
   (return-type "none")
   (parameters
-    '("gint" "bx")
-    '("gint" "by")
-    '("gint*" "tx")
-    '("gint*" "ty")
+    '("int" "bx")
+    '("int" "by")
+    '("int*" "tx")
+    '("int*" "ty")
   )
 )
 
@@ -29164,14 +29611,14 @@
   (c-name "gtk_tree_view_set_level_indentation")
   (return-type "none")
   (parameters
-    '("gint" "indentation")
+    '("int" "indentation")
   )
 )
 
 (define-method get_level_indentation
   (of-object "GtkTreeView")
   (c-name "gtk_tree_view_get_level_indentation")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_tooltip_row
@@ -29201,8 +29648,8 @@
   (c-name "gtk_tree_view_get_tooltip_context")
   (return-type "gboolean")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
+    '("int*" "x")
+    '("int*" "y")
     '("gboolean" "keyboard_tip")
     '("GtkTreeModel**" "model")
     '("GtkTreePath**" "path")
@@ -29215,14 +29662,14 @@
   (c-name "gtk_tree_view_set_tooltip_column")
   (return-type "none")
   (parameters
-    '("gint" "column")
+    '("int" "column")
   )
 )
 
 (define-method get_tooltip_column
   (of-object "GtkTreeView")
   (c-name "gtk_tree_view_get_tooltip_column")
-  (return-type "gint")
+  (return-type "int")
 )
 
 
@@ -29436,7 +29883,7 @@
   (return-type "GtkWidget*")
   (parameters
     '("GType" "type")
-    '("const-gchar*" "first_property_name")
+    '("const-char*" "first_property_name")
   )
   (varargs #t)
 )
@@ -29597,7 +30044,7 @@
     '("guint" "keyval")
     '("GdkModifierType" "mods")
     '("GtkShortcutFunc" "callback")
-    '("const-gchar*" "format_string")
+    '("const-char*" "format_string")
   )
   (varargs #t)
 )
@@ -29609,8 +30056,8 @@
   (parameters
     '("guint" "keyval")
     '("GdkModifierType" "mods")
-    '("const-gchar*" "signal")
-    '("const-gchar*" "format_string")
+    '("const-char*" "signal")
+    '("const-char*" "format_string")
   )
   (varargs #t)
 )
@@ -29622,8 +30069,8 @@
   (parameters
     '("guint" "keyval")
     '("GdkModifierType" "mods")
-    '("const-gchar*" "action_name")
-    '("const-gchar*" "format_string")
+    '("const-char*" "action_name")
+    '("const-char*" "format_string")
   )
   (varargs #t)
 )
@@ -29762,14 +30209,14 @@
   (c-name "gtk_widget_set_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
 (define-method get_name
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_state_flags
@@ -30007,8 +30454,8 @@
   (c-name "gtk_widget_set_size_request")
   (return-type "none")
   (parameters
-    '("gint" "width")
-    '("gint" "height")
+    '("int" "width")
+    '("int" "height")
   )
 )
 
@@ -30017,8 +30464,8 @@
   (c-name "gtk_widget_get_size_request")
   (return-type "none")
   (parameters
-    '("gint*" "width")
-    '("gint*" "height")
+    '("int*" "width")
+    '("int*" "height")
   )
 )
 
@@ -30064,7 +30511,7 @@
 (define-method get_scale_factor
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_scale_factor")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method get_display
@@ -30160,30 +30607,6 @@
   )
 )
 
-(define-method set_accessible_type
-  (of-object "GtkWidgetClass")
-  (c-name "gtk_widget_class_set_accessible_type")
-  (return-type "none")
-  (parameters
-    '("GType" "type")
-  )
-)
-
-(define-method set_accessible_role
-  (of-object "GtkWidgetClass")
-  (c-name "gtk_widget_class_set_accessible_role")
-  (return-type "none")
-  (parameters
-    '("AtkRole" "role")
-  )
-)
-
-(define-method get_accessible
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_get_accessible")
-  (return-type "AtkObject*")
-)
-
 (define-method get_halign
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_halign")
@@ -30217,7 +30640,7 @@
 (define-method get_margin_start
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_margin_start")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_margin_start
@@ -30225,14 +30648,14 @@
   (c-name "gtk_widget_set_margin_start")
   (return-type "none")
   (parameters
-    '("gint" "margin")
+    '("int" "margin")
   )
 )
 
 (define-method get_margin_end
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_margin_end")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_margin_end
@@ -30240,14 +30663,14 @@
   (c-name "gtk_widget_set_margin_end")
   (return-type "none")
   (parameters
-    '("gint" "margin")
+    '("int" "margin")
   )
 )
 
 (define-method get_margin_top
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_margin_top")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_margin_top
@@ -30255,14 +30678,14 @@
   (c-name "gtk_widget_set_margin_top")
   (return-type "none")
   (parameters
-    '("gint" "margin")
+    '("int" "margin")
   )
 )
 
 (define-method get_margin_bottom
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_margin_bottom")
-  (return-type "gint")
+  (return-type "int")
 )
 
 (define-method set_margin_bottom
@@ -30270,7 +30693,7 @@
   (c-name "gtk_widget_set_margin_bottom")
   (return-type "none")
   (parameters
-    '("gint" "margin")
+    '("int" "margin")
   )
 )
 
@@ -30301,8 +30724,8 @@
   (c-name "gtk_widget_contains")
   (return-type "gboolean")
   (parameters
-    '("gdouble" "x")
-    '("gdouble" "y")
+    '("double" "x")
+    '("double" "y")
   )
 )
 
@@ -30311,8 +30734,8 @@
   (c-name "gtk_widget_pick")
   (return-type "GtkWidget*")
   (parameters
-    '("gdouble" "x")
-    '("gdouble" "y")
+    '("double" "x")
+    '("double" "y")
     '("GtkPickFlags" "flags")
   )
 )
@@ -30367,7 +30790,7 @@
   (c-name "gtk_widget_create_pango_layout")
   (return-type "PangoLayout*")
   (parameters
-    '("const-gchar*" "text")
+    '("const-char*" "text")
   )
 )
 
@@ -30580,7 +31003,7 @@
   (return-type "GObject*")
   (parameters
     '("GType" "widget_type")
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
@@ -30598,7 +31021,7 @@
   (c-name "gtk_widget_class_set_template_from_resource")
   (return-type "none")
   (parameters
-    '("const-gchar*" "resource_name")
+    '("const-char*" "resource_name")
   )
 )
 
@@ -30607,7 +31030,7 @@
   (c-name "gtk_widget_class_bind_template_callback_full")
   (return-type "none")
   (parameters
-    '("const-gchar*" "callback_name")
+    '("const-char*" "callback_name")
     '("GCallback" "callback_symbol")
   )
 )
@@ -30626,7 +31049,7 @@
   (c-name "gtk_widget_class_bind_template_child_full")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
     '("gboolean" "internal_child")
     '("gssize" "struct_offset")
   )
@@ -30637,7 +31060,7 @@
   (c-name "gtk_widget_insert_action_group")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
     '("GActionGroup*" "group")
   )
 )
@@ -30863,6 +31286,21 @@
   )
 )
 
+(define-method set_accessible_role
+  (of-object "GtkWidgetClass")
+  (c-name "gtk_widget_class_set_accessible_role")
+  (return-type "none")
+  (parameters
+    '("GtkAccessibleRole" "accessible_role")
+  )
+)
+
+(define-method get_accessible_role
+  (of-object "GtkWidgetClass")
+  (c-name "gtk_widget_class_get_accessible_role")
+  (return-type "GtkAccessibleRole")
+)
+
 
 
 ;; From gtkwidgetpaintable.h
@@ -30996,14 +31434,14 @@
   (c-name "gtk_window_set_title")
   (return-type "none")
   (parameters
-    '("const-gchar*" "title")
+    '("const-char*" "title")
   )
 )
 
 (define-method get_title
   (of-object "GtkWindow")
   (c-name "gtk_window_get_title")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-method set_startup_id
@@ -31011,7 +31449,7 @@
   (c-name "gtk_window_set_startup_id")
   (return-type "none")
   (parameters
-    '("const-gchar*" "startup_id")
+    '("const-char*" "startup_id")
   )
 )
 
@@ -31185,27 +31623,27 @@
   (c-name "gtk_window_set_icon_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
 (define-method get_icon_name
   (of-object "GtkWindow")
   (c-name "gtk_window_get_icon_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-function gtk_window_set_default_icon_name
   (c-name "gtk_window_set_default_icon_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-char*" "name")
   )
 )
 
 (define-function gtk_window_get_default_icon_name
   (c-name "gtk_window_get_default_icon_name")
-  (return-type "const-gchar*")
+  (return-type "const-char*")
 )
 
 (define-function gtk_window_set_auto_startup_notification
@@ -31312,8 +31750,8 @@
   (c-name "gtk_window_set_default_size")
   (return-type "none")
   (parameters
-    '("gint" "width")
-    '("gint" "height")
+    '("int" "width")
+    '("int" "height")
   )
 )
 
@@ -31322,8 +31760,8 @@
   (c-name "gtk_window_get_default_size")
   (return-type "none")
   (parameters
-    '("gint*" "width")
-    '("gint*" "height")
+    '("int*" "width")
+    '("int*" "height")
   )
 )
 
@@ -31332,8 +31770,8 @@
   (c-name "gtk_window_resize")
   (return-type "none")
   (parameters
-    '("gint" "width")
-    '("gint" "height")
+    '("int" "width")
+    '("int" "height")
   )
 )
 
@@ -31342,8 +31780,8 @@
   (c-name "gtk_window_get_size")
   (return-type "none")
   (parameters
-    '("gint*" "width")
-    '("gint*" "height")
+    '("int*" "width")
+    '("int*" "height")
   )
 )
 
@@ -31886,6 +32324,46 @@
   (return-type "GType")
 )
 
+(define-function gtk_accessible_role_get_type
+  (c-name "gtk_accessible_role_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_accessible_state_get_type
+  (c-name "gtk_accessible_state_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_accessible_property_get_type
+  (c-name "gtk_accessible_property_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_accessible_relation_get_type
+  (c-name "gtk_accessible_relation_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_accessible_tristate_get_type
+  (c-name "gtk_accessible_tristate_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_accessible_invalid_state_get_type
+  (c-name "gtk_accessible_invalid_state_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_accessible_autocomplete_get_type
+  (c-name "gtk_accessible_autocomplete_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_accessible_sort_get_type
+  (c-name "gtk_accessible_sort_get_type")
+  (return-type "GType")
+)
+
 (define-function gtk_event_controller_scroll_flags_get_type
   (c-name "gtk_event_controller_scroll_flags_get_type")
   (return-type "GType")
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index 6a0bc43c3..ed916ed2b 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -6445,15 +6445,6 @@
   (construct-only #f)
 )
 
-(define-property align-widget
-  (of-object "GtkMenuButton")
-  (prop-type "GParamObject")
-  (docs "The parent widget which the menu should align with.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property direction
   (of-object "GtkMenuButton")
   (prop-type "GParamEnum")
@@ -8541,6 +8532,15 @@
   (construct-only #f)
 )
 
+(define-property key-capture-widget
+  (of-object "GtkSearchBar")
+  (prop-type "GParamObject")
+  (docs "Key Capture Widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkSearchEntry
 
 (define-signal activate


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