diff --git a/Source/Libs/GtkSharp/GtkSharp.metadata b/Source/Libs/GtkSharp/GtkSharp.metadata index 1334e897b..505b50580 100644 --- a/Source/Libs/GtkSharp/GtkSharp.metadata +++ b/Source/Libs/GtkSharp/GtkSharp.metadata @@ -1005,4 +1005,8 @@ /api/namespace/object[@cname='GtkStyle'] + + + true + true diff --git a/Source/Libs/Shared/Gapi.xsd b/Source/Libs/Shared/Gapi.xsd index 592595a63..7ef1b8bc3 100644 --- a/Source/Libs/Shared/Gapi.xsd +++ b/Source/Libs/Shared/Gapi.xsd @@ -182,6 +182,7 @@ + @@ -211,6 +212,7 @@ + diff --git a/Source/Tools/GapiCodegen/ClassBase.cs b/Source/Tools/GapiCodegen/ClassBase.cs index 0d2812114..375a79a74 100644 --- a/Source/Tools/GapiCodegen/ClassBase.cs +++ b/Source/Tools/GapiCodegen/ClassBase.cs @@ -252,8 +252,11 @@ namespace GtkSharp.Generation { var field = _fields[i]; next = _fields.Count > i +1 ? _fields[i + 1] : null; + prev = field.Generate(gen_info, "\t\t\t\t\t", prev, next, cs_parent_struct, field_alignment_structures_writer); + if (field.IsPadding) + continue; var union = field as UnionABIField; if (union == null && gen_info.CAbiWriter != null && !field.IsBitfield) { gen_info.AbiWriter.WriteLine("\t\t\tConsole.WriteLine(\"\\\"{0}.{3}\\\": \\\"\" + {1}.{2}." + info_name + ".GetFieldOffset(\"{3}\") + \"\\\"\");", structname, NS, Name, field.CName); diff --git a/Source/Tools/GapiCodegen/StructField.cs b/Source/Tools/GapiCodegen/StructField.cs index a90ce2943..9fdb330f2 100644 --- a/Source/Tools/GapiCodegen/StructField.cs +++ b/Source/Tools/GapiCodegen/StructField.cs @@ -152,8 +152,8 @@ namespace GtkSharp.Generation { public bool IsPadding { get { - if (elem.GetAttributeAsBoolean ("is-padding")) - return elem.GetAttributeAsBoolean ("is-padding"); + if (elem.GetAttributeAsBoolean ("padding")) + return elem.GetAttributeAsBoolean ("padding"); return (elem.GetAttribute ("access") == "private" && ( CName.StartsWith ("dummy") || CName.StartsWith ("padding")));