From fe3b98a79be84bf18df14039ab71365bf5e839e9 Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Wed, 21 Dec 2005 00:18:52 +0000 Subject: [PATCH] 2005-12-21 Lluis Sanchez Gual * generator/FieldBase.cs: Properly convert marshalled value to native value. * generator/CallbackGen.cs: Added parens to the result of ToNativeReturn, since it may have problems with the cast. svn path=/trunk/gtk-sharp/; revision=54671 --- ChangeLog | 7 +++++++ generator/CallbackGen.cs | 2 +- generator/FieldBase.cs | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index abebd5723..ad1ea82fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-12-21 Lluis Sanchez Gual + + * generator/FieldBase.cs: Properly convert marshalled value + to native value. + * generator/CallbackGen.cs: Added parens to the result of ToNativeReturn, + since it may have problems with the cast. + 2005-12-16 John Luke * samples/CairoSample.cs: diff --git a/generator/CallbackGen.cs b/generator/CallbackGen.cs index 4e667b7d4..b2669dec1 100644 --- a/generator/CallbackGen.cs +++ b/generator/CallbackGen.cs @@ -159,7 +159,7 @@ namespace GtkSharp.Generation { } else if (table.IsEnum (retval.CType)) sw.WriteLine ("(int) {0};", invoke); else - sw.WriteLine ("({0}) {1};", retval.MarshalType, table.ToNativeReturn (retval.CType, invoke)); + sw.WriteLine ("({0}) ({1});", retval.MarshalType, table.ToNativeReturn (retval.CType, invoke)); } else sw.WriteLine (invoke + ";"); diff --git a/generator/FieldBase.cs b/generator/FieldBase.cs index 427c52ff7..f4ab42299 100644 --- a/generator/FieldBase.cs +++ b/generator/FieldBase.cs @@ -195,7 +195,7 @@ namespace GtkSharp.Generation { sw.WriteLine (indent + "\t\t\t*raw_ptr = value;"); } else { sw.WriteLine (indent + "\t\t\t" + table.GetMarshalReturnType (CType) + "* raw_ptr = (" + table.GetMarshalReturnType (CType) + "*)(((byte*)" + container_type.CallByName () + ") + " + offsetName + ");"); - sw.WriteLine (indent + "\t\t\t*raw_ptr = " + table.CallByName (ctype, "value") + ";"); + sw.WriteLine (indent + "\t\t\t*raw_ptr = " + table.ToNativeReturn (ctype, "value") + ";"); } sw.WriteLine (indent + "\t\t}"); sw.WriteLine (indent + "\t}");