3 files changed, 24 insertions, 33 deletions
diff --git a/vapi/metadata/Gdk-4.0.metadata b/vapi/metadata/Gdk-4.0.metadata
index fb5e0909a..18ffd126d 100644
--- a/vapi/metadata/Gdk-4.0.metadata
+++ b/vapi/metadata/Gdk-4.0.metadata
@@ -1,5 +1,4 @@
 KEY_* name="KEY_(.+)" parent="Gdk.Key"
-selection_* name="selection_(.+)" parent="Gdk.Selection"
 
 *.ref unowned
 
@@ -25,13 +24,10 @@ Rectangle struct
         .y skip
         .width skip
         .height skip
-selection_add_targets.targets array array_length_idx=-1
-selection_add_targets.n_targets skip
 RGBA struct
 ModifierType
         .modifier_reserved_*_mask skip
 pango_layout_get_clip_region skip=false
-property_change skip=false
 Texture
         // Factory method
         .new_* symbol_type="function" name="new_(.+)"
@@ -47,33 +43,27 @@ Device
 Rectangle.union return_void
 Window.get_frame_extents return_void
 
-EventAny struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventButton struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventConfigure struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventCrossing struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventDND struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventExpose struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventFocus struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventGrabBroken struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventKey struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventMotion struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventOwnerChange struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventPadAxis struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventPadButton struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventPadGroupMode struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventProperty struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventProximity struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventScroll struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventSelection struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventSetting struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventTouch struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventTouchpadPinch struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventTouchpadSwipe struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
-EventWindowState struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()"
+EventAny skip
+EventButton skip
+EventConfigure skip
+EventCrossing skip
+EventDND skip
+EventExpose skip
+EventFocus skip
+EventGrabBroken skip
+EventKey skip
+EventMotion skip
+EventPadAxis skip
+EventPadButton skip
+EventPadGroupMode skip
+EventProximity skip
+EventScroll skip
+EventSetting skip
+EventTouch skip
+EventTouchpadPinch skip
+EventTouchpadSwipe skip
+
 FilterFunc.data closure=2
-property_change.data array
-selection_property_get skip=false
-        .data array
 threads_add_idle skip=false
 threads_add_timeout skip=false
 threads_add_timeout_seconds skip=false
diff --git a/vapi/metadata/GdkX11-4.0.metadata b/vapi/metadata/GdkX11-4.0.metadata
index f70e9ed0f..89009452c 100644
--- a/vapi/metadata/GdkX11-4.0.metadata
+++ b/vapi/metadata/GdkX11-4.0.metadata
@@ -5,6 +5,7 @@ X11* name="X11(.+)" parent="Gdk.X11"
 
 X11Display
 	.broadcast_startup_message skip=false
+	.xevent.xevent type="X.Event"
 
 X11Window
 	.foreign_new_for_display name="foreign_for_display"
diff --git a/vapi/metadata/Gtk-4.0.metadata b/vapi/metadata/Gtk-4.0.metadata
index da4d671ba..4d8da49b9 100644
--- a/vapi/metadata/Gtk-4.0.metadata
+++ b/vapi/metadata/Gtk-4.0.metadata
@@ -2,6 +2,9 @@
 // but may be some day.
 ////////////////////////////////////////////////////////////////////
 
+*.event type="Gdk.Event"
+*.*.event type="Gdk.Event"
+
 // G-I doesn't support per-sybmol includes
 * cheader_filename="gtk/gtk.h"
 *Accessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h"
@@ -325,15 +328,12 @@ TreeView
   .get_cell_area return_void
   .get_visible_rect return_void
 Widget
-  .delete_event.event type="Gdk.EventAny"
-  .destroy_event.event type="Gdk.EventAny"
   .drag_*#method parent="Gtk" symbol_type="function"
   .get_allocation return_void
   .get_clip return_void
   .grab_add parent="Gtk" symbol_type="function"
   .grab_remove parent="Gtk" symbol_type="function"
   .intersect.intersection unowned=false nullable default=null
-  .touch_event.event type="Gdk.EventTouch"
   .size_allocate return_void
 WidgetPath
   .free destroys_instance