diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2020-08-22 14:23:41 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2020-08-22 14:23:41 +0200 |
| commit | 8cba4a322614597f2b13bab4d3a0e88e10713e90 (patch) | |
| tree | 97b1bac32724c60b8218ad0ad69a8e7af78ba1fb | |
| parent | 4424e8328d327c23f87515b01b918f661aafaf27 (diff) | |
| download | vala-wip/gtk4.tar.gz | |
gtk4: Resolve a few conflicts of methods with virtual-methodswip/gtk4
| -rw-r--r-- | vapi/gtk4.vapi | 8 | ||||
| -rw-r--r-- | vapi/metadata/Gtk-4.0.metadata | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/vapi/gtk4.vapi b/vapi/gtk4.vapi index fe4070c26..da1bd346c 100644 --- a/vapi/gtk4.vapi +++ b/vapi/gtk4.vapi @@ -8907,6 +8907,8 @@ namespace Gtk { public unowned Gtk.LayoutChild get_layout_child (Gtk.Widget child); [NoWrapper] public virtual Gtk.SizeRequestMode get_request_mode (Gtk.Widget widget); + [CCode (cname = "gtk_layout_manager_get_request_mode")] + public Gtk.SizeRequestMode get_size_request_mode (); public unowned Gtk.Widget? get_widget (); public void layout_changed (); public virtual void measure (Gtk.Widget widget, Gtk.Orientation orientation, int for_size, out int minimum, out int natural, out int minimum_baseline, out int natural_baseline); @@ -9190,6 +9192,8 @@ namespace Gtk { public virtual void pause (); [NoWrapper] public virtual bool play (); + [CCode (cname = "gtk_media_stream_play")] + public void play_now (); public virtual void realize (Gdk.Surface surface); public virtual void seek (int64 timestamp); public void seek_failed (); @@ -11879,6 +11883,8 @@ namespace Gtk { public class void add_shortcut (Gtk.Shortcut shortcut); public uint add_tick_callback (owned Gtk.TickCallback callback); public void allocate (int width, int height, int baseline, owned Gsk.Transform? transform); + [CCode (cname = "gtk_widget_size_allocate")] + public void allocate_size (Gtk.Allocation allocation, int baseline); [CCode (cname = "gtk_widget_class_bind_template_callback_full")] public class void bind_template_callback_full (string callback_name, [CCode (scope = "async")] GLib.Callback callback_symbol); [CCode (cname = "gtk_widget_class_bind_template_child_full")] @@ -12048,8 +12054,6 @@ namespace Gtk { public bool should_layout (); [NoWrapper] public virtual void size_allocate (int width, int height, int baseline); - [CCode (cname = "gtk_widget_size_allocate")] - public void size_allocate_emit (Gtk.Allocation allocation, int baseline); [NoWrapper] public virtual void snapshot (Gtk.Snapshot snapshot); public void snapshot_child (Gtk.Widget child, Gtk.Snapshot snapshot); diff --git a/vapi/metadata/Gtk-4.0.metadata b/vapi/metadata/Gtk-4.0.metadata index 5ece7391a..c9e42d7f8 100644 --- a/vapi/metadata/Gtk-4.0.metadata +++ b/vapi/metadata/Gtk-4.0.metadata @@ -220,12 +220,17 @@ EntryCompletion .insert_prefix#method name="request_prefix_insertion" InfoBar .add_child new +LayoutManager + .get_request_mode#method name="get_size_request_mode" +MediaStream + .play#method name="play_now" Notebook .insert_page_menu skip TreeView .row_expanded#method name="is_row_expanded" Widget .compute_expand#virtual_method name="compute_expand_internal" + .size_allocate#method name="allocate_size" Editable .delete_text#method skip .insert_text#method skip @@ -307,7 +312,6 @@ TreeView Widget .drag_*#method parent="Gtk" symbol_type="function" .get_allocation return_void - .size_allocate#method name="size_allocate_emit" TreeModel .get_value return_void .rows_reordered skip |