From bc8ca2e212cd262a21a98a541c27eaeeddf5303b Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Fri, 10 Oct 2003 04:45:42 +0000
Subject: [PATCH] 2003-10-10  Mike Kestner  <mkestner@ximian.com>

	* gdk/gdk-api.xml : regenerated
	* sources/Gdk.metadata : mark Cursor opaque. mark confine_to and
	cursor null_ok in Gdk.Pointer.Grab. [Fixes #48273]

svn path=/trunk/gtk-sharp/; revision=18847
---
 ChangeLog            |  6 ++++++
 gdk/gdk-api.xml      | 10 +++++-----
 sources/Gdk.metadata | 27 +++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2cea8bad6..e0e7195e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-10  Mike Kestner  <mkestner@ximian.com>
+
+	* gdk/gdk-api.xml : regenerated
+	* sources/Gdk.metadata : mark Cursor opaque. mark confine_to and
+	cursor null_ok in Gdk.Pointer.Grab. [Fixes #48273]
+
 2003-10-09  Mike Kestner  <mkestner@ximian.com>
 
 	* generator/Statistics.cs (Report): pretty it up.
diff --git a/gdk/gdk-api.xml b/gdk/gdk-api.xml
index 13bc4adb6..7d19d76e2 100644
--- a/gdk/gdk-api.xml
+++ b/gdk/gdk-api.xml
@@ -1844,8 +1844,8 @@
           <callback cname="child_func">
             <return-type type="gboolean"/>
             <parameters>
-              <parameter type=" &#9;&#9;&#9;&#9;&#9;&#9; gboolean " name="child_func"/>
-              <parameter type=" &#9;&#9;&#9;&#9;&#9;&#9; gboolean " name="child_func"/>
+              <parameter type="" name=""/>
+              <parameter type="" name=""/>
             </parameters>
           </callback>
           <parameter type="gpointer" name="user_data"/>
@@ -2199,7 +2199,7 @@
         </parameters>
       </method>
     </boxed>
-    <boxed name="Cursor" cname="GdkCursor">
+    <boxed name="Cursor" cname="GdkCursor" opaque="1">
       <field cname="type" type="GdkCursorType"/>
       <field cname="ref_count" type="guint"/>
       <method name="GetDisplay" cname="gdk_cursor_get_display">
@@ -3295,8 +3295,8 @@
           <parameter type="GdkWindow*" name="window"/>
           <parameter type="gboolean" name="owner_events"/>
           <parameter type="GdkEventMask" name="event_mask"/>
-          <parameter type="GdkWindow*" name="confine_to"/>
-          <parameter type="GdkCursor*" name="cursor"/>
+          <parameter type="GdkWindow*" name="confine_to" null_ok="1"/>
+          <parameter type="GdkCursor*" name="cursor" null_ok="1"/>
           <parameter type="guint32" name="time_"/>
         </parameters>
       </method>
diff --git a/sources/Gdk.metadata b/sources/Gdk.metadata
index dcee6f9e1..464df59d5 100644
--- a/sources/Gdk.metadata
+++ b/sources/Gdk.metadata
@@ -67,6 +67,33 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GdkPointer_">
+    <method>Grab</method>
+  </class>
+  <data>
+    <attribute target="param">
+      <filter level="name">cursor</filter>
+      <name>null_ok</name>
+      <value>1</value>
+    </attribute>
+    <attribute target="param">
+      <filter level="name">confine_to</filter>
+      <name>null_ok</name>
+      <value>1</value>
+    </attribute>
+  </data>
+</rule>
+
+<rule>
+  <class name="GdkCursor"/>
+  <data>
+    <attribute target="class">
+      <name>opaque</name>
+      <value>1</value>
+    </attribute>
+  </data>
+</rule>
 
 <!-- API hacks -->
 <rule>