Browse Source

Something went wrong and the actual fix for changed property access wasn't sent.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
pull/512/merge
Dimitar Dobrev 11 years ago
parent
commit
994ed60dc0
  1. 14
      src/Generator/Generators/CSharp/CSharpTextTemplate.cs

14
src/Generator/Generators/CSharp/CSharpTextTemplate.cs

@ -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;

Loading…
Cancel
Save