From 86535bb201d151cb43736d67320b4a7b13152f3b Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Sat, 12 Feb 2005 06:30:56 +0000
Subject: [PATCH] 2005-02-11  Mike Kestner  <mkestner@novell.com>

	* gtk/Gtk.metadata : hide Menu.SetScreen.
	* gtk/Menu.custom : manually implement Screen prop.

svn path=/trunk/gtk-sharp/; revision=40529
---
 ChangeLog           |  5 +++++
 doc/en/Gtk/Menu.xml | 26 ++++++++++++--------------
 gtk/Gtk.metadata    |  2 +-
 gtk/Menu.custom     | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1b4077e7d..8320f1258 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-11  Mike Kestner  <mkestner@novell.com>
+
+	* gtk/Gtk.metadata : hide Menu.SetScreen.
+	* gtk/Menu.custom : manually implement Screen prop.
+
 2005-02-11  Dan Winship  <danw@novell.com>
 
 	* gtk/Gtk.metadata: Hide StyleGetProperty and StyleGetValist since
diff --git a/doc/en/Gtk/Menu.xml b/doc/en/Gtk/Menu.xml
index 3c8e4ab3b..b96a2a4fa 100644
--- a/doc/en/Gtk/Menu.xml
+++ b/doc/en/Gtk/Menu.xml
@@ -429,16 +429,14 @@ class PopupSample
       </Docs>
     </Member>
     <Member MemberName="Screen">
-      <MemberSignature Language="C#" Value="public Gdk.Screen Screen { set; };" />
+      <MemberSignature Language="C#" Value="public Gdk.Screen Screen { set; get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>Gdk.Screen</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>The physical screen this menu is placed on.</summary>
-        <param name="value">a <see cref="T:Gdk.Screen" /></param>
         <returns>a <see cref="T:Gdk.Screen" /></returns>
         <remarks />
       </Docs>
@@ -498,7 +496,8 @@ class PopupSample
       <Docs>
         <summary>The number of the monitor on which the menu should be popped up.</summary>
         <returns>a <see cref="T:System.Int32" /></returns>
-        <remarks></remarks>
+        <remarks>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="Attach">
@@ -515,22 +514,21 @@ class PopupSample
         <Parameter Name="bottom_attach" Type="System.UInt32" />
       </Parameters>
       <Docs>
-        <summary>Adds a new <see cref="T:Gtk.MenuItem"/> to a (table) menu.</summary>
-        <param name="child">a <see cref="T:Gtk.Widget" />, should be a <see cref="T:Gtk.MenuItem"/></param>
+        <summary>Adds a new <see cref="T:Gtk.MenuItem" /> to a (table) menu.</summary>
+        <param name="child">a <see cref="T:Gtk.Widget" />, should be a <see cref="T:Gtk.MenuItem" /></param>
         <param name="left_attach">a <see cref="T:System.UInt32" /></param>
         <param name="right_attach">a <see cref="T:System.UInt32" /></param>
         <param name="top_attach">a <see cref="T:System.UInt32" /></param>
         <param name="bottom_attach">a <see cref="T:System.UInt32" /></param>
         <remarks>
-	  <para>The number of 'cells' that
-	    an item will occupy is specified by <paramref name="left_attach"/>, 
-	    <paramref name="right_attach"/>, <paramref name="top_attach"/> and 
-	    <paramref name="bottom_attach"/>. These each represent the leftmost,
+          <para>The number of 'cells' that
+	    an item will occupy is specified by <paramref name="left_attach" />, 
+	    <paramref name="right_attach" />, <paramref name="top_attach" /> and 
+	    <paramref name="bottom_attach" />. These each represent the leftmost,
 	    rightmost, uppermost and lower column and row numbers of the table.
 	    (Columns and rows are indexed from zero).</para>
-	  
-	  <para>Note that this function is not related to <see cref="M:Gtk.Menu.Detach"/>.</para>
-	</remarks>
+          <para>Note that this function is not related to <see cref="M:Gtk.Menu.Detach" />.</para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="Item">
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index c4a0d72bf..ded915803 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -238,7 +238,7 @@
   <attr path="/api/namespace/object[@cname='GtkMenuItem']/signal[@name='ToggleSizeRequest']" name="name">ToggleSizeRequested</attr>
   <attr path="/api/namespace/object[@cname='GtkMenu']/method[@name='Popup']/*/*[@type='GtkMenuPositionFunc']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GtkMenu']/method[@name='Popup']/*/*[@type='GtkWidget*']" name="null_ok">1</attr>
-  <attr path="/api/namespace/object[@cname='GtkMenu']/method[@name='SetScreen']" name="new_flag">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMenu']/method[@name='SetScreen']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkMenuShell']/signal[@name='Cancel']" name="name">Canceled</attr>
   <attr path="/api/namespace/object[@cname='GtkMenuShell']/signal[@name='Deactivate']" name="name">Deactivated</attr>
   <attr path="/api/namespace/object[@cname='GtkMessageDialog']/constructor[@cname='gtk_message_dialog_new']" name="hidden">1</attr>
diff --git a/gtk/Menu.custom b/gtk/Menu.custom
index 48aa97d41..91f026bcb 100644
--- a/gtk/Menu.custom
+++ b/gtk/Menu.custom
@@ -24,3 +24,19 @@
 	{
 		this.Popup (null, null, null, IntPtr.Zero, 3, Global.CurrentEventTime);
 	}
+
+	[DllImport("libgtk-win32-2.0-0.dll")]
+	static extern IntPtr gtk_widget_get_screen (IntPtr raw);
+
+	[DllImport("libgtk-win32-2.0-0.dll")]
+	static extern void gtk_menu_set_screen (IntPtr raw, IntPtr screen);
+
+	public new Gdk.Screen Screen { 
+		get {
+			return GLib.Object.GetObject (gtk_widget_get_screen (Handle), false) as Gdk.Screen;
+		}
+		set {
+			gtk_menu_set_screen (Handle, value.Handle);
+		}
+	}
+