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

2008-05-06 Mike Kestner <mkestner@novell.com>

Browse source 
* glib/Object.cs: revert the connection optimization from r102349.
	It breaks under the current CellRenderer implementation which probably
	can't be reworked compatibly to take advantage of this code.
	* glib/SignalClosure.cs: use IntPtr.ToInt64 instead of (long) since
	the cast apparently has issues on bleeding edge mono.

svn path=/trunk/gtk-sharp/; revision=102693
This commit is contained in:
Mike Kestner 2008-05-07 02:13:16 +00:00
parent acceaad509
commit 22add1100a
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-05-06 Mike Kestner <mkestner@novell.com>
* glib/Object.cs: revert the connection optimization from r102349.
It breaks under the current CellRenderer implementation which probably
can't be reworked compatibly to take advantage of this code.
* glib/SignalClosure.cs: use IntPtr.ToInt64 instead of (long) since
the cast apparently has issues on bleeding edge mono.
2008-05-06 Mike Kestner <mkestner@novell.com> 2008-05-06 Mike Kestner <mkestner@novell.com>
* gtk/Gtk.metadata: mark Rc.DefaultFiles accessors as null_term_array. * gtk/Gtk.metadata: mark Rc.DefaultFiles accessors as null_term_array.

12
glib/Object.cs
View file

@ -139,18 +139,6 @@ namespace GLib {
if (baseinfo == minfo) if (baseinfo == minfo)
continue; continue;
bool ignore = false;
for (Type parent = t.BaseType; parent != baseinfo.DeclaringType; parent = parent.BaseType) {
MethodInfo pinfo = parent.GetMethod (minfo.Name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly);
if (pinfo != null) {
ignore = true;
break;
}
}
if (ignore)
continue;
foreach (object attr in baseinfo.GetCustomAttributes (typeof (DefaultSignalHandlerAttribute), false)) { foreach (object attr in baseinfo.GetCustomAttributes (typeof (DefaultSignalHandlerAttribute), false)) {
DefaultSignalHandlerAttribute sigattr = attr as DefaultSignalHandlerAttribute; DefaultSignalHandlerAttribute sigattr = attr as DefaultSignalHandlerAttribute;
MethodInfo connector = sigattr.Type.GetMethod (sigattr.ConnectionMethod, BindingFlags.Static | BindingFlags.NonPublic); MethodInfo connector = sigattr.Type.GetMethod (sigattr.ConnectionMethod, BindingFlags.Static | BindingFlags.NonPublic);

2
glib/SignalClosure.cs
View file

@ -135,7 +135,7 @@ namespace GLib {
SignalArgs args = Activator.CreateInstance (closure.args_type, new object [0]) as SignalArgs; SignalArgs args = Activator.CreateInstance (closure.args_type, new object [0]) as SignalArgs;
args.Args = new object [n_param_vals - 1]; args.Args = new object [n_param_vals - 1];
for (int i = 1; i < n_param_vals; i++) { for (int i = 1; i < n_param_vals; i++) {
IntPtr ptr = new IntPtr ((long)param_values + i * Marshal.SizeOf (typeof (Value))); IntPtr ptr = new IntPtr (param_values.ToInt64 () + i * Marshal.SizeOf (typeof (Value)));
Value val = (Value) Marshal.PtrToStructure (ptr, typeof (Value)); Value val = (Value) Marshal.PtrToStructure (ptr, typeof (Value));
args.Args [i - 1] = val.Val; args.Args [i - 1] = val.Val;
} }