diff --git a/ChangeLog b/ChangeLog
index e80a1e61c..7a7fedeb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-17  Mike Kestner  <mkestner@novell.com>
+
+	* gdk/Gdk.metadata : mark out param on Window.GetFrameExtents.
+	* gdk/WindowAttr.custom : new typed Mask prop.
+	* gtk/Widget.custom : new typed WidgetFlags prop. mark Flags obsolete.
+
 2004-12-17  Mike Kestner  <mkestner@novell.com>
 
 	* gtk/Makefile.am : add new file.
diff --git a/doc/en/Gdk/Window.xml b/doc/en/Gdk/Window.xml
index 790d3af8b..83ea4b2c9 100644
--- a/doc/en/Gdk/Window.xml
+++ b/doc/en/Gdk/Window.xml
@@ -1159,26 +1159,6 @@ in a child).
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName="GetFrameExtents">
-      <MemberSignature Language="C#" Value="public void GetFrameExtents (Gdk.Rectangle rect);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="rect" Type="Gdk.Rectangle" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Obtains the bounding box of the window, including window manager
-	  titlebar/borders if any. The frame position is given in root window
-	  coordinates. To get the position of the window itself (rather than
-	  the frame) in root window coordinates, use <see cref="M:Gdk.Window.GetOrigin" />.
-	</summary>
-        <param name="rect">A <see cref="T:Gdk.Rectangle" /></param>
-        <remarks />
-      </Docs>
-    </Member>
     <Member MemberName="Finalize">
       <MemberSignature Language="C#" Value="protected override void Finalize ();" />
       <MemberType>Method</MemberType>
@@ -1953,5 +1933,18 @@ The color must be allocated;
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="FrameExtents">
+      <MemberSignature Language="C#" Value="public Gdk.Rectangle FrameExtents { get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Gdk.Rectangle</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>Obtains the bounding box of the window.</summary>
+        <returns>a <see cref="T:Gdk.Rectangle" /></returns>
+        <remarks>Area includes window manager titlebar/borders if any. The frame position is given in root window coordinates. To get the position of the window itself (rather than the frame) in root window coordinates, use <see cref="M:Gdk.Window.GetOrigin" />.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/doc/en/Gdk/WindowAttr.xml b/doc/en/Gdk/WindowAttr.xml
index 8edb95395..c41a35950 100644
--- a/doc/en/Gdk/WindowAttr.xml
+++ b/doc/en/Gdk/WindowAttr.xml
@@ -236,5 +236,18 @@
         <remarks>None.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Mask">
+      <MemberSignature Language="C#" Value="public Gdk.EventMask Mask { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Gdk.EventMask</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>Event mask.</summary>
+        <returns>a <see cref="T:Gdk.EventMask" /></returns>
+        <remarks>See <see cref="P:Gdk.Window.Events" />.</remarks>
+      </Docs>
+    </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/Gtk/Widget.xml b/doc/en/Gtk/Widget.xml
index db0cec082..9e80944b9 100644
--- a/doc/en/Gtk/Widget.xml
+++ b/doc/en/Gtk/Widget.xml
@@ -3725,7 +3725,7 @@ xs    <Member MemberName="OnMapEvent">
         <returns>a <see cref="T:System.Int32" /></returns>
         <remarks>
           <para>
-          This property should only be used when writing custom widgets in C#.
+          This property should only be used when writing custom widgets in C#. The <see cref="M:Gtk.Widget.WidgetFlags"/> property is a preferred more strongly typed member.  This member is obsolete in Gtk# 2.0.
           </para>
           <para>
           See <see cref="T:Gtk.WidgetFlags" /> for possible values.
@@ -4192,4 +4192,16 @@ Widgets are required to honor the size allocation they receive; a size request i
         <param name="vals">the values for the properties identified by <paramref name="names" /></param>
         <remarks>See <see cref="M:GLib.Object.CreateNativeObject" /> for more details. This overridden method also sets up event handlers on the object to ensure that the wrapper object always stays alive when the widget is contained by another widget (even when it is contained by an unmanaged widget that doesn't know about its managed wrapper).</remarks>
       </Docs>
-    </Member></Members></Type>
\ No newline at end of file
+    </Member><Member MemberName="WidgetFlags">
+      <MemberSignature Language="C#" Value="public Gtk.WidgetFlags WidgetFlags { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Gtk.WidgetFlags</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>Contains Widget specific flags values.</summary>
+        <returns>a <see cref="T:Gtk.WidgetFlags" /></returns>
+        <remarks />
+      </Docs>
+    </Member></Members></Type>
diff --git a/gdk/Gdk.metadata b/gdk/Gdk.metadata
index 06920e04f..4556a9666 100644
--- a/gdk/Gdk.metadata
+++ b/gdk/Gdk.metadata
@@ -105,6 +105,7 @@
   <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='Destroy']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetChildren']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkWindow']" name="parent">GdkDrawable</attr>
+  <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetFrameExtents']/*/*[@name='rect']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetInternalPaintInfo']/*/*[@type='gint*']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetInternalPaintInfo']/*/*[@type='GdkDrawable**']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetOrigin']/*/*[@type='gint*']" name="pass_as">out</attr>
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index ec39ee10f..607acf317 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -60,6 +60,7 @@ customs = 			\
 	Region.custom		\
 	Screen.custom		\
 	Selection.custom	\
+	WindowAttr.custom	\
 	Window.custom
 
 build_customs = $(addprefix $(srcdir)/, $(customs))
diff --git a/gdk/WindowAttr.custom b/gdk/WindowAttr.custom
new file mode 100644
index 000000000..49134c426
--- /dev/null
+++ b/gdk/WindowAttr.custom
@@ -0,0 +1,31 @@
+// Gdk.WindowAttr.custom - Gdk Window class customizations
+//
+// Author: Mike Kestner <mkestner@novell.com>
+//
+// Copyright (c) 2004 Novell, Inc.
+//
+// This code is inserted after the automatically generated code.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the Lesser GNU General 
+// Public License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+		public EventMask Mask {
+			get {
+				return (EventMask) EventMask;
+			}
+			set {
+				EventMask = (int) value;
+			}
+		}
+
diff --git a/gtk/Widget.custom b/gtk/Widget.custom
index 234b00334..929908091 100644
--- a/gtk/Widget.custom
+++ b/gtk/Widget.custom
@@ -103,6 +103,7 @@ static extern int gtksharp_gtk_widget_get_flags (IntPtr raw);
 [DllImport("gtksharpglue-2")]
 static extern void gtksharp_gtk_widget_set_flags (IntPtr raw, int flags);
 
+[Obsolete]
 public int Flags {
 	get {
 		return gtksharp_gtk_widget_get_flags (Handle);
@@ -112,6 +113,15 @@ public int Flags {
 	}
 }
 
+public WidgetFlags WidgetFlags {
+	get {
+		return (WidgetFlags) gtksharp_gtk_widget_get_flags (Handle);
+	}
+	set {
+		gtksharp_gtk_widget_set_flags (Handle, (int) value);
+	}
+}
+
 public void SetFlag (WidgetFlags flag)
 {
 	Flags |= (int)flag;