Browse Source

Move event and enum handling checks to their generation methods.

pull/818/head
Joao Matos 9 years ago
parent
commit
95265deeb8
  1. 11
      src/Generator/Generators/CSharp/CSharpSources.cs

11
src/Generator/Generators/CSharp/CSharpSources.cs

@ -222,9 +222,6 @@ namespace CppSharp.Generators.CSharp
// Generate all the enum declarations. // Generate all the enum declarations.
foreach (var @enum in context.Enums) foreach (var @enum in context.Enums)
{ {
if (@enum.IsIncomplete)
continue;
GenerateEnum(@enum); GenerateEnum(@enum);
} }
@ -282,8 +279,6 @@ namespace CppSharp.Generators.CSharp
foreach (var @event in context.Events) foreach (var @event in context.Events)
{ {
if (!@event.IsGenerated) continue;
GenerateEvent(@event); GenerateEvent(@event);
} }
@ -1781,6 +1776,9 @@ namespace CppSharp.Generators.CSharp
private void GenerateEvent(Event @event) private void GenerateEvent(Event @event)
{ {
if (!@event.IsGenerated)
return;
PushBlock(CSharpBlockKind.Event, @event); PushBlock(CSharpBlockKind.Event, @event);
TypePrinter.PushContext(TypePrinterContextKind.Native); TypePrinter.PushContext(TypePrinterContextKind.Native);
var args = TypePrinter.VisitParameters(@event.Parameters, hasNames: true); var args = TypePrinter.VisitParameters(@event.Parameters, hasNames: true);
@ -3051,6 +3049,9 @@ namespace CppSharp.Generators.CSharp
public void GenerateEnum(Enumeration @enum) public void GenerateEnum(Enumeration @enum)
{ {
if (@enum.IsIncomplete)
return;
PushBlock(CSharpBlockKind.Enum); PushBlock(CSharpBlockKind.Enum);
GenerateDeclarationCommon(@enum); GenerateDeclarationCommon(@enum);

Loading…
Cancel
Save