diff --git a/ChangeLog b/ChangeLog
index 512d02bd5..3cb7101b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-15  Duncan Mak  <duncan@ximian.com>
+
+	* sources/Gtk.metadata (Gtk.TreeView.CellArea): Apply patch from
+	Aleksey Sanin <aleksey@aleksey.com> to declare the "Gdk.Rectangle
+	rect" parameter as an out parameter. This is required because
+	Gdk.Rectangle is a struct.
+
 2003-08-14  Martin Willemoes Hansen  <mwh@sysrq.dk>
 
 	* sources/Gnome.metadata: Renamed use of keyword base to Base 
diff --git a/api/gtk-api.xml b/api/gtk-api.xml
index 00b93b990..ff7a06c82 100644
--- a/api/gtk-api.xml
+++ b/api/gtk-api.xml
@@ -8385,7 +8385,7 @@
         <parameters>
           <parameter type="GtkTreePath*" name="path"/>
           <parameter type="GtkTreeViewColumn*" name="column"/>
-          <parameter type="GdkRectangle*" name="rect"/>
+          <parameter type="GdkRectangle*" name="rect" pass_as="out"/>
         </parameters>
       </method>
       <method name="GetColumn" cname="gtk_tree_view_get_column">
diff --git a/doc/en/Gtk/TreeView.xml b/doc/en/Gtk/TreeView.xml
index 6ce677390..5e96abc1d 100644
--- a/doc/en/Gtk/TreeView.xml
+++ b/doc/en/Gtk/TreeView.xml
@@ -53,7 +53,7 @@
       </para>
       <para>A simple list:
       <example>
-        <code lang="C#">
+          <code lang="C#">
 using System;
 using Gtk;
 using GtkSharp;
@@ -98,10 +98,10 @@ public class TreeViewSample {
 	}
 }
 	</code>
-      </example></para>
+        </example></para>
       <para>A more advanced example:
       <example>
-        <code lang="C#">
+          <code lang="C#">
 using System;
 using System.Reflection;
 using Gtk;
@@ -219,7 +219,7 @@ public class TreeViewDemo {
 	}
 }
         </code>
-      </example></para>
+        </example></para>
     </remarks>
   </Docs>
   <Base>
@@ -261,8 +261,8 @@ public class TreeViewDemo {
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="column" Type="Gtk.TreeViewColumn" />
-	</Parameters>
+        <Parameter Name="column" Type="Gtk.TreeViewColumn" />
+      </Parameters>
       <Docs>
         <summary>Removes <paramref name="column" /> from <see cref="T:Gtk.TreeView" />.</summary>
         <param name="column">an object of type <see cref="T:Gtk.TreeViewColumn" /></param>
@@ -277,10 +277,10 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="func" Type="Gtk.TreeViewColumnDropFunc" />
-		<Parameter Name="user_data" Type="System.IntPtr" />
-		<Parameter Name="destroy" Type="Gtk.DestroyNotify" />
-	</Parameters>
+        <Parameter Name="func" Type="Gtk.TreeViewColumnDropFunc" />
+        <Parameter Name="user_data" Type="System.IntPtr" />
+        <Parameter Name="destroy" Type="Gtk.DestroyNotify" />
+      </Parameters>
       <Docs>
         <summary>Sets a user function for determining where a column may be dropped when dragged.</summary>
         <param name="func">an object of type <see cref="T:Gtk.TreeViewColumnDropFunc" /></param>
@@ -296,12 +296,12 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="path" Type="Gtk.TreePath" />
-		<Parameter Name="column" Type="Gtk.TreeViewColumn" />
-		<Parameter Name="use_align" Type="System.Boolean" />
-		<Parameter Name="row_align" Type="System.Single" />
-		<Parameter Name="col_align" Type="System.Single" />
-	</Parameters>
+        <Parameter Name="path" Type="Gtk.TreePath" />
+        <Parameter Name="column" Type="Gtk.TreeViewColumn" />
+        <Parameter Name="use_align" Type="System.Boolean" />
+        <Parameter Name="row_align" Type="System.Single" />
+        <Parameter Name="col_align" Type="System.Single" />
+      </Parameters>
       <Docs>
         <summary>Moves the alignments of the <see cref="T:Gtk.TreeView" /> to the position specified by <paramref name="column" /> and <paramref name="path" />.</summary>
         <param name="path">an object of type <see cref="T:Gtk.TreePath" /></param>
@@ -319,7 +319,7 @@ public class TreeViewDemo {
           <para>
             This function only works if the model is set, and <paramref name="path" /> is a valid row on the model. If the model changes before the <see cref="Gtk.TreeView" /> is realized, the centered path will be modified to reflect this change.
           </para>
-		</remarks>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="EnableModelDragDest">
@@ -329,10 +329,10 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="targets" Type="Gtk.TargetEntry" />
-		<Parameter Name="n_targets" Type="System.Int32" />
-		<Parameter Name="actions" Type="Gdk.DragAction" />
-	</Parameters>
+        <Parameter Name="targets" Type="Gtk.TargetEntry" />
+        <Parameter Name="n_targets" Type="System.Int32" />
+        <Parameter Name="actions" Type="Gdk.DragAction" />
+      </Parameters>
       <Docs>
         <summary>To be added</summary>
         <param name="targets">an object of type <see cref="T:Gtk.TargetEntry" /></param>
@@ -348,8 +348,8 @@ public class TreeViewDemo {
         <ReturnType>Gdk.Pixmap</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="path" Type="Gtk.TreePath" />
-	</Parameters>
+        <Parameter Name="path" Type="Gtk.TreePath" />
+      </Parameters>
       <Docs>
         <summary>This image is used for a drag icon.</summary>
         <param name="path">an object of type <see cref="T:Gtk.TreePath" /></param>
@@ -376,9 +376,9 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="column" Type="Gtk.TreeViewColumn" />
-		<Parameter Name="base_column" Type="Gtk.TreeViewColumn" />
-	</Parameters>
+        <Parameter Name="column" Type="Gtk.TreeViewColumn" />
+        <Parameter Name="base_column" Type="Gtk.TreeViewColumn" />
+      </Parameters>
       <Docs>
         <summary>Moves <paramref name="column" /> to be after to <paramref name="base_column" />.</summary>
         <param name="column">an object of type <see cref="T:Gtk.TreeViewColumn" /></param>
@@ -393,10 +393,10 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="path" Type="Gtk.TreePath" />
-		<Parameter Name="focus_column" Type="Gtk.TreeViewColumn" />
-		<Parameter Name="start_editing" Type="System.Boolean" />
-	</Parameters>
+        <Parameter Name="path" Type="Gtk.TreePath" />
+        <Parameter Name="focus_column" Type="Gtk.TreeViewColumn" />
+        <Parameter Name="start_editing" Type="System.Boolean" />
+      </Parameters>
       <Docs>
         <summary>Sets the current keyboard focus to be at <paramref name="path" />, and selects it.</summary>
         <param name="path">an object of type <see cref="T:Gtk.TreePath" /></param>
@@ -412,10 +412,10 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="path" Type="Gtk.TreePath" />
-		<Parameter Name="column" Type="Gtk.TreeViewColumn" />
-		<Parameter Name="rect" Type="Gdk.Rectangle" />
-	</Parameters>
+        <Parameter Name="path" Type="Gtk.TreePath" />
+        <Parameter Name="column" Type="Gtk.TreeViewColumn" />
+        <Parameter Name="rect" Type="Gdk.Rectangle" />
+      </Parameters>
       <Docs>
         <summary>Fills the bounding rectangle in tree window coordinates for the cell at the row specified by <paramref name="path" /> and the column specified by <paramref name="column" />.</summary>
         <param name="path">an object of type <see cref="T:Gtk.TreePath" /></param>
@@ -431,8 +431,8 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="visible_rect" Type="Gdk.Rectangle" />
-	</Parameters>
+        <Parameter Name="visible_rect" Type="Gdk.Rectangle" />
+      </Parameters>
       <Docs>
         <summary>Fills <paramref name="visible_rect" /> with the currently-visible region of the buffer, in tree coordinates.</summary>
         <param name="visible_rect">an object of type <see cref="T:Gdk.Rectangle" /></param>
@@ -446,9 +446,9 @@ public class TreeViewDemo {
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="column" Type="Gtk.TreeViewColumn" />
-		<Parameter Name="position" Type="System.Int32" />
-	</Parameters>
+        <Parameter Name="column" Type="Gtk.TreeViewColumn" />
+        <Parameter Name="position" Type="System.Int32" />
+      </Parameters>
       <Docs>
         <summary>This inserts the <paramref name="column" /> into the <see cref="T:Gtk.TreeView" /> at <paramref name="position" />.</summary>
         <param name="column">an object of type <see cref="T:Gtk.TreeViewColumn" /></param>
@@ -464,9 +464,9 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="path" Type="Gtk.TreePath" />
-		<Parameter Name="column" Type="Gtk.TreeViewColumn" />
-	</Parameters>
+        <Parameter Name="path" Type="Gtk.TreePath" />
+        <Parameter Name="column" Type="Gtk.TreeViewColumn" />
+      </Parameters>
       <Docs>
         <summary>Activates the cell determined by <paramref name="path" /> and <paramref name="column" />.</summary>
         <param name="path">an object of type <see cref="T:Gtk.TreePath" /></param>
@@ -481,8 +481,8 @@ public class TreeViewDemo {
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="path" Type="Gtk.TreePath" />
-	</Parameters>
+        <Parameter Name="path" Type="Gtk.TreePath" />
+      </Parameters>
       <Docs>
         <summary>Opens the row so its children are visible.</summary>
         <param name="path">an object of type <see cref="T:Gtk.TreePath" /></param>
@@ -497,10 +497,10 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="func" Type="Gtk.TreeDestroyCountFunc" />
-		<Parameter Name="data" Type="System.IntPtr" />
-		<Parameter Name="destroy" Type="Gtk.DestroyNotify" />
-	</Parameters>
+        <Parameter Name="func" Type="Gtk.TreeDestroyCountFunc" />
+        <Parameter Name="data" Type="System.IntPtr" />
+        <Parameter Name="destroy" Type="Gtk.DestroyNotify" />
+      </Parameters>
       <Docs>
         <summary>This function should almost never be used.</summary>
         <param name="func">an object of type <see cref="T:Gtk.TreeDestroyCountFunc" /></param>
@@ -516,10 +516,10 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="search_equal_func" Type="Gtk.TreeViewSearchEqualFunc" />
-		<Parameter Name="search_user_data" Type="System.IntPtr" />
-		<Parameter Name="search_destroy" Type="Gtk.DestroyNotify" />
-	</Parameters>
+        <Parameter Name="search_equal_func" Type="Gtk.TreeViewSearchEqualFunc" />
+        <Parameter Name="search_user_data" Type="System.IntPtr" />
+        <Parameter Name="search_destroy" Type="Gtk.DestroyNotify" />
+      </Parameters>
       <Docs>
         <summary>Sets the compare function for the interactive search capabilities.</summary>
         <param name="search_equal_func"> an object of type <see cref="T:Gtk.TreeViewSearchEqualFunc" /></param>
@@ -547,8 +547,8 @@ public class TreeViewDemo {
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="column" Type="Gtk.TreeViewColumn" />
-	</Parameters>
+        <Parameter Name="column" Type="Gtk.TreeViewColumn" />
+      </Parameters>
       <Docs>
         <summary>Appends <paramref name="column" /> to the list of columns.</summary>
         <param name="column">an object of type <see cref="T:Gtk.TreeViewColumn" /></param>
@@ -563,9 +563,9 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="path" Type="Gtk.TreePath" />
-		<Parameter Name="pos" Type="Gtk.TreeViewDropPosition" />
-	</Parameters>
+        <Parameter Name="path" Type="Gtk.TreePath" />
+        <Parameter Name="pos" Type="Gtk.TreeViewDropPosition" />
+      </Parameters>
       <Docs>
         <summary>To be added</summary>
         <param name="path">an object of type <see cref="T:Gtk.TreePath" /></param>
@@ -592,11 +592,11 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="start_button_mask" Type="Gdk.ModifierType" />
-		<Parameter Name="targets" Type="Gtk.TargetEntry" />
-		<Parameter Name="n_targets" Type="System.Int32" />
-		<Parameter Name="actions" Type="Gdk.DragAction" />
-	</Parameters>
+        <Parameter Name="start_button_mask" Type="Gdk.ModifierType" />
+        <Parameter Name="targets" Type="Gtk.TargetEntry" />
+        <Parameter Name="n_targets" Type="System.Int32" />
+        <Parameter Name="actions" Type="Gdk.DragAction" />
+      </Parameters>
       <Docs>
         <summary>To be added</summary>
         <param name="start_button_mask">an object of type <see cref="T:Gdk.ModifierType" /></param>
@@ -613,8 +613,8 @@ public class TreeViewDemo {
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="path" Type="Gtk.TreePath" />
-	</Parameters>
+        <Parameter Name="path" Type="Gtk.TreePath" />
+      </Parameters>
       <Docs>
         <summary>Collapses a row (hides its child rows, if they exist).</summary>
         <param name="path">an object of type <see cref="T:Gtk.TreePath" /></param>
@@ -629,11 +629,11 @@ public class TreeViewDemo {
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="drag_x" Type="System.Int32" />
-		<Parameter Name="drag_y" Type="System.Int32" />
-		<Parameter Name="path" Type="Gtk.TreePath" />
-		<Parameter Name="pos" Type="Gtk.TreeViewDropPosition" />
-	</Parameters>
+        <Parameter Name="drag_x" Type="System.Int32" />
+        <Parameter Name="drag_y" Type="System.Int32" />
+        <Parameter Name="path" Type="Gtk.TreePath" />
+        <Parameter Name="pos" Type="Gtk.TreeViewDropPosition" />
+      </Parameters>
       <Docs>
         <summary>To be added</summary>
         <param name="drag_x">an object of type <see cref="T:System.Int32" /></param>
@@ -663,9 +663,9 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="path" Type="Gtk.TreePath" />
-		<Parameter Name="pos" Type="Gtk.TreeViewDropPosition" />
-	</Parameters>
+        <Parameter Name="path" Type="Gtk.TreePath" />
+        <Parameter Name="pos" Type="Gtk.TreeViewDropPosition" />
+      </Parameters>
       <Docs>
         <summary>To be added</summary>
         <param name="path">an object of type <see cref="T:Gtk.TreePath" /></param>
@@ -680,8 +680,8 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="func" Type="Gtk.TreeViewMappingFunc" />
-	</Parameters>
+        <Parameter Name="func" Type="Gtk.TreeViewMappingFunc" />
+      </Parameters>
       <Docs>
         <summary>To be added</summary>
         <param name="func">an object of type <see cref="T:Gtk.TreeViewMappingFunc" /></param>
@@ -695,9 +695,9 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="tree_x" Type="System.Int32" />
-		<Parameter Name="tree_y" Type="System.Int32" />
-	</Parameters>
+        <Parameter Name="tree_x" Type="System.Int32" />
+        <Parameter Name="tree_y" Type="System.Int32" />
+      </Parameters>
       <Docs>
         <summary>Scrolls the <see cref="T:Gtk.TreeView" /> such that the top-left corner of the visible area is <paramref name="tree_x" />, <paramref name="tree_y" />, where <paramref name="tree_x" /> and <paramref name="tree_y" /> are specified in tree window coordinates.</summary>
         <param name="tree_x">an object of type <see cref="T:System.Int32" /></param>
@@ -712,8 +712,8 @@ public class TreeViewDemo {
         <ReturnType>Gtk.TreeViewColumn</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="n" Type="System.Int32" />
-	</Parameters>
+        <Parameter Name="n" Type="System.Int32" />
+      </Parameters>
       <Docs>
         <summary>Gets the <see cref="T:Gtk.TreeViewColumn" /> at the given position in the <see cref="T:Gtk.TreeView" />.</summary>
         <param name="n">an object of type <see cref="T:System.Int32" /></param>
@@ -728,9 +728,9 @@ public class TreeViewDemo {
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="path" Type="Gtk.TreePath" />
-		<Parameter Name="open_all" Type="System.Boolean" />
-	</Parameters>
+        <Parameter Name="path" Type="Gtk.TreePath" />
+        <Parameter Name="open_all" Type="System.Boolean" />
+      </Parameters>
       <Docs>
         <summary>Opens the row so its children are visible.</summary>
         <param name="path">an object of type <see cref="T:Gtk.TreePath" /></param>
@@ -758,11 +758,11 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="tx" Type="System.Int32" />
-		<Parameter Name="ty" Type="System.Int32" />
-		<Parameter Name="wx" Type="System.Int32" />
-		<Parameter Name="wy" Type="System.Int32" />
-	</Parameters>
+        <Parameter Name="tx" Type="System.Int32" />
+        <Parameter Name="ty" Type="System.Int32" />
+        <Parameter Name="wx" Type="System.Int32" />
+        <Parameter Name="wy" Type="System.Int32" />
+      </Parameters>
       <Docs>
         <summary>Converts tree coordinates (coordinates in full scrollable area of the tree) to widget coordinates.</summary>
         <param name="tx">an object of type <see cref="T:System.Int32" /></param>
@@ -773,16 +773,16 @@ public class TreeViewDemo {
       </Docs>
     </Member>
     <Member MemberName="GetCellArea">
-      <MemberSignature Language="C#" Value="public void GetCellArea (Gtk.TreePath path, Gtk.TreeViewColumn column, Gdk.Rectangle rect);" />
+      <MemberSignature Language="C#" Value="public void GetCellArea (Gtk.TreePath path, Gtk.TreeViewColumn column, out Gdk.Rectangle rect);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="path" Type="Gtk.TreePath" />
-		<Parameter Name="column" Type="Gtk.TreeViewColumn" />
-		<Parameter Name="rect" Type="Gdk.Rectangle" />
-	</Parameters>
+        <Parameter Name="path" Type="Gtk.TreePath" />
+        <Parameter Name="column" Type="Gtk.TreeViewColumn" />
+        <Parameter Name="rect" Type="Gdk.Rectangle&amp;" RefType="out" />
+      </Parameters>
       <Docs>
         <summary>Fills the bounding rectangle in tree window coordinates for the cell at the row specified by <paramref name="path" /> and the column specified by <paramref name="column" />.</summary>
         <param name="path">an object of type <see cref="T:Gtk.TreePath" /></param>
@@ -798,9 +798,9 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="path" Type="Gtk.TreePath" />
-		<Parameter Name="focus_column" Type="Gtk.TreeViewColumn" />
-	</Parameters>
+        <Parameter Name="path" Type="Gtk.TreePath" />
+        <Parameter Name="focus_column" Type="Gtk.TreeViewColumn" />
+      </Parameters>
       <Docs>
         <summary>Fills in <paramref name="path" /> and <paramref name="focus_column" /> with the current path and focus column.</summary>
         <param name="path">an object of type <see cref="T:Gtk.TreePath" /></param>
@@ -825,8 +825,8 @@ public class TreeViewDemo {
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-		<Parameter Name="raw" Type="System.IntPtr" />
-	</Parameters>
+        <Parameter Name="raw" Type="System.IntPtr" />
+      </Parameters>
       <Docs>
         <summary>Internal constructor</summary>
         <param name="raw">Pointer to the C object.</param>
@@ -852,8 +852,8 @@ public class TreeViewDemo {
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-		<Parameter Name="model" Type="Gtk.TreeModel" />
-	</Parameters>
+        <Parameter Name="model" Type="Gtk.TreeModel" />
+      </Parameters>
       <Docs>
         <summary>Creates a new <see cref="T:Gtk.TreeView" /> object.</summary>
         <param name="model">an object of type <see cref="T:Gtk.TreeModel" /></param>
@@ -879,8 +879,7 @@ public class TreeViewDemo {
       <ReturnValue>
         <ReturnType>Gtk.TreeModel</ReturnType>
       </ReturnValue>
-      <Parameters>
-	</Parameters>
+      <Parameters></Parameters>
       <Docs>
         <summary>The model for the TreeView.</summary>
         <param name="value">an object of type <see cref="T:Gtk.TreeModel" /></param>
@@ -930,8 +929,7 @@ public class TreeViewDemo {
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
-      <Parameters>
-	</Parameters>
+      <Parameters></Parameters>
       <Docs>
         <summary>Whether to display alternating, shaded rows in the <see cref="Gtk.TreeView" />.</summary>
         <param name="value">an object of type <see cref="T:System.Boolean" /></param>
@@ -945,8 +943,7 @@ public class TreeViewDemo {
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
-      <Parameters>
-	</Parameters>
+      <Parameters></Parameters>
       <Docs>
         <summary>View allows user to search through columns interactively.</summary>
         <param name="value">an object of type <see cref="T:System.Boolean" /></param>
@@ -960,8 +957,7 @@ public class TreeViewDemo {
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
-      <Parameters>
-	</Parameters>
+      <Parameters></Parameters>
       <Docs>
         <summary>Show the column header buttons.</summary>
         <param name="value">an object of type <see cref="T:System.Boolean" /></param>
@@ -975,8 +971,7 @@ public class TreeViewDemo {
       <ReturnValue>
         <ReturnType>Gtk.TreeViewColumn</ReturnType>
       </ReturnValue>
-      <Parameters>
-	</Parameters>
+      <Parameters></Parameters>
       <Docs>
         <summary>Set the column for the expander column.</summary>
         <param name="value">an object of type <see cref="T:Gtk.TreeViewColumn" /></param>
@@ -990,8 +985,7 @@ public class TreeViewDemo {
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
-      <Parameters>
-	</Parameters>
+      <Parameters></Parameters>
       <Docs>
         <summary>View is reorderable.</summary>
         <param name="value">an object of type <see cref="T:System.Boolean" /></param>
@@ -1005,8 +999,7 @@ public class TreeViewDemo {
       <ReturnValue>
         <ReturnType>Gtk.Adjustment</ReturnType>
       </ReturnValue>
-      <Parameters>
-	</Parameters>
+      <Parameters></Parameters>
       <Docs>
         <summary>Horizontal Adjustment for the widget.</summary>
         <param name="value">an object of type <see cref="T:Gtk.Adjustment" /></param>
@@ -1020,8 +1013,7 @@ public class TreeViewDemo {
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
-      <Parameters>
-	</Parameters>
+      <Parameters></Parameters>
       <Docs>
         <summary>Column headers respond to click events.</summary>
         <param name="value">an object of type <see cref="T:System.Boolean" /></param>
@@ -1035,8 +1027,7 @@ public class TreeViewDemo {
       <ReturnValue>
         <ReturnType>Gtk.Adjustment</ReturnType>
       </ReturnValue>
-      <Parameters>
-	</Parameters>
+      <Parameters></Parameters>
       <Docs>
         <summary>Vertical Adjustment for the widget.</summary>
         <param name="value">an object of type <see cref="T:Gtk.Adjustment" /></param>
@@ -1050,8 +1041,7 @@ public class TreeViewDemo {
       <ReturnValue>
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
-      <Parameters>
-	</Parameters>
+      <Parameters></Parameters>
       <Docs>
         <summary>Model column to search through when searching through code.</summary>
         <param name="value">an object of type <see cref="T:System.Int32" /></param>
@@ -1062,7 +1052,9 @@ public class TreeViewDemo {
     <Member MemberName="ScrollAdjustmentsSet">
       <MemberSignature Language="C#" Value="public event GtkSharp.ScrollAdjustmentsSetHandler ScrollAdjustmentsSet;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>GtkSharp.ScrollAdjustmentsSetHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>GtkSharp.ScrollAdjustmentsSetHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1072,7 +1064,9 @@ public class TreeViewDemo {
     <Member MemberName="RowExpanded">
       <MemberSignature Language="C#" Value="public event GtkSharp.RowExpandedHandler RowExpanded;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>GtkSharp.RowExpandedHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>GtkSharp.RowExpandedHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1082,7 +1076,9 @@ public class TreeViewDemo {
     <Member MemberName="MoveCursor">
       <MemberSignature Language="C#" Value="public event GtkSharp.MoveCursorHandler MoveCursor;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>GtkSharp.MoveCursorHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>GtkSharp.MoveCursorHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1092,7 +1088,9 @@ public class TreeViewDemo {
     <Member MemberName="TestExpandRow">
       <MemberSignature Language="C#" Value="public event GtkSharp.TestExpandRowHandler TestExpandRow;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>GtkSharp.TestExpandRowHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>GtkSharp.TestExpandRowHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1102,7 +1100,9 @@ public class TreeViewDemo {
     <Member MemberName="SelectCursorRow">
       <MemberSignature Language="C#" Value="public event GtkSharp.SelectCursorRowHandler SelectCursorRow;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>GtkSharp.SelectCursorRowHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>GtkSharp.SelectCursorRowHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1112,7 +1112,9 @@ public class TreeViewDemo {
     <Member MemberName="RowCollapsed">
       <MemberSignature Language="C#" Value="public event GtkSharp.RowCollapsedHandler RowCollapsed;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>GtkSharp.RowCollapsedHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>GtkSharp.RowCollapsedHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1122,7 +1124,9 @@ public class TreeViewDemo {
     <Member MemberName="ColumnsChanged">
       <MemberSignature Language="C#" Value="public event EventHandler ColumnsChanged;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>System.EventHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>System.EventHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1132,7 +1136,9 @@ public class TreeViewDemo {
     <Member MemberName="ExpandCollapseCursorRow">
       <MemberSignature Language="C#" Value="public event GtkSharp.ExpandCollapseCursorRowHandler ExpandCollapseCursorRow;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>GtkSharp.ExpandCollapseCursorRowHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>GtkSharp.ExpandCollapseCursorRowHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1142,7 +1148,9 @@ public class TreeViewDemo {
     <Member MemberName="RowActivated">
       <MemberSignature Language="C#" Value="public event GtkSharp.RowActivatedHandler RowActivated;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>GtkSharp.RowActivatedHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>GtkSharp.RowActivatedHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1152,7 +1160,9 @@ public class TreeViewDemo {
     <Member MemberName="TestCollapseRow">
       <MemberSignature Language="C#" Value="public event GtkSharp.TestCollapseRowHandler TestCollapseRow;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>GtkSharp.TestCollapseRowHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>GtkSharp.TestCollapseRowHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1162,7 +1172,9 @@ public class TreeViewDemo {
     <Member MemberName="CursorChanged">
       <MemberSignature Language="C#" Value="public event EventHandler CursorChanged;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>System.EventHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>System.EventHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1174,8 +1186,8 @@ public class TreeViewDemo {
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-		<Parameter Name="gtype" Type="GLib.Type" />
-	</Parameters>
+        <Parameter Name="gtype" Type="GLib.Type" />
+      </Parameters>
       <Docs>
         <summary>Internal constructor</summary>
         <param name="gtype">GLib type for the type</param>
@@ -1192,11 +1204,11 @@ public class TreeViewDemo {
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="x" Type="System.Int32" />
-		<Parameter Name="y" Type="System.Int32" />
-		<Parameter Name="path" Type="Gtk.TreePath&amp;" RefType="out" />
-		<Parameter Name="column" Type="Gtk.TreeViewColumn" />
-	</Parameters>
+        <Parameter Name="x" Type="System.Int32" />
+        <Parameter Name="y" Type="System.Int32" />
+        <Parameter Name="path" Type="Gtk.TreePath&amp;" RefType="out" />
+        <Parameter Name="column" Type="Gtk.TreeViewColumn" />
+      </Parameters>
       <Docs>
         <summary>Finds the path at the point (x, y), relative to widget coordinates.</summary>
         <param name="x">an object of type <see cref="T:System.Int32" /></param>
@@ -1214,10 +1226,10 @@ public class TreeViewDemo {
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="x" Type="System.Int32" />
-		<Parameter Name="y" Type="System.Int32" />
-		<Parameter Name="path" Type="Gtk.TreePath&amp;" RefType="out" />
-	</Parameters>
+        <Parameter Name="x" Type="System.Int32" />
+        <Parameter Name="y" Type="System.Int32" />
+        <Parameter Name="path" Type="Gtk.TreePath&amp;" RefType="out" />
+      </Parameters>
       <Docs>
         <summary>To be added</summary>
         <param name="x">an object of type <see cref="T:System.Int32" /></param>
@@ -1234,13 +1246,13 @@ public class TreeViewDemo {
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="x" Type="System.Int32" />
-		<Parameter Name="y" Type="System.Int32" />
-		<Parameter Name="path" Type="Gtk.TreePath&amp;" RefType="out" />
-		<Parameter Name="column" Type="Gtk.TreeViewColumn" />
-		<Parameter Name="cell_x" Type="System.Int32&amp;" RefType="out" />
-		<Parameter Name="cell_y" Type="System.Int32&amp;" RefType="out" />
-	</Parameters>
+        <Parameter Name="x" Type="System.Int32" />
+        <Parameter Name="y" Type="System.Int32" />
+        <Parameter Name="path" Type="Gtk.TreePath&amp;" RefType="out" />
+        <Parameter Name="column" Type="Gtk.TreeViewColumn" />
+        <Parameter Name="cell_x" Type="System.Int32&amp;" RefType="out" />
+        <Parameter Name="cell_y" Type="System.Int32&amp;" RefType="out" />
+      </Parameters>
       <Docs>
         <summary>Finds the path at the point (x, y), relative to widget coordinates.</summary>
         <param name="x">an object of type <see cref="T:System.Int32" /></param>
@@ -1260,11 +1272,11 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="wx" Type="System.Int32" />
-		<Parameter Name="wy" Type="System.Int32" />
-		<Parameter Name="tx" Type="System.Int32&amp;" RefType="out" />
-		<Parameter Name="ty" Type="System.Int32&amp;" RefType="out" />
-	</Parameters>
+        <Parameter Name="wx" Type="System.Int32" />
+        <Parameter Name="wy" Type="System.Int32" />
+        <Parameter Name="tx" Type="System.Int32&amp;" RefType="out" />
+        <Parameter Name="ty" Type="System.Int32&amp;" RefType="out" />
+      </Parameters>
       <Docs>
         <summary>Converts widget coordinates to coordinates for the tree window (the full scrollable area of the tree).</summary>
         <param name="wx">an object of type <see cref="T:System.Int32" /></param>
@@ -1277,7 +1289,9 @@ public class TreeViewDemo {
     <Member MemberName="ToggleCursorRow">
       <MemberSignature Language="C#" Value="public event GtkSharp.ToggleCursorRowHandler ToggleCursorRow;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>GtkSharp.ToggleCursorRowHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>GtkSharp.ToggleCursorRowHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1287,7 +1301,9 @@ public class TreeViewDemo {
     <Member MemberName="StartInteractiveSearch">
       <MemberSignature Language="C#" Value="public event GtkSharp.StartInteractiveSearchHandler StartInteractiveSearch;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>GtkSharp.StartInteractiveSearchHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>GtkSharp.StartInteractiveSearchHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1297,7 +1313,9 @@ public class TreeViewDemo {
     <Member MemberName="SelectAll">
       <MemberSignature Language="C#" Value="public event GtkSharp.SelectAllHandler SelectAll;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>GtkSharp.SelectAllHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>GtkSharp.SelectAllHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1307,7 +1325,9 @@ public class TreeViewDemo {
     <Member MemberName="SelectCursorParent">
       <MemberSignature Language="C#" Value="public event GtkSharp.SelectCursorParentHandler SelectCursorParent;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>GtkSharp.SelectCursorParentHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>GtkSharp.SelectCursorParentHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1317,7 +1337,9 @@ public class TreeViewDemo {
     <Member MemberName="UnselectAll">
       <MemberSignature Language="C#" Value="public event GtkSharp.UnselectAllHandler UnselectAll;" />
       <MemberType>Event</MemberType>
-      <ReturnValue><ReturnType>GtkSharp.UnselectAllHandler</ReturnType></ReturnValue>
+      <ReturnValue>
+        <ReturnType>GtkSharp.UnselectAllHandler</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -1331,10 +1353,10 @@ public class TreeViewDemo {
         <ReturnType>Gtk.TreeViewColumn</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="title" Type="System.String" />
-		<Parameter Name="cell" Type="Gtk.CellRenderer" />
-		<Parameter Name="attrs" Type="System.Object[]" />
-	</Parameters>
+        <Parameter Name="title" Type="System.String" />
+        <Parameter Name="cell" Type="Gtk.CellRenderer" />
+        <Parameter Name="attrs" Type="System.Object[]" />
+      </Parameters>
       <Docs>
         <summary>To be added</summary>
         <param name="title">a <see cref="T:System.String" /></param>
@@ -1351,10 +1373,10 @@ public class TreeViewDemo {
         <ReturnType>Gtk.TreeViewColumn</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="title" Type="System.String" />
-		<Parameter Name="cell" Type="Gtk.CellRenderer" />
-		<Parameter Name="cell_data" Type="Gtk.TreeCellDataFunc" />
-	</Parameters>
+        <Parameter Name="title" Type="System.String" />
+        <Parameter Name="cell" Type="Gtk.CellRenderer" />
+        <Parameter Name="cell_data" Type="Gtk.TreeCellDataFunc" />
+      </Parameters>
       <Docs>
         <summary>To be added</summary>
         <param name="title">a <see cref="T:System.String" /></param>
@@ -1371,11 +1393,11 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="path" Type="Gtk.TreePath" />
-		<Parameter Name="focus_column" Type="Gtk.TreeViewColumn" />
-		<Parameter Name="focus_cell" Type="Gtk.CellRenderer" />
-		<Parameter Name="start_editing" Type="System.Boolean" />
-	</Parameters>
+        <Parameter Name="path" Type="Gtk.TreePath" />
+        <Parameter Name="focus_column" Type="Gtk.TreeViewColumn" />
+        <Parameter Name="focus_cell" Type="Gtk.CellRenderer" />
+        <Parameter Name="start_editing" Type="System.Boolean" />
+      </Parameters>
       <Docs>
         <summary>To be added</summary>
         <param name="path">a <see cref="T:Gtk.TreePath" /></param>
@@ -1392,8 +1414,8 @@ public class TreeViewDemo {
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-		<Parameter Name="path" Type="Gtk.TreePath" />
-	</Parameters>
+        <Parameter Name="path" Type="Gtk.TreePath" />
+      </Parameters>
       <Docs>
         <summary>To be added</summary>
         <param name="path">a <see cref="T:Gtk.TreePath" /></param>
@@ -1401,4 +1423,4 @@ public class TreeViewDemo {
       </Docs>
     </Member>
   </Members>
-</Type>
+</Type>
\ No newline at end of file
diff --git a/sources/Gtk.metadata b/sources/Gtk.metadata
index 0d05e81e1..dd62e5cf2 100644
--- a/sources/Gtk.metadata
+++ b/sources/Gtk.metadata
@@ -410,6 +410,18 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GtkTreeView">
+    <method>GetCellArea</method>
+  </class>
+  <data>
+    <attribute target="param">
+      <filter level="name">rect</filter>
+      <name>pass_as</name>
+      <value>out</value>
+    </attribute>
+  </data>
+</rule>
 
 <!-- variable arguments -->
 <rule>