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

2003-11-02 Mike Kestner <mkestner@ximian.com>

Browse source 
* generator/CallbackGen.cs : use a temporary ret value if there
	is any cleanup to be done after the call.  Thanks to John Luke
	for a patch which identified the problem.

svn path=/trunk/gtk-sharp/; revision=19561
This commit is contained in:
Mike Kestner 2003-11-03 01:36:55 +00:00
parent 68ee3bc9b4
commit 7ade209999
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2003-11-02 Mike Kestner <mkestner@ximian.com>
* generator/CallbackGen.cs : use a temporary ret value if there
is any cleanup to be done after the call. Thanks to John Luke
for a patch which identified the problem.
2003-11-01 Radek Doulik <rodo@ximian.com>
* gtk/TreeModelSort.custom: implementation of GetValue/SetValue

26
generator/CallbackGen.cs
View file

@ -148,16 +148,22 @@ namespace GtkSharp.Generation {
sw.Write ("\t\t\t");
string invoke = "_managed (" + call_str + ")";
if (m_ret != "void") {
if (ret_wrapper != null && (ret_wrapper is ObjectGen || ret_wrapper is OpaqueGen))
sw.WriteLine ("return (({0}) {1}).Handle;", s_ret, invoke);
else if (table.IsStruct (rettype) || table.IsBoxed (rettype)) {
// Shoot. I have no idea what to do here.
sw.WriteLine ("return IntPtr.Zero;");
}
else if (table.IsEnum (rettype))
sw.WriteLine ("return (int) {0};", invoke);
else
sw.WriteLine ("return ({0}) {1};", m_ret, table.ToNativeReturn (rettype, invoke));
if (cleanup_str == "")
sw.Write ("return ");
else {
sw.Write (m_ret + " ret = ");
cleanup_str += "\t\t\treturn ret;\n";
}
if (ret_wrapper != null && (ret_wrapper is ObjectGen || ret_wrapper is OpaqueGen))
sw.WriteLine ("(({0}) {1}).Handle;", s_ret, invoke);
else if (table.IsStruct (rettype) || table.IsBoxed (rettype)) {
// Shoot. I have no idea what to do here.
sw.WriteLine ("IntPtr.Zero;");
} else if (table.IsEnum (rettype))
sw.WriteLine ("(int) {0};", invoke);
else
sw.WriteLine ("({0}) {1};", m_ret, table.ToNativeReturn (rettype, invoke));
} else
sw.WriteLine (invoke + ";");