ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2008-10-22 Peter Johanson <peter@peterjohanson.com>

Browse source 
* gtk/TreeModelAdapter.custom:
        * gtk/TreeModelFilter.custom:
        * gtk/TreeModelSort.custom:
        * gtk/TreeStore.custom: Don't trigger any gtk+ critical
        warnings when the 'rows-reodered' signal is fired.

svn path=/trunk/gtk-sharp/; revision=116800
This commit is contained in:
Pete Johanson 2008-10-22 20:43:12 +00:00
parent c07a5f5580
commit 98b7f5f2e7
5 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-10-22 Peter Johanson <peter@peterjohanson.com>
* gtk/TreeModelAdapter.custom:
* gtk/TreeModelFilter.custom:
* gtk/TreeModelSort.custom:
* gtk/TreeStore.custom: Don't trigger any gtk+ critical
warnings when the 'rows-reodered' signal is fired.
2008-10-21 Mike Kestner <mkestner@novell.com> 2008-10-21 Mike Kestner <mkestner@novell.com>
* cairo/*: add a policy assembly for 1.0 defering to 2.0. * cairo/*: add a policy assembly for 1.0 defering to 2.0.

2
gtk/TreeModelAdapter.custom
View file

@ -92,7 +92,7 @@
args.Args = new object[3]; args.Args = new object[3];
args.Args[0] = arg1 == IntPtr.Zero ? null : (Gtk.TreePath) GLib.Opaque.GetOpaque (arg1, typeof (Gtk.TreePath), false); args.Args[0] = arg1 == IntPtr.Zero ? null : (Gtk.TreePath) GLib.Opaque.GetOpaque (arg1, typeof (Gtk.TreePath), false);
args.Args[1] = Gtk.TreeIter.New (arg2); args.Args[1] = Gtk.TreeIter.New (arg2);
int child_cnt = sender.IterNChildren ((TreeIter)args.Args[1]); int child_cnt = arg2 == IntPtr.Zero ? sender.IterNChildren () : sender.IterNChildren ((TreeIter)args.Args[1]);
int[] new_order = new int [child_cnt]; int[] new_order = new int [child_cnt];
Marshal.Copy (arg3, new_order, 0, child_cnt); Marshal.Copy (arg3, new_order, 0, child_cnt);
args.Args[2] = new_order; args.Args[2] = new_order;

2
gtk/TreeModelFilter.custom
View file

@ -96,7 +96,7 @@
args.Args = new object[3]; args.Args = new object[3];
args.Args[0] = arg1 == IntPtr.Zero ? null : (Gtk.TreePath) GLib.Opaque.GetOpaque (arg1, typeof (Gtk.TreePath), false); args.Args[0] = arg1 == IntPtr.Zero ? null : (Gtk.TreePath) GLib.Opaque.GetOpaque (arg1, typeof (Gtk.TreePath), false);
args.Args[1] = Gtk.TreeIter.New (arg2); args.Args[1] = Gtk.TreeIter.New (arg2);
int child_cnt = sender.IterNChildren ((TreeIter)args.Args[1]); int child_cnt = arg2 == IntPtr.Zero ? sender.IterNChildren () : sender.IterNChildren ((TreeIter)args.Args[1]);
int[] new_order = new int [child_cnt]; int[] new_order = new int [child_cnt];
Marshal.Copy (arg3, new_order, 0, child_cnt); Marshal.Copy (arg3, new_order, 0, child_cnt);
args.Args[2] = new_order; args.Args[2] = new_order;

2
gtk/TreeModelSort.custom
View file

@ -110,7 +110,7 @@
args.Args = new object[3]; args.Args = new object[3];
args.Args[0] = arg1 == IntPtr.Zero ? null : (Gtk.TreePath) GLib.Opaque.GetOpaque (arg1, typeof (Gtk.TreePath), false); args.Args[0] = arg1 == IntPtr.Zero ? null : (Gtk.TreePath) GLib.Opaque.GetOpaque (arg1, typeof (Gtk.TreePath), false);
args.Args[1] = Gtk.TreeIter.New (arg2); args.Args[1] = Gtk.TreeIter.New (arg2);
int child_cnt = sender.IterNChildren ((TreeIter)args.Args[1]); int child_cnt = arg2 == IntPtr.Zero ? sender.IterNChildren () : sender.IterNChildren ((TreeIter)args.Args[1]);
int[] new_order = new int [child_cnt]; int[] new_order = new int [child_cnt];
Marshal.Copy (arg3, new_order, 0, child_cnt); Marshal.Copy (arg3, new_order, 0, child_cnt);
args.Args[2] = new_order; args.Args[2] = new_order;

2
gtk/TreeStore.custom
View file

@ -418,7 +418,7 @@
args.Args = new object[3]; args.Args = new object[3];
args.Args[0] = arg1 == IntPtr.Zero ? null : (Gtk.TreePath) GLib.Opaque.GetOpaque (arg1, typeof (Gtk.TreePath), false); args.Args[0] = arg1 == IntPtr.Zero ? null : (Gtk.TreePath) GLib.Opaque.GetOpaque (arg1, typeof (Gtk.TreePath), false);
args.Args[1] = Gtk.TreeIter.New (arg2); args.Args[1] = Gtk.TreeIter.New (arg2);
int child_cnt = sender.IterNChildren ((TreeIter)args.Args[1]); int child_cnt = arg2 == IntPtr.Zero ? sender.IterNChildren () : sender.IterNChildren ((TreeIter)args.Args[1]);
int[] new_order = new int [child_cnt]; int[] new_order = new int [child_cnt];
Marshal.Copy (arg3, new_order, 0, child_cnt); Marshal.Copy (arg3, new_order, 0, child_cnt);
args.Args[2] = new_order; args.Args[2] = new_order;