gtk+-2.0, gtk+-3.0: Further syncing with introspection annotations

(cherry picked from commit 370cd5b6eccbe884457b42557b9b647c914f7c2f)

6 files changed, 33 insertions, 19 deletions

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index a9aff9881..005db626c 100644
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -6267,12 +6267,12 @@ namespace Gtk {
 		public abstract void rebuild_menu ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface TreeDragDest {
+	public interface TreeDragDest : GLib.Object {
 		public abstract bool drag_data_received (Gtk.TreePath dest, Gtk.SelectionData selection_data);
 		public abstract bool row_drop_possible (Gtk.TreePath dest_path, Gtk.SelectionData selection_data);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface TreeDragSource {
+	public interface TreeDragSource : GLib.Object {
 		public abstract bool drag_data_delete (Gtk.TreePath path);
 		public abstract bool drag_data_get (Gtk.TreePath path, Gtk.SelectionData selection_data);
 		public abstract bool row_draggable (Gtk.TreePath path);
@@ -8260,9 +8260,9 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static GLib.Quark print_error_quark ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static unowned Gtk.PageSetup print_run_page_setup_dialog (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings);
+	public static Gtk.PageSetup print_run_page_setup_dialog (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void print_run_page_setup_dialog_async (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings, Gtk.PageSetupDoneFunc done_cb, void* data);
+	public static void print_run_page_setup_dialog_async (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings, Gtk.PageSetupDoneFunc done_cb);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void propagate_event (Gtk.Widget widget, Gdk.Event event);
 	[CCode (cheader_filename = "gtk/gtk.h")]
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index c970dbb3d..2ca42d954 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -6675,15 +6675,6 @@ namespace Gtk {
 		[NoWrapper]
 		public virtual void notify_gtk (GLib.Object object, GLib.ParamSpec pspec);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	[Compact]
-	public class WidgetAuxInfo {
-		public uint halign;
-		public int height;
-		public Gtk.Border margin;
-		public uint valign;
-		public int width;
-	}
 	[CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_widget_path_ref", type_id = "gtk_widget_path_get_type ()", unref_function = "gtk_widget_path_unref")]
 	[Compact]
 	public class WidgetPath {
@@ -6955,7 +6946,7 @@ namespace Gtk {
 		public abstract void set_name (string name);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface CellAccessibleParent {
+	public interface CellAccessibleParent : GLib.Object {
 		public abstract void activate (Gtk.CellAccessible cell);
 		public abstract void edit (Gtk.CellAccessible cell);
 		public abstract void expand_collapse (Gtk.CellAccessible cell);
@@ -7205,7 +7196,7 @@ namespace Gtk {
 		public Gtk.ScrollablePolicy vscroll_policy { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface StyleProvider {
+	public interface StyleProvider : GLib.Object {
 		public abstract unowned Gtk.IconFactory get_icon_factory (Gtk.WidgetPath path);
 		public abstract Gtk.StyleProperties get_style (Gtk.WidgetPath path);
 		public abstract bool get_style_property (Gtk.WidgetPath path, Gtk.StateFlags state, GLib.ParamSpec pspec, out GLib.Value value);
@@ -7223,12 +7214,12 @@ namespace Gtk {
 		public abstract void rebuild_menu ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface TreeDragDest {
+	public interface TreeDragDest : GLib.Object {
 		public abstract bool drag_data_received (Gtk.TreePath dest, Gtk.SelectionData selection_data);
 		public abstract bool row_drop_possible (Gtk.TreePath dest_path, Gtk.SelectionData selection_data);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface TreeDragSource {
+	public interface TreeDragSource : GLib.Object {
 		public abstract bool drag_data_delete (Gtk.TreePath path);
 		public abstract bool drag_data_get (Gtk.TreePath path, Gtk.SelectionData selection_data);
 		public abstract bool row_draggable (Gtk.TreePath path);
@@ -9512,9 +9503,9 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static GLib.Quark print_error_quark ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static unowned Gtk.PageSetup print_run_page_setup_dialog (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings);
+	public static Gtk.PageSetup print_run_page_setup_dialog (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void print_run_page_setup_dialog_async (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings, Gtk.PageSetupDoneFunc done_cb, void* data);
+	public static void print_run_page_setup_dialog_async (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings, Gtk.PageSetupDoneFunc done_cb);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void propagate_event (Gtk.Widget widget, Gdk.Event event);
 	[CCode (cheader_filename = "gtk/gtk.h")]
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
index 011be6b62..8e94a9e8d 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
@@ -264,6 +264,12 @@ namespace Gtk {
 		public GLib.SList<GLib.File> get_files ();
 	}
 
+	public interface TreeDragDest : GLib.Object {
+	}
+
+	public interface TreeDragSource : GLib.Object {
+	}
+
 	[CCode (cname = "gint")]
 	public enum SortColumn {
 		[CCode (cname = "GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID")]
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 565842e4d..ed1104c48 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -539,6 +539,8 @@ gtk_print_context_get_hard_margins.top is_out="1"
 gtk_print_context_get_hard_margins.bottom is_out="1"
 gtk_print_context_get_hard_margins.left is_out="1"
 gtk_print_context_get_hard_margins.right is_out="1"
+gtk_print_run_page_setup_dialog transfer_ownership="1"
+gtk_print_run_page_setup_dialog_async.data hidden="1"
 gtk_print_settings_copy transfer_ownership="1"
 gtk_print_settings_get_page_ranges is_array="1" array_length_pos="0.1" array_length_cname="num_ranges" transfer_ownership="1"
 gtk_print_settings_get_page_ranges.num_ranges hidden="1"
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
index eb3594375..c0f96c05e 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
@@ -88,6 +88,9 @@ namespace Gtk {
 		public virtual void get_preferred_height_for_width_internal (int width, out int minimum_height, out int natural_height);
 	}
 
+	public interface CellAccessibleParent : GLib.Object {
+	}
+
 	[CCode (type_cname = "GtkEditableInterface")]
 	public interface Editable : GLib.Object {
 		[CCode (vfunc_name = "set_selection_bounds")]
@@ -101,6 +104,15 @@ namespace Gtk {
 		public GLib.SList<GLib.File> get_files ();
 	}
 
+	public interface StyleProvider : GLib.Object {
+	}
+
+	public interface TreeDragDest : GLib.Object {
+	}
+
+	public interface TreeDragSource : GLib.Object {
+	}
+
 	[CCode (cname = "gint")]
 	public enum SortColumn {
 		[CCode (cname = "GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID")]
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 25aca6993..4f7c8fa92 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -792,6 +792,8 @@ gtk_print_context_get_hard_margins.top is_out="1"
 gtk_print_context_get_hard_margins.bottom is_out="1"
 gtk_print_context_get_hard_margins.left is_out="1"
 gtk_print_context_get_hard_margins.right is_out="1"
+gtk_print_run_page_setup_dialog transfer_ownership="1"
+gtk_print_run_page_setup_dialog_async.data hidden="1"
 gtk_print_settings_copy transfer_ownership="1"
 gtk_print_settings_get_page_ranges is_array="1" array_length_pos="0.1" array_length_cname="num_ranges" transfer_ownership="1"
 gtk_print_settings_get_page_ranges.num_ranges hidden="1"
@@ -1593,6 +1595,7 @@ gtk_widget_path_iter_has_qregion.flags is_out="1"
 gtk_widget_path_iter_list_classes transfer_ownership="1" type_arguments="unowned string"
 gtk_widget_path_iter_list_regions transfer_ownership="1" type_arguments="unowned string"
 gtk_widget_path_to_string transfer_ownership="1"
+GtkWidgetAuxInfo hidden="1"
 gtk_render_activity deprecated_since="vala-0.16" replacement="StyleContext.render_activity"
 gtk_render_arrow deprecated_since="vala-0.16" replacement="StyleContext.render_arrow"
 gtk_render_background deprecated_since="vala-0.16" replacement="StyleContext.render_background"