vala r2170 - in trunk: . vapi vapi/packages/gtk+-2.0

[juergbi svn gnome org]

Author: juergbi
Date: Mon Dec 15 23:30:51 2008
New Revision: 2170
URL: http://svn.gnome.org/viewvc/vala?rev=2170&view=rev

Log:
2008-12-16  JÃrg Billeter  <j bitron ch>

	* vapi/packages/gtk+-2.0/:

	Fix gtk_status_icon_position_menu and GtkMenuPositionFunc bindings,
	fixes bug 563457

	* vapi/gtk+-2.0.vapi: regenerated


Modified:
   trunk/ChangeLog
   trunk/vapi/gtk+-2.0.vapi
   trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
   trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata

Modified: trunk/vapi/gtk+-2.0.vapi
==============================================================================
--- trunk/vapi/gtk+-2.0.vapi	(original)
+++ trunk/vapi/gtk+-2.0.vapi	Mon Dec 15 23:30:51 2008
@@ -3411,7 +3411,8 @@
 		public bool is_embedded ();
 		[CCode (has_construct_function = false)]
 		public StatusIcon ();
-		public static void position_menu (Gtk.Menu menu, int x, int y, bool push_in);
+		[CCode (instance_pos = -1)]
+		public void position_menu (Gtk.Menu menu, out int x, out int y, out bool push_in);
 		public void set_blinking (bool blinking);
 		public void set_from_file (string filename);
 		public void set_from_icon_name (string icon_name);
@@ -6689,7 +6690,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static delegate void MenuDetachFunc (Gtk.Widget attach_widget, Gtk.Menu menu);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public delegate void MenuPositionFunc (Gtk.Menu menu, int x, int y, bool push_in);
+	public delegate void MenuPositionFunc (Gtk.Menu menu, out int x, out int y, out bool push_in);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static delegate void ModuleDisplayInitFunc (Gdk.Display display);
 	[CCode (cheader_filename = "gtk/gtk.h")]

Modified: trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
==============================================================================
--- trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala	(original)
+++ trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala	Mon Dec 15 23:30:51 2008
@@ -32,6 +32,11 @@
 		public GLib.List<weak Gtk.Widget> get_children ();
 	}
 
+	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 class Widget {
 		public extern Widget (GLib.Type type, ...);
 
@@ -79,6 +84,8 @@
 
 	public delegate void ActionCallback (Action action);
 
+	public delegate void MenuPositionFunc (Gtk.Menu menu, out int x, out int y, out bool push_in);
+
 	public delegate void RadioActionCallback (Action action, Action current);
 
 	public delegate bool TreeViewSearchEqualFunc (TreeModel model, int column, string key, TreeIter iter);

Modified: trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
==============================================================================
--- trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata	(original)
+++ trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata	Mon Dec 15 23:30:51 2008
@@ -185,6 +185,7 @@
 gtk_menu_popup.func nullable="1"
 gtk_menu_popup.parent_menu_shell nullable="1"
 gtk_menu_popup.parent_menu_item nullable="1"
+GtkMenuPositionFunc hidden="1"
 gtk_menu_item_deselect hidden="1"
 gtk_menu_item_select hidden="1"
 GtkMenuItem::activate has_emitter="1"
@@ -308,6 +309,7 @@
 gtk_spin_button_get_range.max is_out="1"
 gtk_status_icon_get_geometry.area is_out="1"
 gtk_status_icon_get_geometry.orientation is_out="1"
+gtk_status_icon_position_menu hidden="1"
 GtkStyle.fg weak="0"
 GtkStyle.bg weak="0"
 GtkStyle.light weak="0"