From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 21 Aug 2014 17:02:58 +0000 (+0200)
Subject: gtk+-2.0, gtk+-3.0: Make Widget.get/set_parent compatible with its property
X-Git-Tag: 0.25.2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3494c3f259125cc9299db0d8986ba06fc1265f13;p=thirdparty%2Fvala.git

gtk+-2.0, gtk+-3.0: Make Widget.get/set_parent compatible with its property
---

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 6b3f83efb..e989a3895 100644
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -5583,7 +5583,8 @@ namespace Gtk {
 		public unowned Gtk.RcStyle get_modifier_style ();
 		public bool get_no_show_all ();
 		public unowned Pango.Context get_pango_context ();
-		public unowned Gtk.Widget get_parent ();
+		[CCode (type = "GtkWidget*")]
+		public unowned Gtk.Container? get_parent ();
 		public unowned Gdk.Window get_parent_window ();
 		public void get_pointer (out int x, out int y);
 		public bool get_realized ();
@@ -5685,7 +5686,7 @@ namespace Gtk {
 		public void set_has_window (bool has_window);
 		public void set_mapped (bool mapped);
 		public void set_no_show_all (bool no_show_all);
-		public void set_parent (Gtk.Widget parent);
+		public void set_parent ([CCode (type = "GtkWidget*")] Gtk.Container parent);
 		public void set_parent_window (Gdk.Window parent_window);
 		public void set_realized (bool realized);
 		public void set_receives_default (bool receives_default);
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 47dad180c..69b952dcb 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -6341,7 +6341,8 @@ namespace Gtk {
 		public bool get_no_show_all ();
 		public double get_opacity ();
 		public unowned Pango.Context get_pango_context ();
-		public unowned Gtk.Widget get_parent ();
+		[CCode (type = "GtkWidget*")]
+		public unowned Gtk.Container? get_parent ();
 		public unowned Gdk.Window get_parent_window ();
 		public unowned Gtk.WidgetPath get_path ();
 		[Deprecated (replacement = "Gdk.Window.get_device_position", since = "3.4")]
@@ -6494,7 +6495,7 @@ namespace Gtk {
 		public void set_margin_top (int margin);
 		public void set_no_show_all (bool no_show_all);
 		public void set_opacity (double opacity);
-		public void set_parent (Gtk.Widget parent);
+		public void set_parent ([CCode (type = "GtkWidget*")] Gtk.Container parent);
 		public void set_parent_window (Gdk.Window parent_window);
 		public void set_realized (bool realized);
 		public void set_receives_default (bool receives_default);
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index e35ea77d0..00422c4c1 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -1076,6 +1076,7 @@ gtk_widget_get_child_requisition.requisition is_out="1"
 gtk_widget_get_composite_name transfer_ownership="1"
 gtk_widget_get_requisition.requisition hidden="1"
 gtk_widget_get_requisition type_name="Gtk.Requisition"
+gtk_widget_get_parent type_name="Gtk.Container" ctype="GtkWidget*" nullable="1"
 gtk_widget_get_pointer.x is_out="1"
 gtk_widget_get_pointer.y is_out="1"
 gtk_widget_get_size_request.width is_out="1"
@@ -1101,6 +1102,7 @@ gtk_widget_region_intersect transfer_ownership="1"
 gtk_widget_render_icon.detail nullable="1"
 gtk_widget_render_icon nullable="1"
 gtk_widget_render_icon transfer_ownership="1"
+gtk_widget_set_parent.parent type_name="Gtk.Container" ctype="GtkWidget*"
 gtk_widget_set_scroll_adjustments.hadjustment nullable="1"
 gtk_widget_set_scroll_adjustments.vadjustment nullable="1"
 gtk_widget_set_style.style nullable="1"
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 8f8603b44..c69cc1450 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -1439,6 +1439,7 @@ gtk_widget_get_modifier_style deprecated_since="3.0" replacement="StyleContext w
 gtk_widget_get_requisition deprecated_since="3.0"
 gtk_widget_get_requisition.requisition hidden="1"
 gtk_widget_get_requisition type_name="Gtk.Requisition"
+gtk_widget_get_parent type_name="Gtk.Container" ctype="GtkWidget*" nullable="1"
 gtk_widget_get_pointer deprecated_since="3.4" replacement="Gdk.Window.get_device_position"
 gtk_widget_get_pointer.x is_out="1"
 gtk_widget_get_pointer.y is_out="1"
@@ -1491,6 +1492,7 @@ gtk_widget_render_icon nullable="1"
 gtk_widget_render_icon transfer_ownership="1"
 gtk_widget_render_icon_pixbuf transfer_ownership="1"
 gtk_widget_reset_rc_styles deprecated_since="3.0" replacement="reset_style"
+gtk_widget_set_parent.parent type_name="Gtk.Container" ctype="GtkWidget*"
 gtk_widget_set_scroll_adjustments.hadjustment nullable="1"
 gtk_widget_set_scroll_adjustments.vadjustment nullable="1"
 gtk_widget_set_state deprecated_since="3.0" replacement="set_state_flags"