diff --git a/ChangeLog b/ChangeLog
index e2aa568a1..7e4792907 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-25  Mike Kestner  <mkestner@ximian.com>
+
+	* gtk/Gtk.metadata : Widget.Events is a Gdk.EventMask, not int
+	* sample/GtkDemo/DemoDrawingArea.cs : remove int casts
+	* sample/Scribble.cs : remove int casts
+
 2003-03-24  John Luke  <jluke@cfl.rr.com>
 
 	* samples/gconf/Makefile.am:
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 4a7c9de36..96f907132 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -254,6 +254,7 @@
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetDefaultColormap']" name="needs_ref">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetDefaultStyle']" name="needs_ref">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetDefaultVisual']" name="needs_ref">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetEvents']/return-type" name="type">GdkEventMask</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetModifierStyle']" name="needs_ref">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetParentWindow']" name="needs_ref">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetStyle']" name="needs_ref">1</attr>
@@ -263,6 +264,7 @@
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='ListAccelClosures']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='Path']/*/*[@type='gchar**']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='Ref']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='SetEvents']/*/*[@type='gint']" name="type">GdkEventMask</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='SetScrollAdjustments']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='SetStyle']/*/*[@type='GtkStyle*']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='SizeRequest']/*/*[@name='requisition']" name="pass_as">ref</attr>
diff --git a/sample/GtkDemo/DemoDrawingArea.cs b/sample/GtkDemo/DemoDrawingArea.cs
index 1ff9f51a8..1d25e47d1 100644
--- a/sample/GtkDemo/DemoDrawingArea.cs
+++ b/sample/GtkDemo/DemoDrawingArea.cs
@@ -84,10 +84,8 @@ namespace GtkDemo {
 			// Ask to receive events the drawing area doesn't normally
 			// subscribe to
 
-			drawingArea1.Events = (int)EventMask.LeaveNotifyMask |
-			                     (int)EventMask.ButtonPressMask |
-			                     (int)EventMask.PointerMotionMask |
-			                     (int)EventMask.PointerMotionHintMask;
+			drawingArea1.Events = EventMask.LeaveNotifyMask | EventMask.ButtonPressMask |
+			                      EventMask.PointerMotionMask | EventMask.PointerMotionHintMask;
 			
 			window.ShowAll ();
 		}
diff --git a/sample/Scribble.cs b/sample/Scribble.cs
index 06e9b14d5..59c083ecf 100644
--- a/sample/Scribble.cs
+++ b/sample/Scribble.cs
@@ -28,11 +28,9 @@ namespace GtkSamples {
 			darea.ConfigureEvent += new ConfigureEventHandler (ConfigureEvent);
 			darea.MotionNotifyEvent += new MotionNotifyEventHandler (MotionNotifyEvent);
 			darea.ButtonPressEvent += new ButtonPressEventHandler (ButtonPressEvent);
-			darea.Events = (int)EventMask.ExposureMask |
-							   (int)EventMask.LeaveNotifyMask |
-							   (int)EventMask.ButtonPressMask |
-							   (int)EventMask.PointerMotionMask |
-							   (int)EventMask.PointerMotionHintMask;
+			darea.Events = EventMask.ExposureMask | EventMask.LeaveNotifyMask |
+				       EventMask.ButtonPressMask | EventMask.PointerMotionMask |
+				       EventMask.PointerMotionHintMask;
 
 			win.ShowAll ();
 			Application.Run ();