gtk+-2.0,gtk+-3.0: Gtk.MenuPositionFunc, x and y are inout, not just out.

https://bugzilla.gnome.org/show_bug.cgi?id=674537

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index acc2e092b969f452c24ef8e1a9fc45313a038158..551022e41a1be315f473c8458423951674098b96 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -4073,7 +4073,7 @@ namespace Gtk {
                public uint32 get_x11_window_id ();
                public bool is_embedded ();
                [CCode (instance_pos = -1)]
-               public void position_menu (Gtk.Menu menu, out int x, out int y, out bool push_in);
+               public void position_menu (Gtk.Menu menu, ref int x, ref int y, out bool push_in);
                public void set_blinking (bool blinking);
                public void set_from_file (string filename);
                public void set_from_gicon (GLib.Icon icon);
@@ -7569,7 +7569,7 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
        public delegate void MenuDetachFunc (Gtk.Widget attach_widget, Gtk.Menu menu);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate void MenuPositionFunc (Gtk.Menu menu, out int x, out int y, out bool push_in);
+       public delegate void MenuPositionFunc (Gtk.Menu menu, ref int x, ref int y, out bool push_in);
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
        public delegate void ModuleDisplayInitFunc (Gdk.Display display);
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 2fb504df773b0ad01384ea07c7b6e8569f5090ac..c6ff4c6df423fca41799e0bf15f42bb110bb0515 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -4823,7 +4823,7 @@ namespace Gtk {
                public uint32 get_x11_window_id ();
                public bool is_embedded ();
                [CCode (instance_pos = -1)]
-               public void position_menu (Gtk.Menu menu, out int x, out int y, out bool push_in);
+               public void position_menu (Gtk.Menu menu, ref int x, ref int y, out bool push_in);
                public void set_from_file (string filename);
                public void set_from_gicon (GLib.Icon icon);
                public void set_from_icon_name (string icon_name);
@@ -8706,7 +8706,7 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
        public delegate void MenuDetachFunc (Gtk.Widget attach_widget, Gtk.Menu menu);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate void MenuPositionFunc (Gtk.Menu menu, out int x, out int y, out bool push_in);
+       public delegate void MenuPositionFunc (Gtk.Menu menu, ref int x, ref int y, out bool push_in);
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
        public delegate void ModuleDisplayInitFunc (Gdk.Display display);
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]

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 8e94a9e8d190e48faa450116c435c8340920dc62..9d018ec88bf4279e5fdf2ff8f5058413ad8b1985 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
@@ -189,7 +189,7 @@ namespace Gtk {
 
        public class StatusIcon {
                [CCode (instance_pos = -1)]
-               public void position_menu (Gtk.Menu menu, out int x, out int y, out bool push_in);
+               public void position_menu (Gtk.Menu menu, ref int x, ref int y, out bool push_in);
        }
 
        public class UIManager {

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 0838bf1422f541bd5021d35e565c562322628e15..881da4d250611717ca69946e04208f9ff1a41f12 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -412,8 +412,8 @@ gtk_menu_popup.data hidden="1"
 gtk_menu_popup.func nullable="1"
 gtk_menu_popup.parent_menu_shell nullable="1"
 gtk_menu_popup.parent_menu_item nullable="1"
-GtkMenuPositionFunc.x is_out="1"
-GtkMenuPositionFunc.y is_out="1"
+GtkMenuPositionFunc.x is_ref="1"
+GtkMenuPositionFunc.y is_ref="1"
 GtkMenuPositionFunc.push_in is_out="1"
 gtk_menu_item_deselect hidden="1"
 gtk_menu_item_select 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 0e7a2ec43929771bedbecaf0487f38c3d9aa5d7c..6343797fe8dd60a94ac8803fad372d43987a2900 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
@@ -58,7 +58,7 @@ namespace Gtk {
        [CCode (type_id = "gtk_status_icon_get_type ()")]
        public class StatusIcon {
                [CCode (instance_pos = -1)]
-               public void position_menu (Gtk.Menu menu, out int x, out int y, out bool push_in);
+               public void position_menu (Gtk.Menu menu, ref int x, ref int y, out bool push_in);
        }
 
        [CCode (type_id = "gtk_ui_manager_get_type ()")]

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index c6a2988209186f9cb0f173f32103fe2011dee53e..27bf7d6cb2d9ba9d5e39d3e59cb2a0b52727d04c 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -640,8 +640,8 @@ gtk_menu_popup.data hidden="1"
 gtk_menu_popup.func nullable="1"
 gtk_menu_popup.parent_menu_shell nullable="1"
 gtk_menu_popup.parent_menu_item nullable="1"
-GtkMenuPositionFunc.x is_out="1"
-GtkMenuPositionFunc.y is_out="1"
+GtkMenuPositionFunc.x is_ref="1"
+GtkMenuPositionFunc.y is_ref="1"
 GtkMenuPositionFunc.push_in is_out="1"
 gtk_menu_item_deselect hidden="1"
 gtk_menu_item_set_right_justified deprecated_since="3.2" replacement="Widget.set_hexpand and Widget.set_halign"