2005-06-21 Mike Kestner <mkestner@novell.com>

* generator/ConstStringGen.cs : override ToNativeReturn ().
	* generator/ClassBase.cs : use fully qualified interface names for
	conflicting implementations.

svn path=/trunk/gtk-sharp/; revision=46320
This commit is contained in:
Mike Kestner 2005-06-21 16:11:22 +00:00
parent 94b7d14a39
commit ab8285550b
3 changed files with 12 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2005-06-21 Mike Kestner <mkestner@novell.com>
* generator/ConstStringGen.cs : override ToNativeReturn ().
* generator/ClassBase.cs : use fully qualified interface names for
conflicting implementations.
2005-06-20 Mike Kestner <mkestner@novell.com> 2005-06-20 Mike Kestner <mkestner@novell.com>
* parser/gapi2xml.pl : fix const foo * const * fields/params. * parser/gapi2xml.pl : fix const foo * const * fields/params.

View File

@ -250,7 +250,7 @@ namespace GtkSharp.Generation {
{ {
oname = method.Name; oname = method.Name;
oprotection = method.Protection; oprotection = method.Protection;
method.Name = Name + "." + method.Name; method.Name = QualifiedName + "." + method.Name;
method.Protection = ""; method.Protection = "";
} }
method.Generate (gen_info, implementor); method.Generate (gen_info, implementor);

View File

@ -40,6 +40,11 @@ namespace GtkSharp.Generation {
return "GLib.Marshaller.Utf8PtrToString (" + var + ")"; return "GLib.Marshaller.Utf8PtrToString (" + var + ")";
} }
public override string ToNativeReturn (string var)
{
return "GLib.Marshaller.StringToPtrGStrdup (" + var + ")";
}
public string AllocNative (string managed_var) public string AllocNative (string managed_var)
{ {
return "GLib.Marshaller.StringToPtrGStrdup (" + managed_var + ")"; return "GLib.Marshaller.StringToPtrGStrdup (" + managed_var + ")";