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

2007-09-19 Mike Kestner <mkestner@novell.com>

Browse source 
* generator/VirtualMethod.cs: refactor delegate generation into
	GenerateCallback and add [CDeclCallback] which was missing.
	* generator/InterfaceGen.cs: kill GenerateDelegates.  They are now
	generated by VirtualMethod.GenerateCallback.

svn path=/trunk/gtk-sharp/; revision=86026
This commit is contained in:
Mike Kestner 2007-09-19 18:15:55 +00:00
parent 2c82cec395
commit 74458aa03a
3 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-09-19 Mike Kestner <mkestner@novell.com>
* generator/VirtualMethod.cs: refactor delegate generation into
GenerateCallback and add [CDeclCallback] which was missing.
* generator/InterfaceGen.cs: kill GenerateDelegates. They are now
generated by VirtualMethod.GenerateCallback.
2007-09-14 Mike Kestner <mkestner@novell.com> 2007-09-14 Mike Kestner <mkestner@novell.com>
* generator/CallbackGen.cs (GenInvoker): null check the sig field * generator/CallbackGen.cs (GenInvoker): null check the sig field

15
generator/InterfaceGen.cs
View file

@ -3,7 +3,7 @@
// Author: Mike Kestner <mkestner@speakeasy.net> // Author: Mike Kestner <mkestner@speakeasy.net>
// //
// Copyright (c) 2001-2003 Mike Kestner // Copyright (c) 2001-2003 Mike Kestner
// Copyright (c) 2004 Novell, Inc. // Copyright (c) 2004, 2007 Novell, Inc.
// //
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of version 2 of the GNU General Public // modify it under the terms of version 2 of the GNU General Public
@ -75,18 +75,6 @@ namespace GtkSharp.Generation {
} }
} }
void GenerateDelegates (StreamWriter sw)
{
if (vms.Count == 0)
return;
foreach (VirtualMethod vm in vms) {
if (vm.IsValid)
sw.WriteLine ("\t\t" + vm.NativeDelegate);
}
sw.WriteLine ();
}
void GenerateIfaceStruct (StreamWriter sw) void GenerateIfaceStruct (StreamWriter sw)
{ {
sw.WriteLine ("\t\tstatic " + IfaceName + " iface;"); sw.WriteLine ("\t\tstatic " + IfaceName + " iface;");
@ -184,7 +172,6 @@ namespace GtkSharp.Generation {
sw.WriteLine ("\tinternal class " + Name + "Adapter : GLib.GInterfaceAdapter {"); sw.WriteLine ("\tinternal class " + Name + "Adapter : GLib.GInterfaceAdapter {");
sw.WriteLine (); sw.WriteLine ();
GenerateDelegates (sw);
GenerateIfaceStruct (sw); GenerateIfaceStruct (sw);
GenerateStaticCtor (sw); GenerateStaticCtor (sw);
GenerateCallbacks (sw); GenerateCallbacks (sw);

10
generator/VirtualMethod.cs
View file

@ -83,12 +83,6 @@ namespace GtkSharp.Generation {
} }
} }
public string NativeDelegate {
get {
return "delegate " + MarshalReturnType + " " + Name + "Delegate (" + parms.ImportSignature + ");";
}
}
public void GenerateCallback (StreamWriter sw) public void GenerateCallback (StreamWriter sw)
{ {
if (!Validate ()) if (!Validate ())
@ -102,6 +96,10 @@ namespace GtkSharp.Generation {
call_string = "__obj." + (Name.StartsWith ("Get") ? Name.Substring (3) : Name); call_string = "__obj." + (Name.StartsWith ("Get") ? Name.Substring (3) : Name);
else if (IsSetter) else if (IsSetter)
call_string = "__obj." + Name.Substring (3) + " = " + call; call_string = "__obj." + Name.Substring (3) + " = " + call;
sw.WriteLine ("\t\t[GLib.CDeclCallback]");
sw.WriteLine ("\t\tdelegate " + MarshalReturnType + " " + Name + "Delegate (" + parms.ImportSignature + ");");
sw.WriteLine ();
sw.WriteLine ("\t\tstatic " + MarshalReturnType + " " + Name + "Callback (" + parms.ImportSignature + ")"); sw.WriteLine ("\t\tstatic " + MarshalReturnType + " " + Name + "Callback (" + parms.ImportSignature + ")");
sw.WriteLine ("\t\t{"); sw.WriteLine ("\t\t{");
sw.WriteLine ("\t\t\t" + type + " __obj = GLib.Object.GetObject (" + name + ", false) as " + type + ";"); sw.WriteLine ("\t\t\t" + type + " __obj = GLib.Object.GetObject (" + name + ", false) as " + type + ";");