From 99793aa24f950bf5424066ef6fdbea948594bb3a Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Wed, 18 Feb 2004 18:16:24 +0000
Subject: [PATCH] 2004-02-18  Mike Kestner  <mkestner@ximian.com>

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

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

diff --git a/ChangeLog b/ChangeLog
index d25eba7bc..81e01db42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-18  Mike Kestner  <mkestner@ximian.com>
+
+	* gdk/Gdk.metadata : hide EventVisibility. 
+	* gdk/EventVisibility.cs : glue-based manual implementation.
+	* gdk/EventVisibility.custom : kill
+	* gdk/gdk-api.xml : regen
+	* gdk/gdk-symbols.xml : manual mapping for EventVisibility.
+	* glue/event.cs : expose Visibility struct fields.
+
 2004-02-18  Mike Kestner  <mkestner@ximian.com>
 
 	* gdk/Gdk.metadata : hide EventExpose. make Region opaque.
diff --git a/gdk/EventVisibility.cs b/gdk/EventVisibility.cs
new file mode 100644
index 000000000..31e9d841a
--- /dev/null
+++ b/gdk/EventVisibility.cs
@@ -0,0 +1,26 @@
+// Gdk.EventVisibility.cs - Custom visibility event wrapper 
+//
+// Author:  Mike Kestner <mkestner@ximian.com>
+//
+// (c) 2004 Novell, Inc.
+
+namespace Gdk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public class EventVisibility : Event {
+
+		[DllImport("gtksharpglue")]
+		static extern VisibilityState gtksharp_gdk_event_visibility_get_state (IntPtr evt);
+
+		public EventVisibility (IntPtr raw) : base (raw) {} 
+
+		public VisibilityState State {
+			get {
+				return gtksharp_gdk_event_visibility_get_state (Handle);
+			}
+		}
+	}
+}
+
diff --git a/gdk/EventVisibility.custom b/gdk/EventVisibility.custom
deleted file mode 100644
index d5b304c3e..000000000
--- a/gdk/EventVisibility.custom
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// gdk/EventVisibility.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 95233cb35..384a129f5 100644
--- a/gdk/Gdk.metadata
+++ b/gdk/Gdk.metadata
@@ -69,6 +69,7 @@
   <attr path="//struct[@cname='GdkEventKey']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventMotion']" name="hidden">1</attr>
   <attr path="//struct[@cname='GdkEventScroll']" 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>
   <attr path="//struct[@cname='GdkTimeCoord']/field[@cname='axes']" name="array_len">128</attr>
diff --git a/gdk/gdk-api.xml b/gdk/gdk-api.xml
index d8c65495d..530457833 100644
--- a/gdk/gdk-api.xml
+++ b/gdk/gdk-api.xml
@@ -2415,7 +2415,7 @@
       <field cname="action" type="GdkSettingAction" />
       <field cname="name" type="char*" />
     </struct>
-    <struct name="EventVisibility" cname="GdkEventVisibility">
+    <struct name="EventVisibility" cname="GdkEventVisibility" 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 69092a589..77f77554e 100644
--- a/gdk/gdk-symbols.xml
+++ b/gdk/gdk-symbols.xml
@@ -7,5 +7,6 @@
   <symbol type="manual" cname="GdkEventKey" name="Gdk.EventKey"/>
   <symbol type="manual" cname="GdkEventMotion" name="Gdk.EventMotion"/>
   <symbol type="manual" cname="GdkEventScroll" name="Gdk.EventScroll"/>
+  <symbol type="manual" cname="GdkEventVisibility" name="Gdk.EventVisibility"/>
 </api>
 
diff --git a/glue/event.c b/glue/event.c
index 73f6c1fdc..bcbd524a6 100644
--- a/glue/event.c
+++ b/glue/event.c
@@ -48,6 +48,7 @@ GdkDevice* gtksharp_gdk_event_motion_get_device (GdkEventMotion *event);
 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);
 /* */
 
 GdkEventType
@@ -272,3 +273,9 @@ gtksharp_gdk_event_expose_get_region (GdkEventExpose *event)
 	return event->region;
 }
 
+GdkVisibilityState 
+gtksharp_gdk_event_visibility_get_state (GdkEventVisibility *event)
+{
+	return event->state;
+}
+