|
|
|
@ -1136,7 +1136,7 @@ namespace CppSharp.Generators.CSharp |
|
|
|
GenerateDeclarationCommon(prop); |
|
|
|
GenerateDeclarationCommon(prop); |
|
|
|
if (prop.ExplicitInterfaceImpl == null) |
|
|
|
if (prop.ExplicitInterfaceImpl == null) |
|
|
|
{ |
|
|
|
{ |
|
|
|
Write(Helpers.GetAccess(prop.Access)); |
|
|
|
Write(Helpers.GetAccess(GetValidPropertyAccess(prop))); |
|
|
|
|
|
|
|
|
|
|
|
if (prop.IsStatic) |
|
|
|
if (prop.IsStatic) |
|
|
|
Write("static "); |
|
|
|
Write("static "); |
|
|
|
@ -2188,6 +2188,18 @@ namespace CppSharp.Generators.CSharp |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private static AccessSpecifier GetValidPropertyAccess(Property property) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
switch (property.Access) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
case AccessSpecifier.Public: |
|
|
|
|
|
|
|
return AccessSpecifier.Public; |
|
|
|
|
|
|
|
default: |
|
|
|
|
|
|
|
return property.IsOverride ? |
|
|
|
|
|
|
|
((Class) property.Namespace).GetRootBaseProperty(property).Access : property.Access; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void GenerateAbstractImplCall(Function function, Class @class) |
|
|
|
private void GenerateAbstractImplCall(Function function, Class @class) |
|
|
|
{ |
|
|
|
{ |
|
|
|
string delegateId; |
|
|
|
string delegateId; |
|
|
|
|