Browse Source

Added missing arguments of CLI event raise

pull/1/head
marcos henrich 12 years ago
parent
commit
55b05ecff9
  1. 16
      src/Generator/Generators/CLI/CLIHeadersTemplate.cs

16
src/Generator/Generators/CLI/CLIHeadersTemplate.cs

@ -361,19 +361,18 @@ namespace CppSharp.Generators.CLI
{ {
if (@event.Ignore) continue; if (@event.Ignore) continue;
var typePrinter = new CppTypePrinter(Driver.TypeDatabase); var cppTypePrinter = new CppTypePrinter(Driver.TypeDatabase);
var cppArgs = cppTypePrinter.VisitParameters(@event.Parameters, hasNames: true);
var args = typePrinter.VisitParameters(@event.Parameters, hasNames: true);
PopIndent(); PopIndent();
WriteLine("private:"); WriteLine("private:");
PushIndent(); PushIndent();
var delegateName = string.Format("_{0}Delegate", @event.Name); var delegateName = string.Format("_{0}Delegate", @event.Name);
WriteLine("delegate void {0}({1});", delegateName, args); WriteLine("delegate void {0}({1});", delegateName, cppArgs);
WriteLine("{0}^ {0}Instance;", delegateName); WriteLine("{0}^ {0}Instance;", delegateName);
WriteLine("void _{0}Raise({1});", @event.Name, args); WriteLine("void _{0}Raise({1});", @event.Name, cppArgs);
WriteLine("{0} _{1};", @event.Type, @event.Name); WriteLine("{0} _{1};", @event.Type, @event.Name);
PopIndent(); PopIndent();
@ -386,11 +385,10 @@ namespace CppSharp.Generators.CLI
WriteLine("void add({0} evt);", @event.Type); WriteLine("void add({0} evt);", @event.Type);
WriteLine("void remove({0} evt);", @event.Type); WriteLine("void remove({0} evt);", @event.Type);
var paramNames = @event.Parameters.Select(param => param.ToString()). var cliTypePrinter = new CLITypePrinter(Driver);
ToList(); var cliArgs = cliTypePrinter.VisitParameters(@event.Parameters, hasNames: true);
var parameters = string.Join(", ", paramNames);
WriteLine("void raise({0});", parameters); WriteLine("void raise({0});", cliArgs);
WriteCloseBraceIndent(); WriteCloseBraceIndent();
} }
PopIndent(); PopIndent();

Loading…
Cancel
Save