diff --git a/ChangeLog b/ChangeLog
index f96de4f50..bf6a4e3f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-01  Todd Berman  <tberman@off.net>
+
+	* gtk/Gtk.metadata: Change the Gtk.Style.Paint* methods to use a
+	Gdk.Drawable instead of a Gdk.Window
+	* doc/en/Gtk/Style.xml: Update the documentation for the above
+	change.
+
 2005-07-28  Mike Kestner  <mkestner@novell.com>
 
 	* bootstrap-for-the-insane : beginnings of 2.8 binding.
diff --git a/doc/en/Gtk/Style.xml b/doc/en/Gtk/Style.xml
index 52b15f3aa..fd335c97b 100644
--- a/doc/en/Gtk/Style.xml
+++ b/doc/en/Gtk/Style.xml
@@ -476,14 +476,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintBox">
-      <MemberSignature Language="C#" Value="public static void PaintBox (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
+      <MemberSignature Language="C#" Value="public static void PaintBox (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="shadow_type" Type="Gtk.ShadowType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -497,7 +497,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Draws a box on the screen with the given parameters.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="shadow_type">a <see cref="T:Gtk.ShadowType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
@@ -511,14 +511,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintCheck">
-      <MemberSignature Language="C#" Value="public static void PaintCheck (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
+      <MemberSignature Language="C#" Value="public static void PaintCheck (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="shadow_type" Type="Gtk.ShadowType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -532,7 +532,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Draws a check button indicator in the given rectangle on <paramref name="window" /> with the given parameters.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="shadow_type">a <see cref="T:Gtk.ShadowType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
@@ -546,14 +546,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintResizeGrip">
-      <MemberSignature Language="C#" Value="public static void PaintResizeGrip (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.WindowEdge edge, int x, int y, int width, int height);" />
+      <MemberSignature Language="C#" Value="public static void PaintResizeGrip (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.WindowEdge edge, int x, int y, int width, int height);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
         <Parameter Name="widget" Type="Gtk.Widget" />
@@ -567,7 +567,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary> Draws a resize grip in the given rectangle on <paramref name="window" /> using the given parameters. </summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
         <param name="widget">a <see cref="T:Gtk.Widget" /></param>
@@ -581,14 +581,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintLayout">
-      <MemberSignature Language="C#" Value="public static void PaintLayout (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, bool use_text, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Pango.Layout layout);" />
+      <MemberSignature Language="C#" Value="public static void PaintLayout (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, bool use_text, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Pango.Layout layout);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="use_text" Type="System.Boolean" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -601,7 +601,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Draws a layout on the screen using the given parameters.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="use_text">a <see cref="T:System.Boolean" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
@@ -614,14 +614,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintOption">
-      <MemberSignature Language="C#" Value="public static void PaintOption (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
+      <MemberSignature Language="C#" Value="public static void PaintOption (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="shadow_type" Type="Gtk.ShadowType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -636,7 +636,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
         <summary>Draws a radio button indicator in the given rectangle on <paramref name="window" /> with the given parameters.
 	</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="shadow_type">a <see cref="T:Gtk.ShadowType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
@@ -650,14 +650,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintSlider">
-      <MemberSignature Language="C#" Value="public static void PaintSlider (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation);" />
+      <MemberSignature Language="C#" Value="public static void PaintSlider (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="shadow_type" Type="Gtk.ShadowType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -672,7 +672,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Draws a slider widget with the given parameters.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="shadow_type">a <see cref="T:Gtk.ShadowType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
@@ -687,14 +687,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintDiamond">
-      <MemberSignature Language="C#" Value="public static void PaintDiamond (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
+      <MemberSignature Language="C#" Value="public static void PaintDiamond (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="shadow_type" Type="Gtk.ShadowType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -708,7 +708,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Draws a diamond in the given rectangle on <paramref name="window" /> using the given parameters.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="shadow_type">a <see cref="T:Gtk.ShadowType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
@@ -722,14 +722,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintShadow">
-      <MemberSignature Language="C#" Value="public static void PaintShadow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
+      <MemberSignature Language="C#" Value="public static void PaintShadow (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="shadow_type" Type="Gtk.ShadowType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -743,7 +743,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Draws a shadow around the given rectangle in <paramref name="window" /> using the given style and state and shadow type.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="shadow_type">a <see cref="T:Gtk.ShadowType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
@@ -757,14 +757,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintVline">
-      <MemberSignature Language="C#" Value="public static void PaintVline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int y1_, int y2_, int x);" />
+      <MemberSignature Language="C#" Value="public static void PaintVline (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int y1_, int y2_, int x);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
         <Parameter Name="widget" Type="Gtk.Widget" />
@@ -776,7 +776,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary> Draws a vertical line from (<paramref name="x" />, <paramref name="y1_" />) to (<paramref name="x" />, <paramref name="y2_" />) in <paramref name="window" /> using the given style and state.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
         <param name="widget">a <see cref="T:Gtk.Widget" /></param>
@@ -788,14 +788,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintTab">
-      <MemberSignature Language="C#" Value="public static void PaintTab (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
+      <MemberSignature Language="C#" Value="public static void PaintTab (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="shadow_type" Type="Gtk.ShadowType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -810,7 +810,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
         <summary>Draws an option menu tab (i.e. the up and down pointing arrows) in the given rectangle on <paramref name="window" /> using the given parameters.
 	</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="shadow_type">a <see cref="T:Gtk.ShadowType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
@@ -824,14 +824,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintFocus">
-      <MemberSignature Language="C#" Value="public static void PaintFocus (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
+      <MemberSignature Language="C#" Value="public static void PaintFocus (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
         <Parameter Name="widget" Type="Gtk.Widget" />
@@ -844,7 +844,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Draws a focus indicator around the given rectangle on <paramref name="window" /> using the given style.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
         <param name="widget">a <see cref="T:Gtk.Widget" /></param>
@@ -857,14 +857,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintShadowGap">
-      <MemberSignature Language="C#" Value="public static void PaintShadowGap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);" />
+      <MemberSignature Language="C#" Value="public static void PaintShadowGap (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="shadow_type" Type="Gtk.ShadowType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -881,7 +881,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Draws a shadow gap around the given widget using the given parameters.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="shadow_type">a <see cref="T:Gtk.ShadowType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
@@ -898,14 +898,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintExtension">
-      <MemberSignature Language="C#" Value="public static void PaintExtension (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side);" />
+      <MemberSignature Language="C#" Value="public static void PaintExtension (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="shadow_type" Type="Gtk.ShadowType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -920,7 +920,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Draws an extension for the given widget in the given style.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="shadow_type">a <see cref="T:Gtk.ShadowType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
@@ -935,14 +935,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintFlatBox">
-      <MemberSignature Language="C#" Value="public static void PaintFlatBox (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
+      <MemberSignature Language="C#" Value="public static void PaintFlatBox (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="shadow_type" Type="Gtk.ShadowType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -956,7 +956,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Draws a flat box on <paramref name="window" /> with the given parameters.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="shadow_type">a <see cref="T:Gtk.ShadowType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
@@ -970,14 +970,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintHandle">
-      <MemberSignature Language="C#" Value="public static void PaintHandle (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation);" />
+      <MemberSignature Language="C#" Value="public static void PaintHandle (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="shadow_type" Type="Gtk.ShadowType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -992,7 +992,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Draw a handle graphic for the given widget using the given parameters.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="shadow_type">a <see cref="T:Gtk.ShadowType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
@@ -1007,14 +1007,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintArrow">
-      <MemberSignature Language="C#" Value="public static void PaintArrow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height);" />
+      <MemberSignature Language="C#" Value="public static void PaintArrow (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="shadow_type" Type="Gtk.ShadowType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -1030,7 +1030,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Draw an arrow at (<paramref name="x" />, <paramref name="y" />) using the given parameters.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="shadow_type">a <see cref="T:Gtk.ShadowType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
@@ -1046,14 +1046,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintHline">
-      <MemberSignature Language="C#" Value="public static void PaintHline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x1, int x2, int y);" />
+      <MemberSignature Language="C#" Value="public static void PaintHline (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x1, int x2, int y);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
         <Parameter Name="widget" Type="Gtk.Widget" />
@@ -1065,7 +1065,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary> Draws a horizontal line from (<paramref name="x1" />, <paramref name="y" />) to (<paramref name="x2" />, <paramref name="y" />) in <paramref name="window" /> using the given style and state.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
         <param name="widget">a <see cref="T:Gtk.Widget" /></param>
@@ -1077,14 +1077,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintBoxGap">
-      <MemberSignature Language="C#" Value="public static void PaintBoxGap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);" />
+      <MemberSignature Language="C#" Value="public static void PaintBoxGap (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="shadow_type" Type="Gtk.ShadowType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -1101,7 +1101,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Draws a gap around a box using the given parameters.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:Gtk.StateType" /></param>
         <param name="shadow_type">a <see cref="T:Gtk.ShadowType" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
@@ -1207,14 +1207,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintExpander">
-      <MemberSignature Language="C#" Value="public static void PaintExpander (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Gtk.ExpanderStyle expander_style);" />
+      <MemberSignature Language="C#" Value="public static void PaintExpander (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Gtk.ExpanderStyle expander_style);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
         <Parameter Name="widget" Type="Gtk.Widget" />
@@ -1226,7 +1226,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Paints an expander using the style specified.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:System.Int32" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
         <param name="widget">a <see cref="T:Gtk.Widget" /></param>
@@ -1239,14 +1239,14 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       </Docs>
     </Member>
     <Member MemberName="PaintPolygon">
-      <MemberSignature Language="C#" Value="public static void PaintPolygon (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.Point[] points, bool fill);" />
+      <MemberSignature Language="C#" Value="public static void PaintPolygon (Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.Point[] points, bool fill);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="style" Type="Gtk.Style" />
-        <Parameter Name="window" Type="Gdk.Window" />
+        <Parameter Name="window" Type="Gdk.Drawable" />
         <Parameter Name="state_type" Type="Gtk.StateType" />
         <Parameter Name="shadow_type" Type="Gtk.ShadowType" />
         <Parameter Name="area" Type="Gdk.Rectangle" />
@@ -1258,7 +1258,7 @@ color or pixmap specified by this style for <paramref name="state" />.</summary>
       <Docs>
         <summary>Paint a polygon.</summary>
         <param name="style">a <see cref="T:Gtk.Style" /></param>
-        <param name="window">a <see cref="T:Gdk.Window" /></param>
+        <param name="window">a <see cref="T:Gdk.Drawable" /></param>
         <param name="state_type">a <see cref="T:System.Int32" /></param>
         <param name="shadow_type">a <see cref="T:System.Int32" /></param>
         <param name="area">a <see cref="T:Gdk.Rectangle" /></param>
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 30cf6f5b3..0fb404e2b 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -53,6 +53,26 @@
   <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintPolygon']/*/*[@name='npoints']" name="name">n_points</attr>
   <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PrivateFlagsGetType']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='TextLayoutDraw']" name="hidden">1</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintArrow']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintBoxGap']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintBox']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintCheck']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintDiamond']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintExpander']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintExtension']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintFlatBox']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintFocus']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintHandle']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintHline']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintLayout']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintOption']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintPolygon']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintResizeGrip']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintShadowGap']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintShadow']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintSlider']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintTab']/*/*[@name='window']" name="type">GdkDrawable*</attr>
+  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintVline']/*/*[@name='window']" name="type">GdkDrawable*</attr>
   <attr path="/api/namespace/class[@cname='GtkIdle_']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GtkInit_']/method[@name='Check']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GtkInit_']/method[@name='CheckAbiCheck']" name="hidden">1</attr>