From b2bbe4483bfefd18fea71c16b6b0e00035a82bf8 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Wed, 18 Feb 2004 20:05:03 +0000
Subject: [PATCH] 2004-02-18  Mike Kestner  <mkestner@ximian.com>

	* gdk/Gdk.metadata : hide EventCrossing.
	* gdk/EventCrossing.cs : glue-based manual implementation.
	* gdk/EventCrossing.custom : kill
	* gdk/gdk-api.xml : regen
	* gdk/gdk-symbols.xml : manual mapping for EventCrossing.
	* glue/event.cs : expose Crossing struct fields.

svn path=/trunk/gtk-sharp/; revision=23235
---
 ChangeLog                |   9 ++++
 gdk/EventCrossing.cs     | 107 +++++++++++++++++++++++++++++++++++++++
 gdk/EventCrossing.custom |  18 -------
 gdk/Gdk.metadata         |   1 +
 gdk/gdk-api.xml          |   2 +-
 gdk/gdk-symbols.xml      |   1 +
 glue/event.c             |  70 +++++++++++++++++++++++++
 7 files changed, 189 insertions(+), 19 deletions(-)
 create mode 100644 gdk/EventCrossing.cs
 delete mode 100644 gdk/EventCrossing.custom

diff --git a/ChangeLog b/ChangeLog
index 81e01db42..629b88208 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-18  Mike Kestner  <mkestner@ximian.com>
+
+	* gdk/Gdk.metadata : hide EventCrossing. 
+	* gdk/EventCrossing.cs : glue-based manual implementation.
+	* gdk/EventCrossing.custom : kill
+	* gdk/gdk-api.xml : regen
+	* gdk/gdk-symbols.xml : manual mapping for EventCrossing.
+	* glue/event.cs : expose Crossing struct fields.
+
 2004-02-18  Mike Kestner  <mkestner@ximian.com>
 
 	* gdk/Gdk.metadata : hide EventVisibility. 
diff --git a/gdk/EventCrossing.cs b/gdk/EventCrossing.cs
new file mode 100644
index 000000000..017e9ed17
--- /dev/null
+++ b/gdk/EventCrossing.cs
@@ -0,0 +1,107 @@
+// Gdk.EventCrossing.cs - Custom crossing event wrapper 
+//
+// Author:  Mike Kestner <mkestner@ximian.com>
+//
+// (c) 2004 Novell, Inc.
+
+namespace Gdk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public class EventCrossing : Event {
+
+		[DllImport("gtksharpglue")]
+		static extern uint gtksharp_gdk_event_crossing_get_time (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern double gtksharp_gdk_event_crossing_get_x (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern double gtksharp_gdk_event_crossing_get_y (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern double gtksharp_gdk_event_crossing_get_x_root (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern double gtksharp_gdk_event_crossing_get_y_root (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern uint gtksharp_gdk_event_crossing_get_state (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern IntPtr gtksharp_gdk_event_crossing_get_subwindow (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern CrossingMode gtksharp_gdk_event_crossing_get_mode (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern NotifyType gtksharp_gdk_event_crossing_get_detail (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern bool gtksharp_gdk_event_crossing_get_focus (IntPtr evt);
+
+		public EventCrossing (IntPtr raw) : base (raw) {} 
+
+		public uint Time {
+			get {
+				return gtksharp_gdk_event_crossing_get_time (Handle);
+			}
+		}
+
+		public ModifierType State {
+			get {
+				return (ModifierType) gtksharp_gdk_event_crossing_get_state (Handle);
+			}
+		}
+
+		public double X {
+			get {
+				return gtksharp_gdk_event_crossing_get_x (Handle);
+			}
+		}
+
+		public double Y {
+			get {
+				return gtksharp_gdk_event_crossing_get_y (Handle);
+			}
+		}
+
+		public double XRoot {
+			get {
+				return gtksharp_gdk_event_crossing_get_x_root (Handle);
+			}
+		}
+
+		public double YRoot {
+			get {
+				return gtksharp_gdk_event_crossing_get_y_root (Handle);
+			}
+		}
+
+		public Window Subwindow {
+			get {
+				return GLib.Object.GetObject (gtksharp_gdk_event_crossing_get_subwindow (Handle)) as Window;
+			}
+		}
+
+		public CrossingMode Mode {
+			get {
+				return gtksharp_gdk_event_crossing_get_mode (Handle);
+			}
+		}
+
+		public NotifyType Detail {
+			get {
+				return gtksharp_gdk_event_crossing_get_detail (Handle);
+			}
+		}
+
+		public bool Focus {
+			get {
+				return gtksharp_gdk_event_crossing_get_focus (Handle);
+			}
+		}
+	}
+}
+
diff --git a/gdk/EventCrossing.custom b/gdk/EventCrossing.custom
deleted file mode 100644
index f7c5b6d50..000000000
--- a/gdk/EventCrossing.custom
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// gdk/EventCrossing.custom
-//
-// Author: Gustavo Giraldez <gustavo.giraldez@gmx.net>
-//
-// Copyright (C) 2004 Gustavo Giraldez.
-//
-
-[DllImport("libgdk-win32-2.0-0.dll")]
-static extern IntPtr gdk_event_get_type();
-
-public static GLib.GType GType { 
-	get {
-		IntPtr raw_ret = gdk_event_get_type();
-		GLib.GType ret = new GLib.GType(raw_ret);
-		return ret;
-	}
-}
diff --git a/gdk/Gdk.metadata b/gdk/Gdk.metadata
index 384a129f5..d54f8209c 100644
--- a/gdk/Gdk.metadata
+++ b/gdk/Gdk.metadata
@@ -65,6 +65,7 @@
   <attr path="//object[@cname='GdkWindow']/method[@name='SetIconList']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventAny']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventButton']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GdkEventCrossing']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventExpose']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventKey']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventMotion']" name="hidden">1</attr>
diff --git a/gdk/gdk-api.xml b/gdk/gdk-api.xml
index 530457833..0dcc4db0d 100644
--- a/gdk/gdk-api.xml
+++ b/gdk/gdk-api.xml
@@ -2301,7 +2301,7 @@
       <field cname="width" type="gint" />
       <field cname="height" type="gint" />
     </struct>
-    <struct name="EventCrossing" cname="GdkEventCrossing">
+    <struct name="EventCrossing" cname="GdkEventCrossing" hidden="1">
       <field cname="type" type="GdkEventType" />
       <field cname="window" type="GdkWindow*" />
       <field cname="send_event" type="gint8" />
diff --git a/gdk/gdk-symbols.xml b/gdk/gdk-symbols.xml
index 77f77554e..e5c663416 100644
--- a/gdk/gdk-symbols.xml
+++ b/gdk/gdk-symbols.xml
@@ -3,6 +3,7 @@
   <symbol type="manual" cname="GdkEvent" name="Gdk.Event"/>
   <symbol type="manual" cname="GdkEventAny" name="Gdk.Event"/>
   <symbol type="manual" cname="GdkEventButton" name="Gdk.EventButton"/>
+  <symbol type="manual" cname="GdkEventCrossing" name="Gdk.EventCrossing"/>
   <symbol type="manual" cname="GdkEventExpose" name="Gdk.EventExpose"/>
   <symbol type="manual" cname="GdkEventKey" name="Gdk.EventKey"/>
   <symbol type="manual" cname="GdkEventMotion" name="Gdk.EventMotion"/>
diff --git a/glue/event.c b/glue/event.c
index bcbd524a6..fb9926bbc 100644
--- a/glue/event.c
+++ b/glue/event.c
@@ -49,6 +49,16 @@ GdkRectangle gtksharp_gdk_event_expose_get_area (GdkEventExpose *event);
 gint gtksharp_gdk_event_expose_get_count (GdkEventExpose *event);
 GdkRegion* gtksharp_gdk_event_expose_get_region (GdkEventExpose *event);
 GdkVisibilityState gtksharp_gdk_event_visibility_get_state (GdkEventVisibility *event);
+guint32 gtksharp_gdk_event_crossing_get_time (GdkEventCrossing *event);
+guint gtksharp_gdk_event_crossing_get_state (GdkEventCrossing *event);
+gboolean gtksharp_gdk_event_crossing_get_focus (GdkEventCrossing *event);
+gdouble gtksharp_gdk_event_crossing_get_x (GdkEventCrossing *event);
+gdouble gtksharp_gdk_event_crossing_get_y (GdkEventCrossing *event);
+gdouble gtksharp_gdk_event_crossing_get_x_root (GdkEventCrossing *event);
+gdouble gtksharp_gdk_event_crossing_get_y_root (GdkEventCrossing *event);
+GdkNotifyType gtksharp_gdk_event_crossing_get_detail (GdkEventCrossing *event);
+GdkCrossingMode gtksharp_gdk_event_crossing_get_mode (GdkEventCrossing *event);
+GdkWindow* gtksharp_gdk_event_crossing_get_subwindow (GdkEventCrossing *event);
 /* */
 
 GdkEventType
@@ -279,3 +289,63 @@ gtksharp_gdk_event_visibility_get_state (GdkEventVisibility *event)
 	return event->state;
 }
 
+gdouble
+gtksharp_gdk_event_crossing_get_x (GdkEventCrossing *event)
+{
+	return event->x;
+}
+
+gdouble
+gtksharp_gdk_event_crossing_get_y (GdkEventCrossing *event)
+{
+	return event->y;
+}
+
+gdouble
+gtksharp_gdk_event_crossing_get_x_root (GdkEventCrossing *event)
+{
+	return event->x_root;
+}
+
+gdouble
+gtksharp_gdk_event_crossing_get_y_root (GdkEventCrossing *event)
+{
+	return event->y_root;
+}
+
+guint32
+gtksharp_gdk_event_crossing_get_time (GdkEventCrossing *event)
+{
+	return event->time;
+}
+
+guint
+gtksharp_gdk_event_crossing_get_state (GdkEventCrossing *event)
+{
+	return event->state;
+}
+
+gboolean
+gtksharp_gdk_event_crossing_get_focus (GdkEventCrossing *event)
+{
+	return event->focus;
+}
+
+GdkWindow*
+gtksharp_gdk_event_crossing_get_subwindow (GdkEventCrossing *event)
+{
+	return event->subwindow;
+}
+
+GdkCrossingMode
+gtksharp_gdk_event_crossing_get_mode (GdkEventCrossing *event)
+{
+	return event->mode;
+}
+
+GdkNotifyType
+gtksharp_gdk_event_crossing_get_detail (GdkEventCrossing *event)
+{
+	return event->detail;
+}
+