From aee5779fd141e981473a4a5b67cdeac05ca93690 Mon Sep 17 00:00:00 2001 From: Mike D Pilsbury Date: Fri, 27 Sep 2019 18:44:44 +0100 Subject: [PATCH] Make all fields in gtk.TreeIter private. With them non-private it's not possible to iterate with the iterator. That is because the internal fields are critical to the iteration. --- internal/generate/field.go | 4 ++++ internal/generate/fields.go | 18 ++++++++++++++++++ internal/generate/record.go | 1 + internal/gir-files/Gtk-3.0-addenda.gir | 8 ++++++++ lib/gtk/v-.go | 26 ++++++-------------------- lib/gtk/v-2.10.go | 26 ++++++-------------------- lib/gtk/v-2.12.go | 26 ++++++-------------------- lib/gtk/v-2.14.go | 26 ++++++-------------------- lib/gtk/v-2.16.go | 26 ++++++-------------------- lib/gtk/v-2.18.go | 26 ++++++-------------------- lib/gtk/v-2.2.go | 26 ++++++-------------------- lib/gtk/v-2.20.go | 26 ++++++-------------------- lib/gtk/v-2.22.go | 26 ++++++-------------------- lib/gtk/v-2.24.go | 26 ++++++-------------------- lib/gtk/v-2.4.go | 26 ++++++-------------------- lib/gtk/v-2.6.go | 26 ++++++-------------------- lib/gtk/v-2.8.go | 26 ++++++-------------------- lib/gtk/v-3.0.go | 26 ++++++-------------------- lib/gtk/v-3.10.go | 26 ++++++-------------------- lib/gtk/v-3.12.go | 26 ++++++-------------------- lib/gtk/v-3.14.go | 26 ++++++-------------------- lib/gtk/v-3.16.go | 26 ++++++-------------------- lib/gtk/v-3.18.go | 26 ++++++-------------------- lib/gtk/v-3.2.go | 26 ++++++-------------------- lib/gtk/v-3.20.go | 26 ++++++-------------------- lib/gtk/v-3.22.26.go | 26 ++++++-------------------- lib/gtk/v-3.22.29.go | 26 ++++++-------------------- lib/gtk/v-3.22.6.go | 26 ++++++-------------------- lib/gtk/v-3.22.go | 26 ++++++-------------------- lib/gtk/v-3.4.go | 26 ++++++-------------------- lib/gtk/v-3.6.go | 26 ++++++-------------------- lib/gtk/v-3.8.go | 26 ++++++-------------------- 32 files changed, 199 insertions(+), 560 deletions(-) diff --git a/internal/generate/field.go b/internal/generate/field.go index 7f7c3a49..59456242 100644 --- a/internal/generate/field.go +++ b/internal/generate/field.go @@ -61,3 +61,7 @@ func (f Field) generate(g *jen.Group) { f.Type.generator.generateDeclaration(g, f.goVarName) } + +func (f *Field) mergeAddenda(addenda *Field) { + f.Private = addenda.Private +} diff --git a/internal/generate/fields.go b/internal/generate/fields.go index 2f56fab9..340c0bd2 100644 --- a/internal/generate/fields.go +++ b/internal/generate/fields.go @@ -15,3 +15,21 @@ func (ff Fields) generate(g *jen.Group) { f.generate(g) } } + +func (ff Fields) forName(name string) *Field { + for _, field := range ff { + if field.Name == name { + return field + } + } + + return nil +} + +func (ff Fields) mergeAddenda(addenda Fields) { + for _, addendaField := range addenda { + if field := ff.forName(addendaField.Name); field != nil { + field.mergeAddenda(addendaField) + } + } +} diff --git a/internal/generate/record.go b/internal/generate/record.go index 87276c37..4270eb7c 100644 --- a/internal/generate/record.go +++ b/internal/generate/record.go @@ -69,6 +69,7 @@ func (r *Record) mergeAddenda(addenda *Record) { r.Constructors.mergeAddenda(addenda.Constructors) r.Functions.mergeAddenda(addenda.Functions) r.Methods.mergeAddenda(addenda.Methods) + r.Fields.mergeAddenda(addenda.Fields) } func (r *Record) generate(g *jen.Group, version *Version) { diff --git a/internal/gir-files/Gtk-3.0-addenda.gir b/internal/gir-files/Gtk-3.0-addenda.gir index 9b511c9d..94ecd363 100644 --- a/internal/gir-files/Gtk-3.0-addenda.gir +++ b/internal/gir-files/Gtk-3.0-addenda.gir @@ -188,6 +188,14 @@ + + + + + + + + diff --git a/lib/gtk/v-.go b/lib/gtk/v-.go index e1cb05b6..e4f05648 100644 --- a/lib/gtk/v-.go +++ b/lib/gtk/v-.go @@ -67977,11 +67977,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -67990,26 +67990,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-2.10.go b/lib/gtk/v-2.10.go index 61edcd0d..513893d9 100644 --- a/lib/gtk/v-2.10.go +++ b/lib/gtk/v-2.10.go @@ -82112,11 +82112,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -82125,26 +82125,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-2.12.go b/lib/gtk/v-2.12.go index 366ebaa2..5fbfac83 100644 --- a/lib/gtk/v-2.12.go +++ b/lib/gtk/v-2.12.go @@ -84676,11 +84676,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -84689,26 +84689,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-2.14.go b/lib/gtk/v-2.14.go index 9d3a5d6f..327ac5d3 100644 --- a/lib/gtk/v-2.14.go +++ b/lib/gtk/v-2.14.go @@ -86366,11 +86366,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -86379,26 +86379,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-2.16.go b/lib/gtk/v-2.16.go index a51763ff..d0eac741 100644 --- a/lib/gtk/v-2.16.go +++ b/lib/gtk/v-2.16.go @@ -87598,11 +87598,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -87611,26 +87611,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-2.18.go b/lib/gtk/v-2.18.go index 956e8ed6..acbf5b03 100644 --- a/lib/gtk/v-2.18.go +++ b/lib/gtk/v-2.18.go @@ -88847,11 +88847,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -88860,26 +88860,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-2.2.go b/lib/gtk/v-2.2.go index fa97861d..c5b4c1ce 100644 --- a/lib/gtk/v-2.2.go +++ b/lib/gtk/v-2.2.go @@ -69013,11 +69013,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -69026,26 +69026,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-2.20.go b/lib/gtk/v-2.20.go index af3de8a8..8699f9f5 100644 --- a/lib/gtk/v-2.20.go +++ b/lib/gtk/v-2.20.go @@ -89816,11 +89816,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -89829,26 +89829,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-2.22.go b/lib/gtk/v-2.22.go index 41c12022..2197e601 100644 --- a/lib/gtk/v-2.22.go +++ b/lib/gtk/v-2.22.go @@ -90041,11 +90041,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -90054,26 +90054,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-2.24.go b/lib/gtk/v-2.24.go index 139e1e84..965d965b 100644 --- a/lib/gtk/v-2.24.go +++ b/lib/gtk/v-2.24.go @@ -90285,11 +90285,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -90298,26 +90298,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-2.4.go b/lib/gtk/v-2.4.go index 8d25d73a..7b3cc65c 100644 --- a/lib/gtk/v-2.4.go +++ b/lib/gtk/v-2.4.go @@ -74153,11 +74153,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -74166,26 +74166,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-2.6.go b/lib/gtk/v-2.6.go index ec585871..bc112fd0 100644 --- a/lib/gtk/v-2.6.go +++ b/lib/gtk/v-2.6.go @@ -76133,11 +76133,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -76146,26 +76146,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-2.8.go b/lib/gtk/v-2.8.go index 85d574bd..f8fe4309 100644 --- a/lib/gtk/v-2.8.go +++ b/lib/gtk/v-2.8.go @@ -76731,11 +76731,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -76744,26 +76744,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.0.go b/lib/gtk/v-3.0.go index 377f3a96..17187938 100644 --- a/lib/gtk/v-3.0.go +++ b/lib/gtk/v-3.0.go @@ -95201,11 +95201,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -95214,26 +95214,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.10.go b/lib/gtk/v-3.10.go index 1445694b..15e75e7d 100644 --- a/lib/gtk/v-3.10.go +++ b/lib/gtk/v-3.10.go @@ -99501,11 +99501,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -99514,26 +99514,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.12.go b/lib/gtk/v-3.12.go index 0e39b91e..b258e7fd 100644 --- a/lib/gtk/v-3.12.go +++ b/lib/gtk/v-3.12.go @@ -100238,11 +100238,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -100251,26 +100251,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.14.go b/lib/gtk/v-3.14.go index 09292169..40137a9f 100644 --- a/lib/gtk/v-3.14.go +++ b/lib/gtk/v-3.14.go @@ -102677,11 +102677,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -102690,26 +102690,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.16.go b/lib/gtk/v-3.16.go index 2eb39618..09800c38 100644 --- a/lib/gtk/v-3.16.go +++ b/lib/gtk/v-3.16.go @@ -103942,11 +103942,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -103955,26 +103955,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.18.go b/lib/gtk/v-3.18.go index 7f37da7b..2d15c99c 100644 --- a/lib/gtk/v-3.18.go +++ b/lib/gtk/v-3.18.go @@ -104349,11 +104349,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -104362,26 +104362,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.2.go b/lib/gtk/v-3.2.go index 70bae8d7..5374312f 100644 --- a/lib/gtk/v-3.2.go +++ b/lib/gtk/v-3.2.go @@ -95997,11 +95997,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -96010,26 +96010,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.20.go b/lib/gtk/v-3.20.go index 27793f5e..a4107798 100644 --- a/lib/gtk/v-3.20.go +++ b/lib/gtk/v-3.20.go @@ -106029,11 +106029,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -106042,26 +106042,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.22.26.go b/lib/gtk/v-3.22.26.go index 1c94c7d6..f972bf26 100644 --- a/lib/gtk/v-3.22.26.go +++ b/lib/gtk/v-3.22.26.go @@ -106550,11 +106550,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -106563,26 +106563,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.22.29.go b/lib/gtk/v-3.22.29.go index 07d792b9..4f7a8b70 100644 --- a/lib/gtk/v-3.22.29.go +++ b/lib/gtk/v-3.22.29.go @@ -106706,11 +106706,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -106719,26 +106719,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.22.6.go b/lib/gtk/v-3.22.6.go index b83d8d13..c93c64fc 100644 --- a/lib/gtk/v-3.22.6.go +++ b/lib/gtk/v-3.22.6.go @@ -106461,11 +106461,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -106474,26 +106474,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.22.go b/lib/gtk/v-3.22.go index e10d920c..55af628a 100644 --- a/lib/gtk/v-3.22.go +++ b/lib/gtk/v-3.22.go @@ -106444,11 +106444,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -106457,26 +106457,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.4.go b/lib/gtk/v-3.4.go index 79f67a88..4c880f13 100644 --- a/lib/gtk/v-3.4.go +++ b/lib/gtk/v-3.4.go @@ -96722,11 +96722,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -96735,26 +96735,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.6.go b/lib/gtk/v-3.6.go index 9db39e0a..4aa2eeed 100644 --- a/lib/gtk/v-3.6.go +++ b/lib/gtk/v-3.6.go @@ -97299,11 +97299,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -97312,26 +97312,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) } diff --git a/lib/gtk/v-3.8.go b/lib/gtk/v-3.8.go index 06f18af7..b1f482e9 100644 --- a/lib/gtk/v-3.8.go +++ b/lib/gtk/v-3.8.go @@ -97540,11 +97540,11 @@ func (recv *TreeDragSourceIface) Equals(other *TreeDragSourceIface) bool { // TreeIter is a wrapper around the C record GtkTreeIter. type TreeIter struct { - native *C.GtkTreeIter - Stamp int32 - UserData uintptr - UserData2 uintptr - UserData3 uintptr + native *C.GtkTreeIter + // Private : stamp + // Private : user_data + // Private : user_data2 + // Private : user_data3 } func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { @@ -97553,26 +97553,12 @@ func TreeIterNewFromC(u unsafe.Pointer) *TreeIter { return nil } - g := &TreeIter{ - Stamp: (int32)(c.stamp), - UserData: (uintptr)(c.user_data), - UserData2: (uintptr)(c.user_data2), - UserData3: (uintptr)(c.user_data3), - native: c, - } + g := &TreeIter{native: c} return g } func (recv *TreeIter) ToC() unsafe.Pointer { - recv.native.stamp = - (C.gint)(recv.Stamp) - recv.native.user_data = - (C.gpointer)(recv.UserData) - recv.native.user_data2 = - (C.gpointer)(recv.UserData2) - recv.native.user_data3 = - (C.gpointer)(recv.UserData3) return (unsafe.Pointer)(recv.native) }