diff --git a/ChangeLog b/ChangeLog
index 519e46fe4..58cebca02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-02-20  Mike Kestner  <mkestner@ximian.com>
+
+	* gdk/Gdk.metadata : hide Property, Selection, and DND events
+	* gdk/EventDND.cs : glue-based manual implementation.
+	* gdk/EventDND.custom : kill
+	* gdk/EventProperty.cs : glue-based manual implementation.
+	* gdk/EventProperty.custom : kill
+	* gdk/EventSelection.cs : glue-based manual implementation.
+	* gdk/EventSelection.custom : kill
+	* gdk/gdk-api.xml : regen
+	* gdk/gdk-symbols.xml : manual mappings.
+	* glue/event.cs : expose DND, Property and Selection struct fields.
+
 2004-02-19  Thiago Milczarek Sayão  <sayao@brturbo.com>
 
 	* gtk/TextBuffer.custom : new InsertWithTags method.
diff --git a/gdk/EventDND.cs b/gdk/EventDND.cs
new file mode 100644
index 000000000..b6b9626a5
--- /dev/null
+++ b/gdk/EventDND.cs
@@ -0,0 +1,53 @@
+// Gdk.EventDND.cs - Custom dnd event wrapper 
+//
+// Author:  Mike Kestner <mkestner@ximian.com>
+//
+// (c) 2004 Novell, Inc.
+
+namespace Gdk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public class EventDND : Event {
+
+		[DllImport("gtksharpglue")]
+		static extern uint gtksharp_gdk_event_dnd_get_time (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern IntPtr gtksharp_gdk_event_dnd_get_context (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern short gtksharp_gdk_event_dnd_get_x_root (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern short gtksharp_gdk_event_dnd_get_y_root (IntPtr evt);
+
+		public EventDND (IntPtr raw) : base (raw) {} 
+
+		public DragContext Context {
+			get {
+				return GLib.Object.GetObject (gtksharp_gdk_event_dnd_get_context (Handle)) as DragContext;
+			}
+		}
+
+		public uint Time {
+			get {
+				return gtksharp_gdk_event_dnd_get_time (Handle);
+			}
+		}
+
+		public short XRoot {
+			get {
+				return gtksharp_gdk_event_dnd_get_x_root (Handle);
+			}
+		}
+
+		public short YRoot {
+			get {
+				return gtksharp_gdk_event_dnd_get_y_root (Handle);
+			}
+		}
+	}
+}
+
diff --git a/gdk/EventDND.custom b/gdk/EventDND.custom
deleted file mode 100644
index 646656568..000000000
--- a/gdk/EventDND.custom
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// gdk/EventDND.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/EventProperty.cs b/gdk/EventProperty.cs
new file mode 100644
index 000000000..a427c7628
--- /dev/null
+++ b/gdk/EventProperty.cs
@@ -0,0 +1,44 @@
+// Gdk.EventProperty.cs - Custom property event wrapper 
+//
+// Author:  Mike Kestner <mkestner@ximian.com>
+//
+// (c) 2004 Novell, Inc.
+
+namespace Gdk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public class EventProperty : Event {
+
+		[DllImport("gtksharpglue")]
+		static extern uint gtksharp_gdk_event_property_get_time (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern IntPtr gtksharp_gdk_event_property_get_atom (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern PropertyState gtksharp_gdk_event_property_get_state (IntPtr evt);
+
+		public EventProperty (IntPtr raw) : base (raw) {} 
+
+		public Atom Atom {
+			get {
+				return new Atom (gtksharp_gdk_event_property_get_atom (Handle));
+			}
+		}
+
+		public PropertyState State {
+			get {
+				return gtksharp_gdk_event_property_get_state (Handle);
+			}
+		}
+
+		public uint Time {
+			get {
+				return gtksharp_gdk_event_property_get_time (Handle);
+			}
+		}
+	}
+}
+
diff --git a/gdk/EventProperty.custom b/gdk/EventProperty.custom
deleted file mode 100644
index 8491198f7..000000000
--- a/gdk/EventProperty.custom
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// gdk/EventProperty.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/EventSelection.cs b/gdk/EventSelection.cs
new file mode 100644
index 000000000..e0faea0a2
--- /dev/null
+++ b/gdk/EventSelection.cs
@@ -0,0 +1,62 @@
+// Gdk.EventSelection.cs - Custom selection event wrapper 
+//
+// Author:  Mike Kestner <mkestner@ximian.com>
+//
+// (c) 2004 Novell, Inc.
+
+namespace Gdk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public class EventSelection : Event {
+
+		[DllImport("gtksharpglue")]
+		static extern uint gtksharp_gdk_event_selection_get_time (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern IntPtr gtksharp_gdk_event_selection_get_selection (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern IntPtr gtksharp_gdk_event_selection_get_target (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern IntPtr gtksharp_gdk_event_selection_get_property (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern uint gtksharp_gdk_event_selection_get_requestor (IntPtr evt);
+
+		public EventSelection (IntPtr raw) : base (raw) {} 
+
+		public Atom Property {
+			get {
+				return new Atom (gtksharp_gdk_event_selection_get_property (Handle));
+			}
+		}
+
+		public Atom Selection {
+			get {
+				return new Atom (gtksharp_gdk_event_selection_get_selection (Handle));
+			}
+		}
+
+		public Atom Target {
+			get {
+				return new Atom (gtksharp_gdk_event_selection_get_target (Handle));
+			}
+		}
+
+		public uint Requestor {
+			get {
+				return gtksharp_gdk_event_selection_get_requestor (Handle);
+			}
+		}
+
+		public uint Time {
+			get {
+				return gtksharp_gdk_event_selection_get_time (Handle);
+			}
+		}
+	}
+}
+
diff --git a/gdk/EventSelection.custom b/gdk/EventSelection.custom
deleted file mode 100644
index 1dc372782..000000000
--- a/gdk/EventSelection.custom
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// gdk/EventSelection.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 beef07818..2cdb76bc0 100644
--- a/gdk/Gdk.metadata
+++ b/gdk/Gdk.metadata
@@ -67,11 +67,14 @@
   <attr path="//struct[@cname='GdkEventButton']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventConfigure']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventCrossing']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GdkEventDND']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventExpose']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventFocus']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventKey']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventMotion']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GdkEventProperty']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventScroll']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GdkEventSelection']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventVisibility']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkPixmapObject']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkRegion']" name="opaque">1</attr>
diff --git a/gdk/gdk-api.xml b/gdk/gdk-api.xml
index 594b2b7ee..f336c897f 100644
--- a/gdk/gdk-api.xml
+++ b/gdk/gdk-api.xml
@@ -2316,7 +2316,7 @@
       <field cname="focus" type="gboolean" />
       <field cname="state" type="guint" />
     </struct>
-    <struct name="EventDND" cname="GdkEventDND">
+    <struct name="EventDND" cname="GdkEventDND" hidden="1">
       <field cname="type" type="GdkEventType" />
       <field cname="window" type="GdkWindow*" />
       <field cname="send_event" type="gint8" />
@@ -2370,7 +2370,7 @@
       <field cname="window" type="GdkWindow*" />
       <field cname="send_event" type="gint8" />
     </struct>
-    <struct name="EventProperty" cname="GdkEventProperty">
+    <struct name="EventProperty" cname="GdkEventProperty" hidden="1">
       <field cname="type" type="GdkEventType" />
       <field cname="window" type="GdkWindow*" />
       <field cname="send_event" type="gint8" />
@@ -2398,7 +2398,7 @@
       <field cname="x_root" type="gdouble" />
       <field cname="y_root" type="gdouble" />
     </struct>
-    <struct name="EventSelection" cname="GdkEventSelection">
+    <struct name="EventSelection" cname="GdkEventSelection" 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 7e44b5590..8ce67cec5 100644
--- a/gdk/gdk-symbols.xml
+++ b/gdk/gdk-symbols.xml
@@ -5,11 +5,14 @@
   <symbol type="manual" cname="GdkEventButton" name="Gdk.EventButton"/>
   <symbol type="manual" cname="GdkEventConfigure" name="Gdk.EventConfigure"/>
   <symbol type="manual" cname="GdkEventCrossing" name="Gdk.EventCrossing"/>
+  <symbol type="manual" cname="GdkEventDND" name="Gdk.EventDND"/>
   <symbol type="manual" cname="GdkEventExpose" name="Gdk.EventExpose"/>
   <symbol type="manual" cname="GdkEventFocus" name="Gdk.EventFocus"/>
   <symbol type="manual" cname="GdkEventKey" name="Gdk.EventKey"/>
   <symbol type="manual" cname="GdkEventMotion" name="Gdk.EventMotion"/>
+  <symbol type="manual" cname="GdkEventProperty" name="Gdk.EventProperty"/>
   <symbol type="manual" cname="GdkEventScroll" name="Gdk.EventScroll"/>
+  <symbol type="manual" cname="GdkEventSelection" name="Gdk.EventSelection"/>
   <symbol type="manual" cname="GdkEventVisibility" name="Gdk.EventVisibility"/>
 </api>
 
diff --git a/glue/event.c b/glue/event.c
index 74c926fe6..5eee8a0a3 100644
--- a/glue/event.c
+++ b/glue/event.c
@@ -64,6 +64,18 @@ gint gtksharp_gdk_event_configure_get_x (GdkEventConfigure *event);
 gint gtksharp_gdk_event_configure_get_y (GdkEventConfigure *event);
 gint gtksharp_gdk_event_configure_get_width (GdkEventConfigure *event);
 gint gtksharp_gdk_event_configure_get_height (GdkEventConfigure *event);
+guint32 gtksharp_gdk_event_property_get_time (GdkEventProperty *event);
+GdkAtom gtksharp_gdk_event_property_get_atom (GdkEventProperty *event);
+guint gtksharp_gdk_event_property_get_state (GdkEventProperty *event);
+GdkNativeWindow gtksharp_gdk_event_selection_get_requestor (GdkEventSelection *event);
+GdkAtom gtksharp_gdk_event_selection_get_property (GdkEventSelection *event);
+GdkAtom gtksharp_gdk_event_selection_get_selection (GdkEventSelection *event);
+GdkAtom gtksharp_gdk_event_selection_get_target (GdkEventSelection *event);
+guint32 gtksharp_gdk_event_selection_get_time (GdkEventSelection *event);
+guint32 gtksharp_gdk_event_dnd_get_time (GdkEventDND *event);
+gshort gtksharp_gdk_event_dnd_get_x_root (GdkEventDND *event);
+gshort gtksharp_gdk_event_dnd_get_y_root (GdkEventDND *event);
+GdkDragContext* gtksharp_gdk_event_dnd_get_context (GdkEventDND *event);
 /* */
 
 GdkEventType
@@ -384,3 +396,75 @@ gtksharp_gdk_event_configure_get_height (GdkEventConfigure *event)
 	return event->height;
 }
 
+guint32 
+gtksharp_gdk_event_property_get_time (GdkEventProperty *event)
+{
+	return event->time;
+}
+
+GdkAtom 
+gtksharp_gdk_event_property_get_atom (GdkEventProperty *event)
+{
+	return event->atom;
+}
+
+guint 
+gtksharp_gdk_event_property_get_state (GdkEventProperty *event)
+{
+	return event->state;
+}
+
+GdkNativeWindow 
+gtksharp_gdk_event_selection_get_requestor (GdkEventSelection *event)
+{
+	return event->requestor;
+}
+
+GdkAtom 
+gtksharp_gdk_event_selection_get_property (GdkEventSelection *event)
+{
+	return event->property;
+}
+
+GdkAtom 
+gtksharp_gdk_event_selection_get_selection (GdkEventSelection *event)
+{
+	return event->selection;
+}
+
+GdkAtom 
+gtksharp_gdk_event_selection_get_target (GdkEventSelection *event)
+{
+	return event->target;
+}
+
+guint32 
+gtksharp_gdk_event_selection_get_time (GdkEventSelection *event)
+{
+	return event->time;
+}
+
+GdkDragContext* 
+gtksharp_gdk_event_dnd_get_context (GdkEventDND *event)
+{
+	return event->context;
+}
+
+gshort 
+gtksharp_gdk_event_dnd_get_x_root (GdkEventDND *event)
+{
+	return event->x_root;
+}
+
+gshort 
+gtksharp_gdk_event_dnd_get_y_root (GdkEventDND *event)
+{
+	return event->y_root;
+}
+
+guint32 
+gtksharp_gdk_event_dnd_get_time (GdkEventDND *event)
+{
+	return event->time;
+}
+