diff --git a/ChangeLog b/ChangeLog index 99cb429df..8089c50e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-06-12 Mike Kestner + + * generator/SimpleGen.cs : mark a few members virtual + since they are overridden elsewhere. + 2003-05-29 Rachel Hestilow * gconf/Value.cs: Update to use new string marshalling. diff --git a/generator/SimpleGen.cs b/generator/SimpleGen.cs index 5a0bbd078..c375f6b49 100644 --- a/generator/SimpleGen.cs +++ b/generator/SimpleGen.cs @@ -40,35 +40,35 @@ namespace GtkSharp.Generation { } } - public String MarshalType { + public string MarshalType { get { return type; } } - public String MarshalReturnType { + public virtual string MarshalReturnType { get { return type; } } - public String CallByName (String var_name) + public string CallByName (string var_name) { return var_name; } - public String FromNative(String var) + public string FromNative(string var) { return var; } - public String FromNativeReturn(String var) + public virtual string FromNativeReturn(string var) { return var; } - public String ToNativeReturn(String var) + public virtual string ToNativeReturn(string var) { return var; }