From 636ff0bc8a4b3b6cd88d249e9e9037b119f50b25 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Wed, 2 Aug 2006 20:37:23 +0000
Subject: [PATCH] 2006-08-01  Mike Kestner  <mkestner@novell.com>

	* gtk/Gtk.metadata : fix a couple of compat breaks against 2.8.
	* gtk/TreeModelFilter.cs : hand implement ConvertChildIterToIter
	to match the 2.8 version of the method.

svn path=/trunk/gtk-sharp/; revision=63271
---
 ChangeLog                  |  6 ++++++
 gtk/Gtk.metadata           | 10 +++++-----
 gtk/TreeModelFilter.custom | 12 ++++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 205c040d9..667d69001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-01  Mike Kestner  <mkestner@novell.com>
+
+	* gtk/Gtk.metadata : fix a couple of compat breaks against 2.8.
+	* gtk/TreeModelFilter.cs : hand implement ConvertChildIterToIter
+	to match the 2.8 version of the method.
+
 2006-08-01  Mike Kestner  <mkestner@novell.com>
 
 	* gtk/gtk-api-2.10.raw : reparsed
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index a4395f87a..129c8e61b 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -552,7 +552,7 @@
   <attr path="/api/namespace/object[@cname='GtkToolbar']/method[@name='PrependItem']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkToolItem']/signal[@name='SetTooltip']" name="name">TooltipSet</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeModelFilter']/method[@name='ConvertIterToChildIter']/*/*[@name='child_iter']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GtkTreeModelFilter']/method[@name='ConvertChildIterToIter']/*/*[@name='filter_iter']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GtkTreeModelFilter']/method[@name='ConvertChildIterToIter']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeModelFilter']/method[@name='ConvertChildPathToPath']/return-type" name="owned">true</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeModelFilter']/method[@name='ConvertPathToChildPath']/return-type" name="owned">true</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeModelFilter']/method[@name='SetModifyFunc']" name="hidden">1</attr>
@@ -704,10 +704,10 @@
   <attr path="/api/namespace/struct[@cname='GtkTableChild']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GtkTableRowCol']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GtkTargetEntry']/field[@cname='flags']" name="type">GtkTargetFlags</attr>
-  <attr path="/api/namespace/struct[@cname='GtkTargetList']/constructor[@cname='gtk_target_list_new']" name="hidden">1</attr>
-  <attr path="/api/namespace/struct[@cname='GtkTargetList']/field" name="access">private</attr>
-  <attr path="/api/namespace/struct[@cname='GtkTargetList']/method[@name='AddTable']/*/*[@name='targets']" name="array">1</attr>
-  <attr path="/api/namespace/struct[@cname='GtkTargetList']/method[@name='AddTable']/*/*[@name='ntargets']" name="name">n_targets</attr>
+  <attr path="/api/namespace/*[@cname='GtkTargetList']/constructor[@cname='gtk_target_list_new']" name="hidden">1</attr>
+  <attr path="/api/namespace/*[@cname='GtkTargetList']/field" name="access">private</attr>
+  <attr path="/api/namespace/*[@cname='GtkTargetList']/method[@name='AddTable']/*/*[@name='targets']" name="array">1</attr>
+  <attr path="/api/namespace/*[@cname='GtkTargetList']/method[@name='AddTable']/*/*[@name='ntargets']" name="name">n_targets</attr>
   <attr path="/api/namespace/struct[@cname='GtkTextAppearance']/field[@cname='underline']" name="type">PangoUnderline</attr>
   <attr path="/api/namespace/struct[@cname='GtkTextAppearance']/field[@cname='draw_bg']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GtkTextAppearance']/field[@cname='inside_selection']" name="hidden">1</attr>
diff --git a/gtk/TreeModelFilter.custom b/gtk/TreeModelFilter.custom
index 7005829ff..75f7470fa 100644
--- a/gtk/TreeModelFilter.custom
+++ b/gtk/TreeModelFilter.custom
@@ -71,3 +71,15 @@
 			gtk_tree_model_filter_set_modify_func (Handle, n_columns, native_types, func_wrapper.NativeDelegate, (IntPtr) gch, new GLib.DestroyNotify (GLib.DestroyHelper.NotifyHandler));
 		}
 
+		[DllImport("libgtk-win32-2.0-0.dll")]
+		static extern bool gtk_tree_model_filter_convert_child_iter_to_iter (IntPtr raw, out Gtk.TreeIter filter_iter, ref Gtk.TreeIter child_iter);
+
+		public TreeIter ConvertChildIterToIter (Gtk.TreeIter child_iter)
+		{
+			TreeIter filter_iter;
+			if (gtk_tree_model_filter_convert_child_iter_to_iter(Handle, out filter_iter, ref child_iter))
+				return filter_iter;
+			else
+				return TreeIter.Zero;
+		}
+