gtk4: Fix a few binding errors

diff --git a/vapi/gtk4.vapi b/vapi/gtk4.vapi
index 00dac6b083911b3556a79cb7ead37f75e4d67376..1403b678754528c4d0837d13f26210e1f4409147 100644 (file)
--- a/vapi/gtk4.vapi
+++ b/vapi/gtk4.vapi
@@ -5295,6 +5295,14 @@ namespace Gdk {
                public void set_resizable (bool resizable);
                public void unref ();
        }
+       [CCode (cheader_filename = "gdk/gdk.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gdk_toplevel_size_get_type ()")]
+       [Compact (opaque = true)]
+       public class ToplevelSize {
+               public void get_bounds (out int bounds_width, out int bounds_height);
+               public void set_min_size (int min_width, int min_height);
+               public void set_shadow_width (int left, int right, int top, int bottom);
+               public void set_size (int width, int height);
+       }
        [CCode (cheader_filename = "gdk/gdk.h", type_id = "gdk_touch_event_get_type ()")]
        public class TouchEvent : Gdk.Event {
                [CCode (has_construct_function = false)]
@@ -5439,14 +5447,6 @@ namespace Gdk {
                [CCode (array_length = false)]
                public weak double axes[12];
        }
-       [CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
-       public struct ToplevelSize {
-               public void get_bounds (out int bounds_width, out int bounds_height);
-               public static GLib.Type get_type ();
-               public void set_min_size (int min_width, int min_height);
-               public void set_shadow_width (int left, int right, int top, int bottom);
-               public void set_size (int width, int height);
-       }
        [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_ANCHOR_", type_id = "gdk_anchor_hints_get_type ()")]
        [Flags]
        public enum AnchorHints {
@@ -5891,7 +5891,7 @@ namespace Gsk {
                [CCode (array_length = false, array_length_cexpr = "4")]
                public unowned float[] get_widths ();
        }
-       [CCode (cheader_filename = "gsk/gsk.h", type_id = "gsk_broadway_renderer_get_type ()")]
+       [CCode (cheader_filename = "gsk/broadway/gskbroadwayrenderer.h", type_id = "gsk_broadway_renderer_get_type ()")]
        public class BroadwayRenderer : Gsk.Renderer {
                [CCode (has_construct_function = false, type = "GskRenderer*")]
                public BroadwayRenderer ();
@@ -5963,7 +5963,7 @@ namespace Gsk {
                public unowned Gsk.RenderNode get_child ();
                public unowned string get_message ();
        }
-       [CCode (cheader_filename = "gsk/gsk.h", type_id = "gsk_gl_renderer_get_type ()")]
+       [CCode (cheader_filename = "gsk/gl/gskglrenderer.h", type_id = "gsk_gl_renderer_get_type ()")]
        public class GLRenderer : Gsk.Renderer {
                [CCode (has_construct_function = false, type = "GskRenderer*")]
                [Version (since = "4.2")]
@@ -6038,9 +6038,9 @@ namespace Gsk {
                public Gsk.MaskMode get_mask_mode ();
                public unowned Gsk.RenderNode get_source ();
        }
-       [CCode (cheader_filename = "gsk/gsk.h", type_id = "gsk_ngl_renderer_get_type ()")]
+       [CCode (cheader_filename = "gsk/gl/gskglrenderer.h", cname = "GskRenderer", type_id = "gsk_ngl_renderer_get_type ()")]
        public class NglRenderer : Gsk.Renderer {
-               [CCode (has_construct_function = false, type = "GskRenderer*")]
+               [CCode (has_construct_function = false)]
                [Version (deprecated = true, deprecated_since = "4.4")]
                public NglRenderer ();
        }
@@ -12221,10 +12221,6 @@ namespace Gtk {
                [Version (deprecated = true, deprecated_since = "4.10")]
                public bool up ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gtk_tree_row_data_get_type ()")]
-       [Compact]
-       public class TreeRowData {
-       }
        [CCode (cheader_filename = "gtk/gtk.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gtk_tree_row_reference_get_type ()")]
        [Compact]
        public class TreeRowReference {

diff --git a/vapi/metadata/Gdk-4.0-custom.vala b/vapi/metadata/Gdk-4.0-custom.vala
index c973828e823d9ca70187cfb5aca4235572384208..7b60478d8829bea621a2e18875f7848d6e9a2cfe 100644 (file)
--- a/vapi/metadata/Gdk-4.0-custom.vala
+++ b/vapi/metadata/Gdk-4.0-custom.vala
@@ -2,4 +2,8 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public struct Rectangle : Cairo.RectangleInt {
        }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       [Compact (opaque = true)]
+       public class ToplevelSize {
+       }
 }

diff --git a/vapi/metadata/Gdk-4.0.metadata b/vapi/metadata/Gdk-4.0.metadata
index 284cf3f84a6a3e2c89a706ddfa351dabebac3a05..8446d0b2b265eebf6c93b2a20a5ccec7415fdd97 100644 (file)
--- a/vapi/metadata/Gdk-4.0.metadata
+++ b/vapi/metadata/Gdk-4.0.metadata
@@ -45,7 +45,8 @@ Surface
         .translate_coordinates.y ref
 Toplevel
         .compute_size.size nullable unowned
-ToplevelSize struct
+ToplevelSize type_id="gdk_toplevel_size_get_type ()"
+toplevel_size_get_type skip
 
 // Bug #: confused girparser
 content_register_deserializer

diff --git a/vapi/metadata/Gsk-4.0.metadata b/vapi/metadata/Gsk-4.0.metadata
index 74ed7f852bc5b7fb9712a85cc41f95e8efa3e59b..a67b0f4c95715d8e18671d179bca9d7a31b33aac 100644 (file)
--- a/vapi/metadata/Gsk-4.0.metadata
+++ b/vapi/metadata/Gsk-4.0.metadata
@@ -1,6 +1,10 @@
 *.ref unowned
 *.unref destroys_instance=false
 
+BroadwayRenderer cheader_filename="gsk/broadway/gskbroadwayrenderer.h"
+GLRenderer cheader_filename="gsk/gl/gskglrenderer.h"
+NglRenderer cname="GskRenderer" cheader_filename="gsk/gl/gskglrenderer.h"
+
 Renderer
        // Factory method
        .new_for_surface symbol_type="function" name="for_surface"

diff --git a/vapi/metadata/Gtk-4.0.metadata b/vapi/metadata/Gtk-4.0.metadata
index aaca6de3daf0dd1d002af69475048f198e6c55f9..4b39e2c86f87748e89ec0a84af35ca28f5b3b9dc 100644 (file)
--- a/vapi/metadata/Gtk-4.0.metadata
+++ b/vapi/metadata/Gtk-4.0.metadata
@@ -262,6 +262,7 @@ Editable
 // Not sure what g-i was thinking
 TreeModel
   .filter_new parent="Gtk.TreeModelFilter" name="new" symbol_type="constructor"
+TreeRowData skip
 
 // Vala-specific, not really bugs
 /////////////////////////////////