diff options
Diffstat (limited to 'gtk/genmarshal.pl')
| -rwxr-xr-x | gtk/genmarshal.pl | 43 |
1 files changed, 3 insertions, 40 deletions
diff --git a/gtk/genmarshal.pl b/gtk/genmarshal.pl index 067afd3fb2..cfde7948b7 100755 --- a/gtk/genmarshal.pl +++ b/gtk/genmarshal.pl @@ -13,11 +13,7 @@ "OBJECT"=>"gpointer", # complex types. These need special handling. - "FOREIGN"=>"FOREIGN", - "C_CALLBACK"=>"C_CALLBACK", - "SIGNAL"=>"SIGNAL", - "ARGS"=>"ARGS", - "CALLBACK"=>"CALLBACK" + "SIGNAL"=>"SIGNAL" ); if ($#ARGV != 2) { @@ -106,24 +102,7 @@ EOT print OS "typedef $trans{$retval} (*GtkSignal_$funcname) (GtkObject *object, \n"; $argn = 1; for (@params) { - if($_ eq "C_CALLBACK") { - print OS "gpointer arg".$argn."a,\n"; - print OS "gpointer arg".$argn."b,\n"; - $argn++; - } elsif($_ eq "SIGNAL") { - print OS "gpointer arg".$argn."a,\n"; - print OS "gpointer arg".$argn."b,\n"; - $argn++; - } elsif($_ eq "ARGS") { - print OS "gpointer arg".$argn."a,\n"; - print OS "gpointer arg".$argn."b,\n"; - $argn++; - } elsif($_ eq "CALLBACK") { - print OS "gpointer arg".$argn."a,\n"; - print OS "gpointer arg".$argn."b,\n"; - print OS "gpointer arg".$argn."c,\n"; - $argn++; - } elsif($_ eq "FOREIGN") { + if($_ eq "SIGNAL") { print OS "gpointer arg".$argn."a,\n"; print OS "gpointer arg".$argn."b,\n"; $argn++; @@ -153,27 +132,11 @@ EOT print OS " (* rfunc) (object,\n"; for($i = 0; $i < (scalar @params); $i++) { - if($params[$i] eq "C_CALLBACK") { - print OS <<EOT; -GTK_VALUE_C_CALLBACK(args[$i]).func, -GTK_VALUE_C_CALLBACK(args[$i]).func_data, -EOT - } elsif ($params[$i] eq "SIGNAL") { + if ($params[$i] eq "SIGNAL") { print OS <<EOT; GTK_VALUE_SIGNAL(args[$i]).f, GTK_VALUE_SIGNAL(args[$i]).d, EOT - } elsif ($params[$i] eq "CALLBACK") { - print OS <<EOT; -GTK_VALUE_CALLBACK(args[$i]).marshal, -GTK_VALUE_CALLBACK(args[$i]).data, -GTK_VALUE_CALLBACK(args[$i]).notify, -EOT - } elsif ($params[$i] eq "FOREIGN") { - print OS <<EOT; -GTK_VALUE_FOREIGN(args[$i]).data, -GTK_VALUE_FOREIGN(args[$i]).notify, -EOT } elsif ($params[$i] eq "NONE") { } else { print OS " GTK_VALUE_$params[$i](args[$i]),\n"; |