ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

parser: Handle the G_DEFINE_TYPE_EXTENDED macro

Browse source 
G_DEFINE_TYPE_EXTENDED is the general macro for type implementations, on
which G_DEFINE_TYPE_WITH_CODE is based. Handle it just like
G_DEFINE_TYPE_WITH_CODE.

Reparse the API with that change, which marks a few classes as
implementing GtkStyleProvider.
This commit is contained in:
Bertrand Lorentz 2011-07-31 12:32:43 +02:00
parent 4f42fb77fb
commit 63db97e9ad
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gtk/gtk-api.raw
View file

@ -8393,6 +8393,9 @@
<virtual_method name="GtkReserved4" cname="_gtk_reserved4" shared="true" padding="true"> <virtual_method name="GtkReserved4" cname="_gtk_reserved4" shared="true" padding="true">
<return-type type="void" /> <return-type type="void" />
</virtual_method> </virtual_method>
<implements>
<interface cname="GtkStyleProvider" />
</implements>
<method name="ErrorQuark" cname="gtk_css_provider_error_quark" shared="true"> <method name="ErrorQuark" cname="gtk_css_provider_error_quark" shared="true">
<return-type type="GQuark" /> <return-type type="GQuark" />
</method> </method>
@ -13182,6 +13185,9 @@
<virtual_method name="GtkReserved4" cname="_gtk_reserved4" shared="true" padding="true"> <virtual_method name="GtkReserved4" cname="_gtk_reserved4" shared="true" padding="true">
<return-type type="void" /> <return-type type="void" />
</virtual_method> </virtual_method>
<implements>
<interface cname="GtkStyleProvider" />
</implements>
</object> </object>
<object name="MountOperation" cname="GtkMountOperation" parent="GMountOperation"> <object name="MountOperation" cname="GtkMountOperation" parent="GMountOperation">
<class_struct cname="GtkMountOperationClass"> <class_struct cname="GtkMountOperationClass">
@ -16740,6 +16746,9 @@
<virtual_method name="GtkReserved4" cname="_gtk_reserved4" shared="true" padding="true"> <virtual_method name="GtkReserved4" cname="_gtk_reserved4" shared="true" padding="true">
<return-type type="void" /> <return-type type="void" />
</virtual_method> </virtual_method>
<implements>
<interface cname="GtkStyleProvider" />
</implements>
<method name="GetDefault" cname="gtk_settings_get_default" shared="true"> <method name="GetDefault" cname="gtk_settings_get_default" shared="true">
<return-type type="GtkSettings*" /> <return-type type="GtkSettings*" />
</method> </method>
@ -18309,6 +18318,9 @@
<virtual_method name="GtkReserved4" cname="_gtk_reserved4" shared="true" padding="true"> <virtual_method name="GtkReserved4" cname="_gtk_reserved4" shared="true" padding="true">
<return-type type="void" /> <return-type type="void" />
</virtual_method> </virtual_method>
<implements>
<interface cname="GtkStyleProvider" />
</implements>
<method name="Clear" cname="gtk_style_properties_clear"> <method name="Clear" cname="gtk_style_properties_clear">
<return-type type="void" /> <return-type type="void" />
</method> </method>

6
parser/gapi2xml.pl
View file

@ -161,8 +161,8 @@ while ($line = <STDIN>) {
last if ($line =~ /^(deprecated)?}/); last if ($line =~ /^(deprecated)?}/);
} }
$typefuncs{lc($class)} = $pedef; $typefuncs{lc($class)} = $pedef;
} elsif ($line =~ /^G_DEFINE_TYPE_WITH_CODE\s*\(\s*(\w+)/) { } elsif ($line =~ /^G_DEFINE_TYPE_(EXTENDED|WITH_CODE)\s*\(\s*(\w+)/) {
$typefuncs{lc($1)} = $line; $typefuncs{lc($2)} = $line;
} elsif ($line =~ /^G_DEFINE_BOXED_TYPE\s*\(\s*(\w+)/) { } elsif ($line =~ /^G_DEFINE_BOXED_TYPE\s*\(\s*(\w+)/) {
$boxdefs{$1} = $line; $boxdefs{$1} = $line;
} elsif ($line =~ /^G_DEFINE_INTERFACE\s*\(\s*(\w+)\s*,\s*(\w+)/) { } elsif ($line =~ /^G_DEFINE_INTERFACE\s*\(\s*(\w+)\s*,\s*(\w+)/) {
@ -410,7 +410,7 @@ foreach $type (sort(keys(%objects))) {
# Get the interfaces from the class_init func. # Get the interfaces from the class_init func.
if ($typefunc) { if ($typefunc) {
if ($typefunc =~ /G_DEFINE_TYPE_WITH_CODE/) { if ($typefunc =~ /G_DEFINE_TYPE_(EXTENDED|WITH_CODE)/) {
parseTypeFuncMacro($obj_el, $typefunc); parseTypeFuncMacro($obj_el, $typefunc);
} else { } else {
parseTypeFunc($obj_el, $typefunc); parseTypeFunc($obj_el, $typefunc);

4
parser/gapi_pp.pl
View file

@ -207,9 +207,9 @@ foreach $fname (@srcs, @privhdrs) {
} }
while ($line = <INFILE>) { while ($line = <INFILE>) {
next if ($line !~ /^(struct|typedef struct.*;|\w+_class_init|\w+_base_init|\w+_default_init|\w+_get_type\b|G_DEFINE_TYPE_WITH_CODE|G_DEFINE_BOXED_TYPE|G_DEFINE_INTERFACE)/); next if ($line !~ /^(struct|typedef struct.*;|\w+_class_init|\w+_base_init|\w+_default_init|\w+_get_type\b|G_DEFINE_TYPE_EXTENDED|G_DEFINE_TYPE_WITH_CODE|G_DEFINE_BOXED_TYPE|G_DEFINE_INTERFACE)/);
if ($line =~ /^G_DEFINE_(TYPE_WITH_CODE|BOXED_TYPE|INTERFACE)/) { if ($line =~ /^G_DEFINE_(TYPE_EXTENDED|TYPE_WITH_CODE|BOXED_TYPE|INTERFACE)/) {
my $macro; my $macro;
my $parens = 0; my $parens = 0;
do { do {