[gtkmm/use-dllexport: 28/60] Gdk, Gtk: Regenerate docs.xml and .defs files



commit 6d05cfba48d4a6a590c3eb9b58a399c036e84a71
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Sat Apr 25 09:30:42 2020 +0200

    Gdk, Gtk: Regenerate docs.xml and .defs files
    
    and update these files:
    * gtk/src/gtk_vfuncs.defs: set_focus_child_vfunc() was moved from
    Container to Widget.
    * tools/gen_scripts/gdk_generate_extra_defs.sh:
    gdk_signals.defs must be patched now (GdkEvent -> GdkEvent*).
    * gdk/src/gdk_signals.defs.patch: New file

 gdk/src/gdk_docs.xml                         |  216 ++--
 gdk/src/gdk_enums.defs                       |   30 -
 gdk/src/gdk_methods.defs                     |  149 ++-
 gdk/src/gdk_signals.defs                     |   18 +
 gdk/src/gdk_signals.defs.patch               |   15 +
 gtk/src/gtk_docs.xml                         | 1579 +++++++++++++++-----------
 gtk/src/gtk_enums.defs                       |   72 +-
 gtk/src/gtk_methods.defs                     |  403 ++++---
 gtk/src/gtk_signals.defs                     |  130 ++-
 gtk/src/gtk_vfuncs.defs                      |   16 +-
 tools/gen_scripts/gdk_generate_extra_defs.sh |   32 +-
 11 files changed, 1546 insertions(+), 1114 deletions(-)
---
diff --git a/gdk/src/gdk_docs.xml b/gdk/src/gdk_docs.xml
index a8671f9d..c32f32e1 100644
--- a/gdk/src/gdk_docs.xml
+++ b/gdk/src/gdk_docs.xml
@@ -2416,6 +2416,24 @@ of physical pixels on an output device are laid out.
 </parameters>
 </enum>
 
+<signal name="GdkSurface::enter-montor">
+<description>
+Emitted when @surface starts being present on the monitor.
+
+</description>
+<parameters>
+<parameter name="surface">
+<parameter_description> the #GdkSurface
+</parameter_description>
+</parameter>
+<parameter name="monitor">
+<parameter_description> the monitor
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</signal>
+
 <signal name="GdkSurface::event">
 <description>
 Emitted when GDK receives an input event for @surface.
@@ -2436,6 +2454,24 @@ Emitted when GDK receives an input event for @surface.
 </return>
 </signal>
 
+<signal name="GdkSurface::leave-montor">
+<description>
+Emitted when @surface stops being present on the monitor.
+
+</description>
+<parameters>
+<parameter name="surface">
+<parameter_description> the #GdkSurface
+</parameter_description>
+</parameter>
+<parameter name="monitor">
+<parameter_description> the monitor
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</signal>
+
 <signal name="GdkSurface::popup-layout-changed">
 <description>
 Emitted when the layout of a popup @surface has changed, e.g. if the popup
@@ -2477,6 +2513,9 @@ Emitted when part of the surface needs to be redrawn.
 <description>
 Emitted when the size of @surface is changed.
 
+Surface size is reported in ”application pixels”, not
+”device pixels” (see gdk_surface_get_scale_factor()).
+
 </description>
 <parameters>
 <parameter name="surface">
@@ -2552,60 +2591,6 @@ Determines a surface edge or corner.
 </parameters>
 </enum>
 
-<enum name="GdkSurfaceHints">
-<description>
-Used to indicate which fields of a #GdkGeometry struct should be paid
-attention to. Also, the presence/absence of @GDK_HINT_POS,
-@GDK_HINT_USER_POS, and @GDK_HINT_USER_SIZE is significant, though they don't
-directly refer to #GdkGeometry fields. @GDK_HINT_USER_POS will be set
-automatically by #GtkWindow if you call gtk_window_move().
-@GDK_HINT_USER_POS and @GDK_HINT_USER_SIZE should be set if the user
-specified a size/position using a --geometry command-line argument;
-gtk_window_parse_geometry() automatically sets these flags.
-
-</description>
-<parameters>
-<parameter name="GDK_HINT_POS">
-<parameter_description> indicates that the program has positioned the surface
-</parameter_description>
-</parameter>
-<parameter name="GDK_HINT_MIN_SIZE">
-<parameter_description> min size fields are set
-</parameter_description>
-</parameter>
-<parameter name="GDK_HINT_MAX_SIZE">
-<parameter_description> max size fields are set
-</parameter_description>
-</parameter>
-<parameter name="GDK_HINT_BASE_SIZE">
-<parameter_description> base size fields are set
-</parameter_description>
-</parameter>
-<parameter name="GDK_HINT_ASPECT">
-<parameter_description> aspect ratio fields are set
-</parameter_description>
-</parameter>
-<parameter name="GDK_HINT_RESIZE_INC">
-<parameter_description> resize increment fields are set
-</parameter_description>
-</parameter>
-<parameter name="GDK_HINT_WIN_GRAVITY">
-<parameter_description> surface gravity field is set
-</parameter_description>
-</parameter>
-<parameter name="GDK_HINT_USER_POS">
-<parameter_description> indicates that the surface’s position was explicitly set
-by the user
-</parameter_description>
-</parameter>
-<parameter name="GDK_HINT_USER_SIZE">
-<parameter_description> indicates that the surface’s size was explicitly set by
-the user
-</parameter_description>
-</parameter>
-</parameters>
-</enum>
-
 <enum name="GdkSurfaceState">
 <description>
 Specifies the state of a toplevel surface.
@@ -5065,6 +5050,22 @@ Extracts the notify detail from a crossing event.
 </return>
 </function>
 
+<function name="gdk_crossing_event_get_focus">
+<description>
+Checks if the @event surface is the focus surface.
+
+
+</description>
+<parameters>
+<parameter name="event">
+<parameter_description> a crossing event
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the surface is the focus surface
+</return>
+</function>
+
 <function name="gdk_crossing_event_get_mode">
 <description>
 Extracts the crossing mode from a crossing event.
@@ -6763,6 +6764,22 @@ handled synchronously, this function will do nothing.
 <return></return>
 </function>
 
+<function name="gdk_dnd_event_get_drop">
+<description>
+Gets the #GdkDrop from a DND event.
+
+
+</description>
+<parameters>
+<parameter name="event">
+<parameter_description> a DND event
+</parameter_description>
+</parameter>
+</parameters>
+<return> the drop
+</return>
+</function>
+
 <function name="gdk_drag_action_is_unique">
 <description>
 Checks if @action represents a single action or if it
@@ -6859,22 +6876,6 @@ all subsequent calls will be ignored.
 <return></return>
 </function>
 
-<function name="gdk_drag_event_get_drop">
-<description>
-Gets the #GdkDrop from a DND event.
-
-
-</description>
-<parameters>
-<parameter name="event">
-<parameter_description> a DND event
-</parameter_description>
-</parameter>
-</parameters>
-<return> the drop
-</return>
-</function>
-
 <function name="gdk_drag_get_actions">
 <description>
 Determines the bitmask of possible actions proposed by the source.
@@ -7556,7 +7557,7 @@ Returns the device of an event.
 </parameter_description>
 </parameter>
 </parameters>
-<return> a #GdkDevice, or %NULL.
+<return> a #GdkDevice.
 </return>
 </function>
 
@@ -7648,24 +7649,6 @@ Returns the modifier state field of an event.
 </return>
 </function>
 
-<function name="gdk_event_get_motion_history">
-<description>
-Retrieves the history of the @event motion, as a list of time and
-coordinates.
-
-
-</description>
-<parameters>
-<parameter name="event">
-<parameter_description> a #GdkEvent of type %GDK_MOTION_NOTIFY
-</parameter_description>
-</parameter>
-</parameters>
-<return> a list
-of time and coordinates
-</return>
-</function>
-
 <function name="gdk_event_get_pointer_emulated">
 <description>
 Returns whether this event is an 'emulated' pointer event (typically
@@ -8689,6 +8672,22 @@ Extracts the grab surface from a grab broken event.
 </return>
 </function>
 
+<function name="gdk_grab_broken_event_get_implicit">
+<description>
+Checks whether the grab broken event is for an implicit grab.
+
+
+</description>
+<parameters>
+<parameter name="event">
+<parameter_description> a grab broken event
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the an implicit grab was broken
+</return>
+</function>
+
 <function name="gdk_intern_mime_type">
 <description>
 Canonicalizes the given mime type and interns the result.
@@ -9585,7 +9584,25 @@ physical monitor is unplugged or removed.
 </return>
 </function>
 
-<function name="gdk_pad_axis_event_get_value">
+<function name="gdk_motion_event_get_history">
+<description>
+Retrieves the history of the @event motion, as a list of time and
+coordinates.
+
+
+</description>
+<parameters>
+<parameter name="event">
+<parameter_description> a motion #GdkEvent
+</parameter_description>
+</parameter>
+</parameters>
+<return> a list
+of time and coordinates
+</return>
+</function>
+
+<function name="gdk_pad_event_get_axis_value">
 <description>
 Extracts the information from a pad strip or ring event.
 
@@ -9607,7 +9624,7 @@ Extracts the information from a pad strip or ring event.
 <return></return>
 </function>
 
-<function name="gdk_pad_button_event_get_button">
+<function name="gdk_pad_event_get_button">
 <description>
 Extracts information about the pressed button from
 a pad event.
@@ -15372,9 +15389,8 @@ surface.
 <description>
 Returns the height of the given @surface.
 
-On the X11 platform the returned size is the size reported in the
-most-recently-processed configure event, rather than the current
-size on the X server.
+Surface size is reported in ”application pixels”, not
+”device pixels” (see gdk_surface_get_scale_factor()).
 
 
 </description>
@@ -15453,9 +15469,8 @@ devices.
 <description>
 Returns the width of the given @surface.
 
-On the X11 platform the returned size is the size reported in the
-most-recently-processed configure event, rather than the current
-size on the X server.
+Surface size is reported in ”application pixels”, not
+”device pixels” (see gdk_surface_get_scale_factor()).
 
 
 </description>
@@ -16273,6 +16288,9 @@ Create a toplevel layout description.
 Used together with gdk_toplevel_present() to describe
 how a toplevel surface should be placed and behave on-screen.
 
+The size is in ”application pixels”, not
+”device pixels” (see gdk_surface_get_scale_factor()).
+
 
 </description>
 <parameters>
@@ -16728,7 +16746,7 @@ Extracts the number of fingers from a touchpad event.
 </return>
 </function>
 
-<function name="gdk_touchpad_pinch_event_get_angle_delta">
+<function name="gdk_touchpad_event_get_pinch_angle_delta">
 <description>
 Extracts the angle delta from a touchpad pinch event.
 
@@ -16744,7 +16762,7 @@ Extracts the angle delta from a touchpad pinch event.
 </return>
 </function>
 
-<function name="gdk_touchpad_pinch_event_get_scale">
+<function name="gdk_touchpad_event_get_pinch_scale">
 <description>
 Extracts the scale from a touchpad pinch event.
 
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index 5767706b..d559140d 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -467,36 +467,6 @@
 
 ;; From gdksurface.h
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_HINT_POS             = 1 << 0,
-;;   GDK_HINT_MIN_SIZE    = 1 << 1,
-;;   GDK_HINT_MAX_SIZE    = 1 << 2,
-;;   GDK_HINT_BASE_SIZE   = 1 << 3,
-;;   GDK_HINT_ASPECT      = 1 << 4,
-;;   GDK_HINT_RESIZE_INC  = 1 << 5,
-;;   GDK_HINT_WIN_GRAVITY = 1 << 6,
-;;   GDK_HINT_USER_POS    = 1 << 7,
-;;   GDK_HINT_USER_SIZE   = 1 << 8
-;; } GdkSurfaceHints;
-
-(define-flags-extended SurfaceHints
-  (in-module "Gdk")
-  (c-name "GdkSurfaceHints")
-  (values
-    '("pos" "GDK_HINT_POS" "1 << 0")
-    '("min-size" "GDK_HINT_MIN_SIZE" "1 << 1")
-    '("max-size" "GDK_HINT_MAX_SIZE" "1 << 2")
-    '("base-size" "GDK_HINT_BASE_SIZE" "1 << 3")
-    '("aspect" "GDK_HINT_ASPECT" "1 << 4")
-    '("resize-inc" "GDK_HINT_RESIZE_INC" "1 << 5")
-    '("win-gravity" "GDK_HINT_WIN_GRAVITY" "1 << 6")
-    '("user-pos" "GDK_HINT_USER_POS" "1 << 7")
-    '("user-size" "GDK_HINT_USER_SIZE" "1 << 8")
-  )
-)
-
 ;; Original typedef:
 ;; typedef enum
 ;; {
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index e415e2d1..6e2d632d 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -270,23 +270,6 @@
   )
 )
 
-(define-flags SurfaceHints
-  (in-module "Gdk")
-  (c-name "GdkSurfaceHints")
-  (gtype-id "GDK_TYPE_SURFACE_HINTS")
-  (values
-    '("pos" "GDK_HINT_POS")
-    '("min-size" "GDK_HINT_MIN_SIZE")
-    '("max-size" "GDK_HINT_MAX_SIZE")
-    '("base-size" "GDK_HINT_BASE_SIZE")
-    '("aspect" "GDK_HINT_ASPECT")
-    '("resize-inc" "GDK_HINT_RESIZE_INC")
-    '("win-gravity" "GDK_HINT_WIN_GRAVITY")
-    '("user-pos" "GDK_HINT_USER_POS")
-    '("user-size" "GDK_HINT_USER_SIZE")
-  )
-)
-
 (define-enum SurfaceEdge
   (in-module "Gdk")
   (c-name "GdkSurfaceEdge")
@@ -2459,6 +2442,11 @@
   (return-type "gboolean")
 )
 
+(define-function gdk_button_event_get_type
+  (c-name "gdk_button_event_get_type")
+  (return-type "GType")
+)
+
 (define-function gdk_button_event_get_button
   (c-name "gdk_button_event_get_button")
   (return-type "guint")
@@ -2467,6 +2455,11 @@
   )
 )
 
+(define-function gdk_scroll_event_get_type
+  (c-name "gdk_scroll_event_get_type")
+  (return-type "GType")
+)
+
 (define-function gdk_scroll_event_get_direction
   (c-name "gdk_scroll_event_get_direction")
   (return-type "GdkScrollDirection")
@@ -2493,6 +2486,11 @@
   )
 )
 
+(define-function gdk_key_event_get_type
+  (c-name "gdk_key_event_get_type")
+  (return-type "GType")
+)
+
 (define-function gdk_key_event_get_keyval
   (c-name "gdk_key_event_get_keyval")
   (return-type "guint")
@@ -2541,6 +2539,11 @@
   )
 )
 
+(define-function gdk_focus_event_get_type
+  (c-name "gdk_focus_event_get_type")
+  (return-type "GType")
+)
+
 (define-function gdk_focus_event_get_in
   (c-name "gdk_focus_event_get_in")
   (return-type "gboolean")
@@ -2549,6 +2552,11 @@
   )
 )
 
+(define-function gdk_touch_event_get_type
+  (c-name "gdk_touch_event_get_type")
+  (return-type "GType")
+)
+
 (define-function gdk_touch_event_get_emulating_pointer
   (c-name "gdk_touch_event_get_emulating_pointer")
   (return-type "gboolean")
@@ -2557,6 +2565,11 @@
   )
 )
 
+(define-function gdk_crossing_event_get_type
+  (c-name "gdk_crossing_event_get_type")
+  (return-type "GType")
+)
+
 (define-function gdk_crossing_event_get_mode
   (c-name "gdk_crossing_event_get_mode")
   (return-type "GdkCrossingMode")
@@ -2573,6 +2586,19 @@
   )
 )
 
+(define-function gdk_crossing_event_get_focus
+  (c-name "gdk_crossing_event_get_focus")
+  (return-type "gboolean")
+  (parameters
+    '("GdkEvent*" "event")
+  )
+)
+
+(define-function gdk_configure_event_get_type
+  (c-name "gdk_configure_event_get_type")
+  (return-type "GType")
+)
+
 (define-function gdk_configure_event_get_size
   (c-name "gdk_configure_event_get_size")
   (return-type "none")
@@ -2583,6 +2609,11 @@
   )
 )
 
+(define-function gdk_touchpad_event_get_type
+  (c-name "gdk_touchpad_event_get_type")
+  (return-type "GType")
+)
+
 (define-function gdk_touchpad_event_get_gesture_phase
   (c-name "gdk_touchpad_event_get_gesture_phase")
   (return-type "GdkTouchpadGesturePhase")
@@ -2609,32 +2640,37 @@
   )
 )
 
-(define-function gdk_touchpad_pinch_event_get_angle_delta
-  (c-name "gdk_touchpad_pinch_event_get_angle_delta")
+(define-function gdk_touchpad_event_get_pinch_angle_delta
+  (c-name "gdk_touchpad_event_get_pinch_angle_delta")
   (return-type "double")
   (parameters
     '("GdkEvent*" "event")
   )
 )
 
-(define-function gdk_touchpad_pinch_event_get_scale
-  (c-name "gdk_touchpad_pinch_event_get_scale")
+(define-function gdk_touchpad_event_get_pinch_scale
+  (c-name "gdk_touchpad_event_get_pinch_scale")
   (return-type "double")
   (parameters
     '("GdkEvent*" "event")
   )
 )
 
-(define-function gdk_pad_button_event_get_button
-  (c-name "gdk_pad_button_event_get_button")
+(define-function gdk_pad_event_get_type
+  (c-name "gdk_pad_event_get_type")
+  (return-type "GType")
+)
+
+(define-function gdk_pad_event_get_button
+  (c-name "gdk_pad_event_get_button")
   (return-type "guint")
   (parameters
     '("GdkEvent*" "event")
   )
 )
 
-(define-function gdk_pad_axis_event_get_value
-  (c-name "gdk_pad_axis_event_get_value")
+(define-function gdk_pad_event_get_axis_value
+  (c-name "gdk_pad_event_get_axis_value")
   (return-type "none")
   (parameters
     '("GdkEvent*" "event")
@@ -2653,14 +2689,24 @@
   )
 )
 
-(define-function gdk_drag_event_get_drop
-  (c-name "gdk_drag_event_get_drop")
+(define-function gdk_dnd_event_get_type
+  (c-name "gdk_dnd_event_get_type")
+  (return-type "GType")
+)
+
+(define-function gdk_dnd_event_get_drop
+  (c-name "gdk_dnd_event_get_drop")
   (return-type "GdkDrop*")
   (parameters
     '("GdkEvent*" "event")
   )
 )
 
+(define-function gdk_grab_broken_event_get_type
+  (c-name "gdk_grab_broken_event_get_type")
+  (return-type "GType")
+)
+
 (define-function gdk_grab_broken_event_get_grab_surface
   (c-name "gdk_grab_broken_event_get_grab_surface")
   (return-type "GdkSurface*")
@@ -2669,10 +2715,35 @@
   )
 )
 
-(define-method get_motion_history
-  (of-object "GdkEvent")
-  (c-name "gdk_event_get_motion_history")
+(define-function gdk_grab_broken_event_get_implicit
+  (c-name "gdk_grab_broken_event_get_implicit")
+  (return-type "gboolean")
+  (parameters
+    '("GdkEvent*" "event")
+  )
+)
+
+(define-function gdk_motion_event_get_type
+  (c-name "gdk_motion_event_get_type")
+  (return-type "GType")
+)
+
+(define-function gdk_motion_event_get_history
+  (c-name "gdk_motion_event_get_history")
   (return-type "GList*")
+  (parameters
+    '("GdkEvent*" "event")
+  )
+)
+
+(define-function gdk_delete_event_get_type
+  (c-name "gdk_delete_event_get_type")
+  (return-type "GType")
+)
+
+(define-function gdk_proximity_event_get_type
+  (c-name "gdk_proximity_event_get_type")
+  (return-type "GType")
 )
 
 (define-method triggers_context_menu
@@ -3907,19 +3978,6 @@
   (return-type "none")
 )
 
-(define-function gdk_surface_constrain_size
-  (c-name "gdk_surface_constrain_size")
-  (return-type "none")
-  (parameters
-    '("GdkGeometry*" "geometry")
-    '("GdkSurfaceHints" "flags")
-    '("gint" "width")
-    '("gint" "height")
-    '("gint*" "new_width")
-    '("gint*" "new_height")
-  )
-)
-
 (define-method set_support_multidevice
   (of-object "GdkSurface")
   (c-name "gdk_surface_set_support_multidevice")
@@ -4477,11 +4535,6 @@
   (return-type "GType")
 )
 
-(define-function gdk_surface_hints_get_type
-  (c-name "gdk_surface_hints_get_type")
-  (return-type "GType")
-)
-
 (define-function gdk_surface_edge_get_type
   (c-name "gdk_surface_edge_get_type")
   (return-type "GType")
diff --git a/gdk/src/gdk_signals.defs b/gdk/src/gdk_signals.defs
index 8a8ec370..e9df3daf 100644
--- a/gdk/src/gdk_signals.defs
+++ b/gdk/src/gdk_signals.defs
@@ -1057,6 +1057,24 @@
   )
 )
 
+(define-signal enter-monitor
+  (of-object "GdkSurface")
+  (return-type "void")
+  (flags "Run First")
+  (parameters
+    '("GdkMonitor*" "p0")
+  )
+)
+
+(define-signal leave-monitor
+  (of-object "GdkSurface")
+  (return-type "void")
+  (flags "Run First")
+  (parameters
+    '("GdkMonitor*" "p0")
+  )
+)
+
 (define-property cursor
   (of-object "GdkSurface")
   (prop-type "GParamObject")
diff --git a/gdk/src/gdk_signals.defs.patch b/gdk/src/gdk_signals.defs.patch
new file mode 100644
index 00000000..e5505382
--- /dev/null
+++ b/gdk/src/gdk_signals.defs.patch
@@ -0,0 +1,15 @@
+--- ./../../gdk/src/gdk_signals.defs.orig      2020-04-23 15:27:59.893186000 +0200
++++ ./../../gdk/src/gdk_signals.defs   2020-04-23 19:24:24.925500062 +0200
+@@ -1051,11 +1051,11 @@
+ (define-signal event
+   (of-object "GdkSurface")
+   (return-type "gboolean")
+   (flags "Run Last")
+   (parameters
+-    '("GdkEvent" "p0")
++    '("GdkEvent*" "p0")
+   )
+ )
+ 
+ (define-signal enter-monitor
+   (of-object "GdkSurface")
diff --git a/gtk/src/gtk_docs.xml b/gtk/src/gtk_docs.xml
index 7c74504e..4f6e7d08 100644
--- a/gtk/src/gtk_docs.xml
+++ b/gtk/src/gtk_docs.xml
@@ -3,7 +3,7 @@
 <description>
 The signal which gets emitted to activate a URI.
 Applications may connect to it to override the default behaviour,
-which is to call gtk_show_uri_on_window().
+which is to call gtk_show_uri().
 
 
 </description>
@@ -5289,6 +5289,14 @@ There are too many key combinations to list them all here.
 <parameter_description> the number of @step units to move
 </parameter_description>
 </parameter>
+<parameter name="extend">
+<parameter_description> whether to extend the selection
+</parameter_description>
+</parameter>
+<parameter name="modify">
+<parameter_description> whether to modify the selection
+</parameter_description>
+</parameter>
 </parameters>
 <return> %TRUE to stop other handlers from being invoked for the event.
 %FALSE to propagate the event further.
@@ -6643,6 +6651,14 @@ the Shift modifier.
 <parameter_description> the number of @step units to move
 </parameter_description>
 </parameter>
+<parameter name="extend">
+<parameter_description> whether to extend the selection
+</parameter_description>
+</parameter>
+<parameter name="modify">
+<parameter_description> whether to modify the selection
+</parameter_description>
+</parameter>
 </parameters>
 <return></return>
 </signal>
@@ -7232,7 +7248,7 @@ The default bindings for this signal are all forms of the Enter key.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> The label on which the signal was emitted
 </parameter_description>
 </parameter>
@@ -7244,12 +7260,12 @@ The default bindings for this signal are all forms of the Enter key.
 <description>
 The signal which gets emitted to activate a URI.
 Applications may connect to it to override the default behaviour,
-which is to call gtk_show_uri_on_window().
+which is to call gtk_show_uri().
 
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> The label on which the signal was emitted
 </parameter_description>
 </parameter>
@@ -7272,7 +7288,7 @@ The default binding for this signal is Ctrl-c.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> the object which received the signal
 </parameter_description>
 </parameter>
@@ -7397,15 +7413,6 @@ changes would be distracting, e.g. in a statusbar.
 </description>
 </property>
 
-<property name="GtkLabel:track-visited-links">
-<description>
-Set this property to %TRUE to make the label track which links
-have been visited. It will then apply the #GTK_STATE_FLAG_VISITED
-when rendering this link, in addition to #GTK_STATE_FLAG_LINK.
-
-</description>
-</property>
-
 <property name="GtkLabel:width-chars">
 <description>
 The desired width of the label, in characters. If this property is set to
@@ -7618,6 +7625,18 @@ developer
 <parameter_description> The GNU Affero General Public License, version 3.0 only
 </parameter_description>
 </parameter>
+<parameter name="GTK_LICENSE_BSD_3">
+<parameter_description> The 3-clause BSD licence
+</parameter_description>
+</parameter>
+<parameter name="GTK_LICENSE_APACHE_2_0">
+<parameter_description> The Apache License, version 2.0
+</parameter_description>
+</parameter>
+<parameter name="GTK_LICENSE_MPL_2_0">
+<parameter_description> The Mozilla Public License, version 2.0
+</parameter_description>
+</parameter>
 </parameters>
 </enum>
 
@@ -7626,7 +7645,7 @@ developer
 The ::activate-link signal is emitted each time the #GtkLinkButton
 has been clicked.
 
-The default handler will call gtk_show_uri_on_window() with the URI stored inside
+The default handler will call gtk_show_uri() with the URI stored inside
 the #GtkLinkButton:uri property.
 
 To override the default behavior, you can connect to the ::activate-link
@@ -10166,23 +10185,6 @@ resources file.
 </parameters>
 </enum>
 
-<enum name="GtkReliefStyle">
-<description>
-Indicated the relief to be drawn around a #GtkButton.
-
-</description>
-<parameters>
-<parameter name="GTK_RELIEF_NORMAL">
-<parameter_description> Draw a normal relief.
-</parameter_description>
-</parameter>
-<parameter name="GTK_RELIEF_NONE">
-<parameter_description> No relief.
-</parameter_description>
-</parameter>
-</parameters>
-</enum>
-
 <enum name="GtkResponseType">
 <description>
 Predefined values for use as response ids in gtk_dialog_add_button().
@@ -11193,39 +11195,6 @@ or none.
 </description>
 </property>
 
-<enum name="GtkShadowType">
-<description>
-Used to change the appearance of an outline typically provided by a #GtkFrame.
-
-Note that many themes do not differentiate the appearance of the
-various shadow types: Either there is no visible shadow (@GTK_SHADOW_NONE),
-or there is (any other value).
-
-</description>
-<parameters>
-<parameter name="GTK_SHADOW_NONE">
-<parameter_description> No outline.
-</parameter_description>
-</parameter>
-<parameter name="GTK_SHADOW_IN">
-<parameter_description> The outline is bevelled inwards.
-</parameter_description>
-</parameter>
-<parameter name="GTK_SHADOW_OUT">
-<parameter_description> The outline is bevelled outwards like a button.
-</parameter_description>
-</parameter>
-<parameter name="GTK_SHADOW_ETCHED_IN">
-<parameter_description> The outline has a sunken 3d appearance.
-</parameter_description>
-</parameter>
-<parameter name="GTK_SHADOW_ETCHED_OUT">
-<parameter_description> The outline has a raised 3d appearance.
-</parameter_description>
-</parameter>
-</parameters>
-</enum>
-
 <property name="GtkShortcut:action">
 <description>
 The action that gets activated by this shortcut.
@@ -12165,6 +12134,10 @@ classes and sometimes uses different names.
 <parameter_description> Widget has the visible focus
 </parameter_description>
 </parameter>
+<parameter name="GTK_STATE_FLAG_FOCUS_WITHIN">
+<parameter_description> Widget contains the keyboard focus
+</parameter_description>
+</parameter>
 </parameters>
 </enum>
 
@@ -12233,6 +12206,11 @@ CSS nodes starting at the style context's node
 CSS properties for each node
 </parameter_description>
 </parameter>
+<parameter name="GTK_STYLE_CONTEXT_PRINT_SHOW_CHANGE">
+<parameter_description> Show information about 
+what changes affect the styles
+</parameter_description>
+</parameter>
 </parameters>
 </enum>
 
@@ -12300,6 +12278,46 @@ See #GtkSwitch::state-set for details.
 </description>
 </property>
 
+<enum name="GtkSystemSetting">
+<description>
+Values that can be passed to the GtkWidgetClass.system_setting_changed
+vfunc to indicate that a system setting has changed and widgets may
+need to drop caches, or react otherwise.
+
+Most of the values correspond to #GtkSettings properties.
+
+More values may be added over time.
+
+</description>
+<parameters>
+<parameter name="GTK_SYSTEM_SETTING_DPI">
+<parameter_description> the #GtkSettings:gtk-xft-dpi setting has changed
+</parameter_description>
+</parameter>
+<parameter name="GTK_SYSTEM_SETTING_FONT_NAME">
+<parameter_description> The #GtkSettings:gtk-font-name setting has changed
+</parameter_description>
+</parameter>
+<parameter name="GTK_SYSTEM_SETTING_FONT_CONFIG">
+<parameter_description> The font configuration has changed in a way that
+requires text to be redrawn. This can be any of the
+#GtkSettings:gtk-xft-antialias, #GtkSettings:gtk-xft-hinting,
+#GtkSettings:gtk-xft-hintstyle, #GtkSettings:gtk-xft-rgba or
+#GtkSettings:gtk-fontconfig-timestamp settings
+</parameter_description>
+</parameter>
+<parameter name="GTK_SYSTEM_SETTING_DISPLAY">
+<parameter_description> The display has changed
+</parameter_description>
+</parameter>
+<parameter name="GTK_SYSTEM_SETTING_ICON_THEME">
+<parameter_description> The icon theme has changed in a way that requires
+icons to be looked up again
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
 <signal name="GtkText::activate">
 <description>
 The ::activate signal is emitted when the user hits
@@ -14205,18 +14223,25 @@ gtk_tree_view_set_cursor_on_cell() when moving horizontally
 </parameter_description>
 </parameter>
 <parameter name="step">
-<parameter_description> the granularity of the move, as a
-#GtkMovementStep. %GTK_MOVEMENT_LOGICAL_POSITIONS,
-%GTK_MOVEMENT_VISUAL_POSITIONS, %GTK_MOVEMENT_DISPLAY_LINES,
-%GTK_MOVEMENT_PAGES and %GTK_MOVEMENT_BUFFER_ENDS are
-supported. %GTK_MOVEMENT_LOGICAL_POSITIONS and
-%GTK_MOVEMENT_VISUAL_POSITIONS are treated identically.
+<parameter_description> the granularity of the move, as a #GtkMovementStep.
+%GTK_MOVEMENT_LOGICAL_POSITIONS, %GTK_MOVEMENT_VISUAL_POSITIONS,
+%GTK_MOVEMENT_DISPLAY_LINES, %GTK_MOVEMENT_PAGES and
+%GTK_MOVEMENT_BUFFER_ENDS are supported.
+%GTK_MOVEMENT_LOGICAL_POSITIONS and %GTK_MOVEMENT_VISUAL_POSITIONS
+are treated identically.
 </parameter_description>
 </parameter>
 <parameter name="direction">
-<parameter_description> the direction to move: +1 to move forwards;
--1 to move backwards. The resulting movement is
-undefined for all other values.
+<parameter_description> the direction to move: +1 to move forwards; -1 to move
+backwards. The resulting movement is undefined for all other values.
+</parameter_description>
+</parameter>
+<parameter name="extend">
+<parameter_description> whether to extend the selection
+</parameter_description>
+</parameter>
+<parameter name="modify">
+<parameter_description> whether to modify the selection
 </parameter_description>
 </parameter>
 </parameters>
@@ -17282,6 +17307,22 @@ or %NULL, in which case a default text is displayed
 </return>
 </function>
 
+<function name="gtk_app_chooser_button_get_modal">
+<description>
+Gets whether the dialog is modal.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAppChooserButton
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the dialog is modal
+</return>
+</function>
+
 <function name="gtk_app_chooser_button_get_show_default_item">
 <description>
 Returns the current value of the #GtkAppChooserButton:show-default-item
@@ -17374,6 +17415,24 @@ If the heading is not set, the dialog displays a default text.
 <return></return>
 </function>
 
+<function name="gtk_app_chooser_button_set_modal">
+<description>
+Sets whether the dialog should be modal.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAppChooserButton
+</parameter_description>
+</parameter>
+<parameter name="modal">
+<parameter_description> %TRUE to make the dialog modal
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_app_chooser_button_set_show_default_item">
 <description>
 Sets whether the dropdown menu of this button should show the
@@ -18427,17 +18486,80 @@ and menubar as needed.
 <return></return>
 </function>
 
-<function name="gtk_aspect_frame_new">
+<function name="gtk_aspect_frame_get_obey_child">
 <description>
-Create a new #GtkAspectFrame.
+Returns whether the childs size request should override
+the set aspect ratio of the #GtkAspectFrame.
 
 
 </description>
 <parameters>
-<parameter name="label">
-<parameter_description> Label text.
+<parameter name="self">
+<parameter_description> a #GtkAspectFrame
+</parameter_description>
+</parameter>
+</parameters>
+<return> whether to obey the childs size request
+</return>
+</function>
+
+<function name="gtk_aspect_frame_get_ratio">
+<description>
+Returns the desired aspect ratio of the child.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAspectFrame
 </parameter_description>
 </parameter>
+</parameters>
+<return> the desired aspect ratio
+</return>
+</function>
+
+<function name="gtk_aspect_frame_get_xalign">
+<description>
+Returns the horizontal alignment of the child within the
+allocation of the #GtkAspectFrame.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAspectFrame
+</parameter_description>
+</parameter>
+</parameters>
+<return> the horizontal alignment
+</return>
+</function>
+
+<function name="gtk_aspect_frame_get_yalign">
+<description>
+Returns the vertical alignment of the child within the
+allocation of the #GtkAspectFrame.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAspectFrame
+</parameter_description>
+</parameter>
+</parameters>
+<return> the vertical alignment
+</return>
+</function>
+
+<function name="gtk_aspect_frame_new">
+<description>
+Create a new #GtkAspectFrame.
+
+
+</description>
+<parameters>
 <parameter name="xalign">
 <parameter_description> Horizontal alignment of the child within the allocation of
 the #GtkAspectFrame. This ranges from 0.0 (left aligned)
@@ -18464,35 +18586,77 @@ ratio is taken from the requistion of the child.
 </return>
 </function>
 
-<function name="gtk_aspect_frame_set">
+<function name="gtk_aspect_frame_set_obey_child">
 <description>
-Set parameters for an existing #GtkAspectFrame.
+Sets whether the aspect ratio of the childs size
+request should override the set aspect ratio of
+the #GtkAspectFrame.
 
 </description>
 <parameters>
-<parameter name="aspect_frame">
+<parameter name="self">
 <parameter_description> a #GtkAspectFrame
 </parameter_description>
 </parameter>
-<parameter name="xalign">
-<parameter_description> Horizontal alignment of the child within the allocation of
-the #GtkAspectFrame. This ranges from 0.0 (left aligned)
-to 1.0 (right aligned)
+<parameter name="obey_child">
+<parameter_description> If %TRUE, @ratio is ignored, and the aspect
+ratio is taken from the requistion of the child.
 </parameter_description>
 </parameter>
-<parameter name="yalign">
-<parameter_description> Vertical alignment of the child within the allocation of
-the #GtkAspectFrame. This ranges from 0.0 (top aligned)
-to 1.0 (bottom aligned)
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_aspect_frame_set_ratio">
+<description>
+Sets the desired aspect ratio of the child.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAspectFrame
 </parameter_description>
 </parameter>
 <parameter name="ratio">
-<parameter_description> The desired aspect ratio.
+<parameter_description> aspect ratio of the child
 </parameter_description>
 </parameter>
-<parameter name="obey_child">
-<parameter_description> If %TRUE, @ratio is ignored, and the aspect
-ratio is taken from the requistion of the child.
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_aspect_frame_set_xalign">
+<description>
+Sets the horizontal alignment of the child within the allocation
+of the #GtkAspectFrame.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAspectFrame
+</parameter_description>
+</parameter>
+<parameter name="xalign">
+<parameter_description> horizontal alignment, from 0.0 (left aligned) to 1.0 (right aligned)
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_aspect_frame_set_yalign">
+<description>
+Sets the vertical alignment of the child within the allocation
+of the #GtkAspectFrame.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkAspectFrame
+</parameter_description>
+</parameter>
+<parameter name="yalign">
+<parameter_description> horizontal alignment, from 0.0 (top aligned) to 1.0 (bottom aligned)
 </parameter_description>
 </parameter>
 </parameters>
@@ -20583,6 +20747,22 @@ Upon errors %FALSE will be returned and @error will be assigned a
 </return>
 </function>
 
+<function name="gtk_button_get_has_frame">
+<description>
+Returns whether the button has a frame.
+
+
+</description>
+<parameters>
+<parameter name="button">
+<parameter_description> a #GtkButton
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the button has a frame
+</return>
+</function>
+
 <function name="gtk_button_get_icon_name">
 <description>
 Returns the icon name set via gtk_button_set_icon_name().
@@ -20620,22 +20800,6 @@ by the widget and must not be modified or freed.
 </return>
 </function>
 
-<function name="gtk_button_get_relief">
-<description>
-Returns the current relief style of the given #GtkButton.
-
-
-</description>
-<parameters>
-<parameter name="button">
-<parameter_description> The #GtkButton you want the #GtkReliefStyle from.
-</parameter_description>
-</parameter>
-</parameters>
-<return> The current #GtkReliefStyle
-</return>
-</function>
-
 <function name="gtk_button_get_use_underline">
 <description>
 Returns whether an embedded underline in the button label indicates a
@@ -20726,6 +20890,25 @@ mnemonic character
 </return>
 </function>
 
+<function name="gtk_button_set_has_frame">
+<description>
+Sets the style of the button. Buttons can has a flat appearance
+or have a frame drawn around them.
+
+</description>
+<parameters>
+<parameter name="button">
+<parameter_description> a #GtkButton
+</parameter_description>
+</parameter>
+<parameter name="has_frame">
+<parameter_description> whether the button should have a visible frame
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_button_set_icon_name">
 <description>
 Adds a #GtkImage with the given icon name as a child. If @button already
@@ -20766,26 +20949,6 @@ This will also clear any previously set labels.
 <return></return>
 </function>
 
-<function name="gtk_button_set_relief">
-<description>
-Sets the relief style of the edges of the given #GtkButton widget.
-Two styles exist, %GTK_RELIEF_NORMAL and %GTK_RELIEF_NONE.
-The default style is, as one can guess, %GTK_RELIEF_NORMAL.
-
-</description>
-<parameters>
-<parameter name="button">
-<parameter_description> The #GtkButton you want to set relief styles of
-</parameter_description>
-</parameter>
-<parameter name="relief">
-<parameter_description> The GtkReliefStyle as described above
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_button_set_use_underline">
 <description>
 If true, an underline in the text of the button label indicates
@@ -20821,6 +20984,10 @@ Remove all visual markers.
 
 <function name="gtk_calendar_get_date">
 <description>
+Returns a #GDateTime representing the shown
+year, month and the selected day, in the local
+time zone.
+
 
 </description>
 <parameters>
@@ -20829,8 +20996,8 @@ Remove all visual markers.
 </parameter_description>
 </parameter>
 </parameters>
-<return> A #GDateTime representing the shown
-year, month and the selected day, in the local time zone.
+<return> the #GDate representing
+the shown date.
 </return>
 </function>
 
@@ -20854,8 +21021,12 @@ Returns if the @day of the @calendar is already marked.
 </return>
 </function>
 
-<function name="gtk_calendar_get_day_names">
+<function name="gtk_calendar_get_show_day_names">
 <description>
+Returns whether @self is currently showing the names
+of the week days above the day numbers, i.e. the value
+of the #GtkCalendar:show-day-names property.
+
 
 </description>
 <parameters>
@@ -20864,14 +21035,16 @@ Returns if the @day of the @calendar is already marked.
 </parameter_description>
 </parameter>
 </parameters>
-<return> Whether @self is currently showing the names
-of the week days above the day numbers, i.e. the value
-of the #GtkCalendar:show-day-names property.
+<return> Whether the calendar shows day names.
 </return>
 </function>
 
 <function name="gtk_calendar_get_show_heading">
 <description>
+Returns whether @self is currently showing the heading,
+i.e. the value of the #GtkCalendar:show-heading property.
+
+Return: Whether the calendar is showing a heading.
 
 </description>
 <parameters>
@@ -20880,13 +21053,16 @@ of the #GtkCalendar:show-day-names property.
 </parameter_description>
 </parameter>
 </parameters>
-<return> Whether @self is currently showing the heading,
-i.e. the value of the #GtkCalendar:show-heading property.
-</return>
+<return></return>
 </function>
 
 <function name="gtk_calendar_get_show_week_numbers">
 <description>
+Returns whether @self is showing week numbers right
+now, i.e. the value of the #GtkCalendar:show-week-numbers
+property.
+
+Return: Whether the calendar is showing week numbers.
 
 </description>
 <parameters>
@@ -20895,9 +21071,7 @@ i.e. the value of the #GtkCalendar:show-heading property.
 </parameter_description>
 </parameter>
 </parameters>
-<return> Whether @self is showing week numbers right now,
-i.e. the value of the #GtkCalendar:show-week-numbers property.
-</return>
+<return></return>
 </function>
 
 <function name="gtk_calendar_mark_day">
@@ -20950,6 +21124,7 @@ Will switch to @date's year and month and select its day.
 
 <function name="gtk_calendar_set_show_day_names">
 <description>
+Sets whether the calendar shows day names.
 
 </description>
 <parameters>
@@ -20958,8 +21133,7 @@ Will switch to @date's year and month and select its day.
 </parameter_description>
 </parameter>
 <parameter name="value">
-<parameter_description> Whether to show week day names above the
-day numbers
+<parameter_description> Whether to show day names above the day numbers
 </parameter_description>
 </parameter>
 </parameters>
@@ -20968,6 +21142,9 @@ day numbers
 
 <function name="gtk_calendar_set_show_heading">
 <description>
+Sets whether the calendar should show a heading
+containing the current year and month as well as
+buttons for changing both.
 
 </description>
 <parameters>
@@ -20976,9 +21153,7 @@ day numbers
 </parameter_description>
 </parameter>
 <parameter name="value">
-<parameter_description> Whether to show the heading in the calendar,
-containing the current year and month as well as
-buttons for changing both.
+<parameter_description> Whether to show the heading in the calendar
 </parameter_description>
 </parameter>
 </parameters>
@@ -20996,7 +21171,7 @@ Sets whether week numbers are shown in the calendar.
 </parameter_description>
 </parameter>
 <parameter name="value">
-<parameter_description> Whether to show week numbers on the left of the days
+<parameter_description> whether to show week numbers on the left of the days
 </parameter_description>
 </parameter>
 </parameters>
@@ -24353,6 +24528,8 @@ Sets the start widget. To remove the existing start widget, pass %NULL.
 
 <function name="gtk_center_layout_get_baseline_position">
 <description>
+Returns the baseline position of the layout.
+
 
 </description>
 <parameters>
@@ -24367,6 +24544,8 @@ Sets the start widget. To remove the existing start widget, pass %NULL.
 
 <function name="gtk_center_layout_get_center_widget">
 <description>
+Returns the center widget of the layout.
+
 
 </description>
 <parameters>
@@ -24381,6 +24560,8 @@ Sets the start widget. To remove the existing start widget, pass %NULL.
 
 <function name="gtk_center_layout_get_end_widget">
 <description>
+Returns the end widget of the layout.
+
 
 </description>
 <parameters>
@@ -24395,6 +24576,8 @@ Sets the start widget. To remove the existing start widget, pass %NULL.
 
 <function name="gtk_center_layout_get_orientation">
 <description>
+Gets the current orienration of the layout manager.
+
 
 </description>
 <parameters>
@@ -24409,6 +24592,8 @@ Sets the start widget. To remove the existing start widget, pass %NULL.
 
 <function name="gtk_center_layout_get_start_widget">
 <description>
+Returns the start widget fo the layout.
+
 
 </description>
 <parameters>
@@ -24695,6 +24880,22 @@ or freed.
 </return>
 </function>
 
+<function name="gtk_color_button_get_modal">
+<description>
+Gets whether the dialog is modal.
+
+
+</description>
+<parameters>
+<parameter name="button">
+<parameter_description> a #GtkColorButton
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the dialog is modal
+</return>
+</function>
+
 <function name="gtk_color_button_get_title">
 <description>
 Gets the title of the color selection dialog.
@@ -24745,6 +24946,24 @@ Creates a new color button.
 </return>
 </function>
 
+<function name="gtk_color_button_set_modal">
+<description>
+Sets whether the dialog should be modal.
+
+</description>
+<parameters>
+<parameter name="button">
+<parameter_description> a #GtkColorButton
+</parameter_description>
+</parameter>
+<parameter name="modal">
+<parameter_description> %TRUE to make the dialog modal
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_color_button_set_title">
 <description>
 Sets the title for the color selection dialog.
@@ -26625,42 +26844,6 @@ gtk_container_forall() for details on what constitutes an &quot;internal&quot; c
 </return>
 </function>
 
-<function name="gtk_container_get_focus_hadjustment">
-<description>
-Retrieves the horizontal focus adjustment for the container. See
-gtk_container_set_focus_hadjustment ().
-
-
-</description>
-<parameters>
-<parameter name="container">
-<parameter_description> a #GtkContainer
-</parameter_description>
-</parameter>
-</parameters>
-<return> the horizontal focus adjustment, or %NULL if
-none has been set.
-</return>
-</function>
-
-<function name="gtk_container_get_focus_vadjustment">
-<description>
-Retrieves the vertical focus adjustment for the container. See
-gtk_container_set_focus_vadjustment().
-
-
-</description>
-<parameters>
-<parameter name="container">
-<parameter_description> a #GtkContainer
-</parameter_description>
-</parameter>
-</parameters>
-<return> the vertical focus adjustment, or
-%NULL if none has been set.
-</return>
-</function>
-
 <function name="gtk_container_remove">
 <description>
 Removes @widget from @container. @widget must be inside @container.
@@ -26687,85 +26870,6 @@ container and help break any circular reference count cycles.
 <return></return>
 </function>
 
-<function name="gtk_container_set_focus_child">
-<description>
-Sets, or unsets if @child is %NULL, the focused child of @container.
-
-This function emits the GtkContainer::set_focus_child signal of
-@container. Implementations of #GtkContainer can override the
-default behaviour by overriding the class closure of this signal.
-
-This is function is mostly meant to be used by widgets. Applications can use
-gtk_widget_grab_focus() to manually set the focus to a specific widget.
-
-</description>
-<parameters>
-<parameter name="container">
-<parameter_description> a #GtkContainer
-</parameter_description>
-</parameter>
-<parameter name="child">
-<parameter_description> a #GtkWidget, or %NULL
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
-<function name="gtk_container_set_focus_hadjustment">
-<description>
-Hooks up an adjustment to focus handling in a container, so when a child
-of the container is focused, the adjustment is scrolled to show that
-widget. This function sets the horizontal alignment.
-See gtk_scrolled_window_get_hadjustment() for a typical way of obtaining
-the adjustment and gtk_container_set_focus_vadjustment() for setting
-the vertical adjustment.
-
-The adjustments have to be in pixel units and in the same coordinate
-system as the allocation for immediate children of the container.
-
-</description>
-<parameters>
-<parameter name="container">
-<parameter_description> a #GtkContainer
-</parameter_description>
-</parameter>
-<parameter name="adjustment">
-<parameter_description> an adjustment which should be adjusted when the focus is
-moved among the descendents of @container
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
-<function name="gtk_container_set_focus_vadjustment">
-<description>
-Hooks up an adjustment to focus handling in a container, so when a
-child of the container is focused, the adjustment is scrolled to
-show that widget. This function sets the vertical alignment. See
-gtk_scrolled_window_get_vadjustment() for a typical way of obtaining
-the adjustment and gtk_container_set_focus_hadjustment() for setting
-the horizontal adjustment.
-
-The adjustments have to be in pixel units and in the same coordinate
-system as the allocation for immediate children of the container.
-
-</description>
-<parameters>
-<parameter name="container">
-<parameter_description> a #GtkContainer
-</parameter_description>
-</parameter>
-<parameter name="adjustment">
-<parameter_description> an adjustment which should be adjusted when the focus
-is moved among the descendents of @container
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_css_node_new">
 <description>
 Creates a new CSS node.
@@ -31420,6 +31524,104 @@ Creates a new event controller that will handle focus events.
 </return>
 </function>
 
+<function name="gtk_event_controller_get_current_event">
+<description>
+Returns the event that is currently being handled by the
+controller, and %NULL at other times.
+
+
+</description>
+<parameters>
+<parameter name="controller">
+<parameter_description> a #GtkEventController
+</parameter_description>
+</parameter>
+</parameters>
+<return> the event is current handled by @controller
+</return>
+</function>
+
+<function name="gtk_event_controller_get_current_event_device">
+<description>
+Returns the device of the event that is currently being
+handled by the controller, and %NULL otherwise.
+
+
+</description>
+<parameters>
+<parameter name="controller">
+<parameter_description> a #GtkEventController
+</parameter_description>
+</parameter>
+</parameters>
+<return> device of the event is current handled by @controller
+</return>
+</function>
+
+<function name="gtk_event_controller_get_current_event_state">
+<description>
+Returns the modifier state of the event that is currently being
+handled by the controller, and 0 otherwise.
+
+
+</description>
+<parameters>
+<parameter name="controller">
+<parameter_description> a #GtkEventController
+</parameter_description>
+</parameter>
+</parameters>
+<return> modifier state of the event is current handled by @controller
+</return>
+</function>
+
+<function name="gtk_event_controller_get_current_event_time">
+<description>
+Returns the timestamp of the event that is currently being
+handled by the controller, and 0 otherwise.
+
+
+</description>
+<parameters>
+<parameter name="controller">
+<parameter_description> a #GtkEventController
+</parameter_description>
+</parameter>
+</parameters>
+<return> timestamp of the event is current handled by @controller
+</return>
+</function>
+
+<function name="gtk_event_controller_get_name">
+<description>
+Gets the name of @controller.
+
+</description>
+<parameters>
+<parameter name="controller">
+<parameter_description> a #GtkEventController
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_event_controller_get_propagation_limit">
+<description>
+Gets the propagation limit of the event controller.
+
+
+</description>
+<parameters>
+<parameter name="controller">
+<parameter_description> a #GtkEventController
+</parameter_description>
+</parameter>
+</parameters>
+<return> the propagation limit
+</return>
+</function>
+
 <function name="gtk_event_controller_get_propagation_phase">
 <description>
 Gets the propagation phase at which @controller handles events.
@@ -31725,6 +31927,47 @@ Sets the flags conditioning scroll controller behavior.
 <return></return>
 </function>
 
+<function name="gtk_event_controller_set_name">
+<description>
+Sets a name on the controller that can be used for
+debugging.
+
+</description>
+<parameters>
+<parameter name="controller">
+<parameter_description> a #GtkEventController
+</parameter_description>
+</parameter>
+<parameter name="name">
+<parameter_description> a name for @controller
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_event_controller_set_propagation_limit">
+<description>
+Sets the event propagation limit on the event controller.
+
+If the limit is set to %@GTK_LIMIT_SAME_NATIVE, the controller
+won't handle events that are targeted at widgets on a different
+surface, such as popovers.
+
+</description>
+<parameters>
+<parameter name="controller">
+<parameter_description> a #GtkEventController
+</parameter_description>
+</parameter>
+<parameter name="limit">
+<parameter_description> the propagation limit
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_event_controller_set_propagation_phase">
 <description>
 Sets the propagation phase at which a controller handles events.
@@ -32101,6 +32344,22 @@ otherwise.
 </return>
 </function>
 
+<function name="gtk_file_chooser_button_get_modal">
+<description>
+Gets whether the dialog is modal.
+
+
+</description>
+<parameters>
+<parameter name="button">
+<parameter_description> a #GtkFileChooserButton
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the dialog is modal
+</return>
+</function>
+
 <function name="gtk_file_chooser_button_get_title">
 <description>
 Retrieves the title of the browse dialog used by @button. The returned value
@@ -32179,6 +32438,24 @@ order for the button to take over the file selected in the dialog.
 </return>
 </function>
 
+<function name="gtk_file_chooser_button_set_modal">
+<description>
+Sets whether the dialog should be modal.
+
+</description>
+<parameters>
+<parameter name="button">
+<parameter_description> a #GtkFileChooserButton
+</parameter_description>
+</parameter>
+<parameter name="modal">
+<parameter_description> %TRUE to make the dialog modal
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_file_chooser_button_set_title">
 <description>
 Modifies the @title of the browse dialog used by @button.
@@ -34330,6 +34607,22 @@ mode allows it.
 <return></return>
 </function>
 
+<function name="gtk_font_button_get_modal">
+<description>
+Gets whether the dialog is modal.
+
+
+</description>
+<parameters>
+<parameter name="font_button">
+<parameter_description> a #GtkFontButton
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the dialog is modal
+</return>
+</function>
+
 <function name="gtk_font_button_get_title">
 <description>
 Retrieves the title of the font chooser dialog.
@@ -34406,6 +34699,24 @@ Creates a new font picker widget.
 </return>
 </function>
 
+<function name="gtk_font_button_set_modal">
+<description>
+Sets whether the dialog should be modal.
+
+</description>
+<parameters>
+<parameter name="font_button">
+<parameter_description> a #GtkFontButton
+</parameter_description>
+</parameter>
+<parameter name="modal">
+<parameter_description> %TRUE to make the dialog modal
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_font_button_set_title">
 <description>
 Sets the title for the font chooser dialog.  
@@ -34935,23 +35246,6 @@ there is none.
 </return>
 </function>
 
-<function name="gtk_frame_get_shadow_type">
-<description>
-Retrieves the shadow type of the frame. See
-gtk_frame_set_shadow_type().
-
-
-</description>
-<parameters>
-<parameter name="frame">
-<parameter_description> a #GtkFrame
-</parameter_description>
-</parameter>
-</parameters>
-<return> the current shadow type of the frame.
-</return>
-</function>
-
 <function name="gtk_frame_new">
 <description>
 Creates a new #GtkFrame, with optional label @label.
@@ -35028,27 +35322,6 @@ will appear embedded in the top edge of the frame as a title.
 <return></return>
 </function>
 
-<function name="gtk_frame_set_shadow_type">
-<description>
-Sets the #GtkFrame:shadow-type for @frame, i.e. whether it is drawn without
-(%GTK_SHADOW_NONE) or with (other values) a visible border. Values other than
-%GTK_SHADOW_NONE are treated identically by GtkFrame. The chosen type is
-applied by removing or adding the .flat class to the main CSS node, frame.
-
-</description>
-<parameters>
-<parameter name="frame">
-<parameter_description> a #GtkFrame
-</parameter_description>
-</parameter>
-<parameter name="type">
-<parameter_description> the new #GtkShadowType
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_gesture_click_get_area">
 <description>
 If an area was set through gtk_gesture_click_set_area(),
@@ -35485,10 +35758,11 @@ returned %TRUE for the sequences being currently interpreted.
 </return>
 </function>
 
-<function name="gtk_gesture_long_press_get_property">
+<function name="gtk_gesture_long_press_get_delay_factor">
 <description>
 Returns the delay factor as set by gtk_gesture_long_press_set_delay_factor().
 
+
 </description>
 <parameters>
 <parameter name="gesture">
@@ -35496,7 +35770,8 @@ Returns the delay factor as set by gtk_gesture_long_press_set_delay_factor().
 </parameter_description>
 </parameter>
 </parameters>
-<return></return>
+<return> the delay factor
+</return>
 </function>
 
 <function name="gtk_gesture_long_press_new">
@@ -35511,11 +35786,10 @@ Returns a newly created #GtkGesture that recognizes long presses.
 </return>
 </function>
 
-<function name="gtk_gesture_long_press_set_property">
+<function name="gtk_gesture_long_press_set_delay_factor">
 <description>
 Applies the given delay factor. The default long press time will be
-multiplied by this value.
-Valid values are in the range [0.5..2.0].
+multiplied by this value. Valid values are in the range [0.5..2.0].
 
 </description>
 <parameters>
@@ -36063,70 +36337,6 @@ worry about it.
 </return>
 </function>
 
-<function name="gtk_get_current_event">
-<description>
-Obtains a reference of the event currently being processed by GTK.
-
-For example, if you are handling a #GtkButton::clicked signal,
-the current event will be the #GdkEventButton that triggered
-the ::clicked signal.
-
-
-</description>
-<parameters>
-</parameters>
-<return> a reference of the current event, or
-%NULL if there is no current event. The returned event must be
-freed with g_object_unref().
-</return>
-</function>
-
-<function name="gtk_get_current_event_device">
-<description>
-If there is a current event and it has a device, return that
-device, otherwise return %NULL.
-
-
-</description>
-<parameters>
-</parameters>
-<return> a #GdkDevice, or %NULL
-</return>
-</function>
-
-<function name="gtk_get_current_event_state">
-<description>
-If there is a current event and it has a state field, place
-that state field in @state and return %TRUE, otherwise return
-%FALSE.
-
-
-</description>
-<parameters>
-<parameter name="state">
-<parameter_description> a location to store the state of the current event
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if there was a current event and it
-had a state field
-</return>
-</function>
-
-<function name="gtk_get_current_event_time">
-<description>
-If there is a current event and it has a timestamp,
-return that timestamp, otherwise return %GDK_CURRENT_TIME.
-
-
-</description>
-<parameters>
-</parameters>
-<return> the timestamp from the current event,
-or %GDK_CURRENT_TIME.
-</return>
-</function>
-
 <function name="gtk_get_debug_flags">
 <description>
 Returns the GTK debug flags.
@@ -37696,10 +37906,9 @@ setting.
 The format of the string is button names, separated by commas.
 A colon separates the buttons that should appear on the left
 from those on the right. Recognized button names are minimize,
-maximize, close, icon (the window icon) and menu (a menu button
-for the fallback app menu).
+maximize, close and icon (the window icon).
 
-For example, “menu:minimize,maximize,close” specifies a menu
+For example, “icon:minimize,maximize,close” specifies a icon
 on the left, and minimize, maximize and close buttons on the right.
 
 </description>
@@ -40937,12 +41146,12 @@ gtk_label_set_attributes(), if any. This function does
 not reflect attributes that come from the labels markup
 (see gtk_label_set_markup()). If you want to get the
 effective attributes for the label, use
-pango_layout_get_attribute (gtk_label_get_layout (label)).
+pango_layout_get_attribute (gtk_label_get_layout (self)).
 
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -40965,7 +41174,7 @@ or for use in a #GtkWidget::query-tooltip handler.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -40982,7 +41191,7 @@ Returns the ellipsizing position of the label. See gtk_label_set_ellipsize().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -40998,7 +41207,7 @@ Gets the menu model set with gtk_label_set_extra_menu().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41014,7 +41223,7 @@ Returns the justification of the label. See gtk_label_set_justify().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41032,7 +41241,7 @@ gtk_label_get_text()).
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41054,7 +41263,7 @@ any time, so it should be considered read-only.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41074,7 +41283,7 @@ and from pixels using PANGO_PIXELS() or #PANGO_SCALE.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41098,7 +41307,7 @@ label should be limited. See gtk_label_set_lines().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41115,7 +41324,7 @@ gtk_label_set_width_chars().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41134,7 +41343,7 @@ layout.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> the label
 </parameter_description>
 </parameter>
@@ -41160,7 +41369,7 @@ mnemonic set up it returns #GDK_KEY_VoidSymbol.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41177,7 +41386,7 @@ label. See gtk_label_set_mnemonic_widget().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41194,7 +41403,7 @@ Gets the value set by gtk_label_set_selectable().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41211,7 +41420,7 @@ if there’s a selection.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41235,7 +41444,7 @@ Returns whether the label is in single line mode.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41253,7 +41462,7 @@ indicating mnemonics or Pango markup. (See gtk_label_get_label())
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41263,23 +41472,6 @@ string used by the label, and must not be modified.
 </return>
 </function>
 
-<function name="gtk_label_get_track_visited_links">
-<description>
-Returns whether the label is currently keeping track
-of clicked links.
-
-
-</description>
-<parameters>
-<parameter name="label">
-<parameter_description> a #GtkLabel
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if clicked links are remembered
-</return>
-</function>
-
 <function name="gtk_label_get_use_markup">
 <description>
 Returns whether the label’s text is interpreted as marked up with
@@ -41289,7 +41481,7 @@ See gtk_label_set_use_markup ().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41306,7 +41498,7 @@ mnemonic. See gtk_label_set_use_underline().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41324,7 +41516,7 @@ gtk_label_set_width_chars().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41341,7 +41533,7 @@ See gtk_label_set_wrap().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41357,7 +41549,7 @@ Returns line wrap mode used by the label. See gtk_label_set_wrap_mode().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41373,7 +41565,7 @@ Gets the #GtkLabel:xalign property for @label.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41389,7 +41581,7 @@ Gets the #GtkLabel:yalign property for @label.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41454,7 +41646,7 @@ this function has no effect. If @start_offset or
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41484,7 +41676,7 @@ to the label after the markup string is parsed.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41503,7 +41695,7 @@ if there is not enough space to render the entire string.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41522,7 +41714,7 @@ the context menu for @label.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41545,7 +41737,7 @@ single line.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41566,7 +41758,7 @@ on the values of the #GtkLabel:use-underline and
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41587,7 +41779,7 @@ number of lines.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41609,13 +41801,13 @@ If the @str is external data, you may need to escape it with
 g_markup_escape_text() or g_markup_printf_escaped():
 
 |[&lt;!-- language=&quot;C&quot; --&gt;
-GtkWidget *label = gtk_label_new (NULL);
+GtkWidget *self = gtk_label_new (NULL);
 const char *str = &quot;...&quot;;
 const char *format = &quot;&lt;span style=\&quot;italic\&quot;&gt;\%s&lt;/span&gt;&quot;;
 char *markup;
 
 markup = g_markup_printf_escaped (format, str);
-gtk_label_set_markup (GTK_LABEL (label), markup);
+gtk_label_set_markup (GTK_LABEL (self), markup);
 g_free (markup);
 ]|
 
@@ -41630,7 +41822,7 @@ See also: gtk_label_set_text()
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41655,7 +41847,7 @@ automatically, or explicitly using gtk_label_set_mnemonic_widget().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41674,7 +41866,7 @@ Sets the desired maximum width in characters of @label to @n_chars.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41705,7 +41897,7 @@ and toggle focus between the colliding widgets otherwise.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41717,27 +41909,6 @@ and toggle focus between the colliding widgets otherwise.
 <return></return>
 </function>
 
-<function name="gtk_label_set_pattern">
-<description>
-The pattern of underlines you want under the existing text within the
-#GtkLabel widget.  For example if the current text of the label says
-“FooBarBaz” passing a pattern of “___   ___” will underline
-“Foo” and “Baz” but not “Bar”.
-
-</description>
-<parameters>
-<parameter name="label">
-<parameter_description> The #GtkLabel you want to set the pattern to.
-</parameter_description>
-</parameter>
-<parameter name="pattern">
-<parameter_description> The pattern as described above.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_label_set_selectable">
 <description>
 Selectable labels allow the user to select text from the label, for
@@ -41745,7 +41916,7 @@ copy-and-paste.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41763,7 +41934,7 @@ Sets whether the label is in single line mode.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41790,7 +41961,7 @@ See also: gtk_label_set_markup()
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41812,7 +41983,7 @@ automatically, or explicitly using gtk_label_set_mnemonic_widget().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41824,25 +41995,6 @@ automatically, or explicitly using gtk_label_set_mnemonic_widget().
 <return></return>
 </function>
 
-<function name="gtk_label_set_track_visited_links">
-<description>
-Sets whether the label should keep track of clicked
-links (and use a different color for them).
-
-</description>
-<parameters>
-<parameter name="label">
-<parameter_description> a #GtkLabel
-</parameter_description>
-</parameter>
-<parameter name="track_links">
-<parameter_description> %TRUE to track visited links
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_label_set_use_markup">
 <description>
 Sets whether the text of the label contains markup in
@@ -41851,7 +42003,7 @@ See gtk_label_set_markup().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41870,7 +42022,7 @@ used for the mnemonic accelerator key.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41888,7 +42040,7 @@ Sets the desired width in characters of @label to @n_chars.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41914,7 +42066,7 @@ set the label’s width using gtk_widget_set_size_request().
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41934,7 +42086,7 @@ wrap on word boundaries.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41952,7 +42104,7 @@ Sets the #GtkLabel:xalign property for @label.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -41970,7 +42122,7 @@ Sets the #GtkLabel:yalign property for @label.
 
 </description>
 <parameters>
-<parameter name="label">
+<parameter name="self">
 <parameter_description> a #GtkLabel
 </parameter_description>
 </parameter>
@@ -45065,6 +45217,22 @@ Returns the direction the popup will be pointing at when popped up.
 </return>
 </function>
 
+<function name="gtk_menu_button_get_has_frame">
+<description>
+Returns whether the button has a frame.
+
+
+</description>
+<parameters>
+<parameter name="menu_button">
+<parameter_description> a #GtkMenuButton
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the button has a frame
+</return>
+</function>
+
 <function name="gtk_menu_button_get_icon_name">
 <description>
 Gets the name of the icon shown in the button.
@@ -45131,19 +45299,21 @@ returns %NULL.
 </return>
 </function>
 
-<function name="gtk_menu_button_get_relief">
+<function name="gtk_menu_button_get_use_underline">
 <description>
-Returns the current relief style of the given #GtkMenuButton.
+Returns whether an embedded underline in the text indicates a
+mnemonic. See gtk_menu_button_set_use_underline().
 
 
 </description>
 <parameters>
 <parameter name="menu_button">
-<parameter_description> The #GtkMenuButton you want the #GtkReliefStyle from.
+<parameter_description> a #GtkMenuButton
 </parameter_description>
 </parameter>
 </parameters>
-<return> The current #GtkReliefStyle
+<return> %TRUE whether an embedded underline in the text indicates
+the mnemonic accelerator keys.
 </return>
 </function>
 
@@ -45278,6 +45448,24 @@ as if you passed %GTK_ARROW_DOWN (although you won’t see any arrows).
 <return></return>
 </function>
 
+<function name="gtk_menu_button_set_has_frame">
+<description>
+Sets the style of the button.
+
+</description>
+<parameters>
+<parameter name="menu_button">
+<parameter_description> a #GtkMenuButton
+</parameter_description>
+</parameter>
+<parameter name="has_frame">
+<parameter_description> whether the button should have a visible frame
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_menu_button_set_icon_name">
 <description>
 Sets the name of an icon to show inside the menu button.
@@ -45362,22 +45550,19 @@ If #GtkMenuButton:menu-model is set, the menu model is dissociated from the
 <return></return>
 </function>
 
-<function name="gtk_menu_button_set_relief">
+<function name="gtk_menu_button_set_use_underline">
 <description>
-Sets the relief style of the edges of the given
-#GtkMenuButton widget.
-
-Two styles exist, %GTK_RELIEF_NORMAL and %GTK_RELIEF_NONE.
-The default style is, as one can guess, %GTK_RELIEF_NORMAL.
+If true, an underline in the text indicates the next character should be
+used for the mnemonic accelerator key.
 
 </description>
 <parameters>
 <parameter name="menu_button">
-<parameter_description> The #GtkMenuButton you want to set relief styles of
+<parameter_description> a #GtkMenuButton
 </parameter_description>
 </parameter>
-<parameter name="relief">
-<parameter_description> The GtkReliefStyle as described above
+<parameter name="use_underline">
+<parameter_description> %TRUE if underlines in the text indicate mnemonics
 </parameter_description>
 </parameter>
 </parameters>
@@ -49598,7 +49783,7 @@ nested submenus instead of the default sliding submenus.
 </return>
 </function>
 
-<function name="gtk_popover_menu_set_model">
+<function name="gtk_popover_menu_set_menu_model">
 <description>
 Sets a new menu model on @popover.
 
@@ -49620,6 +49805,18 @@ to @model.
 <return></return>
 </function>
 
+<function name="gtk_popover_new">
+<description>
+Creates a new popover.
+
+
+</description>
+<parameters>
+</parameters>
+<return> the new popover
+</return>
+</function>
+
 <function name="gtk_popover_popdown">
 <description>
 Pops @popover down.This is different than a gtk_widget_hide() call
@@ -49677,6 +49874,27 @@ different from the current one, will cause the popup to be hidden.
 <return></return>
 </function>
 
+<function name="gtk_popover_set_default_widget">
+<description>
+The default widget is the widget that’s activated when the user
+presses Enter in a dialog (for example). This function sets or
+unsets the default widget for a #GtkPopover.
+
+</description>
+<parameters>
+<parameter name="popover">
+<parameter_description> a #GtkPopover
+</parameter_description>
+</parameter>
+<parameter name="widget">
+<parameter_description> a child widget of @popover to set as
+the default, or %NULL to unset the default widget for the popover
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_popover_set_has_arrow">
 <description>
 Sets whether this popover should draw an arrow
@@ -57110,6 +57328,23 @@ functionality.
 </return>
 </function>
 
+<function name="gtk_scrolled_window_get_has_frame">
+<description>
+Gets whether the scrolled window draws a frame.
+See  gtk_scrolled_window_set_has_frame().
+
+
+</description>
+<parameters>
+<parameter name="scrolled_window">
+<parameter_description> a #GtkScrolledWindow
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the @scrolled_window has a frame
+</return>
+</function>
+
 <function name="gtk_scrolled_window_get_hscrollbar">
 <description>
 Returns the horizontal scrollbar of @scrolled_window.
@@ -57301,23 +57536,6 @@ through the scrolled window’s requested natural width.
 </return>
 </function>
 
-<function name="gtk_scrolled_window_get_shadow_type">
-<description>
-Gets the shadow type of the scrolled window. See 
-gtk_scrolled_window_set_shadow_type().
-
-
-</description>
-<parameters>
-<parameter name="scrolled_window">
-<parameter_description> a #GtkScrolledWindow
-</parameter_description>
-</parameter>
-</parameters>
-<return> the current shadow type
-</return>
-</function>
-
 <function name="gtk_scrolled_window_get_vadjustment">
 <description>
 Returns the vertical scrollbar’s adjustment, used to connect the
@@ -57422,6 +57640,24 @@ Sets the #GtkAdjustment for the horizontal scrollbar.
 <return></return>
 </function>
 
+<function name="gtk_scrolled_window_set_has_frame">
+<description>
+Changes the frame drawn around the contents of @scrolled_window.
+
+</description>
+<parameters>
+<parameter name="scrolled_window">
+<parameter_description> a #GtkScrolledWindow
+</parameter_description>
+</parameter>
+<parameter name="has_frame">
+<parameter_description> whether to draw a frame around scrolled window contents
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_scrolled_window_set_kinetic_scrolling">
 <description>
 Turns kinetic scrolling on or off.
@@ -57646,25 +57882,6 @@ through the scrolled window’s requested natural width.
 <return></return>
 </function>
 
-<function name="gtk_scrolled_window_set_shadow_type">
-<description>
-Changes the type of shadow drawn around the contents of
-@scrolled_window.
-
-</description>
-<parameters>
-<parameter name="scrolled_window">
-<parameter_description> a #GtkScrolledWindow
-</parameter_description>
-</parameter>
-<parameter name="type">
-<parameter_description> kind of shadow to draw around scrolled window contents
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_scrolled_window_set_vadjustment">
 <description>
 Sets the #GtkAdjustment for the vertical scrollbar.
@@ -58460,6 +58677,22 @@ Gets the action that is activated by this shortcut.
 </return>
 </function>
 
+<function name="gtk_shortcut_get_arguments">
+<description>
+Gets the arguments that are passed when activating the shortcut.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkShortcut
+</parameter_description>
+</parameter>
+</parameters>
+<return> the arguments
+</return>
+</function>
+
 <function name="gtk_shortcut_get_trigger">
 <description>
 Gets the trigger used to trigger @self.
@@ -58633,6 +58866,24 @@ If the @action is %NULL, the nothing action will be used.
 <return></return>
 </function>
 
+<function name="gtk_shortcut_set_arguments">
+<description>
+Sets the arguments to pass when activating the shortcut.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkShortcut
+</parameter_description>
+</parameter>
+<parameter name="args">
+<parameter_description> arguments to pass when activating @self
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_shortcut_set_trigger">
 <description>
 Sets the new trigger for @self to be @trigger.
@@ -58904,25 +59155,56 @@ reused for future invocations of this function.
 <return></return>
 </function>
 
-<function name="gtk_show_uri_on_window">
+<function name="gtk_show_uri">
+<description>
+This function launches the default application for showing
+a given uri, or shows an error dialog if that fails.
+
+The uri must be of a form understood by GIO (i.e. you need
+to install gvfs to get support for uri schemes such as http://
+or ftp://, as only local files are handled by GIO itself).
+Typical examples are
+- `file:///home/gnome/pict.jpg`
+- `http://www.gnome.org`
+- `mailto:me gnome org`
+
+</description>
+<parameters>
+<parameter name="parent">
+<parameter_description> parent window
+</parameter_description>
+</parameter>
+<parameter name="uri">
+<parameter_description> the uri to show
+</parameter_description>
+</parameter>
+<parameter name="timestamp">
+<parameter_description> timestamp from the event that triggered this call, or %GDK_CURRENT_TIME
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_show_uri_full">
 <description>
-This is a convenience function for launching the default application
-to show the uri. The uri must be of a form understood by GIO (i.e. you
-need to install gvfs to get support for uri schemes such as http://
+This function launches the default application for showing
+a given uri.
+
+The uri must be of a form understood by GIO (i.e. you need
+to install gvfs to get support for uri schemes such as http://
 or ftp://, as only local files are handled by GIO itself).
 Typical examples are
 - `file:///home/gnome/pict.jpg`
 - `http://www.gnome.org`
 - `mailto:me gnome org`
 
-Ideally the timestamp is taken from the event triggering
-the gtk_show_uri_on_window() call. If timestamp is not known you can take
-%GDK_CURRENT_TIME.
+The @callback will be called when the launch is completed.
+It should call gtk_show_uri_finish() to obtain the result.
 
 This is the recommended call to be used as it passes information
 necessary for sandbox helpers to parent their dialogs properly.
 
-
 </description>
 <parameters>
 <parameter name="parent">
@@ -58934,15 +59216,48 @@ necessary for sandbox helpers to parent their dialogs properly.
 </parameter_description>
 </parameter>
 <parameter name="timestamp">
-<parameter_description> a timestamp to prevent focus stealing
+<parameter_description> timestamp from the event that triggered this call, or %GDK_CURRENT_TIME
+</parameter_description>
+</parameter>
+<parameter name="cancellable">
+<parameter_description> a #GCancellable to cancel the launch
+</parameter_description>
+</parameter>
+<parameter name="callback">
+<parameter_description> a callback to call when the action is complete
+</parameter_description>
+</parameter>
+<parameter name="user_data">
+<parameter_description> data to pass to @callback
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_show_uri_full_finish">
+<description>
+Finished the gtk_show_uri() call and returns the result
+of the operation.
+
+
+</description>
+<parameters>
+<parameter name="parent">
+<parameter_description> the #GtkWindow passed to gtk_show_uri()
+</parameter_description>
+</parameter>
+<parameter name="result">
+<parameter_description> #GASyncResult that was passed to @callback
 </parameter_description>
 </parameter>
 <parameter name="error">
-<parameter_description> a #GError that is returned in case of errors
+<parameter_description> return location for an error
 </parameter_description>
 </parameter>
 </parameters>
-<return> %TRUE on success, %FALSE on error
+<return> %TRUE if the URI was shown successfully.
+Otherwise, %FALSE is returned and @error is set
 </return>
 </function>
 
@@ -62279,25 +62594,6 @@ Removes @provider from the global style providers list in @display.
 <return></return>
 </function>
 
-<function name="gtk_style_context_reset_widgets">
-<description>
-This function recomputes the styles for all widgets under a particular
-#GdkDisplay. This is useful when some global parameter has changed that
-affects the appearance of all widgets, because when a widget gets a new
-style, it will both redraw and recompute any cached information about
-its appearance. As an example, it is used when the color scheme changes
-in the related #GtkSettings object.
-
-</description>
-<parameters>
-<parameter name="display">
-<parameter_description> a #GdkDisplay
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_style_context_restore">
 <description>
 Restores @context state to a previous stage.
@@ -63205,6 +63501,38 @@ entire buffer lies within the range [@start,@end).
 <return></return>
 </function>
 
+<function name="gtk_text_buffer_get_can_redo">
+<description>
+Gets whether there is a redoable action in the history.
+
+
+</description>
+<parameters>
+<parameter name="buffer">
+<parameter_description> a #GtkTextBuffer
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if there is an redoable action
+</return>
+</function>
+
+<function name="gtk_text_buffer_get_can_undo">
+<description>
+Gets whether there is an undoable action in the history.
+
+
+</description>
+<parameters>
+<parameter name="buffer">
+<parameter_description> a #GtkTextBuffer
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if there is an undoable action
+</return>
+</function>
+
 <function name="gtk_text_buffer_get_char_count">
 <description>
 Gets the number of characters in the buffer; note that characters
@@ -64347,6 +64675,10 @@ that cannot be undone.
 <parameter_description> a #GtkTextBuffer
 </parameter_description>
 </parameter>
+<parameter name="enable_undo">
+<parameter_description> %TRUE to enable undo
+</parameter_description>
+</parameter>
 </parameters>
 <return></return>
 </function>
@@ -66926,16 +67258,6 @@ or %NULL.
 <return></return>
 </function>
 
-<function name="gtk_text_layout_get_lines">
-<description>
-
-</description>
-<parameters>
-</parameters>
-<return>
-</return>
-</function>
-
 <function name="gtk_text_layout_is_valid">
 <description>
 Check if there are any invalid regions in a #GtkTextLayout’s buffer
@@ -67084,19 +67406,6 @@ is moved off of the end of a run.
 <return></return>
 </function>
 
-<function name="gtk_text_layout_set_buffer">
-<description>
-
-</description>
-<parameters>
-<parameter name="buffer">
-<parameter_description>
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_text_layout_set_cursor_direction">
 <description>
 Sets which text directions (left-to-right and/or right-to-left) for
@@ -76936,10 +77245,10 @@ This is a utility function that calls gtk_video_set_file(),
 <return></return>
 </function>
 
-<function name="gtk_viewport_get_shadow_type">
+<function name="gtk_viewport_get_scroll_to_focus">
 <description>
-Gets the shadow type of the #GtkViewport. See
-gtk_viewport_set_shadow_type().
+Gets whether the viewport is scrolling to keep the focused
+child in view. See gtk_viewport_set_scroll_to_focus().
 
 
 </description>
@@ -76949,7 +77258,7 @@ gtk_viewport_set_shadow_type().
 </parameter_description>
 </parameter>
 </parameters>
-<return> the shadow type 
+<return> %TRUE if the viewport keeps the focus child scrolled to view
 </return>
 </function>
 
@@ -76974,18 +77283,19 @@ adjustments if none are given.
 </return>
 </function>
 
-<function name="gtk_viewport_set_shadow_type">
+<function name="gtk_viewport_set_scroll_to_focus">
 <description>
-Sets the shadow type of the viewport.
+Sets whether the viewport should automatically scroll
+to keep the focused child in view.
 
 </description>
 <parameters>
 <parameter name="viewport">
-<parameter_description> a #GtkViewport.
+<parameter_description> a #GtkViewport
 </parameter_description>
 </parameter>
-<parameter name="type">
-<parameter_description> the new shadow type.
+<parameter name="scroll_to_focus">
+<parameter_description> whether to keep the focus widget scrolled to view
 </parameter_description>
 </parameter>
 </parameters>
@@ -77753,17 +78063,54 @@ See also: gtk_widget_class_set_layout_manager_type()
 </return>
 </function>
 
+<function name="gtk_widget_class_install_action">
+<description>
+This should be called at class initialization time to specify
+actions to be added for all instances of this class.
+
+Actions installed by this function are stateless. The only state
+they have is whether they are enabled or not.
+
+</description>
+<parameters>
+<parameter name="widget_class">
+<parameter_description> a #GtkWidgetClass
+</parameter_description>
+</parameter>
+<parameter name="action_name">
+<parameter_description> a prefixed action name, such as &quot;clipboard.paste&quot;
+</parameter_description>
+</parameter>
+<parameter name="parameter_type">
+<parameter_description> the parameter type, or %NULL
+</parameter_description>
+</parameter>
+<parameter name="activate">
+<parameter_description> callback to use when the action is activated
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_widget_class_install_property_action">
 <description>
 Installs an action called @action_name on @widget_class and binds its
 state to the value of the @property_name property.
 
-This function will perform a few santity checks on the property selected via
-@property_name. Namely, the property must exist, must be readable, writable and
-must not be construct-only. There are also certain restrictions on the type of
-the given property. If any of these conditions are not met, a critical
+This function will perform a few santity checks on the property selected
+via @property_name. Namely, the property must exist, must be readable,
+writable and must not be construct-only. There are also restrictions
+on the type of the given property, it must be boolean, int, unsigned int,
+double or string. If any of these conditions are not met, a critical
 warning will be printed and no action will be added.
 
+The state type of the action matches the property type.
+
+If the property is boolean, the action will have no parameter and
+toggle the property value. Otherwise, the action will have a parameter
+of the same type as the property.
+
 </description>
 <parameters>
 <parameter name="widget_class">
@@ -79631,32 +79978,13 @@ input focus, and only having the focus within a toplevel.
 </return>
 </function>
 
-<function name="gtk_widget_has_grab">
-<description>
-Determines whether the widget is currently grabbing events, so it
-is the only widget receiving input events (keyboard and mouse).
-
-See also gtk_grab_add().
-
-
-</description>
-<parameters>
-<parameter name="widget">
-<parameter_description> a #GtkWidget
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if the widget is in the grab_widgets stack
-</return>
-</function>
-
 <function name="gtk_widget_has_visible_focus">
 <description>
 Determines if the widget should show a visible indication that
-it has the global input focus. This is a convenience function for
-use in ::draw handlers that takes into account whether focus
-indication should currently be shown in the toplevel window of
-@widget. See gtk_window_get_focus_visible() for more information
+it has the global input focus. This is a convenience function
+that takes into account whether focus indication should currently
+be shown in the toplevel window of @widget.
+See gtk_window_get_focus_visible() for more information
 about focus indication.
 
 To find out if the widget has the global input focus, use
@@ -80456,23 +80784,6 @@ gtk_widget_add_tick_callback().
 <return></return>
 </function>
 
-<function name="gtk_widget_reset_style">
-<description>
-Updates the style context of @widget and all descendants
-by updating its widget path. #GtkContainers may want
-to use this on a child when reordering it in a way that a different
-style might apply to it.
-
-</description>
-<parameters>
-<parameter name="widget">
-<parameter_description> a #GtkWidget
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gtk_widget_set_can_focus">
 <description>
 Specifies whether @widget can own the input focus.
diff --git a/gtk/src/gtk_enums.defs b/gtk/src/gtk_enums.defs
index a785a244..355e1596 100644
--- a/gtk/src/gtk_enums.defs
+++ b/gtk/src/gtk_enums.defs
@@ -42,7 +42,11 @@
 ;;   GTK_LICENSE_LGPL_3_0_ONLY,
 ;; 
 ;;   GTK_LICENSE_AGPL_3_0,
-;;   GTK_LICENSE_AGPL_3_0_ONLY
+;;   GTK_LICENSE_AGPL_3_0_ONLY,
+;; 
+;;   GTK_LICENSE_BSD_3,
+;;   GTK_LICENSE_APACHE_2_0,
+;;   GTK_LICENSE_MPL_2_0
 ;; } GtkLicense;
 
 (define-enum-extended GtkLicense
@@ -64,6 +68,9 @@
     '("lgpl-3-0-only" "GTK_LICENSE_LGPL_3_0_ONLY" "12")
     '("agpl-3-0" "GTK_LICENSE_AGPL_3_0" "13")
     '("agpl-3-0-only" "GTK_LICENSE_AGPL_3_0_ONLY" "14")
+    '("bsd-3" "GTK_LICENSE_BSD_3" "15")
+    '("apache-2-0" "GTK_LICENSE_APACHE_2_0" "16")
+    '("mpl-2-0" "GTK_LICENSE_MPL_2_0" "17")
   )
 )
 
@@ -745,22 +752,6 @@
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_RELIEF_NORMAL,
-;;   GTK_RELIEF_NONE
-;; } GtkReliefStyle;
-
-(define-enum-extended GtkReliefStyle
-  (in-module "Gsk")
-  (c-name "GtkReliefStyle")
-  (values
-    '("normal" "GTK_RELIEF_NORMAL" "0")
-    '("none" "GTK_RELIEF_NONE" "1")
-  )
-)
-
 ;; Original typedef:
 ;; typedef enum
 ;; {
@@ -825,28 +816,6 @@
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_SHADOW_NONE,
-;;   GTK_SHADOW_IN,
-;;   GTK_SHADOW_OUT,
-;;   GTK_SHADOW_ETCHED_IN,
-;;   GTK_SHADOW_ETCHED_OUT
-;; } GtkShadowType;
-
-(define-enum-extended GtkShadowType
-  (in-module "Gsk")
-  (c-name "GtkShadowType")
-  (values
-    '("none" "GTK_SHADOW_NONE" "0")
-    '("in" "GTK_SHADOW_IN" "1")
-    '("out" "GTK_SHADOW_OUT" "2")
-    '("etched-in" "GTK_SHADOW_ETCHED_IN" "3")
-    '("etched-out" "GTK_SHADOW_ETCHED_OUT" "4")
-  )
-)
-
 ;; Original typedef:
 ;; typedef enum
 ;; {
@@ -1117,7 +1086,8 @@
 ;;   GTK_STATE_FLAG_VISITED       = 1 << 10,
 ;;   GTK_STATE_FLAG_CHECKED       = 1 << 11,
 ;;   GTK_STATE_FLAG_DROP_ACTIVE   = 1 << 12,
-;;   GTK_STATE_FLAG_FOCUS_VISIBLE = 1 << 13
+;;   GTK_STATE_FLAG_FOCUS_VISIBLE = 1 << 13,
+;;   GTK_STATE_FLAG_FOCUS_WITHIN  = 1 << 14
 ;; } GtkStateFlags;
 
 (define-flags-extended GtkStateFlags
@@ -1139,6 +1109,7 @@
     '("checked" "GTK_STATE_FLAG_CHECKED" "1 << 11")
     '("drop-active" "GTK_STATE_FLAG_DROP_ACTIVE" "1 << 12")
     '("focus-visible" "GTK_STATE_FLAG_FOCUS_VISIBLE" "1 << 13")
+    '("focus-within" "GTK_STATE_FLAG_FOCUS_WITHIN" "1 << 14")
   )
 )
 
@@ -1494,6 +1465,27 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   GTK_SYSTEM_SETTING_DPI,
+;;   GTK_SYSTEM_SETTING_FONT_NAME,
+;;   GTK_SYSTEM_SETTING_FONT_CONFIG,
+;;   GTK_SYSTEM_SETTING_DISPLAY,
+;;   GTK_SYSTEM_SETTING_ICON_THEME
+;; } GtkSystemSetting;
+
+(define-enum-extended GtkSystemSetting
+  (in-module "Gsk")
+  (c-name "GtkSystemSetting")
+  (values
+    '("dpi" "GTK_SYSTEM_SETTING_DPI" "0")
+    '("font-name" "GTK_SYSTEM_SETTING_FONT_NAME" "1")
+    '("font-config" "GTK_SYSTEM_SETTING_FONT_CONFIG" "2")
+    '("display" "GTK_SYSTEM_SETTING_DISPLAY" "3")
+    '("icon-theme" "GTK_SYSTEM_SETTING_ICON_THEME" "4")
+  )
+)
+
 ;; From gtkeventcontrollerscroll.h
 
 ;; Original typedef:
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index a718fbac..29c6c60c 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -505,6 +505,9 @@
     '("lgpl-3-0-only" "GTK_LICENSE_LGPL_3_0_ONLY")
     '("agpl-3-0" "GTK_LICENSE_AGPL_3_0")
     '("agpl-3-0-only" "GTK_LICENSE_AGPL_3_0_ONLY")
+    '("bsd-3" "GTK_LICENSE_BSD_3")
+    '("apache-2-0" "GTK_LICENSE_APACHE_2_0")
+    '("mpl-2-0" "GTK_LICENSE_MPL_2_0")
   )
 )
 
@@ -895,16 +898,6 @@
   )
 )
 
-(define-enum ReliefStyle
-  (in-module "Gtk")
-  (c-name "GtkReliefStyle")
-  (gtype-id "GTK_TYPE_RELIEF_STYLE")
-  (values
-    '("normal" "GTK_RELIEF_NORMAL")
-    '("none" "GTK_RELIEF_NONE")
-  )
-)
-
 (define-enum ScrollType
   (in-module "Gtk")
   (c-name "GtkScrollType")
@@ -941,19 +934,6 @@
   )
 )
 
-(define-enum ShadowType
-  (in-module "Gtk")
-  (c-name "GtkShadowType")
-  (gtype-id "GTK_TYPE_SHADOW_TYPE")
-  (values
-    '("none" "GTK_SHADOW_NONE")
-    '("in" "GTK_SHADOW_IN")
-    '("out" "GTK_SHADOW_OUT")
-    '("etched-in" "GTK_SHADOW_ETCHED_IN")
-    '("etched-out" "GTK_SHADOW_ETCHED_OUT")
-  )
-)
-
 (define-enum WrapMode
   (in-module "Gtk")
   (c-name "GtkWrapMode")
@@ -1127,6 +1107,7 @@
     '("checked" "GTK_STATE_FLAG_CHECKED")
     '("drop-active" "GTK_STATE_FLAG_DROP_ACTIVE")
     '("focus-visible" "GTK_STATE_FLAG_FOCUS_VISIBLE")
+    '("focus-within" "GTK_STATE_FLAG_FOCUS_WITHIN")
   )
 )
 
@@ -1342,6 +1323,19 @@
   )
 )
 
+(define-enum SystemSetting
+  (in-module "Gtk")
+  (c-name "GtkSystemSetting")
+  (gtype-id "GTK_TYPE_SYSTEM_SETTING")
+  (values
+    '("dpi" "GTK_SYSTEM_SETTING_DPI")
+    '("font-name" "GTK_SYSTEM_SETTING_FONT_NAME")
+    '("font-config" "GTK_SYSTEM_SETTING_FONT_CONFIG")
+    '("display" "GTK_SYSTEM_SETTING_DISPLAY")
+    '("icon-theme" "GTK_SYSTEM_SETTING_ICON_THEME")
+  )
+)
+
 (define-flags EventControllerScrollFlags
   (in-module "Gtk")
   (c-name "GtkEventControllerScrollFlags")
@@ -2767,6 +2761,21 @@
   (return-type "gboolean")
 )
 
+(define-method get_modal
+  (of-object "GtkAppChooserButton")
+  (c-name "gtk_app_chooser_button_get_modal")
+  (return-type "gboolean")
+)
+
+(define-method set_modal
+  (of-object "GtkAppChooserButton")
+  (c-name "gtk_app_chooser_button_set_modal")
+  (return-type "none")
+  (parameters
+    '("gboolean" "modal")
+  )
+)
+
 
 
 ;; From gtkappchooserdialog.h
@@ -3175,26 +3184,73 @@
   (is-constructor-of "GtkAspectFrame")
   (return-type "GtkWidget*")
   (parameters
-    '("const-gchar*" "label")
-    '("gfloat" "xalign")
-    '("gfloat" "yalign")
-    '("gfloat" "ratio")
+    '("float" "xalign")
+    '("float" "yalign")
+    '("float" "ratio")
     '("gboolean" "obey_child")
   )
 )
 
-(define-method set
+(define-method set_xalign
   (of-object "GtkAspectFrame")
-  (c-name "gtk_aspect_frame_set")
+  (c-name "gtk_aspect_frame_set_xalign")
+  (return-type "none")
+  (parameters
+    '("float" "xalign")
+  )
+)
+
+(define-method get_xalign
+  (of-object "GtkAspectFrame")
+  (c-name "gtk_aspect_frame_get_xalign")
+  (return-type "float")
+)
+
+(define-method set_yalign
+  (of-object "GtkAspectFrame")
+  (c-name "gtk_aspect_frame_set_yalign")
+  (return-type "none")
+  (parameters
+    '("float" "yalign")
+  )
+)
+
+(define-method get_yalign
+  (of-object "GtkAspectFrame")
+  (c-name "gtk_aspect_frame_get_yalign")
+  (return-type "float")
+)
+
+(define-method set_ratio
+  (of-object "GtkAspectFrame")
+  (c-name "gtk_aspect_frame_set_ratio")
+  (return-type "none")
+  (parameters
+    '("float" "ratio")
+  )
+)
+
+(define-method get_ratio
+  (of-object "GtkAspectFrame")
+  (c-name "gtk_aspect_frame_get_ratio")
+  (return-type "float")
+)
+
+(define-method set_obey_child
+  (of-object "GtkAspectFrame")
+  (c-name "gtk_aspect_frame_set_obey_child")
   (return-type "none")
   (parameters
-    '("gfloat" "xalign")
-    '("gfloat" "yalign")
-    '("gfloat" "ratio")
     '("gboolean" "obey_child")
   )
 )
 
+(define-method get_obey_child
+  (of-object "GtkAspectFrame")
+  (c-name "gtk_aspect_frame_get_obey_child")
+  (return-type "gboolean")
+)
+
 
 
 ;; From gtkassistant.h
@@ -4076,19 +4132,19 @@
   )
 )
 
-(define-method set_relief
+(define-method set_has_frame
   (of-object "GtkButton")
-  (c-name "gtk_button_set_relief")
+  (c-name "gtk_button_set_has_frame")
   (return-type "none")
   (parameters
-    '("GtkReliefStyle" "relief")
+    '("gboolean" "has_frame")
   )
 )
 
-(define-method get_relief
+(define-method get_has_frame
   (of-object "GtkButton")
-  (c-name "gtk_button_get_relief")
-  (return-type "GtkReliefStyle")
+  (c-name "gtk_button_get_has_frame")
+  (return-type "gboolean")
 )
 
 (define-method set_label
@@ -5840,6 +5896,21 @@
   (return-type "const-gchar*")
 )
 
+(define-method get_modal
+  (of-object "GtkColorButton")
+  (c-name "gtk_color_button_get_modal")
+  (return-type "gboolean")
+)
+
+(define-method set_modal
+  (of-object "GtkColorButton")
+  (c-name "gtk_color_button_set_modal")
+  (return-type "none")
+  (parameters
+    '("gboolean" "modal")
+  )
+)
+
 
 
 ;; From gtkcolorchooserdialog.h
@@ -6638,36 +6709,6 @@
   (return-type "GList*")
 )
 
-(define-method set_focus_vadjustment
-  (of-object "GtkContainer")
-  (c-name "gtk_container_set_focus_vadjustment")
-  (return-type "none")
-  (parameters
-    '("GtkAdjustment*" "adjustment")
-  )
-)
-
-(define-method get_focus_vadjustment
-  (of-object "GtkContainer")
-  (c-name "gtk_container_get_focus_vadjustment")
-  (return-type "GtkAdjustment*")
-)
-
-(define-method set_focus_hadjustment
-  (of-object "GtkContainer")
-  (c-name "gtk_container_set_focus_hadjustment")
-  (return-type "none")
-  (parameters
-    '("GtkAdjustment*" "adjustment")
-  )
-)
-
-(define-method get_focus_hadjustment
-  (of-object "GtkContainer")
-  (c-name "gtk_container_get_focus_hadjustment")
-  (return-type "GtkAdjustment*")
-)
-
 (define-method child_type
   (of-object "GtkContainer")
   (c-name "gtk_container_child_type")
@@ -8435,6 +8476,30 @@
   )
 )
 
+(define-method get_current_event
+  (of-object "GtkEventController")
+  (c-name "gtk_event_controller_get_current_event")
+  (return-type "GdkEvent*")
+)
+
+(define-method get_current_event_time
+  (of-object "GtkEventController")
+  (c-name "gtk_event_controller_get_current_event_time")
+  (return-type "guint32")
+)
+
+(define-method get_current_event_device
+  (of-object "GtkEventController")
+  (c-name "gtk_event_controller_get_current_event_device")
+  (return-type "GdkDevice*")
+)
+
+(define-method get_current_event_state
+  (of-object "GtkEventController")
+  (c-name "gtk_event_controller_get_current_event_state")
+  (return-type "GdkModifierType")
+)
+
 
 
 ;; From gtkeventcontrollerkey.h
@@ -8728,6 +8793,21 @@
   )
 )
 
+(define-method get_modal
+  (of-object "GtkFileChooserButton")
+  (c-name "gtk_file_chooser_button_get_modal")
+  (return-type "gboolean")
+)
+
+(define-method set_modal
+  (of-object "GtkFileChooserButton")
+  (c-name "gtk_file_chooser_button_set_modal")
+  (return-type "none")
+  (parameters
+    '("gboolean" "modal")
+  )
+)
+
 
 
 ;; From gtkfilechooserdialog.h
@@ -9696,6 +9776,21 @@
   )
 )
 
+(define-method get_modal
+  (of-object "GtkFontButton")
+  (c-name "gtk_font_button_get_modal")
+  (return-type "gboolean")
+)
+
+(define-method set_modal
+  (of-object "GtkFontButton")
+  (c-name "gtk_font_button_set_modal")
+  (return-type "none")
+  (parameters
+    '("gboolean" "modal")
+  )
+)
+
 (define-method get_use_font
   (of-object "GtkFontButton")
   (c-name "gtk_font_button_get_use_font")
@@ -9976,21 +10071,6 @@
   (return-type "gfloat")
 )
 
-(define-method set_shadow_type
-  (of-object "GtkFrame")
-  (c-name "gtk_frame_set_shadow_type")
-  (return-type "none")
-  (parameters
-    '("GtkShadowType" "type")
-  )
-)
-
-(define-method get_shadow_type
-  (of-object "GtkFrame")
-  (c-name "gtk_frame_get_shadow_type")
-  (return-type "GtkShadowType")
-)
-
 
 
 ;; From gtkgestureclick.h
@@ -12518,7 +12598,7 @@
   (c-name "gtk_label_set_width_chars")
   (return-type "none")
   (parameters
-    '("gint" "n_chars")
+    '("int" "n_chars")
   )
 )
 
@@ -12533,7 +12613,7 @@
   (c-name "gtk_label_set_max_width_chars")
   (return-type "none")
   (parameters
-    '("gint" "n_chars")
+    '("int" "n_chars")
   )
 )
 
@@ -12558,15 +12638,6 @@
   (return-type "gint")
 )
 
-(define-method set_pattern
-  (of-object "GtkLabel")
-  (c-name "gtk_label_set_pattern")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "pattern")
-  )
-)
-
 (define-method set_wrap
   (of-object "GtkLabel")
   (c-name "gtk_label_set_wrap")
@@ -12669,21 +12740,6 @@
   (return-type "const-gchar*")
 )
 
-(define-method set_track_visited_links
-  (of-object "GtkLabel")
-  (c-name "gtk_label_set_track_visited_links")
-  (return-type "none")
-  (parameters
-    '("gboolean" "track_links")
-  )
-)
-
-(define-method get_track_visited_links
-  (of-object "GtkLabel")
-  (c-name "gtk_label_get_track_visited_links")
-  (return-type "gboolean")
-)
-
 (define-method set_xalign
   (of-object "GtkLabel")
   (c-name "gtk_label_set_xalign")
@@ -13651,29 +13707,6 @@
   (return-type "GtkTextDirection")
 )
 
-(define-function gtk_get_current_event
-  (c-name "gtk_get_current_event")
-  (return-type "GdkEvent*")
-)
-
-(define-function gtk_get_current_event_time
-  (c-name "gtk_get_current_event_time")
-  (return-type "guint32")
-)
-
-(define-function gtk_get_current_event_state
-  (c-name "gtk_get_current_event_state")
-  (return-type "gboolean")
-  (parameters
-    '("GdkModifierType*" "state")
-  )
-)
-
-(define-function gtk_get_current_event_device
-  (c-name "gtk_get_current_event_device")
-  (return-type "GdkDevice*")
-)
-
 
 
 ;; From gtkmaplistmodel.h
@@ -14202,19 +14235,19 @@
   (return-type "gboolean")
 )
 
-(define-method set_relief
+(define-method set_has_frame
   (of-object "GtkMenuButton")
-  (c-name "gtk_menu_button_set_relief")
+  (c-name "gtk_menu_button_set_has_frame")
   (return-type "none")
   (parameters
-    '("GtkReliefStyle" "relief")
+    '("gboolean" "has_frame")
   )
 )
 
-(define-method get_relief
+(define-method get_has_frame
   (of-object "GtkMenuButton")
-  (c-name "gtk_menu_button_get_relief")
-  (return-type "GtkReliefStyle")
+  (c-name "gtk_menu_button_get_has_frame")
+  (return-type "gboolean")
 )
 
 (define-method popup
@@ -19357,19 +19390,19 @@
   (return-type "GtkCornerType")
 )
 
-(define-method set_shadow_type
+(define-method set_has_frame
   (of-object "GtkScrolledWindow")
-  (c-name "gtk_scrolled_window_set_shadow_type")
+  (c-name "gtk_scrolled_window_set_has_frame")
   (return-type "none")
   (parameters
-    '("GtkShadowType" "type")
+    '("gboolean" "has_frame")
   )
 )
 
-(define-method get_shadow_type
+(define-method get_has_frame
   (of-object "GtkScrolledWindow")
-  (c-name "gtk_scrolled_window_get_shadow_type")
-  (return-type "GtkShadowType")
+  (c-name "gtk_scrolled_window_get_has_frame")
+  (return-type "gboolean")
 )
 
 (define-method get_min_content_width
@@ -20139,17 +20172,39 @@
 
 ;; From gtkshow.h
 
-(define-function gtk_show_uri_on_window
-  (c-name "gtk_show_uri_on_window")
-  (return-type "gboolean")
+(define-function gtk_show_uri_full
+  (c-name "gtk_show_uri_full")
+  (return-type "none")
   (parameters
     '("GtkWindow*" "parent")
     '("const-char*" "uri")
     '("guint32" "timestamp")
+    '("GCancellable*" "cancellable")
+    '("GAsyncReadyCallback" "callback")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-function gtk_show_uri_full_finish
+  (c-name "gtk_show_uri_full_finish")
+  (return-type "gboolean")
+  (parameters
+    '("GtkWindow*" "parent")
+    '("GAsyncResult*" "result")
     '("GError**" "error")
   )
 )
 
+(define-function gtk_show_uri
+  (c-name "gtk_show_uri")
+  (return-type "none")
+  (parameters
+    '("GtkWindow*" "parent")
+    '("const-char*" "uri")
+    '("guint32" "timestamp")
+  )
+)
+
 
 
 ;; From gtksingleselection.h
@@ -27105,19 +27160,19 @@
   )
 )
 
-(define-method set_shadow_type
+(define-method get_scroll_to_focus
   (of-object "GtkViewport")
-  (c-name "gtk_viewport_set_shadow_type")
-  (return-type "none")
-  (parameters
-    '("GtkShadowType" "type")
-  )
+  (c-name "gtk_viewport_get_scroll_to_focus")
+  (return-type "gboolean")
 )
 
-(define-method get_shadow_type
+(define-method set_scroll_to_focus
   (of-object "GtkViewport")
-  (c-name "gtk_viewport_get_shadow_type")
-  (return-type "GtkShadowType")
+  (c-name "gtk_viewport_set_scroll_to_focus")
+  (return-type "none")
+  (parameters
+    '("gboolean" "scroll_to_focus")
+  )
 )
 
 
@@ -27366,15 +27421,6 @@
   )
 )
 
-(define-method can_activate_accel
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_can_activate_accel")
-  (return-type "gboolean")
-  (parameters
-    '("guint" "signal_id")
-  )
-)
-
 (define-method mnemonic_activate
   (of-object "GtkWidget")
   (c-name "gtk_widget_mnemonic_activate")
@@ -27480,12 +27526,6 @@
   (return-type "gboolean")
 )
 
-(define-method has_grab
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_has_grab")
-  (return-type "gboolean")
-)
-
 (define-method device_is_shadowed
   (of-object "GtkWidget")
   (c-name "gtk_widget_device_is_shadowed")
@@ -28079,12 +28119,6 @@
   )
 )
 
-(define-method reset_style
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_reset_style")
-  (return-type "none")
-)
-
 (define-method create_pango_context
   (of-object "GtkWidget")
   (c-name "gtk_widget_create_pango_context")
@@ -29428,11 +29462,6 @@
   (return-type "GType")
 )
 
-(define-function gtk_relief_style_get_type
-  (c-name "gtk_relief_style_get_type")
-  (return-type "GType")
-)
-
 (define-function gtk_scroll_type_get_type
   (c-name "gtk_scroll_type_get_type")
   (return-type "GType")
@@ -29443,11 +29472,6 @@
   (return-type "GType")
 )
 
-(define-function gtk_shadow_type_get_type
-  (c-name "gtk_shadow_type_get_type")
-  (return-type "GType")
-)
-
 (define-function gtk_wrap_mode_get_type
   (c-name "gtk_wrap_mode_get_type")
   (return-type "GType")
@@ -29598,6 +29622,11 @@
   (return-type "GType")
 )
 
+(define-function gtk_system_setting_get_type
+  (c-name "gtk_system_setting_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 c85a0872..2c4db8ed 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -354,6 +354,16 @@
   (default-value "")
 )
 
+(define-property modal
+  (of-object "GtkAppChooserButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether the dialog should be modal")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+  (default-value "TRUE")
+)
+
 ;; From GtkAppChooserDialog
 
 (define-property gfile
@@ -795,14 +805,14 @@
   (default-value "")
 )
 
-(define-property relief
+(define-property has-frame
   (of-object "GtkButton")
-  (prop-type "GParamEnum")
-  (docs "The border relief style")
+  (prop-type "GParamBoolean")
+  (docs "Whether the button has a frame")
   (readable #t)
   (writable #t)
   (construct-only #f)
-  (default-value "GTK_RELIEF_NORMAL")
+  (default-value "TRUE")
 )
 
 (define-property use-underline
@@ -2204,6 +2214,16 @@
   (default-value "FALSE")
 )
 
+(define-property modal
+  (of-object "GtkColorButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether the dialog is modal")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+  (default-value "TRUE")
+)
+
 ;; From GtkColorChooser
 
 (define-signal color-activated
@@ -4069,6 +4089,16 @@
   (default-value "-1")
 )
 
+(define-property modal
+  (of-object "GtkFileChooserButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to make the dialog modal")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+  (default-value "TRUE")
+)
+
 ;; From GtkFileChooserDialog
 
 ;; From GtkFileChooserNative
@@ -4231,6 +4261,8 @@
   (parameters
     '("GtkMovementStep" "p0")
     '("gint" "p1")
+    '("gboolean" "p2")
+    '("gboolean" "p3")
   )
 )
 
@@ -4352,6 +4384,16 @@
   (default-value "Pick a Font")
 )
 
+(define-property modal
+  (of-object "GtkFontButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether the dialog is modal")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+  (default-value "TRUE")
+)
+
 (define-property use-font
   (of-object "GtkFontButton")
   (prop-type "GParamBoolean")
@@ -4487,16 +4529,6 @@
   (default-value "0")
 )
 
-(define-property shadow-type
-  (of-object "GtkFrame")
-  (prop-type "GParamEnum")
-  (docs "Appearance of the frame")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-  (default-value "GTK_SHADOW_ETCHED_IN")
-)
-
 (define-property label-widget
   (of-object "GtkFrame")
   (prop-type "GParamObject")
@@ -5327,6 +5359,8 @@
   (parameters
     '("GtkMovementStep" "p0")
     '("gint" "p1")
+    '("gboolean" "p2")
+    '("gboolean" "p3")
   )
 )
 
@@ -5620,16 +5654,6 @@
   (default-value "GTK_JUSTIFY_LEFT")
 )
 
-(define-property pattern
-  (of-object "GtkLabel")
-  (prop-type "GParamString")
-  (docs "A string with _ characters in positions correspond to characters in the text to underline")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-  (default-value "")
-)
-
 (define-property wrap
   (of-object "GtkLabel")
   (prop-type "GParamBoolean")
@@ -5679,26 +5703,6 @@
   (construct-only #f)
 )
 
-(define-property cursor-position
-  (of-object "GtkLabel")
-  (prop-type "GParamInt")
-  (docs "The current position of the insertion cursor in chars")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-  (default-value "0")
-)
-
-(define-property selection-bound
-  (of-object "GtkLabel")
-  (prop-type "GParamInt")
-  (docs "The position of the opposite end of the selection from the cursor in chars")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-  (default-value "0")
-)
-
 (define-property ellipsize
   (of-object "GtkLabel")
   (prop-type "GParamEnum")
@@ -5739,16 +5743,6 @@
   (default-value "-1")
 )
 
-(define-property track-visited-links
-  (of-object "GtkLabel")
-  (prop-type "GParamBoolean")
-  (docs "Whether visited links should be tracked")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-  (default-value "TRUE")
-)
-
 (define-property lines
   (of-object "GtkLabel")
   (prop-type "GParamInt")
@@ -5907,6 +5901,8 @@
   (parameters
     '("GtkMovementStep" "p0")
     '("gint" "p1")
+    '("gboolean" "p2")
+    '("gboolean" "p3")
   )
 )
 
@@ -6318,14 +6314,14 @@
   (default-value "FALSE")
 )
 
-(define-property relief
+(define-property has-frame
   (of-object "GtkMenuButton")
-  (prop-type "GParamEnum")
-  (docs "The border relief style")
+  (prop-type "GParamBoolean")
+  (docs "Whether the button has a frame")
   (readable #t)
   (writable #t)
   (construct-only #f)
-  (default-value "GTK_RELIEF_NORMAL")
+  (default-value "TRUE")
 )
 
 ;; From GtkMessageDialog
@@ -8168,14 +8164,14 @@
   (default-value "GTK_CORNER_TOP_LEFT")
 )
 
-(define-property shadow-type
+(define-property has-frame
   (of-object "GtkScrolledWindow")
-  (prop-type "GParamEnum")
-  (docs "Style of bevel around the contents")
+  (prop-type "GParamBoolean")
+  (docs "Whether to draw a frame around the contents")
   (readable #t)
   (writable #t)
   (construct-only #f)
-  (default-value "GTK_SHADOW_NONE")
+  (default-value "FALSE")
 )
 
 (define-property min-content-width
@@ -11420,6 +11416,8 @@
   (parameters
     '("GtkMovementStep" "p0")
     '("gint" "p1")
+    '("gboolean" "p2")
+    '("gboolean" "p3")
   )
 )
 
@@ -11941,14 +11939,14 @@
 
 ;; From GtkViewport
 
-(define-property shadow-type
+(define-property scroll-to-focus
   (of-object "GtkViewport")
-  (prop-type "GParamEnum")
-  (docs "Determines how the shadowed box around the viewport is drawn")
+  (prop-type "GParamBoolean")
+  (docs "Whether to scroll when the focus changes")
   (readable #t)
   (writable #t)
   (construct-only #f)
-  (default-value "GTK_SHADOW_IN")
+  (default-value "FALSE")
 )
 
 ;; From GtkVolumeButton
diff --git a/gtk/src/gtk_vfuncs.defs b/gtk/src/gtk_vfuncs.defs
index a7276c81..8af31f08 100644
--- a/gtk/src/gtk_vfuncs.defs
+++ b/gtk/src/gtk_vfuncs.defs
@@ -280,14 +280,6 @@
    )
 )
 
-(define-vfunc set_focus_child
-  (of-object "GtkContainer")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "child")
-  )
-)
-
 ; GtkEditable
 
 (define-vfunc get_text
@@ -861,6 +853,14 @@
   (return-type "gboolean")
 )
 
+(define-vfunc set_focus_child
+  (of-object "GtkWidget")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "child")
+  )
+)
+
 (define-vfunc get_accessible
   (of-object "GtkWidget")
   (return-type "AtkObject*")
diff --git a/tools/gen_scripts/gdk_generate_extra_defs.sh b/tools/gen_scripts/gdk_generate_extra_defs.sh
index 83c0a1d8..9ae2b149 100755
--- a/tools/gen_scripts/gdk_generate_extra_defs.sh
+++ b/tools/gen_scripts/gdk_generate_extra_defs.sh
@@ -2,11 +2,39 @@
 
 # The script assumes that it resides in the tools/gen_scripts directory
 # and the defs file will be placed in gdk/src.
+# It shall be executed from the tools/gen_scripts directory.
+
+# To update the gdk_signals.defs file:
+# 1. ./gdk_generate_extra_defs.sh
+#    Generates gdk/src/gdk_signals.defs.orig and gdk/src/gdk_signals.defs.
+#    If any hunks from the patch file fail to apply, apply them manually to the
+#    gdk_signals.defs file, if required.
+# 2. Optional: Remove gdk/src/gdk_signals.defs.orig.
+
+# To update the gdk_signals.defs file and the patch file:
+# 1. Like step 1 when updating only the gdk_signals.defs file.
+# 2. Apply new patches manually to the gdk_signals.defs file.
+# 3. ./gdk_generate_extra_defs.sh --make-patch
+# 4. Like step 2 when updating only the gdk_signals.defs file.
 
 source "$(dirname "$0")/init_generate.sh"
 
 out_dir="$root_dir/gdk/src"
+out_defs_file="$out_dir"/gdk_signals.defs
 
-# Without LC_ALL=C documentation (docs "xxx") may be translated in the .defs file.
-LC_ALL=C "$extra_defs_gen_dir"/generate_defs_gdk > "$out_dir"/gdk_signals.defs
+if [ $# -eq 0 ]
+then
+  # Without LC_ALL=C documentation (docs "xxx") may be translated in the .defs file.
+  LC_ALL=C "$extra_defs_gen_dir"/generate_defs_gdk > "$out_defs_file"
+  # patch version 2.7.5 does not like directory names.
+  cd "$(dirname "$out_defs_file")"
+  patch_options="--backup --version-control=simple --suffix=.orig"
+  patch $patch_options "$(basename "$out_defs_file")" "$(basename "$out_defs_file").patch"
+elif [ "$1" = "--make-patch" ]
+then
+  diff --unified=5 "$out_defs_file".orig "$out_defs_file" > "$out_defs_file".patch
+else
+  echo "Usage: $0 [--make-patch]"
+  exit 1
+fi
 


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