From e35e9720d77f5422eab03596e8fb523966c56815 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Thu, 30 Dec 2004 16:29:44 +0000
Subject: [PATCH] 2004-12-30  Mike Kestner  <mkestner@novell.com>

	* gtk/Gtk.metadata : hide TreeView.InsertColumnWith*.
	* gtk/TreeView.cs : manual implementations of InsertColumn overloads
	for WithAttributes and WithDataFunc.

svn path=/trunk/gtk-sharp/; revision=38187
---
 ChangeLog                       |  6 ++++
 doc/ChangeLog                   |  5 ++++
 doc/en/Gtk/ItemFactoryEntry.xml |  2 +-
 doc/en/Gtk/TreeView.xml         | 50 +++++++++++++++++++++++----------
 gtk/Gtk.metadata                |  2 ++
 gtk/TreeView.custom             | 15 ++++++++++
 6 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5bacf8007..0529b0c95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-30  Mike Kestner  <mkestner@novell.com>
+
+	* gtk/Gtk.metadata : hide TreeView.InsertColumnWith*.
+	* gtk/TreeView.cs : manual implementations of InsertColumn overloads
+	for WithAttributes and WithDataFunc.
+
 2004-12-30  Alp Toker  <alp@atoker.com>
 
 	* README.generator: Close tag fix for example XML.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index ff0c012aa..94aab39b3 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-30 Mike Kestner <mkestner@novell.com>
+
+	* en/Gtk/IterFactoryEntry.xml : fix a make assemble breakage.
+	* en/Gtk/TreeView.xml : docs for new InsertColumn overloads.
+
 2004-12-30 Shane Landrum <epicene@pobox.com>
 
 	* en/Gtk/ItemFactory.xml
diff --git a/doc/en/Gtk/ItemFactoryEntry.xml b/doc/en/Gtk/ItemFactoryEntry.xml
index 624555fdc..eadb8e939 100644
--- a/doc/en/Gtk/ItemFactoryEntry.xml
+++ b/doc/en/Gtk/ItemFactoryEntry.xml
@@ -70,7 +70,7 @@
       </Parameters>
       <Docs>
         <summary>The accelerator key for this item.</summary>
-        <remarks>For example, "<control>O".</remarks>
+        <remarks>For example, "&lt;control&gt;O".</remarks>
       </Docs>
     </Member>
     <Member MemberName="CallbackAction">
diff --git a/doc/en/Gtk/TreeView.xml b/doc/en/Gtk/TreeView.xml
index 485b85a0e..a39bec948 100644
--- a/doc/en/Gtk/TreeView.xml
+++ b/doc/en/Gtk/TreeView.xml
@@ -1765,40 +1765,60 @@ tree_view.AppendColumn ("title", text, "text", 0);
       <Docs>
         <summary>Whether or not to assume all rows are the same height.</summary>
         <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>This is an optimization; set to <see langword="true"/> for fastest performance.</remarks>
+        <remarks>This is an optimization; set to <see langword="true" /> for fastest performance.</remarks>
       </Docs>
     </Member>
-    <Member MemberName="InsertColumnWithDataFunc">
-      <MemberSignature Language="C#" Value="public int InsertColumnWithDataFunc (int position, string title, Gtk.CellRenderer cell, Gtk.TreeCellDataFunc func, IntPtr data, IntPtr dnotify);" />
+    <Member MemberName="InsertColumn">
+      <MemberSignature Language="C#" Value="public int InsertColumn (int pos, string title, Gtk.CellRenderer cell, Gtk.TreeCellDataFunc cell_data);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="position" Type="System.Int32" />
+        <Parameter Name="pos" Type="System.Int32" />
         <Parameter Name="title" Type="System.String" />
         <Parameter Name="cell" Type="Gtk.CellRenderer" />
-        <Parameter Name="func" Type="Gtk.TreeCellDataFunc" />
-        <Parameter Name="data" Type="System.IntPtr" />
-        <Parameter Name="dnotify" Type="System.IntPtr" />
+        <Parameter Name="cell_data" Type="Gtk.TreeCellDataFunc" />
       </Parameters>
       <Docs>
         <summary>Convenience function that inserts a new column into the tree view
 	  with the given cell renderer and a <see cref="T:Gtk.TreeCellDataFunc" /> to set cell renderer
 	  attributes (normally using data from the model). </summary>
-        <param name="position">a <see cref="T:System.Int32" />, the position of the new column (-1 to append, positive numbers to insert)</param>
+        <param name="pos">a <see cref="T:System.Int32" />, the position of the new column (-1 to append, positive numbers to insert)</param>
         <param name="title">a <see cref="T:System.String" />, the column title</param>
         <param name="cell">a <see cref="T:Gtk.CellRenderer" />, the renderer object</param>
-        <param name="func">a <see cref="T:Gtk.TreeCellDataFunc" />, a function for presenting the data</param>
-        <param name="data">a <see cref="T:System.IntPtr" />, pointer to the data for <paramref name="func"/></param>
-        <param name="dnotify">a <see cref="T:System.IntPtr" />, a destroy notifier for <paramref name="data"/></param>
-        <returns>a <see cref="T:System.Int32" /></returns>
+        <param name="cell_data">a <see cref="T:Gtk.TreeCellDataFunc" />, a function for presenting the data</param>
+        <returns>The number of columns in the tree view after the insertion.</returns>
         <remarks>
-	  See also <see cref="M:Gtk.TreeViewColumn.SetCellDataFunc"/>, <see cref="M:Gtk.TreeViewColumn.PackStart"/>.
-	  If the tree view has <see cref="P:Gtk.TreeViewColumn.FixedHeightMode"/> enabled, then <paramref name="column"/> must have its
-	  <see cref="P:Gtk.TreeViewColumn.Sizing"/> property set to be <see cref="P:Gtk.TreeViewColumnSizing.Fixed"/>.
+	  See also <see cref="M:Gtk.TreeViewColumn.SetCellDataFunc" />, <see cref="M:Gtk.TreeViewColumn.PackStart" />.
+	  If the tree view has <see cref="P:Gtk.TreeViewColumn.FixedHeightMode" /> enabled, then <paramref name="column" /> must have its
+	  <see cref="P:Gtk.TreeViewColumn.Sizing" /> property set to be <see cref="P:Gtk.TreeViewColumnSizing.Fixed" />.
 	</remarks>
       </Docs>
     </Member>
+    <Member MemberName="InsertColumn">
+      <MemberSignature Language="C#" Value="public int InsertColumn (int pos, string title, Gtk.CellRenderer cell, object [] attrs);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="pos" Type="System.Int32" />
+        <Parameter Name="title" Type="System.String" />
+        <Parameter Name="cell" Type="Gtk.CellRenderer" />
+        <Parameter Name="attrs" Type="System.Object[]" />
+      </Parameters>
+      <Docs>
+        <summary>Convenience function that inserts a new column into the tree view
+	  with the given cell renderer and attribute bindings for the cell renderer.
+	</summary>
+        <param name="pos">a <see cref="T:System.Int32" />, the position of the new column (-1 to append, positive numbers to insert)</param>
+        <param name="title">a <see cref="T:System.String" />, the column title</param>
+        <param name="cell">a <see cref="T:Gtk.CellRenderer" />, the renderer object</param>
+        <param name="attrs">an array of attribute bindings</param>
+        <returns>The number of columns in the tree view after the insertion.</returns>
+        <remarks />
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 18aa86246..8dbe9f189 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -356,6 +356,8 @@
   <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='GetBackgroundArea']/*/*[@name='rect']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='GetPathAtPos']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='GetSearchEqualFunc']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='InsertColumnWithAttributes']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='InsertColumnWithDataFunc']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='RowActivated']" name="name">ActivateRow</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='RowExpanded']" name="name">GetRowExpanded</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='ScrollToCell']/*/*[@type='GtkTreePath*']" name="null_ok">1</attr>
diff --git a/gtk/TreeView.custom b/gtk/TreeView.custom
index 36c77da0b..ecf17def1 100644
--- a/gtk/TreeView.custom
+++ b/gtk/TreeView.custom
@@ -136,3 +136,18 @@
 			return col;
 		}
 
+		public int InsertColumn (int pos, string title, CellRenderer cell, TreeCellDataFunc cell_data) 
+		{
+			TreeViewColumn col = new TreeViewColumn ();
+			col.Title = title;
+			col.PackStart (cell, true);
+			col.SetCellDataFunc (cell, cell_data);
+			return InsertColumn (col, pos);
+		}
+		
+		public int InsertColumn (int pos, string title, CellRenderer cell, params object[] attrs) 
+		{
+			TreeViewColumn col = new TreeViewColumn (title, cell, attrs);
+			return InsertColumn (col, pos);
+		}
+