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

	* gdk/Gdk.metadata : hide EventExpose. make Region opaque.
	* gdk/EventExpose.cs : glue-based manual implementation.
	* gdk/EventExpose.custom : kill
	* gdk/gdk-api.xml : regen
	* gdk/gdk-symbols.xml : manual mapping for EventExpose.
	* glue/event.cs : expose Expose struct fields.
	* sample/Scribble.cs : fix some EventExpose api breakage

svn path=/trunk/gtk-sharp/; revision=23226
---
 ChangeLog              | 10 ++++++++++
 gdk/EventExpose.cs     | 44 ++++++++++++++++++++++++++++++++++++++++++
 gdk/EventExpose.custom | 18 -----------------
 gdk/Gdk.metadata       |  2 ++
 gdk/gdk-api.xml        |  4 ++--
 gdk/gdk-symbols.xml    |  1 +
 glue/event.c           | 21 ++++++++++++++++++++
 sample/Scribble.cs     | 18 ++++++-----------
 8 files changed, 86 insertions(+), 32 deletions(-)
 create mode 100644 gdk/EventExpose.cs
 delete mode 100644 gdk/EventExpose.custom

diff --git a/ChangeLog b/ChangeLog
index bb33cde04..d25eba7bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-02-18  Mike Kestner  <mkestner@ximian.com>
+
+	* gdk/Gdk.metadata : hide EventExpose. make Region opaque.
+	* gdk/EventExpose.cs : glue-based manual implementation.
+	* gdk/EventExpose.custom : kill
+	* gdk/gdk-api.xml : regen
+	* gdk/gdk-symbols.xml : manual mapping for EventExpose.
+	* glue/event.cs : expose Expose struct fields.
+	* sample/Scribble.cs : fix some EventExpose api breakage
+
 2004-02-18  Mike Kestner  <mkestner@ximian.com>
 
 	* gdk/Gdk.metadata : hide EventMotion
diff --git a/gdk/EventExpose.cs b/gdk/EventExpose.cs
new file mode 100644
index 000000000..4f604930d
--- /dev/null
+++ b/gdk/EventExpose.cs
@@ -0,0 +1,44 @@
+// Gdk.EventExpose.cs - Custom expose event wrapper 
+//
+// Author:  Mike Kestner <mkestner@ximian.com>
+//
+// (c) 2004 Novell, Inc.
+
+namespace Gdk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public class EventExpose : Event {
+
+		[DllImport("gtksharpglue")]
+		static extern Rectangle gtksharp_gdk_event_expose_get_area (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern IntPtr gtksharp_gdk_event_expose_get_region (IntPtr evt);
+
+		[DllImport("gtksharpglue")]
+		static extern int gtksharp_gdk_event_expose_get_count (IntPtr evt);
+
+		public EventExpose (IntPtr raw) : base (raw) {} 
+
+		public Rectangle Area {
+			get {
+				return gtksharp_gdk_event_expose_get_area (Handle);
+			}
+		}
+
+		public int Count {
+			get {
+				return gtksharp_gdk_event_expose_get_count (Handle);
+			}
+		}
+
+		public Region Region {
+			get {
+				return new Region (gtksharp_gdk_event_expose_get_region (Handle));
+			}
+		}
+	}
+}
+
diff --git a/gdk/EventExpose.custom b/gdk/EventExpose.custom
deleted file mode 100644
index fc02fb692..000000000
--- a/gdk/EventExpose.custom
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// gdk/EventExpose.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 ed8f8cef5..95233cb35 100644
--- a/gdk/Gdk.metadata
+++ b/gdk/Gdk.metadata
@@ -65,10 +65,12 @@
   <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='GdkEventExpose']" 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='GdkEventScroll']" 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>
   <attr path="//struct[@cname='GdkWindowObject']" name="hidden">1</attr>
 </metadata>
diff --git a/gdk/gdk-api.xml b/gdk/gdk-api.xml
index 99b524bb0..d8c65495d 100644
--- a/gdk/gdk-api.xml
+++ b/gdk/gdk-api.xml
@@ -2325,7 +2325,7 @@
       <field cname="x_root" type="gshort" />
       <field cname="y_root" type="gshort" />
     </struct>
-    <struct name="EventExpose" cname="GdkEventExpose">
+    <struct name="EventExpose" cname="GdkEventExpose" hidden="1">
       <field cname="type" type="GdkEventType" />
       <field cname="window" type="GdkWindow*" />
       <field cname="send_event" type="gint8" />
@@ -2536,7 +2536,7 @@
         </parameters>
       </method>
     </boxed>
-    <struct name="Region" cname="GdkRegion">
+    <struct name="Region" cname="GdkRegion" opaque="1">
       <field cname="size" type="long" />
       <field cname="numRects" type="long" />
       <field cname="rects" type="GdkRegionBox*" />
diff --git a/gdk/gdk-symbols.xml b/gdk/gdk-symbols.xml
index 91059eacd..69092a589 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="GdkEventExpose" name="Gdk.EventExpose"/>
   <symbol type="manual" cname="GdkEventKey" name="Gdk.EventKey"/>
   <symbol type="manual" cname="GdkEventMotion" name="Gdk.EventMotion"/>
   <symbol type="manual" cname="GdkEventScroll" name="Gdk.EventScroll"/>
diff --git a/glue/event.c b/glue/event.c
index c99e1cb5f..73f6c1fdc 100644
--- a/glue/event.c
+++ b/glue/event.c
@@ -45,6 +45,9 @@ gdouble gtksharp_gdk_event_motion_get_x_root (GdkEventMotion *event);
 gdouble gtksharp_gdk_event_motion_get_y_root (GdkEventMotion *event);
 gdouble* gtksharp_gdk_event_motion_get_axes (GdkEventMotion *event);
 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);
 /* */
 
 GdkEventType
@@ -251,3 +254,21 @@ gtksharp_gdk_event_motion_get_axes (GdkEventMotion *event)
 	return event->axes;
 }
 
+GdkRectangle
+gtksharp_gdk_event_expose_get_area (GdkEventExpose *event)
+{
+	return event->area;
+}
+
+gint
+gtksharp_gdk_event_expose_get_count (GdkEventExpose *event)
+{
+	return event->count;
+}
+
+GdkRegion*
+gtksharp_gdk_event_expose_get_region (GdkEventExpose *event)
+{
+	return event->region;
+}
+
diff --git a/sample/Scribble.cs b/sample/Scribble.cs
index c116add22..d4bbaef33 100644
--- a/sample/Scribble.cs
+++ b/sample/Scribble.cs
@@ -47,16 +47,12 @@ namespace GtkSamples {
 
 		static void ExposeEvent (object obj, ExposeEventArgs args)
 		{
-			Gdk.EventExpose ev = args.Event;
-			Gdk.Window window = ev.window;
-			// FIXME: mcs bug
-			Gdk.Rectangle area = ev.Area;
-			// FIXME: array marshalling not done yet so no FG */
-			window.DrawDrawable (darea.Style.BlackGC,
-									   pixmap,
-									   area.X, area.Y,
-									   area.X, area.Y,
-									   area.Width, area.Height);
+			Gdk.Rectangle area = args.Event.Area;
+			args.Event.Window.DrawDrawable (darea.Style.BlackGC,
+							pixmap,
+							area.X, area.Y,
+							area.X, area.Y,
+							area.Width, area.Height);
 
 			args.RetVal = false;
 		}
@@ -67,12 +63,10 @@ namespace GtkSamples {
 			Gdk.Window window = ev.window;
 			Gdk.Rectangle allocation = darea.Allocation;
 
-		Console.WriteLine ("Darea=[{0}]" , darea);
 			pixmap = new Gdk.Pixmap (window,
 									       allocation.Width,
 									       allocation.Height,
 											 -1);
-			Console.WriteLine ("Darea.Style={0}", darea.Style);
 			pixmap.DrawRectangle (darea.Style.WhiteGC, true, 0, 0,
 									    allocation.Width, allocation.Height);