2004-12-17 Mike Kestner <mkestner@novell.com>

* gtk/ListStore.custom : dispose a bunch of GLib.Values.
	* gtk/TreeStore.custom : ditto.  Reworked and expanded from a patch
	by Ben "valgrind-boy" Maurer. [Fixes #69925]

svn path=/trunk/gtk-sharp/; revision=37919
This commit is contained in:
Mike Kestner 2004-12-18 06:01:09 +00:00
parent 348c8035e3
commit 5e5c493b33
3 changed files with 98 additions and 48 deletions

View File

@ -1,3 +1,9 @@
2004-12-17 Mike Kestner <mkestner@novell.com>
* gtk/ListStore.custom : dispose a bunch of GLib.Values.
* gtk/TreeStore.custom : ditto. Reworked and expanded from a patch
by Ben "valgrind-boy" Maurer. [Fixes #69925]
2004-12-17 Mike Kestner <mkestner@novell.com> 2004-12-17 Mike Kestner <mkestner@novell.com>
* glade/XML.custom (BindFields) : support multiple autoconnects * glade/XML.custom (BindFields) : support multiple autoconnects

View File

@ -23,7 +23,8 @@
[DllImport("libgtk-win32-2.0-0.dll")] [DllImport("libgtk-win32-2.0-0.dll")]
static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent); static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent);
public bool IterChildren (out Gtk.TreeIter iter) { public bool IterChildren (out Gtk.TreeIter iter)
{
bool raw_ret = gtk_tree_model_iter_children (Handle, out iter, IntPtr.Zero); bool raw_ret = gtk_tree_model_iter_children (Handle, out iter, IntPtr.Zero);
bool ret = raw_ret; bool ret = raw_ret;
return ret; return ret;
@ -31,7 +32,8 @@
[DllImport("libgtk-win32-2.0-0.dll")] [DllImport("libgtk-win32-2.0-0.dll")]
static extern int gtk_tree_model_iter_n_children (IntPtr raw, IntPtr iter); static extern int gtk_tree_model_iter_n_children (IntPtr raw, IntPtr iter);
public int IterNChildren () { public int IterNChildren ()
{
int raw_ret = gtk_tree_model_iter_n_children (Handle, IntPtr.Zero); int raw_ret = gtk_tree_model_iter_n_children (Handle, IntPtr.Zero);
int ret = raw_ret; int ret = raw_ret;
return ret; return ret;
@ -39,43 +41,64 @@
[DllImport("libgtk-win32-2.0-0.dll")] [DllImport("libgtk-win32-2.0-0.dll")]
static extern bool gtk_tree_model_iter_nth_child (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent, int n); static extern bool gtk_tree_model_iter_nth_child (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent, int n);
public bool IterNthChild (out Gtk.TreeIter iter, int n) { public bool IterNthChild (out Gtk.TreeIter iter, int n)
{
bool raw_ret = gtk_tree_model_iter_nth_child (Handle, out iter, IntPtr.Zero, n); bool raw_ret = gtk_tree_model_iter_nth_child (Handle, out iter, IntPtr.Zero, n);
bool ret = raw_ret; bool ret = raw_ret;
return ret; return ret;
} }
public void SetValue (Gtk.TreeIter iter, int column, bool value) { public void SetValue (Gtk.TreeIter iter, int column, bool value)
SetValue (iter, column, new GLib.Value (value)); {
}
public void SetValue (Gtk.TreeIter iter, int column, double value) {
SetValue (iter, column, new GLib.Value (value));
}
public void SetValue (Gtk.TreeIter iter, int column, int value) {
SetValue (iter, column, new GLib.Value (value));
}
public void SetValue (Gtk.TreeIter iter, int column, string value) {
SetValue (iter, column, new GLib.Value (value));
}
public void SetValue (Gtk.TreeIter iter, int column, float value) {
SetValue (iter, column, new GLib.Value (value));
}
public void SetValue (Gtk.TreeIter iter, int column, uint value) {
SetValue (iter, column, new GLib.Value (value));
}
public void SetValue (Gtk.TreeIter iter, int column, object value) {
GLib.Value val = new GLib.Value (value); GLib.Value val = new GLib.Value (value);
SetValue (iter, column, val); SetValue (iter, column, val);
val.Dispose (); val.Dispose ();
} }
public Gtk.TreeIter AppendValues (Array values) { public void SetValue (Gtk.TreeIter iter, int column, double value)
{
GLib.Value val = new GLib.Value (value);
SetValue (iter, column, val);
val.Dispose ();
}
public void SetValue (Gtk.TreeIter iter, int column, int value)
{
GLib.Value val = new GLib.Value (value);
SetValue (iter, column, val);
val.Dispose ();
}
public void SetValue (Gtk.TreeIter iter, int column, string value)
{
GLib.Value val = new GLib.Value (value);
SetValue (iter, column, val);
val.Dispose ();
}
public void SetValue (Gtk.TreeIter iter, int column, float value)
{
GLib.Value val = new GLib.Value (value);
SetValue (iter, column, val);
val.Dispose ();
}
public void SetValue (Gtk.TreeIter iter, int column, uint value)
{
GLib.Value val = new GLib.Value (value);
SetValue (iter, column, val);
val.Dispose ();
}
public void SetValue (Gtk.TreeIter iter, int column, object value)
{
GLib.Value val = new GLib.Value (value);
SetValue (iter, column, val);
val.Dispose ();
}
public Gtk.TreeIter AppendValues (Array values)
{
Gtk.TreeIter iter = Append(); Gtk.TreeIter iter = Append();
int col = 0; int col = 0;
@ -91,7 +114,8 @@
return iter; return iter;
} }
public Gtk.TreeIter AppendValues (params object[] values) { public Gtk.TreeIter AppendValues (params object[] values)
{
return AppendValues ((Array) values); return AppendValues ((Array) values);
} }
@ -117,7 +141,8 @@
SetColumnTypes (gtypes); SetColumnTypes (gtypes);
} }
public object GetValue(Gtk.TreeIter iter, int column) { public object GetValue(Gtk.TreeIter iter, int column)
{
GLib.Value val = GLib.Value.Empty; GLib.Value val = GLib.Value.Empty;
GetValue (iter, column, ref val); GetValue (iter, column, ref val);
object ret = val.Val; object ret = val.Val;
@ -125,5 +150,3 @@
return ret; return ret;
} }

View File

@ -84,39 +84,60 @@
return ret; return ret;
} }
public void SetValue (Gtk.TreeIter iter, int column, bool value) { public void SetValue (Gtk.TreeIter iter, int column, bool value)
SetValue (iter, column, new GLib.Value (value)); {
GLib.Value val = new GLib.Value (value);
SetValue (iter, column, val);
val.Dispose ();
} }
public void SetValue (Gtk.TreeIter iter, int column, double value) { public void SetValue (Gtk.TreeIter iter, int column, double value)
SetValue (iter, column, new GLib.Value (value)); {
GLib.Value val = new GLib.Value (value);
SetValue (iter, column, val);
val.Dispose ();
} }
public void SetValue (Gtk.TreeIter iter, int column, int value) { public void SetValue (Gtk.TreeIter iter, int column, int value)
SetValue (iter, column, new GLib.Value (value)); {
GLib.Value val = new GLib.Value (value);
SetValue (iter, column, val);
val.Dispose ();
} }
public void SetValue (Gtk.TreeIter iter, int column, string value) { public void SetValue (Gtk.TreeIter iter, int column, string value)
SetValue (iter, column, new GLib.Value (value)); {
GLib.Value val = new GLib.Value (value);
SetValue (iter, column, val);
val.Dispose ();
} }
public void SetValue (Gtk.TreeIter iter, int column, float value) { public void SetValue (Gtk.TreeIter iter, int column, float value)
SetValue (iter, column, new GLib.Value (value)); {
GLib.Value val = new GLib.Value (value);
SetValue (iter, column, val);
val.Dispose ();
} }
public void SetValue (Gtk.TreeIter iter, int column, uint value) { public void SetValue (Gtk.TreeIter iter, int column, uint value)
SetValue (iter, column, new GLib.Value (value)); {
GLib.Value val = new GLib.Value (value);
SetValue (iter, column, val);
val.Dispose ();
} }
public void SetValue (Gtk.TreeIter iter, int column, object value) { public void SetValue (Gtk.TreeIter iter, int column, object value)
SetValue (iter, column, new GLib.Value (value)); {
GLib.Value val = new GLib.Value (value);
SetValue (iter, column, val);
val.Dispose ();
} }
private void _AppendValues (Gtk.TreeIter iter, Array values) { private void _AppendValues (Gtk.TreeIter iter, Array values) {
int col = 0; int col = 0;
foreach (object value in values) { foreach (object value in values) {
if (value != null) if (value != null)
SetValue (iter, col, new GLib.Value (value)); SetValue (iter, col, value);
col++; col++;
} }
} }