From ab8285550bb597f23741cd87320ebda7129e7a8c Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Tue, 21 Jun 2005 16:11:22 +0000 Subject: [PATCH] 2005-06-21 Mike Kestner * generator/ConstStringGen.cs : override ToNativeReturn (). * generator/ClassBase.cs : use fully qualified interface names for conflicting implementations. svn path=/trunk/gtk-sharp/; revision=46320 --- ChangeLog | 6 ++++++ generator/ClassBase.cs | 2 +- generator/ConstStringGen.cs | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index db475395c..ebb435bd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-06-21 Mike Kestner + + * generator/ConstStringGen.cs : override ToNativeReturn (). + * generator/ClassBase.cs : use fully qualified interface names for + conflicting implementations. + 2005-06-20 Mike Kestner * parser/gapi2xml.pl : fix const foo * const * fields/params. diff --git a/generator/ClassBase.cs b/generator/ClassBase.cs index 6b97dfed0..0fa7d24a9 100644 --- a/generator/ClassBase.cs +++ b/generator/ClassBase.cs @@ -250,7 +250,7 @@ namespace GtkSharp.Generation { { oname = method.Name; oprotection = method.Protection; - method.Name = Name + "." + method.Name; + method.Name = QualifiedName + "." + method.Name; method.Protection = ""; } method.Generate (gen_info, implementor); diff --git a/generator/ConstStringGen.cs b/generator/ConstStringGen.cs index 1a50279a2..24359b0cf 100644 --- a/generator/ConstStringGen.cs +++ b/generator/ConstStringGen.cs @@ -40,6 +40,11 @@ namespace GtkSharp.Generation { return "GLib.Marshaller.Utf8PtrToString (" + var + ")"; } + public override string ToNativeReturn (string var) + { + return "GLib.Marshaller.StringToPtrGStrdup (" + var + ")"; + } + public string AllocNative (string managed_var) { return "GLib.Marshaller.StringToPtrGStrdup (" + managed_var + ")";