detached 62142c4

Pass: Only converts gint to int32 in records

commit
62142c4f5395c6a7b48a3043586f0d86c923d25f
author
jwijenbergh · · 2023-08-15 12:16 UTC
committer
jwijenbergh · · 2023-08-15 12:18 UTC
parent
61f3996
signature
GPG Unverified1A2298F6C34F96E5 The key is unknown
330 files · +2614 -2611
Unified
UnifiedSplit
M internal/gir/pass/pass.go +6 -0
@@ -104,6 +104,12 @@ func (p *Pass) writeGo(r types.Repository, gotemp *template.Template, dir string
104104 if _type == "" {
105105 continue
106106 }
107+ // HACK: Handle the specific case where a gint is converted to an int
108+ // But for structs this needs to be an int32 as purego just gets the pointer to the struct
109+ // Instead of converting each field separately
110+ if f.AnyType.Type != nil && f.AnyType.Type.CType == "gint" {
111+ _type = "int32"
112+ }
107113 fields = append(fields, types.RecordField{
108114 Name: util.SnakeToCamel(f.Name),
109115 Type: _type,
M internal/gir/types/types.go +1 -4
@@ -17,10 +17,7 @@ var convList = map[string]string{
1717 "gboolean": "bool",
1818 "gfloat": "float32",
1919 "gdouble": "float64",
20- // This was changed because e.g. the error code in a GError struct is a gint and it has to be an int32
21- // gint is a typedef to an int and on 32 and 64 bit systems a c int is 32 bits commonly, whereas in go an int is 32 bits on 32 bits systems and 64 bits on 64 bits systems
22- // gotk4 seems to not cast these, see e.g. https://github.com/diamondburned/gotk4/blob/fd960d20b525a07580938d10a214336bafb47d12/gir/girgen/types/types.go#L473-L481
23- "gint": "int32",
20+ "gint": "int",
2421 "gssize": "int",
2522 "gint8": "int8",
2623 "gint16": "int16",
M v4/adw/adw-about-window.go +3 -3
@@ -967,7 +967,7 @@ func (x *AboutWindow) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, va
967967 // property change must be communicated to assistive technologies.
968968 //
969969 // This function is meant to be used by language bindings.
970-func (x *AboutWindow) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
970+func (x *AboutWindow) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
971971
972972 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
973973
@@ -1003,7 +1003,7 @@ func (x *AboutWindow) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, va
10031003 // relation change must be communicated to assistive technologies.
10041004 //
10051005 // This function is meant to be used by language bindings.
1006-func (x *AboutWindow) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
1006+func (x *AboutWindow) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
10071007
10081008 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
10091009
@@ -1036,7 +1036,7 @@ func (x *AboutWindow) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...
10361036 // state change must be communicated to assistive technologies.
10371037 //
10381038 // This function is meant to be used by language bindings.
1039-func (x *AboutWindow) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
1039+func (x *AboutWindow) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
10401040
10411041 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
10421042
M v4/adw/adw-action-row.go +11 -11
@@ -140,11 +140,11 @@ func (x *ActionRow) GetSubtitle() string {
140140
141141 }
142142
143-var xActionRowGetSubtitleLines func(uintptr) int32
143+var xActionRowGetSubtitleLines func(uintptr) int
144144
145145 // Gets the number of lines at the end of which the subtitle label will be
146146 // ellipsized.
147-func (x *ActionRow) GetSubtitleLines() int32 {
147+func (x *ActionRow) GetSubtitleLines() int {
148148
149149 return xActionRowGetSubtitleLines(x.GoPointer())
150150
@@ -159,11 +159,11 @@ func (x *ActionRow) GetSubtitleSelectable() bool {
159159
160160 }
161161
162-var xActionRowGetTitleLines func(uintptr) int32
162+var xActionRowGetTitleLines func(uintptr) int
163163
164164 // Gets the number of lines at the end of which the title label will be
165165 // ellipsized.
166-func (x *ActionRow) GetTitleLines() int32 {
166+func (x *ActionRow) GetTitleLines() int {
167167
168168 return xActionRowGetTitleLines(x.GoPointer())
169169
@@ -215,13 +215,13 @@ func (x *ActionRow) SetSubtitle(SubtitleVar string) {
215215
216216 }
217217
218-var xActionRowSetSubtitleLines func(uintptr, int32)
218+var xActionRowSetSubtitleLines func(uintptr, int)
219219
220220 // Sets the number of lines at the end of which the subtitle label will be
221221 // ellipsized.
222222 //
223223 // If the value is 0, the number of lines won't be limited.
224-func (x *ActionRow) SetSubtitleLines(SubtitleLinesVar int32) {
224+func (x *ActionRow) SetSubtitleLines(SubtitleLinesVar int) {
225225
226226 xActionRowSetSubtitleLines(x.GoPointer(), SubtitleLinesVar)
227227
@@ -238,13 +238,13 @@ func (x *ActionRow) SetSubtitleSelectable(SubtitleSelectableVar bool) {
238238
239239 }
240240
241-var xActionRowSetTitleLines func(uintptr, int32)
241+var xActionRowSetTitleLines func(uintptr, int)
242242
243243 // Sets the number of lines at the end of which the title label will be
244244 // ellipsized.
245245 //
246246 // If the value is 0, the number of lines won't be limited.
247-func (x *ActionRow) SetTitleLines(TitleLinesVar int32) {
247+func (x *ActionRow) SetTitleLines(TitleLinesVar int) {
248248
249249 xActionRowSetTitleLines(x.GoPointer(), TitleLinesVar)
250250
@@ -328,7 +328,7 @@ func (x *ActionRow) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varA
328328 // property change must be communicated to assistive technologies.
329329 //
330330 // This function is meant to be used by language bindings.
331-func (x *ActionRow) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
331+func (x *ActionRow) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
332332
333333 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
334334
@@ -364,7 +364,7 @@ func (x *ActionRow) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varA
364364 // relation change must be communicated to assistive technologies.
365365 //
366366 // This function is meant to be used by language bindings.
367-func (x *ActionRow) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
367+func (x *ActionRow) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
368368
369369 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
370370
@@ -397,7 +397,7 @@ func (x *ActionRow) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...in
397397 // state change must be communicated to assistive technologies.
398398 //
399399 // This function is meant to be used by language bindings.
400-func (x *ActionRow) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
400+func (x *ActionRow) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
401401
402402 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
403403
M v4/adw/adw-application-window.go +4 -4
@@ -385,7 +385,7 @@ func (x *ApplicationWindow) AddAction(ActionVar gio.Action) {
385385 // }
386386 //
387387 // ]|
388-func (x *ApplicationWindow) AddActionEntries(EntriesVar uintptr, NEntriesVar int32, UserDataVar uintptr) {
388+func (x *ApplicationWindow) AddActionEntries(EntriesVar uintptr, NEntriesVar int, UserDataVar uintptr) {
389389
390390 gio.XGActionMapAddActionEntries(x.GoPointer(), EntriesVar, NEntriesVar, UserDataVar)
391391
@@ -476,7 +476,7 @@ func (x *ApplicationWindow) UpdateProperty(FirstPropertyVar gtk.AccessibleProper
476476 // property change must be communicated to assistive technologies.
477477 //
478478 // This function is meant to be used by language bindings.
479-func (x *ApplicationWindow) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
479+func (x *ApplicationWindow) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
480480
481481 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
482482
@@ -512,7 +512,7 @@ func (x *ApplicationWindow) UpdateRelation(FirstRelationVar gtk.AccessibleRelati
512512 // relation change must be communicated to assistive technologies.
513513 //
514514 // This function is meant to be used by language bindings.
515-func (x *ApplicationWindow) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
515+func (x *ApplicationWindow) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
516516
517517 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
518518
@@ -545,7 +545,7 @@ func (x *ApplicationWindow) UpdateState(FirstStateVar gtk.AccessibleState, varAr
545545 // state change must be communicated to assistive technologies.
546546 //
547547 // This function is meant to be used by language bindings.
548-func (x *ApplicationWindow) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
548+func (x *ApplicationWindow) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
549549
550550 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
551551
M v4/adw/adw-application.go +1 -1
@@ -387,7 +387,7 @@ func (x *Application) AddAction(ActionVar gio.Action) {
387387 // }
388388 //
389389 // ]|
390-func (x *Application) AddActionEntries(EntriesVar uintptr, NEntriesVar int32, UserDataVar uintptr) {
390+func (x *Application) AddActionEntries(EntriesVar uintptr, NEntriesVar int, UserDataVar uintptr) {
391391
392392 gio.XGActionMapAddActionEntries(x.GoPointer(), EntriesVar, NEntriesVar, UserDataVar)
393393
M v4/adw/adw-avatar.go +11 -11
@@ -48,10 +48,10 @@ func AvatarNewFromInternalPtr(ptr uintptr) *Avatar {
4848 return cls
4949 }
5050
51-var xNewAvatar func(int32, string, bool) uintptr
51+var xNewAvatar func(int, string, bool) uintptr
5252
5353 // Creates a new `AdwAvatar`.
54-func NewAvatar(SizeVar int32, TextVar string, ShowInitialsVar bool) *gtk.Widget {
54+func NewAvatar(SizeVar int, TextVar string, ShowInitialsVar bool) *gtk.Widget {
5555 NewAvatarPtr := xNewAvatar(SizeVar, TextVar, ShowInitialsVar)
5656 if NewAvatarPtr == 0 {
5757 return nil
@@ -64,12 +64,12 @@ func NewAvatar(SizeVar int32, TextVar string, ShowInitialsVar bool) *gtk.Widget
6464 return NewAvatarCls
6565 }
6666
67-var xAvatarDrawToTexture func(uintptr, int32) uintptr
67+var xAvatarDrawToTexture func(uintptr, int) uintptr
6868
6969 // Renders @self into a [class@Gdk.Texture] at @scale_factor.
7070 //
7171 // This can be used to export the fallback avatar.
72-func (x *Avatar) DrawToTexture(ScaleFactorVar int32) *gdk.Texture {
72+func (x *Avatar) DrawToTexture(ScaleFactorVar int) *gdk.Texture {
7373
7474 DrawToTexturePtr := xAvatarDrawToTexture(x.GoPointer(), ScaleFactorVar)
7575 if DrawToTexturePtr == 0 {
@@ -118,10 +118,10 @@ func (x *Avatar) GetShowInitials() bool {
118118
119119 }
120120
121-var xAvatarGetSize func(uintptr) int32
121+var xAvatarGetSize func(uintptr) int
122122
123123 // Gets the size of the avatar.
124-func (x *Avatar) GetSize() int32 {
124+func (x *Avatar) GetSize() int {
125125
126126 return xAvatarGetSize(x.GoPointer())
127127
@@ -169,10 +169,10 @@ func (x *Avatar) SetShowInitials(ShowInitialsVar bool) {
169169
170170 }
171171
172-var xAvatarSetSize func(uintptr, int32)
172+var xAvatarSetSize func(uintptr, int)
173173
174174 // Sets the size of the avatar.
175-func (x *Avatar) SetSize(SizeVar int32) {
175+func (x *Avatar) SetSize(SizeVar int) {
176176
177177 xAvatarSetSize(x.GoPointer(), SizeVar)
178178
@@ -256,7 +256,7 @@ func (x *Avatar) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varArgs
256256 // property change must be communicated to assistive technologies.
257257 //
258258 // This function is meant to be used by language bindings.
259-func (x *Avatar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
259+func (x *Avatar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
260260
261261 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
262262
@@ -292,7 +292,7 @@ func (x *Avatar) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varArgs
292292 // relation change must be communicated to assistive technologies.
293293 //
294294 // This function is meant to be used by language bindings.
295-func (x *Avatar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
295+func (x *Avatar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
296296
297297 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
298298
@@ -325,7 +325,7 @@ func (x *Avatar) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...inter
325325 // state change must be communicated to assistive technologies.
326326 //
327327 // This function is meant to be used by language bindings.
328-func (x *Avatar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
328+func (x *Avatar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
329329
330330 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
331331
M v4/adw/adw-banner.go +3 -3
@@ -224,7 +224,7 @@ func (x *Banner) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varArgs
224224 // property change must be communicated to assistive technologies.
225225 //
226226 // This function is meant to be used by language bindings.
227-func (x *Banner) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
227+func (x *Banner) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
228228
229229 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
230230
@@ -260,7 +260,7 @@ func (x *Banner) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varArgs
260260 // relation change must be communicated to assistive technologies.
261261 //
262262 // This function is meant to be used by language bindings.
263-func (x *Banner) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
263+func (x *Banner) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
264264
265265 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
266266
@@ -293,7 +293,7 @@ func (x *Banner) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...inter
293293 // state change must be communicated to assistive technologies.
294294 //
295295 // This function is meant to be used by language bindings.
296-func (x *Banner) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
296+func (x *Banner) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
297297
298298 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
299299
M v4/adw/adw-bin.go +3 -3
@@ -145,7 +145,7 @@ func (x *Bin) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varArgs ..
145145 // property change must be communicated to assistive technologies.
146146 //
147147 // This function is meant to be used by language bindings.
148-func (x *Bin) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
148+func (x *Bin) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
149149
150150 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
151151
@@ -181,7 +181,7 @@ func (x *Bin) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varArgs ..
181181 // relation change must be communicated to assistive technologies.
182182 //
183183 // This function is meant to be used by language bindings.
184-func (x *Bin) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
184+func (x *Bin) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
185185
186186 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
187187
@@ -214,7 +214,7 @@ func (x *Bin) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...interfac
214214 // state change must be communicated to assistive technologies.
215215 //
216216 // This function is meant to be used by language bindings.
217-func (x *Bin) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
217+func (x *Bin) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
218218
219219 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
220220
M v4/adw/adw-button-content.go +3 -3
@@ -214,7 +214,7 @@ func (x *ButtonContent) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty,
214214 // property change must be communicated to assistive technologies.
215215 //
216216 // This function is meant to be used by language bindings.
217-func (x *ButtonContent) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
217+func (x *ButtonContent) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
218218
219219 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
220220
@@ -250,7 +250,7 @@ func (x *ButtonContent) UpdateRelation(FirstRelationVar gtk.AccessibleRelation,
250250 // relation change must be communicated to assistive technologies.
251251 //
252252 // This function is meant to be used by language bindings.
253-func (x *ButtonContent) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
253+func (x *ButtonContent) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
254254
255255 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
256256
@@ -283,7 +283,7 @@ func (x *ButtonContent) UpdateState(FirstStateVar gtk.AccessibleState, varArgs .
283283 // state change must be communicated to assistive technologies.
284284 //
285285 // This function is meant to be used by language bindings.
286-func (x *ButtonContent) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
286+func (x *ButtonContent) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
287287
288288 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
289289
M v4/adw/adw-carousel-indicator-dots.go +3 -3
@@ -151,7 +151,7 @@ func (x *CarouselIndicatorDots) UpdateProperty(FirstPropertyVar gtk.AccessiblePr
151151 // property change must be communicated to assistive technologies.
152152 //
153153 // This function is meant to be used by language bindings.
154-func (x *CarouselIndicatorDots) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
154+func (x *CarouselIndicatorDots) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
155155
156156 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
157157
@@ -187,7 +187,7 @@ func (x *CarouselIndicatorDots) UpdateRelation(FirstRelationVar gtk.AccessibleRe
187187 // relation change must be communicated to assistive technologies.
188188 //
189189 // This function is meant to be used by language bindings.
190-func (x *CarouselIndicatorDots) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
190+func (x *CarouselIndicatorDots) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
191191
192192 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
193193
@@ -220,7 +220,7 @@ func (x *CarouselIndicatorDots) UpdateState(FirstStateVar gtk.AccessibleState, v
220220 // state change must be communicated to assistive technologies.
221221 //
222222 // This function is meant to be used by language bindings.
223-func (x *CarouselIndicatorDots) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
223+func (x *CarouselIndicatorDots) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
224224
225225 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
226226
M v4/adw/adw-carousel-indicator-lines.go +3 -3
@@ -150,7 +150,7 @@ func (x *CarouselIndicatorLines) UpdateProperty(FirstPropertyVar gtk.AccessibleP
150150 // property change must be communicated to assistive technologies.
151151 //
152152 // This function is meant to be used by language bindings.
153-func (x *CarouselIndicatorLines) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
153+func (x *CarouselIndicatorLines) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
154154
155155 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
156156
@@ -186,7 +186,7 @@ func (x *CarouselIndicatorLines) UpdateRelation(FirstRelationVar gtk.AccessibleR
186186 // relation change must be communicated to assistive technologies.
187187 //
188188 // This function is meant to be used by language bindings.
189-func (x *CarouselIndicatorLines) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
189+func (x *CarouselIndicatorLines) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
190190
191191 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
192192
@@ -219,7 +219,7 @@ func (x *CarouselIndicatorLines) UpdateState(FirstStateVar gtk.AccessibleState,
219219 // state change must be communicated to assistive technologies.
220220 //
221221 // This function is meant to be used by language bindings.
222-func (x *CarouselIndicatorLines) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
222+func (x *CarouselIndicatorLines) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
223223
224224 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
225225
M v4/adw/adw-carousel.go +8 -8
@@ -167,13 +167,13 @@ func (x *Carousel) GetSpacing() uint {
167167
168168 }
169169
170-var xCarouselInsert func(uintptr, uintptr, int32)
170+var xCarouselInsert func(uintptr, uintptr, int)
171171
172172 // Inserts @child into @self at position @position.
173173 //
174174 // If position is -1, or larger than the number of pages,
175175 // @child will be appended to the end.
176-func (x *Carousel) Insert(ChildVar *gtk.Widget, PositionVar int32) {
176+func (x *Carousel) Insert(ChildVar *gtk.Widget, PositionVar int) {
177177
178178 xCarouselInsert(x.GoPointer(), ChildVar.GoPointer(), PositionVar)
179179
@@ -197,13 +197,13 @@ func (x *Carousel) Remove(ChildVar *gtk.Widget) {
197197
198198 }
199199
200-var xCarouselReorder func(uintptr, uintptr, int32)
200+var xCarouselReorder func(uintptr, uintptr, int)
201201
202202 // Moves @child into position @position.
203203 //
204204 // If position is -1, or larger than the number of pages, @child will be moved
205205 // at the end.
206-func (x *Carousel) Reorder(ChildVar *gtk.Widget, PositionVar int32) {
206+func (x *Carousel) Reorder(ChildVar *gtk.Widget, PositionVar int) {
207207
208208 xCarouselReorder(x.GoPointer(), ChildVar.GoPointer(), PositionVar)
209209
@@ -352,7 +352,7 @@ func (x *Carousel) GetProgress() float64 {
352352 //
353353 // Each snap point represents a progress value that is considered acceptable to
354354 // end the swipe on.
355-func (x *Carousel) GetSnapPoints(NSnapPointsVar int32) uintptr {
355+func (x *Carousel) GetSnapPoints(NSnapPointsVar int) uintptr {
356356
357357 return XAdwSwipeableGetSnapPoints(x.GoPointer(), NSnapPointsVar)
358358
@@ -431,7 +431,7 @@ func (x *Carousel) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varAr
431431 // property change must be communicated to assistive technologies.
432432 //
433433 // This function is meant to be used by language bindings.
434-func (x *Carousel) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
434+func (x *Carousel) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
435435
436436 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
437437
@@ -467,7 +467,7 @@ func (x *Carousel) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varAr
467467 // relation change must be communicated to assistive technologies.
468468 //
469469 // This function is meant to be used by language bindings.
470-func (x *Carousel) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
470+func (x *Carousel) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
471471
472472 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
473473
@@ -500,7 +500,7 @@ func (x *Carousel) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...int
500500 // state change must be communicated to assistive technologies.
501501 //
502502 // This function is meant to be used by language bindings.
503-func (x *Carousel) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
503+func (x *Carousel) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
504504
505505 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
506506
M v4/adw/adw-clamp-layout.go +8 -8
@@ -61,36 +61,36 @@ func NewClampLayout() *gtk.LayoutManager {
6161 return NewClampLayoutCls
6262 }
6363
64-var xClampLayoutGetMaximumSize func(uintptr) int32
64+var xClampLayoutGetMaximumSize func(uintptr) int
6565
6666 // Gets the maximum size allocated to the children.
67-func (x *ClampLayout) GetMaximumSize() int32 {
67+func (x *ClampLayout) GetMaximumSize() int {
6868
6969 return xClampLayoutGetMaximumSize(x.GoPointer())
7070
7171 }
7272
73-var xClampLayoutGetTighteningThreshold func(uintptr) int32
73+var xClampLayoutGetTighteningThreshold func(uintptr) int
7474
7575 // Gets the size above which the children are clamped.
76-func (x *ClampLayout) GetTighteningThreshold() int32 {
76+func (x *ClampLayout) GetTighteningThreshold() int {
7777
7878 return xClampLayoutGetTighteningThreshold(x.GoPointer())
7979
8080 }
8181
82-var xClampLayoutSetMaximumSize func(uintptr, int32)
82+var xClampLayoutSetMaximumSize func(uintptr, int)
8383
8484 // Sets the maximum size allocated to the children.
8585 //
8686 // It is the width if the layout is horizontal, or the height if it is vertical.
87-func (x *ClampLayout) SetMaximumSize(MaximumSizeVar int32) {
87+func (x *ClampLayout) SetMaximumSize(MaximumSizeVar int) {
8888
8989 xClampLayoutSetMaximumSize(x.GoPointer(), MaximumSizeVar)
9090
9191 }
9292
93-var xClampLayoutSetTighteningThreshold func(uintptr, int32)
93+var xClampLayoutSetTighteningThreshold func(uintptr, int)
9494
9595 // Sets the size above which the children are clamped.
9696 //
@@ -106,7 +106,7 @@ var xClampLayoutSetTighteningThreshold func(uintptr, int32)
106106 //
107107 // Effectively, tightening the grip on a child before it reaches its maximum
108108 // size makes transitions to and from the maximum size smoother when resizing.
109-func (x *ClampLayout) SetTighteningThreshold(TighteningThresholdVar int32) {
109+func (x *ClampLayout) SetTighteningThreshold(TighteningThresholdVar int) {
110110
111111 xClampLayoutSetTighteningThreshold(x.GoPointer(), TighteningThresholdVar)
112112
M v4/adw/adw-clamp-scrollable.go +11 -11
@@ -63,19 +63,19 @@ func (x *ClampScrollable) GetChild() *gtk.Widget {
6363
6464 }
6565
66-var xClampScrollableGetMaximumSize func(uintptr) int32
66+var xClampScrollableGetMaximumSize func(uintptr) int
6767
6868 // Gets the maximum size allocated to the child.
69-func (x *ClampScrollable) GetMaximumSize() int32 {
69+func (x *ClampScrollable) GetMaximumSize() int {
7070
7171 return xClampScrollableGetMaximumSize(x.GoPointer())
7272
7373 }
7474
75-var xClampScrollableGetTighteningThreshold func(uintptr) int32
75+var xClampScrollableGetTighteningThreshold func(uintptr) int
7676
7777 // Gets the size above which the child is clamped.
78-func (x *ClampScrollable) GetTighteningThreshold() int32 {
78+func (x *ClampScrollable) GetTighteningThreshold() int {
7979
8080 return xClampScrollableGetTighteningThreshold(x.GoPointer())
8181
@@ -90,18 +90,18 @@ func (x *ClampScrollable) SetChild(ChildVar *gtk.Widget) {
9090
9191 }
9292
93-var xClampScrollableSetMaximumSize func(uintptr, int32)
93+var xClampScrollableSetMaximumSize func(uintptr, int)
9494
9595 // Sets the maximum size allocated to the child.
9696 //
9797 // It is the width if the clamp is horizontal, or the height if it is vertical.
98-func (x *ClampScrollable) SetMaximumSize(MaximumSizeVar int32) {
98+func (x *ClampScrollable) SetMaximumSize(MaximumSizeVar int) {
9999
100100 xClampScrollableSetMaximumSize(x.GoPointer(), MaximumSizeVar)
101101
102102 }
103103
104-var xClampScrollableSetTighteningThreshold func(uintptr, int32)
104+var xClampScrollableSetTighteningThreshold func(uintptr, int)
105105
106106 // Sets the size above which the child is clamped.
107107 //
@@ -117,7 +117,7 @@ var xClampScrollableSetTighteningThreshold func(uintptr, int32)
117117 //
118118 // Effectively, tightening the grip on the child before it reaches its maximum
119119 // size makes transitions to and from the maximum size smoother when resizing.
120-func (x *ClampScrollable) SetTighteningThreshold(TighteningThresholdVar int32) {
120+func (x *ClampScrollable) SetTighteningThreshold(TighteningThresholdVar int) {
121121
122122 xClampScrollableSetTighteningThreshold(x.GoPointer(), TighteningThresholdVar)
123123
@@ -189,7 +189,7 @@ func (x *ClampScrollable) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty
189189 // property change must be communicated to assistive technologies.
190190 //
191191 // This function is meant to be used by language bindings.
192-func (x *ClampScrollable) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
192+func (x *ClampScrollable) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
193193
194194 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
195195
@@ -225,7 +225,7 @@ func (x *ClampScrollable) UpdateRelation(FirstRelationVar gtk.AccessibleRelation
225225 // relation change must be communicated to assistive technologies.
226226 //
227227 // This function is meant to be used by language bindings.
228-func (x *ClampScrollable) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
228+func (x *ClampScrollable) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
229229
230230 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
231231
@@ -258,7 +258,7 @@ func (x *ClampScrollable) UpdateState(FirstStateVar gtk.AccessibleState, varArgs
258258 // state change must be communicated to assistive technologies.
259259 //
260260 // This function is meant to be used by language bindings.
261-func (x *ClampScrollable) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
261+func (x *ClampScrollable) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
262262
263263 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
264264
M v4/adw/adw-clamp.go +11 -11
@@ -86,19 +86,19 @@ func (x *Clamp) GetChild() *gtk.Widget {
8686
8787 }
8888
89-var xClampGetMaximumSize func(uintptr) int32
89+var xClampGetMaximumSize func(uintptr) int
9090
9191 // Gets the maximum size allocated to the child.
92-func (x *Clamp) GetMaximumSize() int32 {
92+func (x *Clamp) GetMaximumSize() int {
9393
9494 return xClampGetMaximumSize(x.GoPointer())
9595
9696 }
9797
98-var xClampGetTighteningThreshold func(uintptr) int32
98+var xClampGetTighteningThreshold func(uintptr) int
9999
100100 // Gets the size above which the child is clamped.
101-func (x *Clamp) GetTighteningThreshold() int32 {
101+func (x *Clamp) GetTighteningThreshold() int {
102102
103103 return xClampGetTighteningThreshold(x.GoPointer())
104104
@@ -113,18 +113,18 @@ func (x *Clamp) SetChild(ChildVar *gtk.Widget) {
113113
114114 }
115115
116-var xClampSetMaximumSize func(uintptr, int32)
116+var xClampSetMaximumSize func(uintptr, int)
117117
118118 // Sets the maximum size allocated to the child.
119119 //
120120 // It is the width if the clamp is horizontal, or the height if it is vertical.
121-func (x *Clamp) SetMaximumSize(MaximumSizeVar int32) {
121+func (x *Clamp) SetMaximumSize(MaximumSizeVar int) {
122122
123123 xClampSetMaximumSize(x.GoPointer(), MaximumSizeVar)
124124
125125 }
126126
127-var xClampSetTighteningThreshold func(uintptr, int32)
127+var xClampSetTighteningThreshold func(uintptr, int)
128128
129129 // Sets the size above which the child is clamped.
130130 //
@@ -140,7 +140,7 @@ var xClampSetTighteningThreshold func(uintptr, int32)
140140 //
141141 // Effectively, tightening the grip on the child before it reaches its maximum
142142 // size makes transitions to and from the maximum size smoother when resizing.
143-func (x *Clamp) SetTighteningThreshold(TighteningThresholdVar int32) {
143+func (x *Clamp) SetTighteningThreshold(TighteningThresholdVar int) {
144144
145145 xClampSetTighteningThreshold(x.GoPointer(), TighteningThresholdVar)
146146
@@ -212,7 +212,7 @@ func (x *Clamp) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varArgs
212212 // property change must be communicated to assistive technologies.
213213 //
214214 // This function is meant to be used by language bindings.
215-func (x *Clamp) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
215+func (x *Clamp) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
216216
217217 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
218218
@@ -248,7 +248,7 @@ func (x *Clamp) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varArgs
248248 // relation change must be communicated to assistive technologies.
249249 //
250250 // This function is meant to be used by language bindings.
251-func (x *Clamp) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
251+func (x *Clamp) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
252252
253253 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
254254
@@ -281,7 +281,7 @@ func (x *Clamp) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...interf
281281 // state change must be communicated to assistive technologies.
282282 //
283283 // This function is meant to be used by language bindings.
284-func (x *Clamp) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
284+func (x *Clamp) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
285285
286286 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
287287
M v4/adw/adw-combo-row.go +3 -3
@@ -340,7 +340,7 @@ func (x *ComboRow) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varAr
340340 // property change must be communicated to assistive technologies.
341341 //
342342 // This function is meant to be used by language bindings.
343-func (x *ComboRow) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
343+func (x *ComboRow) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
344344
345345 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
346346
@@ -376,7 +376,7 @@ func (x *ComboRow) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varAr
376376 // relation change must be communicated to assistive technologies.
377377 //
378378 // This function is meant to be used by language bindings.
379-func (x *ComboRow) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
379+func (x *ComboRow) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
380380
381381 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
382382
@@ -409,7 +409,7 @@ func (x *ComboRow) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...int
409409 // state change must be communicated to assistive technologies.
410410 //
411411 // This function is meant to be used by language bindings.
412-func (x *ComboRow) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
412+func (x *ComboRow) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
413413
414414 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
415415
M v4/adw/adw-entry-row.go +14 -14
@@ -333,7 +333,7 @@ func (x *EntryRow) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varAr
333333 // property change must be communicated to assistive technologies.
334334 //
335335 // This function is meant to be used by language bindings.
336-func (x *EntryRow) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
336+func (x *EntryRow) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
337337
338338 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
339339
@@ -369,7 +369,7 @@ func (x *EntryRow) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varAr
369369 // relation change must be communicated to assistive technologies.
370370 //
371371 // This function is meant to be used by language bindings.
372-func (x *EntryRow) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
372+func (x *EntryRow) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
373373
374374 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
375375
@@ -402,7 +402,7 @@ func (x *EntryRow) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...int
402402 // state change must be communicated to assistive technologies.
403403 //
404404 // This function is meant to be used by language bindings.
405-func (x *EntryRow) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
405+func (x *EntryRow) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
406406
407407 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
408408
@@ -518,7 +518,7 @@ func (x *EntryRow) DeleteSelection() {
518518 // the end of the text.
519519 //
520520 // Note that the positions are specified in characters, not bytes.
521-func (x *EntryRow) DeleteText(StartPosVar int32, EndPosVar int32) {
521+func (x *EntryRow) DeleteText(StartPosVar int, EndPosVar int) {
522522
523523 gtk.XGtkEditableDeleteText(x.GoPointer(), StartPosVar, EndPosVar)
524524
@@ -549,7 +549,7 @@ func (x *EntryRow) GetAlignment() float32 {
549549 // the end of the text.
550550 //
551551 // Note that positions are specified in characters, not bytes.
552-func (x *EntryRow) GetChars(StartPosVar int32, EndPosVar int32) string {
552+func (x *EntryRow) GetChars(StartPosVar int, EndPosVar int) string {
553553
554554 return gtk.XGtkEditableGetChars(x.GoPointer(), StartPosVar, EndPosVar)
555555
@@ -589,7 +589,7 @@ func (x *EntryRow) GetEnableUndo() bool {
589589 }
590590
591591 // Retrieves the desired maximum width of @editable, in characters.
592-func (x *EntryRow) GetMaxWidthChars() int32 {
592+func (x *EntryRow) GetMaxWidthChars() int {
593593
594594 return gtk.XGtkEditableGetMaxWidthChars(x.GoPointer())
595595
@@ -599,7 +599,7 @@ func (x *EntryRow) GetMaxWidthChars() int32 {
599599 // to the start of the content of the editable.
600600 //
601601 // Note that this position is in characters, not in bytes.
602-func (x *EntryRow) GetPosition() int32 {
602+func (x *EntryRow) GetPosition() int {
603603
604604 return gtk.XGtkEditableGetPosition(x.GoPointer())
605605
@@ -612,7 +612,7 @@ func (x *EntryRow) GetPosition() int32 {
612612 // and %FALSE will be returned.
613613 //
614614 // Note that positions are specified in characters, not bytes.
615-func (x *EntryRow) GetSelectionBounds(StartPosVar int32, EndPosVar int32) bool {
615+func (x *EntryRow) GetSelectionBounds(StartPosVar int, EndPosVar int) bool {
616616
617617 return gtk.XGtkEditableGetSelectionBounds(x.GoPointer(), StartPosVar, EndPosVar)
618618
@@ -629,7 +629,7 @@ func (x *EntryRow) GetText() string {
629629
630630 // Gets the number of characters of space reserved
631631 // for the contents of the editable.
632-func (x *EntryRow) GetWidthChars() int32 {
632+func (x *EntryRow) GetWidthChars() int {
633633
634634 return gtk.XGtkEditableGetWidthChars(x.GoPointer())
635635
@@ -654,7 +654,7 @@ func (x *EntryRow) InitDelegate() {
654654 // Note that the position is in characters, not in bytes.
655655 // The function updates @position to point after the newly
656656 // inserted text.
657-func (x *EntryRow) InsertText(TextVar string, LengthVar int32, PositionVar int32) {
657+func (x *EntryRow) InsertText(TextVar string, LengthVar int, PositionVar int) {
658658
659659 gtk.XGtkEditableInsertText(x.GoPointer(), TextVar, LengthVar, PositionVar)
660660
@@ -668,7 +668,7 @@ func (x *EntryRow) InsertText(TextVar string, LengthVar int32, PositionVar int32
668668 // @start_pos to the end of the text.
669669 //
670670 // Note that positions are specified in characters, not bytes.
671-func (x *EntryRow) SelectRegion(StartPosVar int32, EndPosVar int32) {
671+func (x *EntryRow) SelectRegion(StartPosVar int, EndPosVar int) {
672672
673673 gtk.XGtkEditableSelectRegion(x.GoPointer(), StartPosVar, EndPosVar)
674674
@@ -704,7 +704,7 @@ func (x *EntryRow) SetEnableUndo(EnableUndoVar bool) {
704704 }
705705
706706 // Sets the desired maximum width in characters of @editable.
707-func (x *EntryRow) SetMaxWidthChars(NCharsVar int32) {
707+func (x *EntryRow) SetMaxWidthChars(NCharsVar int) {
708708
709709 gtk.XGtkEditableSetMaxWidthChars(x.GoPointer(), NCharsVar)
710710
@@ -717,7 +717,7 @@ func (x *EntryRow) SetMaxWidthChars(NCharsVar int32) {
717717 // or equal to the number of characters in the editable. A value of -1
718718 // indicates that the position should be set after the last character
719719 // of the editable. Note that @position is in characters, not in bytes.
720-func (x *EntryRow) SetPosition(PositionVar int32) {
720+func (x *EntryRow) SetPosition(PositionVar int) {
721721
722722 gtk.XGtkEditableSetPosition(x.GoPointer(), PositionVar)
723723
@@ -738,7 +738,7 @@ func (x *EntryRow) SetText(TextVar string) {
738738 // Note that it changes the size request, the size can still
739739 // be affected by how you pack the widget into containers.
740740 // If @n_chars is -1, the size reverts to the default size.
741-func (x *EntryRow) SetWidthChars(NCharsVar int32) {
741+func (x *EntryRow) SetWidthChars(NCharsVar int) {
742742
743743 gtk.XGtkEditableSetWidthChars(x.GoPointer(), NCharsVar)
744744
M v4/adw/adw-enum-list-model.go +4 -4
@@ -45,10 +45,10 @@ func (x *EnumListItem) GetNick() string {
4545
4646 }
4747
48-var xEnumListItemGetValue func(uintptr) int32
48+var xEnumListItemGetValue func(uintptr) int
4949
5050 // Gets the enum value.
51-func (x *EnumListItem) GetValue() int32 {
51+func (x *EnumListItem) GetValue() int {
5252
5353 return xEnumListItemGetValue(x.GoPointer())
5454
@@ -89,10 +89,10 @@ func NewEnumListModel(EnumTypeVar []interface{}) *EnumListModel {
8989 return NewEnumListModelCls
9090 }
9191
92-var xEnumListModelFindPosition func(uintptr, int32) uint
92+var xEnumListModelFindPosition func(uintptr, int) uint
9393
9494 // Finds the position of a given enum value in @self.
95-func (x *EnumListModel) FindPosition(ValueVar int32) uint {
95+func (x *EnumListModel) FindPosition(ValueVar int) uint {
9696
9797 return xEnumListModelFindPosition(x.GoPointer(), ValueVar)
9898
M v4/adw/adw-expander-row.go +7 -7
@@ -221,25 +221,25 @@ func (x *ExpanderRow) SetSubtitle(SubtitleVar string) {
221221
222222 }
223223
224-var xExpanderRowSetSubtitleLines func(uintptr, int32)
224+var xExpanderRowSetSubtitleLines func(uintptr, int)
225225
226226 // Sets the number of lines at the end of which the subtitle label will be
227227 // ellipsized.
228228 //
229229 // If the value is 0, the number of lines won't be limited.
230-func (x *ExpanderRow) SetSubtitleLines(SubtitleLinesVar int32) {
230+func (x *ExpanderRow) SetSubtitleLines(SubtitleLinesVar int) {
231231
232232 xExpanderRowSetSubtitleLines(x.GoPointer(), SubtitleLinesVar)
233233
234234 }
235235
236-var xExpanderRowSetTitleLines func(uintptr, int32)
236+var xExpanderRowSetTitleLines func(uintptr, int)
237237
238238 // Sets the number of lines at the end of which the title label will be
239239 // ellipsized.
240240 //
241241 // If the value is 0, the number of lines won't be limited.
242-func (x *ExpanderRow) SetTitleLines(TitleLinesVar int32) {
242+func (x *ExpanderRow) SetTitleLines(TitleLinesVar int) {
243243
244244 xExpanderRowSetTitleLines(x.GoPointer(), TitleLinesVar)
245245
@@ -311,7 +311,7 @@ func (x *ExpanderRow) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, va
311311 // property change must be communicated to assistive technologies.
312312 //
313313 // This function is meant to be used by language bindings.
314-func (x *ExpanderRow) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
314+func (x *ExpanderRow) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
315315
316316 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
317317
@@ -347,7 +347,7 @@ func (x *ExpanderRow) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, va
347347 // relation change must be communicated to assistive technologies.
348348 //
349349 // This function is meant to be used by language bindings.
350-func (x *ExpanderRow) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
350+func (x *ExpanderRow) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
351351
352352 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
353353
@@ -380,7 +380,7 @@ func (x *ExpanderRow) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...
380380 // state change must be communicated to assistive technologies.
381381 //
382382 // This function is meant to be used by language bindings.
383-func (x *ExpanderRow) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
383+func (x *ExpanderRow) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
384384
385385 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
386386
M v4/adw/adw-flap.go +4 -4
@@ -519,7 +519,7 @@ func (x *Flap) GetProgress() float64 {
519519 //
520520 // Each snap point represents a progress value that is considered acceptable to
521521 // end the swipe on.
522-func (x *Flap) GetSnapPoints(NSnapPointsVar int32) uintptr {
522+func (x *Flap) GetSnapPoints(NSnapPointsVar int) uintptr {
523523
524524 return XAdwSwipeableGetSnapPoints(x.GoPointer(), NSnapPointsVar)
525525
@@ -598,7 +598,7 @@ func (x *Flap) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varArgs .
598598 // property change must be communicated to assistive technologies.
599599 //
600600 // This function is meant to be used by language bindings.
601-func (x *Flap) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
601+func (x *Flap) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
602602
603603 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
604604
@@ -634,7 +634,7 @@ func (x *Flap) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varArgs .
634634 // relation change must be communicated to assistive technologies.
635635 //
636636 // This function is meant to be used by language bindings.
637-func (x *Flap) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
637+func (x *Flap) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
638638
639639 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
640640
@@ -667,7 +667,7 @@ func (x *Flap) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...interfa
667667 // state change must be communicated to assistive technologies.
668668 //
669669 // This function is meant to be used by language bindings.
670-func (x *Flap) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
670+func (x *Flap) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
671671
672672 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
673673
M v4/adw/adw-header-bar.go +3 -3
@@ -376,7 +376,7 @@ func (x *HeaderBar) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varA
376376 // property change must be communicated to assistive technologies.
377377 //
378378 // This function is meant to be used by language bindings.
379-func (x *HeaderBar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
379+func (x *HeaderBar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
380380
381381 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
382382
@@ -412,7 +412,7 @@ func (x *HeaderBar) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varA
412412 // relation change must be communicated to assistive technologies.
413413 //
414414 // This function is meant to be used by language bindings.
415-func (x *HeaderBar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
415+func (x *HeaderBar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
416416
417417 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
418418
@@ -445,7 +445,7 @@ func (x *HeaderBar) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...in
445445 // state change must be communicated to assistive technologies.
446446 //
447447 // This function is meant to be used by language bindings.
448-func (x *HeaderBar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
448+func (x *HeaderBar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
449449
450450 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
451451
M v4/adw/adw-leaflet.go +4 -4
@@ -574,7 +574,7 @@ func (x *Leaflet) GetProgress() float64 {
574574 //
575575 // Each snap point represents a progress value that is considered acceptable to
576576 // end the swipe on.
577-func (x *Leaflet) GetSnapPoints(NSnapPointsVar int32) uintptr {
577+func (x *Leaflet) GetSnapPoints(NSnapPointsVar int) uintptr {
578578
579579 return XAdwSwipeableGetSnapPoints(x.GoPointer(), NSnapPointsVar)
580580
@@ -653,7 +653,7 @@ func (x *Leaflet) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varArg
653653 // property change must be communicated to assistive technologies.
654654 //
655655 // This function is meant to be used by language bindings.
656-func (x *Leaflet) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
656+func (x *Leaflet) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
657657
658658 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
659659
@@ -689,7 +689,7 @@ func (x *Leaflet) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varArg
689689 // relation change must be communicated to assistive technologies.
690690 //
691691 // This function is meant to be used by language bindings.
692-func (x *Leaflet) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
692+func (x *Leaflet) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
693693
694694 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
695695
@@ -722,7 +722,7 @@ func (x *Leaflet) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...inte
722722 // state change must be communicated to assistive technologies.
723723 //
724724 // This function is meant to be used by language bindings.
725-func (x *Leaflet) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
725+func (x *Leaflet) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
726726
727727 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
728728
M v4/adw/adw-message-dialog.go +3 -3
@@ -690,7 +690,7 @@ func (x *MessageDialog) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty,
690690 // property change must be communicated to assistive technologies.
691691 //
692692 // This function is meant to be used by language bindings.
693-func (x *MessageDialog) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
693+func (x *MessageDialog) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
694694
695695 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
696696
@@ -726,7 +726,7 @@ func (x *MessageDialog) UpdateRelation(FirstRelationVar gtk.AccessibleRelation,
726726 // relation change must be communicated to assistive technologies.
727727 //
728728 // This function is meant to be used by language bindings.
729-func (x *MessageDialog) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
729+func (x *MessageDialog) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
730730
731731 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
732732
@@ -759,7 +759,7 @@ func (x *MessageDialog) UpdateState(FirstStateVar gtk.AccessibleState, varArgs .
759759 // state change must be communicated to assistive technologies.
760760 //
761761 // This function is meant to be used by language bindings.
762-func (x *MessageDialog) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
762+func (x *MessageDialog) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
763763
764764 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
765765
M v4/adw/adw-password-entry-row.go +14 -14
@@ -126,7 +126,7 @@ func (x *PasswordEntryRow) UpdateProperty(FirstPropertyVar gtk.AccessiblePropert
126126 // property change must be communicated to assistive technologies.
127127 //
128128 // This function is meant to be used by language bindings.
129-func (x *PasswordEntryRow) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
129+func (x *PasswordEntryRow) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
130130
131131 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
132132
@@ -162,7 +162,7 @@ func (x *PasswordEntryRow) UpdateRelation(FirstRelationVar gtk.AccessibleRelatio
162162 // relation change must be communicated to assistive technologies.
163163 //
164164 // This function is meant to be used by language bindings.
165-func (x *PasswordEntryRow) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
165+func (x *PasswordEntryRow) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
166166
167167 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
168168
@@ -195,7 +195,7 @@ func (x *PasswordEntryRow) UpdateState(FirstStateVar gtk.AccessibleState, varArg
195195 // state change must be communicated to assistive technologies.
196196 //
197197 // This function is meant to be used by language bindings.
198-func (x *PasswordEntryRow) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
198+func (x *PasswordEntryRow) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
199199
200200 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
201201
@@ -311,7 +311,7 @@ func (x *PasswordEntryRow) DeleteSelection() {
311311 // the end of the text.
312312 //
313313 // Note that the positions are specified in characters, not bytes.
314-func (x *PasswordEntryRow) DeleteText(StartPosVar int32, EndPosVar int32) {
314+func (x *PasswordEntryRow) DeleteText(StartPosVar int, EndPosVar int) {
315315
316316 gtk.XGtkEditableDeleteText(x.GoPointer(), StartPosVar, EndPosVar)
317317
@@ -342,7 +342,7 @@ func (x *PasswordEntryRow) GetAlignment() float32 {
342342 // the end of the text.
343343 //
344344 // Note that positions are specified in characters, not bytes.
345-func (x *PasswordEntryRow) GetChars(StartPosVar int32, EndPosVar int32) string {
345+func (x *PasswordEntryRow) GetChars(StartPosVar int, EndPosVar int) string {
346346
347347 return gtk.XGtkEditableGetChars(x.GoPointer(), StartPosVar, EndPosVar)
348348
@@ -382,7 +382,7 @@ func (x *PasswordEntryRow) GetEnableUndo() bool {
382382 }
383383
384384 // Retrieves the desired maximum width of @editable, in characters.
385-func (x *PasswordEntryRow) GetMaxWidthChars() int32 {
385+func (x *PasswordEntryRow) GetMaxWidthChars() int {
386386
387387 return gtk.XGtkEditableGetMaxWidthChars(x.GoPointer())
388388
@@ -392,7 +392,7 @@ func (x *PasswordEntryRow) GetMaxWidthChars() int32 {
392392 // to the start of the content of the editable.
393393 //
394394 // Note that this position is in characters, not in bytes.
395-func (x *PasswordEntryRow) GetPosition() int32 {
395+func (x *PasswordEntryRow) GetPosition() int {
396396
397397 return gtk.XGtkEditableGetPosition(x.GoPointer())
398398
@@ -405,7 +405,7 @@ func (x *PasswordEntryRow) GetPosition() int32 {
405405 // and %FALSE will be returned.
406406 //
407407 // Note that positions are specified in characters, not bytes.
408-func (x *PasswordEntryRow) GetSelectionBounds(StartPosVar int32, EndPosVar int32) bool {
408+func (x *PasswordEntryRow) GetSelectionBounds(StartPosVar int, EndPosVar int) bool {
409409
410410 return gtk.XGtkEditableGetSelectionBounds(x.GoPointer(), StartPosVar, EndPosVar)
411411
@@ -422,7 +422,7 @@ func (x *PasswordEntryRow) GetText() string {
422422
423423 // Gets the number of characters of space reserved
424424 // for the contents of the editable.
425-func (x *PasswordEntryRow) GetWidthChars() int32 {
425+func (x *PasswordEntryRow) GetWidthChars() int {
426426
427427 return gtk.XGtkEditableGetWidthChars(x.GoPointer())
428428
@@ -447,7 +447,7 @@ func (x *PasswordEntryRow) InitDelegate() {
447447 // Note that the position is in characters, not in bytes.
448448 // The function updates @position to point after the newly
449449 // inserted text.
450-func (x *PasswordEntryRow) InsertText(TextVar string, LengthVar int32, PositionVar int32) {
450+func (x *PasswordEntryRow) InsertText(TextVar string, LengthVar int, PositionVar int) {
451451
452452 gtk.XGtkEditableInsertText(x.GoPointer(), TextVar, LengthVar, PositionVar)
453453
@@ -461,7 +461,7 @@ func (x *PasswordEntryRow) InsertText(TextVar string, LengthVar int32, PositionV
461461 // @start_pos to the end of the text.
462462 //
463463 // Note that positions are specified in characters, not bytes.
464-func (x *PasswordEntryRow) SelectRegion(StartPosVar int32, EndPosVar int32) {
464+func (x *PasswordEntryRow) SelectRegion(StartPosVar int, EndPosVar int) {
465465
466466 gtk.XGtkEditableSelectRegion(x.GoPointer(), StartPosVar, EndPosVar)
467467
@@ -497,7 +497,7 @@ func (x *PasswordEntryRow) SetEnableUndo(EnableUndoVar bool) {
497497 }
498498
499499 // Sets the desired maximum width in characters of @editable.
500-func (x *PasswordEntryRow) SetMaxWidthChars(NCharsVar int32) {
500+func (x *PasswordEntryRow) SetMaxWidthChars(NCharsVar int) {
501501
502502 gtk.XGtkEditableSetMaxWidthChars(x.GoPointer(), NCharsVar)
503503
@@ -510,7 +510,7 @@ func (x *PasswordEntryRow) SetMaxWidthChars(NCharsVar int32) {
510510 // or equal to the number of characters in the editable. A value of -1
511511 // indicates that the position should be set after the last character
512512 // of the editable. Note that @position is in characters, not in bytes.
513-func (x *PasswordEntryRow) SetPosition(PositionVar int32) {
513+func (x *PasswordEntryRow) SetPosition(PositionVar int) {
514514
515515 gtk.XGtkEditableSetPosition(x.GoPointer(), PositionVar)
516516
@@ -531,7 +531,7 @@ func (x *PasswordEntryRow) SetText(TextVar string) {
531531 // Note that it changes the size request, the size can still
532532 // be affected by how you pack the widget into containers.
533533 // If @n_chars is -1, the size reverts to the default size.
534-func (x *PasswordEntryRow) SetWidthChars(NCharsVar int32) {
534+func (x *PasswordEntryRow) SetWidthChars(NCharsVar int) {
535535
536536 gtk.XGtkEditableSetWidthChars(x.GoPointer(), NCharsVar)
537537
M v4/adw/adw-preferences-group.go +3 -3
@@ -224,7 +224,7 @@ func (x *PreferencesGroup) UpdateProperty(FirstPropertyVar gtk.AccessiblePropert
224224 // property change must be communicated to assistive technologies.
225225 //
226226 // This function is meant to be used by language bindings.
227-func (x *PreferencesGroup) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
227+func (x *PreferencesGroup) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
228228
229229 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
230230
@@ -260,7 +260,7 @@ func (x *PreferencesGroup) UpdateRelation(FirstRelationVar gtk.AccessibleRelatio
260260 // relation change must be communicated to assistive technologies.
261261 //
262262 // This function is meant to be used by language bindings.
263-func (x *PreferencesGroup) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
263+func (x *PreferencesGroup) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
264264
265265 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
266266
@@ -293,7 +293,7 @@ func (x *PreferencesGroup) UpdateState(FirstStateVar gtk.AccessibleState, varArg
293293 // state change must be communicated to assistive technologies.
294294 //
295295 // This function is meant to be used by language bindings.
296-func (x *PreferencesGroup) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
296+func (x *PreferencesGroup) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
297297
298298 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
299299
M v4/adw/adw-preferences-page.go +3 -3
@@ -224,7 +224,7 @@ func (x *PreferencesPage) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty
224224 // property change must be communicated to assistive technologies.
225225 //
226226 // This function is meant to be used by language bindings.
227-func (x *PreferencesPage) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
227+func (x *PreferencesPage) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
228228
229229 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
230230
@@ -260,7 +260,7 @@ func (x *PreferencesPage) UpdateRelation(FirstRelationVar gtk.AccessibleRelation
260260 // relation change must be communicated to assistive technologies.
261261 //
262262 // This function is meant to be used by language bindings.
263-func (x *PreferencesPage) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
263+func (x *PreferencesPage) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
264264
265265 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
266266
@@ -293,7 +293,7 @@ func (x *PreferencesPage) UpdateState(FirstStateVar gtk.AccessibleState, varArgs
293293 // state change must be communicated to assistive technologies.
294294 //
295295 // This function is meant to be used by language bindings.
296-func (x *PreferencesPage) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
296+func (x *PreferencesPage) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
297297
298298 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
299299
M v4/adw/adw-preferences-row.go +3 -3
@@ -197,7 +197,7 @@ func (x *PreferencesRow) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty,
197197 // property change must be communicated to assistive technologies.
198198 //
199199 // This function is meant to be used by language bindings.
200-func (x *PreferencesRow) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
200+func (x *PreferencesRow) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
201201
202202 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
203203
@@ -233,7 +233,7 @@ func (x *PreferencesRow) UpdateRelation(FirstRelationVar gtk.AccessibleRelation,
233233 // relation change must be communicated to assistive technologies.
234234 //
235235 // This function is meant to be used by language bindings.
236-func (x *PreferencesRow) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
236+func (x *PreferencesRow) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
237237
238238 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
239239
@@ -266,7 +266,7 @@ func (x *PreferencesRow) UpdateState(FirstStateVar gtk.AccessibleState, varArgs
266266 // state change must be communicated to assistive technologies.
267267 //
268268 // This function is meant to be used by language bindings.
269-func (x *PreferencesRow) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
269+func (x *PreferencesRow) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
270270
271271 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
272272
M v4/adw/adw-preferences-window.go +3 -3
@@ -270,7 +270,7 @@ func (x *PreferencesWindow) UpdateProperty(FirstPropertyVar gtk.AccessibleProper
270270 // property change must be communicated to assistive technologies.
271271 //
272272 // This function is meant to be used by language bindings.
273-func (x *PreferencesWindow) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
273+func (x *PreferencesWindow) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
274274
275275 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
276276
@@ -306,7 +306,7 @@ func (x *PreferencesWindow) UpdateRelation(FirstRelationVar gtk.AccessibleRelati
306306 // relation change must be communicated to assistive technologies.
307307 //
308308 // This function is meant to be used by language bindings.
309-func (x *PreferencesWindow) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
309+func (x *PreferencesWindow) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
310310
311311 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
312312
@@ -339,7 +339,7 @@ func (x *PreferencesWindow) UpdateState(FirstStateVar gtk.AccessibleState, varAr
339339 // state change must be communicated to assistive technologies.
340340 //
341341 // This function is meant to be used by language bindings.
342-func (x *PreferencesWindow) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
342+func (x *PreferencesWindow) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
343343
344344 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
345345
M v4/adw/adw-split-button.go +3 -3
@@ -396,7 +396,7 @@ func (x *SplitButton) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, va
396396 // property change must be communicated to assistive technologies.
397397 //
398398 // This function is meant to be used by language bindings.
399-func (x *SplitButton) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
399+func (x *SplitButton) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
400400
401401 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
402402
@@ -432,7 +432,7 @@ func (x *SplitButton) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, va
432432 // relation change must be communicated to assistive technologies.
433433 //
434434 // This function is meant to be used by language bindings.
435-func (x *SplitButton) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
435+func (x *SplitButton) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
436436
437437 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
438438
@@ -465,7 +465,7 @@ func (x *SplitButton) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...
465465 // state change must be communicated to assistive technologies.
466466 //
467467 // This function is meant to be used by language bindings.
468-func (x *SplitButton) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
468+func (x *SplitButton) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
469469
470470 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
471471
M v4/adw/adw-squeezer.go +3 -3
@@ -418,7 +418,7 @@ func (x *Squeezer) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varAr
418418 // property change must be communicated to assistive technologies.
419419 //
420420 // This function is meant to be used by language bindings.
421-func (x *Squeezer) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
421+func (x *Squeezer) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
422422
423423 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
424424
@@ -454,7 +454,7 @@ func (x *Squeezer) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varAr
454454 // relation change must be communicated to assistive technologies.
455455 //
456456 // This function is meant to be used by language bindings.
457-func (x *Squeezer) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
457+func (x *Squeezer) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
458458
459459 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
460460
@@ -487,7 +487,7 @@ func (x *Squeezer) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...int
487487 // state change must be communicated to assistive technologies.
488488 //
489489 // This function is meant to be used by language bindings.
490-func (x *Squeezer) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
490+func (x *Squeezer) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
491491
492492 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
493493
M v4/adw/adw-status-page.go +3 -3
@@ -240,7 +240,7 @@ func (x *StatusPage) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, var
240240 // property change must be communicated to assistive technologies.
241241 //
242242 // This function is meant to be used by language bindings.
243-func (x *StatusPage) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
243+func (x *StatusPage) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
244244
245245 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
246246
@@ -276,7 +276,7 @@ func (x *StatusPage) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, var
276276 // relation change must be communicated to assistive technologies.
277277 //
278278 // This function is meant to be used by language bindings.
279-func (x *StatusPage) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
279+func (x *StatusPage) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
280280
281281 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
282282
@@ -309,7 +309,7 @@ func (x *StatusPage) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...i
309309 // state change must be communicated to assistive technologies.
310310 //
311311 // This function is meant to be used by language bindings.
312-func (x *StatusPage) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
312+func (x *StatusPage) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
313313
314314 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
315315
M v4/adw/adw-swipeable.go +3 -3
@@ -25,7 +25,7 @@ type Swipeable interface {
2525 GetCancelProgress() float64
2626 GetDistance() float64
2727 GetProgress() float64
28- GetSnapPoints(NSnapPointsVar int32) uintptr
28+ GetSnapPoints(NSnapPointsVar int) uintptr
2929 GetSwipeArea(NavigationDirectionVar NavigationDirection, IsDragVar bool, RectVar *gdk.Rectangle)
3030 }
3131 type SwipeableBase struct {
@@ -67,7 +67,7 @@ func (x *SwipeableBase) GetProgress() float64 {
6767 //
6868 // Each snap point represents a progress value that is considered acceptable to
6969 // end the swipe on.
70-func (x *SwipeableBase) GetSnapPoints(NSnapPointsVar int32) uintptr {
70+func (x *SwipeableBase) GetSnapPoints(NSnapPointsVar int) uintptr {
7171
7272 return XAdwSwipeableGetSnapPoints(x.GoPointer(), NSnapPointsVar)
7373
@@ -91,7 +91,7 @@ func (x *SwipeableBase) GetSwipeArea(NavigationDirectionVar NavigationDirection,
9191 var XAdwSwipeableGetCancelProgress func(uintptr) float64
9292 var XAdwSwipeableGetDistance func(uintptr) float64
9393 var XAdwSwipeableGetProgress func(uintptr) float64
94-var XAdwSwipeableGetSnapPoints func(uintptr, int32) uintptr
94+var XAdwSwipeableGetSnapPoints func(uintptr, int) uintptr
9595 var XAdwSwipeableGetSwipeArea func(uintptr, NavigationDirection, bool, *gdk.Rectangle)
9696
9797 func init() {
M v4/adw/adw-tab-bar.go +3 -3
@@ -371,7 +371,7 @@ func (x *TabBar) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varArgs
371371 // property change must be communicated to assistive technologies.
372372 //
373373 // This function is meant to be used by language bindings.
374-func (x *TabBar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
374+func (x *TabBar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
375375
376376 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
377377
@@ -407,7 +407,7 @@ func (x *TabBar) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varArgs
407407 // relation change must be communicated to assistive technologies.
408408 //
409409 // This function is meant to be used by language bindings.
410-func (x *TabBar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
410+func (x *TabBar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
411411
412412 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
413413
@@ -440,7 +440,7 @@ func (x *TabBar) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...inter
440440 // state change must be communicated to assistive technologies.
441441 //
442442 // This function is meant to be used by language bindings.
443-func (x *TabBar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
443+func (x *TabBar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
444444
445445 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
446446
M v4/adw/adw-tab-button.go +3 -3
@@ -191,7 +191,7 @@ func (x *TabButton) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varA
191191 // property change must be communicated to assistive technologies.
192192 //
193193 // This function is meant to be used by language bindings.
194-func (x *TabButton) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
194+func (x *TabButton) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
195195
196196 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
197197
@@ -227,7 +227,7 @@ func (x *TabButton) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varA
227227 // relation change must be communicated to assistive technologies.
228228 //
229229 // This function is meant to be used by language bindings.
230-func (x *TabButton) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
230+func (x *TabButton) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
231231
232232 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
233233
@@ -260,7 +260,7 @@ func (x *TabButton) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...in
260260 // state change must be communicated to assistive technologies.
261261 //
262262 // This function is meant to be used by language bindings.
263-func (x *TabButton) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
263+func (x *TabButton) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
264264
265265 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
266266
M v4/adw/adw-tab-overview.go +3 -3
@@ -482,7 +482,7 @@ func (x *TabOverview) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, va
482482 // property change must be communicated to assistive technologies.
483483 //
484484 // This function is meant to be used by language bindings.
485-func (x *TabOverview) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
485+func (x *TabOverview) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
486486
487487 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
488488
@@ -518,7 +518,7 @@ func (x *TabOverview) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, va
518518 // relation change must be communicated to assistive technologies.
519519 //
520520 // This function is meant to be used by language bindings.
521-func (x *TabOverview) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
521+func (x *TabOverview) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
522522
523523 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
524524
@@ -551,7 +551,7 @@ func (x *TabOverview) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...
551551 // state change must be communicated to assistive technologies.
552552 //
553553 // This function is meant to be used by language bindings.
554-func (x *TabOverview) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
554+func (x *TabOverview) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
555555
556556 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
557557
M v4/adw/adw-tab-view.go +28 -28
@@ -538,7 +538,7 @@ func (x *TabPage) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varArg
538538 // property change must be communicated to assistive technologies.
539539 //
540540 // This function is meant to be used by language bindings.
541-func (x *TabPage) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
541+func (x *TabPage) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
542542
543543 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
544544
@@ -574,7 +574,7 @@ func (x *TabPage) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varArg
574574 // relation change must be communicated to assistive technologies.
575575 //
576576 // This function is meant to be used by language bindings.
577-func (x *TabPage) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
577+func (x *TabPage) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
578578
579579 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
580580
@@ -607,7 +607,7 @@ func (x *TabPage) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...inte
607607 // state change must be communicated to assistive technologies.
608608 //
609609 // This function is meant to be used by language bindings.
610-func (x *TabPage) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
610+func (x *TabPage) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
611611
612612 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
613613
@@ -877,30 +877,30 @@ func (x *TabView) GetMenuModel() *gio.MenuModel {
877877
878878 }
879879
880-var xTabViewGetNPages func(uintptr) int32
880+var xTabViewGetNPages func(uintptr) int
881881
882882 // Gets the number of pages in @self.
883-func (x *TabView) GetNPages() int32 {
883+func (x *TabView) GetNPages() int {
884884
885885 return xTabViewGetNPages(x.GoPointer())
886886
887887 }
888888
889-var xTabViewGetNPinnedPages func(uintptr) int32
889+var xTabViewGetNPinnedPages func(uintptr) int
890890
891891 // Gets the number of pinned pages in @self.
892892 //
893893 // See [method@TabView.set_page_pinned].
894-func (x *TabView) GetNPinnedPages() int32 {
894+func (x *TabView) GetNPinnedPages() int {
895895
896896 return xTabViewGetNPinnedPages(x.GoPointer())
897897
898898 }
899899
900-var xTabViewGetNthPage func(uintptr, int32) uintptr
900+var xTabViewGetNthPage func(uintptr, int) uintptr
901901
902902 // Gets the [class@TabPage] representing the child at @position.
903-func (x *TabView) GetNthPage(PositionVar int32) *TabPage {
903+func (x *TabView) GetNthPage(PositionVar int) *TabPage {
904904
905905 GetNthPagePtr := xTabViewGetNthPage(x.GoPointer(), PositionVar)
906906 if GetNthPagePtr == 0 {
@@ -933,10 +933,10 @@ func (x *TabView) GetPage(ChildVar *gtk.Widget) *TabPage {
933933
934934 }
935935
936-var xTabViewGetPagePosition func(uintptr, uintptr) int32
936+var xTabViewGetPagePosition func(uintptr, uintptr) int
937937
938938 // Finds the position of @page in @self, starting from 0.
939-func (x *TabView) GetPagePosition(PageVar *TabPage) int32 {
939+func (x *TabView) GetPagePosition(PageVar *TabPage) int {
940940
941941 return xTabViewGetPagePosition(x.GoPointer(), PageVar.GoPointer())
942942
@@ -989,13 +989,13 @@ func (x *TabView) GetShortcuts() TabViewShortcuts {
989989
990990 }
991991
992-var xTabViewInsert func(uintptr, uintptr, int32) uintptr
992+var xTabViewInsert func(uintptr, uintptr, int) uintptr
993993
994994 // Inserts a non-pinned page at @position.
995995 //
996996 // It's an error to try to insert a page before a pinned page, in that case
997997 // [method@TabView.insert_pinned] should be used instead.
998-func (x *TabView) Insert(ChildVar *gtk.Widget, PositionVar int32) *TabPage {
998+func (x *TabView) Insert(ChildVar *gtk.Widget, PositionVar int) *TabPage {
999999
10001000 InsertPtr := xTabViewInsert(x.GoPointer(), ChildVar.GoPointer(), PositionVar)
10011001 if InsertPtr == 0 {
@@ -1010,13 +1010,13 @@ func (x *TabView) Insert(ChildVar *gtk.Widget, PositionVar int32) *TabPage {
10101010
10111011 }
10121012
1013-var xTabViewInsertPinned func(uintptr, uintptr, int32) uintptr
1013+var xTabViewInsertPinned func(uintptr, uintptr, int) uintptr
10141014
10151015 // Inserts a pinned page at @position.
10161016 //
10171017 // It's an error to try to insert a pinned page after a non-pinned page, in
10181018 // that case [method@TabView.insert] should be used instead.
1019-func (x *TabView) InsertPinned(ChildVar *gtk.Widget, PositionVar int32) *TabPage {
1019+func (x *TabView) InsertPinned(ChildVar *gtk.Widget, PositionVar int) *TabPage {
10201020
10211021 InsertPinnedPtr := xTabViewInsertPinned(x.GoPointer(), ChildVar.GoPointer(), PositionVar)
10221022 if InsertPinnedPtr == 0 {
@@ -1126,13 +1126,13 @@ func (x *TabView) ReorderLast(PageVar *TabPage) bool {
11261126
11271127 }
11281128
1129-var xTabViewReorderPage func(uintptr, uintptr, int32) bool
1129+var xTabViewReorderPage func(uintptr, uintptr, int) bool
11301130
11311131 // Reorders @page to @position.
11321132 //
11331133 // It's a programmer error to try to reorder a pinned page after a non-pinned
11341134 // one, or a non-pinned page before a pinned one.
1135-func (x *TabView) ReorderPage(PageVar *TabPage, PositionVar int32) bool {
1135+func (x *TabView) ReorderPage(PageVar *TabPage, PositionVar int) bool {
11361136
11371137 return xTabViewReorderPage(x.GoPointer(), PageVar.GoPointer(), PositionVar)
11381138
@@ -1254,7 +1254,7 @@ func (x *TabView) SetShortcuts(ShortcutsVar TabViewShortcuts) {
12541254
12551255 }
12561256
1257-var xTabViewTransferPage func(uintptr, uintptr, uintptr, int32)
1257+var xTabViewTransferPage func(uintptr, uintptr, uintptr, int)
12581258
12591259 // Transfers @page from @self to @other_view.
12601260 //
@@ -1262,7 +1262,7 @@ var xTabViewTransferPage func(uintptr, uintptr, uintptr, int32)
12621262 //
12631263 // It's a programmer error to try to insert a pinned page after a non-pinned
12641264 // one, or a non-pinned page before a pinned one.
1265-func (x *TabView) TransferPage(PageVar *TabPage, OtherViewVar *TabView, PositionVar int32) {
1265+func (x *TabView) TransferPage(PageVar *TabPage, OtherViewVar *TabView, PositionVar int) {
12661266
12671267 xTabViewTransferPage(x.GoPointer(), PageVar.GoPointer(), OtherViewVar.GoPointer(), PositionVar)
12681268
@@ -1353,8 +1353,8 @@ func (x *TabView) ConnectIndicatorActivated(cb func(TabView, uintptr)) {
13531353 //
13541354 // A typical reason to connect to this signal would be to connect to page
13551355 // signals for things such as updating window title.
1356-func (x *TabView) ConnectPageAttached(cb func(TabView, uintptr, int32)) {
1357- fcb := func(clsPtr uintptr, PageVarp uintptr, PositionVarp int32) {
1356+func (x *TabView) ConnectPageAttached(cb func(TabView, uintptr, int)) {
1357+ fcb := func(clsPtr uintptr, PageVarp uintptr, PositionVarp int) {
13581358 fa := TabView{}
13591359 fa.Ptr = clsPtr
13601360
@@ -1373,8 +1373,8 @@ func (x *TabView) ConnectPageAttached(cb func(TabView, uintptr, int32)) {
13731373 // this function as the child might merely be moved to another window; use
13741374 // child dispose handler for that or do it in sync with your
13751375 // [method@TabView.close_page_finish] calls.
1376-func (x *TabView) ConnectPageDetached(cb func(TabView, uintptr, int32)) {
1377- fcb := func(clsPtr uintptr, PageVarp uintptr, PositionVarp int32) {
1376+func (x *TabView) ConnectPageDetached(cb func(TabView, uintptr, int)) {
1377+ fcb := func(clsPtr uintptr, PageVarp uintptr, PositionVarp int) {
13781378 fa := TabView{}
13791379 fa.Ptr = clsPtr
13801380
@@ -1385,8 +1385,8 @@ func (x *TabView) ConnectPageDetached(cb func(TabView, uintptr, int32)) {
13851385 }
13861386
13871387 // Emitted after @page has been reordered to @position.
1388-func (x *TabView) ConnectPageReordered(cb func(TabView, uintptr, int32)) {
1389- fcb := func(clsPtr uintptr, PageVarp uintptr, PositionVarp int32) {
1388+func (x *TabView) ConnectPageReordered(cb func(TabView, uintptr, int)) {
1389+ fcb := func(clsPtr uintptr, PageVarp uintptr, PositionVarp int) {
13901390 fa := TabView{}
13911391 fa.Ptr = clsPtr
13921392
@@ -1471,7 +1471,7 @@ func (x *TabView) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varArg
14711471 // property change must be communicated to assistive technologies.
14721472 //
14731473 // This function is meant to be used by language bindings.
1474-func (x *TabView) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
1474+func (x *TabView) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
14751475
14761476 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
14771477
@@ -1507,7 +1507,7 @@ func (x *TabView) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varArg
15071507 // relation change must be communicated to assistive technologies.
15081508 //
15091509 // This function is meant to be used by language bindings.
1510-func (x *TabView) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
1510+func (x *TabView) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
15111511
15121512 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
15131513
@@ -1540,7 +1540,7 @@ func (x *TabView) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...inte
15401540 // state change must be communicated to assistive technologies.
15411541 //
15421542 // This function is meant to be used by language bindings.
1543-func (x *TabView) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
1543+func (x *TabView) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
15441544
15451545 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
15461546
M v4/adw/adw-toast-overlay.go +3 -3
@@ -192,7 +192,7 @@ func (x *ToastOverlay) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, v
192192 // property change must be communicated to assistive technologies.
193193 //
194194 // This function is meant to be used by language bindings.
195-func (x *ToastOverlay) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
195+func (x *ToastOverlay) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
196196
197197 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
198198
@@ -228,7 +228,7 @@ func (x *ToastOverlay) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, v
228228 // relation change must be communicated to assistive technologies.
229229 //
230230 // This function is meant to be used by language bindings.
231-func (x *ToastOverlay) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
231+func (x *ToastOverlay) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
232232
233233 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
234234
@@ -261,7 +261,7 @@ func (x *ToastOverlay) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ..
261261 // state change must be communicated to assistive technologies.
262262 //
263263 // This function is meant to be used by language bindings.
264-func (x *ToastOverlay) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
264+func (x *ToastOverlay) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
265265
266266 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
267267
M v4/adw/adw-view-stack.go +6 -6
@@ -404,7 +404,7 @@ func (x *ViewStack) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varA
404404 // property change must be communicated to assistive technologies.
405405 //
406406 // This function is meant to be used by language bindings.
407-func (x *ViewStack) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
407+func (x *ViewStack) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
408408
409409 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
410410
@@ -440,7 +440,7 @@ func (x *ViewStack) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varA
440440 // relation change must be communicated to assistive technologies.
441441 //
442442 // This function is meant to be used by language bindings.
443-func (x *ViewStack) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
443+func (x *ViewStack) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
444444
445445 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
446446
@@ -473,7 +473,7 @@ func (x *ViewStack) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...in
473473 // state change must be communicated to assistive technologies.
474474 //
475475 // This function is meant to be used by language bindings.
476-func (x *ViewStack) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
476+func (x *ViewStack) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
477477
478478 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
479479
@@ -723,7 +723,7 @@ func (x *ViewStackPage) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty,
723723 // property change must be communicated to assistive technologies.
724724 //
725725 // This function is meant to be used by language bindings.
726-func (x *ViewStackPage) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
726+func (x *ViewStackPage) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
727727
728728 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
729729
@@ -759,7 +759,7 @@ func (x *ViewStackPage) UpdateRelation(FirstRelationVar gtk.AccessibleRelation,
759759 // relation change must be communicated to assistive technologies.
760760 //
761761 // This function is meant to be used by language bindings.
762-func (x *ViewStackPage) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
762+func (x *ViewStackPage) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
763763
764764 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
765765
@@ -792,7 +792,7 @@ func (x *ViewStackPage) UpdateState(FirstStateVar gtk.AccessibleState, varArgs .
792792 // state change must be communicated to assistive technologies.
793793 //
794794 // This function is meant to be used by language bindings.
795-func (x *ViewStackPage) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
795+func (x *ViewStackPage) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
796796
797797 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
798798
M v4/adw/adw-view-switcher-bar.go +3 -3
@@ -207,7 +207,7 @@ func (x *ViewSwitcherBar) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty
207207 // property change must be communicated to assistive technologies.
208208 //
209209 // This function is meant to be used by language bindings.
210-func (x *ViewSwitcherBar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
210+func (x *ViewSwitcherBar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
211211
212212 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
213213
@@ -243,7 +243,7 @@ func (x *ViewSwitcherBar) UpdateRelation(FirstRelationVar gtk.AccessibleRelation
243243 // relation change must be communicated to assistive technologies.
244244 //
245245 // This function is meant to be used by language bindings.
246-func (x *ViewSwitcherBar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
246+func (x *ViewSwitcherBar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
247247
248248 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
249249
@@ -276,7 +276,7 @@ func (x *ViewSwitcherBar) UpdateState(FirstStateVar gtk.AccessibleState, varArgs
276276 // state change must be communicated to assistive technologies.
277277 //
278278 // This function is meant to be used by language bindings.
279-func (x *ViewSwitcherBar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
279+func (x *ViewSwitcherBar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
280280
281281 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
282282
M v4/adw/adw-view-switcher-title.go +3 -3
@@ -273,7 +273,7 @@ func (x *ViewSwitcherTitle) UpdateProperty(FirstPropertyVar gtk.AccessibleProper
273273 // property change must be communicated to assistive technologies.
274274 //
275275 // This function is meant to be used by language bindings.
276-func (x *ViewSwitcherTitle) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
276+func (x *ViewSwitcherTitle) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
277277
278278 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
279279
@@ -309,7 +309,7 @@ func (x *ViewSwitcherTitle) UpdateRelation(FirstRelationVar gtk.AccessibleRelati
309309 // relation change must be communicated to assistive technologies.
310310 //
311311 // This function is meant to be used by language bindings.
312-func (x *ViewSwitcherTitle) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
312+func (x *ViewSwitcherTitle) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
313313
314314 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
315315
@@ -342,7 +342,7 @@ func (x *ViewSwitcherTitle) UpdateState(FirstStateVar gtk.AccessibleState, varAr
342342 // state change must be communicated to assistive technologies.
343343 //
344344 // This function is meant to be used by language bindings.
345-func (x *ViewSwitcherTitle) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
345+func (x *ViewSwitcherTitle) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
346346
347347 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
348348
M v4/adw/adw-view-switcher.go +3 -3
@@ -189,7 +189,7 @@ func (x *ViewSwitcher) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, v
189189 // property change must be communicated to assistive technologies.
190190 //
191191 // This function is meant to be used by language bindings.
192-func (x *ViewSwitcher) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
192+func (x *ViewSwitcher) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
193193
194194 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
195195
@@ -225,7 +225,7 @@ func (x *ViewSwitcher) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, v
225225 // relation change must be communicated to assistive technologies.
226226 //
227227 // This function is meant to be used by language bindings.
228-func (x *ViewSwitcher) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
228+func (x *ViewSwitcher) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
229229
230230 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
231231
@@ -258,7 +258,7 @@ func (x *ViewSwitcher) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ..
258258 // state change must be communicated to assistive technologies.
259259 //
260260 // This function is meant to be used by language bindings.
261-func (x *ViewSwitcher) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
261+func (x *ViewSwitcher) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
262262
263263 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
264264
M v4/adw/adw-window-title.go +3 -3
@@ -160,7 +160,7 @@ func (x *WindowTitle) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, va
160160 // property change must be communicated to assistive technologies.
161161 //
162162 // This function is meant to be used by language bindings.
163-func (x *WindowTitle) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
163+func (x *WindowTitle) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
164164
165165 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
166166
@@ -196,7 +196,7 @@ func (x *WindowTitle) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, va
196196 // relation change must be communicated to assistive technologies.
197197 //
198198 // This function is meant to be used by language bindings.
199-func (x *WindowTitle) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
199+func (x *WindowTitle) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
200200
201201 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
202202
@@ -229,7 +229,7 @@ func (x *WindowTitle) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...
229229 // state change must be communicated to assistive technologies.
230230 //
231231 // This function is meant to be used by language bindings.
232-func (x *WindowTitle) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
232+func (x *WindowTitle) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
233233
234234 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
235235
M v4/adw/adw-window.go +3 -3
@@ -172,7 +172,7 @@ func (x *Window) UpdateProperty(FirstPropertyVar gtk.AccessibleProperty, varArgs
172172 // property change must be communicated to assistive technologies.
173173 //
174174 // This function is meant to be used by language bindings.
175-func (x *Window) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
175+func (x *Window) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
176176
177177 gtk.XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
178178
@@ -208,7 +208,7 @@ func (x *Window) UpdateRelation(FirstRelationVar gtk.AccessibleRelation, varArgs
208208 // relation change must be communicated to assistive technologies.
209209 //
210210 // This function is meant to be used by language bindings.
211-func (x *Window) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
211+func (x *Window) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
212212
213213 gtk.XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
214214
@@ -241,7 +241,7 @@ func (x *Window) UpdateState(FirstStateVar gtk.AccessibleState, varArgs ...inter
241241 // state change must be communicated to assistive technologies.
242242 //
243243 // This function is meant to be used by language bindings.
244-func (x *Window) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
244+func (x *Window) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
245245
246246 gtk.XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
247247
M v4/gdk/gdkapplaunchcontext.go +2 -2
@@ -56,7 +56,7 @@ func (x *AppLaunchContext) GetDisplay() *Display {
5656
5757 }
5858
59-var xAppLaunchContextSetDesktop func(uintptr, int32)
59+var xAppLaunchContextSetDesktop func(uintptr, int)
6060
6161 // Sets the workspace on which applications will be launched.
6262 //
@@ -71,7 +71,7 @@ var xAppLaunchContextSetDesktop func(uintptr, int32)
7171 // When the workspace is not specified or @desktop is set to -1,
7272 // it is up to the window manager to pick one, typically it will
7373 // be the current workspace.
74-func (x *AppLaunchContext) SetDesktop(DesktopVar int32) {
74+func (x *AppLaunchContext) SetDesktop(DesktopVar int) {
7575
7676 xAppLaunchContextSetDesktop(x.GoPointer(), DesktopVar)
7777
M v4/gdk/gdkcairo.go +2 -2
@@ -8,7 +8,7 @@ import (
88 "github.com/jwijenbergh/puregotk/v4/gdkpixbuf"
99 )
1010
11-var xCairoDrawFromGl func(*cairo.Context, uintptr, int32, int32, int32, int32, int32, int32, int32)
11+var xCairoDrawFromGl func(*cairo.Context, uintptr, int, int, int, int, int, int, int)
1212
1313 // The main way to not draw GL content in GTK.
1414 //
@@ -28,7 +28,7 @@ var xCairoDrawFromGl func(*cairo.Context, uintptr, int32, int32, int32, int32, i
2828 // with alpha components, so make sure you use GL_TEXTURE if using alpha.
2929 //
3030 // Calling this may change the current GL context.
31-func CairoDrawFromGl(CrVar *cairo.Context, SurfaceVar *Surface, SourceVar int32, SourceTypeVar int32, BufferScaleVar int32, XVar int32, YVar int32, WidthVar int32, HeightVar int32) {
31+func CairoDrawFromGl(CrVar *cairo.Context, SurfaceVar *Surface, SourceVar int, SourceTypeVar int, BufferScaleVar int, XVar int, YVar int, WidthVar int, HeightVar int) {
3232
3333 xCairoDrawFromGl(CrVar, SurfaceVar.GoPointer(), SourceVar, SourceTypeVar, BufferScaleVar, XVar, YVar, WidthVar, HeightVar)
3434
M v4/gdk/gdkclipboard.go +6 -6
@@ -98,7 +98,7 @@ func (x *Clipboard) IsLocal() bool {
9898
9999 }
100100
101-var xClipboardReadAsync func(uintptr, uintptr, int32, uintptr, uintptr, uintptr)
101+var xClipboardReadAsync func(uintptr, uintptr, int, uintptr, uintptr, uintptr)
102102
103103 // Asynchronously requests an input stream to read the @clipboard's
104104 // contents from.
@@ -108,7 +108,7 @@ var xClipboardReadAsync func(uintptr, uintptr, int32, uintptr, uintptr, uintptr)
108108 //
109109 // The clipboard will choose the most suitable mime type from the given list
110110 // to fulfill the request, preferring the ones listed first.
111-func (x *Clipboard) ReadAsync(MimeTypesVar uintptr, IoPriorityVar int32, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
111+func (x *Clipboard) ReadAsync(MimeTypesVar uintptr, IoPriorityVar int, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
112112
113113 xClipboardReadAsync(x.GoPointer(), MimeTypesVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
114114
@@ -193,7 +193,7 @@ func (x *Clipboard) ReadTextureFinish(ResultVar gio.AsyncResult) *Texture {
193193
194194 }
195195
196-var xClipboardReadValueAsync func(uintptr, []interface{}, int32, uintptr, uintptr, uintptr)
196+var xClipboardReadValueAsync func(uintptr, []interface{}, int, uintptr, uintptr, uintptr)
197197
198198 // Asynchronously request the @clipboard contents converted to the given
199199 // @type.
@@ -204,7 +204,7 @@ var xClipboardReadValueAsync func(uintptr, []interface{}, int32, uintptr, uintpt
204204 // For local clipboard contents that are available in the given `GType`,
205205 // the value will be copied directly. Otherwise, GDK will try to use
206206 // [func@content_deserialize_async] to convert the clipboard's data.
207-func (x *Clipboard) ReadValueAsync(TypeVar []interface{}, IoPriorityVar int32, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
207+func (x *Clipboard) ReadValueAsync(TypeVar []interface{}, IoPriorityVar int, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
208208
209209 xClipboardReadValueAsync(x.GoPointer(), TypeVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
210210
@@ -296,7 +296,7 @@ func (x *Clipboard) SetValue(ValueVar *gobject.Value) {
296296
297297 }
298298
299-var xClipboardStoreAsync func(uintptr, int32, uintptr, uintptr, uintptr)
299+var xClipboardStoreAsync func(uintptr, int, uintptr, uintptr, uintptr)
300300
301301 // Asynchronously instructs the @clipboard to store its contents remotely.
302302 //
@@ -311,7 +311,7 @@ var xClipboardStoreAsync func(uintptr, int32, uintptr, uintptr, uintptr)
311311 //
312312 // This function is called automatically when a [class@Gtk.Application] is
313313 // shut down, so you likely don't need to call it.
314-func (x *Clipboard) StoreAsync(IoPriorityVar int32, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
314+func (x *Clipboard) StoreAsync(IoPriorityVar int, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
315315
316316 xClipboardStoreAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
317317
M v4/gdk/gdkcontentdeserializer.go +4 -4
@@ -16,7 +16,7 @@ import (
1616 // operation.
1717 type ContentDeserializeFunc func(uintptr)
1818
19-var xContentDeserializeAsync func(uintptr, string, []interface{}, int32, uintptr, uintptr, uintptr)
19+var xContentDeserializeAsync func(uintptr, string, []interface{}, int, uintptr, uintptr, uintptr)
2020
2121 // Read content from the given input stream and deserialize it, asynchronously.
2222 //
@@ -25,7 +25,7 @@ var xContentDeserializeAsync func(uintptr, string, []interface{}, int32, uintptr
2525 //
2626 // When the operation is finished, @callback will be called. You must then
2727 // call [func@Gdk.content_deserialize_finish] to get the result of the operation.
28-func ContentDeserializeAsync(StreamVar *gio.InputStream, MimeTypeVar string, TypeVar []interface{}, IoPriorityVar int32, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
28+func ContentDeserializeAsync(StreamVar *gio.InputStream, MimeTypeVar string, TypeVar []interface{}, IoPriorityVar int, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
2929
3030 xContentDeserializeAsync(StreamVar.GoPointer(), MimeTypeVar, TypeVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
3131
@@ -128,12 +128,12 @@ func (x *ContentDeserializer) GetMimeType() string {
128128
129129 }
130130
131-var xContentDeserializerGetPriority func(uintptr) int32
131+var xContentDeserializerGetPriority func(uintptr) int
132132
133133 // Gets the I/O priority for the current operation.
134134 //
135135 // This is the priority that was passed to [func@Gdk.content_deserialize_async].
136-func (x *ContentDeserializer) GetPriority() int32 {
136+func (x *ContentDeserializer) GetPriority() int {
137137
138138 return xContentDeserializerGetPriority(x.GoPointer())
139139
M v4/gdk/gdkcontentprovider.go +2 -2
@@ -159,7 +159,7 @@ func (x *ContentProvider) RefStorableFormats() *ContentFormats {
159159
160160 }
161161
162-var xContentProviderWriteMimeTypeAsync func(uintptr, string, uintptr, int32, uintptr, uintptr, uintptr)
162+var xContentProviderWriteMimeTypeAsync func(uintptr, string, uintptr, int, uintptr, uintptr, uintptr)
163163
164164 // Asynchronously writes the contents of @provider to @stream in the given
165165 // @mime_type.
@@ -173,7 +173,7 @@ var xContentProviderWriteMimeTypeAsync func(uintptr, string, uintptr, int32, uin
173173 // not supported, `G_IO_ERROR_NOT_SUPPORTED` will be reported.
174174 //
175175 // The given @stream will not be closed.
176-func (x *ContentProvider) WriteMimeTypeAsync(MimeTypeVar string, StreamVar *gio.OutputStream, IoPriorityVar int32, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
176+func (x *ContentProvider) WriteMimeTypeAsync(MimeTypeVar string, StreamVar *gio.OutputStream, IoPriorityVar int, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
177177
178178 xContentProviderWriteMimeTypeAsync(x.GoPointer(), MimeTypeVar, StreamVar.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
179179
M v4/gdk/gdkcontentserializer.go +4 -4
@@ -25,7 +25,7 @@ func ContentRegisterSerializer(TypeVar []interface{}, MimeTypeVar string, Serial
2525
2626 }
2727
28-var xContentSerializeAsync func(uintptr, string, *gobject.Value, int32, uintptr, uintptr, uintptr)
28+var xContentSerializeAsync func(uintptr, string, *gobject.Value, int, uintptr, uintptr, uintptr)
2929
3030 // Serialize content and write it to the given output stream, asynchronously.
3131 //
@@ -34,7 +34,7 @@ var xContentSerializeAsync func(uintptr, string, *gobject.Value, int32, uintptr,
3434 //
3535 // When the operation is finished, @callback will be called. You must then
3636 // call [func@Gdk.content_serialize_finish] to get the result of the operation.
37-func ContentSerializeAsync(StreamVar *gio.OutputStream, MimeTypeVar string, ValueVar *gobject.Value, IoPriorityVar int32, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
37+func ContentSerializeAsync(StreamVar *gio.OutputStream, MimeTypeVar string, ValueVar *gobject.Value, IoPriorityVar int, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
3838
3939 xContentSerializeAsync(StreamVar.GoPointer(), MimeTypeVar, ValueVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
4040
@@ -129,12 +129,12 @@ func (x *ContentSerializer) GetOutputStream() *gio.OutputStream {
129129
130130 }
131131
132-var xContentSerializerGetPriority func(uintptr) int32
132+var xContentSerializerGetPriority func(uintptr) int
133133
134134 // Gets the I/O priority for the current operation.
135135 //
136136 // This is the priority that was passed to [func@content_serialize_async].
137-func (x *ContentSerializer) GetPriority() int32 {
137+func (x *ContentSerializer) GetPriority() int {
138138
139139 return xContentSerializerGetPriority(x.GoPointer())
140140
M v4/gdk/gdkcursor.go +6 -6
@@ -80,10 +80,10 @@ func NewFromNameCursor(NameVar string, FallbackVar *Cursor) *Cursor {
8080 return NewFromNameCursorCls
8181 }
8282
83-var xNewFromTextureCursor func(uintptr, int32, int32, uintptr) uintptr
83+var xNewFromTextureCursor func(uintptr, int, int, uintptr) uintptr
8484
8585 // Creates a new cursor from a `GdkTexture`.
86-func NewFromTextureCursor(TextureVar *Texture, HotspotXVar int32, HotspotYVar int32, FallbackVar *Cursor) *Cursor {
86+func NewFromTextureCursor(TextureVar *Texture, HotspotXVar int, HotspotYVar int, FallbackVar *Cursor) *Cursor {
8787 NewFromTextureCursorPtr := xNewFromTextureCursor(TextureVar.GoPointer(), HotspotXVar, HotspotYVar, FallbackVar.GoPointer())
8888 if NewFromTextureCursorPtr == 0 {
8989 return nil
@@ -118,7 +118,7 @@ func (x *Cursor) GetFallback() *Cursor {
118118
119119 }
120120
121-var xCursorGetHotspotX func(uintptr) int32
121+var xCursorGetHotspotX func(uintptr) int
122122
123123 // Returns the horizontal offset of the hotspot.
124124 //
@@ -127,13 +127,13 @@ var xCursorGetHotspotX func(uintptr) int32
127127 // Note that named cursors may have a nonzero hotspot, but this function
128128 // will only return the hotspot position for cursors created with
129129 // [ctor@Gdk.Cursor.new_from_texture].
130-func (x *Cursor) GetHotspotX() int32 {
130+func (x *Cursor) GetHotspotX() int {
131131
132132 return xCursorGetHotspotX(x.GoPointer())
133133
134134 }
135135
136-var xCursorGetHotspotY func(uintptr) int32
136+var xCursorGetHotspotY func(uintptr) int
137137
138138 // Returns the vertical offset of the hotspot.
139139 //
@@ -142,7 +142,7 @@ var xCursorGetHotspotY func(uintptr) int32
142142 // Note that named cursors may have a nonzero hotspot, but this function
143143 // will only return the hotspot position for cursors created with
144144 // [ctor@Gdk.Cursor.new_from_texture].
145-func (x *Cursor) GetHotspotY() int32 {
145+func (x *Cursor) GetHotspotY() int {
146146
147147 return xCursorGetHotspotY(x.GoPointer())
148148
M v4/gdk/gdkdevicepad.go +12 -12
@@ -29,10 +29,10 @@ type DevicePadInterface struct {
2929 type DevicePad interface {
3030 GoPointer() uintptr
3131 SetGoPointer(uintptr)
32- GetFeatureGroup(FeatureVar DevicePadFeature, FeatureIdxVar int32) int32
33- GetGroupNModes(GroupIdxVar int32) int32
34- GetNFeatures(FeatureVar DevicePadFeature) int32
35- GetNGroups() int32
32+ GetFeatureGroup(FeatureVar DevicePadFeature, FeatureIdxVar int) int
33+ GetGroupNModes(GroupIdxVar int) int
34+ GetNFeatures(FeatureVar DevicePadFeature) int
35+ GetNGroups() int
3636 }
3737 type DevicePadBase struct {
3838 Ptr uintptr
@@ -49,21 +49,21 @@ func (x *DevicePadBase) SetGoPointer(ptr uintptr) {
4949 // Returns the group the given @feature and @idx belong to.
5050 //
5151 // f the feature or index do not exist in @pad, -1 is returned.
52-func (x *DevicePadBase) GetFeatureGroup(FeatureVar DevicePadFeature, FeatureIdxVar int32) int32 {
52+func (x *DevicePadBase) GetFeatureGroup(FeatureVar DevicePadFeature, FeatureIdxVar int) int {
5353
5454 return XGdkDevicePadGetFeatureGroup(x.GoPointer(), FeatureVar, FeatureIdxVar)
5555
5656 }
5757
5858 // Returns the number of modes that @group may have.
59-func (x *DevicePadBase) GetGroupNModes(GroupIdxVar int32) int32 {
59+func (x *DevicePadBase) GetGroupNModes(GroupIdxVar int) int {
6060
6161 return XGdkDevicePadGetGroupNModes(x.GoPointer(), GroupIdxVar)
6262
6363 }
6464
6565 // Returns the number of features a tablet pad has.
66-func (x *DevicePadBase) GetNFeatures(FeatureVar DevicePadFeature) int32 {
66+func (x *DevicePadBase) GetNFeatures(FeatureVar DevicePadFeature) int {
6767
6868 return XGdkDevicePadGetNFeatures(x.GoPointer(), FeatureVar)
6969
@@ -74,16 +74,16 @@ func (x *DevicePadBase) GetNFeatures(FeatureVar DevicePadFeature) int32 {
7474 // Pads have at least one group. A pad group is a subcollection of
7575 // buttons/strip/rings that is affected collectively by a same
7676 // current mode.
77-func (x *DevicePadBase) GetNGroups() int32 {
77+func (x *DevicePadBase) GetNGroups() int {
7878
7979 return XGdkDevicePadGetNGroups(x.GoPointer())
8080
8181 }
8282
83-var XGdkDevicePadGetFeatureGroup func(uintptr, DevicePadFeature, int32) int32
84-var XGdkDevicePadGetGroupNModes func(uintptr, int32) int32
85-var XGdkDevicePadGetNFeatures func(uintptr, DevicePadFeature) int32
86-var XGdkDevicePadGetNGroups func(uintptr) int32
83+var XGdkDevicePadGetFeatureGroup func(uintptr, DevicePadFeature, int) int
84+var XGdkDevicePadGetGroupNModes func(uintptr, int) int
85+var XGdkDevicePadGetNFeatures func(uintptr, DevicePadFeature) int
86+var XGdkDevicePadGetNGroups func(uintptr) int
8787
8888 // A pad feature.
8989 type DevicePadFeature int
M v4/gdk/gdkdisplay.go +6 -6
@@ -311,7 +311,7 @@ func (x *Display) ListSeats() *glib.List {
311311
312312 }
313313
314-var xDisplayMapKeycode func(uintptr, uint, uintptr, uintptr, int32) bool
314+var xDisplayMapKeycode func(uintptr, uint, uintptr, uintptr, int) bool
315315
316316 // Returns the keyvals bound to @keycode.
317317 //
@@ -322,13 +322,13 @@ var xDisplayMapKeycode func(uintptr, uint, uintptr, uintptr, int32) bool
322322 // keyboard group and level.
323323 //
324324 // Free the returned arrays with g_free().
325-func (x *Display) MapKeycode(KeycodeVar uint, KeysVar uintptr, KeyvalsVar uintptr, NEntriesVar int32) bool {
325+func (x *Display) MapKeycode(KeycodeVar uint, KeysVar uintptr, KeyvalsVar uintptr, NEntriesVar int) bool {
326326
327327 return xDisplayMapKeycode(x.GoPointer(), KeycodeVar, KeysVar, KeyvalsVar, NEntriesVar)
328328
329329 }
330330
331-var xDisplayMapKeyval func(uintptr, uint, uintptr, int32) bool
331+var xDisplayMapKeyval func(uintptr, uint, uintptr, int) bool
332332
333333 // Obtains a list of keycode/group/level combinations that will
334334 // generate @keyval.
@@ -345,7 +345,7 @@ var xDisplayMapKeyval func(uintptr, uint, uintptr, int32) bool
345345 // keyboard group. The level is computed from the modifier mask.
346346 //
347347 // The returned array should be freed with g_free().
348-func (x *Display) MapKeyval(KeyvalVar uint, KeysVar uintptr, NKeysVar int32) bool {
348+func (x *Display) MapKeyval(KeyvalVar uint, KeysVar uintptr, NKeysVar int) bool {
349349
350350 return xDisplayMapKeyval(x.GoPointer(), KeyvalVar, KeysVar, NKeysVar)
351351
@@ -433,7 +433,7 @@ func (x *Display) Sync() {
433433
434434 }
435435
436-var xDisplayTranslateKey func(uintptr, uint, ModifierType, int32, uint, int32, int32, *ModifierType) bool
436+var xDisplayTranslateKey func(uintptr, uint, ModifierType, int, uint, int, int, *ModifierType) bool
437437
438438 // Translates the contents of a `GdkEventKey` into a keyval, effective group,
439439 // and level.
@@ -454,7 +454,7 @@ var xDisplayTranslateKey func(uintptr, uint, ModifierType, int32, uint, int32, i
454454 // This function should rarely be needed, since `GdkEventKey` already
455455 // contains the translated keyval. It is exported for the benefit of
456456 // virtualized test environments.
457-func (x *Display) TranslateKey(KeycodeVar uint, StateVar ModifierType, GroupVar int32, KeyvalVar uint, EffectiveGroupVar int32, LevelVar int32, ConsumedVar *ModifierType) bool {
457+func (x *Display) TranslateKey(KeycodeVar uint, StateVar ModifierType, GroupVar int, KeyvalVar uint, EffectiveGroupVar int, LevelVar int, ConsumedVar *ModifierType) bool {
458458
459459 return xDisplayTranslateKey(x.GoPointer(), KeycodeVar, StateVar, GroupVar, KeyvalVar, EffectiveGroupVar, LevelVar, ConsumedVar)
460460
M v4/gdk/gdkdrag.go +2 -2
@@ -195,13 +195,13 @@ func (x *Drag) GetSurface() *Surface {
195195
196196 }
197197
198-var xDragSetHotspot func(uintptr, int32, int32)
198+var xDragSetHotspot func(uintptr, int, int)
199199
200200 // Sets the position of the drag surface that will be kept
201201 // under the cursor hotspot.
202202 //
203203 // Initially, the hotspot is at the top left corner of the drag surface.
204-func (x *Drag) SetHotspot(HotXVar int32, HotYVar int32) {
204+func (x *Drag) SetHotspot(HotXVar int, HotYVar int) {
205205
206206 xDragSetHotspot(x.GoPointer(), HotXVar, HotYVar)
207207
M v4/gdk/gdkdragsurface.go +3 -3
@@ -14,7 +14,7 @@ type DragSurfaceInterface struct {
1414 type DragSurface interface {
1515 GoPointer() uintptr
1616 SetGoPointer(uintptr)
17- Present(WidthVar int32, HeightVar int32) bool
17+ Present(WidthVar int, HeightVar int) bool
1818 }
1919 type DragSurfaceBase struct {
2020 Ptr uintptr
@@ -29,13 +29,13 @@ func (x *DragSurfaceBase) SetGoPointer(ptr uintptr) {
2929 }
3030
3131 // Present @drag_surface.
32-func (x *DragSurfaceBase) Present(WidthVar int32, HeightVar int32) bool {
32+func (x *DragSurfaceBase) Present(WidthVar int, HeightVar int) bool {
3333
3434 return XGdkDragSurfacePresent(x.GoPointer(), WidthVar, HeightVar)
3535
3636 }
3737
38-var XGdkDragSurfacePresent func(uintptr, int32, int32) bool
38+var XGdkDragSurfacePresent func(uintptr, int, int) bool
3939
4040 func init() {
4141 lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL)
M v4/gdk/gdkdrop.go +4 -4
@@ -151,11 +151,11 @@ func (x *Drop) GetSurface() *Surface {
151151
152152 }
153153
154-var xDropReadAsync func(uintptr, uintptr, int32, uintptr, uintptr, uintptr)
154+var xDropReadAsync func(uintptr, uintptr, int, uintptr, uintptr, uintptr)
155155
156156 // Asynchronously read the dropped data from a `GdkDrop`
157157 // in a format that complies with one of the mime types.
158-func (x *Drop) ReadAsync(MimeTypesVar uintptr, IoPriorityVar int32, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
158+func (x *Drop) ReadAsync(MimeTypesVar uintptr, IoPriorityVar int, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
159159
160160 xDropReadAsync(x.GoPointer(), MimeTypesVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
161161
@@ -184,7 +184,7 @@ func (x *Drop) ReadFinish(ResultVar gio.AsyncResult, OutMimeTypeVar string) *gio
184184
185185 }
186186
187-var xDropReadValueAsync func(uintptr, []interface{}, int32, uintptr, uintptr, uintptr)
187+var xDropReadValueAsync func(uintptr, []interface{}, int, uintptr, uintptr, uintptr)
188188
189189 // Asynchronously request the drag operation's contents converted
190190 // to the given @type.
@@ -196,7 +196,7 @@ var xDropReadValueAsync func(uintptr, []interface{}, int32, uintptr, uintptr, ui
196196 // For local drag-and-drop operations that are available in the given
197197 // `GType`, the value will be copied directly. Otherwise, GDK will
198198 // try to use [func@Gdk.content_deserialize_async] to convert the data.
199-func (x *Drop) ReadValueAsync(TypeVar []interface{}, IoPriorityVar int32, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
199+func (x *Drop) ReadValueAsync(TypeVar []interface{}, IoPriorityVar int, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
200200
201201 xDropReadValueAsync(x.GoPointer(), TypeVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
202202
M v4/gdk/gdkglcontext.go +8 -8
@@ -137,7 +137,7 @@ func (x *GLContext) GetForwardCompatible() bool {
137137
138138 }
139139
140-var xGLContextGetRequiredVersion func(uintptr, int32, int32)
140+var xGLContextGetRequiredVersion func(uintptr, int, int)
141141
142142 // Retrieves required OpenGL version set as a requirement for the @context
143143 // realization. It will not change even if a greater OpenGL version is supported
@@ -145,7 +145,7 @@ var xGLContextGetRequiredVersion func(uintptr, int32, int32)
145145 // [method@Gdk.GLContext.get_version] for the real version in use.
146146 //
147147 // See [method@Gdk.GLContext.set_required_version].
148-func (x *GLContext) GetRequiredVersion(MajorVar int32, MinorVar int32) {
148+func (x *GLContext) GetRequiredVersion(MajorVar int, MinorVar int) {
149149
150150 xGLContextGetRequiredVersion(x.GoPointer(), MajorVar, MinorVar)
151151
@@ -199,7 +199,7 @@ func (x *GLContext) GetUseEs() bool {
199199
200200 }
201201
202-var xGLContextGetVersion func(uintptr, int32, int32)
202+var xGLContextGetVersion func(uintptr, int, int)
203203
204204 // Retrieves the OpenGL version of the @context.
205205 //
@@ -207,7 +207,7 @@ var xGLContextGetVersion func(uintptr, int32, int32)
207207 //
208208 // If the @context has never been made current, the version cannot
209209 // be known and it will return 0 for both @major and @minor.
210-func (x *GLContext) GetVersion(MajorVar int32, MinorVar int32) {
210+func (x *GLContext) GetVersion(MajorVar int, MinorVar int) {
211211
212212 xGLContextGetVersion(x.GoPointer(), MajorVar, MinorVar)
213213
@@ -324,7 +324,7 @@ func (x *GLContext) SetForwardCompatible(CompatibleVar bool) {
324324
325325 }
326326
327-var xGLContextSetRequiredVersion func(uintptr, int32, int32)
327+var xGLContextSetRequiredVersion func(uintptr, int, int)
328328
329329 // Sets the major and minor version of OpenGL to request.
330330 //
@@ -335,13 +335,13 @@ var xGLContextSetRequiredVersion func(uintptr, int32, int32)
335335 //
336336 // The @context must not be realized or made current prior to calling
337337 // this function.
338-func (x *GLContext) SetRequiredVersion(MajorVar int32, MinorVar int32) {
338+func (x *GLContext) SetRequiredVersion(MajorVar int, MinorVar int) {
339339
340340 xGLContextSetRequiredVersion(x.GoPointer(), MajorVar, MinorVar)
341341
342342 }
343343
344-var xGLContextSetUseEs func(uintptr, int32)
344+var xGLContextSetUseEs func(uintptr, int)
345345
346346 // Requests that GDK create an OpenGL ES context instead of an OpenGL one.
347347 //
@@ -356,7 +356,7 @@ var xGLContextSetUseEs func(uintptr, int32)
356356 // You should check the return value of [method@Gdk.GLContext.get_use_es]
357357 // after calling [method@Gdk.GLContext.realize] to decide whether to use
358358 // the OpenGL or OpenGL ES API, extensions, or shaders.
359-func (x *GLContext) SetUseEs(UseEsVar int32) {
359+func (x *GLContext) SetUseEs(UseEsVar int) {
360360
361361 xGLContextSetUseEs(x.GoPointer(), UseEsVar)
362362
M v4/gdk/gdkgltexture.go +6 -6
@@ -22,14 +22,14 @@ func GLTextureNewFromInternalPtr(ptr uintptr) *GLTexture {
2222 return cls
2323 }
2424
25-var xNewGLTexture func(uintptr, uint, int32, int32, uintptr, uintptr) uintptr
25+var xNewGLTexture func(uintptr, uint, int, int, uintptr, uintptr) uintptr
2626
2727 // Creates a new texture for an existing GL texture.
2828 //
2929 // Note that the GL texture must not be modified until @destroy is called,
3030 // which will happen when the GdkTexture object is finalized, or due to
3131 // an explicit call of [method@Gdk.GLTexture.release].
32-func NewGLTexture(ContextVar *GLContext, IdVar uint, WidthVar int32, HeightVar int32, DestroyVar glib.DestroyNotify, DataVar uintptr) *GLTexture {
32+func NewGLTexture(ContextVar *GLContext, IdVar uint, WidthVar int, HeightVar int, DestroyVar glib.DestroyNotify, DataVar uintptr) *GLTexture {
3333 NewGLTexturePtr := xNewGLTexture(ContextVar.GoPointer(), IdVar, WidthVar, HeightVar, purego.NewCallback(DestroyVar), DataVar)
3434 if NewGLTexturePtr == 0 {
3535 return nil
@@ -140,7 +140,7 @@ func (x *GLTexture) GetIntrinsicAspectRatio() float64 {
140140 //
141141 // If the @paintable does not have a preferred height, it returns 0.
142142 // Negative values are never returned.
143-func (x *GLTexture) GetIntrinsicHeight() int32 {
143+func (x *GLTexture) GetIntrinsicHeight() int {
144144
145145 return XGdkPaintableGetIntrinsicHeight(x.GoPointer())
146146
@@ -156,7 +156,7 @@ func (x *GLTexture) GetIntrinsicHeight() int32 {
156156 //
157157 // If the @paintable does not have a preferred width, it returns 0.
158158 // Negative values are never returned.
159-func (x *GLTexture) GetIntrinsicWidth() int32 {
159+func (x *GLTexture) GetIntrinsicWidth() int {
160160
161161 return XGdkPaintableGetIntrinsicWidth(x.GoPointer())
162162
@@ -247,7 +247,7 @@ func (x *GLTexture) ToString() string {
247247
248248 // Loads a loadable icon. For the asynchronous version of this function,
249249 // see g_loadable_icon_load_async().
250-func (x *GLTexture) Load(SizeVar int32, TypeVar string, CancellableVar *gio.Cancellable) *gio.InputStream {
250+func (x *GLTexture) Load(SizeVar int, TypeVar string, CancellableVar *gio.Cancellable) *gio.InputStream {
251251
252252 LoadPtr := gio.XGLoadableIconLoad(x.GoPointer(), SizeVar, TypeVar, CancellableVar.GoPointer())
253253 if LoadPtr == 0 {
@@ -263,7 +263,7 @@ func (x *GLTexture) Load(SizeVar int32, TypeVar string, CancellableVar *gio.Canc
263263 // Loads an icon asynchronously. To finish this function, see
264264 // g_loadable_icon_load_finish(). For the synchronous, blocking
265265 // version of this function, see g_loadable_icon_load().
266-func (x *GLTexture) LoadAsync(SizeVar int32, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
266+func (x *GLTexture) LoadAsync(SizeVar int, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
267267
268268 gio.XGLoadableIconLoadAsync(x.GoPointer(), SizeVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
269269
M v4/gdk/gdkmemorytexture.go +6 -6
@@ -22,13 +22,13 @@ func MemoryTextureNewFromInternalPtr(ptr uintptr) *MemoryTexture {
2222 return cls
2323 }
2424
25-var xNewMemoryTexture func(int32, int32, MemoryFormat, *glib.Bytes, uint) uintptr
25+var xNewMemoryTexture func(int, int, MemoryFormat, *glib.Bytes, uint) uintptr
2626
2727 // Creates a new texture for a blob of image data.
2828 //
2929 // The `GBytes` must contain @stride × @height pixels
3030 // in the given format.
31-func NewMemoryTexture(WidthVar int32, HeightVar int32, FormatVar MemoryFormat, BytesVar *glib.Bytes, StrideVar uint) *MemoryTexture {
31+func NewMemoryTexture(WidthVar int, HeightVar int, FormatVar MemoryFormat, BytesVar *glib.Bytes, StrideVar uint) *MemoryTexture {
3232 NewMemoryTexturePtr := xNewMemoryTexture(WidthVar, HeightVar, FormatVar, BytesVar, StrideVar)
3333 if NewMemoryTexturePtr == 0 {
3434 return nil
@@ -126,7 +126,7 @@ func (x *MemoryTexture) GetIntrinsicAspectRatio() float64 {
126126 //
127127 // If the @paintable does not have a preferred height, it returns 0.
128128 // Negative values are never returned.
129-func (x *MemoryTexture) GetIntrinsicHeight() int32 {
129+func (x *MemoryTexture) GetIntrinsicHeight() int {
130130
131131 return XGdkPaintableGetIntrinsicHeight(x.GoPointer())
132132
@@ -142,7 +142,7 @@ func (x *MemoryTexture) GetIntrinsicHeight() int32 {
142142 //
143143 // If the @paintable does not have a preferred width, it returns 0.
144144 // Negative values are never returned.
145-func (x *MemoryTexture) GetIntrinsicWidth() int32 {
145+func (x *MemoryTexture) GetIntrinsicWidth() int {
146146
147147 return XGdkPaintableGetIntrinsicWidth(x.GoPointer())
148148
@@ -233,7 +233,7 @@ func (x *MemoryTexture) ToString() string {
233233
234234 // Loads a loadable icon. For the asynchronous version of this function,
235235 // see g_loadable_icon_load_async().
236-func (x *MemoryTexture) Load(SizeVar int32, TypeVar string, CancellableVar *gio.Cancellable) *gio.InputStream {
236+func (x *MemoryTexture) Load(SizeVar int, TypeVar string, CancellableVar *gio.Cancellable) *gio.InputStream {
237237
238238 LoadPtr := gio.XGLoadableIconLoad(x.GoPointer(), SizeVar, TypeVar, CancellableVar.GoPointer())
239239 if LoadPtr == 0 {
@@ -249,7 +249,7 @@ func (x *MemoryTexture) Load(SizeVar int32, TypeVar string, CancellableVar *gio.
249249 // Loads an icon asynchronously. To finish this function, see
250250 // g_loadable_icon_load_finish(). For the synchronous, blocking
251251 // version of this function, see g_loadable_icon_load().
252-func (x *MemoryTexture) LoadAsync(SizeVar int32, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
252+func (x *MemoryTexture) LoadAsync(SizeVar int, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
253253
254254 gio.XGLoadableIconLoadAsync(x.GoPointer(), SizeVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
255255
M v4/gdk/gdkmonitor.go +8 -8
@@ -87,10 +87,10 @@ func (x *Monitor) GetGeometry(GeometryVar *Rectangle) {
8787
8888 }
8989
90-var xMonitorGetHeightMm func(uintptr) int32
90+var xMonitorGetHeightMm func(uintptr) int
9191
9292 // Gets the height in millimeters of the monitor.
93-func (x *Monitor) GetHeightMm() int32 {
93+func (x *Monitor) GetHeightMm() int {
9494
9595 return xMonitorGetHeightMm(x.GoPointer())
9696
@@ -120,19 +120,19 @@ func (x *Monitor) GetModel() string {
120120
121121 }
122122
123-var xMonitorGetRefreshRate func(uintptr) int32
123+var xMonitorGetRefreshRate func(uintptr) int
124124
125125 // Gets the refresh rate of the monitor, if available.
126126 //
127127 // The value is in milli-Hertz, so a refresh rate of 60Hz
128128 // is returned as 60000.
129-func (x *Monitor) GetRefreshRate() int32 {
129+func (x *Monitor) GetRefreshRate() int {
130130
131131 return xMonitorGetRefreshRate(x.GoPointer())
132132
133133 }
134134
135-var xMonitorGetScaleFactor func(uintptr) int32
135+var xMonitorGetScaleFactor func(uintptr) int
136136
137137 // Gets the internal scale factor that maps from monitor coordinates
138138 // to device pixels.
@@ -143,7 +143,7 @@ var xMonitorGetScaleFactor func(uintptr) int32
143143 // This can be used if you want to create pixel based data for a
144144 // particular monitor, but most of the time you’re drawing to a surface
145145 // where it is better to use [method@Gdk.Surface.get_scale_factor] instead.
146-func (x *Monitor) GetScaleFactor() int32 {
146+func (x *Monitor) GetScaleFactor() int {
147147
148148 return xMonitorGetScaleFactor(x.GoPointer())
149149
@@ -159,10 +159,10 @@ func (x *Monitor) GetSubpixelLayout() SubpixelLayout {
159159
160160 }
161161
162-var xMonitorGetWidthMm func(uintptr) int32
162+var xMonitorGetWidthMm func(uintptr) int
163163
164164 // Gets the width in millimeters of the monitor.
165-func (x *Monitor) GetWidthMm() int32 {
165+func (x *Monitor) GetWidthMm() int {
166166
167167 return xMonitorGetWidthMm(x.GoPointer())
168168
M v4/gdk/gdkpaintable.go +8 -8
@@ -71,8 +71,8 @@ type Paintable interface {
7171 GetCurrentImage() *PaintableBase
7272 GetFlags() PaintableFlags
7373 GetIntrinsicAspectRatio() float64
74- GetIntrinsicHeight() int32
75- GetIntrinsicWidth() int32
74+ GetIntrinsicHeight() int
75+ GetIntrinsicWidth() int
7676 InvalidateContents()
7777 InvalidateSize()
7878 Snapshot(SnapshotVar *Snapshot, WidthVar float64, HeightVar float64)
@@ -168,7 +168,7 @@ func (x *PaintableBase) GetIntrinsicAspectRatio() float64 {
168168 //
169169 // If the @paintable does not have a preferred height, it returns 0.
170170 // Negative values are never returned.
171-func (x *PaintableBase) GetIntrinsicHeight() int32 {
171+func (x *PaintableBase) GetIntrinsicHeight() int {
172172
173173 return XGdkPaintableGetIntrinsicHeight(x.GoPointer())
174174
@@ -184,7 +184,7 @@ func (x *PaintableBase) GetIntrinsicHeight() int32 {
184184 //
185185 // If the @paintable does not have a preferred width, it returns 0.
186186 // Negative values are never returned.
187-func (x *PaintableBase) GetIntrinsicWidth() int32 {
187+func (x *PaintableBase) GetIntrinsicWidth() int {
188188
189189 return XGdkPaintableGetIntrinsicWidth(x.GoPointer())
190190
@@ -237,8 +237,8 @@ var XGdkPaintableComputeConcreteSize func(uintptr, float64, float64, float64, fl
237237 var XGdkPaintableGetCurrentImage func(uintptr) uintptr
238238 var XGdkPaintableGetFlags func(uintptr) PaintableFlags
239239 var XGdkPaintableGetIntrinsicAspectRatio func(uintptr) float64
240-var XGdkPaintableGetIntrinsicHeight func(uintptr) int32
241-var XGdkPaintableGetIntrinsicWidth func(uintptr) int32
240+var XGdkPaintableGetIntrinsicHeight func(uintptr) int
241+var XGdkPaintableGetIntrinsicWidth func(uintptr) int
242242 var XGdkPaintableInvalidateContents func(uintptr)
243243 var XGdkPaintableInvalidateSize func(uintptr)
244244 var XGdkPaintableSnapshot func(uintptr, uintptr, float64, float64)
@@ -260,7 +260,7 @@ const (
260260 PaintableStaticContentsValue PaintableFlags = 2
261261 )
262262
263-var xPaintableNewEmpty func(int32, int32) uintptr
263+var xPaintableNewEmpty func(int, int) uintptr
264264
265265 // Returns a paintable that has the given intrinsic size and draws nothing.
266266 //
@@ -268,7 +268,7 @@ var xPaintableNewEmpty func(int32, int32) uintptr
268268 // [vfunc@Gdk.Paintable.get_current_image] virtual function
269269 // when the paintable is in an incomplete state (like a
270270 // [class@Gtk.MediaStream] before receiving the first frame).
271-func PaintableNewEmpty(IntrinsicWidthVar int32, IntrinsicHeightVar int32) *PaintableBase {
271+func PaintableNewEmpty(IntrinsicWidthVar int, IntrinsicHeightVar int) *PaintableBase {
272272
273273 PaintableNewEmptyPtr := xPaintableNewEmpty(IntrinsicWidthVar, IntrinsicHeightVar)
274274 if PaintableNewEmptyPtr == 0 {
M v4/gdk/gdkpango.go +4 -4
@@ -8,7 +8,7 @@ import (
88 "github.com/jwijenbergh/puregotk/v4/pango"
99 )
1010
11-var xPangoLayoutGetClipRegion func(uintptr, int32, int32, int32, int32) *cairo.Region
11+var xPangoLayoutGetClipRegion func(uintptr, int, int, int, int) *cairo.Region
1212
1313 // Obtains a clip region which contains the areas where the given ranges
1414 // of text would be drawn.
@@ -20,13 +20,13 @@ var xPangoLayoutGetClipRegion func(uintptr, int32, int32, int32, int32) *cairo.R
2020 // ranges, not ink extents. So the drawn layout may in fact touch areas out of
2121 // the clip region. The clip region is mainly useful for highlightling parts
2222 // of text, such as when text is selected.
23-func PangoLayoutGetClipRegion(LayoutVar *pango.Layout, XOriginVar int32, YOriginVar int32, IndexRangesVar int32, NRangesVar int32) *cairo.Region {
23+func PangoLayoutGetClipRegion(LayoutVar *pango.Layout, XOriginVar int, YOriginVar int, IndexRangesVar int, NRangesVar int) *cairo.Region {
2424
2525 return xPangoLayoutGetClipRegion(LayoutVar.GoPointer(), XOriginVar, YOriginVar, IndexRangesVar, NRangesVar)
2626
2727 }
2828
29-var xPangoLayoutLineGetClipRegion func(*pango.LayoutLine, int32, int32, uintptr, int32) *cairo.Region
29+var xPangoLayoutLineGetClipRegion func(*pango.LayoutLine, int, int, uintptr, int) *cairo.Region
3030
3131 // Obtains a clip region which contains the areas where the given
3232 // ranges of text would be drawn.
@@ -43,7 +43,7 @@ var xPangoLayoutLineGetClipRegion func(*pango.LayoutLine, int32, int32, uintptr,
4343 // ranges, not ink extents. So the drawn line may in fact touch areas out of
4444 // the clip region. The clip region is mainly useful for highlightling parts
4545 // of text, such as when text is selected.
46-func PangoLayoutLineGetClipRegion(LineVar *pango.LayoutLine, XOriginVar int32, YOriginVar int32, IndexRangesVar uintptr, NRangesVar int32) *cairo.Region {
46+func PangoLayoutLineGetClipRegion(LineVar *pango.LayoutLine, XOriginVar int, YOriginVar int, IndexRangesVar uintptr, NRangesVar int) *cairo.Region {
4747
4848 return xPangoLayoutLineGetClipRegion(LineVar, XOriginVar, YOriginVar, IndexRangesVar, NRangesVar)
4949
M v4/gdk/gdkpixbuf.go +2 -2
@@ -8,7 +8,7 @@ import (
88 "github.com/jwijenbergh/puregotk/v4/gdkpixbuf"
99 )
1010
11-var xPixbufGetFromSurface func(*cairo.Surface, int32, int32, int32, int32) uintptr
11+var xPixbufGetFromSurface func(*cairo.Surface, int, int, int, int) uintptr
1212
1313 // Transfers image data from a `cairo_surface_t` and converts it
1414 // to a `GdkPixbuf`.
@@ -17,7 +17,7 @@ var xPixbufGetFromSurface func(*cairo.Surface, int32, int32, int32, int32) uintp
1717 //
1818 // This function will create an RGB pixbuf with 8 bits per channel.
1919 // The pixbuf will contain an alpha channel if the @surface contains one.
20-func PixbufGetFromSurface(SurfaceVar *cairo.Surface, SrcXVar int32, SrcYVar int32, WidthVar int32, HeightVar int32) *gdkpixbuf.Pixbuf {
20+func PixbufGetFromSurface(SurfaceVar *cairo.Surface, SrcXVar int, SrcYVar int, WidthVar int, HeightVar int) *gdkpixbuf.Pixbuf {
2121
2222 PixbufGetFromSurfacePtr := xPixbufGetFromSurface(SurfaceVar, SrcXVar, SrcYVar, WidthVar, HeightVar)
2323 if PixbufGetFromSurfacePtr == 0 {
M v4/gdk/gdkpopup.go +9 -9
@@ -22,11 +22,11 @@ type Popup interface {
2222 SetGoPointer(uintptr)
2323 GetAutohide() bool
2424 GetParent() *Surface
25- GetPositionX() int32
26- GetPositionY() int32
25+ GetPositionX() int
26+ GetPositionY() int
2727 GetRectAnchor() Gravity
2828 GetSurfaceAnchor() Gravity
29- Present(WidthVar int32, HeightVar int32, LayoutVar *PopupLayout) bool
29+ Present(WidthVar int, HeightVar int, LayoutVar *PopupLayout) bool
3030 }
3131 type PopupBase struct {
3232 Ptr uintptr
@@ -64,14 +64,14 @@ func (x *PopupBase) GetParent() *Surface {
6464 }
6565
6666 // Obtains the position of the popup relative to its parent.
67-func (x *PopupBase) GetPositionX() int32 {
67+func (x *PopupBase) GetPositionX() int {
6868
6969 return XGdkPopupGetPositionX(x.GoPointer())
7070
7171 }
7272
7373 // Obtains the position of the popup relative to its parent.
74-func (x *PopupBase) GetPositionY() int32 {
74+func (x *PopupBase) GetPositionY() int {
7575
7676 return XGdkPopupGetPositionY(x.GoPointer())
7777
@@ -112,7 +112,7 @@ func (x *PopupBase) GetSurfaceAnchor() Gravity {
112112 // Presenting may fail, for example if the @popup is set to autohide
113113 // and is immediately hidden upon being presented. If presenting failed,
114114 // the [signal@Gdk.Surface::layout] signal will not me emitted.
115-func (x *PopupBase) Present(WidthVar int32, HeightVar int32, LayoutVar *PopupLayout) bool {
115+func (x *PopupBase) Present(WidthVar int, HeightVar int, LayoutVar *PopupLayout) bool {
116116
117117 return XGdkPopupPresent(x.GoPointer(), WidthVar, HeightVar, LayoutVar)
118118
@@ -120,11 +120,11 @@ func (x *PopupBase) Present(WidthVar int32, HeightVar int32, LayoutVar *PopupLay
120120
121121 var XGdkPopupGetAutohide func(uintptr) bool
122122 var XGdkPopupGetParent func(uintptr) uintptr
123-var XGdkPopupGetPositionX func(uintptr) int32
124-var XGdkPopupGetPositionY func(uintptr) int32
123+var XGdkPopupGetPositionX func(uintptr) int
124+var XGdkPopupGetPositionY func(uintptr) int
125125 var XGdkPopupGetRectAnchor func(uintptr) Gravity
126126 var XGdkPopupGetSurfaceAnchor func(uintptr) Gravity
127-var XGdkPopupPresent func(uintptr, int32, int32, *PopupLayout) bool
127+var XGdkPopupPresent func(uintptr, int, int, *PopupLayout) bool
128128
129129 func init() {
130130 lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL)
M v4/gdk/gdksurface.go +10 -10
@@ -110,7 +110,7 @@ func (x *Surface) CreateGlContext() *GLContext {
110110
111111 }
112112
113-var xSurfaceCreateSimilarSurface func(uintptr, cairo.Content, int32, int32) *cairo.Surface
113+var xSurfaceCreateSimilarSurface func(uintptr, cairo.Content, int, int) *cairo.Surface
114114
115115 // Create a new Cairo surface that is as compatible as possible with the
116116 // given @surface.
@@ -127,7 +127,7 @@ var xSurfaceCreateSimilarSurface func(uintptr, cairo.Content, int32, int32) *cai
127127 // This function always returns a valid pointer, but it will return a
128128 // pointer to a “nil” surface if @other is already in an error state
129129 // or any other error occurs.
130-func (x *Surface) CreateSimilarSurface(ContentVar cairo.Content, WidthVar int32, HeightVar int32) *cairo.Surface {
130+func (x *Surface) CreateSimilarSurface(ContentVar cairo.Content, WidthVar int, HeightVar int) *cairo.Surface {
131131
132132 return xSurfaceCreateSimilarSurface(x.GoPointer(), ContentVar, WidthVar, HeightVar)
133133
@@ -267,13 +267,13 @@ func (x *Surface) GetFrameClock() *FrameClock {
267267
268268 }
269269
270-var xSurfaceGetHeight func(uintptr) int32
270+var xSurfaceGetHeight func(uintptr) int
271271
272272 // Returns the height of the given @surface.
273273 //
274274 // Surface size is reported in ”application pixels”, not
275275 // ”device pixels” (see [method@Gdk.Surface.get_scale_factor]).
276-func (x *Surface) GetHeight() int32 {
276+func (x *Surface) GetHeight() int {
277277
278278 return xSurfaceGetHeight(x.GoPointer())
279279
@@ -291,7 +291,7 @@ func (x *Surface) GetMapped() bool {
291291
292292 }
293293
294-var xSurfaceGetScaleFactor func(uintptr) int32
294+var xSurfaceGetScaleFactor func(uintptr) int
295295
296296 // Returns the internal scale factor that maps from surface coordinates
297297 // to the actual device pixels.
@@ -304,19 +304,19 @@ var xSurfaceGetScaleFactor func(uintptr) int32
304304 // use a pixel resource with higher resolution data.
305305 //
306306 // The scale of a surface may change during runtime.
307-func (x *Surface) GetScaleFactor() int32 {
307+func (x *Surface) GetScaleFactor() int {
308308
309309 return xSurfaceGetScaleFactor(x.GoPointer())
310310
311311 }
312312
313-var xSurfaceGetWidth func(uintptr) int32
313+var xSurfaceGetWidth func(uintptr) int
314314
315315 // Returns the width of the given @surface.
316316 //
317317 // Surface size is reported in ”application pixels”, not
318318 // ”device pixels” (see [method@Gdk.Surface.get_scale_factor]).
319-func (x *Surface) GetWidth() int32 {
319+func (x *Surface) GetWidth() int {
320320
321321 return xSurfaceGetWidth(x.GoPointer())
322322
@@ -494,8 +494,8 @@ func (x *Surface) ConnectEvent(cb func(Surface, *Event) bool) {
494494 //
495495 // Surface size is reported in ”application pixels”, not
496496 // ”device pixels” (see gdk_surface_get_scale_factor()).
497-func (x *Surface) ConnectLayout(cb func(Surface, int32, int32)) {
498- fcb := func(clsPtr uintptr, WidthVarp int32, HeightVarp int32) {
497+func (x *Surface) ConnectLayout(cb func(Surface, int, int)) {
498+ fcb := func(clsPtr uintptr, WidthVarp int, HeightVarp int) {
499499 fa := Surface{}
500500 fa.Ptr = clsPtr
501501
M v4/gdk/gdktexture.go +8 -8
@@ -197,19 +197,19 @@ func (x *Texture) Download(DataVar uintptr, StrideVar uint) {
197197
198198 }
199199
200-var xTextureGetHeight func(uintptr) int32
200+var xTextureGetHeight func(uintptr) int
201201
202202 // Returns the height of the @texture, in pixels.
203-func (x *Texture) GetHeight() int32 {
203+func (x *Texture) GetHeight() int {
204204
205205 return xTextureGetHeight(x.GoPointer())
206206
207207 }
208208
209-var xTextureGetWidth func(uintptr) int32
209+var xTextureGetWidth func(uintptr) int
210210
211211 // Returns the width of @texture, in pixels.
212-func (x *Texture) GetWidth() int32 {
212+func (x *Texture) GetWidth() int {
213213
214214 return xTextureGetWidth(x.GoPointer())
215215
@@ -370,7 +370,7 @@ func (x *Texture) GetIntrinsicAspectRatio() float64 {
370370 //
371371 // If the @paintable does not have a preferred height, it returns 0.
372372 // Negative values are never returned.
373-func (x *Texture) GetIntrinsicHeight() int32 {
373+func (x *Texture) GetIntrinsicHeight() int {
374374
375375 return XGdkPaintableGetIntrinsicHeight(x.GoPointer())
376376
@@ -386,7 +386,7 @@ func (x *Texture) GetIntrinsicHeight() int32 {
386386 //
387387 // If the @paintable does not have a preferred width, it returns 0.
388388 // Negative values are never returned.
389-func (x *Texture) GetIntrinsicWidth() int32 {
389+func (x *Texture) GetIntrinsicWidth() int {
390390
391391 return XGdkPaintableGetIntrinsicWidth(x.GoPointer())
392392
@@ -477,7 +477,7 @@ func (x *Texture) ToString() string {
477477
478478 // Loads a loadable icon. For the asynchronous version of this function,
479479 // see g_loadable_icon_load_async().
480-func (x *Texture) Load(SizeVar int32, TypeVar string, CancellableVar *gio.Cancellable) *gio.InputStream {
480+func (x *Texture) Load(SizeVar int, TypeVar string, CancellableVar *gio.Cancellable) *gio.InputStream {
481481
482482 LoadPtr := gio.XGLoadableIconLoad(x.GoPointer(), SizeVar, TypeVar, CancellableVar.GoPointer())
483483 if LoadPtr == 0 {
@@ -493,7 +493,7 @@ func (x *Texture) Load(SizeVar int32, TypeVar string, CancellableVar *gio.Cancel
493493 // Loads an icon asynchronously. To finish this function, see
494494 // g_loadable_icon_load_finish(). For the synchronous, blocking
495495 // version of this function, see g_loadable_icon_load().
496-func (x *Texture) LoadAsync(SizeVar int32, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
496+func (x *Texture) LoadAsync(SizeVar int, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
497497
498498 gio.XGLoadableIconLoadAsync(x.GoPointer(), SizeVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
499499
M v4/gdk/gdktoplevel.go +6 -6
@@ -18,8 +18,8 @@ type ToplevelInterface struct {
1818 type Toplevel interface {
1919 GoPointer() uintptr
2020 SetGoPointer(uintptr)
21- BeginMove(DeviceVar *Device, ButtonVar int32, XVar float64, YVar float64, TimestampVar uint32)
22- BeginResize(EdgeVar SurfaceEdge, DeviceVar *Device, ButtonVar int32, XVar float64, YVar float64, TimestampVar uint32)
21+ BeginMove(DeviceVar *Device, ButtonVar int, XVar float64, YVar float64, TimestampVar uint32)
22+ BeginResize(EdgeVar SurfaceEdge, DeviceVar *Device, ButtonVar int, XVar float64, YVar float64, TimestampVar uint32)
2323 Focus(TimestampVar uint32)
2424 GetState() ToplevelState
2525 InhibitSystemShortcuts(EventVar *Event)
@@ -53,7 +53,7 @@ func (x *ToplevelBase) SetGoPointer(ptr uintptr) {
5353 // Begins an interactive move operation.
5454 //
5555 // You might use this function to implement draggable titlebars.
56-func (x *ToplevelBase) BeginMove(DeviceVar *Device, ButtonVar int32, XVar float64, YVar float64, TimestampVar uint32) {
56+func (x *ToplevelBase) BeginMove(DeviceVar *Device, ButtonVar int, XVar float64, YVar float64, TimestampVar uint32) {
5757
5858 XGdkToplevelBeginMove(x.GoPointer(), DeviceVar.GoPointer(), ButtonVar, XVar, YVar, TimestampVar)
5959
@@ -62,7 +62,7 @@ func (x *ToplevelBase) BeginMove(DeviceVar *Device, ButtonVar int32, XVar float6
6262 // Begins an interactive resize operation.
6363 //
6464 // You might use this function to implement a “window resize grip.”
65-func (x *ToplevelBase) BeginResize(EdgeVar SurfaceEdge, DeviceVar *Device, ButtonVar int32, XVar float64, YVar float64, TimestampVar uint32) {
65+func (x *ToplevelBase) BeginResize(EdgeVar SurfaceEdge, DeviceVar *Device, ButtonVar int, XVar float64, YVar float64, TimestampVar uint32) {
6666
6767 XGdkToplevelBeginResize(x.GoPointer(), EdgeVar, DeviceVar.GoPointer(), ButtonVar, XVar, YVar, TimestampVar)
6868
@@ -271,8 +271,8 @@ func (x *ToplevelBase) TitlebarGesture(GestureVar TitlebarGesture) bool {
271271
272272 }
273273
274-var XGdkToplevelBeginMove func(uintptr, uintptr, int32, float64, float64, uint32)
275-var XGdkToplevelBeginResize func(uintptr, SurfaceEdge, uintptr, int32, float64, float64, uint32)
274+var XGdkToplevelBeginMove func(uintptr, uintptr, int, float64, float64, uint32)
275+var XGdkToplevelBeginResize func(uintptr, SurfaceEdge, uintptr, int, float64, float64, uint32)
276276 var XGdkToplevelFocus func(uintptr, uint32)
277277 var XGdkToplevelGetState func(uintptr) ToplevelState
278278 var XGdkToplevelInhibitSystemShortcuts func(uintptr, uintptr)
M v4/gdk/gdktypes.go +6 -6
@@ -40,9 +40,9 @@ type ContentFormats struct {
4040 type KeymapKey struct {
4141 Keycode uint
4242
43- Group int32
43+ Group int
4444
45- Level int32
45+ Level int
4646 }
4747
4848 // A `GdkRectangle` data type for representing rectangles.
@@ -61,11 +61,11 @@ type KeymapKey struct {
6161 // The Graphene library has a number of other data types for regions and
6262 // volumes in 2D and 3D.
6363 type Rectangle struct {
64- X int32
64+ X int
6565
66- Y int32
66+ Y int
6767
68- Width int32
68+ Width int
6969
70- Height int32
70+ Height int
7171 }
M v4/gdkpixbuf/gdk-pixbuf-animation.go +6 -6
@@ -124,10 +124,10 @@ func NewFromStreamFinishPixbufAnimation(AsyncResultVar gio.AsyncResult) *PixbufA
124124 return NewFromStreamFinishPixbufAnimationCls
125125 }
126126
127-var xPixbufAnimationGetHeight func(uintptr) int32
127+var xPixbufAnimationGetHeight func(uintptr) int
128128
129129 // Queries the height of the bounding box of a pixbuf animation.
130-func (x *PixbufAnimation) GetHeight() int32 {
130+func (x *PixbufAnimation) GetHeight() int {
131131
132132 return xPixbufAnimationGetHeight(x.GoPointer())
133133
@@ -210,10 +210,10 @@ func (x *PixbufAnimation) GetStaticImage() *Pixbuf {
210210
211211 }
212212
213-var xPixbufAnimationGetWidth func(uintptr) int32
213+var xPixbufAnimationGetWidth func(uintptr) int
214214
215215 // Queries the width of the bounding box of a pixbuf animation.
216-func (x *PixbufAnimation) GetWidth() int32 {
216+func (x *PixbufAnimation) GetWidth() int {
217217
218218 return xPixbufAnimationGetWidth(x.GoPointer())
219219
@@ -307,7 +307,7 @@ func (x *PixbufAnimationIter) Advance(CurrentTimeVar *glib.TimeVal) bool {
307307
308308 }
309309
310-var xPixbufAnimationIterGetDelayTime func(uintptr) int32
310+var xPixbufAnimationIterGetDelayTime func(uintptr) int
311311
312312 // Gets the number of milliseconds the current pixbuf should be displayed,
313313 // or -1 if the current pixbuf should be displayed forever.
@@ -318,7 +318,7 @@ var xPixbufAnimationIterGetDelayTime func(uintptr) int32
318318 // Note that some formats, like GIF, might clamp the timeout values in the
319319 // image file to avoid updates that are just too quick. The minimum timeout
320320 // for GIF images is currently 20 milliseconds.
321-func (x *PixbufAnimationIter) GetDelayTime() int32 {
321+func (x *PixbufAnimationIter) GetDelayTime() int {
322322
323323 return xPixbufAnimationIterGetDelayTime(x.GoPointer())
324324
M v4/gdkpixbuf/gdk-pixbuf-io.go +3 -3
@@ -76,7 +76,7 @@ type PixbufModuleSaveOptionSupportedFunc func(string) bool
7676 // this as a hint that it will be closed soon and shouldn't allocate further
7777 // resources. This convention is used to implement gdk_pixbuf_get_file_info()
7878 // efficiently.
79-type PixbufModuleSizeFunc func(int32, int32, uintptr)
79+type PixbufModuleSizeFunc func(int, int, uintptr)
8080
8181 // Finalizes the image loading state.
8282 //
@@ -89,7 +89,7 @@ type PixbufModuleStopLoadFunc func(uintptr) bool
8989 // #GdkPixbufLoader uses a function of this type to emit the
9090 // "<link linkend="GdkPixbufLoader-area-updated">area_updated</link>"
9191 // signal.
92-type PixbufModuleUpdatedFunc func(uintptr, int32, int32, int32, int32, uintptr)
92+type PixbufModuleUpdatedFunc func(uintptr, int, int, int, int, uintptr)
9393
9494 // A `GdkPixbufFormat` contains information about the image format accepted
9595 // by a module.
@@ -226,7 +226,7 @@ type PixbufModulePattern struct {
226226
227227 Mask string
228228
229- Relevance int32
229+ Relevance int
230230 }
231231
232232 // Flags which allow a module to specify further details about the supported
M v4/gdkpixbuf/gdk-pixbuf-loader.go +6 -6
@@ -226,7 +226,7 @@ func (x *PixbufLoader) GetPixbuf() *Pixbuf {
226226
227227 }
228228
229-var xPixbufLoaderSetSize func(uintptr, int32, int32)
229+var xPixbufLoaderSetSize func(uintptr, int, int)
230230
231231 // Causes the image to be scaled while it is loaded.
232232 //
@@ -236,7 +236,7 @@ var xPixbufLoaderSetSize func(uintptr, int32, int32)
236236 //
237237 // Attempts to set the desired image size are ignored after the
238238 // emission of the ::size-prepared signal.
239-func (x *PixbufLoader) SetSize(WidthVar int32, HeightVar int32) {
239+func (x *PixbufLoader) SetSize(WidthVar int, HeightVar int) {
240240
241241 xPixbufLoaderSetSize(x.GoPointer(), WidthVar, HeightVar)
242242
@@ -293,8 +293,8 @@ func (x *PixbufLoader) ConnectAreaPrepared(cb func(PixbufLoader)) {
293293 //
294294 // Applications can use this signal to know when to repaint
295295 // areas of an image that is being loaded.
296-func (x *PixbufLoader) ConnectAreaUpdated(cb func(PixbufLoader, int32, int32, int32, int32)) {
297- fcb := func(clsPtr uintptr, XVarp int32, YVarp int32, WidthVarp int32, HeightVarp int32) {
296+func (x *PixbufLoader) ConnectAreaUpdated(cb func(PixbufLoader, int, int, int, int)) {
297+ fcb := func(clsPtr uintptr, XVarp int, YVarp int, WidthVarp int, HeightVarp int) {
298298 fa := PixbufLoader{}
299299 fa.Ptr = clsPtr
300300
@@ -327,8 +327,8 @@ func (x *PixbufLoader) ConnectClosed(cb func(PixbufLoader)) {
327327 // Applications can call gdk_pixbuf_loader_set_size() in response
328328 // to this signal to set the desired size to which the image
329329 // should be scaled.
330-func (x *PixbufLoader) ConnectSizePrepared(cb func(PixbufLoader, int32, int32)) {
331- fcb := func(clsPtr uintptr, WidthVarp int32, HeightVarp int32) {
330+func (x *PixbufLoader) ConnectSizePrepared(cb func(PixbufLoader, int, int)) {
331+ fcb := func(clsPtr uintptr, WidthVarp int, HeightVarp int) {
332332 fa := PixbufLoader{}
333333 fa.Ptr = clsPtr
334334
M v4/gdkpixbuf/gdk-pixbuf-simple-anim.go +2 -2
@@ -20,10 +20,10 @@ func PixbufSimpleAnimNewFromInternalPtr(ptr uintptr) *PixbufSimpleAnim {
2020 return cls
2121 }
2222
23-var xNewPixbufSimpleAnim func(int32, int32, float32) uintptr
23+var xNewPixbufSimpleAnim func(int, int, float32) uintptr
2424
2525 // Creates a new, empty animation.
26-func NewPixbufSimpleAnim(WidthVar int32, HeightVar int32, RateVar float32) *PixbufSimpleAnim {
26+func NewPixbufSimpleAnim(WidthVar int, HeightVar int, RateVar float32) *PixbufSimpleAnim {
2727 NewPixbufSimpleAnimPtr := xNewPixbufSimpleAnim(WidthVar, HeightVar, RateVar)
2828 if NewPixbufSimpleAnimPtr == 0 {
2929 return nil
M v4/gdkpixbuf/gdk-pixbuf.go +42 -42
@@ -157,7 +157,7 @@ func PixbufNewFromInternalPtr(ptr uintptr) *Pixbuf {
157157 return cls
158158 }
159159
160-var xNewPixbuf func(Colorspace, bool, int32, int32, int32) uintptr
160+var xNewPixbuf func(Colorspace, bool, int, int, int) uintptr
161161
162162 // Creates a new `GdkPixbuf` structure and allocates a buffer for it.
163163 //
@@ -165,7 +165,7 @@ var xNewPixbuf func(Colorspace, bool, int32, int32, int32) uintptr
165165 //
166166 // The buffer has an optimal rowstride. Note that the buffer is not cleared;
167167 // you will have to fill it completely yourself.
168-func NewPixbuf(ColorspaceVar Colorspace, HasAlphaVar bool, BitsPerSampleVar int32, WidthVar int32, HeightVar int32) *Pixbuf {
168+func NewPixbuf(ColorspaceVar Colorspace, HasAlphaVar bool, BitsPerSampleVar int, WidthVar int, HeightVar int) *Pixbuf {
169169 NewPixbufPtr := xNewPixbuf(ColorspaceVar, HasAlphaVar, BitsPerSampleVar, WidthVar, HeightVar)
170170 if NewPixbufPtr == 0 {
171171 return nil
@@ -176,7 +176,7 @@ func NewPixbuf(ColorspaceVar Colorspace, HasAlphaVar bool, BitsPerSampleVar int3
176176 return NewPixbufCls
177177 }
178178
179-var xNewFromBytesPixbuf func(*glib.Bytes, Colorspace, bool, int32, int32, int32, int32) uintptr
179+var xNewFromBytesPixbuf func(*glib.Bytes, Colorspace, bool, int, int, int, int) uintptr
180180
181181 // Creates a new #GdkPixbuf out of in-memory readonly image data.
182182 //
@@ -184,7 +184,7 @@ var xNewFromBytesPixbuf func(*glib.Bytes, Colorspace, bool, int32, int32, int32,
184184 //
185185 // This is the `GBytes` variant of gdk_pixbuf_new_from_data(), useful
186186 // for language bindings.
187-func NewFromBytesPixbuf(DataVar *glib.Bytes, ColorspaceVar Colorspace, HasAlphaVar bool, BitsPerSampleVar int32, WidthVar int32, HeightVar int32, RowstrideVar int32) *Pixbuf {
187+func NewFromBytesPixbuf(DataVar *glib.Bytes, ColorspaceVar Colorspace, HasAlphaVar bool, BitsPerSampleVar int, WidthVar int, HeightVar int, RowstrideVar int) *Pixbuf {
188188 NewFromBytesPixbufPtr := xNewFromBytesPixbuf(DataVar, ColorspaceVar, HasAlphaVar, BitsPerSampleVar, WidthVar, HeightVar, RowstrideVar)
189189 if NewFromBytesPixbufPtr == 0 {
190190 return nil
@@ -195,7 +195,7 @@ func NewFromBytesPixbuf(DataVar *glib.Bytes, ColorspaceVar Colorspace, HasAlphaV
195195 return NewFromBytesPixbufCls
196196 }
197197
198-var xNewFromDataPixbuf func(uintptr, Colorspace, bool, int32, int32, int32, int32, uintptr, uintptr) uintptr
198+var xNewFromDataPixbuf func(uintptr, Colorspace, bool, int, int, int, int, uintptr, uintptr) uintptr
199199
200200 // Creates a new #GdkPixbuf out of in-memory image data.
201201 //
@@ -208,7 +208,7 @@ var xNewFromDataPixbuf func(uintptr, Colorspace, bool, int32, int32, int32, int3
208208 // it is its responsibility to free the pixel array.
209209 //
210210 // See also: [ctor@GdkPixbuf.Pixbuf.new_from_bytes]
211-func NewFromDataPixbuf(DataVar uintptr, ColorspaceVar Colorspace, HasAlphaVar bool, BitsPerSampleVar int32, WidthVar int32, HeightVar int32, RowstrideVar int32, DestroyFnVar PixbufDestroyNotify, DestroyFnDataVar uintptr) *Pixbuf {
211+func NewFromDataPixbuf(DataVar uintptr, ColorspaceVar Colorspace, HasAlphaVar bool, BitsPerSampleVar int, WidthVar int, HeightVar int, RowstrideVar int, DestroyFnVar PixbufDestroyNotify, DestroyFnDataVar uintptr) *Pixbuf {
212212 NewFromDataPixbufPtr := xNewFromDataPixbuf(DataVar, ColorspaceVar, HasAlphaVar, BitsPerSampleVar, WidthVar, HeightVar, RowstrideVar, purego.NewCallback(DestroyFnVar), DestroyFnDataVar)
213213 if NewFromDataPixbufPtr == 0 {
214214 return nil
@@ -244,7 +244,7 @@ func NewFromFilePixbuf(FilenameVar string) *Pixbuf {
244244 return NewFromFilePixbufCls
245245 }
246246
247-var xNewFromFileAtScalePixbuf func(string, int32, int32, bool) uintptr
247+var xNewFromFileAtScalePixbuf func(string, int, int, bool) uintptr
248248
249249 // Creates a new pixbuf by loading an image from a file.
250250 //
@@ -268,7 +268,7 @@ var xNewFromFileAtScalePixbuf func(string, int32, int32, bool) uintptr
268268 // aspect ratio, a `width` or `height` of -1 means to not scale the image
269269 // at all in that dimension. Negative values for `width` and `height` are
270270 // allowed since 2.8.
271-func NewFromFileAtScalePixbuf(FilenameVar string, WidthVar int32, HeightVar int32, PreserveAspectRatioVar bool) *Pixbuf {
271+func NewFromFileAtScalePixbuf(FilenameVar string, WidthVar int, HeightVar int, PreserveAspectRatioVar bool) *Pixbuf {
272272 NewFromFileAtScalePixbufPtr := xNewFromFileAtScalePixbuf(FilenameVar, WidthVar, HeightVar, PreserveAspectRatioVar)
273273 if NewFromFileAtScalePixbufPtr == 0 {
274274 return nil
@@ -279,7 +279,7 @@ func NewFromFileAtScalePixbuf(FilenameVar string, WidthVar int32, HeightVar int3
279279 return NewFromFileAtScalePixbufCls
280280 }
281281
282-var xNewFromFileAtSizePixbuf func(string, int32, int32) uintptr
282+var xNewFromFileAtSizePixbuf func(string, int, int) uintptr
283283
284284 // Creates a new pixbuf by loading an image from a file.
285285 //
@@ -299,7 +299,7 @@ var xNewFromFileAtSizePixbuf func(string, int32, int32) uintptr
299299 // than `width` x `height`, if the aspect ratio requires it. To load
300300 // and image at the requested size, regardless of aspect ratio, use
301301 // [ctor@GdkPixbuf.Pixbuf.new_from_file_at_scale].
302-func NewFromFileAtSizePixbuf(FilenameVar string, WidthVar int32, HeightVar int32) *Pixbuf {
302+func NewFromFileAtSizePixbuf(FilenameVar string, WidthVar int, HeightVar int) *Pixbuf {
303303 NewFromFileAtSizePixbufPtr := xNewFromFileAtSizePixbuf(FilenameVar, WidthVar, HeightVar)
304304 if NewFromFileAtSizePixbufPtr == 0 {
305305 return nil
@@ -310,7 +310,7 @@ func NewFromFileAtSizePixbuf(FilenameVar string, WidthVar int32, HeightVar int32
310310 return NewFromFileAtSizePixbufCls
311311 }
312312
313-var xNewFromInlinePixbuf func(int32, uintptr, bool) uintptr
313+var xNewFromInlinePixbuf func(int, uintptr, bool) uintptr
314314
315315 // Creates a `GdkPixbuf` from a flat representation that is suitable for
316316 // storing as inline data in a program.
@@ -345,7 +345,7 @@ var xNewFromInlinePixbuf func(int32, uintptr, bool) uintptr
345345 // For non-const inline data, you could get out of memory. For untrusted
346346 // inline data located at runtime, you could have corrupt inline data in
347347 // addition.
348-func NewFromInlinePixbuf(DataLengthVar int32, DataVar uintptr, CopyPixelsVar bool) *Pixbuf {
348+func NewFromInlinePixbuf(DataLengthVar int, DataVar uintptr, CopyPixelsVar bool) *Pixbuf {
349349 NewFromInlinePixbufPtr := xNewFromInlinePixbuf(DataLengthVar, DataVar, CopyPixelsVar)
350350 if NewFromInlinePixbufPtr == 0 {
351351 return nil
@@ -373,7 +373,7 @@ func NewFromResourcePixbuf(ResourcePathVar string) *Pixbuf {
373373 return NewFromResourcePixbufCls
374374 }
375375
376-var xNewFromResourceAtScalePixbuf func(string, int32, int32, bool) uintptr
376+var xNewFromResourceAtScalePixbuf func(string, int, int, bool) uintptr
377377
378378 // Creates a new pixbuf by loading an image from an resource.
379379 //
@@ -388,7 +388,7 @@ var xNewFromResourceAtScalePixbuf func(string, int32, int32, bool) uintptr
388388 // @height of -1 means to not scale the image at all in that dimension.
389389 //
390390 // The stream is not closed.
391-func NewFromResourceAtScalePixbuf(ResourcePathVar string, WidthVar int32, HeightVar int32, PreserveAspectRatioVar bool) *Pixbuf {
391+func NewFromResourceAtScalePixbuf(ResourcePathVar string, WidthVar int, HeightVar int, PreserveAspectRatioVar bool) *Pixbuf {
392392 NewFromResourceAtScalePixbufPtr := xNewFromResourceAtScalePixbuf(ResourcePathVar, WidthVar, HeightVar, PreserveAspectRatioVar)
393393 if NewFromResourceAtScalePixbufPtr == 0 {
394394 return nil
@@ -424,7 +424,7 @@ func NewFromStreamPixbuf(StreamVar *gio.InputStream, CancellableVar *gio.Cancell
424424 return NewFromStreamPixbufCls
425425 }
426426
427-var xNewFromStreamAtScalePixbuf func(uintptr, int32, int32, bool, uintptr) uintptr
427+var xNewFromStreamAtScalePixbuf func(uintptr, int, int, bool, uintptr) uintptr
428428
429429 // Creates a new pixbuf by loading an image from an input stream.
430430 //
@@ -447,7 +447,7 @@ var xNewFromStreamAtScalePixbuf func(uintptr, int32, int32, bool, uintptr) uintp
447447 // scale the image at all in that dimension.
448448 //
449449 // The stream is not closed.
450-func NewFromStreamAtScalePixbuf(StreamVar *gio.InputStream, WidthVar int32, HeightVar int32, PreserveAspectRatioVar bool, CancellableVar *gio.Cancellable) *Pixbuf {
450+func NewFromStreamAtScalePixbuf(StreamVar *gio.InputStream, WidthVar int, HeightVar int, PreserveAspectRatioVar bool, CancellableVar *gio.Cancellable) *Pixbuf {
451451 NewFromStreamAtScalePixbufPtr := xNewFromStreamAtScalePixbuf(StreamVar.GoPointer(), WidthVar, HeightVar, PreserveAspectRatioVar, CancellableVar.GoPointer())
452452 if NewFromStreamAtScalePixbufPtr == 0 {
453453 return nil
@@ -543,7 +543,7 @@ func (x *Pixbuf) ApplyEmbeddedOrientation() *Pixbuf {
543543
544544 }
545545
546-var xPixbufComposite func(uintptr, uintptr, int32, int32, int32, int32, float64, float64, float64, float64, InterpType, int32)
546+var xPixbufComposite func(uintptr, uintptr, int, int, int, int, float64, float64, float64, float64, InterpType, int)
547547
548548 // Creates a transformation of the source image @src by scaling by
549549 // @scale_x and @scale_y then translating by @offset_x and @offset_y.
@@ -558,13 +558,13 @@ var xPixbufComposite func(uintptr, uintptr, int32, int32, int32, int32, float64,
558558 // to infinity.
559559 //
560560 // ![](composite.png)
561-func (x *Pixbuf) Composite(DestVar *Pixbuf, DestXVar int32, DestYVar int32, DestWidthVar int32, DestHeightVar int32, OffsetXVar float64, OffsetYVar float64, ScaleXVar float64, ScaleYVar float64, InterpTypeVar InterpType, OverallAlphaVar int32) {
561+func (x *Pixbuf) Composite(DestVar *Pixbuf, DestXVar int, DestYVar int, DestWidthVar int, DestHeightVar int, OffsetXVar float64, OffsetYVar float64, ScaleXVar float64, ScaleYVar float64, InterpTypeVar InterpType, OverallAlphaVar int) {
562562
563563 xPixbufComposite(x.GoPointer(), DestVar.GoPointer(), DestXVar, DestYVar, DestWidthVar, DestHeightVar, OffsetXVar, OffsetYVar, ScaleXVar, ScaleYVar, InterpTypeVar, OverallAlphaVar)
564564
565565 }
566566
567-var xPixbufCompositeColor func(uintptr, uintptr, int32, int32, int32, int32, float64, float64, float64, float64, InterpType, int32, int32, int32, int32, uint32, uint32)
567+var xPixbufCompositeColor func(uintptr, uintptr, int, int, int, int, float64, float64, float64, float64, InterpType, int, int, int, int, uint32, uint32)
568568
569569 // Creates a transformation of the source image @src by scaling by
570570 // @scale_x and @scale_y then translating by @offset_x and @offset_y,
@@ -578,18 +578,18 @@ var xPixbufCompositeColor func(uintptr, uintptr, int32, int32, int32, int32, flo
578578 //
579579 // See gdk_pixbuf_composite_color_simple() for a simpler variant of this
580580 // function suitable for many tasks.
581-func (x *Pixbuf) CompositeColor(DestVar *Pixbuf, DestXVar int32, DestYVar int32, DestWidthVar int32, DestHeightVar int32, OffsetXVar float64, OffsetYVar float64, ScaleXVar float64, ScaleYVar float64, InterpTypeVar InterpType, OverallAlphaVar int32, CheckXVar int32, CheckYVar int32, CheckSizeVar int32, Color1Var uint32, Color2Var uint32) {
581+func (x *Pixbuf) CompositeColor(DestVar *Pixbuf, DestXVar int, DestYVar int, DestWidthVar int, DestHeightVar int, OffsetXVar float64, OffsetYVar float64, ScaleXVar float64, ScaleYVar float64, InterpTypeVar InterpType, OverallAlphaVar int, CheckXVar int, CheckYVar int, CheckSizeVar int, Color1Var uint32, Color2Var uint32) {
582582
583583 xPixbufCompositeColor(x.GoPointer(), DestVar.GoPointer(), DestXVar, DestYVar, DestWidthVar, DestHeightVar, OffsetXVar, OffsetYVar, ScaleXVar, ScaleYVar, InterpTypeVar, OverallAlphaVar, CheckXVar, CheckYVar, CheckSizeVar, Color1Var, Color2Var)
584584
585585 }
586586
587-var xPixbufCompositeColorSimple func(uintptr, int32, int32, InterpType, int32, int32, uint32, uint32) uintptr
587+var xPixbufCompositeColorSimple func(uintptr, int, int, InterpType, int, int, uint32, uint32) uintptr
588588
589589 // Creates a new pixbuf by scaling `src` to `dest_width` x `dest_height`
590590 // and alpha blending the result with a checkboard of colors `color1`
591591 // and `color2`.
592-func (x *Pixbuf) CompositeColorSimple(DestWidthVar int32, DestHeightVar int32, InterpTypeVar InterpType, OverallAlphaVar int32, CheckSizeVar int32, Color1Var uint32, Color2Var uint32) *Pixbuf {
592+func (x *Pixbuf) CompositeColorSimple(DestWidthVar int, DestHeightVar int, InterpTypeVar InterpType, OverallAlphaVar int, CheckSizeVar int, Color1Var uint32, Color2Var uint32) *Pixbuf {
593593
594594 CompositeColorSimplePtr := xPixbufCompositeColorSimple(x.GoPointer(), DestWidthVar, DestHeightVar, InterpTypeVar, OverallAlphaVar, CheckSizeVar, Color1Var, Color2Var)
595595 if CompositeColorSimplePtr == 0 {
@@ -622,7 +622,7 @@ func (x *Pixbuf) Copy() *Pixbuf {
622622
623623 }
624624
625-var xPixbufCopyArea func(uintptr, int32, int32, int32, int32, uintptr, int32, int32)
625+var xPixbufCopyArea func(uintptr, int, int, int, int, uintptr, int, int)
626626
627627 // Copies a rectangular area from `src_pixbuf` to `dest_pixbuf`.
628628 //
@@ -631,7 +631,7 @@ var xPixbufCopyArea func(uintptr, int32, int32, int32, int32, uintptr, int32, in
631631 // If the source rectangle overlaps the destination rectangle on the
632632 // same pixbuf, it will be overwritten during the copy operation.
633633 // Therefore, you can not use this function to scroll a pixbuf.
634-func (x *Pixbuf) CopyArea(SrcXVar int32, SrcYVar int32, WidthVar int32, HeightVar int32, DestPixbufVar *Pixbuf, DestXVar int32, DestYVar int32) {
634+func (x *Pixbuf) CopyArea(SrcXVar int, SrcYVar int, WidthVar int, HeightVar int, DestPixbufVar *Pixbuf, DestXVar int, DestYVar int) {
635635
636636 xPixbufCopyArea(x.GoPointer(), SrcXVar, SrcYVar, WidthVar, HeightVar, DestPixbufVar.GoPointer(), DestXVar, DestYVar)
637637
@@ -681,10 +681,10 @@ func (x *Pixbuf) Flip(HorizontalVar bool) *Pixbuf {
681681
682682 }
683683
684-var xPixbufGetBitsPerSample func(uintptr) int32
684+var xPixbufGetBitsPerSample func(uintptr) int
685685
686686 // Queries the number of bits per color sample in a pixbuf.
687-func (x *Pixbuf) GetBitsPerSample() int32 {
687+func (x *Pixbuf) GetBitsPerSample() int {
688688
689689 return xPixbufGetBitsPerSample(x.GoPointer())
690690
@@ -717,19 +717,19 @@ func (x *Pixbuf) GetHasAlpha() bool {
717717
718718 }
719719
720-var xPixbufGetHeight func(uintptr) int32
720+var xPixbufGetHeight func(uintptr) int
721721
722722 // Queries the height of a pixbuf.
723-func (x *Pixbuf) GetHeight() int32 {
723+func (x *Pixbuf) GetHeight() int {
724724
725725 return xPixbufGetHeight(x.GoPointer())
726726
727727 }
728728
729-var xPixbufGetNChannels func(uintptr) int32
729+var xPixbufGetNChannels func(uintptr) int
730730
731731 // Queries the number of channels of a pixbuf.
732-func (x *Pixbuf) GetNChannels() int32 {
732+func (x *Pixbuf) GetNChannels() int {
733733
734734 return xPixbufGetNChannels(x.GoPointer())
735735
@@ -799,26 +799,26 @@ func (x *Pixbuf) GetPixelsWithLength(LengthVar uint) uintptr {
799799
800800 }
801801
802-var xPixbufGetRowstride func(uintptr) int32
802+var xPixbufGetRowstride func(uintptr) int
803803
804804 // Queries the rowstride of a pixbuf, which is the number of bytes between
805805 // the start of a row and the start of the next row.
806-func (x *Pixbuf) GetRowstride() int32 {
806+func (x *Pixbuf) GetRowstride() int {
807807
808808 return xPixbufGetRowstride(x.GoPointer())
809809
810810 }
811811
812-var xPixbufGetWidth func(uintptr) int32
812+var xPixbufGetWidth func(uintptr) int
813813
814814 // Queries the width of a pixbuf.
815-func (x *Pixbuf) GetWidth() int32 {
815+func (x *Pixbuf) GetWidth() int {
816816
817817 return xPixbufGetWidth(x.GoPointer())
818818
819819 }
820820
821-var xPixbufNewSubpixbuf func(uintptr, int32, int32, int32, int32) uintptr
821+var xPixbufNewSubpixbuf func(uintptr, int, int, int, int) uintptr
822822
823823 // Creates a new pixbuf which represents a sub-region of `src_pixbuf`.
824824 //
@@ -829,7 +829,7 @@ var xPixbufNewSubpixbuf func(uintptr, int32, int32, int32, int32) uintptr
829829 //
830830 // Note that if `src_pixbuf` is read-only, this function will force it
831831 // to be mutable.
832-func (x *Pixbuf) NewSubpixbuf(SrcXVar int32, SrcYVar int32, WidthVar int32, HeightVar int32) *Pixbuf {
832+func (x *Pixbuf) NewSubpixbuf(SrcXVar int, SrcYVar int, WidthVar int, HeightVar int) *Pixbuf {
833833
834834 NewSubpixbufPtr := xPixbufNewSubpixbuf(x.GoPointer(), SrcXVar, SrcYVar, WidthVar, HeightVar)
835835 if NewSubpixbufPtr == 0 {
@@ -1166,7 +1166,7 @@ func (x *Pixbuf) Savev(FilenameVar string, TypeVar string, OptionKeysVar []strin
11661166
11671167 }
11681168
1169-var xPixbufScale func(uintptr, uintptr, int32, int32, int32, int32, float64, float64, float64, float64, InterpType)
1169+var xPixbufScale func(uintptr, uintptr, int, int, int, int, float64, float64, float64, float64, InterpType)
11701170
11711171 // Creates a transformation of the source image @src by scaling by
11721172 // @scale_x and @scale_y then translating by @offset_x and @offset_y,
@@ -1181,13 +1181,13 @@ var xPixbufScale func(uintptr, uintptr, int32, int32, int32, int32, float64, flo
11811181 // If the source rectangle overlaps the destination rectangle on the
11821182 // same pixbuf, it will be overwritten during the scaling which
11831183 // results in rendering artifacts.
1184-func (x *Pixbuf) Scale(DestVar *Pixbuf, DestXVar int32, DestYVar int32, DestWidthVar int32, DestHeightVar int32, OffsetXVar float64, OffsetYVar float64, ScaleXVar float64, ScaleYVar float64, InterpTypeVar InterpType) {
1184+func (x *Pixbuf) Scale(DestVar *Pixbuf, DestXVar int, DestYVar int, DestWidthVar int, DestHeightVar int, OffsetXVar float64, OffsetYVar float64, ScaleXVar float64, ScaleYVar float64, InterpTypeVar InterpType) {
11851185
11861186 xPixbufScale(x.GoPointer(), DestVar.GoPointer(), DestXVar, DestYVar, DestWidthVar, DestHeightVar, OffsetXVar, OffsetYVar, ScaleXVar, ScaleYVar, InterpTypeVar)
11871187
11881188 }
11891189
1190-var xPixbufScaleSimple func(uintptr, int32, int32, InterpType) uintptr
1190+var xPixbufScaleSimple func(uintptr, int, int, InterpType) uintptr
11911191
11921192 // Create a new pixbuf containing a copy of `src` scaled to
11931193 // `dest_width` x `dest_height`.
@@ -1207,7 +1207,7 @@ var xPixbufScaleSimple func(uintptr, int32, int32, InterpType) uintptr
12071207 //
12081208 // For more complicated scaling/alpha blending see [method@GdkPixbuf.Pixbuf.scale]
12091209 // and [method@GdkPixbuf.Pixbuf.composite].
1210-func (x *Pixbuf) ScaleSimple(DestWidthVar int32, DestHeightVar int32, InterpTypeVar InterpType) *Pixbuf {
1210+func (x *Pixbuf) ScaleSimple(DestWidthVar int, DestHeightVar int, InterpTypeVar InterpType) *Pixbuf {
12111211
12121212 ScaleSimplePtr := xPixbufScaleSimple(x.GoPointer(), DestWidthVar, DestHeightVar, InterpTypeVar)
12131213 if ScaleSimplePtr == 0 {
@@ -1291,7 +1291,7 @@ func (x *Pixbuf) ToString() string {
12911291
12921292 // Loads a loadable icon. For the asynchronous version of this function,
12931293 // see g_loadable_icon_load_async().
1294-func (x *Pixbuf) Load(SizeVar int32, TypeVar string, CancellableVar *gio.Cancellable) *gio.InputStream {
1294+func (x *Pixbuf) Load(SizeVar int, TypeVar string, CancellableVar *gio.Cancellable) *gio.InputStream {
12951295
12961296 LoadPtr := gio.XGLoadableIconLoad(x.GoPointer(), SizeVar, TypeVar, CancellableVar.GoPointer())
12971297 if LoadPtr == 0 {
@@ -1307,7 +1307,7 @@ func (x *Pixbuf) Load(SizeVar int32, TypeVar string, CancellableVar *gio.Cancell
13071307 // Loads an icon asynchronously. To finish this function, see
13081308 // g_loadable_icon_load_finish(). For the synchronous, blocking
13091309 // version of this function, see g_loadable_icon_load().
1310-func (x *Pixbuf) LoadAsync(SizeVar int32, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
1310+func (x *Pixbuf) LoadAsync(SizeVar int, CancellableVar *gio.Cancellable, CallbackVar gio.AsyncReadyCallback, UserDataVar uintptr) {
13111311
13121312 gio.XGLoadableIconLoadAsync(x.GoPointer(), SizeVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
13131313
M v4/gio/gactionmap.go +3 -3
@@ -45,7 +45,7 @@ type ActionMap interface {
4545 GoPointer() uintptr
4646 SetGoPointer(uintptr)
4747 AddAction(ActionVar Action)
48- AddActionEntries(EntriesVar uintptr, NEntriesVar int32, UserDataVar uintptr)
48+ AddActionEntries(EntriesVar uintptr, NEntriesVar int, UserDataVar uintptr)
4949 LookupAction(ActionNameVar string) *ActionBase
5050 RemoveAction(ActionNameVar string)
5151 }
@@ -116,7 +116,7 @@ func (x *ActionMapBase) AddAction(ActionVar Action) {
116116 // }
117117 //
118118 // ]|
119-func (x *ActionMapBase) AddActionEntries(EntriesVar uintptr, NEntriesVar int32, UserDataVar uintptr) {
119+func (x *ActionMapBase) AddActionEntries(EntriesVar uintptr, NEntriesVar int, UserDataVar uintptr) {
120120
121121 XGActionMapAddActionEntries(x.GoPointer(), EntriesVar, NEntriesVar, UserDataVar)
122122
@@ -150,7 +150,7 @@ func (x *ActionMapBase) RemoveAction(ActionNameVar string) {
150150 }
151151
152152 var XGActionMapAddAction func(uintptr, uintptr)
153-var XGActionMapAddActionEntries func(uintptr, uintptr, int32, uintptr)
153+var XGActionMapAddActionEntries func(uintptr, uintptr, int, uintptr)
154154 var XGActionMapLookupAction func(uintptr, string) uintptr
155155 var XGActionMapRemoveAction func(uintptr, string)
156156
M v4/gio/gapplication.go +11 -11
@@ -476,7 +476,7 @@ func (x *Application) MarkBusy() {
476476
477477 }
478478
479-var xApplicationOpen func(uintptr, uintptr, int32, string)
479+var xApplicationOpen func(uintptr, uintptr, int, string)
480480
481481 // Opens the given files.
482482 //
@@ -492,7 +492,7 @@ var xApplicationOpen func(uintptr, uintptr, int32, string)
492492 //
493493 // The application must be registered before calling this function
494494 // and it must have the %G_APPLICATION_HANDLES_OPEN flag set.
495-func (x *Application) Open(FilesVar uintptr, NFilesVar int32, HintVar string) {
495+func (x *Application) Open(FilesVar uintptr, NFilesVar int, HintVar string) {
496496
497497 xApplicationOpen(x.GoPointer(), FilesVar, NFilesVar, HintVar)
498498
@@ -571,7 +571,7 @@ func (x *Application) Release() {
571571
572572 }
573573
574-var xApplicationRun func(uintptr, int32, []string) int32
574+var xApplicationRun func(uintptr, int, []string) int
575575
576576 // Runs the application.
577577 //
@@ -648,7 +648,7 @@ var xApplicationRun func(uintptr, int32, []string) int32
648648 // should not be used from applications like editors that need precise
649649 // control over when processes invoked via the commandline will exit and
650650 // what their exit status will be.
651-func (x *Application) Run(ArgcVar int32, ArgvVar []string) int32 {
651+func (x *Application) Run(ArgcVar int, ArgvVar []string) int {
652652
653653 return xApplicationRun(x.GoPointer(), ArgcVar, ArgvVar)
654654
@@ -905,8 +905,8 @@ func (x *Application) ConnectActivate(cb func(Application)) {
905905 // The ::command-line signal is emitted on the primary instance when
906906 // a commandline is not handled locally. See g_application_run() and
907907 // the #GApplicationCommandLine documentation for more information.
908-func (x *Application) ConnectCommandLine(cb func(Application, uintptr) int32) {
909- fcb := func(clsPtr uintptr, CommandLineVarp uintptr) int32 {
908+func (x *Application) ConnectCommandLine(cb func(Application, uintptr) int) {
909+ fcb := func(clsPtr uintptr, CommandLineVarp uintptr) int {
910910 fa := Application{}
911911 fa.Ptr = clsPtr
912912
@@ -957,8 +957,8 @@ func (x *Application) ConnectCommandLine(cb func(Application, uintptr) int32) {
957957 // You can override local_command_line() if you need more powerful
958958 // capabilities than what is provided here, but this should not
959959 // normally be required.
960-func (x *Application) ConnectHandleLocalOptions(cb func(Application, uintptr) int32) {
961- fcb := func(clsPtr uintptr, OptionsVarp uintptr) int32 {
960+func (x *Application) ConnectHandleLocalOptions(cb func(Application, uintptr) int) {
961+ fcb := func(clsPtr uintptr, OptionsVarp uintptr) int {
962962 fa := Application{}
963963 fa.Ptr = clsPtr
964964
@@ -986,8 +986,8 @@ func (x *Application) ConnectNameLost(cb func(Application) bool) {
986986
987987 // The ::open signal is emitted on the primary instance when there are
988988 // files to open. See g_application_open() for more information.
989-func (x *Application) ConnectOpen(cb func(Application, uintptr, int32, string)) {
990- fcb := func(clsPtr uintptr, FilesVarp uintptr, NFilesVarp int32, HintVarp string) {
989+func (x *Application) ConnectOpen(cb func(Application, uintptr, int, string)) {
990+ fcb := func(clsPtr uintptr, FilesVarp uintptr, NFilesVarp int, HintVarp string) {
991991 fa := Application{}
992992 fa.Ptr = clsPtr
993993
@@ -1309,7 +1309,7 @@ func (x *Application) AddAction(ActionVar Action) {
13091309 // }
13101310 //
13111311 // ]|
1312-func (x *Application) AddActionEntries(EntriesVar uintptr, NEntriesVar int32, UserDataVar uintptr) {
1312+func (x *Application) AddActionEntries(EntriesVar uintptr, NEntriesVar int, UserDataVar uintptr) {
13131313
13141314 XGActionMapAddActionEntries(x.GoPointer(), EntriesVar, NEntriesVar, UserDataVar)
13151315
M v4/gio/gapplicationcommandline.go +6 -6
@@ -221,7 +221,7 @@ func (x *ApplicationCommandLine) CreateFileForArg(ArgVar string) *FileBase {
221221
222222 }
223223
224-var xApplicationCommandLineGetArguments func(uintptr, int32) uintptr
224+var xApplicationCommandLineGetArguments func(uintptr, int) uintptr
225225
226226 // Gets the list of arguments that was passed on the command line.
227227 //
@@ -234,7 +234,7 @@ var xApplicationCommandLineGetArguments func(uintptr, int32) uintptr
234234 //
235235 // The return value is %NULL-terminated and should be freed using
236236 // g_strfreev().
237-func (x *ApplicationCommandLine) GetArguments(ArgcVar int32) uintptr {
237+func (x *ApplicationCommandLine) GetArguments(ArgcVar int) uintptr {
238238
239239 return xApplicationCommandLineGetArguments(x.GoPointer(), ArgcVar)
240240
@@ -279,11 +279,11 @@ func (x *ApplicationCommandLine) GetEnviron() uintptr {
279279
280280 }
281281
282-var xApplicationCommandLineGetExitStatus func(uintptr) int32
282+var xApplicationCommandLineGetExitStatus func(uintptr) int
283283
284284 // Gets the exit status of @cmdline. See
285285 // g_application_command_line_set_exit_status() for more information.
286-func (x *ApplicationCommandLine) GetExitStatus() int32 {
286+func (x *ApplicationCommandLine) GetExitStatus() int {
287287
288288 return xApplicationCommandLineGetExitStatus(x.GoPointer())
289289
@@ -403,7 +403,7 @@ func (x *ApplicationCommandLine) Printerr(FormatVar string, varArgs ...interface
403403
404404 }
405405
406-var xApplicationCommandLineSetExitStatus func(uintptr, int32)
406+var xApplicationCommandLineSetExitStatus func(uintptr, int)
407407
408408 // Sets the exit status that will be used when the invoking process
409409 // exits.
@@ -426,7 +426,7 @@ var xApplicationCommandLineSetExitStatus func(uintptr, int32)
426426 // have been 'successful' in a certain sense, and the exit status is
427427 // always zero. If the application use count is zero, though, the exit
428428 // status of the local #GApplicationCommandLine is used.
429-func (x *ApplicationCommandLine) SetExitStatus(ExitStatusVar int32) {
429+func (x *ApplicationCommandLine) SetExitStatus(ExitStatusVar int) {
430430
431431 xApplicationCommandLineSetExitStatus(x.GoPointer(), ExitStatusVar)
432432
M v4/gio/gasyncinitable.go +5 -5
@@ -124,7 +124,7 @@ type AsyncInitableIface struct {
124124 type AsyncInitable interface {
125125 GoPointer() uintptr
126126 SetGoPointer(uintptr)
127- InitAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
127+ InitAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
128128 InitFinish(ResVar AsyncResult) bool
129129 NewFinish(ResVar AsyncResult) *gobject.Object
130130 }
@@ -176,7 +176,7 @@ func (x *AsyncInitableBase) SetGoPointer(ptr uintptr) {
176176 // in a thread, so if you want to support asynchronous initialization via
177177 // threads, just implement the #GAsyncInitable interface without overriding
178178 // any interface methods.
179-func (x *AsyncInitableBase) InitAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
179+func (x *AsyncInitableBase) InitAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
180180
181181 XGAsyncInitableInitAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
182182
@@ -205,11 +205,11 @@ func (x *AsyncInitableBase) NewFinish(ResVar AsyncResult) *gobject.Object {
205205
206206 }
207207
208-var XGAsyncInitableInitAsync func(uintptr, int32, uintptr, uintptr, uintptr)
208+var XGAsyncInitableInitAsync func(uintptr, int, uintptr, uintptr, uintptr)
209209 var XGAsyncInitableInitFinish func(uintptr, uintptr) bool
210210 var XGAsyncInitableNewFinish func(uintptr, uintptr) uintptr
211211
212-var xAsyncInitableNewvAsync func([]interface{}, uint, *gobject.Parameter, int32, uintptr, uintptr, uintptr)
212+var xAsyncInitableNewvAsync func([]interface{}, uint, *gobject.Parameter, int, uintptr, uintptr, uintptr)
213213
214214 // Helper function for constructing #GAsyncInitable object. This is
215215 // similar to g_object_newv() but also initializes the object asynchronously.
@@ -217,7 +217,7 @@ var xAsyncInitableNewvAsync func([]interface{}, uint, *gobject.Parameter, int32,
217217 // When the initialization is finished, @callback will be called. You can
218218 // then call g_async_initable_new_finish() to get the new object and check
219219 // for any errors.
220-func AsyncInitableNewvAsync(ObjectTypeVar []interface{}, NParametersVar uint, ParametersVar *gobject.Parameter, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
220+func AsyncInitableNewvAsync(ObjectTypeVar []interface{}, NParametersVar uint, ParametersVar *gobject.Parameter, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
221221
222222 xAsyncInitableNewvAsync(ObjectTypeVar, NParametersVar, ParametersVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
223223
M v4/gio/gbufferedinputstream.go +4 -4
@@ -100,7 +100,7 @@ func (x *BufferedInputStream) Fill(CountVar int, CancellableVar *Cancellable) in
100100
101101 }
102102
103-var xBufferedInputStreamFillAsync func(uintptr, int, int32, uintptr, uintptr, uintptr)
103+var xBufferedInputStreamFillAsync func(uintptr, int, int, uintptr, uintptr, uintptr)
104104
105105 // Reads data into @stream's buffer asynchronously, up to @count size.
106106 // @io_priority can be used to prioritize reads. For the synchronous
@@ -108,7 +108,7 @@ var xBufferedInputStreamFillAsync func(uintptr, int, int32, uintptr, uintptr, ui
108108 //
109109 // If @count is -1 then the attempted read size is equal to the number
110110 // of bytes that are required to fill the buffer.
111-func (x *BufferedInputStream) FillAsync(CountVar int, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
111+func (x *BufferedInputStream) FillAsync(CountVar int, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
112112
113113 xBufferedInputStreamFillAsync(x.GoPointer(), CountVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
114114
@@ -162,7 +162,7 @@ func (x *BufferedInputStream) PeekBuffer(CountVar uint) uintptr {
162162
163163 }
164164
165-var xBufferedInputStreamReadByte func(uintptr, uintptr) int32
165+var xBufferedInputStreamReadByte func(uintptr, uintptr) int
166166
167167 // Tries to read a single byte from the stream or the buffer. Will block
168168 // during this read.
@@ -177,7 +177,7 @@ var xBufferedInputStreamReadByte func(uintptr, uintptr) int32
177177 // partial result will be returned, without an error.
178178 //
179179 // On error -1 is returned and @error is set accordingly.
180-func (x *BufferedInputStream) ReadByte(CancellableVar *Cancellable) int32 {
180+func (x *BufferedInputStream) ReadByte(CancellableVar *Cancellable) int {
181181
182182 return xBufferedInputStreamReadByte(x.GoPointer(), CancellableVar.GoPointer())
183183
M v4/gio/gcancellable.go +2 -2
@@ -121,7 +121,7 @@ func (x *Cancellable) Disconnect(HandlerIdVar uint32) {
121121
122122 }
123123
124-var xCancellableGetFd func(uintptr) int32
124+var xCancellableGetFd func(uintptr) int
125125
126126 // Gets the file descriptor for a cancellable job. This can be used to
127127 // implement cancellable operations on Unix systems. The returned fd will
@@ -136,7 +136,7 @@ var xCancellableGetFd func(uintptr) int32
136136 // the returned file descriptor.
137137 //
138138 // See also g_cancellable_make_pollfd().
139-func (x *Cancellable) GetFd() int32 {
139+func (x *Cancellable) GetFd() int {
140140
141141 return xCancellableGetFd(x.GoPointer())
142142
M v4/gio/gcredentials.go +2 -2
@@ -87,7 +87,7 @@ func (x *Credentials) GetNative(NativeTypeVar CredentialsType) uintptr {
8787
8888 }
8989
90-var xCredentialsGetUnixPid func(uintptr) int32
90+var xCredentialsGetUnixPid func(uintptr) int
9191
9292 // Tries to get the UNIX process identifier from @credentials. This
9393 // method is only available on UNIX platforms.
@@ -95,7 +95,7 @@ var xCredentialsGetUnixPid func(uintptr) int32
9595 // This operation can fail if #GCredentials is not supported on the
9696 // OS or if the native credentials type does not contain information
9797 // about the UNIX process ID.
98-func (x *Credentials) GetUnixPid() int32 {
98+func (x *Credentials) GetUnixPid() int {
9999
100100 return xCredentialsGetUnixPid(x.GoPointer())
101101
M v4/gio/gdatagrambased.go +6 -6
@@ -69,8 +69,8 @@ type DatagramBased interface {
6969 ConditionCheck(ConditionVar glib.IOCondition) glib.IOCondition
7070 ConditionWait(ConditionVar glib.IOCondition, TimeoutVar int64, CancellableVar *Cancellable) bool
7171 CreateSource(ConditionVar glib.IOCondition, CancellableVar *Cancellable) *glib.Source
72- ReceiveMessages(MessagesVar uintptr, NumMessagesVar uint, FlagsVar int32, TimeoutVar int64, CancellableVar *Cancellable) int32
73- SendMessages(MessagesVar uintptr, NumMessagesVar uint, FlagsVar int32, TimeoutVar int64, CancellableVar *Cancellable) int32
72+ ReceiveMessages(MessagesVar uintptr, NumMessagesVar uint, FlagsVar int, TimeoutVar int64, CancellableVar *Cancellable) int
73+ SendMessages(MessagesVar uintptr, NumMessagesVar uint, FlagsVar int, TimeoutVar int64, CancellableVar *Cancellable) int
7474 }
7575 type DatagramBasedBase struct {
7676 Ptr uintptr
@@ -208,7 +208,7 @@ func (x *DatagramBasedBase) CreateSource(ConditionVar glib.IOCondition, Cancella
208208 // messages successfully received before the error will be returned. If
209209 // @cancellable is cancelled, %G_IO_ERROR_CANCELLED is returned as with any
210210 // other error.
211-func (x *DatagramBasedBase) ReceiveMessages(MessagesVar uintptr, NumMessagesVar uint, FlagsVar int32, TimeoutVar int64, CancellableVar *Cancellable) int32 {
211+func (x *DatagramBasedBase) ReceiveMessages(MessagesVar uintptr, NumMessagesVar uint, FlagsVar int, TimeoutVar int64, CancellableVar *Cancellable) int {
212212
213213 return XGDatagramBasedReceiveMessages(x.GoPointer(), MessagesVar, NumMessagesVar, FlagsVar, TimeoutVar, CancellableVar.GoPointer())
214214
@@ -255,7 +255,7 @@ func (x *DatagramBasedBase) ReceiveMessages(MessagesVar uintptr, NumMessagesVar
255255 // be returned if zero messages could be sent; otherwise the number of messages
256256 // successfully sent before the error will be returned. If @cancellable is
257257 // cancelled, %G_IO_ERROR_CANCELLED is returned as with any other error.
258-func (x *DatagramBasedBase) SendMessages(MessagesVar uintptr, NumMessagesVar uint, FlagsVar int32, TimeoutVar int64, CancellableVar *Cancellable) int32 {
258+func (x *DatagramBasedBase) SendMessages(MessagesVar uintptr, NumMessagesVar uint, FlagsVar int, TimeoutVar int64, CancellableVar *Cancellable) int {
259259
260260 return XGDatagramBasedSendMessages(x.GoPointer(), MessagesVar, NumMessagesVar, FlagsVar, TimeoutVar, CancellableVar.GoPointer())
261261
@@ -264,8 +264,8 @@ func (x *DatagramBasedBase) SendMessages(MessagesVar uintptr, NumMessagesVar uin
264264 var XGDatagramBasedConditionCheck func(uintptr, glib.IOCondition) glib.IOCondition
265265 var XGDatagramBasedConditionWait func(uintptr, glib.IOCondition, int64, uintptr) bool
266266 var XGDatagramBasedCreateSource func(uintptr, glib.IOCondition, uintptr) *glib.Source
267-var XGDatagramBasedReceiveMessages func(uintptr, uintptr, uint, int32, int64, uintptr) int32
268-var XGDatagramBasedSendMessages func(uintptr, uintptr, uint, int32, int64, uintptr) int32
267+var XGDatagramBasedReceiveMessages func(uintptr, uintptr, uint, int, int64, uintptr) int
268+var XGDatagramBasedSendMessages func(uintptr, uintptr, uint, int, int64, uintptr) int
269269
270270 func init() {
271271 lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL)
M v4/gio/gdatainputstream.go +6 -6
@@ -126,7 +126,7 @@ func (x *DataInputStream) ReadLine(LengthVar uint, CancellableVar *Cancellable)
126126
127127 }
128128
129-var xDataInputStreamReadLineAsync func(uintptr, int32, uintptr, uintptr, uintptr)
129+var xDataInputStreamReadLineAsync func(uintptr, int, uintptr, uintptr, uintptr)
130130
131131 // The asynchronous version of g_data_input_stream_read_line(). It is
132132 // an error to have two outstanding calls to this function.
@@ -134,7 +134,7 @@ var xDataInputStreamReadLineAsync func(uintptr, int32, uintptr, uintptr, uintptr
134134 // When the operation is finished, @callback will be called. You
135135 // can then call g_data_input_stream_read_line_finish() to get
136136 // the result of the operation.
137-func (x *DataInputStream) ReadLineAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
137+func (x *DataInputStream) ReadLineAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
138138
139139 xDataInputStreamReadLineAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
140140
@@ -238,7 +238,7 @@ func (x *DataInputStream) ReadUntil(StopCharsVar string, LengthVar uint, Cancell
238238
239239 }
240240
241-var xDataInputStreamReadUntilAsync func(uintptr, string, int32, uintptr, uintptr, uintptr)
241+var xDataInputStreamReadUntilAsync func(uintptr, string, int, uintptr, uintptr, uintptr)
242242
243243 // The asynchronous version of g_data_input_stream_read_until().
244244 // It is an error to have two outstanding calls to this function.
@@ -255,7 +255,7 @@ var xDataInputStreamReadUntilAsync func(uintptr, string, int32, uintptr, uintptr
255255 // inconsistent with g_data_input_stream_read_until(). Both functions
256256 // will be marked as deprecated in a future release. Use
257257 // g_data_input_stream_read_upto_async() instead.
258-func (x *DataInputStream) ReadUntilAsync(StopCharsVar string, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
258+func (x *DataInputStream) ReadUntilAsync(StopCharsVar string, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
259259
260260 xDataInputStreamReadUntilAsync(x.GoPointer(), StopCharsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
261261
@@ -291,7 +291,7 @@ func (x *DataInputStream) ReadUpto(StopCharsVar string, StopCharsLenVar int, Len
291291
292292 }
293293
294-var xDataInputStreamReadUptoAsync func(uintptr, string, int, int32, uintptr, uintptr, uintptr)
294+var xDataInputStreamReadUptoAsync func(uintptr, string, int, int, uintptr, uintptr, uintptr)
295295
296296 // The asynchronous version of g_data_input_stream_read_upto().
297297 // It is an error to have two outstanding calls to this function.
@@ -307,7 +307,7 @@ var xDataInputStreamReadUptoAsync func(uintptr, string, int, int32, uintptr, uin
307307 // When the operation is finished, @callback will be called. You
308308 // can then call g_data_input_stream_read_upto_finish() to get
309309 // the result of the operation.
310-func (x *DataInputStream) ReadUptoAsync(StopCharsVar string, StopCharsLenVar int, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
310+func (x *DataInputStream) ReadUptoAsync(StopCharsVar string, StopCharsLenVar int, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
311311
312312 xDataInputStreamReadUptoAsync(x.GoPointer(), StopCharsVar, StopCharsLenVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
313313
M v4/gio/gdbuserror.go +4 -4
@@ -91,14 +91,14 @@ func DbusErrorNewForDbusError(DbusErrorNameVar string, DbusErrorMessageVar strin
9191
9292 }
9393
94-var xDbusErrorRegisterError func(glib.Quark, int32, string) bool
94+var xDbusErrorRegisterError func(glib.Quark, int, string) bool
9595
9696 // Creates an association to map between @dbus_error_name and
9797 // #GErrors specified by @error_domain and @error_code.
9898 //
9999 // This is typically done in the routine that returns the #GQuark for
100100 // an error domain.
101-func DbusErrorRegisterError(ErrorDomainVar glib.Quark, ErrorCodeVar int32, DbusErrorNameVar string) bool {
101+func DbusErrorRegisterError(ErrorDomainVar glib.Quark, ErrorCodeVar int, DbusErrorNameVar string) bool {
102102
103103 return xDbusErrorRegisterError(ErrorDomainVar, ErrorCodeVar, DbusErrorNameVar)
104104
@@ -130,10 +130,10 @@ func DbusErrorStripRemoteError(ErrorVar *glib.Error) bool {
130130
131131 }
132132
133-var xDbusErrorUnregisterError func(glib.Quark, int32, string) bool
133+var xDbusErrorUnregisterError func(glib.Quark, int, string) bool
134134
135135 // Destroys an association previously set up with g_dbus_error_register_error().
136-func DbusErrorUnregisterError(ErrorDomainVar glib.Quark, ErrorCodeVar int32, DbusErrorNameVar string) bool {
136+func DbusErrorUnregisterError(ErrorDomainVar glib.Quark, ErrorCodeVar int, DbusErrorNameVar string) bool {
137137
138138 return xDbusErrorUnregisterError(ErrorDomainVar, ErrorCodeVar, DbusErrorNameVar)
139139
M v4/gio/gdbusobjectmanagerclient.go +1 -1
@@ -302,7 +302,7 @@ func (x *DBusObjectManagerClient) ConnectInterfaceProxySignal(cb func(DBusObject
302302 // in a thread, so if you want to support asynchronous initialization via
303303 // threads, just implement the #GAsyncInitable interface without overriding
304304 // any interface methods.
305-func (x *DBusObjectManagerClient) InitAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
305+func (x *DBusObjectManagerClient) InitAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
306306
307307 XGAsyncInitableInitAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
308308
M v4/gio/gdbusproxy.go +13 -13
@@ -151,7 +151,7 @@ func NewSyncDBusProxy(ConnectionVar *DBusConnection, FlagsVar DBusProxyFlags, In
151151 return NewSyncDBusProxyCls
152152 }
153153
154-var xDBusProxyCall func(uintptr, string, *glib.Variant, DBusCallFlags, int32, uintptr, uintptr, uintptr)
154+var xDBusProxyCall func(uintptr, string, *glib.Variant, DBusCallFlags, int, uintptr, uintptr, uintptr)
155155
156156 // Asynchronously invokes the @method_name method on @proxy.
157157 //
@@ -197,7 +197,7 @@ var xDBusProxyCall func(uintptr, string, *glib.Variant, DBusCallFlags, int32, ui
197197 //
198198 // If @callback is %NULL then the D-Bus method call message will be sent with
199199 // the %G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED flag set.
200-func (x *DBusProxy) Call(MethodNameVar string, ParametersVar *glib.Variant, FlagsVar DBusCallFlags, TimeoutMsecVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
200+func (x *DBusProxy) Call(MethodNameVar string, ParametersVar *glib.Variant, FlagsVar DBusCallFlags, TimeoutMsecVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
201201
202202 xDBusProxyCall(x.GoPointer(), MethodNameVar, ParametersVar, FlagsVar, TimeoutMsecVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
203203
@@ -212,7 +212,7 @@ func (x *DBusProxy) CallFinish(ResVar AsyncResult) *glib.Variant {
212212
213213 }
214214
215-var xDBusProxyCallSync func(uintptr, string, *glib.Variant, DBusCallFlags, int32, uintptr) *glib.Variant
215+var xDBusProxyCallSync func(uintptr, string, *glib.Variant, DBusCallFlags, int, uintptr) *glib.Variant
216216
217217 // Synchronously invokes the @method_name method on @proxy.
218218 //
@@ -250,18 +250,18 @@ var xDBusProxyCallSync func(uintptr, string, *glib.Variant, DBusCallFlags, int32
250250 // If @proxy has an expected interface (see
251251 // #GDBusProxy:g-interface-info) and @method_name is referenced by it,
252252 // then the return value is checked against the return type.
253-func (x *DBusProxy) CallSync(MethodNameVar string, ParametersVar *glib.Variant, FlagsVar DBusCallFlags, TimeoutMsecVar int32, CancellableVar *Cancellable) *glib.Variant {
253+func (x *DBusProxy) CallSync(MethodNameVar string, ParametersVar *glib.Variant, FlagsVar DBusCallFlags, TimeoutMsecVar int, CancellableVar *Cancellable) *glib.Variant {
254254
255255 return xDBusProxyCallSync(x.GoPointer(), MethodNameVar, ParametersVar, FlagsVar, TimeoutMsecVar, CancellableVar.GoPointer())
256256
257257 }
258258
259-var xDBusProxyCallWithUnixFdList func(uintptr, string, *glib.Variant, DBusCallFlags, int32, uintptr, uintptr, uintptr, uintptr)
259+var xDBusProxyCallWithUnixFdList func(uintptr, string, *glib.Variant, DBusCallFlags, int, uintptr, uintptr, uintptr, uintptr)
260260
261261 // Like g_dbus_proxy_call() but also takes a #GUnixFDList object.
262262 //
263263 // This method is only available on UNIX.
264-func (x *DBusProxy) CallWithUnixFdList(MethodNameVar string, ParametersVar *glib.Variant, FlagsVar DBusCallFlags, TimeoutMsecVar int32, FdListVar *UnixFDList, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
264+func (x *DBusProxy) CallWithUnixFdList(MethodNameVar string, ParametersVar *glib.Variant, FlagsVar DBusCallFlags, TimeoutMsecVar int, FdListVar *UnixFDList, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
265265
266266 xDBusProxyCallWithUnixFdList(x.GoPointer(), MethodNameVar, ParametersVar, FlagsVar, TimeoutMsecVar, FdListVar.GoPointer(), CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
267267
@@ -276,12 +276,12 @@ func (x *DBusProxy) CallWithUnixFdListFinish(OutFdListVar **UnixFDList, ResVar A
276276
277277 }
278278
279-var xDBusProxyCallWithUnixFdListSync func(uintptr, string, *glib.Variant, DBusCallFlags, int32, uintptr, *uintptr, uintptr) *glib.Variant
279+var xDBusProxyCallWithUnixFdListSync func(uintptr, string, *glib.Variant, DBusCallFlags, int, uintptr, *uintptr, uintptr) *glib.Variant
280280
281281 // Like g_dbus_proxy_call_sync() but also takes and returns #GUnixFDList objects.
282282 //
283283 // This method is only available on UNIX.
284-func (x *DBusProxy) CallWithUnixFdListSync(MethodNameVar string, ParametersVar *glib.Variant, FlagsVar DBusCallFlags, TimeoutMsecVar int32, FdListVar *UnixFDList, OutFdListVar **UnixFDList, CancellableVar *Cancellable) *glib.Variant {
284+func (x *DBusProxy) CallWithUnixFdListSync(MethodNameVar string, ParametersVar *glib.Variant, FlagsVar DBusCallFlags, TimeoutMsecVar int, FdListVar *UnixFDList, OutFdListVar **UnixFDList, CancellableVar *Cancellable) *glib.Variant {
285285
286286 return xDBusProxyCallWithUnixFdListSync(x.GoPointer(), MethodNameVar, ParametersVar, FlagsVar, TimeoutMsecVar, FdListVar.GoPointer(), gobject.ConvertPtr(OutFdListVar), CancellableVar.GoPointer())
287287
@@ -328,14 +328,14 @@ func (x *DBusProxy) GetConnection() *DBusConnection {
328328
329329 }
330330
331-var xDBusProxyGetDefaultTimeout func(uintptr) int32
331+var xDBusProxyGetDefaultTimeout func(uintptr) int
332332
333333 // Gets the timeout to use if -1 (specifying default timeout) is
334334 // passed as @timeout_msec in the g_dbus_proxy_call() and
335335 // g_dbus_proxy_call_sync() functions.
336336 //
337337 // See the #GDBusProxy:g-default-timeout property for more details.
338-func (x *DBusProxy) GetDefaultTimeout() int32 {
338+func (x *DBusProxy) GetDefaultTimeout() int {
339339
340340 return xDBusProxyGetDefaultTimeout(x.GoPointer())
341341
@@ -447,14 +447,14 @@ func (x *DBusProxy) SetCachedProperty(PropertyNameVar string, ValueVar *glib.Var
447447
448448 }
449449
450-var xDBusProxySetDefaultTimeout func(uintptr, int32)
450+var xDBusProxySetDefaultTimeout func(uintptr, int)
451451
452452 // Sets the timeout to use if -1 (specifying default timeout) is
453453 // passed as @timeout_msec in the g_dbus_proxy_call() and
454454 // g_dbus_proxy_call_sync() functions.
455455 //
456456 // See the #GDBusProxy:g-default-timeout property for more details.
457-func (x *DBusProxy) SetDefaultTimeout(TimeoutMsecVar int32) {
457+func (x *DBusProxy) SetDefaultTimeout(TimeoutMsecVar int) {
458458
459459 xDBusProxySetDefaultTimeout(x.GoPointer(), TimeoutMsecVar)
460460
@@ -554,7 +554,7 @@ func (x *DBusProxy) ConnectGSignal(cb func(DBusProxy, string, string, uintptr))
554554 // in a thread, so if you want to support asynchronous initialization via
555555 // threads, just implement the #GAsyncInitable interface without overriding
556556 // any interface methods.
557-func (x *DBusProxy) InitAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
557+func (x *DBusProxy) InitAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
558558
559559 XGAsyncInitableInitAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
560560
M v4/gio/gdesktopappinfo.go +2 -2
@@ -336,7 +336,7 @@ func (x *DesktopAppInfo) LaunchUrisAsManager(UrisVar *glib.List, LaunchContextVa
336336
337337 }
338338
339-var xDesktopAppInfoLaunchUrisAsManagerWithFds func(uintptr, *glib.List, uintptr, glib.SpawnFlags, uintptr, uintptr, uintptr, uintptr, int32, int32, int32) bool
339+var xDesktopAppInfoLaunchUrisAsManagerWithFds func(uintptr, *glib.List, uintptr, glib.SpawnFlags, uintptr, uintptr, uintptr, uintptr, int, int, int) bool
340340
341341 // Equivalent to g_desktop_app_info_launch_uris_as_manager() but allows
342342 // you to pass in file descriptors for the stdin, stdout and stderr streams
@@ -344,7 +344,7 @@ var xDesktopAppInfoLaunchUrisAsManagerWithFds func(uintptr, *glib.List, uintptr,
344344 //
345345 // If application launching occurs via some non-spawn mechanism (e.g. D-Bus
346346 // activation) then @stdin_fd, @stdout_fd and @stderr_fd are ignored.
347-func (x *DesktopAppInfo) LaunchUrisAsManagerWithFds(UrisVar *glib.List, LaunchContextVar *AppLaunchContext, SpawnFlagsVar glib.SpawnFlags, UserSetupVar glib.SpawnChildSetupFunc, UserSetupDataVar uintptr, PidCallbackVar DesktopAppLaunchCallback, PidCallbackDataVar uintptr, StdinFdVar int32, StdoutFdVar int32, StderrFdVar int32) bool {
347+func (x *DesktopAppInfo) LaunchUrisAsManagerWithFds(UrisVar *glib.List, LaunchContextVar *AppLaunchContext, SpawnFlagsVar glib.SpawnFlags, UserSetupVar glib.SpawnChildSetupFunc, UserSetupDataVar uintptr, PidCallbackVar DesktopAppLaunchCallback, PidCallbackDataVar uintptr, StdinFdVar int, StdoutFdVar int, StderrFdVar int) bool {
348348
349349 return xDesktopAppInfoLaunchUrisAsManagerWithFds(x.GoPointer(), UrisVar, LaunchContextVar.GoPointer(), SpawnFlagsVar, purego.NewCallback(UserSetupVar), UserSetupDataVar, purego.NewCallback(PidCallbackVar), PidCallbackDataVar, StdinFdVar, StdoutFdVar, StderrFdVar)
350350
M v4/gio/gdtlsconnection.go +9 -9
@@ -35,7 +35,7 @@ type DtlsConnection interface {
3535 GoPointer() uintptr
3636 SetGoPointer(uintptr)
3737 Close(CancellableVar *Cancellable) bool
38- CloseAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
38+ CloseAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
3939 CloseFinish(ResultVar AsyncResult) bool
4040 EmitAcceptCertificate(PeerCertVar *TlsCertificate, ErrorsVar TlsCertificateFlags) bool
4141 GetCertificate() *TlsCertificate
@@ -50,7 +50,7 @@ type DtlsConnection interface {
5050 GetRehandshakeMode() TlsRehandshakeMode
5151 GetRequireCloseNotify() bool
5252 Handshake(CancellableVar *Cancellable) bool
53- HandshakeAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
53+ HandshakeAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
5454 HandshakeFinish(ResultVar AsyncResult) bool
5555 SetAdvertisedProtocols(ProtocolsVar uintptr)
5656 SetCertificate(CertificateVar *TlsCertificate)
@@ -59,7 +59,7 @@ type DtlsConnection interface {
5959 SetRehandshakeMode(ModeVar TlsRehandshakeMode)
6060 SetRequireCloseNotify(RequireCloseNotifyVar bool)
6161 Shutdown(ShutdownReadVar bool, ShutdownWriteVar bool, CancellableVar *Cancellable) bool
62- ShutdownAsync(ShutdownReadVar bool, ShutdownWriteVar bool, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
62+ ShutdownAsync(ShutdownReadVar bool, ShutdownWriteVar bool, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
6363 ShutdownFinish(ResultVar AsyncResult) bool
6464 }
6565 type DtlsConnectionBase struct {
@@ -101,7 +101,7 @@ func (x *DtlsConnectionBase) Close(CancellableVar *Cancellable) bool {
101101
102102 // Asynchronously close the DTLS connection. See g_dtls_connection_close() for
103103 // more information.
104-func (x *DtlsConnectionBase) CloseAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
104+func (x *DtlsConnectionBase) CloseAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
105105
106106 XGDtlsConnectionCloseAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
107107
@@ -309,7 +309,7 @@ func (x *DtlsConnectionBase) Handshake(CancellableVar *Cancellable) bool {
309309
310310 // Asynchronously performs a TLS handshake on @conn. See
311311 // g_dtls_connection_handshake() for more information.
312-func (x *DtlsConnectionBase) HandshakeAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
312+func (x *DtlsConnectionBase) HandshakeAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
313313
314314 XGDtlsConnectionHandshakeAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
315315
@@ -457,7 +457,7 @@ func (x *DtlsConnectionBase) Shutdown(ShutdownReadVar bool, ShutdownWriteVar boo
457457
458458 // Asynchronously shut down part or all of the DTLS connection. See
459459 // g_dtls_connection_shutdown() for more information.
460-func (x *DtlsConnectionBase) ShutdownAsync(ShutdownReadVar bool, ShutdownWriteVar bool, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
460+func (x *DtlsConnectionBase) ShutdownAsync(ShutdownReadVar bool, ShutdownWriteVar bool, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
461461
462462 XGDtlsConnectionShutdownAsync(x.GoPointer(), ShutdownReadVar, ShutdownWriteVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
463463
@@ -472,7 +472,7 @@ func (x *DtlsConnectionBase) ShutdownFinish(ResultVar AsyncResult) bool {
472472 }
473473
474474 var XGDtlsConnectionClose func(uintptr, uintptr) bool
475-var XGDtlsConnectionCloseAsync func(uintptr, int32, uintptr, uintptr, uintptr)
475+var XGDtlsConnectionCloseAsync func(uintptr, int, uintptr, uintptr, uintptr)
476476 var XGDtlsConnectionCloseFinish func(uintptr, uintptr) bool
477477 var XGDtlsConnectionEmitAcceptCertificate func(uintptr, uintptr, TlsCertificateFlags) bool
478478 var XGDtlsConnectionGetCertificate func(uintptr) uintptr
@@ -487,7 +487,7 @@ var XGDtlsConnectionGetProtocolVersion func(uintptr) TlsProtocolVersion
487487 var XGDtlsConnectionGetRehandshakeMode func(uintptr) TlsRehandshakeMode
488488 var XGDtlsConnectionGetRequireCloseNotify func(uintptr) bool
489489 var XGDtlsConnectionHandshake func(uintptr, uintptr) bool
490-var XGDtlsConnectionHandshakeAsync func(uintptr, int32, uintptr, uintptr, uintptr)
490+var XGDtlsConnectionHandshakeAsync func(uintptr, int, uintptr, uintptr, uintptr)
491491 var XGDtlsConnectionHandshakeFinish func(uintptr, uintptr) bool
492492 var XGDtlsConnectionSetAdvertisedProtocols func(uintptr, uintptr)
493493 var XGDtlsConnectionSetCertificate func(uintptr, uintptr)
@@ -496,7 +496,7 @@ var XGDtlsConnectionSetInteraction func(uintptr, uintptr)
496496 var XGDtlsConnectionSetRehandshakeMode func(uintptr, TlsRehandshakeMode)
497497 var XGDtlsConnectionSetRequireCloseNotify func(uintptr, bool)
498498 var XGDtlsConnectionShutdown func(uintptr, bool, bool, uintptr) bool
499-var XGDtlsConnectionShutdownAsync func(uintptr, bool, bool, int32, uintptr, uintptr, uintptr)
499+var XGDtlsConnectionShutdownAsync func(uintptr, bool, bool, int, uintptr, uintptr, uintptr)
500500 var XGDtlsConnectionShutdownFinish func(uintptr, uintptr) bool
501501
502502 func init() {
M v4/gio/gfile.go +60 -60
@@ -100,21 +100,21 @@ type File interface {
100100 GoPointer() uintptr
101101 SetGoPointer(uintptr)
102102 AppendTo(FlagsVar FileCreateFlags, CancellableVar *Cancellable) *FileOutputStream
103- AppendToAsync(FlagsVar FileCreateFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
103+ AppendToAsync(FlagsVar FileCreateFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
104104 AppendToFinish(ResVar AsyncResult) *FileOutputStream
105105 BuildAttributeListForCopy(FlagsVar FileCopyFlags, CancellableVar *Cancellable) string
106106 Copy(DestinationVar File, FlagsVar FileCopyFlags, CancellableVar *Cancellable, ProgressCallbackVar FileProgressCallback, ProgressCallbackDataVar uintptr) bool
107- CopyAsync(DestinationVar File, FlagsVar FileCopyFlags, IoPriorityVar int32, CancellableVar *Cancellable, ProgressCallbackVar FileProgressCallback, ProgressCallbackDataVar uintptr, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
107+ CopyAsync(DestinationVar File, FlagsVar FileCopyFlags, IoPriorityVar int, CancellableVar *Cancellable, ProgressCallbackVar FileProgressCallback, ProgressCallbackDataVar uintptr, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
108108 CopyAttributes(DestinationVar File, FlagsVar FileCopyFlags, CancellableVar *Cancellable) bool
109109 CopyFinish(ResVar AsyncResult) bool
110110 Create(FlagsVar FileCreateFlags, CancellableVar *Cancellable) *FileOutputStream
111- CreateAsync(FlagsVar FileCreateFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
111+ CreateAsync(FlagsVar FileCreateFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
112112 CreateFinish(ResVar AsyncResult) *FileOutputStream
113113 CreateReadwrite(FlagsVar FileCreateFlags, CancellableVar *Cancellable) *FileIOStream
114- CreateReadwriteAsync(FlagsVar FileCreateFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
114+ CreateReadwriteAsync(FlagsVar FileCreateFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
115115 CreateReadwriteFinish(ResVar AsyncResult) *FileIOStream
116116 Delete(CancellableVar *Cancellable) bool
117- DeleteAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
117+ DeleteAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
118118 DeleteFinish(ResultVar AsyncResult) bool
119119 Dup() *FileBase
120120 EjectMountable(FlagsVar MountUnmountFlags, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
@@ -122,11 +122,11 @@ type File interface {
122122 EjectMountableWithOperation(FlagsVar MountUnmountFlags, MountOperationVar *MountOperation, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
123123 EjectMountableWithOperationFinish(ResultVar AsyncResult) bool
124124 EnumerateChildren(AttributesVar string, FlagsVar FileQueryInfoFlags, CancellableVar *Cancellable) *FileEnumerator
125- EnumerateChildrenAsync(AttributesVar string, FlagsVar FileQueryInfoFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
125+ EnumerateChildrenAsync(AttributesVar string, FlagsVar FileQueryInfoFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
126126 EnumerateChildrenFinish(ResVar AsyncResult) *FileEnumerator
127127 Equal(File2Var File) bool
128128 FindEnclosingMount(CancellableVar *Cancellable) *MountBase
129- FindEnclosingMountAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
129+ FindEnclosingMountAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
130130 FindEnclosingMountFinish(ResVar AsyncResult) *MountBase
131131 GetBasename() string
132132 GetChild(NameVar string) *FileBase
@@ -151,12 +151,12 @@ type File interface {
151151 LoadPartialContentsAsync(CancellableVar *Cancellable, ReadMoreCallbackVar FileReadMoreCallback, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
152152 LoadPartialContentsFinish(ResVar AsyncResult, ContentsVar []string, LengthVar uint, EtagOutVar string) bool
153153 MakeDirectory(CancellableVar *Cancellable) bool
154- MakeDirectoryAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
154+ MakeDirectoryAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
155155 MakeDirectoryFinish(ResultVar AsyncResult) bool
156156 MakeDirectoryWithParents(CancellableVar *Cancellable) bool
157157 MakeSymbolicLink(SymlinkValueVar string, CancellableVar *Cancellable) bool
158158 MeasureDiskUsage(FlagsVar FileMeasureFlags, CancellableVar *Cancellable, ProgressCallbackVar FileMeasureProgressCallback, ProgressDataVar uintptr, DiskUsageVar uint64, NumDirsVar uint64, NumFilesVar uint64) bool
159- MeasureDiskUsageAsync(FlagsVar FileMeasureFlags, IoPriorityVar int32, CancellableVar *Cancellable, ProgressCallbackVar FileMeasureProgressCallback, ProgressDataVar uintptr, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
159+ MeasureDiskUsageAsync(FlagsVar FileMeasureFlags, IoPriorityVar int, CancellableVar *Cancellable, ProgressCallbackVar FileMeasureProgressCallback, ProgressDataVar uintptr, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
160160 MeasureDiskUsageFinish(ResultVar AsyncResult, DiskUsageVar uint64, NumDirsVar uint64, NumFilesVar uint64) bool
161161 Monitor(FlagsVar FileMonitorFlags, CancellableVar *Cancellable) *FileMonitor
162162 MonitorDirectory(FlagsVar FileMonitorFlags, CancellableVar *Cancellable) *FileMonitor
@@ -166,39 +166,39 @@ type File interface {
166166 MountMountable(FlagsVar MountMountFlags, MountOperationVar *MountOperation, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
167167 MountMountableFinish(ResultVar AsyncResult) *FileBase
168168 Move(DestinationVar File, FlagsVar FileCopyFlags, CancellableVar *Cancellable, ProgressCallbackVar FileProgressCallback, ProgressCallbackDataVar uintptr) bool
169- MoveAsync(DestinationVar File, FlagsVar FileCopyFlags, IoPriorityVar int32, CancellableVar *Cancellable, ProgressCallbackVar FileProgressCallback, ProgressCallbackDataVar uintptr, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
169+ MoveAsync(DestinationVar File, FlagsVar FileCopyFlags, IoPriorityVar int, CancellableVar *Cancellable, ProgressCallbackVar FileProgressCallback, ProgressCallbackDataVar uintptr, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
170170 MoveFinish(ResultVar AsyncResult) bool
171171 OpenReadwrite(CancellableVar *Cancellable) *FileIOStream
172- OpenReadwriteAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
172+ OpenReadwriteAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
173173 OpenReadwriteFinish(ResVar AsyncResult) *FileIOStream
174174 PeekPath() string
175175 PollMountable(CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
176176 PollMountableFinish(ResultVar AsyncResult) bool
177177 QueryDefaultHandler(CancellableVar *Cancellable) *AppInfoBase
178- QueryDefaultHandlerAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
178+ QueryDefaultHandlerAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
179179 QueryDefaultHandlerFinish(ResultVar AsyncResult) *AppInfoBase
180180 QueryExists(CancellableVar *Cancellable) bool
181181 QueryFileType(FlagsVar FileQueryInfoFlags, CancellableVar *Cancellable) FileType
182182 QueryFilesystemInfo(AttributesVar string, CancellableVar *Cancellable) *FileInfo
183- QueryFilesystemInfoAsync(AttributesVar string, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
183+ QueryFilesystemInfoAsync(AttributesVar string, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
184184 QueryFilesystemInfoFinish(ResVar AsyncResult) *FileInfo
185185 QueryInfo(AttributesVar string, FlagsVar FileQueryInfoFlags, CancellableVar *Cancellable) *FileInfo
186- QueryInfoAsync(AttributesVar string, FlagsVar FileQueryInfoFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
186+ QueryInfoAsync(AttributesVar string, FlagsVar FileQueryInfoFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
187187 QueryInfoFinish(ResVar AsyncResult) *FileInfo
188188 QuerySettableAttributes(CancellableVar *Cancellable) *FileAttributeInfoList
189189 QueryWritableNamespaces(CancellableVar *Cancellable) *FileAttributeInfoList
190190 Read(CancellableVar *Cancellable) *FileInputStream
191- ReadAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
191+ ReadAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
192192 ReadFinish(ResVar AsyncResult) *FileInputStream
193193 Replace(EtagVar string, MakeBackupVar bool, FlagsVar FileCreateFlags, CancellableVar *Cancellable) *FileOutputStream
194- ReplaceAsync(EtagVar string, MakeBackupVar bool, FlagsVar FileCreateFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
194+ ReplaceAsync(EtagVar string, MakeBackupVar bool, FlagsVar FileCreateFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
195195 ReplaceContents(ContentsVar string, LengthVar uint, EtagVar string, MakeBackupVar bool, FlagsVar FileCreateFlags, NewEtagVar string, CancellableVar *Cancellable) bool
196196 ReplaceContentsAsync(ContentsVar string, LengthVar uint, EtagVar string, MakeBackupVar bool, FlagsVar FileCreateFlags, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
197197 ReplaceContentsBytesAsync(ContentsVar *glib.Bytes, EtagVar string, MakeBackupVar bool, FlagsVar FileCreateFlags, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
198198 ReplaceContentsFinish(ResVar AsyncResult, NewEtagVar string) bool
199199 ReplaceFinish(ResVar AsyncResult) *FileOutputStream
200200 ReplaceReadwrite(EtagVar string, MakeBackupVar bool, FlagsVar FileCreateFlags, CancellableVar *Cancellable) *FileIOStream
201- ReplaceReadwriteAsync(EtagVar string, MakeBackupVar bool, FlagsVar FileCreateFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
201+ ReplaceReadwriteAsync(EtagVar string, MakeBackupVar bool, FlagsVar FileCreateFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
202202 ReplaceReadwriteFinish(ResVar AsyncResult) *FileIOStream
203203 ResolveRelativePath(RelativePathVar string) *FileBase
204204 SetAttribute(AttributeVar string, TypeVar FileAttributeType, ValuePVar uintptr, FlagsVar FileQueryInfoFlags, CancellableVar *Cancellable) bool
@@ -208,11 +208,11 @@ type File interface {
208208 SetAttributeString(AttributeVar string, ValueVar string, FlagsVar FileQueryInfoFlags, CancellableVar *Cancellable) bool
209209 SetAttributeUint32(AttributeVar string, ValueVar uint32, FlagsVar FileQueryInfoFlags, CancellableVar *Cancellable) bool
210210 SetAttributeUint64(AttributeVar string, ValueVar uint64, FlagsVar FileQueryInfoFlags, CancellableVar *Cancellable) bool
211- SetAttributesAsync(InfoVar *FileInfo, FlagsVar FileQueryInfoFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
211+ SetAttributesAsync(InfoVar *FileInfo, FlagsVar FileQueryInfoFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
212212 SetAttributesFinish(ResultVar AsyncResult, InfoVar **FileInfo) bool
213213 SetAttributesFromInfo(InfoVar *FileInfo, FlagsVar FileQueryInfoFlags, CancellableVar *Cancellable) bool
214214 SetDisplayName(DisplayNameVar string, CancellableVar *Cancellable) *FileBase
215- SetDisplayNameAsync(DisplayNameVar string, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
215+ SetDisplayNameAsync(DisplayNameVar string, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
216216 SetDisplayNameFinish(ResVar AsyncResult) *FileBase
217217 StartMountable(FlagsVar DriveStartFlags, StartOperationVar *MountOperation, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
218218 StartMountableFinish(ResultVar AsyncResult) bool
@@ -220,7 +220,7 @@ type File interface {
220220 StopMountableFinish(ResultVar AsyncResult) bool
221221 SupportsThreadContexts() bool
222222 Trash(CancellableVar *Cancellable) bool
223- TrashAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
223+ TrashAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
224224 TrashFinish(ResultVar AsyncResult) bool
225225 UnmountMountable(FlagsVar MountUnmountFlags, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
226226 UnmountMountableFinish(ResultVar AsyncResult) bool
@@ -277,7 +277,7 @@ func (x *FileBase) AppendTo(FlagsVar FileCreateFlags, CancellableVar *Cancellabl
277277 // When the operation is finished, @callback will be called.
278278 // You can then call g_file_append_to_finish() to get the result
279279 // of the operation.
280-func (x *FileBase) AppendToAsync(FlagsVar FileCreateFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
280+func (x *FileBase) AppendToAsync(FlagsVar FileCreateFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
281281
282282 XGFileAppendToAsync(x.GoPointer(), FlagsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
283283
@@ -369,7 +369,7 @@ func (x *FileBase) Copy(DestinationVar File, FlagsVar FileCopyFlags, Cancellable
369369 //
370370 // When the operation is finished, @callback will be called. You can then call
371371 // g_file_copy_finish() to get the result of the operation.
372-func (x *FileBase) CopyAsync(DestinationVar File, FlagsVar FileCopyFlags, IoPriorityVar int32, CancellableVar *Cancellable, ProgressCallbackVar FileProgressCallback, ProgressCallbackDataVar uintptr, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
372+func (x *FileBase) CopyAsync(DestinationVar File, FlagsVar FileCopyFlags, IoPriorityVar int, CancellableVar *Cancellable, ProgressCallbackVar FileProgressCallback, ProgressCallbackDataVar uintptr, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
373373
374374 XGFileCopyAsync(x.GoPointer(), DestinationVar.GoPointer(), FlagsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(ProgressCallbackVar), ProgressCallbackDataVar, purego.NewCallback(CallbackVar), UserDataVar)
375375
@@ -437,7 +437,7 @@ func (x *FileBase) Create(FlagsVar FileCreateFlags, CancellableVar *Cancellable)
437437 // When the operation is finished, @callback will be called.
438438 // You can then call g_file_create_finish() to get the result
439439 // of the operation.
440-func (x *FileBase) CreateAsync(FlagsVar FileCreateFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
440+func (x *FileBase) CreateAsync(FlagsVar FileCreateFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
441441
442442 XGFileCreateAsync(x.GoPointer(), FlagsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
443443
@@ -503,7 +503,7 @@ func (x *FileBase) CreateReadwrite(FlagsVar FileCreateFlags, CancellableVar *Can
503503 // When the operation is finished, @callback will be called.
504504 // You can then call g_file_create_readwrite_finish() to get
505505 // the result of the operation.
506-func (x *FileBase) CreateReadwriteAsync(FlagsVar FileCreateFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
506+func (x *FileBase) CreateReadwriteAsync(FlagsVar FileCreateFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
507507
508508 XGFileCreateReadwriteAsync(x.GoPointer(), FlagsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
509509
@@ -556,7 +556,7 @@ func (x *FileBase) Delete(CancellableVar *Cancellable) bool {
556556 // Asynchronously delete a file. If the @file is a directory, it will
557557 // only be deleted if it is empty. This has the same semantics as
558558 // g_unlink().
559-func (x *FileBase) DeleteAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
559+func (x *FileBase) DeleteAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
560560
561561 XGFileDeleteAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
562562
@@ -684,7 +684,7 @@ func (x *FileBase) EnumerateChildren(AttributesVar string, FlagsVar FileQueryInf
684684 // When the operation is finished, @callback will be called. You can
685685 // then call g_file_enumerate_children_finish() to get the result of
686686 // the operation.
687-func (x *FileBase) EnumerateChildrenAsync(AttributesVar string, FlagsVar FileQueryInfoFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
687+func (x *FileBase) EnumerateChildrenAsync(AttributesVar string, FlagsVar FileQueryInfoFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
688688
689689 XGFileEnumerateChildrenAsync(x.GoPointer(), AttributesVar, FlagsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
690690
@@ -748,7 +748,7 @@ func (x *FileBase) FindEnclosingMount(CancellableVar *Cancellable) *MountBase {
748748 // When the operation is finished, @callback will be called.
749749 // You can then call g_file_find_enclosing_mount_finish() to
750750 // get the result of the operation.
751-func (x *FileBase) FindEnclosingMountAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
751+func (x *FileBase) FindEnclosingMountAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
752752
753753 XGFileFindEnclosingMountAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
754754
@@ -1119,7 +1119,7 @@ func (x *FileBase) MakeDirectory(CancellableVar *Cancellable) bool {
11191119 }
11201120
11211121 // Asynchronously creates a directory.
1122-func (x *FileBase) MakeDirectoryAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
1122+func (x *FileBase) MakeDirectoryAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
11231123
11241124 XGFileMakeDirectoryAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
11251125
@@ -1192,7 +1192,7 @@ func (x *FileBase) MeasureDiskUsage(FlagsVar FileMeasureFlags, CancellableVar *C
11921192 //
11931193 // This is the asynchronous version of g_file_measure_disk_usage(). See
11941194 // there for more information.
1195-func (x *FileBase) MeasureDiskUsageAsync(FlagsVar FileMeasureFlags, IoPriorityVar int32, CancellableVar *Cancellable, ProgressCallbackVar FileMeasureProgressCallback, ProgressDataVar uintptr, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
1195+func (x *FileBase) MeasureDiskUsageAsync(FlagsVar FileMeasureFlags, IoPriorityVar int, CancellableVar *Cancellable, ProgressCallbackVar FileMeasureProgressCallback, ProgressDataVar uintptr, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
11961196
11971197 XGFileMeasureDiskUsageAsync(x.GoPointer(), FlagsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(ProgressCallbackVar), ProgressDataVar, purego.NewCallback(CallbackVar), UserDataVar)
11981198
@@ -1383,7 +1383,7 @@ func (x *FileBase) Move(DestinationVar File, FlagsVar FileCopyFlags, Cancellable
13831383 //
13841384 // When the operation is finished, @callback will be called. You can then call
13851385 // g_file_move_finish() to get the result of the operation.
1386-func (x *FileBase) MoveAsync(DestinationVar File, FlagsVar FileCopyFlags, IoPriorityVar int32, CancellableVar *Cancellable, ProgressCallbackVar FileProgressCallback, ProgressCallbackDataVar uintptr, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
1386+func (x *FileBase) MoveAsync(DestinationVar File, FlagsVar FileCopyFlags, IoPriorityVar int, CancellableVar *Cancellable, ProgressCallbackVar FileProgressCallback, ProgressCallbackDataVar uintptr, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
13871387
13881388 XGFileMoveAsync(x.GoPointer(), DestinationVar.GoPointer(), FlagsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(ProgressCallbackVar), ProgressCallbackDataVar, purego.NewCallback(CallbackVar), UserDataVar)
13891389
@@ -1434,7 +1434,7 @@ func (x *FileBase) OpenReadwrite(CancellableVar *Cancellable) *FileIOStream {
14341434 // When the operation is finished, @callback will be called.
14351435 // You can then call g_file_open_readwrite_finish() to get
14361436 // the result of the operation.
1437-func (x *FileBase) OpenReadwriteAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
1437+func (x *FileBase) OpenReadwriteAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
14381438
14391439 XGFileOpenReadwriteAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
14401440
@@ -1513,7 +1513,7 @@ func (x *FileBase) QueryDefaultHandler(CancellableVar *Cancellable) *AppInfoBase
15131513 }
15141514
15151515 // Async version of g_file_query_default_handler().
1516-func (x *FileBase) QueryDefaultHandlerAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
1516+func (x *FileBase) QueryDefaultHandlerAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
15171517
15181518 XGFileQueryDefaultHandlerAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
15191519
@@ -1621,7 +1621,7 @@ func (x *FileBase) QueryFilesystemInfo(AttributesVar string, CancellableVar *Can
16211621 // When the operation is finished, @callback will be called. You can
16221622 // then call g_file_query_info_finish() to get the result of the
16231623 // operation.
1624-func (x *FileBase) QueryFilesystemInfoAsync(AttributesVar string, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
1624+func (x *FileBase) QueryFilesystemInfoAsync(AttributesVar string, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
16251625
16261626 XGFileQueryFilesystemInfoAsync(x.GoPointer(), AttributesVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
16271627
@@ -1694,7 +1694,7 @@ func (x *FileBase) QueryInfo(AttributesVar string, FlagsVar FileQueryInfoFlags,
16941694 //
16951695 // When the operation is finished, @callback will be called. You can
16961696 // then call g_file_query_info_finish() to get the result of the operation.
1697-func (x *FileBase) QueryInfoAsync(AttributesVar string, FlagsVar FileQueryInfoFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
1697+func (x *FileBase) QueryInfoAsync(AttributesVar string, FlagsVar FileQueryInfoFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
16981698
16991699 XGFileQueryInfoAsync(x.GoPointer(), AttributesVar, FlagsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
17001700
@@ -1776,7 +1776,7 @@ func (x *FileBase) Read(CancellableVar *Cancellable) *FileInputStream {
17761776 // When the operation is finished, @callback will be called.
17771777 // You can then call g_file_read_finish() to get the result
17781778 // of the operation.
1779-func (x *FileBase) ReadAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
1779+func (x *FileBase) ReadAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
17801780
17811781 XGFileReadAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
17821782
@@ -1860,7 +1860,7 @@ func (x *FileBase) Replace(EtagVar string, MakeBackupVar bool, FlagsVar FileCrea
18601860 // When the operation is finished, @callback will be called.
18611861 // You can then call g_file_replace_finish() to get the result
18621862 // of the operation.
1863-func (x *FileBase) ReplaceAsync(EtagVar string, MakeBackupVar bool, FlagsVar FileCreateFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
1863+func (x *FileBase) ReplaceAsync(EtagVar string, MakeBackupVar bool, FlagsVar FileCreateFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
18641864
18651865 XGFileReplaceAsync(x.GoPointer(), EtagVar, MakeBackupVar, FlagsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
18661866
@@ -1984,7 +1984,7 @@ func (x *FileBase) ReplaceReadwrite(EtagVar string, MakeBackupVar bool, FlagsVar
19841984 // When the operation is finished, @callback will be called.
19851985 // You can then call g_file_replace_readwrite_finish() to get
19861986 // the result of the operation.
1987-func (x *FileBase) ReplaceReadwriteAsync(EtagVar string, MakeBackupVar bool, FlagsVar FileCreateFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
1987+func (x *FileBase) ReplaceReadwriteAsync(EtagVar string, MakeBackupVar bool, FlagsVar FileCreateFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
19881988
19891989 XGFileReplaceReadwriteAsync(x.GoPointer(), EtagVar, MakeBackupVar, FlagsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
19901990
@@ -2119,7 +2119,7 @@ func (x *FileBase) SetAttributeUint64(AttributeVar string, ValueVar uint64, Flag
21192119 // When the operation is finished, @callback will be called.
21202120 // You can then call g_file_set_attributes_finish() to get
21212121 // the result of the operation.
2122-func (x *FileBase) SetAttributesAsync(InfoVar *FileInfo, FlagsVar FileQueryInfoFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
2122+func (x *FileBase) SetAttributesAsync(InfoVar *FileInfo, FlagsVar FileQueryInfoFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
21232123
21242124 XGFileSetAttributesAsync(x.GoPointer(), InfoVar.GoPointer(), FlagsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
21252125
@@ -2186,7 +2186,7 @@ func (x *FileBase) SetDisplayName(DisplayNameVar string, CancellableVar *Cancell
21862186 // When the operation is finished, @callback will be called.
21872187 // You can then call g_file_set_display_name_finish() to get
21882188 // the result of the operation.
2189-func (x *FileBase) SetDisplayNameAsync(DisplayNameVar string, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
2189+func (x *FileBase) SetDisplayNameAsync(DisplayNameVar string, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
21902190
21912191 XGFileSetDisplayNameAsync(x.GoPointer(), DisplayNameVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
21922192
@@ -2286,7 +2286,7 @@ func (x *FileBase) Trash(CancellableVar *Cancellable) bool {
22862286 }
22872287
22882288 // Asynchronously sends @file to the Trash location, if possible.
2289-func (x *FileBase) TrashAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
2289+func (x *FileBase) TrashAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
22902290
22912291 XGFileTrashAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
22922292
@@ -2352,21 +2352,21 @@ func (x *FileBase) UnmountMountableWithOperationFinish(ResultVar AsyncResult) bo
23522352 }
23532353
23542354 var XGFileAppendTo func(uintptr, FileCreateFlags, uintptr) uintptr
2355-var XGFileAppendToAsync func(uintptr, FileCreateFlags, int32, uintptr, uintptr, uintptr)
2355+var XGFileAppendToAsync func(uintptr, FileCreateFlags, int, uintptr, uintptr, uintptr)
23562356 var XGFileAppendToFinish func(uintptr, uintptr) uintptr
23572357 var XGFileBuildAttributeListForCopy func(uintptr, FileCopyFlags, uintptr) string
23582358 var XGFileCopy func(uintptr, uintptr, FileCopyFlags, uintptr, uintptr, uintptr) bool
2359-var XGFileCopyAsync func(uintptr, uintptr, FileCopyFlags, int32, uintptr, uintptr, uintptr, uintptr, uintptr)
2359+var XGFileCopyAsync func(uintptr, uintptr, FileCopyFlags, int, uintptr, uintptr, uintptr, uintptr, uintptr)
23602360 var XGFileCopyAttributes func(uintptr, uintptr, FileCopyFlags, uintptr) bool
23612361 var XGFileCopyFinish func(uintptr, uintptr) bool
23622362 var XGFileCreate func(uintptr, FileCreateFlags, uintptr) uintptr
2363-var XGFileCreateAsync func(uintptr, FileCreateFlags, int32, uintptr, uintptr, uintptr)
2363+var XGFileCreateAsync func(uintptr, FileCreateFlags, int, uintptr, uintptr, uintptr)
23642364 var XGFileCreateFinish func(uintptr, uintptr) uintptr
23652365 var XGFileCreateReadwrite func(uintptr, FileCreateFlags, uintptr) uintptr
2366-var XGFileCreateReadwriteAsync func(uintptr, FileCreateFlags, int32, uintptr, uintptr, uintptr)
2366+var XGFileCreateReadwriteAsync func(uintptr, FileCreateFlags, int, uintptr, uintptr, uintptr)
23672367 var XGFileCreateReadwriteFinish func(uintptr, uintptr) uintptr
23682368 var XGFileDelete func(uintptr, uintptr) bool
2369-var XGFileDeleteAsync func(uintptr, int32, uintptr, uintptr, uintptr)
2369+var XGFileDeleteAsync func(uintptr, int, uintptr, uintptr, uintptr)
23702370 var XGFileDeleteFinish func(uintptr, uintptr) bool
23712371 var XGFileDup func(uintptr) uintptr
23722372 var XGFileEjectMountable func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr)
@@ -2374,11 +2374,11 @@ var XGFileEjectMountableFinish func(uintptr, uintptr) bool
23742374 var XGFileEjectMountableWithOperation func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr, uintptr)
23752375 var XGFileEjectMountableWithOperationFinish func(uintptr, uintptr) bool
23762376 var XGFileEnumerateChildren func(uintptr, string, FileQueryInfoFlags, uintptr) uintptr
2377-var XGFileEnumerateChildrenAsync func(uintptr, string, FileQueryInfoFlags, int32, uintptr, uintptr, uintptr)
2377+var XGFileEnumerateChildrenAsync func(uintptr, string, FileQueryInfoFlags, int, uintptr, uintptr, uintptr)
23782378 var XGFileEnumerateChildrenFinish func(uintptr, uintptr) uintptr
23792379 var XGFileEqual func(uintptr, uintptr) bool
23802380 var XGFileFindEnclosingMount func(uintptr, uintptr) uintptr
2381-var XGFileFindEnclosingMountAsync func(uintptr, int32, uintptr, uintptr, uintptr)
2381+var XGFileFindEnclosingMountAsync func(uintptr, int, uintptr, uintptr, uintptr)
23822382 var XGFileFindEnclosingMountFinish func(uintptr, uintptr) uintptr
23832383 var XGFileGetBasename func(uintptr) string
23842384 var XGFileGetChild func(uintptr, string) uintptr
@@ -2403,12 +2403,12 @@ var XGFileLoadContentsFinish func(uintptr, uintptr, []string, uint, string) bool
24032403 var XGFileLoadPartialContentsAsync func(uintptr, uintptr, uintptr, uintptr, uintptr)
24042404 var XGFileLoadPartialContentsFinish func(uintptr, uintptr, []string, uint, string) bool
24052405 var XGFileMakeDirectory func(uintptr, uintptr) bool
2406-var XGFileMakeDirectoryAsync func(uintptr, int32, uintptr, uintptr, uintptr)
2406+var XGFileMakeDirectoryAsync func(uintptr, int, uintptr, uintptr, uintptr)
24072407 var XGFileMakeDirectoryFinish func(uintptr, uintptr) bool
24082408 var XGFileMakeDirectoryWithParents func(uintptr, uintptr) bool
24092409 var XGFileMakeSymbolicLink func(uintptr, string, uintptr) bool
24102410 var XGFileMeasureDiskUsage func(uintptr, FileMeasureFlags, uintptr, uintptr, uintptr, uint64, uint64, uint64) bool
2411-var XGFileMeasureDiskUsageAsync func(uintptr, FileMeasureFlags, int32, uintptr, uintptr, uintptr, uintptr, uintptr)
2411+var XGFileMeasureDiskUsageAsync func(uintptr, FileMeasureFlags, int, uintptr, uintptr, uintptr, uintptr, uintptr)
24122412 var XGFileMeasureDiskUsageFinish func(uintptr, uintptr, uint64, uint64, uint64) bool
24132413 var XGFileMonitor func(uintptr, FileMonitorFlags, uintptr) uintptr
24142414 var XGFileMonitorDirectory func(uintptr, FileMonitorFlags, uintptr) uintptr
@@ -2418,39 +2418,39 @@ var XGFileMountEnclosingVolumeFinish func(uintptr, uintptr) bool
24182418 var XGFileMountMountable func(uintptr, MountMountFlags, uintptr, uintptr, uintptr, uintptr)
24192419 var XGFileMountMountableFinish func(uintptr, uintptr) uintptr
24202420 var XGFileMove func(uintptr, uintptr, FileCopyFlags, uintptr, uintptr, uintptr) bool
2421-var XGFileMoveAsync func(uintptr, uintptr, FileCopyFlags, int32, uintptr, uintptr, uintptr, uintptr, uintptr)
2421+var XGFileMoveAsync func(uintptr, uintptr, FileCopyFlags, int, uintptr, uintptr, uintptr, uintptr, uintptr)
24222422 var XGFileMoveFinish func(uintptr, uintptr) bool
24232423 var XGFileOpenReadwrite func(uintptr, uintptr) uintptr
2424-var XGFileOpenReadwriteAsync func(uintptr, int32, uintptr, uintptr, uintptr)
2424+var XGFileOpenReadwriteAsync func(uintptr, int, uintptr, uintptr, uintptr)
24252425 var XGFileOpenReadwriteFinish func(uintptr, uintptr) uintptr
24262426 var XGFilePeekPath func(uintptr) string
24272427 var XGFilePollMountable func(uintptr, uintptr, uintptr, uintptr)
24282428 var XGFilePollMountableFinish func(uintptr, uintptr) bool
24292429 var XGFileQueryDefaultHandler func(uintptr, uintptr) uintptr
2430-var XGFileQueryDefaultHandlerAsync func(uintptr, int32, uintptr, uintptr, uintptr)
2430+var XGFileQueryDefaultHandlerAsync func(uintptr, int, uintptr, uintptr, uintptr)
24312431 var XGFileQueryDefaultHandlerFinish func(uintptr, uintptr) uintptr
24322432 var XGFileQueryExists func(uintptr, uintptr) bool
24332433 var XGFileQueryFileType func(uintptr, FileQueryInfoFlags, uintptr) FileType
24342434 var XGFileQueryFilesystemInfo func(uintptr, string, uintptr) uintptr
2435-var XGFileQueryFilesystemInfoAsync func(uintptr, string, int32, uintptr, uintptr, uintptr)
2435+var XGFileQueryFilesystemInfoAsync func(uintptr, string, int, uintptr, uintptr, uintptr)
24362436 var XGFileQueryFilesystemInfoFinish func(uintptr, uintptr) uintptr
24372437 var XGFileQueryInfo func(uintptr, string, FileQueryInfoFlags, uintptr) uintptr
2438-var XGFileQueryInfoAsync func(uintptr, string, FileQueryInfoFlags, int32, uintptr, uintptr, uintptr)
2438+var XGFileQueryInfoAsync func(uintptr, string, FileQueryInfoFlags, int, uintptr, uintptr, uintptr)
24392439 var XGFileQueryInfoFinish func(uintptr, uintptr) uintptr
24402440 var XGFileQuerySettableAttributes func(uintptr, uintptr) *FileAttributeInfoList
24412441 var XGFileQueryWritableNamespaces func(uintptr, uintptr) *FileAttributeInfoList
24422442 var XGFileRead func(uintptr, uintptr) uintptr
2443-var XGFileReadAsync func(uintptr, int32, uintptr, uintptr, uintptr)
2443+var XGFileReadAsync func(uintptr, int, uintptr, uintptr, uintptr)
24442444 var XGFileReadFinish func(uintptr, uintptr) uintptr
24452445 var XGFileReplace func(uintptr, string, bool, FileCreateFlags, uintptr) uintptr
2446-var XGFileReplaceAsync func(uintptr, string, bool, FileCreateFlags, int32, uintptr, uintptr, uintptr)
2446+var XGFileReplaceAsync func(uintptr, string, bool, FileCreateFlags, int, uintptr, uintptr, uintptr)
24472447 var XGFileReplaceContents func(uintptr, string, uint, string, bool, FileCreateFlags, string, uintptr) bool
24482448 var XGFileReplaceContentsAsync func(uintptr, string, uint, string, bool, FileCreateFlags, uintptr, uintptr, uintptr)
24492449 var XGFileReplaceContentsBytesAsync func(uintptr, *glib.Bytes, string, bool, FileCreateFlags, uintptr, uintptr, uintptr)
24502450 var XGFileReplaceContentsFinish func(uintptr, uintptr, string) bool
24512451 var XGFileReplaceFinish func(uintptr, uintptr) uintptr
24522452 var XGFileReplaceReadwrite func(uintptr, string, bool, FileCreateFlags, uintptr) uintptr
2453-var XGFileReplaceReadwriteAsync func(uintptr, string, bool, FileCreateFlags, int32, uintptr, uintptr, uintptr)
2453+var XGFileReplaceReadwriteAsync func(uintptr, string, bool, FileCreateFlags, int, uintptr, uintptr, uintptr)
24542454 var XGFileReplaceReadwriteFinish func(uintptr, uintptr) uintptr
24552455 var XGFileResolveRelativePath func(uintptr, string) uintptr
24562456 var XGFileSetAttribute func(uintptr, string, FileAttributeType, uintptr, FileQueryInfoFlags, uintptr) bool
@@ -2460,11 +2460,11 @@ var XGFileSetAttributeInt64 func(uintptr, string, int64, FileQueryInfoFlags, uin
24602460 var XGFileSetAttributeString func(uintptr, string, string, FileQueryInfoFlags, uintptr) bool
24612461 var XGFileSetAttributeUint32 func(uintptr, string, uint32, FileQueryInfoFlags, uintptr) bool
24622462 var XGFileSetAttributeUint64 func(uintptr, string, uint64, FileQueryInfoFlags, uintptr) bool
2463-var XGFileSetAttributesAsync func(uintptr, uintptr, FileQueryInfoFlags, int32, uintptr, uintptr, uintptr)
2463+var XGFileSetAttributesAsync func(uintptr, uintptr, FileQueryInfoFlags, int, uintptr, uintptr, uintptr)
24642464 var XGFileSetAttributesFinish func(uintptr, uintptr, *uintptr) bool
24652465 var XGFileSetAttributesFromInfo func(uintptr, uintptr, FileQueryInfoFlags, uintptr) bool
24662466 var XGFileSetDisplayName func(uintptr, string, uintptr) uintptr
2467-var XGFileSetDisplayNameAsync func(uintptr, string, int32, uintptr, uintptr, uintptr)
2467+var XGFileSetDisplayNameAsync func(uintptr, string, int, uintptr, uintptr, uintptr)
24682468 var XGFileSetDisplayNameFinish func(uintptr, uintptr) uintptr
24692469 var XGFileStartMountable func(uintptr, DriveStartFlags, uintptr, uintptr, uintptr, uintptr)
24702470 var XGFileStartMountableFinish func(uintptr, uintptr) bool
@@ -2472,7 +2472,7 @@ var XGFileStopMountable func(uintptr, MountUnmountFlags, uintptr, uintptr, uintp
24722472 var XGFileStopMountableFinish func(uintptr, uintptr) bool
24732473 var XGFileSupportsThreadContexts func(uintptr) bool
24742474 var XGFileTrash func(uintptr, uintptr) bool
2475-var XGFileTrashAsync func(uintptr, int32, uintptr, uintptr, uintptr)
2475+var XGFileTrashAsync func(uintptr, int, uintptr, uintptr, uintptr)
24762476 var XGFileTrashFinish func(uintptr, uintptr) bool
24772477 var XGFileUnmountMountable func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr)
24782478 var XGFileUnmountMountableFinish func(uintptr, uintptr) bool
M v4/gio/gfileattribute.go +1 -1
@@ -15,5 +15,5 @@ type FileAttributeInfo struct {
1515 type FileAttributeInfoList struct {
1616 Infos *FileAttributeInfo
1717
18- NInfos int32
18+ NInfos int
1919 }
M v4/gio/gfiledescriptorbased.go +3 -3
@@ -20,7 +20,7 @@ type FileDescriptorBasedIface struct {
2020 type FileDescriptorBased interface {
2121 GoPointer() uintptr
2222 SetGoPointer(uintptr)
23- GetFd() int32
23+ GetFd() int
2424 }
2525 type FileDescriptorBasedBase struct {
2626 Ptr uintptr
@@ -35,13 +35,13 @@ func (x *FileDescriptorBasedBase) SetGoPointer(ptr uintptr) {
3535 }
3636
3737 // Gets the underlying file descriptor.
38-func (x *FileDescriptorBasedBase) GetFd() int32 {
38+func (x *FileDescriptorBasedBase) GetFd() int {
3939
4040 return XGFileDescriptorBasedGetFd(x.GoPointer())
4141
4242 }
4343
44-var XGFileDescriptorBasedGetFd func(uintptr) int32
44+var XGFileDescriptorBasedGetFd func(uintptr) int
4545
4646 func init() {
4747 lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL)
M v4/gio/gfileenumerator.go +4 -4
@@ -65,7 +65,7 @@ func (x *FileEnumerator) Close(CancellableVar *Cancellable) bool {
6565
6666 }
6767
68-var xFileEnumeratorCloseAsync func(uintptr, int32, uintptr, uintptr, uintptr)
68+var xFileEnumeratorCloseAsync func(uintptr, int, uintptr, uintptr, uintptr)
6969
7070 // Asynchronously closes the file enumerator.
7171 //
@@ -73,7 +73,7 @@ var xFileEnumeratorCloseAsync func(uintptr, int32, uintptr, uintptr, uintptr)
7373 // triggering the cancellable object from another thread. If the operation
7474 // was cancelled, the error %G_IO_ERROR_CANCELLED will be returned in
7575 // g_file_enumerator_close_finish().
76-func (x *FileEnumerator) CloseAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
76+func (x *FileEnumerator) CloseAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
7777
7878 xFileEnumeratorCloseAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
7979
@@ -238,7 +238,7 @@ func (x *FileEnumerator) NextFile(CancellableVar *Cancellable) *FileInfo {
238238
239239 }
240240
241-var xFileEnumeratorNextFilesAsync func(uintptr, int32, int32, uintptr, uintptr, uintptr)
241+var xFileEnumeratorNextFilesAsync func(uintptr, int, int, uintptr, uintptr, uintptr)
242242
243243 // Request information for a number of files from the enumerator asynchronously.
244244 // When all i/o for the operation is finished the @callback will be called with
@@ -259,7 +259,7 @@ var xFileEnumeratorNextFilesAsync func(uintptr, int32, int32, uintptr, uintptr,
259259 // Any outstanding i/o request with higher priority (lower numerical value) will
260260 // be executed before an outstanding request with lower priority. Default
261261 // priority is %G_PRIORITY_DEFAULT.
262-func (x *FileEnumerator) NextFilesAsync(NumFilesVar int32, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
262+func (x *FileEnumerator) NextFilesAsync(NumFilesVar int, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
263263
264264 xFileEnumeratorNextFilesAsync(x.GoPointer(), NumFilesVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
265265
M v4/gio/gfileicon.go +2 -2
@@ -105,7 +105,7 @@ func (x *FileIcon) ToString() string {
105105
106106 // Loads a loadable icon. For the asynchronous version of this function,
107107 // see g_loadable_icon_load_async().
108-func (x *FileIcon) Load(SizeVar int32, TypeVar string, CancellableVar *Cancellable) *InputStream {
108+func (x *FileIcon) Load(SizeVar int, TypeVar string, CancellableVar *Cancellable) *InputStream {
109109
110110 LoadPtr := XGLoadableIconLoad(x.GoPointer(), SizeVar, TypeVar, CancellableVar.GoPointer())
111111 if LoadPtr == 0 {
@@ -121,7 +121,7 @@ func (x *FileIcon) Load(SizeVar int32, TypeVar string, CancellableVar *Cancellab
121121 // Loads an icon asynchronously. To finish this function, see
122122 // g_loadable_icon_load_finish(). For the synchronous, blocking
123123 // version of this function, see g_loadable_icon_load().
124-func (x *FileIcon) LoadAsync(SizeVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
124+func (x *FileIcon) LoadAsync(SizeVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
125125
126126 XGLoadableIconLoadAsync(x.GoPointer(), SizeVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
127127
M v4/gio/gfileinputstream.go +2 -2
@@ -53,7 +53,7 @@ func (x *FileInputStream) QueryInfo(AttributesVar string, CancellableVar *Cancel
5353
5454 }
5555
56-var xFileInputStreamQueryInfoAsync func(uintptr, string, int32, uintptr, uintptr, uintptr)
56+var xFileInputStreamQueryInfoAsync func(uintptr, string, int, uintptr, uintptr, uintptr)
5757
5858 // Queries the stream information asynchronously.
5959 // When the operation is finished @callback will be called.
@@ -66,7 +66,7 @@ var xFileInputStreamQueryInfoAsync func(uintptr, string, int32, uintptr, uintptr
6666 // If @cancellable is not %NULL, then the operation can be cancelled by
6767 // triggering the cancellable object from another thread. If the operation
6868 // was cancelled, the error %G_IO_ERROR_CANCELLED will be set
69-func (x *FileInputStream) QueryInfoAsync(AttributesVar string, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
69+func (x *FileInputStream) QueryInfoAsync(AttributesVar string, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
7070
7171 xFileInputStreamQueryInfoAsync(x.GoPointer(), AttributesVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
7272
M v4/gio/gfileiostream.go +2 -2
@@ -87,7 +87,7 @@ func (x *FileIOStream) QueryInfo(AttributesVar string, CancellableVar *Cancellab
8787
8888 }
8989
90-var xFileIOStreamQueryInfoAsync func(uintptr, string, int32, uintptr, uintptr, uintptr)
90+var xFileIOStreamQueryInfoAsync func(uintptr, string, int, uintptr, uintptr, uintptr)
9191
9292 // Asynchronously queries the @stream for a #GFileInfo. When completed,
9393 // @callback will be called with a #GAsyncResult which can be used to
@@ -95,7 +95,7 @@ var xFileIOStreamQueryInfoAsync func(uintptr, string, int32, uintptr, uintptr, u
9595 //
9696 // For the synchronous version of this function, see
9797 // g_file_io_stream_query_info().
98-func (x *FileIOStream) QueryInfoAsync(AttributesVar string, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
98+func (x *FileIOStream) QueryInfoAsync(AttributesVar string, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
9999
100100 xFileIOStreamQueryInfoAsync(x.GoPointer(), AttributesVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
101101
M v4/gio/gfilemonitor.go +2 -2
@@ -71,11 +71,11 @@ func (x *FileMonitor) IsCancelled() bool {
7171
7272 }
7373
74-var xFileMonitorSetRateLimit func(uintptr, int32)
74+var xFileMonitorSetRateLimit func(uintptr, int)
7575
7676 // Sets the rate limit to which the @monitor will report
7777 // consecutive change events to the same file.
78-func (x *FileMonitor) SetRateLimit(LimitMsecsVar int32) {
78+func (x *FileMonitor) SetRateLimit(LimitMsecsVar int) {
7979
8080 xFileMonitorSetRateLimit(x.GoPointer(), LimitMsecsVar)
8181
M v4/gio/gfileoutputstream.go +2 -2
@@ -81,7 +81,7 @@ func (x *FileOutputStream) QueryInfo(AttributesVar string, CancellableVar *Cance
8181
8282 }
8383
84-var xFileOutputStreamQueryInfoAsync func(uintptr, string, int32, uintptr, uintptr, uintptr)
84+var xFileOutputStreamQueryInfoAsync func(uintptr, string, int, uintptr, uintptr, uintptr)
8585
8686 // Asynchronously queries the @stream for a #GFileInfo. When completed,
8787 // @callback will be called with a #GAsyncResult which can be used to
@@ -89,7 +89,7 @@ var xFileOutputStreamQueryInfoAsync func(uintptr, string, int32, uintptr, uintpt
8989 //
9090 // For the synchronous version of this function, see
9191 // g_file_output_stream_query_info().
92-func (x *FileOutputStream) QueryInfoAsync(AttributesVar string, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
92+func (x *FileOutputStream) QueryInfoAsync(AttributesVar string, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
9393
9494 xFileOutputStreamQueryInfoAsync(x.GoPointer(), AttributesVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
9595
M v4/gio/ginputstream.go +10 -10
@@ -76,7 +76,7 @@ func (x *InputStream) Close(CancellableVar *Cancellable) bool {
7676
7777 }
7878
79-var xInputStreamCloseAsync func(uintptr, int32, uintptr, uintptr, uintptr)
79+var xInputStreamCloseAsync func(uintptr, int, uintptr, uintptr, uintptr)
8080
8181 // Requests an asynchronous closes of the stream, releasing resources related to it.
8282 // When the operation is finished @callback will be called.
@@ -88,7 +88,7 @@ var xInputStreamCloseAsync func(uintptr, int32, uintptr, uintptr, uintptr)
8888 // The asynchronous methods have a default fallback that uses threads to implement
8989 // asynchronicity, so they are optional for inheriting classes. However, if you
9090 // override one you must override all.
91-func (x *InputStream) CloseAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
91+func (x *InputStream) CloseAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
9292
9393 xInputStreamCloseAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
9494
@@ -177,7 +177,7 @@ func (x *InputStream) ReadAll(BufferVar uintptr, CountVar uint, BytesReadVar uin
177177
178178 }
179179
180-var xInputStreamReadAllAsync func(uintptr, uintptr, uint, int32, uintptr, uintptr, uintptr)
180+var xInputStreamReadAllAsync func(uintptr, uintptr, uint, int, uintptr, uintptr, uintptr)
181181
182182 // Request an asynchronous read of @count bytes from the stream into the
183183 // buffer starting at @buffer.
@@ -189,7 +189,7 @@ var xInputStreamReadAllAsync func(uintptr, uintptr, uint, int32, uintptr, uintpt
189189 // Any outstanding I/O request with higher priority (lower numerical
190190 // value) will be executed before an outstanding request with lower
191191 // priority. Default priority is %G_PRIORITY_DEFAULT.
192-func (x *InputStream) ReadAllAsync(BufferVar uintptr, CountVar uint, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
192+func (x *InputStream) ReadAllAsync(BufferVar uintptr, CountVar uint, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
193193
194194 xInputStreamReadAllAsync(x.GoPointer(), BufferVar, CountVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
195195
@@ -212,7 +212,7 @@ func (x *InputStream) ReadAllFinish(ResultVar AsyncResult, BytesReadVar uint) bo
212212
213213 }
214214
215-var xInputStreamReadAsync func(uintptr, uintptr, uint, int32, uintptr, uintptr, uintptr)
215+var xInputStreamReadAsync func(uintptr, uintptr, uint, int, uintptr, uintptr, uintptr)
216216
217217 // Request an asynchronous read of @count bytes from the stream into the buffer
218218 // starting at @buffer. When the operation is finished @callback will be called.
@@ -237,7 +237,7 @@ var xInputStreamReadAsync func(uintptr, uintptr, uint, int32, uintptr, uintptr,
237237 // The asynchronous methods have a default fallback that uses threads to implement
238238 // asynchronicity, so they are optional for inheriting classes. However, if you
239239 // override one you must override all.
240-func (x *InputStream) ReadAsync(BufferVar uintptr, CountVar uint, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
240+func (x *InputStream) ReadAsync(BufferVar uintptr, CountVar uint, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
241241
242242 xInputStreamReadAsync(x.GoPointer(), BufferVar, CountVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
243243
@@ -274,7 +274,7 @@ func (x *InputStream) ReadBytes(CountVar uint, CancellableVar *Cancellable) *gli
274274
275275 }
276276
277-var xInputStreamReadBytesAsync func(uintptr, uint, int32, uintptr, uintptr, uintptr)
277+var xInputStreamReadBytesAsync func(uintptr, uint, int, uintptr, uintptr, uintptr)
278278
279279 // Request an asynchronous read of @count bytes from the stream into a
280280 // new #GBytes. When the operation is finished @callback will be
@@ -296,7 +296,7 @@ var xInputStreamReadBytesAsync func(uintptr, uint, int32, uintptr, uintptr, uint
296296 // Any outstanding I/O request with higher priority (lower numerical
297297 // value) will be executed before an outstanding request with lower
298298 // priority. Default priority is %G_PRIORITY_DEFAULT.
299-func (x *InputStream) ReadBytesAsync(CountVar uint, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
299+func (x *InputStream) ReadBytesAsync(CountVar uint, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
300300
301301 xInputStreamReadBytesAsync(x.GoPointer(), CountVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
302302
@@ -353,7 +353,7 @@ func (x *InputStream) Skip(CountVar uint, CancellableVar *Cancellable) int {
353353
354354 }
355355
356-var xInputStreamSkipAsync func(uintptr, uint, int32, uintptr, uintptr, uintptr)
356+var xInputStreamSkipAsync func(uintptr, uint, int, uintptr, uintptr, uintptr)
357357
358358 // Request an asynchronous skip of @count bytes from the stream.
359359 // When the operation is finished @callback will be called.
@@ -378,7 +378,7 @@ var xInputStreamSkipAsync func(uintptr, uint, int32, uintptr, uintptr, uintptr)
378378 // The asynchronous methods have a default fallback that uses threads to
379379 // implement asynchronicity, so they are optional for inheriting classes.
380380 // However, if you override one, you must override all.
381-func (x *InputStream) SkipAsync(CountVar uint, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
381+func (x *InputStream) SkipAsync(CountVar uint, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
382382
383383 xInputStreamSkipAsync(x.GoPointer(), CountVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
384384
M v4/gio/gio-2.0.go +49 -49
@@ -189,7 +189,7 @@ func (x *BytesIcon) ToString() string {
189189
190190 // Loads a loadable icon. For the asynchronous version of this function,
191191 // see g_loadable_icon_load_async().
192-func (x *BytesIcon) Load(SizeVar int32, TypeVar string, CancellableVar *Cancellable) *InputStream {
192+func (x *BytesIcon) Load(SizeVar int, TypeVar string, CancellableVar *Cancellable) *InputStream {
193193
194194 LoadPtr := XGLoadableIconLoad(x.GoPointer(), SizeVar, TypeVar, CancellableVar.GoPointer())
195195 if LoadPtr == 0 {
@@ -205,7 +205,7 @@ func (x *BytesIcon) Load(SizeVar int32, TypeVar string, CancellableVar *Cancella
205205 // Loads an icon asynchronously. To finish this function, see
206206 // g_loadable_icon_load_finish(). For the synchronous, blocking
207207 // version of this function, see g_loadable_icon_load().
208-func (x *BytesIcon) LoadAsync(SizeVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
208+func (x *BytesIcon) LoadAsync(SizeVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
209209
210210 XGLoadableIconLoadAsync(x.GoPointer(), SizeVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
211211
@@ -830,7 +830,7 @@ func (x *DBusConnection) AddFilter(FilterFunctionVar DBusMessageFilterFunction,
830830
831831 }
832832
833-var xDBusConnectionCall func(uintptr, string, string, string, string, *glib.Variant, *glib.VariantType, DBusCallFlags, int32, uintptr, uintptr, uintptr)
833+var xDBusConnectionCall func(uintptr, string, string, string, string, *glib.Variant, *glib.VariantType, DBusCallFlags, int, uintptr, uintptr, uintptr)
834834
835835 // Asynchronously invokes the @method_name method on the
836836 // @interface_name D-Bus interface on the remote object at
@@ -879,7 +879,7 @@ var xDBusConnectionCall func(uintptr, string, string, string, string, *glib.Vari
879879 //
880880 // If @callback is %NULL then the D-Bus method call message will be sent with
881881 // the %G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED flag set.
882-func (x *DBusConnection) Call(BusNameVar string, ObjectPathVar string, InterfaceNameVar string, MethodNameVar string, ParametersVar *glib.Variant, ReplyTypeVar *glib.VariantType, FlagsVar DBusCallFlags, TimeoutMsecVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
882+func (x *DBusConnection) Call(BusNameVar string, ObjectPathVar string, InterfaceNameVar string, MethodNameVar string, ParametersVar *glib.Variant, ReplyTypeVar *glib.VariantType, FlagsVar DBusCallFlags, TimeoutMsecVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
883883
884884 xDBusConnectionCall(x.GoPointer(), BusNameVar, ObjectPathVar, InterfaceNameVar, MethodNameVar, ParametersVar, ReplyTypeVar, FlagsVar, TimeoutMsecVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
885885
@@ -894,7 +894,7 @@ func (x *DBusConnection) CallFinish(ResVar AsyncResult) *glib.Variant {
894894
895895 }
896896
897-var xDBusConnectionCallSync func(uintptr, string, string, string, string, *glib.Variant, *glib.VariantType, DBusCallFlags, int32, uintptr) *glib.Variant
897+var xDBusConnectionCallSync func(uintptr, string, string, string, string, *glib.Variant, *glib.VariantType, DBusCallFlags, int, uintptr) *glib.Variant
898898
899899 // Synchronously invokes the @method_name method on the
900900 // @interface_name D-Bus interface on the remote object at
@@ -934,13 +934,13 @@ var xDBusConnectionCallSync func(uintptr, string, string, string, string, *glib.
934934 // The calling thread is blocked until a reply is received. See
935935 // g_dbus_connection_call() for the asynchronous version of
936936 // this method.
937-func (x *DBusConnection) CallSync(BusNameVar string, ObjectPathVar string, InterfaceNameVar string, MethodNameVar string, ParametersVar *glib.Variant, ReplyTypeVar *glib.VariantType, FlagsVar DBusCallFlags, TimeoutMsecVar int32, CancellableVar *Cancellable) *glib.Variant {
937+func (x *DBusConnection) CallSync(BusNameVar string, ObjectPathVar string, InterfaceNameVar string, MethodNameVar string, ParametersVar *glib.Variant, ReplyTypeVar *glib.VariantType, FlagsVar DBusCallFlags, TimeoutMsecVar int, CancellableVar *Cancellable) *glib.Variant {
938938
939939 return xDBusConnectionCallSync(x.GoPointer(), BusNameVar, ObjectPathVar, InterfaceNameVar, MethodNameVar, ParametersVar, ReplyTypeVar, FlagsVar, TimeoutMsecVar, CancellableVar.GoPointer())
940940
941941 }
942942
943-var xDBusConnectionCallWithUnixFdList func(uintptr, string, string, string, string, *glib.Variant, *glib.VariantType, DBusCallFlags, int32, uintptr, uintptr, uintptr, uintptr)
943+var xDBusConnectionCallWithUnixFdList func(uintptr, string, string, string, string, *glib.Variant, *glib.VariantType, DBusCallFlags, int, uintptr, uintptr, uintptr, uintptr)
944944
945945 // Like g_dbus_connection_call() but also takes a #GUnixFDList object.
946946 //
@@ -957,7 +957,7 @@ var xDBusConnectionCallWithUnixFdList func(uintptr, string, string, string, stri
957957 // value of type %G_VARIANT_TYPE_HANDLE in the body of the message.
958958 //
959959 // This method is only available on UNIX.
960-func (x *DBusConnection) CallWithUnixFdList(BusNameVar string, ObjectPathVar string, InterfaceNameVar string, MethodNameVar string, ParametersVar *glib.Variant, ReplyTypeVar *glib.VariantType, FlagsVar DBusCallFlags, TimeoutMsecVar int32, FdListVar *UnixFDList, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
960+func (x *DBusConnection) CallWithUnixFdList(BusNameVar string, ObjectPathVar string, InterfaceNameVar string, MethodNameVar string, ParametersVar *glib.Variant, ReplyTypeVar *glib.VariantType, FlagsVar DBusCallFlags, TimeoutMsecVar int, FdListVar *UnixFDList, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
961961
962962 xDBusConnectionCallWithUnixFdList(x.GoPointer(), BusNameVar, ObjectPathVar, InterfaceNameVar, MethodNameVar, ParametersVar, ReplyTypeVar, FlagsVar, TimeoutMsecVar, FdListVar.GoPointer(), CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
963963
@@ -983,14 +983,14 @@ func (x *DBusConnection) CallWithUnixFdListFinish(OutFdListVar **UnixFDList, Res
983983
984984 }
985985
986-var xDBusConnectionCallWithUnixFdListSync func(uintptr, string, string, string, string, *glib.Variant, *glib.VariantType, DBusCallFlags, int32, uintptr, *uintptr, uintptr) *glib.Variant
986+var xDBusConnectionCallWithUnixFdListSync func(uintptr, string, string, string, string, *glib.Variant, *glib.VariantType, DBusCallFlags, int, uintptr, *uintptr, uintptr) *glib.Variant
987987
988988 // Like g_dbus_connection_call_sync() but also takes and returns #GUnixFDList objects.
989989 // See g_dbus_connection_call_with_unix_fd_list() and
990990 // g_dbus_connection_call_with_unix_fd_list_finish() for more details.
991991 //
992992 // This method is only available on UNIX.
993-func (x *DBusConnection) CallWithUnixFdListSync(BusNameVar string, ObjectPathVar string, InterfaceNameVar string, MethodNameVar string, ParametersVar *glib.Variant, ReplyTypeVar *glib.VariantType, FlagsVar DBusCallFlags, TimeoutMsecVar int32, FdListVar *UnixFDList, OutFdListVar **UnixFDList, CancellableVar *Cancellable) *glib.Variant {
993+func (x *DBusConnection) CallWithUnixFdListSync(BusNameVar string, ObjectPathVar string, InterfaceNameVar string, MethodNameVar string, ParametersVar *glib.Variant, ReplyTypeVar *glib.VariantType, FlagsVar DBusCallFlags, TimeoutMsecVar int, FdListVar *UnixFDList, OutFdListVar **UnixFDList, CancellableVar *Cancellable) *glib.Variant {
994994
995995 return xDBusConnectionCallWithUnixFdListSync(x.GoPointer(), BusNameVar, ObjectPathVar, InterfaceNameVar, MethodNameVar, ParametersVar, ReplyTypeVar, FlagsVar, TimeoutMsecVar, FdListVar.GoPointer(), gobject.ConvertPtr(OutFdListVar), CancellableVar.GoPointer())
996996
@@ -1419,7 +1419,7 @@ func (x *DBusConnection) SendMessage(MessageVar *DBusMessage, FlagsVar DBusSendM
14191419
14201420 }
14211421
1422-var xDBusConnectionSendMessageWithReply func(uintptr, uintptr, DBusSendMessageFlags, int32, uint32, uintptr, uintptr, uintptr)
1422+var xDBusConnectionSendMessageWithReply func(uintptr, uintptr, DBusSendMessageFlags, int, uint32, uintptr, uintptr, uintptr)
14231423
14241424 // Asynchronously sends @message to the peer represented by @connection.
14251425 //
@@ -1450,7 +1450,7 @@ var xDBusConnectionSendMessageWithReply func(uintptr, uintptr, DBusSendMessageFl
14501450 // See this [server][gdbus-server] and [client][gdbus-unix-fd-client]
14511451 // for an example of how to use this low-level API to send and receive
14521452 // UNIX file descriptors.
1453-func (x *DBusConnection) SendMessageWithReply(MessageVar *DBusMessage, FlagsVar DBusSendMessageFlags, TimeoutMsecVar int32, OutSerialVar uint32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
1453+func (x *DBusConnection) SendMessageWithReply(MessageVar *DBusMessage, FlagsVar DBusSendMessageFlags, TimeoutMsecVar int, OutSerialVar uint32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
14541454
14551455 xDBusConnectionSendMessageWithReply(x.GoPointer(), MessageVar.GoPointer(), FlagsVar, TimeoutMsecVar, OutSerialVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
14561456
@@ -1481,7 +1481,7 @@ func (x *DBusConnection) SendMessageWithReplyFinish(ResVar AsyncResult) *DBusMes
14811481
14821482 }
14831483
1484-var xDBusConnectionSendMessageWithReplySync func(uintptr, uintptr, DBusSendMessageFlags, int32, uint32, uintptr) uintptr
1484+var xDBusConnectionSendMessageWithReplySync func(uintptr, uintptr, DBusSendMessageFlags, int, uint32, uintptr) uintptr
14851485
14861486 // Synchronously sends @message to the peer represented by @connection
14871487 // and blocks the calling thread until a reply is received or the
@@ -1513,7 +1513,7 @@ var xDBusConnectionSendMessageWithReplySync func(uintptr, uintptr, DBusSendMessa
15131513 //
15141514 // Note that @message must be unlocked, unless @flags contain the
15151515 // %G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL flag.
1516-func (x *DBusConnection) SendMessageWithReplySync(MessageVar *DBusMessage, FlagsVar DBusSendMessageFlags, TimeoutMsecVar int32, OutSerialVar uint32, CancellableVar *Cancellable) *DBusMessage {
1516+func (x *DBusConnection) SendMessageWithReplySync(MessageVar *DBusMessage, FlagsVar DBusSendMessageFlags, TimeoutMsecVar int, OutSerialVar uint32, CancellableVar *Cancellable) *DBusMessage {
15171517
15181518 SendMessageWithReplySyncPtr := xDBusConnectionSendMessageWithReplySync(x.GoPointer(), MessageVar.GoPointer(), FlagsVar, TimeoutMsecVar, OutSerialVar, CancellableVar.GoPointer())
15191519 if SendMessageWithReplySyncPtr == 0 {
@@ -1750,7 +1750,7 @@ func (x *DBusConnection) ConnectClosed(cb func(DBusConnection, bool, uintptr)) {
17501750 // in a thread, so if you want to support asynchronous initialization via
17511751 // threads, just implement the #GAsyncInitable interface without overriding
17521752 // any interface methods.
1753-func (x *DBusConnection) InitAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
1753+func (x *DBusConnection) InitAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
17541754
17551755 XGAsyncInitableInitAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
17561756
@@ -2613,7 +2613,7 @@ func (x *DBusMethodInvocation) ReturnDbusError(ErrorNameVar string, ErrorMessage
26132613
26142614 }
26152615
2616-var xDBusMethodInvocationReturnError func(uintptr, glib.Quark, int32, string, ...interface{})
2616+var xDBusMethodInvocationReturnError func(uintptr, glib.Quark, int, string, ...interface{})
26172617
26182618 // Finishes handling a D-Bus method call by returning an error.
26192619 //
@@ -2635,26 +2635,26 @@ var xDBusMethodInvocationReturnError func(uintptr, glib.Quark, int32, string, ..
26352635 // Since 2.48, if the method call requested for a reply not to be sent
26362636 // then this call will free @invocation but otherwise do nothing (as per
26372637 // the recommendations of the D-Bus specification).
2638-func (x *DBusMethodInvocation) ReturnError(DomainVar glib.Quark, CodeVar int32, FormatVar string, varArgs ...interface{}) {
2638+func (x *DBusMethodInvocation) ReturnError(DomainVar glib.Quark, CodeVar int, FormatVar string, varArgs ...interface{}) {
26392639
26402640 xDBusMethodInvocationReturnError(x.GoPointer(), DomainVar, CodeVar, FormatVar, varArgs...)
26412641
26422642 }
26432643
2644-var xDBusMethodInvocationReturnErrorLiteral func(uintptr, glib.Quark, int32, string)
2644+var xDBusMethodInvocationReturnErrorLiteral func(uintptr, glib.Quark, int, string)
26452645
26462646 // Like g_dbus_method_invocation_return_error() but without printf()-style formatting.
26472647 //
26482648 // This method will take ownership of @invocation. See
26492649 // #GDBusInterfaceVTable for more information about the ownership of
26502650 // @invocation.
2651-func (x *DBusMethodInvocation) ReturnErrorLiteral(DomainVar glib.Quark, CodeVar int32, MessageVar string) {
2651+func (x *DBusMethodInvocation) ReturnErrorLiteral(DomainVar glib.Quark, CodeVar int, MessageVar string) {
26522652
26532653 xDBusMethodInvocationReturnErrorLiteral(x.GoPointer(), DomainVar, CodeVar, MessageVar)
26542654
26552655 }
26562656
2657-var xDBusMethodInvocationReturnErrorValist func(uintptr, glib.Quark, int32, string, []interface{})
2657+var xDBusMethodInvocationReturnErrorValist func(uintptr, glib.Quark, int, string, []interface{})
26582658
26592659 // Like g_dbus_method_invocation_return_error() but intended for
26602660 // language bindings.
@@ -2662,7 +2662,7 @@ var xDBusMethodInvocationReturnErrorValist func(uintptr, glib.Quark, int32, stri
26622662 // This method will take ownership of @invocation. See
26632663 // #GDBusInterfaceVTable for more information about the ownership of
26642664 // @invocation.
2665-func (x *DBusMethodInvocation) ReturnErrorValist(DomainVar glib.Quark, CodeVar int32, FormatVar string, VarArgsVar []interface{}) {
2665+func (x *DBusMethodInvocation) ReturnErrorValist(DomainVar glib.Quark, CodeVar int, FormatVar string, VarArgsVar []interface{}) {
26662666
26672667 xDBusMethodInvocationReturnErrorValist(x.GoPointer(), DomainVar, CodeVar, FormatVar, VarArgsVar)
26682668
@@ -3059,18 +3059,18 @@ func (x *Menu) Freeze() {
30593059
30603060 }
30613061
3062-var xMenuInsert func(uintptr, int32, string, string)
3062+var xMenuInsert func(uintptr, int, string, string)
30633063
30643064 // Convenience function for inserting a normal menu item into @menu.
30653065 // Combine g_menu_item_new() and g_menu_insert_item() for a more flexible
30663066 // alternative.
3067-func (x *Menu) Insert(PositionVar int32, LabelVar string, DetailedActionVar string) {
3067+func (x *Menu) Insert(PositionVar int, LabelVar string, DetailedActionVar string) {
30683068
30693069 xMenuInsert(x.GoPointer(), PositionVar, LabelVar, DetailedActionVar)
30703070
30713071 }
30723072
3073-var xMenuInsertItem func(uintptr, int32, uintptr)
3073+var xMenuInsertItem func(uintptr, int, uintptr)
30743074
30753075 // Inserts @item into @menu.
30763076 //
@@ -3089,29 +3089,29 @@ var xMenuInsertItem func(uintptr, int32, uintptr)
30893089 // See g_menu_insert(), g_menu_insert_section() and
30903090 // g_menu_insert_submenu() as well as "prepend" and "append" variants of
30913091 // each of these functions.
3092-func (x *Menu) InsertItem(PositionVar int32, ItemVar *MenuItem) {
3092+func (x *Menu) InsertItem(PositionVar int, ItemVar *MenuItem) {
30933093
30943094 xMenuInsertItem(x.GoPointer(), PositionVar, ItemVar.GoPointer())
30953095
30963096 }
30973097
3098-var xMenuInsertSection func(uintptr, int32, string, uintptr)
3098+var xMenuInsertSection func(uintptr, int, string, uintptr)
30993099
31003100 // Convenience function for inserting a section menu item into @menu.
31013101 // Combine g_menu_item_new_section() and g_menu_insert_item() for a more
31023102 // flexible alternative.
3103-func (x *Menu) InsertSection(PositionVar int32, LabelVar string, SectionVar *MenuModel) {
3103+func (x *Menu) InsertSection(PositionVar int, LabelVar string, SectionVar *MenuModel) {
31043104
31053105 xMenuInsertSection(x.GoPointer(), PositionVar, LabelVar, SectionVar.GoPointer())
31063106
31073107 }
31083108
3109-var xMenuInsertSubmenu func(uintptr, int32, string, uintptr)
3109+var xMenuInsertSubmenu func(uintptr, int, string, uintptr)
31103110
31113111 // Convenience function for inserting a submenu menu item into @menu.
31123112 // Combine g_menu_item_new_submenu() and g_menu_insert_item() for a more
31133113 // flexible alternative.
3114-func (x *Menu) InsertSubmenu(PositionVar int32, LabelVar string, SubmenuVar *MenuModel) {
3114+func (x *Menu) InsertSubmenu(PositionVar int, LabelVar string, SubmenuVar *MenuModel) {
31153115
31163116 xMenuInsertSubmenu(x.GoPointer(), PositionVar, LabelVar, SubmenuVar.GoPointer())
31173117
@@ -3161,7 +3161,7 @@ func (x *Menu) PrependSubmenu(LabelVar string, SubmenuVar *MenuModel) {
31613161
31623162 }
31633163
3164-var xMenuRemove func(uintptr, int32)
3164+var xMenuRemove func(uintptr, int)
31653165
31663166 // Removes an item from the menu.
31673167 //
@@ -3173,7 +3173,7 @@ var xMenuRemove func(uintptr, int32)
31733173 // It is not possible to remove items by identity since items are added
31743174 // to the menu simply by copying their links and attributes (ie:
31753175 // identity of the item itself is not preserved).
3176-func (x *Menu) Remove(PositionVar int32) {
3176+func (x *Menu) Remove(PositionVar int) {
31773177
31783178 xMenuRemove(x.GoPointer(), PositionVar)
31793179
@@ -3229,14 +3229,14 @@ func NewMenuItem(LabelVar string, DetailedActionVar string) *MenuItem {
32293229 return NewMenuItemCls
32303230 }
32313231
3232-var xNewFromModelMenuItem func(uintptr, int32) uintptr
3232+var xNewFromModelMenuItem func(uintptr, int) uintptr
32333233
32343234 // Creates a #GMenuItem as an exact copy of an existing menu item in a
32353235 // #GMenuModel.
32363236 //
32373237 // @item_index must be valid (ie: be sure to call
32383238 // g_menu_model_get_n_items() first).
3239-func NewFromModelMenuItem(ModelVar *MenuModel, ItemIndexVar int32) *MenuItem {
3239+func NewFromModelMenuItem(ModelVar *MenuModel, ItemIndexVar int) *MenuItem {
32403240 NewFromModelMenuItemPtr := xNewFromModelMenuItem(ModelVar.GoPointer(), ItemIndexVar)
32413241 if NewFromModelMenuItemPtr == 0 {
32423242 return nil
@@ -4653,7 +4653,7 @@ func (x *Subprocess) ForceExit() {
46534653
46544654 }
46554655
4656-var xSubprocessGetExitStatus func(uintptr) int32
4656+var xSubprocessGetExitStatus func(uintptr) int
46574657
46584658 // Check the exit status of the subprocess, given that it exited
46594659 // normally. This is the value passed to the exit() system call or the
@@ -4663,7 +4663,7 @@ var xSubprocessGetExitStatus func(uintptr) int32
46634663 //
46644664 // It is an error to call this function before g_subprocess_wait() and
46654665 // unless g_subprocess_get_if_exited() returned %TRUE.
4666-func (x *Subprocess) GetExitStatus() int32 {
4666+func (x *Subprocess) GetExitStatus() int {
46674667
46684668 return xSubprocessGetExitStatus(x.GoPointer())
46694669
@@ -4709,7 +4709,7 @@ func (x *Subprocess) GetIfSignaled() bool {
47094709
47104710 }
47114711
4712-var xSubprocessGetStatus func(uintptr) int32
4712+var xSubprocessGetStatus func(uintptr) int
47134713
47144714 // Gets the raw status code of the process, as from waitpid().
47154715 //
@@ -4722,7 +4722,7 @@ var xSubprocessGetStatus func(uintptr) int32
47224722 //
47234723 // It is an error to call this function before g_subprocess_wait() has
47244724 // returned.
4725-func (x *Subprocess) GetStatus() int32 {
4725+func (x *Subprocess) GetStatus() int {
47264726
47274727 return xSubprocessGetStatus(x.GoPointer())
47284728
@@ -4808,7 +4808,7 @@ func (x *Subprocess) GetSuccessful() bool {
48084808
48094809 }
48104810
4811-var xSubprocessGetTermSig func(uintptr) int32
4811+var xSubprocessGetTermSig func(uintptr) int
48124812
48134813 // Get the signal number that caused the subprocess to terminate, given
48144814 // that it terminated due to a signal.
@@ -4817,13 +4817,13 @@ var xSubprocessGetTermSig func(uintptr) int32
48174817 //
48184818 // It is an error to call this function before g_subprocess_wait() and
48194819 // unless g_subprocess_get_if_signaled() returned %TRUE.
4820-func (x *Subprocess) GetTermSig() int32 {
4820+func (x *Subprocess) GetTermSig() int {
48214821
48224822 return xSubprocessGetTermSig(x.GoPointer())
48234823
48244824 }
48254825
4826-var xSubprocessSendSignal func(uintptr, int32)
4826+var xSubprocessSendSignal func(uintptr, int)
48274827
48284828 // Sends the UNIX signal @signal_num to the subprocess, if it is still
48294829 // running.
@@ -4832,7 +4832,7 @@ var xSubprocessSendSignal func(uintptr, int32)
48324832 // be signalled.
48334833 //
48344834 // This API is not available on Windows.
4835-func (x *Subprocess) SendSignal(SignalNumVar int32) {
4835+func (x *Subprocess) SendSignal(SignalNumVar int) {
48364836
48374837 xSubprocessSendSignal(x.GoPointer(), SignalNumVar)
48384838
@@ -5213,7 +5213,7 @@ func (x *SubprocessLauncher) Spawnv(ArgvVar uintptr) *Subprocess {
52135213
52145214 }
52155215
5216-var xSubprocessLauncherTakeFd func(uintptr, int32, int32)
5216+var xSubprocessLauncherTakeFd func(uintptr, int, int)
52175217
52185218 // Transfer an arbitrary file descriptor from parent process to the
52195219 // child. This function takes ownership of the @source_fd; it will be closed
@@ -5227,13 +5227,13 @@ var xSubprocessLauncherTakeFd func(uintptr, int32, int32)
52275227 // An example use case is GNUPG, which has a command line argument
52285228 // `--passphrase-fd` providing a file descriptor number where it expects
52295229 // the passphrase to be written.
5230-func (x *SubprocessLauncher) TakeFd(SourceFdVar int32, TargetFdVar int32) {
5230+func (x *SubprocessLauncher) TakeFd(SourceFdVar int, TargetFdVar int) {
52315231
52325232 xSubprocessLauncherTakeFd(x.GoPointer(), SourceFdVar, TargetFdVar)
52335233
52345234 }
52355235
5236-var xSubprocessLauncherTakeStderrFd func(uintptr, int32)
5236+var xSubprocessLauncherTakeStderrFd func(uintptr, int)
52375237
52385238 // Sets the file descriptor to use as the stderr for spawned processes.
52395239 //
@@ -5251,13 +5251,13 @@ var xSubprocessLauncherTakeStderrFd func(uintptr, int32)
52515251 // if the launcher flags contain any flags directing stderr elsewhere.
52525252 //
52535253 // This feature is only available on UNIX.
5254-func (x *SubprocessLauncher) TakeStderrFd(FdVar int32) {
5254+func (x *SubprocessLauncher) TakeStderrFd(FdVar int) {
52555255
52565256 xSubprocessLauncherTakeStderrFd(x.GoPointer(), FdVar)
52575257
52585258 }
52595259
5260-var xSubprocessLauncherTakeStdinFd func(uintptr, int32)
5260+var xSubprocessLauncherTakeStdinFd func(uintptr, int)
52615261
52625262 // Sets the file descriptor to use as the stdin for spawned processes.
52635263 //
@@ -5277,13 +5277,13 @@ var xSubprocessLauncherTakeStdinFd func(uintptr, int32)
52775277 // the launcher flags contain any flags directing stdin elsewhere.
52785278 //
52795279 // This feature is only available on UNIX.
5280-func (x *SubprocessLauncher) TakeStdinFd(FdVar int32) {
5280+func (x *SubprocessLauncher) TakeStdinFd(FdVar int) {
52815281
52825282 xSubprocessLauncherTakeStdinFd(x.GoPointer(), FdVar)
52835283
52845284 }
52855285
5286-var xSubprocessLauncherTakeStdoutFd func(uintptr, int32)
5286+var xSubprocessLauncherTakeStdoutFd func(uintptr, int)
52875287
52885288 // Sets the file descriptor to use as the stdout for spawned processes.
52895289 //
@@ -5302,7 +5302,7 @@ var xSubprocessLauncherTakeStdoutFd func(uintptr, int32)
53025302 // if the launcher flags contain any flags directing stdout elsewhere.
53035303 //
53045304 // This feature is only available on UNIX.
5305-func (x *SubprocessLauncher) TakeStdoutFd(FdVar int32) {
5305+func (x *SubprocessLauncher) TakeStdoutFd(FdVar int) {
53065306
53075307 xSubprocessLauncherTakeStdoutFd(x.GoPointer(), FdVar)
53085308
M v4/gio/gioerror.go +2 -2
@@ -6,7 +6,7 @@ import (
66 "github.com/jwijenbergh/puregotk/internal/core"
77 )
88
9-var xIoErrorFromErrno func(int32) IOErrorEnum
9+var xIoErrorFromErrno func(int) IOErrorEnum
1010
1111 // Converts errno.h error codes into GIO error codes. The fallback
1212 // value %G_IO_ERROR_FAILED is returned for error codes not currently
@@ -15,7 +15,7 @@ var xIoErrorFromErrno func(int32) IOErrorEnum
1515 //
1616 // As %errno is global and may be modified by intermediate function
1717 // calls, you should save its value as soon as the call which sets it
18-func IoErrorFromErrno(ErrNoVar int32) IOErrorEnum {
18+func IoErrorFromErrno(ErrNoVar int) IOErrorEnum {
1919
2020 return xIoErrorFromErrno(ErrNoVar)
2121
M v4/gio/giomodule.go +2 -2
@@ -19,14 +19,14 @@ type IOModuleClass struct {
1919 type IOModuleScope struct {
2020 }
2121
22-var xIoExtensionPointImplement func(string, []interface{}, string, int32) *IOExtension
22+var xIoExtensionPointImplement func(string, []interface{}, string, int) *IOExtension
2323
2424 // Registers @type as extension for the extension point with name
2525 // @extension_point_name.
2626 //
2727 // If @type has already been registered as an extension for this
2828 // extension point, the existing #GIOExtension object is returned.
29-func IoExtensionPointImplement(ExtensionPointNameVar string, TypeVar []interface{}, ExtensionNameVar string, PriorityVar int32) *IOExtension {
29+func IoExtensionPointImplement(ExtensionPointNameVar string, TypeVar []interface{}, ExtensionNameVar string, PriorityVar int) *IOExtension {
3030
3131 return xIoExtensionPointImplement(ExtensionPointNameVar, TypeVar, ExtensionNameVar, PriorityVar)
3232
M v4/gio/gioscheduler.go +2 -2
@@ -19,7 +19,7 @@ func IoSchedulerCancelAllJobs() {
1919
2020 }
2121
22-var xIoSchedulerPushJob func(uintptr, uintptr, uintptr, int32, uintptr)
22+var xIoSchedulerPushJob func(uintptr, uintptr, uintptr, int, uintptr)
2323
2424 // Schedules the I/O job to run in another thread.
2525 //
@@ -29,7 +29,7 @@ var xIoSchedulerPushJob func(uintptr, uintptr, uintptr, int32, uintptr)
2929 // If @cancellable is not %NULL, it can be used to cancel the I/O job
3030 // by calling g_cancellable_cancel() or by calling
3131 // g_io_scheduler_cancel_all_jobs().
32-func IoSchedulerPushJob(JobFuncVar IOSchedulerJobFunc, UserDataVar uintptr, NotifyVar glib.DestroyNotify, IoPriorityVar int32, CancellableVar *Cancellable) {
32+func IoSchedulerPushJob(JobFuncVar IOSchedulerJobFunc, UserDataVar uintptr, NotifyVar glib.DestroyNotify, IoPriorityVar int, CancellableVar *Cancellable) {
3333
3434 xIoSchedulerPushJob(purego.NewCallback(JobFuncVar), UserDataVar, purego.NewCallback(NotifyVar), IoPriorityVar, CancellableVar.GoPointer())
3535
M v4/gio/giostream.go +4 -4
@@ -120,7 +120,7 @@ func (x *IOStream) Close(CancellableVar *Cancellable) bool {
120120
121121 }
122122
123-var xIOStreamCloseAsync func(uintptr, int32, uintptr, uintptr, uintptr)
123+var xIOStreamCloseAsync func(uintptr, int, uintptr, uintptr, uintptr)
124124
125125 // Requests an asynchronous close of the stream, releasing resources
126126 // related to it. When the operation is finished @callback will be
@@ -132,7 +132,7 @@ var xIOStreamCloseAsync func(uintptr, int32, uintptr, uintptr, uintptr)
132132 // The asynchronous methods have a default fallback that uses threads
133133 // to implement asynchronicity, so they are optional for inheriting
134134 // classes. However, if you override one you must override all.
135-func (x *IOStream) CloseAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
135+func (x *IOStream) CloseAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
136136
137137 xIOStreamCloseAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
138138
@@ -214,7 +214,7 @@ func (x *IOStream) SetPending() bool {
214214
215215 }
216216
217-var xIOStreamSpliceAsync func(uintptr, uintptr, IOStreamSpliceFlags, int32, uintptr, uintptr, uintptr)
217+var xIOStreamSpliceAsync func(uintptr, uintptr, IOStreamSpliceFlags, int, uintptr, uintptr, uintptr)
218218
219219 // Asynchronously splice the output stream of @stream1 to the input stream of
220220 // @stream2, and splice the output stream of @stream2 to the input stream of
@@ -223,7 +223,7 @@ var xIOStreamSpliceAsync func(uintptr, uintptr, IOStreamSpliceFlags, int32, uint
223223 // When the operation is finished @callback will be called.
224224 // You can then call g_io_stream_splice_finish() to get the
225225 // result of the operation.
226-func (x *IOStream) SpliceAsync(Stream2Var *IOStream, FlagsVar IOStreamSpliceFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
226+func (x *IOStream) SpliceAsync(Stream2Var *IOStream, FlagsVar IOStreamSpliceFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
227227
228228 xIOStreamSpliceAsync(x.GoPointer(), Stream2Var.GoPointer(), FlagsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
229229
M v4/gio/gloadableicon.go +6 -6
@@ -16,8 +16,8 @@ type LoadableIconIface struct {
1616 type LoadableIcon interface {
1717 GoPointer() uintptr
1818 SetGoPointer(uintptr)
19- Load(SizeVar int32, TypeVar string, CancellableVar *Cancellable) *InputStream
20- LoadAsync(SizeVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
19+ Load(SizeVar int, TypeVar string, CancellableVar *Cancellable) *InputStream
20+ LoadAsync(SizeVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr)
2121 LoadFinish(ResVar AsyncResult, TypeVar string) *InputStream
2222 }
2323 type LoadableIconBase struct {
@@ -34,7 +34,7 @@ func (x *LoadableIconBase) SetGoPointer(ptr uintptr) {
3434
3535 // Loads a loadable icon. For the asynchronous version of this function,
3636 // see g_loadable_icon_load_async().
37-func (x *LoadableIconBase) Load(SizeVar int32, TypeVar string, CancellableVar *Cancellable) *InputStream {
37+func (x *LoadableIconBase) Load(SizeVar int, TypeVar string, CancellableVar *Cancellable) *InputStream {
3838
3939 LoadPtr := XGLoadableIconLoad(x.GoPointer(), SizeVar, TypeVar, CancellableVar.GoPointer())
4040 if LoadPtr == 0 {
@@ -50,7 +50,7 @@ func (x *LoadableIconBase) Load(SizeVar int32, TypeVar string, CancellableVar *C
5050 // Loads an icon asynchronously. To finish this function, see
5151 // g_loadable_icon_load_finish(). For the synchronous, blocking
5252 // version of this function, see g_loadable_icon_load().
53-func (x *LoadableIconBase) LoadAsync(SizeVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
53+func (x *LoadableIconBase) LoadAsync(SizeVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
5454
5555 XGLoadableIconLoadAsync(x.GoPointer(), SizeVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
5656
@@ -70,8 +70,8 @@ func (x *LoadableIconBase) LoadFinish(ResVar AsyncResult, TypeVar string) *Input
7070
7171 }
7272
73-var XGLoadableIconLoad func(uintptr, int32, string, uintptr) uintptr
74-var XGLoadableIconLoadAsync func(uintptr, int32, uintptr, uintptr, uintptr)
73+var XGLoadableIconLoad func(uintptr, int, string, uintptr) uintptr
74+var XGLoadableIconLoadAsync func(uintptr, int, uintptr, uintptr, uintptr)
7575 var XGLoadableIconLoadFinish func(uintptr, uintptr, string) uintptr
7676
7777 func init() {
M v4/gio/gmenumodel.go +16 -16
@@ -322,7 +322,7 @@ func MenuModelNewFromInternalPtr(ptr uintptr) *MenuModel {
322322 return cls
323323 }
324324
325-var xMenuModelGetItemAttribute func(uintptr, int32, string, string, ...interface{}) bool
325+var xMenuModelGetItemAttribute func(uintptr, int, string, string, ...interface{}) bool
326326
327327 // Queries item at position @item_index in @model for the attribute
328328 // specified by @attribute.
@@ -340,13 +340,13 @@ var xMenuModelGetItemAttribute func(uintptr, int32, string, string, ...interface
340340 // @format_string must make a complete copy of the data (since the
341341 // #GVariant may go away after the call to g_variant_unref()). In
342342 // particular, no '&' characters are allowed in @format_string.
343-func (x *MenuModel) GetItemAttribute(ItemIndexVar int32, AttributeVar string, FormatStringVar string, varArgs ...interface{}) bool {
343+func (x *MenuModel) GetItemAttribute(ItemIndexVar int, AttributeVar string, FormatStringVar string, varArgs ...interface{}) bool {
344344
345345 return xMenuModelGetItemAttribute(x.GoPointer(), ItemIndexVar, AttributeVar, FormatStringVar, varArgs...)
346346
347347 }
348348
349-var xMenuModelGetItemAttributeValue func(uintptr, int32, string, *glib.VariantType) *glib.Variant
349+var xMenuModelGetItemAttributeValue func(uintptr, int, string, *glib.VariantType) *glib.Variant
350350
351351 // Queries the item at position @item_index in @model for the attribute
352352 // specified by @attribute.
@@ -359,20 +359,20 @@ var xMenuModelGetItemAttributeValue func(uintptr, int32, string, *glib.VariantTy
359359 //
360360 // If the attribute does not exist, or does not match the expected type
361361 // then %NULL is returned.
362-func (x *MenuModel) GetItemAttributeValue(ItemIndexVar int32, AttributeVar string, ExpectedTypeVar *glib.VariantType) *glib.Variant {
362+func (x *MenuModel) GetItemAttributeValue(ItemIndexVar int, AttributeVar string, ExpectedTypeVar *glib.VariantType) *glib.Variant {
363363
364364 return xMenuModelGetItemAttributeValue(x.GoPointer(), ItemIndexVar, AttributeVar, ExpectedTypeVar)
365365
366366 }
367367
368-var xMenuModelGetItemLink func(uintptr, int32, string) uintptr
368+var xMenuModelGetItemLink func(uintptr, int, string) uintptr
369369
370370 // Queries the item at position @item_index in @model for the link
371371 // specified by @link.
372372 //
373373 // If the link exists, the linked #GMenuModel is returned. If the link
374374 // does not exist, %NULL is returned.
375-func (x *MenuModel) GetItemLink(ItemIndexVar int32, LinkVar string) *MenuModel {
375+func (x *MenuModel) GetItemLink(ItemIndexVar int, LinkVar string) *MenuModel {
376376
377377 GetItemLinkPtr := xMenuModelGetItemLink(x.GoPointer(), ItemIndexVar, LinkVar)
378378 if GetItemLinkPtr == 0 {
@@ -385,10 +385,10 @@ func (x *MenuModel) GetItemLink(ItemIndexVar int32, LinkVar string) *MenuModel {
385385
386386 }
387387
388-var xMenuModelGetNItems func(uintptr) int32
388+var xMenuModelGetNItems func(uintptr) int
389389
390390 // Query the number of items in @model.
391-func (x *MenuModel) GetNItems() int32 {
391+func (x *MenuModel) GetNItems() int {
392392
393393 return xMenuModelGetNItems(x.GoPointer())
394394
@@ -406,7 +406,7 @@ func (x *MenuModel) IsMutable() bool {
406406
407407 }
408408
409-var xMenuModelItemsChanged func(uintptr, int32, int32, int32)
409+var xMenuModelItemsChanged func(uintptr, int, int, int)
410410
411411 // Requests emission of the #GMenuModel::items-changed signal on @model.
412412 //
@@ -423,19 +423,19 @@ var xMenuModelItemsChanged func(uintptr, int32, int32, int32)
423423 // entry and not in response to calls -- particularly those from the
424424 // #GMenuModel API. Said another way: the menu must not change while
425425 // user code is running without returning to the mainloop.
426-func (x *MenuModel) ItemsChanged(PositionVar int32, RemovedVar int32, AddedVar int32) {
426+func (x *MenuModel) ItemsChanged(PositionVar int, RemovedVar int, AddedVar int) {
427427
428428 xMenuModelItemsChanged(x.GoPointer(), PositionVar, RemovedVar, AddedVar)
429429
430430 }
431431
432-var xMenuModelIterateItemAttributes func(uintptr, int32) uintptr
432+var xMenuModelIterateItemAttributes func(uintptr, int) uintptr
433433
434434 // Creates a #GMenuAttributeIter to iterate over the attributes of
435435 // the item at position @item_index in @model.
436436 //
437437 // You must free the iterator with g_object_unref() when you are done.
438-func (x *MenuModel) IterateItemAttributes(ItemIndexVar int32) *MenuAttributeIter {
438+func (x *MenuModel) IterateItemAttributes(ItemIndexVar int) *MenuAttributeIter {
439439
440440 IterateItemAttributesPtr := xMenuModelIterateItemAttributes(x.GoPointer(), ItemIndexVar)
441441 if IterateItemAttributesPtr == 0 {
@@ -448,13 +448,13 @@ func (x *MenuModel) IterateItemAttributes(ItemIndexVar int32) *MenuAttributeIter
448448
449449 }
450450
451-var xMenuModelIterateItemLinks func(uintptr, int32) uintptr
451+var xMenuModelIterateItemLinks func(uintptr, int) uintptr
452452
453453 // Creates a #GMenuLinkIter to iterate over the links of the item at
454454 // position @item_index in @model.
455455 //
456456 // You must free the iterator with g_object_unref() when you are done.
457-func (x *MenuModel) IterateItemLinks(ItemIndexVar int32) *MenuLinkIter {
457+func (x *MenuModel) IterateItemLinks(ItemIndexVar int) *MenuLinkIter {
458458
459459 IterateItemLinksPtr := xMenuModelIterateItemLinks(x.GoPointer(), ItemIndexVar)
460460 if IterateItemLinksPtr == 0 {
@@ -495,8 +495,8 @@ func (c *MenuModel) SetGoPointer(ptr uintptr) {
495495 // Signal handlers may query the model (particularly the added items)
496496 // and expect to see the results of the modification that is being
497497 // reported. The signal is emitted after the modification.
498-func (x *MenuModel) ConnectItemsChanged(cb func(MenuModel, int32, int32, int32)) {
499- fcb := func(clsPtr uintptr, PositionVarp int32, RemovedVarp int32, AddedVarp int32) {
498+func (x *MenuModel) ConnectItemsChanged(cb func(MenuModel, int, int, int)) {
499+ fcb := func(clsPtr uintptr, PositionVarp int, RemovedVarp int, AddedVarp int) {
500500 fa := MenuModel{}
501501 fa.Ptr = clsPtr
502502
M v4/gio/gmountoperation.go +4 -4
@@ -69,10 +69,10 @@ func (x *MountOperation) GetAnonymous() bool {
6969
7070 }
7171
72-var xMountOperationGetChoice func(uintptr) int32
72+var xMountOperationGetChoice func(uintptr) int
7373
7474 // Gets a choice from the mount operation.
75-func (x *MountOperation) GetChoice() int32 {
75+func (x *MountOperation) GetChoice() int {
7676
7777 return xMountOperationGetChoice(x.GoPointer())
7878
@@ -161,10 +161,10 @@ func (x *MountOperation) SetAnonymous(AnonymousVar bool) {
161161
162162 }
163163
164-var xMountOperationSetChoice func(uintptr, int32)
164+var xMountOperationSetChoice func(uintptr, int)
165165
166166 // Sets a default choice for the mount operation.
167-func (x *MountOperation) SetChoice(ChoiceVar int32) {
167+func (x *MountOperation) SetChoice(ChoiceVar int) {
168168
169169 xMountOperationSetChoice(x.GoPointer(), ChoiceVar)
170170
M v4/gio/goutputstream.go +16 -16
@@ -82,7 +82,7 @@ func (x *OutputStream) Close(CancellableVar *Cancellable) bool {
8282
8383 }
8484
85-var xOutputStreamCloseAsync func(uintptr, int32, uintptr, uintptr, uintptr)
85+var xOutputStreamCloseAsync func(uintptr, int, uintptr, uintptr, uintptr)
8686
8787 // Requests an asynchronous close of the stream, releasing resources
8888 // related to it. When the operation is finished @callback will be
@@ -94,7 +94,7 @@ var xOutputStreamCloseAsync func(uintptr, int32, uintptr, uintptr, uintptr)
9494 // The asynchronous methods have a default fallback that uses threads
9595 // to implement asynchronicity, so they are optional for inheriting
9696 // classes. However, if you override one you must override all.
97-func (x *OutputStream) CloseAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
97+func (x *OutputStream) CloseAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
9898
9999 xOutputStreamCloseAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
100100
@@ -126,7 +126,7 @@ func (x *OutputStream) Flush(CancellableVar *Cancellable) bool {
126126
127127 }
128128
129-var xOutputStreamFlushAsync func(uintptr, int32, uintptr, uintptr, uintptr)
129+var xOutputStreamFlushAsync func(uintptr, int, uintptr, uintptr, uintptr)
130130
131131 // Forces an asynchronous write of all user-space buffered data for
132132 // the given @stream.
@@ -135,7 +135,7 @@ var xOutputStreamFlushAsync func(uintptr, int32, uintptr, uintptr, uintptr)
135135 // When the operation is finished @callback will be
136136 // called. You can then call g_output_stream_flush_finish() to get the
137137 // result of the operation.
138-func (x *OutputStream) FlushAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
138+func (x *OutputStream) FlushAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
139139
140140 xOutputStreamFlushAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
141141
@@ -220,7 +220,7 @@ func (x *OutputStream) Splice(SourceVar *InputStream, FlagsVar OutputStreamSplic
220220
221221 }
222222
223-var xOutputStreamSpliceAsync func(uintptr, uintptr, OutputStreamSpliceFlags, int32, uintptr, uintptr, uintptr)
223+var xOutputStreamSpliceAsync func(uintptr, uintptr, OutputStreamSpliceFlags, int, uintptr, uintptr, uintptr)
224224
225225 // Splices a stream asynchronously.
226226 // When the operation is finished @callback will be called.
@@ -229,7 +229,7 @@ var xOutputStreamSpliceAsync func(uintptr, uintptr, OutputStreamSpliceFlags, int
229229 //
230230 // For the synchronous, blocking version of this function, see
231231 // g_output_stream_splice().
232-func (x *OutputStream) SpliceAsync(SourceVar *InputStream, FlagsVar OutputStreamSpliceFlags, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
232+func (x *OutputStream) SpliceAsync(SourceVar *InputStream, FlagsVar OutputStreamSpliceFlags, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
233233
234234 xOutputStreamSpliceAsync(x.GoPointer(), SourceVar.GoPointer(), FlagsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
235235
@@ -319,7 +319,7 @@ func (x *OutputStream) WriteAll(BufferVar uintptr, CountVar uint, BytesWrittenVa
319319
320320 }
321321
322-var xOutputStreamWriteAllAsync func(uintptr, uintptr, uint, int32, uintptr, uintptr, uintptr)
322+var xOutputStreamWriteAllAsync func(uintptr, uintptr, uint, int, uintptr, uintptr, uintptr)
323323
324324 // Request an asynchronous write of @count bytes from @buffer into
325325 // the stream. When the operation is finished @callback will be called.
@@ -336,7 +336,7 @@ var xOutputStreamWriteAllAsync func(uintptr, uintptr, uint, int32, uintptr, uint
336336 //
337337 // Note that no copy of @buffer will be made, so it must stay valid
338338 // until @callback is called.
339-func (x *OutputStream) WriteAllAsync(BufferVar uintptr, CountVar uint, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
339+func (x *OutputStream) WriteAllAsync(BufferVar uintptr, CountVar uint, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
340340
341341 xOutputStreamWriteAllAsync(x.GoPointer(), BufferVar, CountVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
342342
@@ -360,7 +360,7 @@ func (x *OutputStream) WriteAllFinish(ResultVar AsyncResult, BytesWrittenVar uin
360360
361361 }
362362
363-var xOutputStreamWriteAsync func(uintptr, uintptr, uint, int32, uintptr, uintptr, uintptr)
363+var xOutputStreamWriteAsync func(uintptr, uintptr, uint, int, uintptr, uintptr, uintptr)
364364
365365 // Request an asynchronous write of @count bytes from @buffer into
366366 // the stream. When the operation is finished @callback will be called.
@@ -397,7 +397,7 @@ var xOutputStreamWriteAsync func(uintptr, uintptr, uint, int32, uintptr, uintptr
397397 // until @callback is called. See g_output_stream_write_bytes_async()
398398 // for a #GBytes version that will automatically hold a reference to
399399 // the contents (without copying) for the duration of the call.
400-func (x *OutputStream) WriteAsync(BufferVar uintptr, CountVar uint, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
400+func (x *OutputStream) WriteAsync(BufferVar uintptr, CountVar uint, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
401401
402402 xOutputStreamWriteAsync(x.GoPointer(), BufferVar, CountVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
403403
@@ -422,7 +422,7 @@ func (x *OutputStream) WriteBytes(BytesVar *glib.Bytes, CancellableVar *Cancella
422422
423423 }
424424
425-var xOutputStreamWriteBytesAsync func(uintptr, *glib.Bytes, int32, uintptr, uintptr, uintptr)
425+var xOutputStreamWriteBytesAsync func(uintptr, *glib.Bytes, int, uintptr, uintptr, uintptr)
426426
427427 // This function is similar to g_output_stream_write_async(), but
428428 // takes a #GBytes as input. Due to the refcounted nature of #GBytes,
@@ -437,7 +437,7 @@ var xOutputStreamWriteBytesAsync func(uintptr, *glib.Bytes, int32, uintptr, uint
437437 //
438438 // For the synchronous, blocking version of this function, see
439439 // g_output_stream_write_bytes().
440-func (x *OutputStream) WriteBytesAsync(BytesVar *glib.Bytes, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
440+func (x *OutputStream) WriteBytesAsync(BytesVar *glib.Bytes, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
441441
442442 xOutputStreamWriteBytesAsync(x.GoPointer(), BytesVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
443443
@@ -522,7 +522,7 @@ func (x *OutputStream) WritevAll(VectorsVar uintptr, NVectorsVar uint, BytesWrit
522522
523523 }
524524
525-var xOutputStreamWritevAllAsync func(uintptr, uintptr, uint, int32, uintptr, uintptr, uintptr)
525+var xOutputStreamWritevAllAsync func(uintptr, uintptr, uint, int, uintptr, uintptr, uintptr)
526526
527527 // Request an asynchronous write of the bytes contained in the @n_vectors @vectors into
528528 // the stream. When the operation is finished @callback will be called.
@@ -540,7 +540,7 @@ var xOutputStreamWritevAllAsync func(uintptr, uintptr, uint, int32, uintptr, uin
540540 // Note that no copy of @vectors will be made, so it must stay valid
541541 // until @callback is called. The content of the individual elements
542542 // of @vectors might be changed by this function.
543-func (x *OutputStream) WritevAllAsync(VectorsVar uintptr, NVectorsVar uint, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
543+func (x *OutputStream) WritevAllAsync(VectorsVar uintptr, NVectorsVar uint, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
544544
545545 xOutputStreamWritevAllAsync(x.GoPointer(), VectorsVar, NVectorsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
546546
@@ -564,7 +564,7 @@ func (x *OutputStream) WritevAllFinish(ResultVar AsyncResult, BytesWrittenVar ui
564564
565565 }
566566
567-var xOutputStreamWritevAsync func(uintptr, uintptr, uint, int32, uintptr, uintptr, uintptr)
567+var xOutputStreamWritevAsync func(uintptr, uintptr, uint, int, uintptr, uintptr, uintptr)
568568
569569 // Request an asynchronous write of the bytes contained in @n_vectors @vectors into
570570 // the stream. When the operation is finished @callback will be called.
@@ -596,7 +596,7 @@ var xOutputStreamWritevAsync func(uintptr, uintptr, uint, int32, uintptr, uintpt
596596 //
597597 // Note that no copy of @vectors will be made, so it must stay valid
598598 // until @callback is called.
599-func (x *OutputStream) WritevAsync(VectorsVar uintptr, NVectorsVar uint, IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
599+func (x *OutputStream) WritevAsync(VectorsVar uintptr, NVectorsVar uint, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
600600
601601 xOutputStreamWritevAsync(x.GoPointer(), VectorsVar, NVectorsVar, IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
602602
M v4/gio/gsettings.go +10 -10
@@ -717,7 +717,7 @@ func (x *Settings) GetDouble(KeyVar string) float64 {
717717
718718 }
719719
720-var xSettingsGetEnum func(uintptr, string) int32
720+var xSettingsGetEnum func(uintptr, string) int
721721
722722 // Gets the value that is stored in @settings for @key and converts it
723723 // to the enum value that it represents.
@@ -731,7 +731,7 @@ var xSettingsGetEnum func(uintptr, string) int32
731731 // If the value stored in the configuration database is not a valid
732732 // value for the enumerated type then this function will return the
733733 // default value.
734-func (x *Settings) GetEnum(KeyVar string) int32 {
734+func (x *Settings) GetEnum(KeyVar string) int {
735735
736736 return xSettingsGetEnum(x.GoPointer(), KeyVar)
737737
@@ -767,7 +767,7 @@ func (x *Settings) GetHasUnapplied() bool {
767767
768768 }
769769
770-var xSettingsGetInt func(uintptr, string) int32
770+var xSettingsGetInt func(uintptr, string) int
771771
772772 // Gets the value that is stored at @key in @settings.
773773 //
@@ -775,7 +775,7 @@ var xSettingsGetInt func(uintptr, string) int32
775775 //
776776 // It is a programmer error to give a @key that isn't specified as
777777 // having a int32 type in the schema for @settings.
778-func (x *Settings) GetInt(KeyVar string) int32 {
778+func (x *Settings) GetInt(KeyVar string) int {
779779
780780 return xSettingsGetInt(x.GoPointer(), KeyVar)
781781
@@ -1058,7 +1058,7 @@ func (x *Settings) SetDouble(KeyVar string, ValueVar float64) bool {
10581058
10591059 }
10601060
1061-var xSettingsSetEnum func(uintptr, string, int32) bool
1061+var xSettingsSetEnum func(uintptr, string, int) bool
10621062
10631063 // Looks up the enumerated type nick for @value and writes it to @key,
10641064 // within @settings.
@@ -1070,7 +1070,7 @@ var xSettingsSetEnum func(uintptr, string, int32) bool
10701070 // After performing the write, accessing @key directly with
10711071 // g_settings_get_string() will return the 'nick' associated with
10721072 // @value.
1073-func (x *Settings) SetEnum(KeyVar string, ValueVar int32) bool {
1073+func (x *Settings) SetEnum(KeyVar string, ValueVar int) bool {
10741074
10751075 return xSettingsSetEnum(x.GoPointer(), KeyVar, ValueVar)
10761076
@@ -1095,7 +1095,7 @@ func (x *Settings) SetFlags(KeyVar string, ValueVar uint) bool {
10951095
10961096 }
10971097
1098-var xSettingsSetInt func(uintptr, string, int32) bool
1098+var xSettingsSetInt func(uintptr, string, int) bool
10991099
11001100 // Sets @key in @settings to @value.
11011101 //
@@ -1103,7 +1103,7 @@ var xSettingsSetInt func(uintptr, string, int32) bool
11031103 //
11041104 // It is a programmer error to give a @key that isn't specified as
11051105 // having a int32 type in the schema for @settings.
1106-func (x *Settings) SetInt(KeyVar string, ValueVar int32) bool {
1106+func (x *Settings) SetInt(KeyVar string, ValueVar int) bool {
11071107
11081108 return xSettingsSetInt(x.GoPointer(), KeyVar, ValueVar)
11091109
@@ -1220,8 +1220,8 @@ func (c *Settings) SetGoPointer(ptr uintptr) {
12201220 // The default handler for this signal invokes the "changed" signal
12211221 // for each affected key. If any other connected handler returns
12221222 // %TRUE then this default functionality will be suppressed.
1223-func (x *Settings) ConnectChangeEvent(cb func(Settings, uintptr, int32) bool) {
1224- fcb := func(clsPtr uintptr, KeysVarp uintptr, NKeysVarp int32) bool {
1223+func (x *Settings) ConnectChangeEvent(cb func(Settings, uintptr, int) bool) {
1224+ fcb := func(clsPtr uintptr, KeysVarp uintptr, NKeysVarp int) bool {
12251225 fa := Settings{}
12261226 fa.Ptr = clsPtr
12271227
M v4/gio/gsimpleactiongroup.go +3 -3
@@ -43,11 +43,11 @@ func NewSimpleActionGroup() *SimpleActionGroup {
4343 return NewSimpleActionGroupCls
4444 }
4545
46-var xSimpleActionGroupAddEntries func(uintptr, uintptr, int32, uintptr)
46+var xSimpleActionGroupAddEntries func(uintptr, uintptr, int, uintptr)
4747
4848 // A convenience function for creating multiple #GSimpleAction instances
4949 // and adding them to the action group.
50-func (x *SimpleActionGroup) AddEntries(EntriesVar uintptr, NEntriesVar int32, UserDataVar uintptr) {
50+func (x *SimpleActionGroup) AddEntries(EntriesVar uintptr, NEntriesVar int, UserDataVar uintptr) {
5151
5252 xSimpleActionGroupAddEntries(x.GoPointer(), EntriesVar, NEntriesVar, UserDataVar)
5353
@@ -392,7 +392,7 @@ func (x *SimpleActionGroup) AddAction(ActionVar Action) {
392392 // }
393393 //
394394 // ]|
395-func (x *SimpleActionGroup) AddActionEntries(EntriesVar uintptr, NEntriesVar int32, UserDataVar uintptr) {
395+func (x *SimpleActionGroup) AddActionEntries(EntriesVar uintptr, NEntriesVar int, UserDataVar uintptr) {
396396
397397 XGActionMapAddActionEntries(x.GoPointer(), EntriesVar, NEntriesVar, UserDataVar)
398398
M v4/gio/gsimpleasyncresult.go +10 -10
@@ -11,12 +11,12 @@ import (
1111 type SimpleAsyncResultClass struct {
1212 }
1313
14-var xSimpleAsyncReportErrorInIdle func(uintptr, uintptr, uintptr, glib.Quark, int32, string, ...interface{})
14+var xSimpleAsyncReportErrorInIdle func(uintptr, uintptr, uintptr, glib.Quark, int, string, ...interface{})
1515
1616 // Reports an error in an asynchronous function in an idle function by
1717 // directly setting the contents of the #GAsyncResult with the given error
1818 // information.
19-func SimpleAsyncReportErrorInIdle(ObjectVar *gobject.Object, CallbackVar AsyncReadyCallback, UserDataVar uintptr, DomainVar glib.Quark, CodeVar int32, FormatVar string, varArgs ...interface{}) {
19+func SimpleAsyncReportErrorInIdle(ObjectVar *gobject.Object, CallbackVar AsyncReadyCallback, UserDataVar uintptr, DomainVar glib.Quark, CodeVar int, FormatVar string, varArgs ...interface{}) {
2020
2121 xSimpleAsyncReportErrorInIdle(ObjectVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar, DomainVar, CodeVar, FormatVar, varArgs...)
2222
@@ -249,10 +249,10 @@ func NewSimpleAsyncResult(SourceObjectVar *gobject.Object, CallbackVar AsyncRead
249249 return NewSimpleAsyncResultCls
250250 }
251251
252-var xNewErrorSimpleAsyncResult func(uintptr, uintptr, uintptr, glib.Quark, int32, string, ...interface{}) uintptr
252+var xNewErrorSimpleAsyncResult func(uintptr, uintptr, uintptr, glib.Quark, int, string, ...interface{}) uintptr
253253
254254 // Creates a new #GSimpleAsyncResult with a set error.
255-func NewErrorSimpleAsyncResult(SourceObjectVar *gobject.Object, CallbackVar AsyncReadyCallback, UserDataVar uintptr, DomainVar glib.Quark, CodeVar int32, FormatVar string, varArgs ...interface{}) *SimpleAsyncResult {
255+func NewErrorSimpleAsyncResult(SourceObjectVar *gobject.Object, CallbackVar AsyncReadyCallback, UserDataVar uintptr, DomainVar glib.Quark, CodeVar int, FormatVar string, varArgs ...interface{}) *SimpleAsyncResult {
256256 NewErrorSimpleAsyncResultPtr := xNewErrorSimpleAsyncResult(SourceObjectVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar, DomainVar, CodeVar, FormatVar, varArgs...)
257257 if NewErrorSimpleAsyncResultPtr == 0 {
258258 return nil
@@ -372,7 +372,7 @@ func (x *SimpleAsyncResult) PropagateError() bool {
372372
373373 }
374374
375-var xSimpleAsyncResultRunInThread func(uintptr, uintptr, int32, uintptr)
375+var xSimpleAsyncResultRunInThread func(uintptr, uintptr, int, uintptr)
376376
377377 // Runs the asynchronous job in a separate thread and then calls
378378 // g_simple_async_result_complete_in_idle() on @simple to return
@@ -380,7 +380,7 @@ var xSimpleAsyncResultRunInThread func(uintptr, uintptr, int32, uintptr)
380380 //
381381 // Calling this function takes a reference to @simple for as long as
382382 // is needed to run the job and report its completion.
383-func (x *SimpleAsyncResult) RunInThread(FuncVar SimpleAsyncThreadFunc, IoPriorityVar int32, CancellableVar *Cancellable) {
383+func (x *SimpleAsyncResult) RunInThread(FuncVar SimpleAsyncThreadFunc, IoPriorityVar int, CancellableVar *Cancellable) {
384384
385385 xSimpleAsyncResultRunInThread(x.GoPointer(), purego.NewCallback(FuncVar), IoPriorityVar, CancellableVar.GoPointer())
386386
@@ -409,20 +409,20 @@ func (x *SimpleAsyncResult) SetCheckCancellable(CheckCancellableVar *Cancellable
409409
410410 }
411411
412-var xSimpleAsyncResultSetError func(uintptr, glib.Quark, int32, string, ...interface{})
412+var xSimpleAsyncResultSetError func(uintptr, glib.Quark, int, string, ...interface{})
413413
414414 // Sets an error within the asynchronous result without a #GError.
415-func (x *SimpleAsyncResult) SetError(DomainVar glib.Quark, CodeVar int32, FormatVar string, varArgs ...interface{}) {
415+func (x *SimpleAsyncResult) SetError(DomainVar glib.Quark, CodeVar int, FormatVar string, varArgs ...interface{}) {
416416
417417 xSimpleAsyncResultSetError(x.GoPointer(), DomainVar, CodeVar, FormatVar, varArgs...)
418418
419419 }
420420
421-var xSimpleAsyncResultSetErrorVa func(uintptr, glib.Quark, int32, string, []interface{})
421+var xSimpleAsyncResultSetErrorVa func(uintptr, glib.Quark, int, string, []interface{})
422422
423423 // Sets an error within the asynchronous result without a #GError.
424424 // Unless writing a binding, see g_simple_async_result_set_error().
425-func (x *SimpleAsyncResult) SetErrorVa(DomainVar glib.Quark, CodeVar int32, FormatVar string, ArgsVar []interface{}) {
425+func (x *SimpleAsyncResult) SetErrorVa(DomainVar glib.Quark, CodeVar int, FormatVar string, ArgsVar []interface{}) {
426426
427427 xSimpleAsyncResultSetErrorVa(x.GoPointer(), DomainVar, CodeVar, FormatVar, ArgsVar)
428428
M v4/gio/gsocket.go +22 -22
@@ -102,7 +102,7 @@ func NewSocket(FamilyVar SocketFamily, TypeVar SocketType, ProtocolVar SocketPro
102102 return NewSocketCls
103103 }
104104
105-var xNewFromFdSocket func(int32) uintptr
105+var xNewFromFdSocket func(int) uintptr
106106
107107 // Creates a new #GSocket from a native file descriptor
108108 // or winsock SOCKET handle.
@@ -117,7 +117,7 @@ var xNewFromFdSocket func(int32) uintptr
117117 //
118118 // Since GLib 2.46, it is no longer a fatal error to call this on a non-socket
119119 // descriptor. Instead, a GError will be set with code %G_IO_ERROR_FAILED
120-func NewFromFdSocket(FdVar int32) *Socket {
120+func NewFromFdSocket(FdVar int) *Socket {
121121 NewFromFdSocketPtr := xNewFromFdSocket(FdVar)
122122 if NewFromFdSocketPtr == 0 {
123123 return nil
@@ -453,14 +453,14 @@ func (x *Socket) GetFamily() SocketFamily {
453453
454454 }
455455
456-var xSocketGetFd func(uintptr) int32
456+var xSocketGetFd func(uintptr) int
457457
458458 // Returns the underlying OS socket object. On unix this
459459 // is a socket file descriptor, and on Windows this is
460460 // a Winsock2 SOCKET handle. This may be useful for
461461 // doing platform specific or otherwise unusual operations
462462 // on the socket.
463-func (x *Socket) GetFd() int32 {
463+func (x *Socket) GetFd() int {
464464
465465 return xSocketGetFd(x.GoPointer())
466466
@@ -476,11 +476,11 @@ func (x *Socket) GetKeepalive() bool {
476476
477477 }
478478
479-var xSocketGetListenBacklog func(uintptr) int32
479+var xSocketGetListenBacklog func(uintptr) int
480480
481481 // Gets the listen backlog setting of the socket. For details on this,
482482 // see g_socket_set_listen_backlog().
483-func (x *Socket) GetListenBacklog() int32 {
483+func (x *Socket) GetListenBacklog() int {
484484
485485 return xSocketGetListenBacklog(x.GoPointer())
486486
@@ -525,7 +525,7 @@ func (x *Socket) GetMulticastTtl() uint {
525525
526526 }
527527
528-var xSocketGetOption func(uintptr, int32, int32, int32) bool
528+var xSocketGetOption func(uintptr, int, int, int) bool
529529
530530 // Gets the value of an integer-valued option on @socket, as with
531531 // getsockopt(). (If you need to fetch a non-integer-valued option,
@@ -540,7 +540,7 @@ var xSocketGetOption func(uintptr, int32, int32, int32) bool
540540 // Note that even for socket options that are a single byte in size,
541541 // @value is still a pointer to a #gint variable, not a #guchar;
542542 // g_socket_get_option() will handle the conversion internally.
543-func (x *Socket) GetOption(LevelVar int32, OptnameVar int32, ValueVar int32) bool {
543+func (x *Socket) GetOption(LevelVar int, OptnameVar int, ValueVar int) bool {
544544
545545 return xSocketGetOption(x.GoPointer(), LevelVar, OptnameVar, ValueVar)
546546
@@ -764,7 +764,7 @@ func (x *Socket) ReceiveFrom(AddressVar **SocketAddress, BufferVar uintptr, Size
764764
765765 }
766766
767-var xSocketReceiveMessage func(uintptr, *uintptr, uintptr, int32, uintptr, int32, int32, uintptr) int
767+var xSocketReceiveMessage func(uintptr, *uintptr, uintptr, int, uintptr, int, int, uintptr) int
768768
769769 // Receive data from a socket. For receiving multiple messages, see
770770 // g_socket_receive_messages(); for easier use, see
@@ -825,13 +825,13 @@ var xSocketReceiveMessage func(uintptr, *uintptr, uintptr, int32, uintptr, int32
825825 // %G_IO_IN condition.
826826 //
827827 // On error -1 is returned and @error is set accordingly.
828-func (x *Socket) ReceiveMessage(AddressVar **SocketAddress, VectorsVar uintptr, NumVectorsVar int32, MessagesVar uintptr, NumMessagesVar int32, FlagsVar int32, CancellableVar *Cancellable) int {
828+func (x *Socket) ReceiveMessage(AddressVar **SocketAddress, VectorsVar uintptr, NumVectorsVar int, MessagesVar uintptr, NumMessagesVar int, FlagsVar int, CancellableVar *Cancellable) int {
829829
830830 return xSocketReceiveMessage(x.GoPointer(), gobject.ConvertPtr(AddressVar), VectorsVar, NumVectorsVar, MessagesVar, NumMessagesVar, FlagsVar, CancellableVar.GoPointer())
831831
832832 }
833833
834-var xSocketReceiveMessages func(uintptr, uintptr, uint, int32, uintptr) int32
834+var xSocketReceiveMessages func(uintptr, uintptr, uint, int, uintptr) int
835835
836836 // Receive multiple data messages from @socket in one go. This is the most
837837 // complicated and fully-featured version of this call. For easier use, see
@@ -881,7 +881,7 @@ var xSocketReceiveMessages func(uintptr, uintptr, uint, int32, uintptr) int32
881881 // On error -1 is returned and @error is set accordingly. An error will only
882882 // be returned if zero messages could be received; otherwise the number of
883883 // messages successfully received before the error will be returned.
884-func (x *Socket) ReceiveMessages(MessagesVar uintptr, NumMessagesVar uint, FlagsVar int32, CancellableVar *Cancellable) int32 {
884+func (x *Socket) ReceiveMessages(MessagesVar uintptr, NumMessagesVar uint, FlagsVar int, CancellableVar *Cancellable) int {
885885
886886 return xSocketReceiveMessages(x.GoPointer(), MessagesVar, NumMessagesVar, FlagsVar, CancellableVar.GoPointer())
887887
@@ -920,7 +920,7 @@ func (x *Socket) Send(BufferVar uintptr, SizeVar uint, CancellableVar *Cancellab
920920
921921 }
922922
923-var xSocketSendMessage func(uintptr, uintptr, uintptr, int32, uintptr, int32, int32, uintptr) int
923+var xSocketSendMessage func(uintptr, uintptr, uintptr, int, uintptr, int, int, uintptr) int
924924
925925 // Send data to @address on @socket. For sending multiple messages see
926926 // g_socket_send_messages(); for easier use, see
@@ -964,13 +964,13 @@ var xSocketSendMessage func(uintptr, uintptr, uintptr, int32, uintptr, int32, in
964964 // function.
965965 //
966966 // On error -1 is returned and @error is set accordingly.
967-func (x *Socket) SendMessage(AddressVar *SocketAddress, VectorsVar uintptr, NumVectorsVar int32, MessagesVar uintptr, NumMessagesVar int32, FlagsVar int32, CancellableVar *Cancellable) int {
967+func (x *Socket) SendMessage(AddressVar *SocketAddress, VectorsVar uintptr, NumVectorsVar int, MessagesVar uintptr, NumMessagesVar int, FlagsVar int, CancellableVar *Cancellable) int {
968968
969969 return xSocketSendMessage(x.GoPointer(), AddressVar.GoPointer(), VectorsVar, NumVectorsVar, MessagesVar, NumMessagesVar, FlagsVar, CancellableVar.GoPointer())
970970
971971 }
972972
973-var xSocketSendMessageWithTimeout func(uintptr, uintptr, uintptr, int32, uintptr, int32, int32, int64, uint, uintptr) PollableReturn
973+var xSocketSendMessageWithTimeout func(uintptr, uintptr, uintptr, int, uintptr, int, int, int64, uint, uintptr) PollableReturn
974974
975975 // This behaves exactly the same as g_socket_send_message(), except that
976976 // the choice of timeout behavior is determined by the @timeout_us argument
@@ -979,13 +979,13 @@ var xSocketSendMessageWithTimeout func(uintptr, uintptr, uintptr, int32, uintptr
979979 // On error %G_POLLABLE_RETURN_FAILED is returned and @error is set accordingly, or
980980 // if the socket is currently not writable %G_POLLABLE_RETURN_WOULD_BLOCK is
981981 // returned. @bytes_written will contain 0 in both cases.
982-func (x *Socket) SendMessageWithTimeout(AddressVar *SocketAddress, VectorsVar uintptr, NumVectorsVar int32, MessagesVar uintptr, NumMessagesVar int32, FlagsVar int32, TimeoutUsVar int64, BytesWrittenVar uint, CancellableVar *Cancellable) PollableReturn {
982+func (x *Socket) SendMessageWithTimeout(AddressVar *SocketAddress, VectorsVar uintptr, NumVectorsVar int, MessagesVar uintptr, NumMessagesVar int, FlagsVar int, TimeoutUsVar int64, BytesWrittenVar uint, CancellableVar *Cancellable) PollableReturn {
983983
984984 return xSocketSendMessageWithTimeout(x.GoPointer(), AddressVar.GoPointer(), VectorsVar, NumVectorsVar, MessagesVar, NumMessagesVar, FlagsVar, TimeoutUsVar, BytesWrittenVar, CancellableVar.GoPointer())
985985
986986 }
987987
988-var xSocketSendMessages func(uintptr, uintptr, uint, int32, uintptr) int32
988+var xSocketSendMessages func(uintptr, uintptr, uint, int, uintptr) int
989989
990990 // Send multiple data messages from @socket in one go. This is the most
991991 // complicated and fully-featured version of this call. For easier use, see
@@ -1021,7 +1021,7 @@ var xSocketSendMessages func(uintptr, uintptr, uint, int32, uintptr) int32
10211021 // On error -1 is returned and @error is set accordingly. An error will only
10221022 // be returned if zero messages could be sent; otherwise the number of messages
10231023 // successfully sent before the error will be returned.
1024-func (x *Socket) SendMessages(MessagesVar uintptr, NumMessagesVar uint, FlagsVar int32, CancellableVar *Cancellable) int32 {
1024+func (x *Socket) SendMessages(MessagesVar uintptr, NumMessagesVar uint, FlagsVar int, CancellableVar *Cancellable) int {
10251025
10261026 return xSocketSendMessages(x.GoPointer(), MessagesVar, NumMessagesVar, FlagsVar, CancellableVar.GoPointer())
10271027
@@ -1101,7 +1101,7 @@ func (x *Socket) SetKeepalive(KeepaliveVar bool) {
11011101
11021102 }
11031103
1104-var xSocketSetListenBacklog func(uintptr, int32)
1104+var xSocketSetListenBacklog func(uintptr, int)
11051105
11061106 // Sets the maximum number of outstanding connections allowed
11071107 // when listening on this socket. If more clients than this are
@@ -1110,7 +1110,7 @@ var xSocketSetListenBacklog func(uintptr, int32)
11101110 //
11111111 // Note that this must be called before g_socket_listen() and has no
11121112 // effect if called after that.
1113-func (x *Socket) SetListenBacklog(BacklogVar int32) {
1113+func (x *Socket) SetListenBacklog(BacklogVar int) {
11141114
11151115 xSocketSetListenBacklog(x.GoPointer(), BacklogVar)
11161116
@@ -1138,7 +1138,7 @@ func (x *Socket) SetMulticastTtl(TtlVar uint) {
11381138
11391139 }
11401140
1141-var xSocketSetOption func(uintptr, int32, int32, int32) bool
1141+var xSocketSetOption func(uintptr, int, int, int) bool
11421142
11431143 // Sets the value of an integer-valued option on @socket, as with
11441144 // setsockopt(). (If you need to set a non-integer-valued option,
@@ -1149,7 +1149,7 @@ var xSocketSetOption func(uintptr, int32, int32, int32) bool
11491149 // standard/portable socket options. For unusual socket protocols or
11501150 // platform-dependent options, you may need to include additional
11511151 // headers.
1152-func (x *Socket) SetOption(LevelVar int32, OptnameVar int32, ValueVar int32) bool {
1152+func (x *Socket) SetOption(LevelVar int, OptnameVar int, ValueVar int) bool {
11531153
11541154 return xSocketSetOption(x.GoPointer(), LevelVar, OptnameVar, ValueVar)
11551155
M v4/gio/gsocketcontrolmessage.go +4 -4
@@ -45,21 +45,21 @@ func SocketControlMessageNewFromInternalPtr(ptr uintptr) *SocketControlMessage {
4545 return cls
4646 }
4747
48-var xSocketControlMessageGetLevel func(uintptr) int32
48+var xSocketControlMessageGetLevel func(uintptr) int
4949
5050 // Returns the "level" (i.e. the originating protocol) of the control message.
5151 // This is often SOL_SOCKET.
52-func (x *SocketControlMessage) GetLevel() int32 {
52+func (x *SocketControlMessage) GetLevel() int {
5353
5454 return xSocketControlMessageGetLevel(x.GoPointer())
5555
5656 }
5757
58-var xSocketControlMessageGetMsgType func(uintptr) int32
58+var xSocketControlMessageGetMsgType func(uintptr) int
5959
6060 // Returns the protocol specific type of the control message.
6161 // For instance, for UNIX fd passing this would be SCM_RIGHTS.
62-func (x *SocketControlMessage) GetMsgType() int32 {
62+func (x *SocketControlMessage) GetMsgType() int {
6363
6464 return xSocketControlMessageGetMsgType(x.GoPointer())
6565
M v4/gio/gsocketlistener.go +2 -2
@@ -267,14 +267,14 @@ func (x *SocketListener) Close() {
267267
268268 }
269269
270-var xSocketListenerSetBacklog func(uintptr, int32)
270+var xSocketListenerSetBacklog func(uintptr, int)
271271
272272 // Sets the listen backlog on the sockets in the listener. This must be called
273273 // before adding any sockets, addresses or ports to the #GSocketListener (for
274274 // example, by calling g_socket_listener_add_inet_port()) to be effective.
275275 //
276276 // See g_socket_set_listen_backlog() for details
277-func (x *SocketListener) SetBacklog(ListenBacklogVar int32) {
277+func (x *SocketListener) SetBacklog(ListenBacklogVar int) {
278278
279279 xSocketListenerSetBacklog(x.GoPointer(), ListenBacklogVar)
280280
M v4/gio/gtask.go +6 -6
@@ -654,10 +654,10 @@ func (x *Task) GetName() string {
654654
655655 }
656656
657-var xTaskGetPriority func(uintptr) int32
657+var xTaskGetPriority func(uintptr) int
658658
659659 // Gets @task's priority
660-func (x *Task) GetPriority() int32 {
660+func (x *Task) GetPriority() int {
661661
662662 return xTaskGetPriority(x.GoPointer())
663663
@@ -836,7 +836,7 @@ func (x *Task) ReturnInt(ResultVar int) {
836836
837837 }
838838
839-var xTaskReturnNewError func(uintptr, glib.Quark, int32, string, ...interface{})
839+var xTaskReturnNewError func(uintptr, glib.Quark, int, string, ...interface{})
840840
841841 // Sets @task's result to a new #GError created from @domain, @code,
842842 // @format, and the remaining arguments, and completes the task (see
@@ -844,7 +844,7 @@ var xTaskReturnNewError func(uintptr, glib.Quark, int32, string, ...interface{})
844844 // means).
845845 //
846846 // See also g_task_return_error().
847-func (x *Task) ReturnNewError(DomainVar glib.Quark, CodeVar int32, FormatVar string, varArgs ...interface{}) {
847+func (x *Task) ReturnNewError(DomainVar glib.Quark, CodeVar int, FormatVar string, varArgs ...interface{}) {
848848
849849 xTaskReturnNewError(x.GoPointer(), DomainVar, CodeVar, FormatVar, varArgs...)
850850
@@ -976,7 +976,7 @@ func (x *Task) SetName(NameVar string) {
976976
977977 }
978978
979-var xTaskSetPriority func(uintptr, int32)
979+var xTaskSetPriority func(uintptr, int)
980980
981981 // Sets @task's priority. If you do not call this, it will default to
982982 // %G_PRIORITY_DEFAULT.
@@ -985,7 +985,7 @@ var xTaskSetPriority func(uintptr, int32)
985985 // g_task_attach_source() and the scheduling of tasks run in threads,
986986 // and can also be explicitly retrieved later via
987987 // g_task_get_priority().
988-func (x *Task) SetPriority(PriorityVar int32) {
988+func (x *Task) SetPriority(PriorityVar int) {
989989
990990 xTaskSetPriority(x.GoPointer(), PriorityVar)
991991
M v4/gio/gthemedicon.go +2 -2
@@ -42,10 +42,10 @@ func NewThemedIcon(IconnameVar string) *ThemedIcon {
4242 return NewThemedIconCls
4343 }
4444
45-var xNewFromNamesThemedIcon func([]string, int32) uintptr
45+var xNewFromNamesThemedIcon func([]string, int) uintptr
4646
4747 // Creates a new themed icon for @iconnames.
48-func NewFromNamesThemedIcon(IconnamesVar []string, LenVar int32) *ThemedIcon {
48+func NewFromNamesThemedIcon(IconnamesVar []string, LenVar int) *ThemedIcon {
4949 NewFromNamesThemedIconPtr := xNewFromNamesThemedIcon(IconnamesVar, LenVar)
5050 if NewFromNamesThemedIconPtr == 0 {
5151 return nil
M v4/gio/gthreadedsocketservice.go +2 -2
@@ -39,11 +39,11 @@ func ThreadedSocketServiceNewFromInternalPtr(ptr uintptr) *ThreadedSocketService
3939 return cls
4040 }
4141
42-var xNewThreadedSocketService func(int32) uintptr
42+var xNewThreadedSocketService func(int) uintptr
4343
4444 // Creates a new #GThreadedSocketService with no listeners. Listeners
4545 // must be added with one of the #GSocketListener "add" methods.
46-func NewThreadedSocketService(MaxThreadsVar int32) *SocketService {
46+func NewThreadedSocketService(MaxThreadsVar int) *SocketService {
4747 NewThreadedSocketServicePtr := xNewThreadedSocketService(MaxThreadsVar)
4848 if NewThreadedSocketServicePtr == 0 {
4949 return nil
M v4/gio/gtlsconnection.go +2 -2
@@ -268,11 +268,11 @@ func (x *TlsConnection) Handshake(CancellableVar *Cancellable) bool {
268268
269269 }
270270
271-var xTlsConnectionHandshakeAsync func(uintptr, int32, uintptr, uintptr, uintptr)
271+var xTlsConnectionHandshakeAsync func(uintptr, int, uintptr, uintptr, uintptr)
272272
273273 // Asynchronously performs a TLS handshake on @conn. See
274274 // g_tls_connection_handshake() for more information.
275-func (x *TlsConnection) HandshakeAsync(IoPriorityVar int32, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
275+func (x *TlsConnection) HandshakeAsync(IoPriorityVar int, CancellableVar *Cancellable, CallbackVar AsyncReadyCallback, UserDataVar uintptr) {
276276
277277 xTlsConnectionHandshakeAsync(x.GoPointer(), IoPriorityVar, CancellableVar.GoPointer(), purego.NewCallback(CallbackVar), UserDataVar)
278278
M v4/gio/gunixconnection.go +4 -4
@@ -100,7 +100,7 @@ func (x *UnixConnection) ReceiveCredentialsFinish(ResultVar AsyncResult) *Creden
100100
101101 }
102102
103-var xUnixConnectionReceiveFd func(uintptr, uintptr) int32
103+var xUnixConnectionReceiveFd func(uintptr, uintptr) int
104104
105105 // Receives a file descriptor from the sending end of the connection.
106106 // The sending end has to call g_unix_connection_send_fd() for this
@@ -109,7 +109,7 @@ var xUnixConnectionReceiveFd func(uintptr, uintptr) int32
109109 // As well as reading the fd this also reads a single byte from the
110110 // stream, as this is required for fd passing to work on some
111111 // implementations.
112-func (x *UnixConnection) ReceiveFd(CancellableVar *Cancellable) int32 {
112+func (x *UnixConnection) ReceiveFd(CancellableVar *Cancellable) int {
113113
114114 return xUnixConnectionReceiveFd(x.GoPointer(), CancellableVar.GoPointer())
115115
@@ -167,7 +167,7 @@ func (x *UnixConnection) SendCredentialsFinish(ResultVar AsyncResult) bool {
167167
168168 }
169169
170-var xUnixConnectionSendFd func(uintptr, int32, uintptr) bool
170+var xUnixConnectionSendFd func(uintptr, int, uintptr) bool
171171
172172 // Passes a file descriptor to the receiving side of the
173173 // connection. The receiving end has to call g_unix_connection_receive_fd()
@@ -176,7 +176,7 @@ var xUnixConnectionSendFd func(uintptr, int32, uintptr) bool
176176 // As well as sending the fd this also writes a single byte to the
177177 // stream, as this is required for fd passing to work on some
178178 // implementations.
179-func (x *UnixConnection) SendFd(FdVar int32, CancellableVar *Cancellable) bool {
179+func (x *UnixConnection) SendFd(FdVar int, CancellableVar *Cancellable) bool {
180180
181181 return xUnixConnectionSendFd(x.GoPointer(), FdVar, CancellableVar.GoPointer())
182182
M v4/gio/gunixfdlist.go +12 -12
@@ -48,7 +48,7 @@ func NewUnixFDList() *UnixFDList {
4848 return NewUnixFDListCls
4949 }
5050
51-var xNewFromArrayUnixFDList func(uintptr, int32) uintptr
51+var xNewFromArrayUnixFDList func(uintptr, int) uintptr
5252
5353 // Creates a new #GUnixFDList containing the file descriptors given in
5454 // @fds. The file descriptors become the property of the new list and
@@ -58,7 +58,7 @@ var xNewFromArrayUnixFDList func(uintptr, int32) uintptr
5858 // Each file descriptor in the array should be set to close-on-exec.
5959 //
6060 // If @n_fds is -1 then @fds must be terminated with -1.
61-func NewFromArrayUnixFDList(FdsVar uintptr, NFdsVar int32) *UnixFDList {
61+func NewFromArrayUnixFDList(FdsVar uintptr, NFdsVar int) *UnixFDList {
6262 NewFromArrayUnixFDListPtr := xNewFromArrayUnixFDList(FdsVar, NFdsVar)
6363 if NewFromArrayUnixFDListPtr == 0 {
6464 return nil
@@ -69,7 +69,7 @@ func NewFromArrayUnixFDList(FdsVar uintptr, NFdsVar int32) *UnixFDList {
6969 return NewFromArrayUnixFDListCls
7070 }
7171
72-var xUnixFDListAppend func(uintptr, int32) int32
72+var xUnixFDListAppend func(uintptr, int) int
7373
7474 // Adds a file descriptor to @list.
7575 //
@@ -83,13 +83,13 @@ var xUnixFDListAppend func(uintptr, int32) int32
8383 // The index of the file descriptor in the list is returned. If you use
8484 // this index with g_unix_fd_list_get() then you will receive back a
8585 // duplicated copy of the same file descriptor.
86-func (x *UnixFDList) Append(FdVar int32) int32 {
86+func (x *UnixFDList) Append(FdVar int) int {
8787
8888 return xUnixFDListAppend(x.GoPointer(), FdVar)
8989
9090 }
9191
92-var xUnixFDListGet func(uintptr, int32) int32
92+var xUnixFDListGet func(uintptr, int) int
9393
9494 // Gets a file descriptor out of @list.
9595 //
@@ -103,23 +103,23 @@ var xUnixFDListGet func(uintptr, int32) int32
103103 //
104104 // A possible cause of failure is exceeding the per-process or
105105 // system-wide file descriptor limit.
106-func (x *UnixFDList) Get(IndexVar int32) int32 {
106+func (x *UnixFDList) Get(IndexVar int) int {
107107
108108 return xUnixFDListGet(x.GoPointer(), IndexVar)
109109
110110 }
111111
112-var xUnixFDListGetLength func(uintptr) int32
112+var xUnixFDListGetLength func(uintptr) int
113113
114114 // Gets the length of @list (ie: the number of file descriptors
115115 // contained within).
116-func (x *UnixFDList) GetLength() int32 {
116+func (x *UnixFDList) GetLength() int {
117117
118118 return xUnixFDListGetLength(x.GoPointer())
119119
120120 }
121121
122-var xUnixFDListPeekFds func(uintptr, int32) uintptr
122+var xUnixFDListPeekFds func(uintptr, int) uintptr
123123
124124 // Returns the array of file descriptors that is contained in this
125125 // object.
@@ -134,13 +134,13 @@ var xUnixFDListPeekFds func(uintptr, int32) uintptr
134134 //
135135 // This function never returns %NULL. In case there are no file
136136 // descriptors contained in @list, an empty array is returned.
137-func (x *UnixFDList) PeekFds(LengthVar int32) uintptr {
137+func (x *UnixFDList) PeekFds(LengthVar int) uintptr {
138138
139139 return xUnixFDListPeekFds(x.GoPointer(), LengthVar)
140140
141141 }
142142
143-var xUnixFDListStealFds func(uintptr, int32) uintptr
143+var xUnixFDListStealFds func(uintptr, int) uintptr
144144
145145 // Returns the array of file descriptors that is contained in this
146146 // object.
@@ -160,7 +160,7 @@ var xUnixFDListStealFds func(uintptr, int32) uintptr
160160 //
161161 // This function never returns %NULL. In case there are no file
162162 // descriptors contained in @list, an empty array is returned.
163-func (x *UnixFDList) StealFds(LengthVar int32) uintptr {
163+func (x *UnixFDList) StealFds(LengthVar int) uintptr {
164164
165165 return xUnixFDListStealFds(x.GoPointer(), LengthVar)
166166
M v4/gio/gunixfdmessage.go +4 -4
@@ -66,7 +66,7 @@ func NewWithFdListUnixFDMessage(FdListVar *UnixFDList) *SocketControlMessage {
6666 return NewWithFdListUnixFDMessageCls
6767 }
6868
69-var xUnixFDMessageAppendFd func(uintptr, int32) bool
69+var xUnixFDMessageAppendFd func(uintptr, int) bool
7070
7171 // Adds a file descriptor to @message.
7272 //
@@ -76,7 +76,7 @@ var xUnixFDMessageAppendFd func(uintptr, int32) bool
7676 //
7777 // A possible cause of failure is exceeding the per-process or
7878 // system-wide file descriptor limit.
79-func (x *UnixFDMessage) AppendFd(FdVar int32) bool {
79+func (x *UnixFDMessage) AppendFd(FdVar int) bool {
8080
8181 return xUnixFDMessageAppendFd(x.GoPointer(), FdVar)
8282
@@ -102,7 +102,7 @@ func (x *UnixFDMessage) GetFdList() *UnixFDList {
102102
103103 }
104104
105-var xUnixFDMessageStealFds func(uintptr, int32) uintptr
105+var xUnixFDMessageStealFds func(uintptr, int) uintptr
106106
107107 // Returns the array of file descriptors that is contained in this
108108 // object.
@@ -121,7 +121,7 @@ var xUnixFDMessageStealFds func(uintptr, int32) uintptr
121121 //
122122 // This function never returns %NULL. In case there are no file
123123 // descriptors contained in @message, an empty array is returned.
124-func (x *UnixFDMessage) StealFds(LengthVar int32) uintptr {
124+func (x *UnixFDMessage) StealFds(LengthVar int) uintptr {
125125
126126 return xUnixFDMessageStealFds(x.GoPointer(), LengthVar)
127127
M v4/gio/gunixinputstream.go +4 -4
@@ -33,13 +33,13 @@ func UnixInputStreamNewFromInternalPtr(ptr uintptr) *UnixInputStream {
3333 return cls
3434 }
3535
36-var xNewUnixInputStream func(int32, bool) uintptr
36+var xNewUnixInputStream func(int, bool) uintptr
3737
3838 // Creates a new #GUnixInputStream for the given @fd.
3939 //
4040 // If @close_fd is %TRUE, the file descriptor will be closed
4141 // when the stream is closed.
42-func NewUnixInputStream(FdVar int32, CloseFdVar bool) *InputStream {
42+func NewUnixInputStream(FdVar int, CloseFdVar bool) *InputStream {
4343 NewUnixInputStreamPtr := xNewUnixInputStream(FdVar, CloseFdVar)
4444 if NewUnixInputStreamPtr == 0 {
4545 return nil
@@ -60,10 +60,10 @@ func (x *UnixInputStream) GetCloseFd() bool {
6060
6161 }
6262
63-var xUnixInputStreamGetFd func(uintptr) int32
63+var xUnixInputStreamGetFd func(uintptr) int
6464
6565 // Return the UNIX file descriptor that the stream reads from.
66-func (x *UnixInputStream) GetFd() int32 {
66+func (x *UnixInputStream) GetFd() int {
6767
6868 return xUnixInputStreamGetFd(x.GoPointer())
6969
M v4/gio/gunixmounts.go +4 -4
@@ -79,10 +79,10 @@ func UnixMountAt(MountPathVar string, TimeReadVar uint64) *UnixMountEntry {
7979
8080 }
8181
82-var xUnixMountCompare func(*UnixMountEntry, *UnixMountEntry) int32
82+var xUnixMountCompare func(*UnixMountEntry, *UnixMountEntry) int
8383
8484 // Compares two unix mounts.
85-func UnixMountCompare(Mount1Var *UnixMountEntry, Mount2Var *UnixMountEntry) int32 {
85+func UnixMountCompare(Mount1Var *UnixMountEntry, Mount2Var *UnixMountEntry) int {
8686
8787 return xUnixMountCompare(Mount1Var, Mount2Var)
8888
@@ -344,7 +344,7 @@ func NewUnixMountMonitor() *UnixMountMonitor {
344344 return NewUnixMountMonitorCls
345345 }
346346
347-var xUnixMountMonitorSetRateLimit func(uintptr, int32)
347+var xUnixMountMonitorSetRateLimit func(uintptr, int)
348348
349349 // This function does nothing.
350350 //
@@ -353,7 +353,7 @@ var xUnixMountMonitorSetRateLimit func(uintptr, int32)
353353 // circumstances. Since @mount_monitor is a singleton, it also meant
354354 // that calling this function would have side effects for other users of
355355 // the monitor.
356-func (x *UnixMountMonitor) SetRateLimit(LimitMsecVar int32) {
356+func (x *UnixMountMonitor) SetRateLimit(LimitMsecVar int) {
357357
358358 xUnixMountMonitorSetRateLimit(x.GoPointer(), LimitMsecVar)
359359
M v4/gio/gunixoutputstream.go +4 -4
@@ -33,13 +33,13 @@ func UnixOutputStreamNewFromInternalPtr(ptr uintptr) *UnixOutputStream {
3333 return cls
3434 }
3535
36-var xNewUnixOutputStream func(int32, bool) uintptr
36+var xNewUnixOutputStream func(int, bool) uintptr
3737
3838 // Creates a new #GUnixOutputStream for the given @fd.
3939 //
4040 // If @close_fd, is %TRUE, the file descriptor will be closed when
4141 // the output stream is destroyed.
42-func NewUnixOutputStream(FdVar int32, CloseFdVar bool) *OutputStream {
42+func NewUnixOutputStream(FdVar int, CloseFdVar bool) *OutputStream {
4343 NewUnixOutputStreamPtr := xNewUnixOutputStream(FdVar, CloseFdVar)
4444 if NewUnixOutputStreamPtr == 0 {
4545 return nil
@@ -60,10 +60,10 @@ func (x *UnixOutputStream) GetCloseFd() bool {
6060
6161 }
6262
63-var xUnixOutputStreamGetFd func(uintptr) int32
63+var xUnixOutputStreamGetFd func(uintptr) int
6464
6565 // Return the UNIX file descriptor that the stream writes to.
66-func (x *UnixOutputStream) GetFd() int32 {
66+func (x *UnixOutputStream) GetFd() int {
6767
6868 return xUnixOutputStreamGetFd(x.GoPointer())
6969
M v4/gio/gunixsocketaddress.go +4 -4
@@ -58,11 +58,11 @@ func NewUnixSocketAddress(PathVar string) *SocketAddress {
5858 return NewUnixSocketAddressCls
5959 }
6060
61-var xNewAbstractUnixSocketAddress func(uintptr, int32) uintptr
61+var xNewAbstractUnixSocketAddress func(uintptr, int) uintptr
6262
6363 // Creates a new %G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED
6464 // #GUnixSocketAddress for @path.
65-func NewAbstractUnixSocketAddress(PathVar uintptr, PathLenVar int32) *SocketAddress {
65+func NewAbstractUnixSocketAddress(PathVar uintptr, PathLenVar int) *SocketAddress {
6666 NewAbstractUnixSocketAddressPtr := xNewAbstractUnixSocketAddress(PathVar, PathLenVar)
6767 if NewAbstractUnixSocketAddressPtr == 0 {
6868 return nil
@@ -73,7 +73,7 @@ func NewAbstractUnixSocketAddress(PathVar uintptr, PathLenVar int32) *SocketAddr
7373 return NewAbstractUnixSocketAddressCls
7474 }
7575
76-var xNewWithTypeUnixSocketAddress func(uintptr, int32, UnixSocketAddressType) uintptr
76+var xNewWithTypeUnixSocketAddress func(uintptr, int, UnixSocketAddressType) uintptr
7777
7878 // Creates a new #GUnixSocketAddress of type @type with name @path.
7979 //
@@ -106,7 +106,7 @@ var xNewWithTypeUnixSocketAddress func(uintptr, int32, UnixSocketAddressType) ui
106106 // when connecting to a server created by another process, you must
107107 // use the appropriate type corresponding to how that process created
108108 // its listening socket.
109-func NewWithTypeUnixSocketAddress(PathVar uintptr, PathLenVar int32, TypeVar UnixSocketAddressType) *SocketAddress {
109+func NewWithTypeUnixSocketAddress(PathVar uintptr, PathLenVar int, TypeVar UnixSocketAddressType) *SocketAddress {
110110 NewWithTypeUnixSocketAddressPtr := xNewWithTypeUnixSocketAddress(PathVar, PathLenVar, TypeVar)
111111 if NewWithTypeUnixSocketAddressPtr == 0 {
112112 return nil
M v4/gio/gzlibcompressor.go +2 -2
@@ -23,10 +23,10 @@ func ZlibCompressorNewFromInternalPtr(ptr uintptr) *ZlibCompressor {
2323 return cls
2424 }
2525
26-var xNewZlibCompressor func(ZlibCompressorFormat, int32) uintptr
26+var xNewZlibCompressor func(ZlibCompressorFormat, int) uintptr
2727
2828 // Creates a new #GZlibCompressor.
29-func NewZlibCompressor(FormatVar ZlibCompressorFormat, LevelVar int32) *ZlibCompressor {
29+func NewZlibCompressor(FormatVar ZlibCompressorFormat, LevelVar int) *ZlibCompressor {
3030 NewZlibCompressorPtr := xNewZlibCompressor(FormatVar, LevelVar)
3131 if NewZlibCompressorPtr == 0 {
3232 return nil
M v4/glib/gatomic.go +14 -14
@@ -6,7 +6,7 @@ import (
66 "github.com/jwijenbergh/puregotk/internal/core"
77 )
88
9-var xAtomicIntAdd func(int32, int32) int32
9+var xAtomicIntAdd func(int, int) int
1010
1111 // Atomically adds @val to the value of @atomic.
1212 //
@@ -20,7 +20,7 @@ var xAtomicIntAdd func(int32, int32) int32
2020 //
2121 // While @atomic has a `volatile` qualifier, this is a historical artifact and
2222 // the pointer passed to it should not be `volatile`.
23-func AtomicIntAdd(AtomicVar int32, ValVar int32) int32 {
23+func AtomicIntAdd(AtomicVar int, ValVar int) int {
2424
2525 return xAtomicIntAdd(AtomicVar, ValVar)
2626
@@ -44,7 +44,7 @@ func AtomicIntAnd(AtomicVar uint, ValVar uint) uint {
4444
4545 }
4646
47-var xAtomicIntCompareAndExchange func(int32, int32, int32) bool
47+var xAtomicIntCompareAndExchange func(int, int, int) bool
4848
4949 // Compares @atomic to @oldval and, if equal, sets it to @newval.
5050 // If @atomic was not equal to @oldval then no change occurs.
@@ -58,13 +58,13 @@ var xAtomicIntCompareAndExchange func(int32, int32, int32) bool
5858 //
5959 // While @atomic has a `volatile` qualifier, this is a historical artifact and
6060 // the pointer passed to it should not be `volatile`.
61-func AtomicIntCompareAndExchange(AtomicVar int32, OldvalVar int32, NewvalVar int32) bool {
61+func AtomicIntCompareAndExchange(AtomicVar int, OldvalVar int, NewvalVar int) bool {
6262
6363 return xAtomicIntCompareAndExchange(AtomicVar, OldvalVar, NewvalVar)
6464
6565 }
6666
67-var xAtomicIntDecAndTest func(int32) bool
67+var xAtomicIntDecAndTest func(int) bool
6868
6969 // Decrements the value of @atomic by 1.
7070 //
@@ -75,24 +75,24 @@ var xAtomicIntDecAndTest func(int32) bool
7575 //
7676 // While @atomic has a `volatile` qualifier, this is a historical artifact and
7777 // the pointer passed to it should not be `volatile`.
78-func AtomicIntDecAndTest(AtomicVar int32) bool {
78+func AtomicIntDecAndTest(AtomicVar int) bool {
7979
8080 return xAtomicIntDecAndTest(AtomicVar)
8181
8282 }
8383
84-var xAtomicIntExchangeAndAdd func(int32, int32) int32
84+var xAtomicIntExchangeAndAdd func(int, int) int
8585
8686 // This function existed before g_atomic_int_add() returned the prior
8787 // value of the integer (which it now does). It is retained only for
8888 // compatibility reasons. Don't use this function in new code.
89-func AtomicIntExchangeAndAdd(AtomicVar int32, ValVar int32) int32 {
89+func AtomicIntExchangeAndAdd(AtomicVar int, ValVar int) int {
9090
9191 return xAtomicIntExchangeAndAdd(AtomicVar, ValVar)
9292
9393 }
9494
95-var xAtomicIntGet func(int32) int32
95+var xAtomicIntGet func(int) int
9696
9797 // Gets the current value of @atomic.
9898 //
@@ -101,13 +101,13 @@ var xAtomicIntGet func(int32) int32
101101 //
102102 // While @atomic has a `volatile` qualifier, this is a historical artifact and
103103 // the pointer passed to it should not be `volatile`.
104-func AtomicIntGet(AtomicVar int32) int32 {
104+func AtomicIntGet(AtomicVar int) int {
105105
106106 return xAtomicIntGet(AtomicVar)
107107
108108 }
109109
110-var xAtomicIntInc func(int32)
110+var xAtomicIntInc func(int)
111111
112112 // Increments the value of @atomic by 1.
113113 //
@@ -117,7 +117,7 @@ var xAtomicIntInc func(int32)
117117 //
118118 // While @atomic has a `volatile` qualifier, this is a historical artifact and
119119 // the pointer passed to it should not be `volatile`.
120-func AtomicIntInc(AtomicVar int32) {
120+func AtomicIntInc(AtomicVar int) {
121121
122122 xAtomicIntInc(AtomicVar)
123123
@@ -141,7 +141,7 @@ func AtomicIntOr(AtomicVar uint, ValVar uint) uint {
141141
142142 }
143143
144-var xAtomicIntSet func(int32, int32)
144+var xAtomicIntSet func(int, int)
145145
146146 // Sets the value of @atomic to @newval.
147147 //
@@ -150,7 +150,7 @@ var xAtomicIntSet func(int32, int32)
150150 //
151151 // While @atomic has a `volatile` qualifier, this is a historical artifact and
152152 // the pointer passed to it should not be `volatile`.
153-func AtomicIntSet(AtomicVar int32, NewvalVar int32) {
153+func AtomicIntSet(AtomicVar int, NewvalVar int) {
154154
155155 xAtomicIntSet(AtomicVar, NewvalVar)
156156
M v4/glib/gbase64.go +6 -6
@@ -27,7 +27,7 @@ func Base64DecodeInplace(TextVar uintptr, OutLenVar uint) byte {
2727
2828 }
2929
30-var xBase64DecodeStep func(uintptr, uint, uintptr, int32, uint) uint
30+var xBase64DecodeStep func(uintptr, uint, uintptr, int, uint) uint
3131
3232 // Incrementally decode a sequence of binary data from its Base-64 stringified
3333 // representation. By calling this function multiple times you can convert
@@ -37,7 +37,7 @@ var xBase64DecodeStep func(uintptr, uint, uintptr, int32, uint) uint
3737 // be written to it. Since base64 encodes 3 bytes in 4 chars you need
3838 // at least: (@len / 4) * 3 + 3 bytes (+ 3 may be needed in case of non-zero
3939 // state).
40-func Base64DecodeStep(InVar uintptr, LenVar uint, OutVar uintptr, StateVar int32, SaveVar uint) uint {
40+func Base64DecodeStep(InVar uintptr, LenVar uint, OutVar uintptr, StateVar int, SaveVar uint) uint {
4141
4242 return xBase64DecodeStep(InVar, LenVar, OutVar, StateVar, SaveVar)
4343
@@ -53,7 +53,7 @@ func Base64Encode(DataVar uintptr, LenVar uint) string {
5353
5454 }
5555
56-var xBase64EncodeClose func(bool, uintptr, int32, int32) uint
56+var xBase64EncodeClose func(bool, uintptr, int, int) uint
5757
5858 // Flush the status from a sequence of calls to g_base64_encode_step().
5959 //
@@ -62,13 +62,13 @@ var xBase64EncodeClose func(bool, uintptr, int32, int32) uint
6262 // line-breaking is enabled.
6363 //
6464 // The @out array will not be automatically nul-terminated.
65-func Base64EncodeClose(BreakLinesVar bool, OutVar uintptr, StateVar int32, SaveVar int32) uint {
65+func Base64EncodeClose(BreakLinesVar bool, OutVar uintptr, StateVar int, SaveVar int) uint {
6666
6767 return xBase64EncodeClose(BreakLinesVar, OutVar, StateVar, SaveVar)
6868
6969 }
7070
71-var xBase64EncodeStep func(uintptr, uint, bool, uintptr, int32, int32) uint
71+var xBase64EncodeStep func(uintptr, uint, bool, uintptr, int, int) uint
7272
7373 // Incrementally encode a sequence of binary data into its Base-64 stringified
7474 // representation. By calling this function multiple times you can convert
@@ -89,7 +89,7 @@ var xBase64EncodeStep func(uintptr, uint, bool, uintptr, int32, int32) uint
8989 // Note however that it breaks the lines with `LF` characters, not
9090 // `CR LF` sequences, so the result cannot be passed directly to SMTP
9191 // or certain other protocols.
92-func Base64EncodeStep(InVar uintptr, LenVar uint, BreakLinesVar bool, OutVar uintptr, StateVar int32, SaveVar int32) uint {
92+func Base64EncodeStep(InVar uintptr, LenVar uint, BreakLinesVar bool, OutVar uintptr, StateVar int, SaveVar int) uint {
9393
9494 return xBase64EncodeStep(InVar, LenVar, BreakLinesVar, OutVar, StateVar, SaveVar)
9595
M v4/glib/gbitlock.go +12 -12
@@ -6,7 +6,7 @@ import (
66 "github.com/jwijenbergh/puregotk/internal/core"
77 )
88
9-var xBitLock func(int32, int32)
9+var xBitLock func(int, int)
1010
1111 // Sets the indicated @lock_bit in @address. If the bit is already
1212 // set, this call will block until g_bit_unlock() unsets the
@@ -22,13 +22,13 @@ var xBitLock func(int32, int32)
2222 // @address must be atomic in order for this function to work
2323 // reliably. While @address has a `volatile` qualifier, this is a historical
2424 // artifact and the argument passed to it should not be `volatile`.
25-func BitLock(AddressVar int32, LockBitVar int32) {
25+func BitLock(AddressVar int, LockBitVar int) {
2626
2727 xBitLock(AddressVar, LockBitVar)
2828
2929 }
3030
31-var xBitTrylock func(int32, int32) bool
31+var xBitTrylock func(int, int) bool
3232
3333 // Sets the indicated @lock_bit in @address, returning %TRUE if
3434 // successful. If the bit is already set, returns %FALSE immediately.
@@ -43,13 +43,13 @@ var xBitTrylock func(int32, int32) bool
4343 // @address must be atomic in order for this function to work
4444 // reliably. While @address has a `volatile` qualifier, this is a historical
4545 // artifact and the argument passed to it should not be `volatile`.
46-func BitTrylock(AddressVar int32, LockBitVar int32) bool {
46+func BitTrylock(AddressVar int, LockBitVar int) bool {
4747
4848 return xBitTrylock(AddressVar, LockBitVar)
4949
5050 }
5151
52-var xBitUnlock func(int32, int32)
52+var xBitUnlock func(int, int)
5353
5454 // Clears the indicated @lock_bit in @address. If another thread is
5555 // currently blocked in g_bit_lock() on this same bit then it will be
@@ -59,13 +59,13 @@ var xBitUnlock func(int32, int32)
5959 // @address must be atomic in order for this function to work
6060 // reliably. While @address has a `volatile` qualifier, this is a historical
6161 // artifact and the argument passed to it should not be `volatile`.
62-func BitUnlock(AddressVar int32, LockBitVar int32) {
62+func BitUnlock(AddressVar int, LockBitVar int) {
6363
6464 xBitUnlock(AddressVar, LockBitVar)
6565
6666 }
6767
68-var xPointerBitLock func(uintptr, int32)
68+var xPointerBitLock func(uintptr, int)
6969
7070 // This is equivalent to g_bit_lock, but working on pointers (or other
7171 // pointer-sized values).
@@ -75,13 +75,13 @@ var xPointerBitLock func(uintptr, int32)
7575 //
7676 // While @address has a `volatile` qualifier, this is a historical
7777 // artifact and the argument passed to it should not be `volatile`.
78-func PointerBitLock(AddressVar uintptr, LockBitVar int32) {
78+func PointerBitLock(AddressVar uintptr, LockBitVar int) {
7979
8080 xPointerBitLock(AddressVar, LockBitVar)
8181
8282 }
8383
84-var xPointerBitTrylock func(uintptr, int32) bool
84+var xPointerBitTrylock func(uintptr, int) bool
8585
8686 // This is equivalent to g_bit_trylock(), but working on pointers (or
8787 // other pointer-sized values).
@@ -91,13 +91,13 @@ var xPointerBitTrylock func(uintptr, int32) bool
9191 //
9292 // While @address has a `volatile` qualifier, this is a historical
9393 // artifact and the argument passed to it should not be `volatile`.
94-func PointerBitTrylock(AddressVar uintptr, LockBitVar int32) bool {
94+func PointerBitTrylock(AddressVar uintptr, LockBitVar int) bool {
9595
9696 return xPointerBitTrylock(AddressVar, LockBitVar)
9797
9898 }
9999
100-var xPointerBitUnlock func(uintptr, int32)
100+var xPointerBitUnlock func(uintptr, int)
101101
102102 // This is equivalent to g_bit_unlock, but working on pointers (or other
103103 // pointer-sized values).
@@ -107,7 +107,7 @@ var xPointerBitUnlock func(uintptr, int32)
107107 //
108108 // While @address has a `volatile` qualifier, this is a historical
109109 // artifact and the argument passed to it should not be `volatile`.
110-func PointerBitUnlock(AddressVar uintptr, LockBitVar int32) {
110+func PointerBitUnlock(AddressVar uintptr, LockBitVar int) {
111111
112112 xPointerBitUnlock(AddressVar, LockBitVar)
113113
M v4/glib/gerror.go +4 -4
@@ -104,24 +104,24 @@ func PropagatePrefixedError(DestVar **Error, SrcVar *Error, FormatVar string, va
104104
105105 }
106106
107-var xSetError func(**Error, Quark, int32, string, ...interface{})
107+var xSetError func(**Error, Quark, int, string, ...interface{})
108108
109109 // Does nothing if @err is %NULL; if @err is non-%NULL, then *@err
110110 // must be %NULL. A new #GError is created and assigned to *@err.
111-func SetError(ErrVar **Error, DomainVar Quark, CodeVar int32, FormatVar string, varArgs ...interface{}) {
111+func SetError(ErrVar **Error, DomainVar Quark, CodeVar int, FormatVar string, varArgs ...interface{}) {
112112
113113 xSetError(ErrVar, DomainVar, CodeVar, FormatVar, varArgs...)
114114
115115 }
116116
117-var xSetErrorLiteral func(**Error, Quark, int32, string)
117+var xSetErrorLiteral func(**Error, Quark, int, string)
118118
119119 // Does nothing if @err is %NULL; if @err is non-%NULL, then *@err
120120 // must be %NULL. A new #GError is created and assigned to *@err.
121121 // Unlike g_set_error(), @message is not a printf()-style format string.
122122 // Use this function if @message contains text you don't have control over,
123123 // that could include printf() escape sequences.
124-func SetErrorLiteral(ErrVar **Error, DomainVar Quark, CodeVar int32, MessageVar string) {
124+func SetErrorLiteral(ErrVar **Error, DomainVar Quark, CodeVar int, MessageVar string) {
125125
126126 xSetErrorLiteral(ErrVar, DomainVar, CodeVar, MessageVar)
127127
M v4/glib/gfileutils.go +14 -14
@@ -305,7 +305,7 @@ func DirMakeTmp(TmplVar string) string {
305305
306306 }
307307
308-var xFileErrorFromErrno func(int32) FileError
308+var xFileErrorFromErrno func(int) FileError
309309
310310 // Gets a #GFileError constant based on the passed-in @err_no.
311311 //
@@ -316,7 +316,7 @@ var xFileErrorFromErrno func(int32) FileError
316316 // Normally a #GFileError value goes into a #GError returned
317317 // from a function that manipulates files. So you would use
318318 // g_file_error_from_errno() when constructing a #GError.
319-func FileErrorFromErrno(ErrNoVar int32) FileError {
319+func FileErrorFromErrno(ErrNoVar int) FileError {
320320
321321 return xFileErrorFromErrno(ErrNoVar)
322322
@@ -340,7 +340,7 @@ func FileGetContents(FilenameVar string, ContentsVar uintptr, LengthVar uint) bo
340340
341341 }
342342
343-var xFileOpenTmp func(string, string) int32
343+var xFileOpenTmp func(string, string) int
344344
345345 // Opens a file for writing in the preferred directory for temporary
346346 // files (as returned by g_get_tmp_dir()).
@@ -358,7 +358,7 @@ var xFileOpenTmp func(string, string) int32
358358 // is returned in @name_used. This string should be freed with g_free()
359359 // when not needed any longer. The returned name is in the GLib file
360360 // name encoding.
361-func FileOpenTmp(TmplVar string, NameUsedVar string) int32 {
361+func FileOpenTmp(TmplVar string, NameUsedVar string) int {
362362
363363 return xFileOpenTmp(TmplVar, NameUsedVar)
364364
@@ -387,7 +387,7 @@ func FileSetContents(FilenameVar string, ContentsVar uintptr, LengthVar int) boo
387387
388388 }
389389
390-var xFileSetContentsFull func(string, uintptr, int, FileSetContentsFlags, int32) bool
390+var xFileSetContentsFull func(string, uintptr, int, FileSetContentsFlags, int) bool
391391
392392 // Writes all of @contents to a file named @filename, with good error checking.
393393 // If a file called @filename already exists it will be overwritten.
@@ -443,7 +443,7 @@ var xFileSetContentsFull func(string, uintptr, int, FileSetContentsFlags, int32)
443443 // If the file didn’t exist before and is created, it will be given the
444444 // permissions from @mode. Otherwise, the permissions of the existing file may
445445 // be changed to @mode depending on @flags, or they may remain unchanged.
446-func FileSetContentsFull(FilenameVar string, ContentsVar uintptr, LengthVar int, FlagsVar FileSetContentsFlags, ModeVar int32) bool {
446+func FileSetContentsFull(FilenameVar string, ContentsVar uintptr, LengthVar int, FlagsVar FileSetContentsFlags, ModeVar int) bool {
447447
448448 return xFileSetContentsFull(FilenameVar, ContentsVar, LengthVar, FlagsVar, ModeVar)
449449
@@ -518,11 +518,11 @@ func GetCurrentDir() string {
518518
519519 }
520520
521-var xMkdirWithParents func(string, int32) int32
521+var xMkdirWithParents func(string, int) int
522522
523523 // Create a directory if it doesn't already exist. Create intermediate
524524 // parent directories as needed, too.
525-func MkdirWithParents(PathnameVar string, ModeVar int32) int32 {
525+func MkdirWithParents(PathnameVar string, ModeVar int) int {
526526
527527 return xMkdirWithParents(PathnameVar, ModeVar)
528528
@@ -551,7 +551,7 @@ func Mkdtemp(TmplVar string) string {
551551
552552 }
553553
554-var xMkdtempFull func(string, int32) string
554+var xMkdtempFull func(string, int) string
555555
556556 // Creates a temporary directory. See the mkdtemp() documentation
557557 // on most UNIX-like systems.
@@ -568,13 +568,13 @@ var xMkdtempFull func(string, int32) string
568568 // If you are going to be creating a temporary directory inside the
569569 // directory returned by g_get_tmp_dir(), you might want to use
570570 // g_dir_make_tmp() instead.
571-func MkdtempFull(TmplVar string, ModeVar int32) string {
571+func MkdtempFull(TmplVar string, ModeVar int) string {
572572
573573 return xMkdtempFull(TmplVar, ModeVar)
574574
575575 }
576576
577-var xMkstemp func(string) int32
577+var xMkstemp func(string) int
578578
579579 // Opens a temporary file. See the mkstemp() documentation
580580 // on most UNIX-like systems.
@@ -586,13 +586,13 @@ var xMkstemp func(string) int32
586586 // The X string will be modified to form the name of a file that
587587 // didn't exist. The string should be in the GLib file name encoding.
588588 // Most importantly, on Windows it should be in UTF-8.
589-func Mkstemp(TmplVar string) int32 {
589+func Mkstemp(TmplVar string) int {
590590
591591 return xMkstemp(TmplVar)
592592
593593 }
594594
595-var xMkstempFull func(string, int32, int32) int32
595+var xMkstempFull func(string, int, int) int
596596
597597 // Opens a temporary file. See the mkstemp() documentation
598598 // on most UNIX-like systems.
@@ -605,7 +605,7 @@ var xMkstempFull func(string, int32, int32) int32
605605 // string will be modified to form the name of a file that didn't exist.
606606 // The string should be in the GLib file name encoding. Most importantly,
607607 // on Windows it should be in UTF-8.
608-func MkstempFull(TmplVar string, FlagsVar int32, ModeVar int32) int32 {
608+func MkstempFull(TmplVar string, FlagsVar int, ModeVar int) int {
609609
610610 return xMkstempFull(TmplVar, FlagsVar, ModeVar)
611611
M v4/glib/ggettext.go +2 -2
@@ -6,13 +6,13 @@ import (
66 "github.com/jwijenbergh/puregotk/internal/core"
77 )
88
9-var xDcgettext func(string, string, int32) string
9+var xDcgettext func(string, string, int) string
1010
1111 // This is a variant of g_dgettext() that allows specifying a locale
1212 // category instead of always using `LC_MESSAGES`. See g_dgettext() for
1313 // more information about how this functions differs from calling
1414 // dcgettext() directly.
15-func Dcgettext(DomainVar string, MsgidVar string, CategoryVar int32) string {
15+func Dcgettext(DomainVar string, MsgidVar string, CategoryVar int) string {
1616
1717 return xDcgettext(DomainVar, MsgidVar, CategoryVar)
1818
M v4/glib/ghash.go +1 -1
@@ -33,7 +33,7 @@ type HashTableIter struct {
3333
3434 Dummy3 uintptr
3535
36- Dummy4 int32
36+ Dummy4 int
3737
3838 Dummy5 bool
3939
M v4/glib/ghook.go +1 -1
@@ -15,7 +15,7 @@ type HookCheckMarshaller func(*Hook, uintptr) bool
1515
1616 // Defines the type of function used to compare #GHook elements in
1717 // g_hook_insert_sorted().
18-type HookCompareFunc func(*Hook, *Hook) int32
18+type HookCompareFunc func(*Hook, *Hook) int
1919
2020 // Defines the type of function to be called when a hook in a
2121 // list of hooks gets finalized.
M v4/glib/giochannel.go +4 -4
@@ -179,7 +179,7 @@ func IoAddWatch(ChannelVar *IOChannel, ConditionVar IOCondition, FuncVar IOFunc,
179179
180180 }
181181
182-var xIoAddWatchFull func(*IOChannel, int32, IOCondition, uintptr, uintptr, uintptr) uint
182+var xIoAddWatchFull func(*IOChannel, int, IOCondition, uintptr, uintptr, uintptr) uint
183183
184184 // Adds the #GIOChannel into the default main loop context
185185 // with the given priority.
@@ -187,16 +187,16 @@ var xIoAddWatchFull func(*IOChannel, int32, IOCondition, uintptr, uintptr, uintp
187187 // This internally creates a main loop source using g_io_create_watch()
188188 // and attaches it to the main loop context with g_source_attach().
189189 // You can do these steps manually if you need greater control.
190-func IoAddWatchFull(ChannelVar *IOChannel, PriorityVar int32, ConditionVar IOCondition, FuncVar IOFunc, UserDataVar uintptr, NotifyVar DestroyNotify) uint {
190+func IoAddWatchFull(ChannelVar *IOChannel, PriorityVar int, ConditionVar IOCondition, FuncVar IOFunc, UserDataVar uintptr, NotifyVar DestroyNotify) uint {
191191
192192 return xIoAddWatchFull(ChannelVar, PriorityVar, ConditionVar, purego.NewCallback(FuncVar), UserDataVar, purego.NewCallback(NotifyVar))
193193
194194 }
195195
196-var xIoChannelErrorFromErrno func(int32) IOChannelError
196+var xIoChannelErrorFromErrno func(int) IOChannelError
197197
198198 // Converts an `errno` error number to a #GIOChannelError.
199-func IoChannelErrorFromErrno(EnVar int32) IOChannelError {
199+func IoChannelErrorFromErrno(EnVar int) IOChannelError {
200200
201201 return xIoChannelErrorFromErrno(EnVar)
202202
M v4/glib/glib-unix.go +17 -17
@@ -8,9 +8,9 @@ import (
88
99 // The type of functions to be called when a UNIX fd watch source
1010 // triggers.
11-type UnixFDSourceFunc func(int32, IOCondition, uintptr) bool
11+type UnixFDSourceFunc func(int, IOCondition, uintptr) bool
1212
13-var xUnixFdAdd func(int32, IOCondition, uintptr, uintptr) uint
13+var xUnixFdAdd func(int, IOCondition, uintptr, uintptr) uint
1414
1515 // Sets a function to be called when the IO condition, as specified by
1616 // @condition becomes true for @fd.
@@ -25,13 +25,13 @@ var xUnixFdAdd func(int32, IOCondition, uintptr, uintptr) uint
2525 // to cancel the watch at any time that it exists.
2626 //
2727 // The source will never close the fd -- you must do it yourself.
28-func UnixFdAdd(FdVar int32, ConditionVar IOCondition, FunctionVar UnixFDSourceFunc, UserDataVar uintptr) uint {
28+func UnixFdAdd(FdVar int, ConditionVar IOCondition, FunctionVar UnixFDSourceFunc, UserDataVar uintptr) uint {
2929
3030 return xUnixFdAdd(FdVar, ConditionVar, purego.NewCallback(FunctionVar), UserDataVar)
3131
3232 }
3333
34-var xUnixFdAddFull func(int32, int32, IOCondition, uintptr, uintptr, uintptr) uint
34+var xUnixFdAddFull func(int, int, IOCondition, uintptr, uintptr, uintptr) uint
3535
3636 // Sets a function to be called when the IO condition, as specified by
3737 // @condition becomes true for @fd.
@@ -39,19 +39,19 @@ var xUnixFdAddFull func(int32, int32, IOCondition, uintptr, uintptr, uintptr) ui
3939 // This is the same as g_unix_fd_add(), except that it allows you to
4040 // specify a non-default priority and a provide a #GDestroyNotify for
4141 // @user_data.
42-func UnixFdAddFull(PriorityVar int32, FdVar int32, ConditionVar IOCondition, FunctionVar UnixFDSourceFunc, UserDataVar uintptr, NotifyVar DestroyNotify) uint {
42+func UnixFdAddFull(PriorityVar int, FdVar int, ConditionVar IOCondition, FunctionVar UnixFDSourceFunc, UserDataVar uintptr, NotifyVar DestroyNotify) uint {
4343
4444 return xUnixFdAddFull(PriorityVar, FdVar, ConditionVar, purego.NewCallback(FunctionVar), UserDataVar, purego.NewCallback(NotifyVar))
4545
4646 }
4747
48-var xUnixFdSourceNew func(int32, IOCondition) *Source
48+var xUnixFdSourceNew func(int, IOCondition) *Source
4949
5050 // Creates a #GSource to watch for a particular IO condition on a file
5151 // descriptor.
5252 //
5353 // The source will never close the fd -- you must do it yourself.
54-func UnixFdSourceNew(FdVar int32, ConditionVar IOCondition) *Source {
54+func UnixFdSourceNew(FdVar int, ConditionVar IOCondition) *Source {
5555
5656 return xUnixFdSourceNew(FdVar, ConditionVar)
5757
@@ -76,7 +76,7 @@ func UnixGetPasswdEntry(UserNameVar string) uintptr {
7676
7777 }
7878
79-var xUnixOpenPipe func(int32, int32) bool
79+var xUnixOpenPipe func(int, int) bool
8080
8181 // Similar to the UNIX pipe() call, but on modern systems like Linux
8282 // uses the pipe2() system call, which atomically creates a pipe with
@@ -86,46 +86,46 @@ var xUnixOpenPipe func(int32, int32) bool
8686 //
8787 // This function does not take %O_CLOEXEC, it takes %FD_CLOEXEC as if
8888 // for fcntl(); these are different on Linux/glibc.
89-func UnixOpenPipe(FdsVar int32, FlagsVar int32) bool {
89+func UnixOpenPipe(FdsVar int, FlagsVar int) bool {
9090
9191 return xUnixOpenPipe(FdsVar, FlagsVar)
9292
9393 }
9494
95-var xUnixSetFdNonblocking func(int32, bool) bool
95+var xUnixSetFdNonblocking func(int, bool) bool
9696
9797 // Control the non-blocking state of the given file descriptor,
9898 // according to @nonblock. On most systems this uses %O_NONBLOCK, but
9999 // on some older ones may use %O_NDELAY.
100-func UnixSetFdNonblocking(FdVar int32, NonblockVar bool) bool {
100+func UnixSetFdNonblocking(FdVar int, NonblockVar bool) bool {
101101
102102 return xUnixSetFdNonblocking(FdVar, NonblockVar)
103103
104104 }
105105
106-var xUnixSignalAdd func(int32, uintptr, uintptr) uint
106+var xUnixSignalAdd func(int, uintptr, uintptr) uint
107107
108108 // A convenience function for g_unix_signal_source_new(), which
109109 // attaches to the default #GMainContext. You can remove the watch
110110 // using g_source_remove().
111-func UnixSignalAdd(SignumVar int32, HandlerVar SourceFunc, UserDataVar uintptr) uint {
111+func UnixSignalAdd(SignumVar int, HandlerVar SourceFunc, UserDataVar uintptr) uint {
112112
113113 return xUnixSignalAdd(SignumVar, purego.NewCallback(HandlerVar), UserDataVar)
114114
115115 }
116116
117-var xUnixSignalAddFull func(int32, int32, uintptr, uintptr, uintptr) uint
117+var xUnixSignalAddFull func(int, int, uintptr, uintptr, uintptr) uint
118118
119119 // A convenience function for g_unix_signal_source_new(), which
120120 // attaches to the default #GMainContext. You can remove the watch
121121 // using g_source_remove().
122-func UnixSignalAddFull(PriorityVar int32, SignumVar int32, HandlerVar SourceFunc, UserDataVar uintptr, NotifyVar DestroyNotify) uint {
122+func UnixSignalAddFull(PriorityVar int, SignumVar int, HandlerVar SourceFunc, UserDataVar uintptr, NotifyVar DestroyNotify) uint {
123123
124124 return xUnixSignalAddFull(PriorityVar, SignumVar, purego.NewCallback(HandlerVar), UserDataVar, purego.NewCallback(NotifyVar))
125125
126126 }
127127
128-var xUnixSignalSourceNew func(int32) *Source
128+var xUnixSignalSourceNew func(int) *Source
129129
130130 // Create a #GSource that will be dispatched upon delivery of the UNIX
131131 // signal @signum. In GLib versions before 2.36, only `SIGHUP`, `SIGINT`,
@@ -150,7 +150,7 @@ var xUnixSignalSourceNew func(int32) *Source
150150 // The source will not initially be associated with any #GMainContext
151151 // and must be added to one with g_source_attach() before it will be
152152 // executed.
153-func UnixSignalSourceNew(SignumVar int32) *Source {
153+func UnixSignalSourceNew(SignumVar int) *Source {
154154
155155 return xUnixSignalSourceNew(SignumVar)
156156
M v4/glib/glibconfig.go +1 -1
@@ -8,4 +8,4 @@ package glib
88 //
99 // GPid is used in GLib only for descendant processes spawned with
1010 // the g_spawn functions.
11-type Pid = int32
11+type Pid = int
M v4/glib/gmain.go +11 -11
@@ -13,7 +13,7 @@ import (
1313 // for g_spawn_check_wait_status(). In particular,
1414 // on Unix platforms, note that it is usually not equal
1515 // to the integer passed to `exit()` or returned from `main()`.
16-type ChildWatchFunc func(Pid, int32, uintptr)
16+type ChildWatchFunc func(Pid, int, uintptr)
1717
1818 // Specifies the type of function passed to g_clear_handle_id().
1919 // The implementation is expected to free the resource identified
@@ -157,7 +157,7 @@ func ChildWatchAdd(PidVar Pid, FunctionVar ChildWatchFunc, DataVar uintptr) uint
157157
158158 }
159159
160-var xChildWatchAddFull func(int32, Pid, uintptr, uintptr, uintptr) uint
160+var xChildWatchAddFull func(int, Pid, uintptr, uintptr, uintptr) uint
161161
162162 // Sets a function to be called when the child indicated by @pid
163163 // exits, at the priority @priority.
@@ -183,7 +183,7 @@ var xChildWatchAddFull func(int32, Pid, uintptr, uintptr, uintptr) uint
183183 // g_child_watch_source_new() and attaches it to the main loop context
184184 // using g_source_attach(). You can do these steps manually if you
185185 // need greater control.
186-func ChildWatchAddFull(PriorityVar int32, PidVar Pid, FunctionVar ChildWatchFunc, DataVar uintptr, NotifyVar DestroyNotify) uint {
186+func ChildWatchAddFull(PriorityVar int, PidVar Pid, FunctionVar ChildWatchFunc, DataVar uintptr, NotifyVar DestroyNotify) uint {
187187
188188 return xChildWatchAddFull(PriorityVar, PidVar, purego.NewCallback(FunctionVar), DataVar, purego.NewCallback(NotifyVar))
189189
@@ -315,7 +315,7 @@ func IdleAdd(FunctionVar SourceFunc, DataVar uintptr) uint {
315315
316316 }
317317
318-var xIdleAddFull func(int32, uintptr, uintptr, uintptr) uint
318+var xIdleAddFull func(int, uintptr, uintptr, uintptr) uint
319319
320320 // Adds a function to be called whenever there are no higher priority
321321 // events pending.
@@ -331,7 +331,7 @@ var xIdleAddFull func(int32, uintptr, uintptr, uintptr) uint
331331 // the callback will be invoked in whichever thread is running that main
332332 // context. You can do these steps manually if you need greater control or to
333333 // use a custom main context.
334-func IdleAddFull(PriorityVar int32, FunctionVar SourceFunc, DataVar uintptr, NotifyVar DestroyNotify) uint {
334+func IdleAddFull(PriorityVar int, FunctionVar SourceFunc, DataVar uintptr, NotifyVar DestroyNotify) uint {
335335
336336 return xIdleAddFull(PriorityVar, purego.NewCallback(FunctionVar), DataVar, purego.NewCallback(NotifyVar))
337337
@@ -415,7 +415,7 @@ func MainCurrentSource() *Source {
415415
416416 }
417417
418-var xMainDepth func() int32
418+var xMainDepth func() int
419419
420420 // Returns the depth of the stack of calls to
421421 // g_main_context_dispatch() on any #GMainContext in the current thread.
@@ -527,7 +527,7 @@ var xMainDepth func() int32
527527 // arbitrary callbacks. Instead, structure your code so that you
528528 // simply return to the main loop and then get called again when
529529 // there is more work to do.
530-func MainDepth() int32 {
530+func MainDepth() int {
531531
532532 return xMainDepth()
533533
@@ -646,7 +646,7 @@ func TimeoutAdd(IntervalVar uint, FunctionVar SourceFunc, DataVar uintptr) uint
646646
647647 }
648648
649-var xTimeoutAddFull func(int32, uint, uintptr, uintptr, uintptr) uint
649+var xTimeoutAddFull func(int, uint, uintptr, uintptr, uintptr) uint
650650
651651 // Sets a function to be called at regular intervals, with the given
652652 // priority. The function is called repeatedly until it returns
@@ -672,7 +672,7 @@ var xTimeoutAddFull func(int32, uint, uintptr, uintptr, uintptr) uint
672672 //
673673 // The interval given is in terms of monotonic time, not wall clock time.
674674 // See g_get_monotonic_time().
675-func TimeoutAddFull(PriorityVar int32, IntervalVar uint, FunctionVar SourceFunc, DataVar uintptr, NotifyVar DestroyNotify) uint {
675+func TimeoutAddFull(PriorityVar int, IntervalVar uint, FunctionVar SourceFunc, DataVar uintptr, NotifyVar DestroyNotify) uint {
676676
677677 return xTimeoutAddFull(PriorityVar, IntervalVar, purego.NewCallback(FunctionVar), DataVar, purego.NewCallback(NotifyVar))
678678
@@ -709,7 +709,7 @@ func TimeoutAddSeconds(IntervalVar uint, FunctionVar SourceFunc, DataVar uintptr
709709
710710 }
711711
712-var xTimeoutAddSecondsFull func(int32, uint, uintptr, uintptr, uintptr) uint
712+var xTimeoutAddSecondsFull func(int, uint, uintptr, uintptr, uintptr) uint
713713
714714 // Sets a function to be called at regular intervals, with @priority.
715715 //
@@ -750,7 +750,7 @@ var xTimeoutAddSecondsFull func(int32, uint, uintptr, uintptr, uintptr) uint
750750 //
751751 // The interval given is in terms of monotonic time, not wall clock
752752 // time. See g_get_monotonic_time().
753-func TimeoutAddSecondsFull(PriorityVar int32, IntervalVar uint, FunctionVar SourceFunc, DataVar uintptr, NotifyVar DestroyNotify) uint {
753+func TimeoutAddSecondsFull(PriorityVar int, IntervalVar uint, FunctionVar SourceFunc, DataVar uintptr, NotifyVar DestroyNotify) uint {
754754
755755 return xTimeoutAddSecondsFull(PriorityVar, IntervalVar, purego.NewCallback(FunctionVar), DataVar, purego.NewCallback(NotifyVar))
756756
M v4/glib/gmessages.go +8 -8
@@ -105,9 +105,9 @@ const (
105105 GLogWriterUnhandledValue LogWriterOutput = 0
106106 )
107107
108-var xAssertWarning func(string, string, int32, string, string)
108+var xAssertWarning func(string, string, int, string, string)
109109
110-func AssertWarning(LogDomainVar string, FileVar string, LineVar int32, PrettyFunctionVar string, ExpressionVar string) {
110+func AssertWarning(LogDomainVar string, FileVar string, LineVar int, PrettyFunctionVar string, ExpressionVar string) {
111111
112112 xAssertWarning(LogDomainVar, FileVar, LineVar, PrettyFunctionVar, ExpressionVar)
113113
@@ -591,7 +591,7 @@ func LogWriterFormatFields(LogLevelVar LogLevelFlags, FieldsVar uintptr, NFields
591591
592592 }
593593
594-var xLogWriterIsJournald func(int32) bool
594+var xLogWriterIsJournald func(int) bool
595595
596596 // Check whether the given @output_fd file descriptor is a connection to the
597597 // systemd journal, or something else (like a log file or `stdout` or
@@ -604,7 +604,7 @@ var xLogWriterIsJournald func(int32) bool
604604 // is_journald = g_log_writer_is_journald (fileno (stderr));
605605 //
606606 // ]|
607-func LogWriterIsJournald(OutputFdVar int32) bool {
607+func LogWriterIsJournald(OutputFdVar int) bool {
608608
609609 return xLogWriterIsJournald(OutputFdVar)
610610
@@ -649,12 +649,12 @@ func LogWriterStandardStreams(LogLevelVar LogLevelFlags, FieldsVar uintptr, NFie
649649
650650 }
651651
652-var xLogWriterSupportsColor func(int32) bool
652+var xLogWriterSupportsColor func(int) bool
653653
654654 // Check whether the given @output_fd file descriptor supports ANSI color
655655 // escape sequences. If so, they can safely be used when formatting log
656656 // messages.
657-func LogWriterSupportsColor(OutputFdVar int32) bool {
657+func LogWriterSupportsColor(OutputFdVar int) bool {
658658
659659 return xLogWriterSupportsColor(OutputFdVar)
660660
@@ -764,11 +764,11 @@ func SetPrinterrHandler(FuncVar PrintFunc) PrintFunc {
764764
765765 }
766766
767-var xWarnMessage func(string, string, int32, string, string)
767+var xWarnMessage func(string, string, int, string, string)
768768
769769 // Internal function used to print messages from the public g_warn_if_reached()
770770 // and g_warn_if_fail() macros.
771-func WarnMessage(DomainVar string, FileVar string, LineVar int32, FuncVar string, WarnexprVar string) {
771+func WarnMessage(DomainVar string, FileVar string, LineVar int, FuncVar string, WarnexprVar string) {
772772
773773 xWarnMessage(DomainVar, FileVar, LineVar, FuncVar, WarnexprVar)
774774
M v4/glib/gpoll.go +3 -3
@@ -8,7 +8,7 @@ import (
88
99 // Specifies the type of function passed to g_main_context_set_poll_func().
1010 // The semantics of the function should match those of the poll() system call.
11-type PollFunc func(*PollFD, uint, int32) int32
11+type PollFunc func(*PollFD, uint, int) int
1212
1313 // Represents a file descriptor, which events to poll for, and which events
1414 // occurred.
@@ -20,7 +20,7 @@ type PollFD struct {
2020 Revents uint16
2121 }
2222
23-var xPoll func(*PollFD, uint, int32) int32
23+var xPoll func(*PollFD, uint, int) int
2424
2525 // Polls @fds, as with the poll() system call, but portably. (On
2626 // systems that don't have poll(), it is emulated using select().)
@@ -39,7 +39,7 @@ var xPoll func(*PollFD, uint, int32) int32
3939 // Windows. If you need to use g_poll() in code that has to run on
4040 // Windows, the easiest solution is to construct all of your
4141 // #GPollFDs with g_io_channel_win32_make_pollfd().
42-func Poll(FdsVar *PollFD, NfdsVar uint, TimeoutVar int32) int32 {
42+func Poll(FdsVar *PollFD, NfdsVar uint, TimeoutVar int) int {
4343
4444 return xPoll(FdsVar, NfdsVar, TimeoutVar)
4545
M v4/glib/gprintf.go +14 -14
@@ -6,19 +6,19 @@ import (
66 "github.com/jwijenbergh/puregotk/internal/core"
77 )
88
9-var xFprintf func(uintptr, string, ...interface{}) int32
9+var xFprintf func(uintptr, string, ...interface{}) int
1010
1111 // An implementation of the standard fprintf() function which supports
1212 // positional parameters, as specified in the Single Unix Specification.
1313 //
1414 // `glib/gprintf.h` must be explicitly included in order to use this function.
15-func Fprintf(FileVar uintptr, FormatVar string, varArgs ...interface{}) int32 {
15+func Fprintf(FileVar uintptr, FormatVar string, varArgs ...interface{}) int {
1616
1717 return xFprintf(FileVar, FormatVar, varArgs...)
1818
1919 }
2020
21-var xPrintf func(string, ...interface{}) int32
21+var xPrintf func(string, ...interface{}) int
2222
2323 // An implementation of the standard printf() function which supports
2424 // positional parameters, as specified in the Single Unix Specification.
@@ -28,13 +28,13 @@ var xPrintf func(string, ...interface{}) int32
2828 // own new-line character.
2929 //
3030 // `glib/gprintf.h` must be explicitly included in order to use this function.
31-func Printf(FormatVar string, varArgs ...interface{}) int32 {
31+func Printf(FormatVar string, varArgs ...interface{}) int {
3232
3333 return xPrintf(FormatVar, varArgs...)
3434
3535 }
3636
37-var xSprintf func(string, string, ...interface{}) int32
37+var xSprintf func(string, string, ...interface{}) int
3838
3939 // An implementation of the standard sprintf() function which supports
4040 // positional parameters, as specified in the Single Unix Specification.
@@ -45,13 +45,13 @@ var xSprintf func(string, string, ...interface{}) int32
4545 // `glib/gprintf.h` must be explicitly included in order to use this function.
4646 //
4747 // See also g_strdup_printf().
48-func Sprintf(StringVar string, FormatVar string, varArgs ...interface{}) int32 {
48+func Sprintf(StringVar string, FormatVar string, varArgs ...interface{}) int {
4949
5050 return xSprintf(StringVar, FormatVar, varArgs...)
5151
5252 }
5353
54-var xVasprintf func(string, string, []interface{}) int32
54+var xVasprintf func(string, string, []interface{}) int
5555
5656 // An implementation of the GNU vasprintf() function which supports
5757 // positional parameters, as specified in the Single Unix Specification.
@@ -64,43 +64,43 @@ var xVasprintf func(string, string, []interface{}) int32
6464 // multibyte representation is available for the given character.
6565 //
6666 // `glib/gprintf.h` must be explicitly included in order to use this function.
67-func Vasprintf(StringVar string, FormatVar string, ArgsVar []interface{}) int32 {
67+func Vasprintf(StringVar string, FormatVar string, ArgsVar []interface{}) int {
6868
6969 return xVasprintf(StringVar, FormatVar, ArgsVar)
7070
7171 }
7272
73-var xVfprintf func(uintptr, string, []interface{}) int32
73+var xVfprintf func(uintptr, string, []interface{}) int
7474
7575 // An implementation of the standard fprintf() function which supports
7676 // positional parameters, as specified in the Single Unix Specification.
7777 //
7878 // `glib/gprintf.h` must be explicitly included in order to use this function.
79-func Vfprintf(FileVar uintptr, FormatVar string, ArgsVar []interface{}) int32 {
79+func Vfprintf(FileVar uintptr, FormatVar string, ArgsVar []interface{}) int {
8080
8181 return xVfprintf(FileVar, FormatVar, ArgsVar)
8282
8383 }
8484
85-var xVprintf func(string, []interface{}) int32
85+var xVprintf func(string, []interface{}) int
8686
8787 // An implementation of the standard vprintf() function which supports
8888 // positional parameters, as specified in the Single Unix Specification.
8989 //
9090 // `glib/gprintf.h` must be explicitly included in order to use this function.
91-func Vprintf(FormatVar string, ArgsVar []interface{}) int32 {
91+func Vprintf(FormatVar string, ArgsVar []interface{}) int {
9292
9393 return xVprintf(FormatVar, ArgsVar)
9494
9595 }
9696
97-var xVsprintf func(string, string, []interface{}) int32
97+var xVsprintf func(string, string, []interface{}) int
9898
9999 // An implementation of the standard vsprintf() function which supports
100100 // positional parameters, as specified in the Single Unix Specification.
101101 //
102102 // `glib/gprintf.h` must be explicitly included in order to use this function.
103-func Vsprintf(StringVar string, FormatVar string, ArgsVar []interface{}) int32 {
103+func Vsprintf(StringVar string, FormatVar string, ArgsVar []interface{}) int {
104104
105105 return xVsprintf(StringVar, FormatVar, ArgsVar)
106106
M v4/glib/gqsort.go +2 -2
@@ -6,13 +6,13 @@ import (
66 "github.com/jwijenbergh/puregotk/internal/core"
77 )
88
9-var xQsortWithData func(uintptr, int32, uint, uintptr, uintptr)
9+var xQsortWithData func(uintptr, int, uint, uintptr, uintptr)
1010
1111 // This is just like the standard C qsort() function, but
1212 // the comparison routine accepts a user data argument.
1313 //
1414 // This is guaranteed to be a stable sort since version 2.32.
15-func QsortWithData(PbaseVar uintptr, TotalElemsVar int32, SizeVar uint, CompareFuncVar CompareDataFunc, UserDataVar uintptr) {
15+func QsortWithData(PbaseVar uintptr, TotalElemsVar int, SizeVar uint, CompareFuncVar CompareDataFunc, UserDataVar uintptr) {
1616
1717 xQsortWithData(PbaseVar, TotalElemsVar, SizeVar, purego.NewCallback(CompareFuncVar), UserDataVar)
1818
M v4/glib/grefcount.go +16 -16
@@ -6,81 +6,81 @@ import (
66 "github.com/jwijenbergh/puregotk/internal/core"
77 )
88
9-var xAtomicRefCountCompare func(int32, int32) bool
9+var xAtomicRefCountCompare func(int, int) bool
1010
1111 // Atomically compares the current value of @arc with @val.
12-func AtomicRefCountCompare(ArcVar int32, ValVar int32) bool {
12+func AtomicRefCountCompare(ArcVar int, ValVar int) bool {
1313
1414 return xAtomicRefCountCompare(ArcVar, ValVar)
1515
1616 }
1717
18-var xAtomicRefCountDec func(int32) bool
18+var xAtomicRefCountDec func(int) bool
1919
2020 // Atomically decreases the reference count.
2121 //
2222 // If %TRUE is returned, the reference count reached 0. After this point, @arc
2323 // is an undefined state and must be reinitialized with
2424 // g_atomic_ref_count_init() to be used again.
25-func AtomicRefCountDec(ArcVar int32) bool {
25+func AtomicRefCountDec(ArcVar int) bool {
2626
2727 return xAtomicRefCountDec(ArcVar)
2828
2929 }
3030
31-var xAtomicRefCountInc func(int32)
31+var xAtomicRefCountInc func(int)
3232
3333 // Atomically increases the reference count.
34-func AtomicRefCountInc(ArcVar int32) {
34+func AtomicRefCountInc(ArcVar int) {
3535
3636 xAtomicRefCountInc(ArcVar)
3737
3838 }
3939
40-var xAtomicRefCountInit func(int32)
40+var xAtomicRefCountInit func(int)
4141
4242 // Initializes a reference count variable to 1.
43-func AtomicRefCountInit(ArcVar int32) {
43+func AtomicRefCountInit(ArcVar int) {
4444
4545 xAtomicRefCountInit(ArcVar)
4646
4747 }
4848
49-var xRefCountCompare func(int32, int32) bool
49+var xRefCountCompare func(int, int) bool
5050
5151 // Compares the current value of @rc with @val.
52-func RefCountCompare(RcVar int32, ValVar int32) bool {
52+func RefCountCompare(RcVar int, ValVar int) bool {
5353
5454 return xRefCountCompare(RcVar, ValVar)
5555
5656 }
5757
58-var xRefCountDec func(int32) bool
58+var xRefCountDec func(int) bool
5959
6060 // Decreases the reference count.
6161 //
6262 // If %TRUE is returned, the reference count reached 0. After this point, @rc
6363 // is an undefined state and must be reinitialized with
6464 // g_ref_count_init() to be used again.
65-func RefCountDec(RcVar int32) bool {
65+func RefCountDec(RcVar int) bool {
6666
6767 return xRefCountDec(RcVar)
6868
6969 }
7070
71-var xRefCountInc func(int32)
71+var xRefCountInc func(int)
7272
7373 // Increases the reference count.
74-func RefCountInc(RcVar int32) {
74+func RefCountInc(RcVar int) {
7575
7676 xRefCountInc(RcVar)
7777
7878 }
7979
80-var xRefCountInit func(int32)
80+var xRefCountInit func(int)
8181
8282 // Initializes a reference count variable to 1.
83-func RefCountInit(RcVar int32) {
83+func RefCountInit(RcVar int) {
8484
8585 xRefCountInit(RcVar)
8686
M v4/glib/gregex.go +4 -4
@@ -441,20 +441,20 @@ func RegexCheckReplacement(ReplacementVar string, HasReferencesVar bool) bool {
441441
442442 }
443443
444-var xRegexEscapeNul func(string, int32) string
444+var xRegexEscapeNul func(string, int) string
445445
446446 // Escapes the nul characters in @string to "\x00". It can be used
447447 // to compile a regex with embedded nul characters.
448448 //
449449 // For completeness, @length can be -1 for a nul-terminated string.
450450 // In this case the output string will be of course equal to @string.
451-func RegexEscapeNul(StringVar string, LengthVar int32) string {
451+func RegexEscapeNul(StringVar string, LengthVar int) string {
452452
453453 return xRegexEscapeNul(StringVar, LengthVar)
454454
455455 }
456456
457-var xRegexEscapeString func(uintptr, int32) string
457+var xRegexEscapeString func(uintptr, int) string
458458
459459 // Escapes the special characters used for regular expressions
460460 // in @string, for instance "a.b*c" becomes "a\.b\*c". This
@@ -463,7 +463,7 @@ var xRegexEscapeString func(uintptr, int32) string
463463 // @string can contain nul characters that are replaced with "\0",
464464 // in this case remember to specify the correct length of @string
465465 // in @length.
466-func RegexEscapeString(StringVar uintptr, LengthVar int32) string {
466+func RegexEscapeString(StringVar uintptr, LengthVar int) string {
467467
468468 return xRegexEscapeString(StringVar, LengthVar)
469469
M v4/glib/gsequence.go +1 -1
@@ -9,7 +9,7 @@ import (
99 // A #GSequenceIterCompareFunc is a function used to compare iterators.
1010 // It must return zero if the iterators compare equal, a negative value
1111 // if @a comes before @b, and a positive value if @b comes before @a.
12-type SequenceIterCompareFunc func(*SequenceIter, *SequenceIter, uintptr) int32
12+type SequenceIterCompareFunc func(*SequenceIter, *SequenceIter, uintptr) int
1313
1414 // The #GSequence struct is an opaque data type representing a
1515 // [sequence][glib-Sequences] data type.
M v4/glib/gshell.go +2 -2
@@ -19,7 +19,7 @@ const (
1919 GShellErrorFailedValue ShellError = 2
2020 )
2121
22-var xShellParseArgv func(string, int32, uintptr) bool
22+var xShellParseArgv func(string, int, uintptr) bool
2323
2424 // Parses a command line into an argument vector, in much the same way
2525 // the shell would, but without many of the expansions the shell would
@@ -39,7 +39,7 @@ var xShellParseArgv func(string, int32, uintptr) bool
3939 // successfully.
4040 //
4141 // Free the returned vector with g_strfreev().
42-func ShellParseArgv(CommandLineVar string, ArgcpVar int32, ArgvpVar uintptr) bool {
42+func ShellParseArgv(CommandLineVar string, ArgcpVar int, ArgvpVar uintptr) bool {
4343
4444 return xShellParseArgv(CommandLineVar, ArgcpVar, ArgvpVar)
4545
M v4/glib/gspawn.go +14 -14
@@ -152,29 +152,29 @@ func SpawnAsync(WorkingDirectoryVar string, ArgvVar uintptr, EnvpVar uintptr, Fl
152152
153153 }
154154
155-var xSpawnAsyncWithFds func(string, uintptr, uintptr, SpawnFlags, uintptr, uintptr, *Pid, int32, int32, int32) bool
155+var xSpawnAsyncWithFds func(string, uintptr, uintptr, SpawnFlags, uintptr, uintptr, *Pid, int, int, int) bool
156156
157157 // Executes a child program asynchronously.
158158 //
159159 // Identical to g_spawn_async_with_pipes_and_fds() but with `n_fds` set to zero,
160160 // so no FD assignments are used.
161-func SpawnAsyncWithFds(WorkingDirectoryVar string, ArgvVar uintptr, EnvpVar uintptr, FlagsVar SpawnFlags, ChildSetupVar SpawnChildSetupFunc, UserDataVar uintptr, ChildPidVar *Pid, StdinFdVar int32, StdoutFdVar int32, StderrFdVar int32) bool {
161+func SpawnAsyncWithFds(WorkingDirectoryVar string, ArgvVar uintptr, EnvpVar uintptr, FlagsVar SpawnFlags, ChildSetupVar SpawnChildSetupFunc, UserDataVar uintptr, ChildPidVar *Pid, StdinFdVar int, StdoutFdVar int, StderrFdVar int) bool {
162162
163163 return xSpawnAsyncWithFds(WorkingDirectoryVar, ArgvVar, EnvpVar, FlagsVar, purego.NewCallback(ChildSetupVar), UserDataVar, ChildPidVar, StdinFdVar, StdoutFdVar, StderrFdVar)
164164
165165 }
166166
167-var xSpawnAsyncWithPipes func(string, uintptr, uintptr, SpawnFlags, uintptr, uintptr, *Pid, int32, int32, int32) bool
167+var xSpawnAsyncWithPipes func(string, uintptr, uintptr, SpawnFlags, uintptr, uintptr, *Pid, int, int, int) bool
168168
169169 // Identical to g_spawn_async_with_pipes_and_fds() but with `n_fds` set to zero,
170170 // so no FD assignments are used.
171-func SpawnAsyncWithPipes(WorkingDirectoryVar string, ArgvVar uintptr, EnvpVar uintptr, FlagsVar SpawnFlags, ChildSetupVar SpawnChildSetupFunc, UserDataVar uintptr, ChildPidVar *Pid, StandardInputVar int32, StandardOutputVar int32, StandardErrorVar int32) bool {
171+func SpawnAsyncWithPipes(WorkingDirectoryVar string, ArgvVar uintptr, EnvpVar uintptr, FlagsVar SpawnFlags, ChildSetupVar SpawnChildSetupFunc, UserDataVar uintptr, ChildPidVar *Pid, StandardInputVar int, StandardOutputVar int, StandardErrorVar int) bool {
172172
173173 return xSpawnAsyncWithPipes(WorkingDirectoryVar, ArgvVar, EnvpVar, FlagsVar, purego.NewCallback(ChildSetupVar), UserDataVar, ChildPidVar, StandardInputVar, StandardOutputVar, StandardErrorVar)
174174
175175 }
176176
177-var xSpawnAsyncWithPipesAndFds func(string, uintptr, uintptr, SpawnFlags, uintptr, uintptr, int32, int32, int32, uintptr, uintptr, uint, *Pid, int32, int32, int32) bool
177+var xSpawnAsyncWithPipesAndFds func(string, uintptr, uintptr, SpawnFlags, uintptr, uintptr, int, int, int, uintptr, uintptr, uint, *Pid, int, int, int) bool
178178
179179 // Executes a child program asynchronously (your program will not
180180 // block waiting for the child to exit).
@@ -364,13 +364,13 @@ var xSpawnAsyncWithPipesAndFds func(string, uintptr, uintptr, SpawnFlags, uintpt
364364 // graphical application too, then to ensure that the spawned program opens its
365365 // windows on the right screen, you may want to use #GdkAppLaunchContext,
366366 // #GAppLaunchContext, or set the `DISPLAY` environment variable.
367-func SpawnAsyncWithPipesAndFds(WorkingDirectoryVar string, ArgvVar uintptr, EnvpVar uintptr, FlagsVar SpawnFlags, ChildSetupVar SpawnChildSetupFunc, UserDataVar uintptr, StdinFdVar int32, StdoutFdVar int32, StderrFdVar int32, SourceFdsVar uintptr, TargetFdsVar uintptr, NFdsVar uint, ChildPidOutVar *Pid, StdinPipeOutVar int32, StdoutPipeOutVar int32, StderrPipeOutVar int32) bool {
367+func SpawnAsyncWithPipesAndFds(WorkingDirectoryVar string, ArgvVar uintptr, EnvpVar uintptr, FlagsVar SpawnFlags, ChildSetupVar SpawnChildSetupFunc, UserDataVar uintptr, StdinFdVar int, StdoutFdVar int, StderrFdVar int, SourceFdsVar uintptr, TargetFdsVar uintptr, NFdsVar uint, ChildPidOutVar *Pid, StdinPipeOutVar int, StdoutPipeOutVar int, StderrPipeOutVar int) bool {
368368
369369 return xSpawnAsyncWithPipesAndFds(WorkingDirectoryVar, ArgvVar, EnvpVar, FlagsVar, purego.NewCallback(ChildSetupVar), UserDataVar, StdinFdVar, StdoutFdVar, StderrFdVar, SourceFdsVar, TargetFdsVar, NFdsVar, ChildPidOutVar, StdinPipeOutVar, StdoutPipeOutVar, StderrPipeOutVar)
370370
371371 }
372372
373-var xSpawnCheckExitStatus func(int32) bool
373+var xSpawnCheckExitStatus func(int) bool
374374
375375 // An old name for g_spawn_check_wait_status(), deprecated because its
376376 // name is misleading.
@@ -380,13 +380,13 @@ var xSpawnCheckExitStatus func(int32) bool
380380 // etc. On Unix platforms, it is incorrect for it to be the exit status
381381 // as passed to `exit()` or returned by g_subprocess_get_exit_status() or
382382 // `WEXITSTATUS()`.
383-func SpawnCheckExitStatus(WaitStatusVar int32) bool {
383+func SpawnCheckExitStatus(WaitStatusVar int) bool {
384384
385385 return xSpawnCheckExitStatus(WaitStatusVar)
386386
387387 }
388388
389-var xSpawnCheckWaitStatus func(int32) bool
389+var xSpawnCheckWaitStatus func(int) bool
390390
391391 // Set @error if @wait_status indicates the child exited abnormally
392392 // (e.g. with a nonzero exit code, or via a fatal signal).
@@ -427,7 +427,7 @@ var xSpawnCheckWaitStatus func(int32) bool
427427 //
428428 // Prior to version 2.70, g_spawn_check_exit_status() provides the same
429429 // functionality, although under a misleading name.
430-func SpawnCheckWaitStatus(WaitStatusVar int32) bool {
430+func SpawnCheckWaitStatus(WaitStatusVar int) bool {
431431
432432 return xSpawnCheckWaitStatus(WaitStatusVar)
433433
@@ -463,7 +463,7 @@ func SpawnCommandLineAsync(CommandLineVar string) bool {
463463
464464 }
465465
466-var xSpawnCommandLineSync func(string, uintptr, uintptr, int32) bool
466+var xSpawnCommandLineSync func(string, uintptr, uintptr, int) bool
467467
468468 // A simple version of g_spawn_sync() with little-used parameters
469469 // removed, taking a command line instead of an argument vector.
@@ -494,13 +494,13 @@ var xSpawnCommandLineSync func(string, uintptr, uintptr, int32) bool
494494 // the backslashes will be eaten, and the space will act as a
495495 // separator. You need to enclose such paths with single quotes, like
496496 // "'c:\\program files\\app\\app.exe' 'e:\\folder\\argument.txt'".
497-func SpawnCommandLineSync(CommandLineVar string, StandardOutputVar uintptr, StandardErrorVar uintptr, WaitStatusVar int32) bool {
497+func SpawnCommandLineSync(CommandLineVar string, StandardOutputVar uintptr, StandardErrorVar uintptr, WaitStatusVar int) bool {
498498
499499 return xSpawnCommandLineSync(CommandLineVar, StandardOutputVar, StandardErrorVar, WaitStatusVar)
500500
501501 }
502502
503-var xSpawnSync func(string, uintptr, uintptr, SpawnFlags, uintptr, uintptr, uintptr, uintptr, int32) bool
503+var xSpawnSync func(string, uintptr, uintptr, SpawnFlags, uintptr, uintptr, uintptr, uintptr, int) bool
504504
505505 // Executes a child synchronously (waits for the child to exit before returning).
506506 //
@@ -525,7 +525,7 @@ var xSpawnSync func(string, uintptr, uintptr, SpawnFlags, uintptr, uintptr, uint
525525 // This function calls g_spawn_async_with_pipes() internally; see that
526526 // function for full details on the other parameters and details on
527527 // how these functions work on Windows.
528-func SpawnSync(WorkingDirectoryVar string, ArgvVar uintptr, EnvpVar uintptr, FlagsVar SpawnFlags, ChildSetupVar SpawnChildSetupFunc, UserDataVar uintptr, StandardOutputVar uintptr, StandardErrorVar uintptr, WaitStatusVar int32) bool {
528+func SpawnSync(WorkingDirectoryVar string, ArgvVar uintptr, EnvpVar uintptr, FlagsVar SpawnFlags, ChildSetupVar SpawnChildSetupFunc, UserDataVar uintptr, StandardOutputVar uintptr, StandardErrorVar uintptr, WaitStatusVar int) bool {
529529
530530 return xSpawnSync(WorkingDirectoryVar, ArgvVar, EnvpVar, FlagsVar, purego.NewCallback(ChildSetupVar), UserDataVar, StandardOutputVar, StandardErrorVar, WaitStatusVar)
531531
M v4/glib/gstdio.go +10 -10
@@ -13,7 +13,7 @@ import (
1313 type StatBuf struct {
1414 }
1515
16-var xAccess func(string, int32) int32
16+var xAccess func(string, int) int
1717
1818 // A wrapper for the POSIX access() function. This function is used to
1919 // test a pathname for one or several of read, write or execute
@@ -27,25 +27,25 @@ var xAccess func(string, int32) int32
2727 // more exactly should use the Win32 API.
2828 //
2929 // See your C library manual for more details about access().
30-func Access(FilenameVar string, ModeVar int32) int32 {
30+func Access(FilenameVar string, ModeVar int) int {
3131
3232 return xAccess(FilenameVar, ModeVar)
3333
3434 }
3535
36-var xChdir func(string) int32
36+var xChdir func(string) int
3737
3838 // A wrapper for the POSIX chdir() function. The function changes the
3939 // current directory of the process to @path.
4040 //
4141 // See your C library manual for more details about chdir().
42-func Chdir(PathVar string) int32 {
42+func Chdir(PathVar string) int {
4343
4444 return xChdir(PathVar)
4545
4646 }
4747
48-var xClose func(int32) bool
48+var xClose func(int) bool
4949
5050 // This wraps the close() call; in case of error, %errno will be
5151 // preserved, but the error will also be stored as a #GError in @error.
@@ -54,26 +54,26 @@ var xClose func(int32) bool
5454 // function over the call provided by the system; on Unix, it will
5555 // attempt to correctly handle %EINTR, which has platform-specific
5656 // semantics.
57-func Close(FdVar int32) bool {
57+func Close(FdVar int) bool {
5858
5959 return xClose(FdVar)
6060
6161 }
6262
63-var xRmdir func(string) int32
63+var xRmdir func(string) int
6464
6565 // A wrapper for the POSIX rmdir() function. The rmdir() function
6666 // deletes a directory from the filesystem.
6767 //
6868 // See your C library manual for more details about how rmdir() works
6969 // on your system.
70-func Rmdir(FilenameVar string) int32 {
70+func Rmdir(FilenameVar string) int {
7171
7272 return xRmdir(FilenameVar)
7373
7474 }
7575
76-var xUnlink func(string) int32
76+var xUnlink func(string) int
7777
7878 // A wrapper for the POSIX unlink() function. The unlink() function
7979 // deletes a name from the filesystem. If this was the last link to the
@@ -83,7 +83,7 @@ var xUnlink func(string) int32
8383 // See your C library manual for more details about unlink(). Note
8484 // that on Windows, it is in general not possible to delete files that
8585 // are open to some process, or mapped into memory.
86-func Unlink(FilenameVar string) int32 {
86+func Unlink(FilenameVar string) int {
8787
8888 return xUnlink(FilenameVar)
8989
M v4/glib/gstrfuncs.go +24 -24
@@ -47,18 +47,18 @@ const (
4747 GNumberParserErrorOutOfBoundsValue NumberParserError = 1
4848 )
4949
50-var xAsciiDigitValue func(byte) int32
50+var xAsciiDigitValue func(byte) int
5151
5252 // Determines the numeric value of a character as a decimal digit.
5353 // Differs from g_unichar_digit_value() because it takes a char, so
5454 // there's no worry about sign extension if characters are signed.
55-func AsciiDigitValue(CVar byte) int32 {
55+func AsciiDigitValue(CVar byte) int {
5656
5757 return xAsciiDigitValue(CVar)
5858
5959 }
6060
61-var xAsciiDtostr func(string, int32, float64) string
61+var xAsciiDtostr func(string, int, float64) string
6262
6363 // Converts a #gdouble to a string, using the '.' as
6464 // decimal point.
@@ -69,13 +69,13 @@ var xAsciiDtostr func(string, int32, float64) string
6969 // guaranteed that the size of the resulting string will never
7070 // be larger than %G_ASCII_DTOSTR_BUF_SIZE bytes, including the terminating
7171 // nul character, which is always added.
72-func AsciiDtostr(BufferVar string, BufLenVar int32, DVar float64) string {
72+func AsciiDtostr(BufferVar string, BufLenVar int, DVar float64) string {
7373
7474 return xAsciiDtostr(BufferVar, BufLenVar, DVar)
7575
7676 }
7777
78-var xAsciiFormatd func(string, int32, string, float64) string
78+var xAsciiFormatd func(string, int, string, float64) string
7979
8080 // Converts a #gdouble to a string, using the '.' as
8181 // decimal point. To format the number you pass in
@@ -89,13 +89,13 @@ var xAsciiFormatd func(string, int32, string, float64) string
8989 //
9090 // If you just want to want to serialize the value into a
9191 // string, use g_ascii_dtostr().
92-func AsciiFormatd(BufferVar string, BufLenVar int32, FormatVar string, DVar float64) string {
92+func AsciiFormatd(BufferVar string, BufLenVar int, FormatVar string, DVar float64) string {
9393
9494 return xAsciiFormatd(BufferVar, BufLenVar, FormatVar, DVar)
9595
9696 }
9797
98-var xAsciiStrcasecmp func(string, string) int32
98+var xAsciiStrcasecmp func(string, string) int
9999
100100 // Compare two strings, ignoring the case of ASCII characters.
101101 //
@@ -112,7 +112,7 @@ var xAsciiStrcasecmp func(string, string) int32
112112 // strings using this function, you will get false matches.
113113 //
114114 // Both @s1 and @s2 must be non-%NULL.
115-func AsciiStrcasecmp(S1Var string, S2Var string) int32 {
115+func AsciiStrcasecmp(S1Var string, S2Var string) int {
116116
117117 return xAsciiStrcasecmp(S1Var, S2Var)
118118
@@ -186,7 +186,7 @@ func AsciiStringToUnsigned(StrVar string, BaseVar uint, MinVar uint64, MaxVar ui
186186
187187 }
188188
189-var xAsciiStrncasecmp func(string, string, uint) int32
189+var xAsciiStrncasecmp func(string, string, uint) int
190190
191191 // Compare @s1 and @s2, ignoring the case of ASCII characters and any
192192 // characters after the first @n in each string. If either string is
@@ -200,7 +200,7 @@ var xAsciiStrncasecmp func(string, string, uint) int32
200200 // The same warning as in g_ascii_strcasecmp() applies: Use this
201201 // function only on strings known to be in encodings where bytes
202202 // corresponding to ASCII letters always represent themselves.
203-func AsciiStrncasecmp(S1Var string, S2Var string, NVar uint) int32 {
203+func AsciiStrncasecmp(S1Var string, S2Var string, NVar uint) int {
204204
205205 return xAsciiStrncasecmp(S1Var, S2Var, NVar)
206206
@@ -335,13 +335,13 @@ func AsciiToupper(CVar byte) byte {
335335
336336 }
337337
338-var xAsciiXdigitValue func(byte) int32
338+var xAsciiXdigitValue func(byte) int
339339
340340 // Determines the numeric value of a character as a hexadecimal
341341 // digit. Differs from g_unichar_xdigit_value() because it takes
342342 // a char, so there's no worry about sign extension if characters
343343 // are signed.
344-func AsciiXdigitValue(CVar byte) int32 {
344+func AsciiXdigitValue(CVar byte) int {
345345
346346 return xAsciiXdigitValue(CVar)
347347
@@ -518,11 +518,11 @@ func Strcanon(StringVar string, ValidCharsVar string, SubstitutorVar byte) strin
518518
519519 }
520520
521-var xStrcasecmp func(string, string) int32
521+var xStrcasecmp func(string, string) int
522522
523523 // A case-insensitive string comparison, corresponding to the standard
524524 // strcasecmp() function on platforms which support it.
525-func Strcasecmp(S1Var string, S2Var string) int32 {
525+func Strcasecmp(S1Var string, S2Var string) int {
526526
527527 return xStrcasecmp(S1Var, S2Var)
528528
@@ -689,7 +689,7 @@ func Strdupv(StrArrayVar string) uintptr {
689689
690690 }
691691
692-var xStrerror func(int32) string
692+var xStrerror func(int) string
693693
694694 // Returns a string corresponding to the given error code, e.g. "no
695695 // such process". Unlike strerror(), this always returns a string in
@@ -711,7 +711,7 @@ var xStrerror func(int32) string
711711 // g_strerror (saved_errno);
712712 //
713713 // ]|
714-func Strerror(ErrnumVar int32) string {
714+func Strerror(ErrnumVar int) string {
715715
716716 return xStrerror(ErrnumVar)
717717
@@ -814,13 +814,13 @@ func Strlcpy(DestVar string, SrcVar string, DestSizeVar uint) uint {
814814
815815 }
816816
817-var xStrncasecmp func(string, string, uint) int32
817+var xStrncasecmp func(string, string, uint) int
818818
819819 // A case-insensitive string comparison, corresponding to the standard
820820 // strncasecmp() function on platforms which support it. It is similar
821821 // to g_strcasecmp() except it only compares the first @n characters of
822822 // the strings.
823-func Strncasecmp(S1Var string, S2Var string, NVar uint) int32 {
823+func Strncasecmp(S1Var string, S2Var string, NVar uint) int {
824824
825825 return xStrncasecmp(S1Var, S2Var, NVar)
826826
@@ -887,19 +887,19 @@ func StrrstrLen(HaystackVar string, HaystackLenVar int, NeedleVar string) string
887887
888888 }
889889
890-var xStrsignal func(int32) string
890+var xStrsignal func(int) string
891891
892892 // Returns a string describing the given signal, e.g. "Segmentation fault".
893893 // You should use this function in preference to strsignal(), because it
894894 // returns a string in UTF-8 encoding, and since not all platforms support
895895 // the strsignal() function.
896-func Strsignal(SignumVar int32) string {
896+func Strsignal(SignumVar int) string {
897897
898898 return xStrsignal(SignumVar)
899899
900900 }
901901
902-var xStrsplit func(string, string, int32) uintptr
902+var xStrsplit func(string, string, int) uintptr
903903
904904 // Splits a string into a maximum of @max_tokens pieces, using the given
905905 // @delimiter. If @max_tokens is reached, the remainder of @string is
@@ -915,13 +915,13 @@ var xStrsplit func(string, string, int32) uintptr
915915 // more useful than consistent handling of empty elements. If you do need
916916 // to represent empty elements, you'll need to check for the empty string
917917 // before calling g_strsplit().
918-func Strsplit(StringVar string, DelimiterVar string, MaxTokensVar int32) uintptr {
918+func Strsplit(StringVar string, DelimiterVar string, MaxTokensVar int) uintptr {
919919
920920 return xStrsplit(StringVar, DelimiterVar, MaxTokensVar)
921921
922922 }
923923
924-var xStrsplitSet func(string, string, int32) uintptr
924+var xStrsplitSet func(string, string, int) uintptr
925925
926926 // Splits @string into a number of tokens not containing any of the characters
927927 // in @delimiter. A token is the (possibly empty) longest string that does not
@@ -944,7 +944,7 @@ var xStrsplitSet func(string, string, int32) uintptr
944944 //
945945 // Note that this function works on bytes not characters, so it can't be used
946946 // to delimit UTF-8 strings for anything but ASCII characters.
947-func StrsplitSet(StringVar string, DelimitersVar string, MaxTokensVar int32) uintptr {
947+func StrsplitSet(StringVar string, DelimitersVar string, MaxTokensVar int) uintptr {
948948
949949 return xStrsplitSet(StringVar, DelimitersVar, MaxTokensVar)
950950
M v4/glib/gtestutils.go +24 -24
@@ -180,62 +180,62 @@ const (
180180 GTestRunIncompleteValue TestResult = 3
181181 )
182182
183-var xAssertionMessage func(string, string, int32, string, string)
183+var xAssertionMessage func(string, string, int, string, string)
184184
185-func AssertionMessage(DomainVar string, FileVar string, LineVar int32, FuncVar string, MessageVar string) {
185+func AssertionMessage(DomainVar string, FileVar string, LineVar int, FuncVar string, MessageVar string) {
186186
187187 xAssertionMessage(DomainVar, FileVar, LineVar, FuncVar, MessageVar)
188188
189189 }
190190
191-var xAssertionMessageCmpnum func(string, string, int32, string, string, float64, string, float64, byte)
191+var xAssertionMessageCmpnum func(string, string, int, string, string, float64, string, float64, byte)
192192
193-func AssertionMessageCmpnum(DomainVar string, FileVar string, LineVar int32, FuncVar string, ExprVar string, Arg1Var float64, CmpVar string, Arg2Var float64, NumtypeVar byte) {
193+func AssertionMessageCmpnum(DomainVar string, FileVar string, LineVar int, FuncVar string, ExprVar string, Arg1Var float64, CmpVar string, Arg2Var float64, NumtypeVar byte) {
194194
195195 xAssertionMessageCmpnum(DomainVar, FileVar, LineVar, FuncVar, ExprVar, Arg1Var, CmpVar, Arg2Var, NumtypeVar)
196196
197197 }
198198
199-var xAssertionMessageCmpstr func(string, string, int32, string, string, string, string, string)
199+var xAssertionMessageCmpstr func(string, string, int, string, string, string, string, string)
200200
201-func AssertionMessageCmpstr(DomainVar string, FileVar string, LineVar int32, FuncVar string, ExprVar string, Arg1Var string, CmpVar string, Arg2Var string) {
201+func AssertionMessageCmpstr(DomainVar string, FileVar string, LineVar int, FuncVar string, ExprVar string, Arg1Var string, CmpVar string, Arg2Var string) {
202202
203203 xAssertionMessageCmpstr(DomainVar, FileVar, LineVar, FuncVar, ExprVar, Arg1Var, CmpVar, Arg2Var)
204204
205205 }
206206
207-var xAssertionMessageCmpstrv func(string, string, int32, string, string, string, string, uint)
207+var xAssertionMessageCmpstrv func(string, string, int, string, string, string, string, uint)
208208
209-func AssertionMessageCmpstrv(DomainVar string, FileVar string, LineVar int32, FuncVar string, ExprVar string, Arg1Var string, Arg2Var string, FirstWrongIdxVar uint) {
209+func AssertionMessageCmpstrv(DomainVar string, FileVar string, LineVar int, FuncVar string, ExprVar string, Arg1Var string, Arg2Var string, FirstWrongIdxVar uint) {
210210
211211 xAssertionMessageCmpstrv(DomainVar, FileVar, LineVar, FuncVar, ExprVar, Arg1Var, Arg2Var, FirstWrongIdxVar)
212212
213213 }
214214
215-var xAssertionMessageError func(string, string, int32, string, string, *Error, Quark, int32)
215+var xAssertionMessageError func(string, string, int, string, string, *Error, Quark, int)
216216
217-func AssertionMessageError(DomainVar string, FileVar string, LineVar int32, FuncVar string, ExprVar string, ErrorVar *Error, ErrorDomainVar Quark, ErrorCodeVar int32) {
217+func AssertionMessageError(DomainVar string, FileVar string, LineVar int, FuncVar string, ExprVar string, ErrorVar *Error, ErrorDomainVar Quark, ErrorCodeVar int) {
218218
219219 xAssertionMessageError(DomainVar, FileVar, LineVar, FuncVar, ExprVar, ErrorVar, ErrorDomainVar, ErrorCodeVar)
220220
221221 }
222222
223-var xAssertionMessageExpr func(string, string, int32, string, string)
223+var xAssertionMessageExpr func(string, string, int, string, string)
224224
225225 // Internal function used to print messages from the public g_assert() and
226226 // g_assert_not_reached() macros.
227-func AssertionMessageExpr(DomainVar string, FileVar string, LineVar int32, FuncVar string, ExprVar string) {
227+func AssertionMessageExpr(DomainVar string, FileVar string, LineVar int, FuncVar string, ExprVar string) {
228228
229229 xAssertionMessageExpr(DomainVar, FileVar, LineVar, FuncVar, ExprVar)
230230
231231 }
232232
233-var xStrcmp0 func(string, string) int32
233+var xStrcmp0 func(string, string) int
234234
235235 // Compares @str1 and @str2 like strcmp(). Handles %NULL
236236 // gracefully by sorting it before non-%NULL strings.
237237 // Comparing two %NULL pointers returns 0.
238-func Strcmp0(Str1Var string, Str2Var string) int32 {
238+func Strcmp0(Str1Var string, Str2Var string) int {
239239
240240 return xStrcmp0(Str1Var, Str2Var)
241241
@@ -300,9 +300,9 @@ func TestAddVtable(TestpathVar string, DataSizeVar uint, TestDataVar uintptr, Da
300300
301301 }
302302
303-var xTestAssertExpectedMessagesInternal func(string, string, int32, string)
303+var xTestAssertExpectedMessagesInternal func(string, string, int, string)
304304
305-func TestAssertExpectedMessagesInternal(DomainVar string, FileVar string, LineVar int32, FuncVar string) {
305+func TestAssertExpectedMessagesInternal(DomainVar string, FileVar string, LineVar int, FuncVar string) {
306306
307307 xTestAssertExpectedMessagesInternal(DomainVar, FileVar, LineVar, FuncVar)
308308
@@ -595,7 +595,7 @@ func TestIncompletePrintf(FormatVar string, varArgs ...interface{}) {
595595
596596 }
597597
598-var xTestInit func(int32, string, ...interface{})
598+var xTestInit func(int, string, ...interface{})
599599
600600 // Initialize the GLib testing framework, e.g. by seeding the
601601 // test random number generator, the name for g_get_prgname()
@@ -648,7 +648,7 @@ var xTestInit func(int32, string, ...interface{})
648648 // from being executed, as g_assert() is commonly (erroneously) used in unit
649649 // tests, and is a no-op when compiled with `G_DISABLE_ASSERT`. Ensure your
650650 // tests are compiled without `G_DISABLE_ASSERT` defined.
651-func TestInit(ArgcVar int32, ArgvVar string, varArgs ...interface{}) {
651+func TestInit(ArgcVar int, ArgvVar string, varArgs ...interface{}) {
652652
653653 xTestInit(ArgcVar, ArgvVar, varArgs...)
654654
@@ -798,7 +798,7 @@ func TestRandIntRange(BeginVar int32, EndVar int32) int32 {
798798
799799 }
800800
801-var xTestRun func() int32
801+var xTestRun func() int
802802
803803 // Runs all tests under the toplevel suite which can be retrieved
804804 // with g_test_get_root(). Similar to g_test_run_suite(), the test
@@ -832,13 +832,13 @@ var xTestRun func() int32
832832 // If all tests are skipped or marked as incomplete (expected failures),
833833 // this function will return 0 if producing TAP output, or 77 (treated
834834 // as "skip test" by Automake) otherwise.
835-func TestRun() int32 {
835+func TestRun() int {
836836
837837 return xTestRun()
838838
839839 }
840840
841-var xTestRunSuite func(*TestSuite) int32
841+var xTestRunSuite func(*TestSuite) int
842842
843843 // Execute the tests within @suite and all nested #GTestSuites.
844844 // The test suites to be executed are filtered according to
@@ -848,7 +848,7 @@ var xTestRunSuite func(*TestSuite) int32
848848 //
849849 // g_test_run_suite() or g_test_run() may only be called once
850850 // in a program.
851-func TestRunSuite(SuiteVar *TestSuite) int32 {
851+func TestRunSuite(SuiteVar *TestSuite) int {
852852
853853 return xTestRunSuite(SuiteVar)
854854
@@ -966,9 +966,9 @@ func TestTimerStart() {
966966
967967 }
968968
969-var xTestTrapAssertions func(string, string, int32, string, uint64, string)
969+var xTestTrapAssertions func(string, string, int, string, uint64, string)
970970
971-func TestTrapAssertions(DomainVar string, FileVar string, LineVar int32, FuncVar string, AssertionFlagsVar uint64, PatternVar string) {
971+func TestTrapAssertions(DomainVar string, FileVar string, LineVar int, FuncVar string, AssertionFlagsVar uint64, PatternVar string) {
972972
973973 xTestTrapAssertions(DomainVar, FileVar, LineVar, FuncVar, AssertionFlagsVar, PatternVar)
974974
M v4/glib/gthreadpool.go +4 -4
@@ -31,10 +31,10 @@ func ThreadPoolGetMaxIdleTime() uint {
3131
3232 }
3333
34-var xThreadPoolGetMaxUnusedThreads func() int32
34+var xThreadPoolGetMaxUnusedThreads func() int
3535
3636 // Returns the maximal allowed number of unused threads.
37-func ThreadPoolGetMaxUnusedThreads() int32 {
37+func ThreadPoolGetMaxUnusedThreads() int {
3838
3939 return xThreadPoolGetMaxUnusedThreads()
4040
@@ -66,14 +66,14 @@ func ThreadPoolSetMaxIdleTime(IntervalVar uint) {
6666
6767 }
6868
69-var xThreadPoolSetMaxUnusedThreads func(int32)
69+var xThreadPoolSetMaxUnusedThreads func(int)
7070
7171 // Sets the maximal number of unused threads to @max_threads.
7272 // If @max_threads is -1, no limit is imposed on the number
7373 // of unused threads.
7474 //
7575 // The default value is 2.
76-func ThreadPoolSetMaxUnusedThreads(MaxThreadsVar int32) {
76+func ThreadPoolSetMaxUnusedThreads(MaxThreadsVar int) {
7777
7878 xThreadPoolSetMaxUnusedThreads(MaxThreadsVar)
7979
M v4/glib/gtypes.go +2 -2
@@ -5,13 +5,13 @@ package glib
55 // values. The function should return a negative integer if the first
66 // value comes before the second, 0 if they are equal, or a positive
77 // integer if the first value comes after the second.
8-type CompareDataFunc func(uintptr, uintptr, uintptr) int32
8+type CompareDataFunc func(uintptr, uintptr, uintptr) int
99
1010 // Specifies the type of a comparison function used to compare two
1111 // values. The function should return a negative integer if the first
1212 // value comes before the second, 0 if they are equal, or a positive
1313 // integer if the first value comes after the second.
14-type CompareFunc func(uintptr, uintptr) int32
14+type CompareFunc func(uintptr, uintptr) int
1515
1616 // A function of this signature is used to copy the node data
1717 // when doing a deep-copy of a tree.
M v4/glib/gunicode.go +10 -10
@@ -586,10 +586,10 @@ func UnicharBreakType(CVar uint32) UnicodeBreakType {
586586
587587 }
588588
589-var xUnicharCombiningClass func(uint32) int32
589+var xUnicharCombiningClass func(uint32) int
590590
591591 // Determines the canonical combining class of a Unicode character.
592-func UnicharCombiningClass(UcVar uint32) int32 {
592+func UnicharCombiningClass(UcVar uint32) int {
593593
594594 return xUnicharCombiningClass(UcVar)
595595
@@ -650,11 +650,11 @@ func UnicharDecompose(ChVar uint32, AVar uint32, BVar uint32) bool {
650650
651651 }
652652
653-var xUnicharDigitValue func(uint32) int32
653+var xUnicharDigitValue func(uint32) int
654654
655655 // Determines the numeric value of a character as a decimal
656656 // digit.
657-func UnicharDigitValue(CVar uint32) int32 {
657+func UnicharDigitValue(CVar uint32) int {
658658
659659 return xUnicharDigitValue(CVar)
660660
@@ -929,10 +929,10 @@ func UnicharIszerowidth(CVar uint32) bool {
929929
930930 }
931931
932-var xUnicharToUtf8 func(uint32, string) int32
932+var xUnicharToUtf8 func(uint32, string) int
933933
934934 // Converts a single character to UTF-8.
935-func UnicharToUtf8(CVar uint32, OutbufVar string) int32 {
935+func UnicharToUtf8(CVar uint32, OutbufVar string) int {
936936
937937 return xUnicharToUtf8(CVar, OutbufVar)
938938
@@ -985,11 +985,11 @@ func UnicharValidate(ChVar uint32) bool {
985985
986986 }
987987
988-var xUnicharXdigitValue func(uint32) int32
988+var xUnicharXdigitValue func(uint32) int
989989
990990 // Determines the numeric value of a character as a hexadecimal
991991 // digit.
992-func UnicharXdigitValue(CVar uint32) int32 {
992+func UnicharXdigitValue(CVar uint32) int {
993993
994994 return xUnicharXdigitValue(CVar)
995995
@@ -1100,7 +1100,7 @@ func Utf8Casefold(StrVar string, LenVar int) string {
11001100
11011101 }
11021102
1103-var xUtf8Collate func(string, string) int32
1103+var xUtf8Collate func(string, string) int
11041104
11051105 // Compares two strings for ordering using the linguistically
11061106 // correct rules for the [current locale][setlocale].
@@ -1112,7 +1112,7 @@ var xUtf8Collate func(string, string) int32
11121112 // If the two strings are not comparable due to being in different collation
11131113 // sequences, the result is undefined. This can happen if the strings are in
11141114 // different language scripts, for example.
1115-func Utf8Collate(Str1Var string, Str2Var string) int32 {
1115+func Utf8Collate(Str1Var string, Str2Var string) int {
11161116
11171117 return xUtf8Collate(Str1Var, Str2Var)
11181118
M v4/glib/guri.go +14 -14
@@ -254,19 +254,19 @@ const (
254254 GUriErrorBadFragmentValue UriError = 9
255255 )
256256
257-var xUriBuild func(UriFlags, string, string, string, int32, string, string, string) *Uri
257+var xUriBuild func(UriFlags, string, string, string, int, string, string, string) *Uri
258258
259259 // Creates a new #GUri from the given components according to @flags.
260260 //
261261 // See also g_uri_build_with_user(), which allows specifying the
262262 // components of the "userinfo" separately.
263-func UriBuild(FlagsVar UriFlags, SchemeVar string, UserinfoVar string, HostVar string, PortVar int32, PathVar string, QueryVar string, FragmentVar string) *Uri {
263+func UriBuild(FlagsVar UriFlags, SchemeVar string, UserinfoVar string, HostVar string, PortVar int, PathVar string, QueryVar string, FragmentVar string) *Uri {
264264
265265 return xUriBuild(FlagsVar, SchemeVar, UserinfoVar, HostVar, PortVar, PathVar, QueryVar, FragmentVar)
266266
267267 }
268268
269-var xUriBuildWithUser func(UriFlags, string, string, string, string, string, int32, string, string, string) *Uri
269+var xUriBuildWithUser func(UriFlags, string, string, string, string, string, int, string, string, string) *Uri
270270
271271 // Creates a new #GUri from the given components according to @flags
272272 // (%G_URI_FLAGS_HAS_PASSWORD is added unconditionally). The @flags must be
@@ -276,7 +276,7 @@ var xUriBuildWithUser func(UriFlags, string, string, string, string, string, int
276276 // In contrast to g_uri_build(), this allows specifying the components
277277 // of the ‘userinfo’ field separately. Note that @user must be non-%NULL
278278 // if either @password or @auth_params is non-%NULL.
279-func UriBuildWithUser(FlagsVar UriFlags, SchemeVar string, UserVar string, PasswordVar string, AuthParamsVar string, HostVar string, PortVar int32, PathVar string, QueryVar string, FragmentVar string) *Uri {
279+func UriBuildWithUser(FlagsVar UriFlags, SchemeVar string, UserVar string, PasswordVar string, AuthParamsVar string, HostVar string, PortVar int, PathVar string, QueryVar string, FragmentVar string) *Uri {
280280
281281 return xUriBuildWithUser(FlagsVar, SchemeVar, UserVar, PasswordVar, AuthParamsVar, HostVar, PortVar, PathVar, QueryVar, FragmentVar)
282282
@@ -333,7 +333,7 @@ func UriIsValid(UriStringVar string, FlagsVar UriFlags) bool {
333333
334334 }
335335
336-var xUriJoin func(UriFlags, string, string, string, int32, string, string, string) string
336+var xUriJoin func(UriFlags, string, string, string, int, string, string, string) string
337337
338338 // Joins the given components together according to @flags to create
339339 // an absolute URI string. @path may not be %NULL (though it may be the empty
@@ -351,13 +351,13 @@ var xUriJoin func(UriFlags, string, string, string, int32, string, string, strin
351351 //
352352 // %G_URI_FLAGS_HAS_PASSWORD and %G_URI_FLAGS_HAS_AUTH_PARAMS are ignored if set
353353 // in @flags.
354-func UriJoin(FlagsVar UriFlags, SchemeVar string, UserinfoVar string, HostVar string, PortVar int32, PathVar string, QueryVar string, FragmentVar string) string {
354+func UriJoin(FlagsVar UriFlags, SchemeVar string, UserinfoVar string, HostVar string, PortVar int, PathVar string, QueryVar string, FragmentVar string) string {
355355
356356 return xUriJoin(FlagsVar, SchemeVar, UserinfoVar, HostVar, PortVar, PathVar, QueryVar, FragmentVar)
357357
358358 }
359359
360-var xUriJoinWithUser func(UriFlags, string, string, string, string, string, int32, string, string, string) string
360+var xUriJoinWithUser func(UriFlags, string, string, string, string, string, int, string, string, string) string
361361
362362 // Joins the given components together according to @flags to create
363363 // an absolute URI string. @path may not be %NULL (though it may be the empty
@@ -368,7 +368,7 @@ var xUriJoinWithUser func(UriFlags, string, string, string, string, string, int3
368368 //
369369 // %G_URI_FLAGS_HAS_PASSWORD and %G_URI_FLAGS_HAS_AUTH_PARAMS are ignored if set
370370 // in @flags.
371-func UriJoinWithUser(FlagsVar UriFlags, SchemeVar string, UserVar string, PasswordVar string, AuthParamsVar string, HostVar string, PortVar int32, PathVar string, QueryVar string, FragmentVar string) string {
371+func UriJoinWithUser(FlagsVar UriFlags, SchemeVar string, UserVar string, PasswordVar string, AuthParamsVar string, HostVar string, PortVar int, PathVar string, QueryVar string, FragmentVar string) string {
372372
373373 return xUriJoinWithUser(FlagsVar, SchemeVar, UserVar, PasswordVar, AuthParamsVar, HostVar, PortVar, PathVar, QueryVar, FragmentVar)
374374
@@ -465,7 +465,7 @@ func UriResolveRelative(BaseUriStringVar string, UriRefVar string, FlagsVar UriF
465465
466466 }
467467
468-var xUriSplit func(string, UriFlags, string, string, string, int32, string, string, string) bool
468+var xUriSplit func(string, UriFlags, string, string, string, int, string, string, string) bool
469469
470470 // Parses @uri_ref (which can be an
471471 // [absolute or relative URI][relative-absolute-uris]) according to @flags, and
@@ -483,13 +483,13 @@ var xUriSplit func(string, UriFlags, string, string, string, int32, string, stri
483483 // %G_URI_FLAGS_HAS_AUTH_PARAMS @flags are ignored by g_uri_split(),
484484 // since it always returns only the full userinfo; use
485485 // g_uri_split_with_user() if you want it split up.
486-func UriSplit(UriRefVar string, FlagsVar UriFlags, SchemeVar string, UserinfoVar string, HostVar string, PortVar int32, PathVar string, QueryVar string, FragmentVar string) bool {
486+func UriSplit(UriRefVar string, FlagsVar UriFlags, SchemeVar string, UserinfoVar string, HostVar string, PortVar int, PathVar string, QueryVar string, FragmentVar string) bool {
487487
488488 return xUriSplit(UriRefVar, FlagsVar, SchemeVar, UserinfoVar, HostVar, PortVar, PathVar, QueryVar, FragmentVar)
489489
490490 }
491491
492-var xUriSplitNetwork func(string, UriFlags, string, string, int32) bool
492+var xUriSplitNetwork func(string, UriFlags, string, string, int) bool
493493
494494 // Parses @uri_string (which must be an [absolute URI][relative-absolute-uris])
495495 // according to @flags, and returns the pieces relevant to connecting to a host.
@@ -497,13 +497,13 @@ var xUriSplitNetwork func(string, UriFlags, string, string, int32) bool
497497 // mostly a wrapper around that function with simpler arguments.
498498 // However, it will return an error if @uri_string is a relative URI,
499499 // or does not contain a hostname component.
500-func UriSplitNetwork(UriStringVar string, FlagsVar UriFlags, SchemeVar string, HostVar string, PortVar int32) bool {
500+func UriSplitNetwork(UriStringVar string, FlagsVar UriFlags, SchemeVar string, HostVar string, PortVar int) bool {
501501
502502 return xUriSplitNetwork(UriStringVar, FlagsVar, SchemeVar, HostVar, PortVar)
503503
504504 }
505505
506-var xUriSplitWithUser func(string, UriFlags, string, string, string, string, string, int32, string, string, string) bool
506+var xUriSplitWithUser func(string, UriFlags, string, string, string, string, string, int, string, string, string) bool
507507
508508 // Parses @uri_ref (which can be an
509509 // [absolute or relative URI][relative-absolute-uris]) according to @flags, and
@@ -516,7 +516,7 @@ var xUriSplitWithUser func(string, UriFlags, string, string, string, string, str
516516 // be parsed out if @flags contains %G_URI_FLAGS_HAS_PASSWORD, and
517517 // @auth_params will only be parsed out if @flags contains
518518 // %G_URI_FLAGS_HAS_AUTH_PARAMS.
519-func UriSplitWithUser(UriRefVar string, FlagsVar UriFlags, SchemeVar string, UserVar string, PasswordVar string, AuthParamsVar string, HostVar string, PortVar int32, PathVar string, QueryVar string, FragmentVar string) bool {
519+func UriSplitWithUser(UriRefVar string, FlagsVar UriFlags, SchemeVar string, UserVar string, PasswordVar string, AuthParamsVar string, HostVar string, PortVar int, PathVar string, QueryVar string, FragmentVar string) bool {
520520
521521 return xUriSplitWithUser(UriRefVar, FlagsVar, SchemeVar, UserVar, PasswordVar, AuthParamsVar, HostVar, PortVar, PathVar, QueryVar, FragmentVar)
522522
M v4/glib/gutils.go +8 -8
@@ -108,26 +108,26 @@ func Atexit(FuncVar VoidFunc) {
108108
109109 }
110110
111-var xBitNthLsf func(uint32, int32) int32
111+var xBitNthLsf func(uint32, int) int
112112
113113 // Find the position of the first bit set in @mask, searching
114114 // from (but not including) @nth_bit upwards. Bits are numbered
115115 // from 0 (least significant) to sizeof(#gulong) * 8 - 1 (31 or 63,
116116 // usually). To start searching from the 0th bit, set @nth_bit to -1.
117-func BitNthLsf(MaskVar uint32, NthBitVar int32) int32 {
117+func BitNthLsf(MaskVar uint32, NthBitVar int) int {
118118
119119 return xBitNthLsf(MaskVar, NthBitVar)
120120
121121 }
122122
123-var xBitNthMsf func(uint32, int32) int32
123+var xBitNthMsf func(uint32, int) int
124124
125125 // Find the position of the first bit set in @mask, searching
126126 // from (but not including) @nth_bit downwards. Bits are numbered
127127 // from 0 (least significant) to sizeof(#gulong) * 8 - 1 (31 or 63,
128128 // usually). To start searching from the last bit, set @nth_bit to
129129 // -1 or GLIB_SIZEOF_LONG * 8.
130-func BitNthMsf(MaskVar uint32, NthBitVar int32) int32 {
130+func BitNthMsf(MaskVar uint32, NthBitVar int) int {
131131
132132 return xBitNthMsf(MaskVar, NthBitVar)
133133
@@ -654,7 +654,7 @@ func SetPrgname(PrgnameVar string) {
654654
655655 }
656656
657-var xSnprintf func(string, uint32, string, ...interface{}) int32
657+var xSnprintf func(string, uint32, string, ...interface{}) int
658658
659659 // A safer form of the standard sprintf() function. The output is guaranteed
660660 // to not exceed @n characters (including the terminating nul character), so
@@ -673,13 +673,13 @@ var xSnprintf func(string, uint32, string, ...interface{}) int32
673673 //
674674 // The format string may contain positional parameters, as specified in
675675 // the Single Unix Specification.
676-func Snprintf(StringVar string, NVar uint32, FormatVar string, varArgs ...interface{}) int32 {
676+func Snprintf(StringVar string, NVar uint32, FormatVar string, varArgs ...interface{}) int {
677677
678678 return xSnprintf(StringVar, NVar, FormatVar, varArgs...)
679679
680680 }
681681
682-var xVsnprintf func(string, uint32, string, []interface{}) int32
682+var xVsnprintf func(string, uint32, string, []interface{}) int
683683
684684 // A safer form of the standard vsprintf() function. The output is guaranteed
685685 // to not exceed @n characters (including the terminating nul character), so
@@ -698,7 +698,7 @@ var xVsnprintf func(string, uint32, string, []interface{}) int32
698698 //
699699 // The format string may contain positional parameters, as specified in
700700 // the Single Unix Specification.
701-func Vsnprintf(StringVar string, NVar uint32, FormatVar string, ArgsVar []interface{}) int32 {
701+func Vsnprintf(StringVar string, NVar uint32, FormatVar string, ArgsVar []interface{}) int {
702702
703703 return xVsnprintf(StringVar, NVar, FormatVar, ArgsVar)
704704
M v4/gobject/gclosure.go +1 -1
@@ -26,7 +26,7 @@ type ClosureNotify func(uintptr, *Closure)
2626 // This is the signature of va_list marshaller functions, an optional
2727 // marshaller that can be used in some situations to avoid
2828 // marshalling the signal argument into GValues.
29-type VaClosureMarshal func(*Closure, *Value, *TypeInstance, []interface{}, uintptr, int32, uintptr)
29+type VaClosureMarshal func(*Closure, *Value, *TypeInstance, []interface{}, uintptr, int, uintptr)
3030
3131 // A #GCClosure is a specialization of #GClosure for C function callbacks.
3232 type CClosure struct {
M v4/gobject/genums.go +4 -4
@@ -83,10 +83,10 @@ func EnumCompleteTypeInfo(GEnumTypeVar []interface{}, InfoVar *TypeInfo, ConstVa
8383
8484 }
8585
86-var xEnumGetValue func(*EnumClass, int32) *EnumValue
86+var xEnumGetValue func(*EnumClass, int) *EnumValue
8787
8888 // Returns the #GEnumValue for a value.
89-func EnumGetValue(EnumClassVar *EnumClass, ValueVar int32) *EnumValue {
89+func EnumGetValue(EnumClassVar *EnumClass, ValueVar int) *EnumValue {
9090
9191 return xEnumGetValue(EnumClassVar, ValueVar)
9292
@@ -123,13 +123,13 @@ func EnumRegisterStatic(NameVar string, ConstStaticValuesVar *EnumValue) []inter
123123
124124 }
125125
126-var xEnumToString func([]interface{}, int32) string
126+var xEnumToString func([]interface{}, int) string
127127
128128 // Pretty-prints @value in the form of the enum’s name.
129129 //
130130 // This is intended to be used for debugging purposes. The format of the output
131131 // may change in the future.
132-func EnumToString(GEnumTypeVar []interface{}, ValueVar int32) string {
132+func EnumToString(GEnumTypeVar []interface{}, ValueVar int) string {
133133
134134 return xEnumToString(GEnumTypeVar, ValueVar)
135135
M v4/gobject/gparam.go +2 -2
@@ -161,12 +161,12 @@ func ParamValueValidate(PspecVar *ParamSpec, ValueVar *Value) bool {
161161
162162 }
163163
164-var xParamValuesCmp func(uintptr, *Value, *Value) int32
164+var xParamValuesCmp func(uintptr, *Value, *Value) int
165165
166166 // Compares @value1 with @value2 according to @pspec, and return -1, 0 or +1,
167167 // if @value1 is found to be less than, equal to or greater than @value2,
168168 // respectively.
169-func ParamValuesCmp(PspecVar *ParamSpec, Value1Var *Value, Value2Var *Value) int32 {
169+func ParamValuesCmp(PspecVar *ParamSpec, Value1Var *Value, Value2Var *Value) int {
170170
171171 return xParamValuesCmp(PspecVar.GoPointer(), Value1Var, Value2Var)
172172
M v4/gobject/gparamspecs.go +4 -4
@@ -83,13 +83,13 @@ func NewParamSpecDouble(NameVar string, NickVar string, BlurbVar string, Minimum
8383
8484 }
8585
86-var xNewParamSpecEnum func(string, string, string, []interface{}, int32, ParamFlags) uintptr
86+var xNewParamSpecEnum func(string, string, string, []interface{}, int, ParamFlags) uintptr
8787
8888 // Creates a new #GParamSpecEnum instance specifying a %G_TYPE_ENUM
8989 // property.
9090 //
9191 // See g_param_spec_internal() for details on property names.
92-func NewParamSpecEnum(NameVar string, NickVar string, BlurbVar string, EnumTypeVar []interface{}, DefaultValueVar int32, FlagsVar ParamFlags) *ParamSpec {
92+func NewParamSpecEnum(NameVar string, NickVar string, BlurbVar string, EnumTypeVar []interface{}, DefaultValueVar int, FlagsVar ParamFlags) *ParamSpec {
9393
9494 NewParamSpecEnumPtr := xNewParamSpecEnum(NameVar, NickVar, BlurbVar, EnumTypeVar, DefaultValueVar, FlagsVar)
9595 if NewParamSpecEnumPtr == 0 {
@@ -158,12 +158,12 @@ func ParamSpecGtype(NameVar string, NickVar string, BlurbVar string, IsATypeVar
158158
159159 }
160160
161-var xNewParamSpecInt func(string, string, string, int32, int32, int32, ParamFlags) uintptr
161+var xNewParamSpecInt func(string, string, string, int, int, int, ParamFlags) uintptr
162162
163163 // Creates a new #GParamSpecInt instance specifying a %G_TYPE_INT property.
164164 //
165165 // See g_param_spec_internal() for details on property names.
166-func NewParamSpecInt(NameVar string, NickVar string, BlurbVar string, MinimumVar int32, MaximumVar int32, DefaultValueVar int32, FlagsVar ParamFlags) *ParamSpec {
166+func NewParamSpecInt(NameVar string, NickVar string, BlurbVar string, MinimumVar int, MaximumVar int, DefaultValueVar int, FlagsVar ParamFlags) *ParamSpec {
167167
168168 NewParamSpecIntPtr := xNewParamSpecInt(NameVar, NickVar, BlurbVar, MinimumVar, MaximumVar, DefaultValueVar, FlagsVar)
169169 if NewParamSpecIntPtr == 0 {
M v4/gobject/gtype.go +6 -6
@@ -380,9 +380,9 @@ func TypeAddClassPrivate(ClassTypeVar []interface{}, PrivateSizeVar uint) {
380380
381381 }
382382
383-var xTypeAddInstancePrivate func([]interface{}, uint) int32
383+var xTypeAddInstancePrivate func([]interface{}, uint) int
384384
385-func TypeAddInstancePrivate(ClassTypeVar []interface{}, PrivateSizeVar uint) int32 {
385+func TypeAddInstancePrivate(ClassTypeVar []interface{}, PrivateSizeVar uint) int {
386386
387387 return xTypeAddInstancePrivate(ClassTypeVar, PrivateSizeVar)
388388
@@ -511,9 +511,9 @@ func TypeChildren(TypeVar []interface{}, NChildrenVar uint) uintptr {
511511
512512 }
513513
514-var xTypeClassAdjustPrivateOffset func(uintptr, int32)
514+var xTypeClassAdjustPrivateOffset func(uintptr, int)
515515
516-func TypeClassAdjustPrivateOffset(GClassVar uintptr, PrivateSizeOrOffsetVar int32) {
516+func TypeClassAdjustPrivateOffset(GClassVar uintptr, PrivateSizeOrOffsetVar int) {
517517
518518 xTypeClassAdjustPrivateOffset(GClassVar, PrivateSizeOrOffsetVar)
519519
@@ -695,13 +695,13 @@ func TypeFundamentalNext() []interface{} {
695695
696696 }
697697
698-var xTypeGetInstanceCount func([]interface{}) int32
698+var xTypeGetInstanceCount func([]interface{}) int
699699
700700 // Returns the number of instances allocated of the particular type;
701701 // this is only available if GLib is built with debugging support and
702702 // the instance_count debug flag is set (by setting the GOBJECT_DEBUG
703703 // variable to include instance-count).
704-func TypeGetInstanceCount(TypeVar []interface{}) int32 {
704+func TypeGetInstanceCount(TypeVar []interface{}) int {
705705
706706 return xTypeGetInstanceCount(TypeVar)
707707
M v4/gsk/gskglshader.go +26 -26
@@ -192,11 +192,11 @@ func (x *GLShader) Compile(RendererVar *Renderer) bool {
192192
193193 }
194194
195-var xGLShaderFindUniformByName func(uintptr, string) int32
195+var xGLShaderFindUniformByName func(uintptr, string) int
196196
197197 // Looks for a uniform by the name @name, and returns the index
198198 // of the uniform, or -1 if it was not found.
199-func (x *GLShader) FindUniformByName(NameVar string) int32 {
199+func (x *GLShader) FindUniformByName(NameVar string) int {
200200
201201 return xGLShaderFindUniformByName(x.GoPointer(), NameVar)
202202
@@ -238,78 +238,78 @@ func (x *GLShader) FormatArgsVa(UniformsVar []interface{}) *glib.Bytes {
238238
239239 }
240240
241-var xGLShaderGetArgBool func(uintptr, *glib.Bytes, int32) bool
241+var xGLShaderGetArgBool func(uintptr, *glib.Bytes, int) bool
242242
243243 // Gets the value of the uniform @idx in the @args block.
244244 //
245245 // The uniform must be of bool type.
246-func (x *GLShader) GetArgBool(ArgsVar *glib.Bytes, IdxVar int32) bool {
246+func (x *GLShader) GetArgBool(ArgsVar *glib.Bytes, IdxVar int) bool {
247247
248248 return xGLShaderGetArgBool(x.GoPointer(), ArgsVar, IdxVar)
249249
250250 }
251251
252-var xGLShaderGetArgFloat func(uintptr, *glib.Bytes, int32) float32
252+var xGLShaderGetArgFloat func(uintptr, *glib.Bytes, int) float32
253253
254254 // Gets the value of the uniform @idx in the @args block.
255255 //
256256 // The uniform must be of float type.
257-func (x *GLShader) GetArgFloat(ArgsVar *glib.Bytes, IdxVar int32) float32 {
257+func (x *GLShader) GetArgFloat(ArgsVar *glib.Bytes, IdxVar int) float32 {
258258
259259 return xGLShaderGetArgFloat(x.GoPointer(), ArgsVar, IdxVar)
260260
261261 }
262262
263-var xGLShaderGetArgInt func(uintptr, *glib.Bytes, int32) int32
263+var xGLShaderGetArgInt func(uintptr, *glib.Bytes, int) int32
264264
265265 // Gets the value of the uniform @idx in the @args block.
266266 //
267267 // The uniform must be of int type.
268-func (x *GLShader) GetArgInt(ArgsVar *glib.Bytes, IdxVar int32) int32 {
268+func (x *GLShader) GetArgInt(ArgsVar *glib.Bytes, IdxVar int) int32 {
269269
270270 return xGLShaderGetArgInt(x.GoPointer(), ArgsVar, IdxVar)
271271
272272 }
273273
274-var xGLShaderGetArgUint func(uintptr, *glib.Bytes, int32) uint32
274+var xGLShaderGetArgUint func(uintptr, *glib.Bytes, int) uint32
275275
276276 // Gets the value of the uniform @idx in the @args block.
277277 //
278278 // The uniform must be of uint type.
279-func (x *GLShader) GetArgUint(ArgsVar *glib.Bytes, IdxVar int32) uint32 {
279+func (x *GLShader) GetArgUint(ArgsVar *glib.Bytes, IdxVar int) uint32 {
280280
281281 return xGLShaderGetArgUint(x.GoPointer(), ArgsVar, IdxVar)
282282
283283 }
284284
285-var xGLShaderGetArgVec2 func(uintptr, *glib.Bytes, int32, *graphene.Vec2)
285+var xGLShaderGetArgVec2 func(uintptr, *glib.Bytes, int, *graphene.Vec2)
286286
287287 // Gets the value of the uniform @idx in the @args block.
288288 //
289289 // The uniform must be of vec2 type.
290-func (x *GLShader) GetArgVec2(ArgsVar *glib.Bytes, IdxVar int32, OutValueVar *graphene.Vec2) {
290+func (x *GLShader) GetArgVec2(ArgsVar *glib.Bytes, IdxVar int, OutValueVar *graphene.Vec2) {
291291
292292 xGLShaderGetArgVec2(x.GoPointer(), ArgsVar, IdxVar, OutValueVar)
293293
294294 }
295295
296-var xGLShaderGetArgVec3 func(uintptr, *glib.Bytes, int32, *graphene.Vec3)
296+var xGLShaderGetArgVec3 func(uintptr, *glib.Bytes, int, *graphene.Vec3)
297297
298298 // Gets the value of the uniform @idx in the @args block.
299299 //
300300 // The uniform must be of vec3 type.
301-func (x *GLShader) GetArgVec3(ArgsVar *glib.Bytes, IdxVar int32, OutValueVar *graphene.Vec3) {
301+func (x *GLShader) GetArgVec3(ArgsVar *glib.Bytes, IdxVar int, OutValueVar *graphene.Vec3) {
302302
303303 xGLShaderGetArgVec3(x.GoPointer(), ArgsVar, IdxVar, OutValueVar)
304304
305305 }
306306
307-var xGLShaderGetArgVec4 func(uintptr, *glib.Bytes, int32, *graphene.Vec4)
307+var xGLShaderGetArgVec4 func(uintptr, *glib.Bytes, int, *graphene.Vec4)
308308
309309 // Gets the value of the uniform @idx in the @args block.
310310 //
311311 // The uniform must be of vec4 type.
312-func (x *GLShader) GetArgVec4(ArgsVar *glib.Bytes, IdxVar int32, OutValueVar *graphene.Vec4) {
312+func (x *GLShader) GetArgVec4(ArgsVar *glib.Bytes, IdxVar int, OutValueVar *graphene.Vec4) {
313313
314314 xGLShaderGetArgVec4(x.GoPointer(), ArgsVar, IdxVar, OutValueVar)
315315
@@ -324,23 +324,23 @@ func (x *GLShader) GetArgsSize() uint {
324324
325325 }
326326
327-var xGLShaderGetNTextures func(uintptr) int32
327+var xGLShaderGetNTextures func(uintptr) int
328328
329329 // Returns the number of textures that the shader requires.
330330 //
331331 // This can be used to check that the a passed shader works
332332 // in your usecase. It is determined by looking at the highest
333333 // u_textureN value that the shader defines.
334-func (x *GLShader) GetNTextures() int32 {
334+func (x *GLShader) GetNTextures() int {
335335
336336 return xGLShaderGetNTextures(x.GoPointer())
337337
338338 }
339339
340-var xGLShaderGetNUniforms func(uintptr) int32
340+var xGLShaderGetNUniforms func(uintptr) int
341341
342342 // Get the number of declared uniforms for this shader.
343-func (x *GLShader) GetNUniforms() int32 {
343+func (x *GLShader) GetNUniforms() int {
344344
345345 return xGLShaderGetNUniforms(x.GoPointer())
346346
@@ -365,28 +365,28 @@ func (x *GLShader) GetSource() *glib.Bytes {
365365
366366 }
367367
368-var xGLShaderGetUniformName func(uintptr, int32) string
368+var xGLShaderGetUniformName func(uintptr, int) string
369369
370370 // Get the name of the declared uniform for this shader at index @idx.
371-func (x *GLShader) GetUniformName(IdxVar int32) string {
371+func (x *GLShader) GetUniformName(IdxVar int) string {
372372
373373 return xGLShaderGetUniformName(x.GoPointer(), IdxVar)
374374
375375 }
376376
377-var xGLShaderGetUniformOffset func(uintptr, int32) int32
377+var xGLShaderGetUniformOffset func(uintptr, int) int
378378
379379 // Get the offset into the data block where data for this uniforms is stored.
380-func (x *GLShader) GetUniformOffset(IdxVar int32) int32 {
380+func (x *GLShader) GetUniformOffset(IdxVar int) int {
381381
382382 return xGLShaderGetUniformOffset(x.GoPointer(), IdxVar)
383383
384384 }
385385
386-var xGLShaderGetUniformType func(uintptr, int32) GLUniformType
386+var xGLShaderGetUniformType func(uintptr, int) GLUniformType
387387
388388 // Get the type of the declared uniform for this shader at index @idx.
389-func (x *GLShader) GetUniformType(IdxVar int32) GLUniformType {
389+func (x *GLShader) GetUniformType(IdxVar int) GLUniformType {
390390
391391 return xGLShaderGetUniformType(x.GoPointer(), IdxVar)
392392
M v4/gtk/gtkaboutdialog.go +3 -3
@@ -577,7 +577,7 @@ func (x *AboutDialog) UpdateProperty(FirstPropertyVar AccessibleProperty, varArg
577577 // property change must be communicated to assistive technologies.
578578 //
579579 // This function is meant to be used by language bindings.
580-func (x *AboutDialog) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
580+func (x *AboutDialog) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
581581
582582 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
583583
@@ -613,7 +613,7 @@ func (x *AboutDialog) UpdateRelation(FirstRelationVar AccessibleRelation, varArg
613613 // relation change must be communicated to assistive technologies.
614614 //
615615 // This function is meant to be used by language bindings.
616-func (x *AboutDialog) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
616+func (x *AboutDialog) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
617617
618618 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
619619
@@ -646,7 +646,7 @@ func (x *AboutDialog) UpdateState(FirstStateVar AccessibleState, varArgs ...inte
646646 // state change must be communicated to assistive technologies.
647647 //
648648 // This function is meant to be used by language bindings.
649-func (x *AboutDialog) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
649+func (x *AboutDialog) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
650650
651651 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
652652
M v4/gtk/gtkaccessible.go +9 -9
@@ -34,11 +34,11 @@ type Accessible interface {
3434 ResetRelation(RelationVar AccessibleRelation)
3535 ResetState(StateVar AccessibleState)
3636 UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...interface{})
37- UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr)
37+ UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr)
3838 UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...interface{})
39- UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr)
39+ UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr)
4040 UpdateState(FirstStateVar AccessibleState, varArgs ...interface{})
41- UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr)
41+ UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr)
4242 }
4343 type AccessibleBase struct {
4444 Ptr uintptr
@@ -110,7 +110,7 @@ func (x *AccessibleBase) UpdateProperty(FirstPropertyVar AccessibleProperty, var
110110 // property change must be communicated to assistive technologies.
111111 //
112112 // This function is meant to be used by language bindings.
113-func (x *AccessibleBase) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
113+func (x *AccessibleBase) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
114114
115115 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
116116
@@ -146,7 +146,7 @@ func (x *AccessibleBase) UpdateRelation(FirstRelationVar AccessibleRelation, var
146146 // relation change must be communicated to assistive technologies.
147147 //
148148 // This function is meant to be used by language bindings.
149-func (x *AccessibleBase) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
149+func (x *AccessibleBase) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
150150
151151 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
152152
@@ -179,7 +179,7 @@ func (x *AccessibleBase) UpdateState(FirstStateVar AccessibleState, varArgs ...i
179179 // state change must be communicated to assistive technologies.
180180 //
181181 // This function is meant to be used by language bindings.
182-func (x *AccessibleBase) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
182+func (x *AccessibleBase) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
183183
184184 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
185185
@@ -190,11 +190,11 @@ var XGtkAccessibleResetProperty func(uintptr, AccessibleProperty)
190190 var XGtkAccessibleResetRelation func(uintptr, AccessibleRelation)
191191 var XGtkAccessibleResetState func(uintptr, AccessibleState)
192192 var XGtkAccessibleUpdateProperty func(uintptr, AccessibleProperty, ...interface{})
193-var XGtkAccessibleUpdatePropertyValue func(uintptr, int32, uintptr, uintptr)
193+var XGtkAccessibleUpdatePropertyValue func(uintptr, int, uintptr, uintptr)
194194 var XGtkAccessibleUpdateRelation func(uintptr, AccessibleRelation, ...interface{})
195-var XGtkAccessibleUpdateRelationValue func(uintptr, int32, uintptr, uintptr)
195+var XGtkAccessibleUpdateRelationValue func(uintptr, int, uintptr, uintptr)
196196 var XGtkAccessibleUpdateState func(uintptr, AccessibleState, ...interface{})
197-var XGtkAccessibleUpdateStateValue func(uintptr, int32, uintptr, uintptr)
197+var XGtkAccessibleUpdateStateValue func(uintptr, int, uintptr, uintptr)
198198
199199 var xAccessiblePropertyInitValue func(AccessibleProperty, *gobject.Value)
200200
M v4/gtk/gtkactionbar.go +3 -3
@@ -217,7 +217,7 @@ func (x *ActionBar) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
217217 // property change must be communicated to assistive technologies.
218218 //
219219 // This function is meant to be used by language bindings.
220-func (x *ActionBar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
220+func (x *ActionBar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
221221
222222 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
223223
@@ -253,7 +253,7 @@ func (x *ActionBar) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
253253 // relation change must be communicated to assistive technologies.
254254 //
255255 // This function is meant to be used by language bindings.
256-func (x *ActionBar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
256+func (x *ActionBar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
257257
258258 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
259259
@@ -286,7 +286,7 @@ func (x *ActionBar) UpdateState(FirstStateVar AccessibleState, varArgs ...interf
286286 // state change must be communicated to assistive technologies.
287287 //
288288 // This function is meant to be used by language bindings.
289-func (x *ActionBar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
289+func (x *ActionBar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
290290
291291 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
292292
M v4/gtk/gtkappchooserbutton.go +3 -3
@@ -289,7 +289,7 @@ func (x *AppChooserButton) UpdateProperty(FirstPropertyVar AccessibleProperty, v
289289 // property change must be communicated to assistive technologies.
290290 //
291291 // This function is meant to be used by language bindings.
292-func (x *AppChooserButton) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
292+func (x *AppChooserButton) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
293293
294294 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
295295
@@ -325,7 +325,7 @@ func (x *AppChooserButton) UpdateRelation(FirstRelationVar AccessibleRelation, v
325325 // relation change must be communicated to assistive technologies.
326326 //
327327 // This function is meant to be used by language bindings.
328-func (x *AppChooserButton) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
328+func (x *AppChooserButton) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
329329
330330 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
331331
@@ -358,7 +358,7 @@ func (x *AppChooserButton) UpdateState(FirstStateVar AccessibleState, varArgs ..
358358 // state change must be communicated to assistive technologies.
359359 //
360360 // This function is meant to be used by language bindings.
361-func (x *AppChooserButton) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
361+func (x *AppChooserButton) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
362362
363363 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
364364
M v4/gtk/gtkappchooserdialog.go +3 -3
@@ -172,7 +172,7 @@ func (x *AppChooserDialog) UpdateProperty(FirstPropertyVar AccessibleProperty, v
172172 // property change must be communicated to assistive technologies.
173173 //
174174 // This function is meant to be used by language bindings.
175-func (x *AppChooserDialog) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
175+func (x *AppChooserDialog) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
176176
177177 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
178178
@@ -208,7 +208,7 @@ func (x *AppChooserDialog) UpdateRelation(FirstRelationVar AccessibleRelation, v
208208 // relation change must be communicated to assistive technologies.
209209 //
210210 // This function is meant to be used by language bindings.
211-func (x *AppChooserDialog) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
211+func (x *AppChooserDialog) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
212212
213213 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
214214
@@ -241,7 +241,7 @@ func (x *AppChooserDialog) UpdateState(FirstStateVar AccessibleState, varArgs ..
241241 // state change must be communicated to assistive technologies.
242242 //
243243 // This function is meant to be used by language bindings.
244-func (x *AppChooserDialog) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
244+func (x *AppChooserDialog) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
245245
246246 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
247247
M v4/gtk/gtkappchooserwidget.go +3 -3
@@ -272,7 +272,7 @@ func (x *AppChooserWidget) UpdateProperty(FirstPropertyVar AccessibleProperty, v
272272 // property change must be communicated to assistive technologies.
273273 //
274274 // This function is meant to be used by language bindings.
275-func (x *AppChooserWidget) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
275+func (x *AppChooserWidget) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
276276
277277 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
278278
@@ -308,7 +308,7 @@ func (x *AppChooserWidget) UpdateRelation(FirstRelationVar AccessibleRelation, v
308308 // relation change must be communicated to assistive technologies.
309309 //
310310 // This function is meant to be used by language bindings.
311-func (x *AppChooserWidget) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
311+func (x *AppChooserWidget) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
312312
313313 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
314314
@@ -341,7 +341,7 @@ func (x *AppChooserWidget) UpdateState(FirstStateVar AccessibleState, varArgs ..
341341 // state change must be communicated to assistive technologies.
342342 //
343343 // This function is meant to be used by language bindings.
344-func (x *AppChooserWidget) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
344+func (x *AppChooserWidget) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
345345
346346 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
347347
M v4/gtk/gtkapplication.go +1 -1
@@ -753,7 +753,7 @@ func (x *Application) AddAction(ActionVar gio.Action) {
753753 // }
754754 //
755755 // ]|
756-func (x *Application) AddActionEntries(EntriesVar uintptr, NEntriesVar int32, UserDataVar uintptr) {
756+func (x *Application) AddActionEntries(EntriesVar uintptr, NEntriesVar int, UserDataVar uintptr) {
757757
758758 gio.XGActionMapAddActionEntries(x.GoPointer(), EntriesVar, NEntriesVar, UserDataVar)
759759
M v4/gtk/gtkapplicationwindow.go +4 -4
@@ -474,7 +474,7 @@ func (x *ApplicationWindow) AddAction(ActionVar gio.Action) {
474474 // }
475475 //
476476 // ]|
477-func (x *ApplicationWindow) AddActionEntries(EntriesVar uintptr, NEntriesVar int32, UserDataVar uintptr) {
477+func (x *ApplicationWindow) AddActionEntries(EntriesVar uintptr, NEntriesVar int, UserDataVar uintptr) {
478478
479479 gio.XGActionMapAddActionEntries(x.GoPointer(), EntriesVar, NEntriesVar, UserDataVar)
480480
@@ -565,7 +565,7 @@ func (x *ApplicationWindow) UpdateProperty(FirstPropertyVar AccessibleProperty,
565565 // property change must be communicated to assistive technologies.
566566 //
567567 // This function is meant to be used by language bindings.
568-func (x *ApplicationWindow) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
568+func (x *ApplicationWindow) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
569569
570570 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
571571
@@ -601,7 +601,7 @@ func (x *ApplicationWindow) UpdateRelation(FirstRelationVar AccessibleRelation,
601601 // relation change must be communicated to assistive technologies.
602602 //
603603 // This function is meant to be used by language bindings.
604-func (x *ApplicationWindow) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
604+func (x *ApplicationWindow) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
605605
606606 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
607607
@@ -634,7 +634,7 @@ func (x *ApplicationWindow) UpdateState(FirstStateVar AccessibleState, varArgs .
634634 // state change must be communicated to assistive technologies.
635635 //
636636 // This function is meant to be used by language bindings.
637-func (x *ApplicationWindow) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
637+func (x *ApplicationWindow) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
638638
639639 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
640640
M v4/gtk/gtkaspectframe.go +3 -3
@@ -213,7 +213,7 @@ func (x *AspectFrame) UpdateProperty(FirstPropertyVar AccessibleProperty, varArg
213213 // property change must be communicated to assistive technologies.
214214 //
215215 // This function is meant to be used by language bindings.
216-func (x *AspectFrame) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
216+func (x *AspectFrame) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
217217
218218 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
219219
@@ -249,7 +249,7 @@ func (x *AspectFrame) UpdateRelation(FirstRelationVar AccessibleRelation, varArg
249249 // relation change must be communicated to assistive technologies.
250250 //
251251 // This function is meant to be used by language bindings.
252-func (x *AspectFrame) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
252+func (x *AspectFrame) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
253253
254254 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
255255
@@ -282,7 +282,7 @@ func (x *AspectFrame) UpdateState(FirstStateVar AccessibleState, varArgs ...inte
282282 // state change must be communicated to assistive technologies.
283283 //
284284 // This function is meant to be used by language bindings.
285-func (x *AspectFrame) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
285+func (x *AspectFrame) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
286286
287287 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
288288
M v4/gtk/gtkassistant.go +20 -20
@@ -17,7 +17,7 @@ import (
1717 // “forward” button and for handling the behavior of the “last” button.
1818 //
1919 // See [method@Gtk.Assistant.set_forward_page_func].
20-type AssistantPageFunc func(int32, uintptr) int32
20+type AssistantPageFunc func(int, uintptr) int
2121
2222 // Determines the page role inside a `GtkAssistant`.
2323 //
@@ -127,10 +127,10 @@ func (x *Assistant) AddActionWidget(ChildVar *Widget) {
127127
128128 }
129129
130-var xAssistantAppendPage func(uintptr, uintptr) int32
130+var xAssistantAppendPage func(uintptr, uintptr) int
131131
132132 // Appends a page to the @assistant.
133-func (x *Assistant) AppendPage(PageVar *Widget) int32 {
133+func (x *Assistant) AppendPage(PageVar *Widget) int {
134134
135135 return xAssistantAppendPage(x.GoPointer(), PageVar.GoPointer())
136136
@@ -154,28 +154,28 @@ func (x *Assistant) Commit() {
154154
155155 }
156156
157-var xAssistantGetCurrentPage func(uintptr) int32
157+var xAssistantGetCurrentPage func(uintptr) int
158158
159159 // Returns the page number of the current page.
160-func (x *Assistant) GetCurrentPage() int32 {
160+func (x *Assistant) GetCurrentPage() int {
161161
162162 return xAssistantGetCurrentPage(x.GoPointer())
163163
164164 }
165165
166-var xAssistantGetNPages func(uintptr) int32
166+var xAssistantGetNPages func(uintptr) int
167167
168168 // Returns the number of pages in the @assistant
169-func (x *Assistant) GetNPages() int32 {
169+func (x *Assistant) GetNPages() int {
170170
171171 return xAssistantGetNPages(x.GoPointer())
172172
173173 }
174174
175-var xAssistantGetNthPage func(uintptr, int32) uintptr
175+var xAssistantGetNthPage func(uintptr, int) uintptr
176176
177177 // Returns the child widget contained in page number @page_num.
178-func (x *Assistant) GetNthPage(PageNumVar int32) *Widget {
178+func (x *Assistant) GetNthPage(PageNumVar int) *Widget {
179179
180180 GetNthPagePtr := xAssistantGetNthPage(x.GoPointer(), PageNumVar)
181181 if GetNthPagePtr == 0 {
@@ -251,10 +251,10 @@ func (x *Assistant) GetPages() *gio.ListModelBase {
251251
252252 }
253253
254-var xAssistantInsertPage func(uintptr, uintptr, int32) int32
254+var xAssistantInsertPage func(uintptr, uintptr, int) int
255255
256256 // Inserts a page in the @assistant at a given position.
257-func (x *Assistant) InsertPage(PageVar *Widget, PositionVar int32) int32 {
257+func (x *Assistant) InsertPage(PageVar *Widget, PositionVar int) int {
258258
259259 return xAssistantInsertPage(x.GoPointer(), PageVar.GoPointer(), PositionVar)
260260
@@ -275,10 +275,10 @@ func (x *Assistant) NextPage() {
275275
276276 }
277277
278-var xAssistantPrependPage func(uintptr, uintptr) int32
278+var xAssistantPrependPage func(uintptr, uintptr) int
279279
280280 // Prepends a page to the @assistant.
281-func (x *Assistant) PrependPage(PageVar *Widget) int32 {
281+func (x *Assistant) PrependPage(PageVar *Widget) int {
282282
283283 return xAssistantPrependPage(x.GoPointer(), PageVar.GoPointer())
284284
@@ -308,23 +308,23 @@ func (x *Assistant) RemoveActionWidget(ChildVar *Widget) {
308308
309309 }
310310
311-var xAssistantRemovePage func(uintptr, int32)
311+var xAssistantRemovePage func(uintptr, int)
312312
313313 // Removes the @page_num’s page from @assistant.
314-func (x *Assistant) RemovePage(PageNumVar int32) {
314+func (x *Assistant) RemovePage(PageNumVar int) {
315315
316316 xAssistantRemovePage(x.GoPointer(), PageNumVar)
317317
318318 }
319319
320-var xAssistantSetCurrentPage func(uintptr, int32)
320+var xAssistantSetCurrentPage func(uintptr, int)
321321
322322 // Switches the page to @page_num.
323323 //
324324 // Note that this will only be necessary in custom buttons,
325325 // as the @assistant flow can be set with
326326 // gtk_assistant_set_forward_page_func().
327-func (x *Assistant) SetCurrentPage(PageNumVar int32) {
327+func (x *Assistant) SetCurrentPage(PageNumVar int) {
328328
329329 xAssistantSetCurrentPage(x.GoPointer(), PageNumVar)
330330
@@ -539,7 +539,7 @@ func (x *Assistant) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
539539 // property change must be communicated to assistive technologies.
540540 //
541541 // This function is meant to be used by language bindings.
542-func (x *Assistant) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
542+func (x *Assistant) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
543543
544544 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
545545
@@ -575,7 +575,7 @@ func (x *Assistant) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
575575 // relation change must be communicated to assistive technologies.
576576 //
577577 // This function is meant to be used by language bindings.
578-func (x *Assistant) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
578+func (x *Assistant) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
579579
580580 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
581581
@@ -608,7 +608,7 @@ func (x *Assistant) UpdateState(FirstStateVar AccessibleState, varArgs ...interf
608608 // state change must be communicated to assistive technologies.
609609 //
610610 // This function is meant to be used by language bindings.
611-func (x *Assistant) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
611+func (x *Assistant) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
612612
613613 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
614614
M v4/gtk/gtkbookmarklist.go +4 -4
@@ -63,10 +63,10 @@ func (x *BookmarkList) GetFilename() string {
6363
6464 }
6565
66-var xBookmarkListGetIoPriority func(uintptr) int32
66+var xBookmarkListGetIoPriority func(uintptr) int
6767
6868 // Gets the IO priority to use while loading file.
69-func (x *BookmarkList) GetIoPriority() int32 {
69+func (x *BookmarkList) GetIoPriority() int {
7070
7171 return xBookmarkListGetIoPriority(x.GoPointer())
7272
@@ -97,12 +97,12 @@ func (x *BookmarkList) SetAttributes(AttributesVar string) {
9797
9898 }
9999
100-var xBookmarkListSetIoPriority func(uintptr, int32)
100+var xBookmarkListSetIoPriority func(uintptr, int)
101101
102102 // Sets the IO priority to use while loading files.
103103 //
104104 // The default IO priority is %G_PRIORITY_DEFAULT.
105-func (x *BookmarkList) SetIoPriority(IoPriorityVar int32) {
105+func (x *BookmarkList) SetIoPriority(IoPriorityVar int) {
106106
107107 xBookmarkListSetIoPriority(x.GoPointer(), IoPriorityVar)
108108
M v4/gtk/gtkbox.go +9 -9
@@ -55,10 +55,10 @@ func BoxNewFromInternalPtr(ptr uintptr) *Box {
5555 return cls
5656 }
5757
58-var xNewBox func(Orientation, int32) uintptr
58+var xNewBox func(Orientation, int) uintptr
5959
6060 // Creates a new `GtkBox`.
61-func NewBox(OrientationVar Orientation, SpacingVar int32) *Widget {
61+func NewBox(OrientationVar Orientation, SpacingVar int) *Widget {
6262 NewBoxPtr := xNewBox(OrientationVar, SpacingVar)
6363 if NewBoxPtr == 0 {
6464 return nil
@@ -99,10 +99,10 @@ func (x *Box) GetHomogeneous() bool {
9999
100100 }
101101
102-var xBoxGetSpacing func(uintptr) int32
102+var xBoxGetSpacing func(uintptr) int
103103
104104 // Gets the value set by gtk_box_set_spacing().
105-func (x *Box) GetSpacing() int32 {
105+func (x *Box) GetSpacing() int {
106106
107107 return xBoxGetSpacing(x.GoPointer())
108108
@@ -179,10 +179,10 @@ func (x *Box) SetHomogeneous(HomogeneousVar bool) {
179179
180180 }
181181
182-var xBoxSetSpacing func(uintptr, int32)
182+var xBoxSetSpacing func(uintptr, int)
183183
184184 // Sets the number of pixels to place between children of @box.
185-func (x *Box) SetSpacing(SpacingVar int32) {
185+func (x *Box) SetSpacing(SpacingVar int) {
186186
187187 xBoxSetSpacing(x.GoPointer(), SpacingVar)
188188
@@ -254,7 +254,7 @@ func (x *Box) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...int
254254 // property change must be communicated to assistive technologies.
255255 //
256256 // This function is meant to be used by language bindings.
257-func (x *Box) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
257+func (x *Box) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
258258
259259 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
260260
@@ -290,7 +290,7 @@ func (x *Box) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...int
290290 // relation change must be communicated to assistive technologies.
291291 //
292292 // This function is meant to be used by language bindings.
293-func (x *Box) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
293+func (x *Box) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
294294
295295 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
296296
@@ -323,7 +323,7 @@ func (x *Box) UpdateState(FirstStateVar AccessibleState, varArgs ...interface{})
323323 // state change must be communicated to assistive technologies.
324324 //
325325 // This function is meant to be used by language bindings.
326-func (x *Box) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
326+func (x *Box) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
327327
328328 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
329329
M v4/gtk/gtkbutton.go +3 -3
@@ -350,7 +350,7 @@ func (x *Button) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...
350350 // property change must be communicated to assistive technologies.
351351 //
352352 // This function is meant to be used by language bindings.
353-func (x *Button) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
353+func (x *Button) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
354354
355355 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
356356
@@ -386,7 +386,7 @@ func (x *Button) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...
386386 // relation change must be communicated to assistive technologies.
387387 //
388388 // This function is meant to be used by language bindings.
389-func (x *Button) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
389+func (x *Button) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
390390
391391 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
392392
@@ -419,7 +419,7 @@ func (x *Button) UpdateState(FirstStateVar AccessibleState, varArgs ...interface
419419 // state change must be communicated to assistive technologies.
420420 //
421421 // This function is meant to be used by language bindings.
422-func (x *Button) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
422+func (x *Button) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
423423
424424 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
425425
M v4/gtk/gtkcalendar.go +3 -3
@@ -336,7 +336,7 @@ func (x *Calendar) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs .
336336 // property change must be communicated to assistive technologies.
337337 //
338338 // This function is meant to be used by language bindings.
339-func (x *Calendar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
339+func (x *Calendar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
340340
341341 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
342342
@@ -372,7 +372,7 @@ func (x *Calendar) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs .
372372 // relation change must be communicated to assistive technologies.
373373 //
374374 // This function is meant to be used by language bindings.
375-func (x *Calendar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
375+func (x *Calendar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
376376
377377 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
378378
@@ -405,7 +405,7 @@ func (x *Calendar) UpdateState(FirstStateVar AccessibleState, varArgs ...interfa
405405 // state change must be communicated to assistive technologies.
406406 //
407407 // This function is meant to be used by language bindings.
408-func (x *Calendar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
408+func (x *Calendar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
409409
410410 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
411411
M v4/gtk/gtkcellarea.go +20 -20
@@ -424,11 +424,11 @@ func (x *CellArea) ApplyAttributes(TreeModelVar TreeModel, IterVar *TreeIter, Is
424424
425425 }
426426
427-var xCellAreaAttributeConnect func(uintptr, uintptr, string, int32)
427+var xCellAreaAttributeConnect func(uintptr, uintptr, string, int)
428428
429429 // Connects an @attribute to apply values from @column for the
430430 // `GtkTreeModel` in use.
431-func (x *CellArea) AttributeConnect(RendererVar *CellRenderer, AttributeVar string, ColumnVar int32) {
431+func (x *CellArea) AttributeConnect(RendererVar *CellRenderer, AttributeVar string, ColumnVar int) {
432432
433433 xCellAreaAttributeConnect(x.GoPointer(), RendererVar.GoPointer(), AttributeVar, ColumnVar)
434434
@@ -445,11 +445,11 @@ func (x *CellArea) AttributeDisconnect(RendererVar *CellRenderer, AttributeVar s
445445
446446 }
447447
448-var xCellAreaAttributeGetColumn func(uintptr, uintptr, string) int32
448+var xCellAreaAttributeGetColumn func(uintptr, uintptr, string) int
449449
450450 // Returns the model column that an attribute has been mapped to,
451451 // or -1 if the attribute is not mapped.
452-func (x *CellArea) AttributeGetColumn(RendererVar *CellRenderer, AttributeVar string) int32 {
452+func (x *CellArea) AttributeGetColumn(RendererVar *CellRenderer, AttributeVar string) int {
453453
454454 return xCellAreaAttributeGetColumn(x.GoPointer(), RendererVar.GoPointer(), AttributeVar)
455455
@@ -556,10 +556,10 @@ func (x *CellArea) CreateContext() *CellAreaContext {
556556
557557 }
558558
559-var xCellAreaEvent func(uintptr, uintptr, uintptr, uintptr, *gdk.Rectangle, CellRendererState) int32
559+var xCellAreaEvent func(uintptr, uintptr, uintptr, uintptr, *gdk.Rectangle, CellRendererState) int
560560
561561 // Delegates event handling to a `GtkCellArea`.
562-func (x *CellArea) Event(ContextVar *CellAreaContext, WidgetVar *Widget, EventVar *gdk.Event, CellAreaVar *gdk.Rectangle, FlagsVar CellRendererState) int32 {
562+func (x *CellArea) Event(ContextVar *CellAreaContext, WidgetVar *Widget, EventVar *gdk.Event, CellAreaVar *gdk.Rectangle, FlagsVar CellRendererState) int {
563563
564564 return xCellAreaEvent(x.GoPointer(), ContextVar.GoPointer(), WidgetVar.GoPointer(), EventVar.GoPointer(), CellAreaVar, FlagsVar)
565565
@@ -609,11 +609,11 @@ func (x *CellArea) GetCellAllocation(ContextVar *CellAreaContext, WidgetVar *Wid
609609
610610 }
611611
612-var xCellAreaGetCellAtPosition func(uintptr, uintptr, uintptr, *gdk.Rectangle, int32, int32, *gdk.Rectangle) uintptr
612+var xCellAreaGetCellAtPosition func(uintptr, uintptr, uintptr, *gdk.Rectangle, int, int, *gdk.Rectangle) uintptr
613613
614614 // Gets the `GtkCellRenderer` at @x and @y coordinates inside @area and optionally
615615 // returns the full cell allocation for it inside @cell_area.
616-func (x *CellArea) GetCellAtPosition(ContextVar *CellAreaContext, WidgetVar *Widget, CellAreaVar *gdk.Rectangle, XVar int32, YVar int32, AllocAreaVar *gdk.Rectangle) *CellRenderer {
616+func (x *CellArea) GetCellAtPosition(ContextVar *CellAreaContext, WidgetVar *Widget, CellAreaVar *gdk.Rectangle, XVar int, YVar int, AllocAreaVar *gdk.Rectangle) *CellRenderer {
617617
618618 GetCellAtPositionPtr := xCellAreaGetCellAtPosition(x.GoPointer(), ContextVar.GoPointer(), WidgetVar.GoPointer(), CellAreaVar, XVar, YVar, AllocAreaVar)
619619 if GetCellAtPositionPtr == 0 {
@@ -730,7 +730,7 @@ func (x *CellArea) GetFocusSiblings(RendererVar *CellRenderer) *glib.List {
730730
731731 }
732732
733-var xCellAreaGetPreferredHeight func(uintptr, uintptr, uintptr, int32, int32)
733+var xCellAreaGetPreferredHeight func(uintptr, uintptr, uintptr, int, int)
734734
735735 // Retrieves a cell area’s initial minimum and natural height.
736736 //
@@ -739,13 +739,13 @@ var xCellAreaGetPreferredHeight func(uintptr, uintptr, uintptr, int32, int32)
739739 // to check the @minimum_height and @natural_height of this call but rather to
740740 // consult gtk_cell_area_context_get_preferred_height() after a series of
741741 // requests.
742-func (x *CellArea) GetPreferredHeight(ContextVar *CellAreaContext, WidgetVar *Widget, MinimumHeightVar int32, NaturalHeightVar int32) {
742+func (x *CellArea) GetPreferredHeight(ContextVar *CellAreaContext, WidgetVar *Widget, MinimumHeightVar int, NaturalHeightVar int) {
743743
744744 xCellAreaGetPreferredHeight(x.GoPointer(), ContextVar.GoPointer(), WidgetVar.GoPointer(), MinimumHeightVar, NaturalHeightVar)
745745
746746 }
747747
748-var xCellAreaGetPreferredHeightForWidth func(uintptr, uintptr, uintptr, int32, int32, int32)
748+var xCellAreaGetPreferredHeightForWidth func(uintptr, uintptr, uintptr, int, int, int)
749749
750750 // Retrieves a cell area’s minimum and natural height if it would be given
751751 // the specified @width.
@@ -761,13 +761,13 @@ var xCellAreaGetPreferredHeightForWidth func(uintptr, uintptr, uintptr, int32, i
761761 // requested with gtk_cell_area_get_preferred_width() again and then
762762 // the full width of the requested rows checked again with
763763 // gtk_cell_area_context_get_preferred_width().
764-func (x *CellArea) GetPreferredHeightForWidth(ContextVar *CellAreaContext, WidgetVar *Widget, WidthVar int32, MinimumHeightVar int32, NaturalHeightVar int32) {
764+func (x *CellArea) GetPreferredHeightForWidth(ContextVar *CellAreaContext, WidgetVar *Widget, WidthVar int, MinimumHeightVar int, NaturalHeightVar int) {
765765
766766 xCellAreaGetPreferredHeightForWidth(x.GoPointer(), ContextVar.GoPointer(), WidgetVar.GoPointer(), WidthVar, MinimumHeightVar, NaturalHeightVar)
767767
768768 }
769769
770-var xCellAreaGetPreferredWidth func(uintptr, uintptr, uintptr, int32, int32)
770+var xCellAreaGetPreferredWidth func(uintptr, uintptr, uintptr, int, int)
771771
772772 // Retrieves a cell area’s initial minimum and natural width.
773773 //
@@ -776,13 +776,13 @@ var xCellAreaGetPreferredWidth func(uintptr, uintptr, uintptr, int32, int32)
776776 // to check the @minimum_width and @natural_width of this call but rather to
777777 // consult gtk_cell_area_context_get_preferred_width() after a series of
778778 // requests.
779-func (x *CellArea) GetPreferredWidth(ContextVar *CellAreaContext, WidgetVar *Widget, MinimumWidthVar int32, NaturalWidthVar int32) {
779+func (x *CellArea) GetPreferredWidth(ContextVar *CellAreaContext, WidgetVar *Widget, MinimumWidthVar int, NaturalWidthVar int) {
780780
781781 xCellAreaGetPreferredWidth(x.GoPointer(), ContextVar.GoPointer(), WidgetVar.GoPointer(), MinimumWidthVar, NaturalWidthVar)
782782
783783 }
784784
785-var xCellAreaGetPreferredWidthForHeight func(uintptr, uintptr, uintptr, int32, int32, int32)
785+var xCellAreaGetPreferredWidthForHeight func(uintptr, uintptr, uintptr, int, int, int)
786786
787787 // Retrieves a cell area’s minimum and natural width if it would be given
788788 // the specified @height.
@@ -798,7 +798,7 @@ var xCellAreaGetPreferredWidthForHeight func(uintptr, uintptr, uintptr, int32, i
798798 // requested with gtk_cell_area_get_preferred_height() again and then
799799 // the full height of the requested rows checked again with
800800 // gtk_cell_area_context_get_preferred_height().
801-func (x *CellArea) GetPreferredWidthForHeight(ContextVar *CellAreaContext, WidgetVar *Widget, HeightVar int32, MinimumWidthVar int32, NaturalWidthVar int32) {
801+func (x *CellArea) GetPreferredWidthForHeight(ContextVar *CellAreaContext, WidgetVar *Widget, HeightVar int, MinimumWidthVar int, NaturalWidthVar int) {
802802
803803 xCellAreaGetPreferredWidthForHeight(x.GoPointer(), ContextVar.GoPointer(), WidgetVar.GoPointer(), HeightVar, MinimumWidthVar, NaturalWidthVar)
804804
@@ -873,14 +873,14 @@ func (x *CellArea) RemoveFocusSibling(RendererVar *CellRenderer, SiblingVar *Cel
873873
874874 }
875875
876-var xCellAreaRequestRenderer func(uintptr, uintptr, Orientation, uintptr, int32, int32, int32)
876+var xCellAreaRequestRenderer func(uintptr, uintptr, Orientation, uintptr, int, int, int)
877877
878878 // This is a convenience function for `GtkCellArea` implementations
879879 // to request size for cell renderers. It’s important to use this
880880 // function to request size and then use gtk_cell_area_inner_cell_area()
881881 // at render and event time since this function will add padding
882882 // around the cell for focus painting.
883-func (x *CellArea) RequestRenderer(RendererVar *CellRenderer, OrientationVar Orientation, WidgetVar *Widget, ForSizeVar int32, MinimumSizeVar int32, NaturalSizeVar int32) {
883+func (x *CellArea) RequestRenderer(RendererVar *CellRenderer, OrientationVar Orientation, WidgetVar *Widget, ForSizeVar int, MinimumSizeVar int, NaturalSizeVar int) {
884884
885885 xCellAreaRequestRenderer(x.GoPointer(), RendererVar.GoPointer(), OrientationVar, WidgetVar.GoPointer(), ForSizeVar, MinimumSizeVar, NaturalSizeVar)
886886
@@ -1008,7 +1008,7 @@ func (x *CellArea) GetBuildableId() string {
10081008 // example if column 2 of the model contains strings, you could have the
10091009 // “text” attribute of a `GtkCellRendererText` get its values from column 2.
10101010 // In this context "attribute" and "property" are used interchangeably.
1011-func (x *CellArea) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int32) {
1011+func (x *CellArea) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int) {
10121012
10131013 XGtkCellLayoutAddAttribute(x.GoPointer(), CellVar.GoPointer(), AttributeVar, ColumnVar)
10141014
@@ -1081,7 +1081,7 @@ func (x *CellArea) PackStart(CellVar *CellRenderer, ExpandVar bool) {
10811081 //
10821082 // Note that @cell has already to be packed into @cell_layout
10831083 // for this to function properly.
1084-func (x *CellArea) Reorder(CellVar *CellRenderer, PositionVar int32) {
1084+func (x *CellArea) Reorder(CellVar *CellRenderer, PositionVar int) {
10851085
10861086 XGtkCellLayoutReorder(x.GoPointer(), CellVar.GoPointer(), PositionVar)
10871087
M v4/gtk/gtkcellareabox.go +6 -6
@@ -53,10 +53,10 @@ func NewCellAreaBox() *CellArea {
5353 return NewCellAreaBoxCls
5454 }
5555
56-var xCellAreaBoxGetSpacing func(uintptr) int32
56+var xCellAreaBoxGetSpacing func(uintptr) int
5757
5858 // Gets the spacing added between cell renderers.
59-func (x *CellAreaBox) GetSpacing() int32 {
59+func (x *CellAreaBox) GetSpacing() int {
6060
6161 return xCellAreaBoxGetSpacing(x.GoPointer())
6262
@@ -86,10 +86,10 @@ func (x *CellAreaBox) PackStart(RendererVar *CellRenderer, ExpandVar bool, Align
8686
8787 }
8888
89-var xCellAreaBoxSetSpacing func(uintptr, int32)
89+var xCellAreaBoxSetSpacing func(uintptr, int)
9090
9191 // Sets the spacing to add between cell renderers in @box.
92-func (x *CellAreaBox) SetSpacing(SpacingVar int32) {
92+func (x *CellAreaBox) SetSpacing(SpacingVar int) {
9393
9494 xCellAreaBoxSetSpacing(x.GoPointer(), SpacingVar)
9595
@@ -120,7 +120,7 @@ func (x *CellAreaBox) GetBuildableId() string {
120120 // example if column 2 of the model contains strings, you could have the
121121 // “text” attribute of a `GtkCellRendererText` get its values from column 2.
122122 // In this context "attribute" and "property" are used interchangeably.
123-func (x *CellAreaBox) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int32) {
123+func (x *CellAreaBox) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int) {
124124
125125 XGtkCellLayoutAddAttribute(x.GoPointer(), CellVar.GoPointer(), AttributeVar, ColumnVar)
126126
@@ -171,7 +171,7 @@ func (x *CellAreaBox) GetCells() *glib.List {
171171 //
172172 // Note that @cell has already to be packed into @cell_layout
173173 // for this to function properly.
174-func (x *CellAreaBox) Reorder(CellVar *CellRenderer, PositionVar int32) {
174+func (x *CellAreaBox) Reorder(CellVar *CellRenderer, PositionVar int) {
175175
176176 XGtkCellLayoutReorder(x.GoPointer(), CellVar.GoPointer(), PositionVar)
177177
M v4/gtk/gtkcellareacontext.go +16 -16
@@ -38,7 +38,7 @@ func CellAreaContextNewFromInternalPtr(ptr uintptr) *CellAreaContext {
3838 return cls
3939 }
4040
41-var xCellAreaContextAllocate func(uintptr, int32, int32)
41+var xCellAreaContextAllocate func(uintptr, int, int)
4242
4343 // Allocates a width and/or a height for all rows which are to be
4444 // rendered with @context.
@@ -50,20 +50,20 @@ var xCellAreaContextAllocate func(uintptr, int32, int32)
5050 // and vertical orientations producing a homogeneous effect of the
5151 // rows. This is generally the case for `GtkTreeView` when
5252 // `GtkTreeView:fixed-height-mode` is enabled.
53-func (x *CellAreaContext) Allocate(WidthVar int32, HeightVar int32) {
53+func (x *CellAreaContext) Allocate(WidthVar int, HeightVar int) {
5454
5555 xCellAreaContextAllocate(x.GoPointer(), WidthVar, HeightVar)
5656
5757 }
5858
59-var xCellAreaContextGetAllocation func(uintptr, int32, int32)
59+var xCellAreaContextGetAllocation func(uintptr, int, int)
6060
6161 // Fetches the current allocation size for @context.
6262 //
6363 // If the context was not allocated in width or height, or if the
6464 // context was recently reset with gtk_cell_area_context_reset(),
6565 // the returned value will be -1.
66-func (x *CellAreaContext) GetAllocation(WidthVar int32, HeightVar int32) {
66+func (x *CellAreaContext) GetAllocation(WidthVar int, HeightVar int) {
6767
6868 xCellAreaContextGetAllocation(x.GoPointer(), WidthVar, HeightVar)
6969
@@ -96,59 +96,59 @@ func (x *CellAreaContext) GetArea() *CellArea {
9696
9797 }
9898
99-var xCellAreaContextGetPreferredHeight func(uintptr, int32, int32)
99+var xCellAreaContextGetPreferredHeight func(uintptr, int, int)
100100
101101 // Gets the accumulative preferred height for all rows which have been
102102 // requested with this context.
103103 //
104104 // After gtk_cell_area_context_reset() is called and/or before ever
105105 // requesting the size of a `GtkCellArea`, the returned values are 0.
106-func (x *CellAreaContext) GetPreferredHeight(MinimumHeightVar int32, NaturalHeightVar int32) {
106+func (x *CellAreaContext) GetPreferredHeight(MinimumHeightVar int, NaturalHeightVar int) {
107107
108108 xCellAreaContextGetPreferredHeight(x.GoPointer(), MinimumHeightVar, NaturalHeightVar)
109109
110110 }
111111
112-var xCellAreaContextGetPreferredHeightForWidth func(uintptr, int32, int32, int32)
112+var xCellAreaContextGetPreferredHeightForWidth func(uintptr, int, int, int)
113113
114114 // Gets the accumulative preferred height for @width for all rows
115115 // which have been requested for the same said @width with this context.
116116 //
117117 // After gtk_cell_area_context_reset() is called and/or before ever
118118 // requesting the size of a `GtkCellArea`, the returned values are -1.
119-func (x *CellAreaContext) GetPreferredHeightForWidth(WidthVar int32, MinimumHeightVar int32, NaturalHeightVar int32) {
119+func (x *CellAreaContext) GetPreferredHeightForWidth(WidthVar int, MinimumHeightVar int, NaturalHeightVar int) {
120120
121121 xCellAreaContextGetPreferredHeightForWidth(x.GoPointer(), WidthVar, MinimumHeightVar, NaturalHeightVar)
122122
123123 }
124124
125-var xCellAreaContextGetPreferredWidth func(uintptr, int32, int32)
125+var xCellAreaContextGetPreferredWidth func(uintptr, int, int)
126126
127127 // Gets the accumulative preferred width for all rows which have been
128128 // requested with this context.
129129 //
130130 // After gtk_cell_area_context_reset() is called and/or before ever
131131 // requesting the size of a `GtkCellArea`, the returned values are 0.
132-func (x *CellAreaContext) GetPreferredWidth(MinimumWidthVar int32, NaturalWidthVar int32) {
132+func (x *CellAreaContext) GetPreferredWidth(MinimumWidthVar int, NaturalWidthVar int) {
133133
134134 xCellAreaContextGetPreferredWidth(x.GoPointer(), MinimumWidthVar, NaturalWidthVar)
135135
136136 }
137137
138-var xCellAreaContextGetPreferredWidthForHeight func(uintptr, int32, int32, int32)
138+var xCellAreaContextGetPreferredWidthForHeight func(uintptr, int, int, int)
139139
140140 // Gets the accumulative preferred width for @height for all rows which
141141 // have been requested for the same said @height with this context.
142142 //
143143 // After gtk_cell_area_context_reset() is called and/or before ever
144144 // requesting the size of a `GtkCellArea`, the returned values are -1.
145-func (x *CellAreaContext) GetPreferredWidthForHeight(HeightVar int32, MinimumWidthVar int32, NaturalWidthVar int32) {
145+func (x *CellAreaContext) GetPreferredWidthForHeight(HeightVar int, MinimumWidthVar int, NaturalWidthVar int) {
146146
147147 xCellAreaContextGetPreferredWidthForHeight(x.GoPointer(), HeightVar, MinimumWidthVar, NaturalWidthVar)
148148
149149 }
150150
151-var xCellAreaContextPushPreferredHeight func(uintptr, int32, int32)
151+var xCellAreaContextPushPreferredHeight func(uintptr, int, int)
152152
153153 // Causes the minimum and/or natural height to grow if the new
154154 // proposed sizes exceed the current minimum and natural height.
@@ -157,13 +157,13 @@ var xCellAreaContextPushPreferredHeight func(uintptr, int32, int32)
157157 // the request process over a series of `GtkTreeModel` rows to
158158 // progressively push the requested height over a series of
159159 // gtk_cell_area_get_preferred_height() requests.
160-func (x *CellAreaContext) PushPreferredHeight(MinimumHeightVar int32, NaturalHeightVar int32) {
160+func (x *CellAreaContext) PushPreferredHeight(MinimumHeightVar int, NaturalHeightVar int) {
161161
162162 xCellAreaContextPushPreferredHeight(x.GoPointer(), MinimumHeightVar, NaturalHeightVar)
163163
164164 }
165165
166-var xCellAreaContextPushPreferredWidth func(uintptr, int32, int32)
166+var xCellAreaContextPushPreferredWidth func(uintptr, int, int)
167167
168168 // Causes the minimum and/or natural width to grow if the new
169169 // proposed sizes exceed the current minimum and natural width.
@@ -172,7 +172,7 @@ var xCellAreaContextPushPreferredWidth func(uintptr, int32, int32)
172172 // the request process over a series of `GtkTreeModel` rows to
173173 // progressively push the requested width over a series of
174174 // gtk_cell_area_get_preferred_width() requests.
175-func (x *CellAreaContext) PushPreferredWidth(MinimumWidthVar int32, NaturalWidthVar int32) {
175+func (x *CellAreaContext) PushPreferredWidth(MinimumWidthVar int, NaturalWidthVar int) {
176176
177177 xCellAreaContextPushPreferredWidth(x.GoPointer(), MinimumWidthVar, NaturalWidthVar)
178178
M v4/gtk/gtkcelllayout.go +6 -6
@@ -136,14 +136,14 @@ type CellLayoutIface struct {
136136 type CellLayout interface {
137137 GoPointer() uintptr
138138 SetGoPointer(uintptr)
139- AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int32)
139+ AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int)
140140 Clear()
141141 ClearAttributes(CellVar *CellRenderer)
142142 GetArea() *CellArea
143143 GetCells() *glib.List
144144 PackEnd(CellVar *CellRenderer, ExpandVar bool)
145145 PackStart(CellVar *CellRenderer, ExpandVar bool)
146- Reorder(CellVar *CellRenderer, PositionVar int32)
146+ Reorder(CellVar *CellRenderer, PositionVar int)
147147 SetAttributes(CellVar *CellRenderer, varArgs ...interface{})
148148 SetCellDataFunc(CellVar *CellRenderer, FuncVar CellLayoutDataFunc, FuncDataVar uintptr, DestroyVar glib.DestroyNotify)
149149 }
@@ -166,7 +166,7 @@ func (x *CellLayoutBase) SetGoPointer(ptr uintptr) {
166166 // example if column 2 of the model contains strings, you could have the
167167 // “text” attribute of a `GtkCellRendererText` get its values from column 2.
168168 // In this context "attribute" and "property" are used interchangeably.
169-func (x *CellLayoutBase) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int32) {
169+func (x *CellLayoutBase) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int) {
170170
171171 XGtkCellLayoutAddAttribute(x.GoPointer(), CellVar.GoPointer(), AttributeVar, ColumnVar)
172172
@@ -239,7 +239,7 @@ func (x *CellLayoutBase) PackStart(CellVar *CellRenderer, ExpandVar bool) {
239239 //
240240 // Note that @cell has already to be packed into @cell_layout
241241 // for this to function properly.
242-func (x *CellLayoutBase) Reorder(CellVar *CellRenderer, PositionVar int32) {
242+func (x *CellLayoutBase) Reorder(CellVar *CellRenderer, PositionVar int) {
243243
244244 XGtkCellLayoutReorder(x.GoPointer(), CellVar.GoPointer(), PositionVar)
245245
@@ -272,14 +272,14 @@ func (x *CellLayoutBase) SetCellDataFunc(CellVar *CellRenderer, FuncVar CellLayo
272272
273273 }
274274
275-var XGtkCellLayoutAddAttribute func(uintptr, uintptr, string, int32)
275+var XGtkCellLayoutAddAttribute func(uintptr, uintptr, string, int)
276276 var XGtkCellLayoutClear func(uintptr)
277277 var XGtkCellLayoutClearAttributes func(uintptr, uintptr)
278278 var XGtkCellLayoutGetArea func(uintptr) uintptr
279279 var XGtkCellLayoutGetCells func(uintptr) *glib.List
280280 var XGtkCellLayoutPackEnd func(uintptr, uintptr, bool)
281281 var XGtkCellLayoutPackStart func(uintptr, uintptr, bool)
282-var XGtkCellLayoutReorder func(uintptr, uintptr, int32)
282+var XGtkCellLayoutReorder func(uintptr, uintptr, int)
283283 var XGtkCellLayoutSetAttributes func(uintptr, uintptr, ...interface{})
284284 var XGtkCellLayoutSetCellDataFunc func(uintptr, uintptr, uintptr, uintptr, uintptr)
285285
M v4/gtk/gtkcellrenderer.go +16 -16
@@ -135,10 +135,10 @@ func (x *CellRenderer) GetAlignment(XalignVar float32, YalignVar float32) {
135135
136136 }
137137
138-var xCellRendererGetFixedSize func(uintptr, int32, int32)
138+var xCellRendererGetFixedSize func(uintptr, int, int)
139139
140140 // Fills in @width and @height with the appropriate size of @cell.
141-func (x *CellRenderer) GetFixedSize(WidthVar int32, HeightVar int32) {
141+func (x *CellRenderer) GetFixedSize(WidthVar int, HeightVar int) {
142142
143143 xCellRendererGetFixedSize(x.GoPointer(), WidthVar, HeightVar)
144144
@@ -162,29 +162,29 @@ func (x *CellRenderer) GetIsExpander() bool {
162162
163163 }
164164
165-var xCellRendererGetPadding func(uintptr, int32, int32)
165+var xCellRendererGetPadding func(uintptr, int, int)
166166
167167 // Fills in @xpad and @ypad with the appropriate values of @cell.
168-func (x *CellRenderer) GetPadding(XpadVar int32, YpadVar int32) {
168+func (x *CellRenderer) GetPadding(XpadVar int, YpadVar int) {
169169
170170 xCellRendererGetPadding(x.GoPointer(), XpadVar, YpadVar)
171171
172172 }
173173
174-var xCellRendererGetPreferredHeight func(uintptr, uintptr, int32, int32)
174+var xCellRendererGetPreferredHeight func(uintptr, uintptr, int, int)
175175
176176 // Retrieves a renderer’s natural size when rendered to @widget.
177-func (x *CellRenderer) GetPreferredHeight(WidgetVar *Widget, MinimumSizeVar int32, NaturalSizeVar int32) {
177+func (x *CellRenderer) GetPreferredHeight(WidgetVar *Widget, MinimumSizeVar int, NaturalSizeVar int) {
178178
179179 xCellRendererGetPreferredHeight(x.GoPointer(), WidgetVar.GoPointer(), MinimumSizeVar, NaturalSizeVar)
180180
181181 }
182182
183-var xCellRendererGetPreferredHeightForWidth func(uintptr, uintptr, int32, int32, int32)
183+var xCellRendererGetPreferredHeightForWidth func(uintptr, uintptr, int, int, int)
184184
185185 // Retrieves a cell renderers’s minimum and natural height if it were rendered to
186186 // @widget with the specified @width.
187-func (x *CellRenderer) GetPreferredHeightForWidth(WidgetVar *Widget, WidthVar int32, MinimumHeightVar int32, NaturalHeightVar int32) {
187+func (x *CellRenderer) GetPreferredHeightForWidth(WidgetVar *Widget, WidthVar int, MinimumHeightVar int, NaturalHeightVar int) {
188188
189189 xCellRendererGetPreferredHeightForWidth(x.GoPointer(), WidgetVar.GoPointer(), WidthVar, MinimumHeightVar, NaturalHeightVar)
190190
@@ -200,20 +200,20 @@ func (x *CellRenderer) GetPreferredSize(WidgetVar *Widget, MinimumSizeVar *Requi
200200
201201 }
202202
203-var xCellRendererGetPreferredWidth func(uintptr, uintptr, int32, int32)
203+var xCellRendererGetPreferredWidth func(uintptr, uintptr, int, int)
204204
205205 // Retrieves a renderer’s natural size when rendered to @widget.
206-func (x *CellRenderer) GetPreferredWidth(WidgetVar *Widget, MinimumSizeVar int32, NaturalSizeVar int32) {
206+func (x *CellRenderer) GetPreferredWidth(WidgetVar *Widget, MinimumSizeVar int, NaturalSizeVar int) {
207207
208208 xCellRendererGetPreferredWidth(x.GoPointer(), WidgetVar.GoPointer(), MinimumSizeVar, NaturalSizeVar)
209209
210210 }
211211
212-var xCellRendererGetPreferredWidthForHeight func(uintptr, uintptr, int32, int32, int32)
212+var xCellRendererGetPreferredWidthForHeight func(uintptr, uintptr, int, int, int)
213213
214214 // Retrieves a cell renderers’s minimum and natural width if it were rendered to
215215 // @widget with the specified @height.
216-func (x *CellRenderer) GetPreferredWidthForHeight(WidgetVar *Widget, HeightVar int32, MinimumWidthVar int32, NaturalWidthVar int32) {
216+func (x *CellRenderer) GetPreferredWidthForHeight(WidgetVar *Widget, HeightVar int, MinimumWidthVar int, NaturalWidthVar int) {
217217
218218 xCellRendererGetPreferredWidthForHeight(x.GoPointer(), WidgetVar.GoPointer(), HeightVar, MinimumWidthVar, NaturalWidthVar)
219219
@@ -276,10 +276,10 @@ func (x *CellRenderer) SetAlignment(XalignVar float32, YalignVar float32) {
276276
277277 }
278278
279-var xCellRendererSetFixedSize func(uintptr, int32, int32)
279+var xCellRendererSetFixedSize func(uintptr, int, int)
280280
281281 // Sets the renderer size to be explicit, independent of the properties set.
282-func (x *CellRenderer) SetFixedSize(WidthVar int32, HeightVar int32) {
282+func (x *CellRenderer) SetFixedSize(WidthVar int, HeightVar int) {
283283
284284 xCellRendererSetFixedSize(x.GoPointer(), WidthVar, HeightVar)
285285
@@ -303,10 +303,10 @@ func (x *CellRenderer) SetIsExpander(IsExpanderVar bool) {
303303
304304 }
305305
306-var xCellRendererSetPadding func(uintptr, int32, int32)
306+var xCellRendererSetPadding func(uintptr, int, int)
307307
308308 // Sets the renderer’s padding.
309-func (x *CellRenderer) SetPadding(XpadVar int32, YpadVar int32) {
309+func (x *CellRenderer) SetPadding(XpadVar int, YpadVar int) {
310310
311311 xCellRendererSetPadding(x.GoPointer(), XpadVar, YpadVar)
312312
M v4/gtk/gtkcellrenderertext.go +2 -2
@@ -53,7 +53,7 @@ func NewCellRendererText() *CellRenderer {
5353 return NewCellRendererTextCls
5454 }
5555
56-var xCellRendererTextSetFixedHeightFromFont func(uintptr, int32)
56+var xCellRendererTextSetFixedHeightFromFont func(uintptr, int)
5757
5858 // Sets the height of a renderer to explicitly be determined by the “font” and
5959 // “y_pad” property set on it. Further changes in these properties do not
@@ -62,7 +62,7 @@ var xCellRendererTextSetFixedHeightFromFont func(uintptr, int32)
6262 // if calculating the size of a cell is too slow (ie, a massive number of cells
6363 // displayed). If @number_of_rows is -1, then the fixed height is unset, and
6464 // the height is determined by the properties again.
65-func (x *CellRendererText) SetFixedHeightFromFont(NumberOfRowsVar int32) {
65+func (x *CellRendererText) SetFixedHeightFromFont(NumberOfRowsVar int) {
6666
6767 xCellRendererTextSetFixedHeightFromFont(x.GoPointer(), NumberOfRowsVar)
6868
M v4/gtk/gtkcellview.go +5 -5
@@ -294,7 +294,7 @@ func (x *CellView) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs .
294294 // property change must be communicated to assistive technologies.
295295 //
296296 // This function is meant to be used by language bindings.
297-func (x *CellView) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
297+func (x *CellView) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
298298
299299 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
300300
@@ -330,7 +330,7 @@ func (x *CellView) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs .
330330 // relation change must be communicated to assistive technologies.
331331 //
332332 // This function is meant to be used by language bindings.
333-func (x *CellView) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
333+func (x *CellView) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
334334
335335 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
336336
@@ -363,7 +363,7 @@ func (x *CellView) UpdateState(FirstStateVar AccessibleState, varArgs ...interfa
363363 // state change must be communicated to assistive technologies.
364364 //
365365 // This function is meant to be used by language bindings.
366-func (x *CellView) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
366+func (x *CellView) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
367367
368368 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
369369
@@ -386,7 +386,7 @@ func (x *CellView) GetBuildableId() string {
386386 // example if column 2 of the model contains strings, you could have the
387387 // “text” attribute of a `GtkCellRendererText` get its values from column 2.
388388 // In this context "attribute" and "property" are used interchangeably.
389-func (x *CellView) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int32) {
389+func (x *CellView) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int) {
390390
391391 XGtkCellLayoutAddAttribute(x.GoPointer(), CellVar.GoPointer(), AttributeVar, ColumnVar)
392392
@@ -459,7 +459,7 @@ func (x *CellView) PackStart(CellVar *CellRenderer, ExpandVar bool) {
459459 //
460460 // Note that @cell has already to be packed into @cell_layout
461461 // for this to function properly.
462-func (x *CellView) Reorder(CellVar *CellRenderer, PositionVar int32) {
462+func (x *CellView) Reorder(CellVar *CellRenderer, PositionVar int) {
463463
464464 XGtkCellLayoutReorder(x.GoPointer(), CellVar.GoPointer(), PositionVar)
465465
M v4/gtk/gtkcenterbox.go +3 -3
@@ -245,7 +245,7 @@ func (x *CenterBox) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
245245 // property change must be communicated to assistive technologies.
246246 //
247247 // This function is meant to be used by language bindings.
248-func (x *CenterBox) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
248+func (x *CenterBox) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
249249
250250 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
251251
@@ -281,7 +281,7 @@ func (x *CenterBox) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
281281 // relation change must be communicated to assistive technologies.
282282 //
283283 // This function is meant to be used by language bindings.
284-func (x *CenterBox) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
284+func (x *CenterBox) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
285285
286286 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
287287
@@ -314,7 +314,7 @@ func (x *CenterBox) UpdateState(FirstStateVar AccessibleState, varArgs ...interf
314314 // state change must be communicated to assistive technologies.
315315 //
316316 // This function is meant to be used by language bindings.
317-func (x *CenterBox) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
317+func (x *CenterBox) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
318318
319319 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
320320
M v4/gtk/gtkcheckbutton.go +3 -3
@@ -360,7 +360,7 @@ func (x *CheckButton) UpdateProperty(FirstPropertyVar AccessibleProperty, varArg
360360 // property change must be communicated to assistive technologies.
361361 //
362362 // This function is meant to be used by language bindings.
363-func (x *CheckButton) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
363+func (x *CheckButton) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
364364
365365 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
366366
@@ -396,7 +396,7 @@ func (x *CheckButton) UpdateRelation(FirstRelationVar AccessibleRelation, varArg
396396 // relation change must be communicated to assistive technologies.
397397 //
398398 // This function is meant to be used by language bindings.
399-func (x *CheckButton) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
399+func (x *CheckButton) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
400400
401401 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
402402
@@ -429,7 +429,7 @@ func (x *CheckButton) UpdateState(FirstStateVar AccessibleState, varArgs ...inte
429429 // state change must be communicated to assistive technologies.
430430 //
431431 // This function is meant to be used by language bindings.
432-func (x *CheckButton) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
432+func (x *CheckButton) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
433433
434434 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
435435
M v4/gtk/gtkcolorbutton.go +4 -4
@@ -212,7 +212,7 @@ func (x *ColorButton) UpdateProperty(FirstPropertyVar AccessibleProperty, varArg
212212 // property change must be communicated to assistive technologies.
213213 //
214214 // This function is meant to be used by language bindings.
215-func (x *ColorButton) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
215+func (x *ColorButton) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
216216
217217 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
218218
@@ -248,7 +248,7 @@ func (x *ColorButton) UpdateRelation(FirstRelationVar AccessibleRelation, varArg
248248 // relation change must be communicated to assistive technologies.
249249 //
250250 // This function is meant to be used by language bindings.
251-func (x *ColorButton) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
251+func (x *ColorButton) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
252252
253253 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
254254
@@ -281,7 +281,7 @@ func (x *ColorButton) UpdateState(FirstStateVar AccessibleState, varArgs ...inte
281281 // state change must be communicated to assistive technologies.
282282 //
283283 // This function is meant to be used by language bindings.
284-func (x *ColorButton) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
284+func (x *ColorButton) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
285285
286286 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
287287
@@ -314,7 +314,7 @@ func (x *ColorButton) GetBuildableId() string {
314314 // of removing the default color palette from the color chooser.
315315 //
316316 // If @colors is %NULL, removes all previously added palettes.
317-func (x *ColorButton) AddPalette(OrientationVar Orientation, ColorsPerLineVar int32, NColorsVar int32, ColorsVar uintptr) {
317+func (x *ColorButton) AddPalette(OrientationVar Orientation, ColorsPerLineVar int, NColorsVar int, ColorsVar uintptr) {
318318
319319 XGtkColorChooserAddPalette(x.GoPointer(), OrientationVar, ColorsPerLineVar, NColorsVar, ColorsVar)
320320
M v4/gtk/gtkcolorchooser.go +3 -3
@@ -24,7 +24,7 @@ type ColorChooserInterface struct {
2424 type ColorChooser interface {
2525 GoPointer() uintptr
2626 SetGoPointer(uintptr)
27- AddPalette(OrientationVar Orientation, ColorsPerLineVar int32, NColorsVar int32, ColorsVar uintptr)
27+ AddPalette(OrientationVar Orientation, ColorsPerLineVar int, NColorsVar int, ColorsVar uintptr)
2828 GetRgba(ColorVar *gdk.RGBA)
2929 GetUseAlpha() bool
3030 SetRgba(ColorVar *gdk.RGBA)
@@ -59,7 +59,7 @@ func (x *ColorChooserBase) SetGoPointer(ptr uintptr) {
5959 // of removing the default color palette from the color chooser.
6060 //
6161 // If @colors is %NULL, removes all previously added palettes.
62-func (x *ColorChooserBase) AddPalette(OrientationVar Orientation, ColorsPerLineVar int32, NColorsVar int32, ColorsVar uintptr) {
62+func (x *ColorChooserBase) AddPalette(OrientationVar Orientation, ColorsPerLineVar int, NColorsVar int, ColorsVar uintptr) {
6363
6464 XGtkColorChooserAddPalette(x.GoPointer(), OrientationVar, ColorsPerLineVar, NColorsVar, ColorsVar)
6565
@@ -93,7 +93,7 @@ func (x *ColorChooserBase) SetUseAlpha(UseAlphaVar bool) {
9393
9494 }
9595
96-var XGtkColorChooserAddPalette func(uintptr, Orientation, int32, int32, uintptr)
96+var XGtkColorChooserAddPalette func(uintptr, Orientation, int, int, uintptr)
9797 var XGtkColorChooserGetRgba func(uintptr, *gdk.RGBA)
9898 var XGtkColorChooserGetUseAlpha func(uintptr) bool
9999 var XGtkColorChooserSetRgba func(uintptr, *gdk.RGBA)
M v4/gtk/gtkcolorchooserdialog.go +4 -4
@@ -113,7 +113,7 @@ func (x *ColorChooserDialog) UpdateProperty(FirstPropertyVar AccessibleProperty,
113113 // property change must be communicated to assistive technologies.
114114 //
115115 // This function is meant to be used by language bindings.
116-func (x *ColorChooserDialog) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
116+func (x *ColorChooserDialog) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
117117
118118 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
119119
@@ -149,7 +149,7 @@ func (x *ColorChooserDialog) UpdateRelation(FirstRelationVar AccessibleRelation,
149149 // relation change must be communicated to assistive technologies.
150150 //
151151 // This function is meant to be used by language bindings.
152-func (x *ColorChooserDialog) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
152+func (x *ColorChooserDialog) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
153153
154154 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
155155
@@ -182,7 +182,7 @@ func (x *ColorChooserDialog) UpdateState(FirstStateVar AccessibleState, varArgs
182182 // state change must be communicated to assistive technologies.
183183 //
184184 // This function is meant to be used by language bindings.
185-func (x *ColorChooserDialog) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
185+func (x *ColorChooserDialog) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
186186
187187 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
188188
@@ -215,7 +215,7 @@ func (x *ColorChooserDialog) GetBuildableId() string {
215215 // of removing the default color palette from the color chooser.
216216 //
217217 // If @colors is %NULL, removes all previously added palettes.
218-func (x *ColorChooserDialog) AddPalette(OrientationVar Orientation, ColorsPerLineVar int32, NColorsVar int32, ColorsVar uintptr) {
218+func (x *ColorChooserDialog) AddPalette(OrientationVar Orientation, ColorsPerLineVar int, NColorsVar int, ColorsVar uintptr) {
219219
220220 XGtkColorChooserAddPalette(x.GoPointer(), OrientationVar, ColorsPerLineVar, NColorsVar, ColorsVar)
221221
M v4/gtk/gtkcolorchooserwidget.go +4 -4
@@ -124,7 +124,7 @@ func (x *ColorChooserWidget) UpdateProperty(FirstPropertyVar AccessibleProperty,
124124 // property change must be communicated to assistive technologies.
125125 //
126126 // This function is meant to be used by language bindings.
127-func (x *ColorChooserWidget) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
127+func (x *ColorChooserWidget) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
128128
129129 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
130130
@@ -160,7 +160,7 @@ func (x *ColorChooserWidget) UpdateRelation(FirstRelationVar AccessibleRelation,
160160 // relation change must be communicated to assistive technologies.
161161 //
162162 // This function is meant to be used by language bindings.
163-func (x *ColorChooserWidget) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
163+func (x *ColorChooserWidget) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
164164
165165 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
166166
@@ -193,7 +193,7 @@ func (x *ColorChooserWidget) UpdateState(FirstStateVar AccessibleState, varArgs
193193 // state change must be communicated to assistive technologies.
194194 //
195195 // This function is meant to be used by language bindings.
196-func (x *ColorChooserWidget) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
196+func (x *ColorChooserWidget) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
197197
198198 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
199199
@@ -226,7 +226,7 @@ func (x *ColorChooserWidget) GetBuildableId() string {
226226 // of removing the default color palette from the color chooser.
227227 //
228228 // If @colors is %NULL, removes all previously added palettes.
229-func (x *ColorChooserWidget) AddPalette(OrientationVar Orientation, ColorsPerLineVar int32, NColorsVar int32, ColorsVar uintptr) {
229+func (x *ColorChooserWidget) AddPalette(OrientationVar Orientation, ColorsPerLineVar int, NColorsVar int, ColorsVar uintptr) {
230230
231231 XGtkColorChooserAddPalette(x.GoPointer(), OrientationVar, ColorsPerLineVar, NColorsVar, ColorsVar)
232232
M v4/gtk/gtkcolumnview.go +3 -3
@@ -420,7 +420,7 @@ func (x *ColumnView) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
420420 // property change must be communicated to assistive technologies.
421421 //
422422 // This function is meant to be used by language bindings.
423-func (x *ColumnView) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
423+func (x *ColumnView) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
424424
425425 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
426426
@@ -456,7 +456,7 @@ func (x *ColumnView) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
456456 // relation change must be communicated to assistive technologies.
457457 //
458458 // This function is meant to be used by language bindings.
459-func (x *ColumnView) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
459+func (x *ColumnView) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
460460
461461 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
462462
@@ -489,7 +489,7 @@ func (x *ColumnView) UpdateState(FirstStateVar AccessibleState, varArgs ...inter
489489 // state change must be communicated to assistive technologies.
490490 //
491491 // This function is meant to be used by language bindings.
492-func (x *ColumnView) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
492+func (x *ColumnView) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
493493
494494 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
495495
M v4/gtk/gtkcolumnviewcolumn.go +4 -4
@@ -107,10 +107,10 @@ func (x *ColumnViewColumn) GetFactory() *ListItemFactory {
107107
108108 }
109109
110-var xColumnViewColumnGetFixedWidth func(uintptr) int32
110+var xColumnViewColumnGetFixedWidth func(uintptr) int
111111
112112 // Gets the fixed width of the column.
113-func (x *ColumnViewColumn) GetFixedWidth() int32 {
113+func (x *ColumnViewColumn) GetFixedWidth() int {
114114
115115 return xColumnViewColumnGetFixedWidth(x.GoPointer())
116116
@@ -202,14 +202,14 @@ func (x *ColumnViewColumn) SetFactory(FactoryVar *ListItemFactory) {
202202
203203 }
204204
205-var xColumnViewColumnSetFixedWidth func(uintptr, int32)
205+var xColumnViewColumnSetFixedWidth func(uintptr, int)
206206
207207 // If @fixed_width is not -1, sets the fixed width of @column;
208208 // otherwise unsets it.
209209 //
210210 // Setting a fixed width overrides the automatically calculated
211211 // width. Interactive resizing also sets the “fixed-width” property.
212-func (x *ColumnViewColumn) SetFixedWidth(FixedWidthVar int32) {
212+func (x *ColumnViewColumn) SetFixedWidth(FixedWidthVar int) {
213213
214214 xColumnViewColumnSetFixedWidth(x.GoPointer(), FixedWidthVar)
215215
M v4/gtk/gtkcombobox.go +17 -17
@@ -155,7 +155,7 @@ func NewWithModelAndEntryComboBox(ModelVar TreeModel) *Widget {
155155 return NewWithModelAndEntryComboBoxCls
156156 }
157157
158-var xComboBoxGetActive func(uintptr) int32
158+var xComboBoxGetActive func(uintptr) int
159159
160160 // Returns the index of the currently active item.
161161 //
@@ -163,7 +163,7 @@ var xComboBoxGetActive func(uintptr) int32
163163 // an immediate child of the root of the tree, this function returns
164164 // `gtk_tree_path_get_indices (path)[0]`, where `path` is the
165165 // [struct@Gtk.TreePath] of the active item.
166-func (x *ComboBox) GetActive() int32 {
166+func (x *ComboBox) GetActive() int {
167167
168168 return xComboBoxGetActive(x.GoPointer())
169169
@@ -229,11 +229,11 @@ func (x *ComboBox) GetChild() *Widget {
229229
230230 }
231231
232-var xComboBoxGetEntryTextColumn func(uintptr) int32
232+var xComboBoxGetEntryTextColumn func(uintptr) int
233233
234234 // Returns the column which @combo_box is using to get the strings
235235 // from to display in the internal entry.
236-func (x *ComboBox) GetEntryTextColumn() int32 {
236+func (x *ComboBox) GetEntryTextColumn() int {
237237
238238 return xComboBoxGetEntryTextColumn(x.GoPointer())
239239
@@ -248,11 +248,11 @@ func (x *ComboBox) GetHasEntry() bool {
248248
249249 }
250250
251-var xComboBoxGetIdColumn func(uintptr) int32
251+var xComboBoxGetIdColumn func(uintptr) int
252252
253253 // Returns the column which @combo_box is using to get string IDs
254254 // for values from.
255-func (x *ComboBox) GetIdColumn() int32 {
255+func (x *ComboBox) GetIdColumn() int {
256256
257257 return xComboBoxGetIdColumn(x.GoPointer())
258258
@@ -334,10 +334,10 @@ func (x *ComboBox) PopupForDevice(DeviceVar *gdk.Device) {
334334
335335 }
336336
337-var xComboBoxSetActive func(uintptr, int32)
337+var xComboBoxSetActive func(uintptr, int)
338338
339339 // Sets the active item of @combo_box to be the item at @index.
340-func (x *ComboBox) SetActive(IndexVar int32) {
340+func (x *ComboBox) SetActive(IndexVar int) {
341341
342342 xComboBoxSetActive(x.GoPointer(), IndexVar)
343343
@@ -390,7 +390,7 @@ func (x *ComboBox) SetChild(ChildVar *Widget) {
390390
391391 }
392392
393-var xComboBoxSetEntryTextColumn func(uintptr, int32)
393+var xComboBoxSetEntryTextColumn func(uintptr, int)
394394
395395 // Sets the model column which @combo_box should use to get strings
396396 // from to be @text_column.
@@ -403,20 +403,20 @@ var xComboBoxSetEntryTextColumn func(uintptr, int32)
403403 //
404404 // This is only relevant if @combo_box has been created with
405405 // [property@Gtk.ComboBox:has-entry] as %TRUE.
406-func (x *ComboBox) SetEntryTextColumn(TextColumnVar int32) {
406+func (x *ComboBox) SetEntryTextColumn(TextColumnVar int) {
407407
408408 xComboBoxSetEntryTextColumn(x.GoPointer(), TextColumnVar)
409409
410410 }
411411
412-var xComboBoxSetIdColumn func(uintptr, int32)
412+var xComboBoxSetIdColumn func(uintptr, int)
413413
414414 // Sets the model column which @combo_box should use to get string IDs
415415 // for values from.
416416 //
417417 // The column @id_column in the model of @combo_box must be of type
418418 // %G_TYPE_STRING.
419-func (x *ComboBox) SetIdColumn(IdColumnVar int32) {
419+func (x *ComboBox) SetIdColumn(IdColumnVar int) {
420420
421421 xComboBoxSetIdColumn(x.GoPointer(), IdColumnVar)
422422
@@ -651,7 +651,7 @@ func (x *ComboBox) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs .
651651 // property change must be communicated to assistive technologies.
652652 //
653653 // This function is meant to be used by language bindings.
654-func (x *ComboBox) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
654+func (x *ComboBox) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
655655
656656 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
657657
@@ -687,7 +687,7 @@ func (x *ComboBox) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs .
687687 // relation change must be communicated to assistive technologies.
688688 //
689689 // This function is meant to be used by language bindings.
690-func (x *ComboBox) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
690+func (x *ComboBox) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
691691
692692 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
693693
@@ -720,7 +720,7 @@ func (x *ComboBox) UpdateState(FirstStateVar AccessibleState, varArgs ...interfa
720720 // state change must be communicated to assistive technologies.
721721 //
722722 // This function is meant to be used by language bindings.
723-func (x *ComboBox) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
723+func (x *ComboBox) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
724724
725725 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
726726
@@ -773,7 +773,7 @@ func (x *ComboBox) StartEditing(EventVar *gdk.Event) {
773773 // example if column 2 of the model contains strings, you could have the
774774 // “text” attribute of a `GtkCellRendererText` get its values from column 2.
775775 // In this context "attribute" and "property" are used interchangeably.
776-func (x *ComboBox) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int32) {
776+func (x *ComboBox) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int) {
777777
778778 XGtkCellLayoutAddAttribute(x.GoPointer(), CellVar.GoPointer(), AttributeVar, ColumnVar)
779779
@@ -846,7 +846,7 @@ func (x *ComboBox) PackStart(CellVar *CellRenderer, ExpandVar bool) {
846846 //
847847 // Note that @cell has already to be packed into @cell_layout
848848 // for this to function properly.
849-func (x *ComboBox) Reorder(CellVar *CellRenderer, PositionVar int32) {
849+func (x *ComboBox) Reorder(CellVar *CellRenderer, PositionVar int) {
850850
851851 XGtkCellLayoutReorder(x.GoPointer(), CellVar.GoPointer(), PositionVar)
852852
M v4/gtk/gtkcomboboxtext.go +11 -11
@@ -150,7 +150,7 @@ func (x *ComboBoxText) GetActiveText() string {
150150
151151 }
152152
153-var xComboBoxTextInsert func(uintptr, int32, string, string)
153+var xComboBoxTextInsert func(uintptr, int, string, string)
154154
155155 // Inserts @text at @position in the list of strings stored in @combo_box.
156156 //
@@ -158,13 +158,13 @@ var xComboBoxTextInsert func(uintptr, int32, string, string)
158158 // See [property@Gtk.ComboBox:id-column].
159159 //
160160 // If @position is negative then @text is appended.
161-func (x *ComboBoxText) Insert(PositionVar int32, IdVar string, TextVar string) {
161+func (x *ComboBoxText) Insert(PositionVar int, IdVar string, TextVar string) {
162162
163163 xComboBoxTextInsert(x.GoPointer(), PositionVar, IdVar, TextVar)
164164
165165 }
166166
167-var xComboBoxTextInsertText func(uintptr, int32, string)
167+var xComboBoxTextInsertText func(uintptr, int, string)
168168
169169 // Inserts @text at @position in the list of strings stored in @combo_box.
170170 //
@@ -172,7 +172,7 @@ var xComboBoxTextInsertText func(uintptr, int32, string)
172172 //
173173 // This is the same as calling [method@Gtk.ComboBoxText.insert]
174174 // with a %NULL ID string.
175-func (x *ComboBoxText) InsertText(PositionVar int32, TextVar string) {
175+func (x *ComboBoxText) InsertText(PositionVar int, TextVar string) {
176176
177177 xComboBoxTextInsertText(x.GoPointer(), PositionVar, TextVar)
178178
@@ -204,10 +204,10 @@ func (x *ComboBoxText) PrependText(TextVar string) {
204204
205205 }
206206
207-var xComboBoxTextRemove func(uintptr, int32)
207+var xComboBoxTextRemove func(uintptr, int)
208208
209209 // Removes the string at @position from @combo_box.
210-func (x *ComboBoxText) Remove(PositionVar int32) {
210+func (x *ComboBoxText) Remove(PositionVar int) {
211211
212212 xComboBoxTextRemove(x.GoPointer(), PositionVar)
213213
@@ -288,7 +288,7 @@ func (x *ComboBoxText) UpdateProperty(FirstPropertyVar AccessibleProperty, varAr
288288 // property change must be communicated to assistive technologies.
289289 //
290290 // This function is meant to be used by language bindings.
291-func (x *ComboBoxText) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
291+func (x *ComboBoxText) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
292292
293293 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
294294
@@ -324,7 +324,7 @@ func (x *ComboBoxText) UpdateRelation(FirstRelationVar AccessibleRelation, varAr
324324 // relation change must be communicated to assistive technologies.
325325 //
326326 // This function is meant to be used by language bindings.
327-func (x *ComboBoxText) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
327+func (x *ComboBoxText) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
328328
329329 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
330330
@@ -357,7 +357,7 @@ func (x *ComboBoxText) UpdateState(FirstStateVar AccessibleState, varArgs ...int
357357 // state change must be communicated to assistive technologies.
358358 //
359359 // This function is meant to be used by language bindings.
360-func (x *ComboBoxText) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
360+func (x *ComboBoxText) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
361361
362362 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
363363
@@ -410,7 +410,7 @@ func (x *ComboBoxText) StartEditing(EventVar *gdk.Event) {
410410 // example if column 2 of the model contains strings, you could have the
411411 // “text” attribute of a `GtkCellRendererText` get its values from column 2.
412412 // In this context "attribute" and "property" are used interchangeably.
413-func (x *ComboBoxText) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int32) {
413+func (x *ComboBoxText) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int) {
414414
415415 XGtkCellLayoutAddAttribute(x.GoPointer(), CellVar.GoPointer(), AttributeVar, ColumnVar)
416416
@@ -483,7 +483,7 @@ func (x *ComboBoxText) PackStart(CellVar *CellRenderer, ExpandVar bool) {
483483 //
484484 // Note that @cell has already to be packed into @cell_layout
485485 // for this to function properly.
486-func (x *ComboBoxText) Reorder(CellVar *CellRenderer, PositionVar int32) {
486+func (x *ComboBoxText) Reorder(CellVar *CellRenderer, PositionVar int) {
487487
488488 XGtkCellLayoutReorder(x.GoPointer(), CellVar.GoPointer(), PositionVar)
489489
M v4/gtk/gtkconstraint.go +6 -6
@@ -62,11 +62,11 @@ func ConstraintNewFromInternalPtr(ptr uintptr) *Constraint {
6262 return cls
6363 }
6464
65-var xNewConstraint func(uintptr, ConstraintAttribute, ConstraintRelation, uintptr, ConstraintAttribute, float64, float64, int32) uintptr
65+var xNewConstraint func(uintptr, ConstraintAttribute, ConstraintRelation, uintptr, ConstraintAttribute, float64, float64, int) uintptr
6666
6767 // Creates a new constraint representing a relation between a layout
6868 // attribute on a source and a layout attribute on a target.
69-func NewConstraint(TargetVar ConstraintTarget, TargetAttributeVar ConstraintAttribute, RelationVar ConstraintRelation, SourceVar ConstraintTarget, SourceAttributeVar ConstraintAttribute, MultiplierVar float64, ConstantVar float64, StrengthVar int32) *Constraint {
69+func NewConstraint(TargetVar ConstraintTarget, TargetAttributeVar ConstraintAttribute, RelationVar ConstraintRelation, SourceVar ConstraintTarget, SourceAttributeVar ConstraintAttribute, MultiplierVar float64, ConstantVar float64, StrengthVar int) *Constraint {
7070 NewConstraintPtr := xNewConstraint(TargetVar.GoPointer(), TargetAttributeVar, RelationVar, SourceVar.GoPointer(), SourceAttributeVar, MultiplierVar, ConstantVar, StrengthVar)
7171 if NewConstraintPtr == 0 {
7272 return nil
@@ -77,11 +77,11 @@ func NewConstraint(TargetVar ConstraintTarget, TargetAttributeVar ConstraintAttr
7777 return NewConstraintCls
7878 }
7979
80-var xNewConstantConstraint func(uintptr, ConstraintAttribute, ConstraintRelation, float64, int32) uintptr
80+var xNewConstantConstraint func(uintptr, ConstraintAttribute, ConstraintRelation, float64, int) uintptr
8181
8282 // Creates a new constraint representing a relation between a layout
8383 // attribute on a target and a constant value.
84-func NewConstantConstraint(TargetVar ConstraintTarget, TargetAttributeVar ConstraintAttribute, RelationVar ConstraintRelation, ConstantVar float64, StrengthVar int32) *Constraint {
84+func NewConstantConstraint(TargetVar ConstraintTarget, TargetAttributeVar ConstraintAttribute, RelationVar ConstraintRelation, ConstantVar float64, StrengthVar int) *Constraint {
8585 NewConstantConstraintPtr := xNewConstantConstraint(TargetVar.GoPointer(), TargetAttributeVar, RelationVar, ConstantVar, StrengthVar)
8686 if NewConstantConstraintPtr == 0 {
8787 return nil
@@ -151,10 +151,10 @@ func (x *Constraint) GetSourceAttribute() ConstraintAttribute {
151151
152152 }
153153
154-var xConstraintGetStrength func(uintptr) int32
154+var xConstraintGetStrength func(uintptr) int
155155
156156 // Retrieves the strength of the constraint.
157-func (x *Constraint) GetStrength() int32 {
157+func (x *Constraint) GetStrength() int {
158158
159159 return xConstraintGetStrength(x.GoPointer())
160160
M v4/gtk/gtkconstraintguide.go +12 -12
@@ -47,19 +47,19 @@ func NewConstraintGuide() *ConstraintGuide {
4747 return NewConstraintGuideCls
4848 }
4949
50-var xConstraintGuideGetMaxSize func(uintptr, int32, int32)
50+var xConstraintGuideGetMaxSize func(uintptr, int, int)
5151
5252 // Gets the maximum size of @guide.
53-func (x *ConstraintGuide) GetMaxSize(WidthVar int32, HeightVar int32) {
53+func (x *ConstraintGuide) GetMaxSize(WidthVar int, HeightVar int) {
5454
5555 xConstraintGuideGetMaxSize(x.GoPointer(), WidthVar, HeightVar)
5656
5757 }
5858
59-var xConstraintGuideGetMinSize func(uintptr, int32, int32)
59+var xConstraintGuideGetMinSize func(uintptr, int, int)
6060
6161 // Gets the minimum size of @guide.
62-func (x *ConstraintGuide) GetMinSize(WidthVar int32, HeightVar int32) {
62+func (x *ConstraintGuide) GetMinSize(WidthVar int, HeightVar int) {
6363
6464 xConstraintGuideGetMinSize(x.GoPointer(), WidthVar, HeightVar)
6565
@@ -74,10 +74,10 @@ func (x *ConstraintGuide) GetName() string {
7474
7575 }
7676
77-var xConstraintGuideGetNatSize func(uintptr, int32, int32)
77+var xConstraintGuideGetNatSize func(uintptr, int, int)
7878
7979 // Gets the natural size of @guide.
80-func (x *ConstraintGuide) GetNatSize(WidthVar int32, HeightVar int32) {
80+func (x *ConstraintGuide) GetNatSize(WidthVar int, HeightVar int) {
8181
8282 xConstraintGuideGetNatSize(x.GoPointer(), WidthVar, HeightVar)
8383
@@ -92,25 +92,25 @@ func (x *ConstraintGuide) GetStrength() ConstraintStrength {
9292
9393 }
9494
95-var xConstraintGuideSetMaxSize func(uintptr, int32, int32)
95+var xConstraintGuideSetMaxSize func(uintptr, int, int)
9696
9797 // Sets the maximum size of @guide.
9898 //
9999 // If @guide is attached to a `GtkConstraintLayout`,
100100 // the constraints will be updated to reflect the new size.
101-func (x *ConstraintGuide) SetMaxSize(WidthVar int32, HeightVar int32) {
101+func (x *ConstraintGuide) SetMaxSize(WidthVar int, HeightVar int) {
102102
103103 xConstraintGuideSetMaxSize(x.GoPointer(), WidthVar, HeightVar)
104104
105105 }
106106
107-var xConstraintGuideSetMinSize func(uintptr, int32, int32)
107+var xConstraintGuideSetMinSize func(uintptr, int, int)
108108
109109 // Sets the minimum size of @guide.
110110 //
111111 // If @guide is attached to a `GtkConstraintLayout`,
112112 // the constraints will be updated to reflect the new size.
113-func (x *ConstraintGuide) SetMinSize(WidthVar int32, HeightVar int32) {
113+func (x *ConstraintGuide) SetMinSize(WidthVar int, HeightVar int) {
114114
115115 xConstraintGuideSetMinSize(x.GoPointer(), WidthVar, HeightVar)
116116
@@ -127,13 +127,13 @@ func (x *ConstraintGuide) SetName(NameVar string) {
127127
128128 }
129129
130-var xConstraintGuideSetNatSize func(uintptr, int32, int32)
130+var xConstraintGuideSetNatSize func(uintptr, int, int)
131131
132132 // Sets the natural size of @guide.
133133 //
134134 // If @guide is attached to a `GtkConstraintLayout`,
135135 // the constraints will be updated to reflect the new size.
136-func (x *ConstraintGuide) SetNatSize(WidthVar int32, HeightVar int32) {
136+func (x *ConstraintGuide) SetNatSize(WidthVar int, HeightVar int) {
137137
138138 xConstraintGuideSetNatSize(x.GoPointer(), WidthVar, HeightVar)
139139
M v4/gtk/gtkconstraintlayout.go +4 -4
@@ -238,20 +238,20 @@ func (x *ConstraintLayout) AddConstraint(ConstraintVar *Constraint) {
238238
239239 }
240240
241-var xConstraintLayoutAddConstraintsFromDescription func(uintptr, uintptr, uint, int32, int32, **glib.Error, string, ...interface{}) *glib.List
241+var xConstraintLayoutAddConstraintsFromDescription func(uintptr, uintptr, uint, int, int, **glib.Error, string, ...interface{}) *glib.List
242242
243243 // Creates a list of constraints from a VFL description.
244244 //
245245 // This function is a convenience wrapper around
246246 // [method@Gtk.ConstraintLayout.add_constraints_from_descriptionv], using
247247 // variadic arguments to populate the view/target map.
248-func (x *ConstraintLayout) AddConstraintsFromDescription(LinesVar uintptr, NLinesVar uint, HspacingVar int32, VspacingVar int32, ErrorVar **glib.Error, FirstViewVar string, varArgs ...interface{}) *glib.List {
248+func (x *ConstraintLayout) AddConstraintsFromDescription(LinesVar uintptr, NLinesVar uint, HspacingVar int, VspacingVar int, ErrorVar **glib.Error, FirstViewVar string, varArgs ...interface{}) *glib.List {
249249
250250 return xConstraintLayoutAddConstraintsFromDescription(x.GoPointer(), LinesVar, NLinesVar, HspacingVar, VspacingVar, ErrorVar, FirstViewVar, varArgs...)
251251
252252 }
253253
254-var xConstraintLayoutAddConstraintsFromDescriptionv func(uintptr, uintptr, uint, int32, int32, *glib.HashTable) *glib.List
254+var xConstraintLayoutAddConstraintsFromDescriptionv func(uintptr, uintptr, uint, int, int, *glib.HashTable) *glib.List
255255
256256 // Creates a list of constraints from a VFL description.
257257 //
@@ -334,7 +334,7 @@ var xConstraintLayoutAddConstraintsFromDescriptionv func(uintptr, uintptr, uint,
334334 // [button1(==button2.height)]
335335 //
336336 // ```
337-func (x *ConstraintLayout) AddConstraintsFromDescriptionv(LinesVar uintptr, NLinesVar uint, HspacingVar int32, VspacingVar int32, ViewsVar *glib.HashTable) *glib.List {
337+func (x *ConstraintLayout) AddConstraintsFromDescriptionv(LinesVar uintptr, NLinesVar uint, HspacingVar int, VspacingVar int, ViewsVar *glib.HashTable) *glib.List {
338338
339339 return xConstraintLayoutAddConstraintsFromDescriptionv(x.GoPointer(), LinesVar, NLinesVar, HspacingVar, VspacingVar, ViewsVar)
340340
M v4/gtk/gtkcustomlayout.go +2 -2
@@ -7,10 +7,10 @@ import (
77 )
88
99 // A function to be used by `GtkCustomLayout` to allocate a widget.
10-type CustomAllocateFunc func(uintptr, int32, int32, int32)
10+type CustomAllocateFunc func(uintptr, int, int, int)
1111
1212 // A function to be used by `GtkCustomLayout` to measure a widget.
13-type CustomMeasureFunc func(uintptr, Orientation, int32, int32, int32, int32, int32)
13+type CustomMeasureFunc func(uintptr, Orientation, int, int, int, int, int)
1414
1515 // Queries a widget for its preferred size request mode.
1616 type CustomRequestModeFunc func(uintptr) SizeRequestMode
M v4/gtk/gtkdialog.go +19 -19
@@ -267,7 +267,7 @@ func NewWithButtonsDialog(TitleVar string, ParentVar *Window, FlagsVar DialogFla
267267 return NewWithButtonsDialogCls
268268 }
269269
270-var xDialogAddActionWidget func(uintptr, uintptr, int32)
270+var xDialogAddActionWidget func(uintptr, uintptr, int)
271271
272272 // Adds an activatable widget to the action area of a `GtkDialog`.
273273 //
@@ -278,13 +278,13 @@ var xDialogAddActionWidget func(uintptr, uintptr, int32)
278278 //
279279 // If you want to add a non-activatable widget, simply pack it into
280280 // the @action_area field of the `GtkDialog` struct.
281-func (x *Dialog) AddActionWidget(ChildVar *Widget, ResponseIdVar int32) {
281+func (x *Dialog) AddActionWidget(ChildVar *Widget, ResponseIdVar int) {
282282
283283 xDialogAddActionWidget(x.GoPointer(), ChildVar.GoPointer(), ResponseIdVar)
284284
285285 }
286286
287-var xDialogAddButton func(uintptr, string, int32) uintptr
287+var xDialogAddButton func(uintptr, string, int) uintptr
288288
289289 // Adds a button with the given text.
290290 //
@@ -292,7 +292,7 @@ var xDialogAddButton func(uintptr, string, int32) uintptr
292292 // [signal@Gtk.Dialog::response] signal with the given @response_id.
293293 // The button is appended to the end of the dialog’s action area.
294294 // The button widget is returned, but usually you don’t need it.
295-func (x *Dialog) AddButton(ButtonTextVar string, ResponseIdVar int32) *Widget {
295+func (x *Dialog) AddButton(ButtonTextVar string, ResponseIdVar int) *Widget {
296296
297297 AddButtonPtr := xDialogAddButton(x.GoPointer(), ButtonTextVar, ResponseIdVar)
298298 if AddButtonPtr == 0 {
@@ -360,21 +360,21 @@ func (x *Dialog) GetHeaderBar() *HeaderBar {
360360
361361 }
362362
363-var xDialogGetResponseForWidget func(uintptr, uintptr) int32
363+var xDialogGetResponseForWidget func(uintptr, uintptr) int
364364
365365 // Gets the response id of a widget in the action area
366366 // of a dialog.
367-func (x *Dialog) GetResponseForWidget(WidgetVar *Widget) int32 {
367+func (x *Dialog) GetResponseForWidget(WidgetVar *Widget) int {
368368
369369 return xDialogGetResponseForWidget(x.GoPointer(), WidgetVar.GoPointer())
370370
371371 }
372372
373-var xDialogGetWidgetForResponse func(uintptr, int32) uintptr
373+var xDialogGetWidgetForResponse func(uintptr, int) uintptr
374374
375375 // Gets the widget button that uses the given response ID in the action area
376376 // of a dialog.
377-func (x *Dialog) GetWidgetForResponse(ResponseIdVar int32) *Widget {
377+func (x *Dialog) GetWidgetForResponse(ResponseIdVar int) *Widget {
378378
379379 GetWidgetForResponsePtr := xDialogGetWidgetForResponse(x.GoPointer(), ResponseIdVar)
380380 if GetWidgetForResponsePtr == 0 {
@@ -389,35 +389,35 @@ func (x *Dialog) GetWidgetForResponse(ResponseIdVar int32) *Widget {
389389
390390 }
391391
392-var xDialogResponse func(uintptr, int32)
392+var xDialogResponse func(uintptr, int)
393393
394394 // Emits the ::response signal with the given response ID.
395395 //
396396 // Used to indicate that the user has responded to the dialog in some way.
397-func (x *Dialog) Response(ResponseIdVar int32) {
397+func (x *Dialog) Response(ResponseIdVar int) {
398398
399399 xDialogResponse(x.GoPointer(), ResponseIdVar)
400400
401401 }
402402
403-var xDialogSetDefaultResponse func(uintptr, int32)
403+var xDialogSetDefaultResponse func(uintptr, int)
404404
405405 // Sets the default widget for the dialog based on the response ID.
406406 //
407407 // Pressing “Enter” normally activates the default widget.
408-func (x *Dialog) SetDefaultResponse(ResponseIdVar int32) {
408+func (x *Dialog) SetDefaultResponse(ResponseIdVar int) {
409409
410410 xDialogSetDefaultResponse(x.GoPointer(), ResponseIdVar)
411411
412412 }
413413
414-var xDialogSetResponseSensitive func(uintptr, int32, bool)
414+var xDialogSetResponseSensitive func(uintptr, int, bool)
415415
416416 // A convenient way to sensitize/desensitize dialog buttons.
417417 //
418418 // Calls `gtk_widget_set_sensitive (widget, @setting)`
419419 // for each widget in the dialog’s action area with the given @response_id.
420-func (x *Dialog) SetResponseSensitive(ResponseIdVar int32, SettingVar bool) {
420+func (x *Dialog) SetResponseSensitive(ResponseIdVar int, SettingVar bool) {
421421
422422 xDialogSetResponseSensitive(x.GoPointer(), ResponseIdVar, SettingVar)
423423
@@ -453,8 +453,8 @@ func (x *Dialog) ConnectClose(cb func(Dialog)) {
453453 // delete event, and when [method@Gtk.Dialog.response] is called.
454454 // On a delete event, the response ID is %GTK_RESPONSE_DELETE_EVENT.
455455 // Otherwise, it depends on which action widget was clicked.
456-func (x *Dialog) ConnectResponse(cb func(Dialog, int32)) {
457- fcb := func(clsPtr uintptr, ResponseIdVarp int32) {
456+func (x *Dialog) ConnectResponse(cb func(Dialog, int)) {
457+ fcb := func(clsPtr uintptr, ResponseIdVarp int) {
458458 fa := Dialog{}
459459 fa.Ptr = clsPtr
460460
@@ -522,7 +522,7 @@ func (x *Dialog) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...
522522 // property change must be communicated to assistive technologies.
523523 //
524524 // This function is meant to be used by language bindings.
525-func (x *Dialog) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
525+func (x *Dialog) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
526526
527527 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
528528
@@ -558,7 +558,7 @@ func (x *Dialog) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...
558558 // relation change must be communicated to assistive technologies.
559559 //
560560 // This function is meant to be used by language bindings.
561-func (x *Dialog) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
561+func (x *Dialog) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
562562
563563 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
564564
@@ -591,7 +591,7 @@ func (x *Dialog) UpdateState(FirstStateVar AccessibleState, varArgs ...interface
591591 // state change must be communicated to assistive technologies.
592592 //
593593 // This function is meant to be used by language bindings.
594-func (x *Dialog) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
594+func (x *Dialog) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
595595
596596 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
597597
M v4/gtk/gtkdirectorylist.go +4 -4
@@ -105,10 +105,10 @@ func (x *DirectoryList) GetFile() *gio.FileBase {
105105
106106 }
107107
108-var xDirectoryListGetIoPriority func(uintptr) int32
108+var xDirectoryListGetIoPriority func(uintptr) int
109109
110110 // Gets the IO priority set via gtk_directory_list_set_io_priority().
111-func (x *DirectoryList) GetIoPriority() int32 {
111+func (x *DirectoryList) GetIoPriority() int {
112112
113113 return xDirectoryListGetIoPriority(x.GoPointer())
114114
@@ -161,7 +161,7 @@ func (x *DirectoryList) SetFile(FileVar gio.File) {
161161
162162 }
163163
164-var xDirectoryListSetIoPriority func(uintptr, int32)
164+var xDirectoryListSetIoPriority func(uintptr, int)
165165
166166 // Sets the IO priority to use while loading directories.
167167 //
@@ -172,7 +172,7 @@ var xDirectoryListSetIoPriority func(uintptr, int32)
172172 // the GTK redraw priority. If you are loading a lot of directories in
173173 // parallel, lowering it to something like %G_PRIORITY_DEFAULT_IDLE
174174 // may increase responsiveness.
175-func (x *DirectoryList) SetIoPriority(IoPriorityVar int32) {
175+func (x *DirectoryList) SetIoPriority(IoPriorityVar int) {
176176
177177 xDirectoryListSetIoPriority(x.GoPointer(), IoPriorityVar)
178178
M v4/gtk/gtkdragicon.go +3 -3
@@ -127,7 +127,7 @@ func (x *DragIcon) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs .
127127 // property change must be communicated to assistive technologies.
128128 //
129129 // This function is meant to be used by language bindings.
130-func (x *DragIcon) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
130+func (x *DragIcon) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
131131
132132 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
133133
@@ -163,7 +163,7 @@ func (x *DragIcon) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs .
163163 // relation change must be communicated to assistive technologies.
164164 //
165165 // This function is meant to be used by language bindings.
166-func (x *DragIcon) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
166+func (x *DragIcon) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
167167
168168 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
169169
@@ -196,7 +196,7 @@ func (x *DragIcon) UpdateState(FirstStateVar AccessibleState, varArgs ...interfa
196196 // state change must be communicated to assistive technologies.
197197 //
198198 // This function is meant to be used by language bindings.
199-func (x *DragIcon) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
199+func (x *DragIcon) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
200200
201201 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
202202
M v4/gtk/gtkdragsource.go +2 -2
@@ -208,7 +208,7 @@ func (x *DragSource) SetContent(ContentVar *gdk.ContentProvider) {
208208
209209 }
210210
211-var xDragSourceSetIcon func(uintptr, uintptr, int32, int32)
211+var xDragSourceSetIcon func(uintptr, uintptr, int, int)
212212
213213 // Sets a paintable to use as icon during DND operations.
214214 //
@@ -220,7 +220,7 @@ var xDragSourceSetIcon func(uintptr, uintptr, int32, int32)
220220 // This function can be called before a drag is started, or in
221221 // a [signal@Gtk.DragSource::prepare] or
222222 // [signal@Gtk.DragSource::drag-begin] signal handler.
223-func (x *DragSource) SetIcon(PaintableVar gdk.Paintable, HotXVar int32, HotYVar int32) {
223+func (x *DragSource) SetIcon(PaintableVar gdk.Paintable, HotXVar int, HotYVar int) {
224224
225225 xDragSourceSetIcon(x.GoPointer(), PaintableVar.GoPointer(), HotXVar, HotYVar)
226226
M v4/gtk/gtkdrawingarea.go +14 -14
@@ -13,7 +13,7 @@ import (
1313 //
1414 // This function should exclusively redraw the contents of the drawing area
1515 // and must not call any widget functions that cause changes.
16-type DrawingAreaDrawFunc func(uintptr, *cairo.Context, int32, int32, uintptr)
16+type DrawingAreaDrawFunc func(uintptr, *cairo.Context, int, int, uintptr)
1717
1818 type DrawingAreaClass struct {
1919 ParentClass uintptr
@@ -132,25 +132,25 @@ func NewDrawingArea() *Widget {
132132 return NewDrawingAreaCls
133133 }
134134
135-var xDrawingAreaGetContentHeight func(uintptr) int32
135+var xDrawingAreaGetContentHeight func(uintptr) int
136136
137137 // Retrieves the content height of the `GtkDrawingArea`.
138-func (x *DrawingArea) GetContentHeight() int32 {
138+func (x *DrawingArea) GetContentHeight() int {
139139
140140 return xDrawingAreaGetContentHeight(x.GoPointer())
141141
142142 }
143143
144-var xDrawingAreaGetContentWidth func(uintptr) int32
144+var xDrawingAreaGetContentWidth func(uintptr) int
145145
146146 // Retrieves the content width of the `GtkDrawingArea`.
147-func (x *DrawingArea) GetContentWidth() int32 {
147+func (x *DrawingArea) GetContentWidth() int {
148148
149149 return xDrawingAreaGetContentWidth(x.GoPointer())
150150
151151 }
152152
153-var xDrawingAreaSetContentHeight func(uintptr, int32)
153+var xDrawingAreaSetContentHeight func(uintptr, int)
154154
155155 // Sets the desired height of the contents of the drawing area.
156156 //
@@ -160,13 +160,13 @@ var xDrawingAreaSetContentHeight func(uintptr, int32)
160160 // [method@Gtk.Widget.set_valign] to avoid that.
161161 //
162162 // If the height is set to 0 (the default), the drawing area may disappear.
163-func (x *DrawingArea) SetContentHeight(HeightVar int32) {
163+func (x *DrawingArea) SetContentHeight(HeightVar int) {
164164
165165 xDrawingAreaSetContentHeight(x.GoPointer(), HeightVar)
166166
167167 }
168168
169-var xDrawingAreaSetContentWidth func(uintptr, int32)
169+var xDrawingAreaSetContentWidth func(uintptr, int)
170170
171171 // Sets the desired width of the contents of the drawing area.
172172 //
@@ -176,7 +176,7 @@ var xDrawingAreaSetContentWidth func(uintptr, int32)
176176 // [method@Gtk.Widget.set_halign] to avoid that.
177177 //
178178 // If the width is set to 0 (the default), the drawing area may disappear.
179-func (x *DrawingArea) SetContentWidth(WidthVar int32) {
179+func (x *DrawingArea) SetContentWidth(WidthVar int) {
180180
181181 xDrawingAreaSetContentWidth(x.GoPointer(), WidthVar)
182182
@@ -217,8 +217,8 @@ func (c *DrawingArea) SetGoPointer(ptr uintptr) {
217217 //
218218 // This is useful in order to keep state up to date with the widget size,
219219 // like for instance a backing surface.
220-func (x *DrawingArea) ConnectResize(cb func(DrawingArea, int32, int32)) {
221- fcb := func(clsPtr uintptr, WidthVarp int32, HeightVarp int32) {
220+func (x *DrawingArea) ConnectResize(cb func(DrawingArea, int, int)) {
221+ fcb := func(clsPtr uintptr, WidthVarp int, HeightVarp int) {
222222 fa := DrawingArea{}
223223 fa.Ptr = clsPtr
224224
@@ -286,7 +286,7 @@ func (x *DrawingArea) UpdateProperty(FirstPropertyVar AccessibleProperty, varArg
286286 // property change must be communicated to assistive technologies.
287287 //
288288 // This function is meant to be used by language bindings.
289-func (x *DrawingArea) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
289+func (x *DrawingArea) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
290290
291291 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
292292
@@ -322,7 +322,7 @@ func (x *DrawingArea) UpdateRelation(FirstRelationVar AccessibleRelation, varArg
322322 // relation change must be communicated to assistive technologies.
323323 //
324324 // This function is meant to be used by language bindings.
325-func (x *DrawingArea) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
325+func (x *DrawingArea) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
326326
327327 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
328328
@@ -355,7 +355,7 @@ func (x *DrawingArea) UpdateState(FirstStateVar AccessibleState, varArgs ...inte
355355 // state change must be communicated to assistive technologies.
356356 //
357357 // This function is meant to be used by language bindings.
358-func (x *DrawingArea) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
358+func (x *DrawingArea) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
359359
360360 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
361361
M v4/gtk/gtkdropdown.go +3 -3
@@ -376,7 +376,7 @@ func (x *DropDown) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs .
376376 // property change must be communicated to assistive technologies.
377377 //
378378 // This function is meant to be used by language bindings.
379-func (x *DropDown) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
379+func (x *DropDown) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
380380
381381 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
382382
@@ -412,7 +412,7 @@ func (x *DropDown) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs .
412412 // relation change must be communicated to assistive technologies.
413413 //
414414 // This function is meant to be used by language bindings.
415-func (x *DropDown) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
415+func (x *DropDown) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
416416
417417 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
418418
@@ -445,7 +445,7 @@ func (x *DropDown) UpdateState(FirstStateVar AccessibleState, varArgs ...interfa
445445 // state change must be communicated to assistive technologies.
446446 //
447447 // This function is meant to be used by language bindings.
448-func (x *DropDown) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
448+func (x *DropDown) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
449449
450450 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
451451
M v4/gtk/gtkeditable.go +33 -33
@@ -157,28 +157,28 @@ type Editable interface {
157157 GoPointer() uintptr
158158 SetGoPointer(uintptr)
159159 DeleteSelection()
160- DeleteText(StartPosVar int32, EndPosVar int32)
160+ DeleteText(StartPosVar int, EndPosVar int)
161161 FinishDelegate()
162162 GetAlignment() float32
163- GetChars(StartPosVar int32, EndPosVar int32) string
163+ GetChars(StartPosVar int, EndPosVar int) string
164164 GetDelegate() *EditableBase
165165 GetEditable() bool
166166 GetEnableUndo() bool
167- GetMaxWidthChars() int32
168- GetPosition() int32
169- GetSelectionBounds(StartPosVar int32, EndPosVar int32) bool
167+ GetMaxWidthChars() int
168+ GetPosition() int
169+ GetSelectionBounds(StartPosVar int, EndPosVar int) bool
170170 GetText() string
171- GetWidthChars() int32
171+ GetWidthChars() int
172172 InitDelegate()
173- InsertText(TextVar string, LengthVar int32, PositionVar int32)
174- SelectRegion(StartPosVar int32, EndPosVar int32)
173+ InsertText(TextVar string, LengthVar int, PositionVar int)
174+ SelectRegion(StartPosVar int, EndPosVar int)
175175 SetAlignment(XalignVar float32)
176176 SetEditable(IsEditableVar bool)
177177 SetEnableUndo(EnableUndoVar bool)
178- SetMaxWidthChars(NCharsVar int32)
179- SetPosition(PositionVar int32)
178+ SetMaxWidthChars(NCharsVar int)
179+ SetPosition(PositionVar int)
180180 SetText(TextVar string)
181- SetWidthChars(NCharsVar int32)
181+ SetWidthChars(NCharsVar int)
182182 }
183183 type EditableBase struct {
184184 Ptr uintptr
@@ -209,7 +209,7 @@ func (x *EditableBase) DeleteSelection() {
209209 // the end of the text.
210210 //
211211 // Note that the positions are specified in characters, not bytes.
212-func (x *EditableBase) DeleteText(StartPosVar int32, EndPosVar int32) {
212+func (x *EditableBase) DeleteText(StartPosVar int, EndPosVar int) {
213213
214214 XGtkEditableDeleteText(x.GoPointer(), StartPosVar, EndPosVar)
215215
@@ -240,7 +240,7 @@ func (x *EditableBase) GetAlignment() float32 {
240240 // the end of the text.
241241 //
242242 // Note that positions are specified in characters, not bytes.
243-func (x *EditableBase) GetChars(StartPosVar int32, EndPosVar int32) string {
243+func (x *EditableBase) GetChars(StartPosVar int, EndPosVar int) string {
244244
245245 return XGtkEditableGetChars(x.GoPointer(), StartPosVar, EndPosVar)
246246
@@ -280,7 +280,7 @@ func (x *EditableBase) GetEnableUndo() bool {
280280 }
281281
282282 // Retrieves the desired maximum width of @editable, in characters.
283-func (x *EditableBase) GetMaxWidthChars() int32 {
283+func (x *EditableBase) GetMaxWidthChars() int {
284284
285285 return XGtkEditableGetMaxWidthChars(x.GoPointer())
286286
@@ -290,7 +290,7 @@ func (x *EditableBase) GetMaxWidthChars() int32 {
290290 // to the start of the content of the editable.
291291 //
292292 // Note that this position is in characters, not in bytes.
293-func (x *EditableBase) GetPosition() int32 {
293+func (x *EditableBase) GetPosition() int {
294294
295295 return XGtkEditableGetPosition(x.GoPointer())
296296
@@ -303,7 +303,7 @@ func (x *EditableBase) GetPosition() int32 {
303303 // and %FALSE will be returned.
304304 //
305305 // Note that positions are specified in characters, not bytes.
306-func (x *EditableBase) GetSelectionBounds(StartPosVar int32, EndPosVar int32) bool {
306+func (x *EditableBase) GetSelectionBounds(StartPosVar int, EndPosVar int) bool {
307307
308308 return XGtkEditableGetSelectionBounds(x.GoPointer(), StartPosVar, EndPosVar)
309309
@@ -320,7 +320,7 @@ func (x *EditableBase) GetText() string {
320320
321321 // Gets the number of characters of space reserved
322322 // for the contents of the editable.
323-func (x *EditableBase) GetWidthChars() int32 {
323+func (x *EditableBase) GetWidthChars() int {
324324
325325 return XGtkEditableGetWidthChars(x.GoPointer())
326326
@@ -345,7 +345,7 @@ func (x *EditableBase) InitDelegate() {
345345 // Note that the position is in characters, not in bytes.
346346 // The function updates @position to point after the newly
347347 // inserted text.
348-func (x *EditableBase) InsertText(TextVar string, LengthVar int32, PositionVar int32) {
348+func (x *EditableBase) InsertText(TextVar string, LengthVar int, PositionVar int) {
349349
350350 XGtkEditableInsertText(x.GoPointer(), TextVar, LengthVar, PositionVar)
351351
@@ -359,7 +359,7 @@ func (x *EditableBase) InsertText(TextVar string, LengthVar int32, PositionVar i
359359 // @start_pos to the end of the text.
360360 //
361361 // Note that positions are specified in characters, not bytes.
362-func (x *EditableBase) SelectRegion(StartPosVar int32, EndPosVar int32) {
362+func (x *EditableBase) SelectRegion(StartPosVar int, EndPosVar int) {
363363
364364 XGtkEditableSelectRegion(x.GoPointer(), StartPosVar, EndPosVar)
365365
@@ -395,7 +395,7 @@ func (x *EditableBase) SetEnableUndo(EnableUndoVar bool) {
395395 }
396396
397397 // Sets the desired maximum width in characters of @editable.
398-func (x *EditableBase) SetMaxWidthChars(NCharsVar int32) {
398+func (x *EditableBase) SetMaxWidthChars(NCharsVar int) {
399399
400400 XGtkEditableSetMaxWidthChars(x.GoPointer(), NCharsVar)
401401
@@ -408,7 +408,7 @@ func (x *EditableBase) SetMaxWidthChars(NCharsVar int32) {
408408 // or equal to the number of characters in the editable. A value of -1
409409 // indicates that the position should be set after the last character
410410 // of the editable. Note that @position is in characters, not in bytes.
411-func (x *EditableBase) SetPosition(PositionVar int32) {
411+func (x *EditableBase) SetPosition(PositionVar int) {
412412
413413 XGtkEditableSetPosition(x.GoPointer(), PositionVar)
414414
@@ -429,35 +429,35 @@ func (x *EditableBase) SetText(TextVar string) {
429429 // Note that it changes the size request, the size can still
430430 // be affected by how you pack the widget into containers.
431431 // If @n_chars is -1, the size reverts to the default size.
432-func (x *EditableBase) SetWidthChars(NCharsVar int32) {
432+func (x *EditableBase) SetWidthChars(NCharsVar int) {
433433
434434 XGtkEditableSetWidthChars(x.GoPointer(), NCharsVar)
435435
436436 }
437437
438438 var XGtkEditableDeleteSelection func(uintptr)
439-var XGtkEditableDeleteText func(uintptr, int32, int32)
439+var XGtkEditableDeleteText func(uintptr, int, int)
440440 var XGtkEditableFinishDelegate func(uintptr)
441441 var XGtkEditableGetAlignment func(uintptr) float32
442-var XGtkEditableGetChars func(uintptr, int32, int32) string
442+var XGtkEditableGetChars func(uintptr, int, int) string
443443 var XGtkEditableGetDelegate func(uintptr) uintptr
444444 var XGtkEditableGetEditable func(uintptr) bool
445445 var XGtkEditableGetEnableUndo func(uintptr) bool
446-var XGtkEditableGetMaxWidthChars func(uintptr) int32
447-var XGtkEditableGetPosition func(uintptr) int32
448-var XGtkEditableGetSelectionBounds func(uintptr, int32, int32) bool
446+var XGtkEditableGetMaxWidthChars func(uintptr) int
447+var XGtkEditableGetPosition func(uintptr) int
448+var XGtkEditableGetSelectionBounds func(uintptr, int, int) bool
449449 var XGtkEditableGetText func(uintptr) string
450-var XGtkEditableGetWidthChars func(uintptr) int32
450+var XGtkEditableGetWidthChars func(uintptr) int
451451 var XGtkEditableInitDelegate func(uintptr)
452-var XGtkEditableInsertText func(uintptr, string, int32, int32)
453-var XGtkEditableSelectRegion func(uintptr, int32, int32)
452+var XGtkEditableInsertText func(uintptr, string, int, int)
453+var XGtkEditableSelectRegion func(uintptr, int, int)
454454 var XGtkEditableSetAlignment func(uintptr, float32)
455455 var XGtkEditableSetEditable func(uintptr, bool)
456456 var XGtkEditableSetEnableUndo func(uintptr, bool)
457-var XGtkEditableSetMaxWidthChars func(uintptr, int32)
458-var XGtkEditableSetPosition func(uintptr, int32)
457+var XGtkEditableSetMaxWidthChars func(uintptr, int)
458+var XGtkEditableSetPosition func(uintptr, int)
459459 var XGtkEditableSetText func(uintptr, string)
460-var XGtkEditableSetWidthChars func(uintptr, int32)
460+var XGtkEditableSetWidthChars func(uintptr, int)
461461
462462 // The identifiers for [iface@Gtk.Editable] properties.
463463 //
M v4/gtk/gtkeditablelabel.go +14 -14
@@ -165,7 +165,7 @@ func (x *EditableLabel) UpdateProperty(FirstPropertyVar AccessibleProperty, varA
165165 // property change must be communicated to assistive technologies.
166166 //
167167 // This function is meant to be used by language bindings.
168-func (x *EditableLabel) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
168+func (x *EditableLabel) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
169169
170170 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
171171
@@ -201,7 +201,7 @@ func (x *EditableLabel) UpdateRelation(FirstRelationVar AccessibleRelation, varA
201201 // relation change must be communicated to assistive technologies.
202202 //
203203 // This function is meant to be used by language bindings.
204-func (x *EditableLabel) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
204+func (x *EditableLabel) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
205205
206206 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
207207
@@ -234,7 +234,7 @@ func (x *EditableLabel) UpdateState(FirstStateVar AccessibleState, varArgs ...in
234234 // state change must be communicated to assistive technologies.
235235 //
236236 // This function is meant to be used by language bindings.
237-func (x *EditableLabel) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
237+func (x *EditableLabel) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
238238
239239 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
240240
@@ -267,7 +267,7 @@ func (x *EditableLabel) DeleteSelection() {
267267 // the end of the text.
268268 //
269269 // Note that the positions are specified in characters, not bytes.
270-func (x *EditableLabel) DeleteText(StartPosVar int32, EndPosVar int32) {
270+func (x *EditableLabel) DeleteText(StartPosVar int, EndPosVar int) {
271271
272272 XGtkEditableDeleteText(x.GoPointer(), StartPosVar, EndPosVar)
273273
@@ -298,7 +298,7 @@ func (x *EditableLabel) GetAlignment() float32 {
298298 // the end of the text.
299299 //
300300 // Note that positions are specified in characters, not bytes.
301-func (x *EditableLabel) GetChars(StartPosVar int32, EndPosVar int32) string {
301+func (x *EditableLabel) GetChars(StartPosVar int, EndPosVar int) string {
302302
303303 return XGtkEditableGetChars(x.GoPointer(), StartPosVar, EndPosVar)
304304
@@ -338,7 +338,7 @@ func (x *EditableLabel) GetEnableUndo() bool {
338338 }
339339
340340 // Retrieves the desired maximum width of @editable, in characters.
341-func (x *EditableLabel) GetMaxWidthChars() int32 {
341+func (x *EditableLabel) GetMaxWidthChars() int {
342342
343343 return XGtkEditableGetMaxWidthChars(x.GoPointer())
344344
@@ -348,7 +348,7 @@ func (x *EditableLabel) GetMaxWidthChars() int32 {
348348 // to the start of the content of the editable.
349349 //
350350 // Note that this position is in characters, not in bytes.
351-func (x *EditableLabel) GetPosition() int32 {
351+func (x *EditableLabel) GetPosition() int {
352352
353353 return XGtkEditableGetPosition(x.GoPointer())
354354
@@ -361,7 +361,7 @@ func (x *EditableLabel) GetPosition() int32 {
361361 // and %FALSE will be returned.
362362 //
363363 // Note that positions are specified in characters, not bytes.
364-func (x *EditableLabel) GetSelectionBounds(StartPosVar int32, EndPosVar int32) bool {
364+func (x *EditableLabel) GetSelectionBounds(StartPosVar int, EndPosVar int) bool {
365365
366366 return XGtkEditableGetSelectionBounds(x.GoPointer(), StartPosVar, EndPosVar)
367367
@@ -378,7 +378,7 @@ func (x *EditableLabel) GetText() string {
378378
379379 // Gets the number of characters of space reserved
380380 // for the contents of the editable.
381-func (x *EditableLabel) GetWidthChars() int32 {
381+func (x *EditableLabel) GetWidthChars() int {
382382
383383 return XGtkEditableGetWidthChars(x.GoPointer())
384384
@@ -403,7 +403,7 @@ func (x *EditableLabel) InitDelegate() {
403403 // Note that the position is in characters, not in bytes.
404404 // The function updates @position to point after the newly
405405 // inserted text.
406-func (x *EditableLabel) InsertText(TextVar string, LengthVar int32, PositionVar int32) {
406+func (x *EditableLabel) InsertText(TextVar string, LengthVar int, PositionVar int) {
407407
408408 XGtkEditableInsertText(x.GoPointer(), TextVar, LengthVar, PositionVar)
409409
@@ -417,7 +417,7 @@ func (x *EditableLabel) InsertText(TextVar string, LengthVar int32, PositionVar
417417 // @start_pos to the end of the text.
418418 //
419419 // Note that positions are specified in characters, not bytes.
420-func (x *EditableLabel) SelectRegion(StartPosVar int32, EndPosVar int32) {
420+func (x *EditableLabel) SelectRegion(StartPosVar int, EndPosVar int) {
421421
422422 XGtkEditableSelectRegion(x.GoPointer(), StartPosVar, EndPosVar)
423423
@@ -453,7 +453,7 @@ func (x *EditableLabel) SetEnableUndo(EnableUndoVar bool) {
453453 }
454454
455455 // Sets the desired maximum width in characters of @editable.
456-func (x *EditableLabel) SetMaxWidthChars(NCharsVar int32) {
456+func (x *EditableLabel) SetMaxWidthChars(NCharsVar int) {
457457
458458 XGtkEditableSetMaxWidthChars(x.GoPointer(), NCharsVar)
459459
@@ -466,7 +466,7 @@ func (x *EditableLabel) SetMaxWidthChars(NCharsVar int32) {
466466 // or equal to the number of characters in the editable. A value of -1
467467 // indicates that the position should be set after the last character
468468 // of the editable. Note that @position is in characters, not in bytes.
469-func (x *EditableLabel) SetPosition(PositionVar int32) {
469+func (x *EditableLabel) SetPosition(PositionVar int) {
470470
471471 XGtkEditableSetPosition(x.GoPointer(), PositionVar)
472472
@@ -487,7 +487,7 @@ func (x *EditableLabel) SetText(TextVar string) {
487487 // Note that it changes the size request, the size can still
488488 // be affected by how you pack the widget into containers.
489489 // If @n_chars is -1, the size reverts to the default size.
490-func (x *EditableLabel) SetWidthChars(NCharsVar int32) {
490+func (x *EditableLabel) SetWidthChars(NCharsVar int) {
491491
492492 XGtkEditableSetWidthChars(x.GoPointer(), NCharsVar)
493493
M v4/gtk/gtkemojichooser.go +3 -3
@@ -146,7 +146,7 @@ func (x *EmojiChooser) UpdateProperty(FirstPropertyVar AccessibleProperty, varAr
146146 // property change must be communicated to assistive technologies.
147147 //
148148 // This function is meant to be used by language bindings.
149-func (x *EmojiChooser) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
149+func (x *EmojiChooser) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
150150
151151 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
152152
@@ -182,7 +182,7 @@ func (x *EmojiChooser) UpdateRelation(FirstRelationVar AccessibleRelation, varAr
182182 // relation change must be communicated to assistive technologies.
183183 //
184184 // This function is meant to be used by language bindings.
185-func (x *EmojiChooser) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
185+func (x *EmojiChooser) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
186186
187187 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
188188
@@ -215,7 +215,7 @@ func (x *EmojiChooser) UpdateState(FirstStateVar AccessibleState, varArgs ...int
215215 // state change must be communicated to assistive technologies.
216216 //
217217 // This function is meant to be used by language bindings.
218-func (x *EmojiChooser) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
218+func (x *EmojiChooser) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
219219
220220 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
221221
M v4/gtk/gtkentry.go +22 -22
@@ -232,11 +232,11 @@ func (x *Entry) GetCompletion() *EntryCompletion {
232232
233233 }
234234
235-var xEntryGetCurrentIconDragSource func(uintptr) int32
235+var xEntryGetCurrentIconDragSource func(uintptr) int
236236
237237 // Returns the index of the icon which is the source of the
238238 // current DND operation, or -1.
239-func (x *Entry) GetCurrentIconDragSource() int32 {
239+func (x *Entry) GetCurrentIconDragSource() int {
240240
241241 return xEntryGetCurrentIconDragSource(x.GoPointer())
242242
@@ -295,7 +295,7 @@ func (x *Entry) GetIconArea(IconPosVar EntryIconPosition, IconAreaVar *gdk.Recta
295295
296296 }
297297
298-var xEntryGetIconAtPos func(uintptr, int32, int32) int32
298+var xEntryGetIconAtPos func(uintptr, int, int) int
299299
300300 // Finds the icon at the given position and return its index.
301301 //
@@ -304,7 +304,7 @@ var xEntryGetIconAtPos func(uintptr, int32, int32) int32
304304 // -1 is returned. This function is intended for use in a
305305 //
306306 // [signal@Gtk.Widget::query-tooltip] signal handler.
307-func (x *Entry) GetIconAtPos(XVar int32, YVar int32) int32 {
307+func (x *Entry) GetIconAtPos(XVar int, YVar int) int {
308308
309309 return xEntryGetIconAtPos(x.GoPointer(), XVar, YVar)
310310
@@ -433,12 +433,12 @@ func (x *Entry) GetInvisibleChar() uint32 {
433433
434434 }
435435
436-var xEntryGetMaxLength func(uintptr) int32
436+var xEntryGetMaxLength func(uintptr) int
437437
438438 // Retrieves the maximum allowed length of the text in @entry.
439439 //
440440 // See [method@Gtk.Entry.set_max_length].
441-func (x *Entry) GetMaxLength() int32 {
441+func (x *Entry) GetMaxLength() int {
442442
443443 return xEntryGetMaxLength(x.GoPointer())
444444
@@ -798,7 +798,7 @@ func (x *Entry) SetInvisibleChar(ChVar uint32) {
798798
799799 }
800800
801-var xEntrySetMaxLength func(uintptr, int32)
801+var xEntrySetMaxLength func(uintptr, int)
802802
803803 // Sets the maximum allowed length of the contents of the widget.
804804 //
@@ -807,7 +807,7 @@ var xEntrySetMaxLength func(uintptr, int32)
807807 //
808808 // This is equivalent to getting @entry's `GtkEntryBuffer` and
809809 // calling [method@Gtk.EntryBuffer.set_max_length] on it.
810-func (x *Entry) SetMaxLength(MaxVar int32) {
810+func (x *Entry) SetMaxLength(MaxVar int) {
811811
812812 xEntrySetMaxLength(x.GoPointer(), MaxVar)
813813
@@ -1007,7 +1007,7 @@ func (x *Entry) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...i
10071007 // property change must be communicated to assistive technologies.
10081008 //
10091009 // This function is meant to be used by language bindings.
1010-func (x *Entry) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
1010+func (x *Entry) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
10111011
10121012 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
10131013
@@ -1043,7 +1043,7 @@ func (x *Entry) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...i
10431043 // relation change must be communicated to assistive technologies.
10441044 //
10451045 // This function is meant to be used by language bindings.
1046-func (x *Entry) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
1046+func (x *Entry) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
10471047
10481048 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
10491049
@@ -1076,7 +1076,7 @@ func (x *Entry) UpdateState(FirstStateVar AccessibleState, varArgs ...interface{
10761076 // state change must be communicated to assistive technologies.
10771077 //
10781078 // This function is meant to be used by language bindings.
1079-func (x *Entry) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
1079+func (x *Entry) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
10801080
10811081 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
10821082
@@ -1139,7 +1139,7 @@ func (x *Entry) DeleteSelection() {
11391139 // the end of the text.
11401140 //
11411141 // Note that the positions are specified in characters, not bytes.
1142-func (x *Entry) DeleteText(StartPosVar int32, EndPosVar int32) {
1142+func (x *Entry) DeleteText(StartPosVar int, EndPosVar int) {
11431143
11441144 XGtkEditableDeleteText(x.GoPointer(), StartPosVar, EndPosVar)
11451145
@@ -1163,7 +1163,7 @@ func (x *Entry) FinishDelegate() {
11631163 // the end of the text.
11641164 //
11651165 // Note that positions are specified in characters, not bytes.
1166-func (x *Entry) GetChars(StartPosVar int32, EndPosVar int32) string {
1166+func (x *Entry) GetChars(StartPosVar int, EndPosVar int) string {
11671167
11681168 return XGtkEditableGetChars(x.GoPointer(), StartPosVar, EndPosVar)
11691169
@@ -1203,7 +1203,7 @@ func (x *Entry) GetEnableUndo() bool {
12031203 }
12041204
12051205 // Retrieves the desired maximum width of @editable, in characters.
1206-func (x *Entry) GetMaxWidthChars() int32 {
1206+func (x *Entry) GetMaxWidthChars() int {
12071207
12081208 return XGtkEditableGetMaxWidthChars(x.GoPointer())
12091209
@@ -1213,7 +1213,7 @@ func (x *Entry) GetMaxWidthChars() int32 {
12131213 // to the start of the content of the editable.
12141214 //
12151215 // Note that this position is in characters, not in bytes.
1216-func (x *Entry) GetPosition() int32 {
1216+func (x *Entry) GetPosition() int {
12171217
12181218 return XGtkEditableGetPosition(x.GoPointer())
12191219
@@ -1226,7 +1226,7 @@ func (x *Entry) GetPosition() int32 {
12261226 // and %FALSE will be returned.
12271227 //
12281228 // Note that positions are specified in characters, not bytes.
1229-func (x *Entry) GetSelectionBounds(StartPosVar int32, EndPosVar int32) bool {
1229+func (x *Entry) GetSelectionBounds(StartPosVar int, EndPosVar int) bool {
12301230
12311231 return XGtkEditableGetSelectionBounds(x.GoPointer(), StartPosVar, EndPosVar)
12321232
@@ -1243,7 +1243,7 @@ func (x *Entry) GetText() string {
12431243
12441244 // Gets the number of characters of space reserved
12451245 // for the contents of the editable.
1246-func (x *Entry) GetWidthChars() int32 {
1246+func (x *Entry) GetWidthChars() int {
12471247
12481248 return XGtkEditableGetWidthChars(x.GoPointer())
12491249
@@ -1268,7 +1268,7 @@ func (x *Entry) InitDelegate() {
12681268 // Note that the position is in characters, not in bytes.
12691269 // The function updates @position to point after the newly
12701270 // inserted text.
1271-func (x *Entry) InsertText(TextVar string, LengthVar int32, PositionVar int32) {
1271+func (x *Entry) InsertText(TextVar string, LengthVar int, PositionVar int) {
12721272
12731273 XGtkEditableInsertText(x.GoPointer(), TextVar, LengthVar, PositionVar)
12741274
@@ -1282,7 +1282,7 @@ func (x *Entry) InsertText(TextVar string, LengthVar int32, PositionVar int32) {
12821282 // @start_pos to the end of the text.
12831283 //
12841284 // Note that positions are specified in characters, not bytes.
1285-func (x *Entry) SelectRegion(StartPosVar int32, EndPosVar int32) {
1285+func (x *Entry) SelectRegion(StartPosVar int, EndPosVar int) {
12861286
12871287 XGtkEditableSelectRegion(x.GoPointer(), StartPosVar, EndPosVar)
12881288
@@ -1308,7 +1308,7 @@ func (x *Entry) SetEnableUndo(EnableUndoVar bool) {
13081308 }
13091309
13101310 // Sets the desired maximum width in characters of @editable.
1311-func (x *Entry) SetMaxWidthChars(NCharsVar int32) {
1311+func (x *Entry) SetMaxWidthChars(NCharsVar int) {
13121312
13131313 XGtkEditableSetMaxWidthChars(x.GoPointer(), NCharsVar)
13141314
@@ -1321,7 +1321,7 @@ func (x *Entry) SetMaxWidthChars(NCharsVar int32) {
13211321 // or equal to the number of characters in the editable. A value of -1
13221322 // indicates that the position should be set after the last character
13231323 // of the editable. Note that @position is in characters, not in bytes.
1324-func (x *Entry) SetPosition(PositionVar int32) {
1324+func (x *Entry) SetPosition(PositionVar int) {
13251325
13261326 XGtkEditableSetPosition(x.GoPointer(), PositionVar)
13271327
@@ -1342,7 +1342,7 @@ func (x *Entry) SetText(TextVar string) {
13421342 // Note that it changes the size request, the size can still
13431343 // be affected by how you pack the widget into containers.
13441344 // If @n_chars is -1, the size reverts to the default size.
1345-func (x *Entry) SetWidthChars(NCharsVar int32) {
1345+func (x *Entry) SetWidthChars(NCharsVar int) {
13461346
13471347 XGtkEditableSetWidthChars(x.GoPointer(), NCharsVar)
13481348
M v4/gtk/gtkentrybuffer.go +12 -12
@@ -31,12 +31,12 @@ func EntryBufferNewFromInternalPtr(ptr uintptr) *EntryBuffer {
3131 return cls
3232 }
3333
34-var xNewEntryBuffer func(string, int32) uintptr
34+var xNewEntryBuffer func(string, int) uintptr
3535
3636 // Create a new `GtkEntryBuffer` object.
3737 //
3838 // Optionally, specify initial text to set in the buffer.
39-func NewEntryBuffer(InitialCharsVar string, NInitialCharsVar int32) *EntryBuffer {
39+func NewEntryBuffer(InitialCharsVar string, NInitialCharsVar int) *EntryBuffer {
4040 NewEntryBufferPtr := xNewEntryBuffer(InitialCharsVar, NInitialCharsVar)
4141 if NewEntryBufferPtr == 0 {
4242 return nil
@@ -47,7 +47,7 @@ func NewEntryBuffer(InitialCharsVar string, NInitialCharsVar int32) *EntryBuffer
4747 return NewEntryBufferCls
4848 }
4949
50-var xEntryBufferDeleteText func(uintptr, uint, int32) uint
50+var xEntryBufferDeleteText func(uintptr, uint, int) uint
5151
5252 // Deletes a sequence of characters from the buffer.
5353 //
@@ -60,7 +60,7 @@ var xEntryBufferDeleteText func(uintptr, uint, int32) uint
6060 //
6161 // Note that the positions are specified in characters,
6262 // not bytes.
63-func (x *EntryBuffer) DeleteText(PositionVar uint, NCharsVar int32) uint {
63+func (x *EntryBuffer) DeleteText(PositionVar uint, NCharsVar int) uint {
6464
6565 return xEntryBufferDeleteText(x.GoPointer(), PositionVar, NCharsVar)
6666
@@ -104,10 +104,10 @@ func (x *EntryBuffer) GetLength() uint {
104104
105105 }
106106
107-var xEntryBufferGetMaxLength func(uintptr) int32
107+var xEntryBufferGetMaxLength func(uintptr) int
108108
109109 // Retrieves the maximum allowed length of the text in @buffer.
110-func (x *EntryBuffer) GetMaxLength() int32 {
110+func (x *EntryBuffer) GetMaxLength() int {
111111
112112 return xEntryBufferGetMaxLength(x.GoPointer())
113113
@@ -125,7 +125,7 @@ func (x *EntryBuffer) GetText() string {
125125
126126 }
127127
128-var xEntryBufferInsertText func(uintptr, uint, string, int32) uint
128+var xEntryBufferInsertText func(uintptr, uint, string, int) uint
129129
130130 // Inserts @n_chars characters of @chars into the contents of the
131131 // buffer, at position @position.
@@ -136,25 +136,25 @@ var xEntryBufferInsertText func(uintptr, uint, string, int32) uint
136136 // coerced to sane values.
137137 //
138138 // Note that the position and length are in characters, not in bytes.
139-func (x *EntryBuffer) InsertText(PositionVar uint, CharsVar string, NCharsVar int32) uint {
139+func (x *EntryBuffer) InsertText(PositionVar uint, CharsVar string, NCharsVar int) uint {
140140
141141 return xEntryBufferInsertText(x.GoPointer(), PositionVar, CharsVar, NCharsVar)
142142
143143 }
144144
145-var xEntryBufferSetMaxLength func(uintptr, int32)
145+var xEntryBufferSetMaxLength func(uintptr, int)
146146
147147 // Sets the maximum allowed length of the contents of the buffer.
148148 //
149149 // If the current contents are longer than the given length, then
150150 // they will be truncated to fit.
151-func (x *EntryBuffer) SetMaxLength(MaxLengthVar int32) {
151+func (x *EntryBuffer) SetMaxLength(MaxLengthVar int) {
152152
153153 xEntryBufferSetMaxLength(x.GoPointer(), MaxLengthVar)
154154
155155 }
156156
157-var xEntryBufferSetText func(uintptr, string, int32)
157+var xEntryBufferSetText func(uintptr, string, int)
158158
159159 // Sets the text in the buffer.
160160 //
@@ -163,7 +163,7 @@ var xEntryBufferSetText func(uintptr, string, int32)
163163 // [method@Gtk.EntryBuffer.insert_text].
164164 //
165165 // Note that @n_chars is in characters, not in bytes.
166-func (x *EntryBuffer) SetText(CharsVar string, NCharsVar int32) {
166+func (x *EntryBuffer) SetText(CharsVar string, NCharsVar int) {
167167
168168 xEntryBufferSetText(x.GoPointer(), CharsVar, NCharsVar)
169169
M v4/gtk/gtkentrycompletion.go +10 -10
@@ -170,10 +170,10 @@ func (x *EntryCompletion) GetInlineSelection() bool {
170170
171171 }
172172
173-var xEntryCompletionGetMinimumKeyLength func(uintptr) int32
173+var xEntryCompletionGetMinimumKeyLength func(uintptr) int
174174
175175 // Returns the minimum key length as set for @completion.
176-func (x *EntryCompletion) GetMinimumKeyLength() int32 {
176+func (x *EntryCompletion) GetMinimumKeyLength() int {
177177
178178 return xEntryCompletionGetMinimumKeyLength(x.GoPointer())
179179
@@ -228,10 +228,10 @@ func (x *EntryCompletion) GetPopupSingleMatch() bool {
228228
229229 }
230230
231-var xEntryCompletionGetTextColumn func(uintptr) int32
231+var xEntryCompletionGetTextColumn func(uintptr) int
232232
233233 // Returns the column in the model of @completion to get strings from.
234-func (x *EntryCompletion) GetTextColumn() int32 {
234+func (x *EntryCompletion) GetTextColumn() int {
235235
236236 return xEntryCompletionGetTextColumn(x.GoPointer())
237237
@@ -278,7 +278,7 @@ func (x *EntryCompletion) SetMatchFunc(FuncVar EntryCompletionMatchFunc, FuncDat
278278
279279 }
280280
281-var xEntryCompletionSetMinimumKeyLength func(uintptr, int32)
281+var xEntryCompletionSetMinimumKeyLength func(uintptr, int)
282282
283283 // Requires the length of the search key for @completion to be at least
284284 // @length.
@@ -286,7 +286,7 @@ var xEntryCompletionSetMinimumKeyLength func(uintptr, int32)
286286 // This is useful for long lists, where completing using a small
287287 // key takes a lot of time and will come up with meaningless results anyway
288288 // (ie, a too large dataset).
289-func (x *EntryCompletion) SetMinimumKeyLength(LengthVar int32) {
289+func (x *EntryCompletion) SetMinimumKeyLength(LengthVar int) {
290290
291291 xEntryCompletionSetMinimumKeyLength(x.GoPointer(), LengthVar)
292292
@@ -337,7 +337,7 @@ func (x *EntryCompletion) SetPopupSingleMatch(PopupSingleMatchVar bool) {
337337
338338 }
339339
340-var xEntryCompletionSetTextColumn func(uintptr, int32)
340+var xEntryCompletionSetTextColumn func(uintptr, int)
341341
342342 // Convenience function for setting up the most used case of this code: a
343343 // completion list with just strings.
@@ -350,7 +350,7 @@ var xEntryCompletionSetTextColumn func(uintptr, int32)
350350 // column. If you need to set the text column, but don't want the cell
351351 // renderer, use g_object_set() to set the
352352 // [property@Gtk.EntryCompletion:text-column] property directly.
353-func (x *EntryCompletion) SetTextColumn(ColumnVar int32) {
353+func (x *EntryCompletion) SetTextColumn(ColumnVar int) {
354354
355355 xEntryCompletionSetTextColumn(x.GoPointer(), ColumnVar)
356356
@@ -454,7 +454,7 @@ func (x *EntryCompletion) GetBuildableId() string {
454454 // example if column 2 of the model contains strings, you could have the
455455 // “text” attribute of a `GtkCellRendererText` get its values from column 2.
456456 // In this context "attribute" and "property" are used interchangeably.
457-func (x *EntryCompletion) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int32) {
457+func (x *EntryCompletion) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int) {
458458
459459 XGtkCellLayoutAddAttribute(x.GoPointer(), CellVar.GoPointer(), AttributeVar, ColumnVar)
460460
@@ -527,7 +527,7 @@ func (x *EntryCompletion) PackStart(CellVar *CellRenderer, ExpandVar bool) {
527527 //
528528 // Note that @cell has already to be packed into @cell_layout
529529 // for this to function properly.
530-func (x *EntryCompletion) Reorder(CellVar *CellRenderer, PositionVar int32) {
530+func (x *EntryCompletion) Reorder(CellVar *CellRenderer, PositionVar int) {
531531
532532 XGtkCellLayoutReorder(x.GoPointer(), CellVar.GoPointer(), PositionVar)
533533
M v4/gtk/gtkenums.go +2 -2
@@ -1492,11 +1492,11 @@ const (
14921492 WrapWordCharValue WrapMode = 3
14931493 )
14941494
1495-var xOrderingFromCmpfunc func(int32) Ordering
1495+var xOrderingFromCmpfunc func(int) Ordering
14961496
14971497 // Converts the result of a `GCompareFunc` like strcmp() to a
14981498 // `GtkOrdering` value.
1499-func OrderingFromCmpfunc(CmpfuncResultVar int32) Ordering {
1499+func OrderingFromCmpfunc(CmpfuncResultVar int) Ordering {
15001500
15011501 return xOrderingFromCmpfunc(CmpfuncResultVar)
15021502
M v4/gtk/gtkexpander.go +3 -3
@@ -395,7 +395,7 @@ func (x *Expander) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs .
395395 // property change must be communicated to assistive technologies.
396396 //
397397 // This function is meant to be used by language bindings.
398-func (x *Expander) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
398+func (x *Expander) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
399399
400400 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
401401
@@ -431,7 +431,7 @@ func (x *Expander) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs .
431431 // relation change must be communicated to assistive technologies.
432432 //
433433 // This function is meant to be used by language bindings.
434-func (x *Expander) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
434+func (x *Expander) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
435435
436436 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
437437
@@ -464,7 +464,7 @@ func (x *Expander) UpdateState(FirstStateVar AccessibleState, varArgs ...interfa
464464 // state change must be communicated to assistive technologies.
465465 //
466466 // This function is meant to be used by language bindings.
467-func (x *Expander) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
467+func (x *Expander) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
468468
469469 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
470470
M v4/gtk/gtkfilechooserdialog.go +3 -3
@@ -279,7 +279,7 @@ func (x *FileChooserDialog) UpdateProperty(FirstPropertyVar AccessibleProperty,
279279 // property change must be communicated to assistive technologies.
280280 //
281281 // This function is meant to be used by language bindings.
282-func (x *FileChooserDialog) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
282+func (x *FileChooserDialog) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
283283
284284 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
285285
@@ -315,7 +315,7 @@ func (x *FileChooserDialog) UpdateRelation(FirstRelationVar AccessibleRelation,
315315 // relation change must be communicated to assistive technologies.
316316 //
317317 // This function is meant to be used by language bindings.
318-func (x *FileChooserDialog) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
318+func (x *FileChooserDialog) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
319319
320320 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
321321
@@ -348,7 +348,7 @@ func (x *FileChooserDialog) UpdateState(FirstStateVar AccessibleState, varArgs .
348348 // state change must be communicated to assistive technologies.
349349 //
350350 // This function is meant to be used by language bindings.
351-func (x *FileChooserDialog) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
351+func (x *FileChooserDialog) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
352352
353353 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
354354
M v4/gtk/gtkfilechooserwidget.go +5 -5
@@ -211,8 +211,8 @@ func (x *FileChooserWidget) ConnectPlacesShortcut(cb func(FileChooserWidget)) {
211211 // Note that in the default binding, that <kbd>Alt</kbd>-<kbd>1</kbd> is
212212 // actually defined to switch to the bookmark at index 0, and so on
213213 // successively.
214-func (x *FileChooserWidget) ConnectQuickBookmark(cb func(FileChooserWidget, int32)) {
215- fcb := func(clsPtr uintptr, BookmarkIndexVarp int32) {
214+func (x *FileChooserWidget) ConnectQuickBookmark(cb func(FileChooserWidget, int)) {
215+ fcb := func(clsPtr uintptr, BookmarkIndexVarp int) {
216216 fa := FileChooserWidget{}
217217 fa.Ptr = clsPtr
218218
@@ -353,7 +353,7 @@ func (x *FileChooserWidget) UpdateProperty(FirstPropertyVar AccessibleProperty,
353353 // property change must be communicated to assistive technologies.
354354 //
355355 // This function is meant to be used by language bindings.
356-func (x *FileChooserWidget) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
356+func (x *FileChooserWidget) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
357357
358358 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
359359
@@ -389,7 +389,7 @@ func (x *FileChooserWidget) UpdateRelation(FirstRelationVar AccessibleRelation,
389389 // relation change must be communicated to assistive technologies.
390390 //
391391 // This function is meant to be used by language bindings.
392-func (x *FileChooserWidget) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
392+func (x *FileChooserWidget) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
393393
394394 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
395395
@@ -422,7 +422,7 @@ func (x *FileChooserWidget) UpdateState(FirstStateVar AccessibleState, varArgs .
422422 // state change must be communicated to assistive technologies.
423423 //
424424 // This function is meant to be used by language bindings.
425-func (x *FileChooserWidget) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
425+func (x *FileChooserWidget) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
426426
427427 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
428428
M v4/gtk/gtkfixed.go +3 -3
@@ -206,7 +206,7 @@ func (x *Fixed) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...i
206206 // property change must be communicated to assistive technologies.
207207 //
208208 // This function is meant to be used by language bindings.
209-func (x *Fixed) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
209+func (x *Fixed) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
210210
211211 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
212212
@@ -242,7 +242,7 @@ func (x *Fixed) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...i
242242 // relation change must be communicated to assistive technologies.
243243 //
244244 // This function is meant to be used by language bindings.
245-func (x *Fixed) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
245+func (x *Fixed) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
246246
247247 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
248248
@@ -275,7 +275,7 @@ func (x *Fixed) UpdateState(FirstStateVar AccessibleState, varArgs ...interface{
275275 // state change must be communicated to assistive technologies.
276276 //
277277 // This function is meant to be used by language bindings.
278-func (x *Fixed) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
278+func (x *Fixed) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
279279
280280 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
281281
M v4/gtk/gtkflowbox.go +17 -17
@@ -27,7 +27,7 @@ type FlowBoxForeachFunc func(uintptr, uintptr, uintptr)
2727
2828 // A function to compare two children to determine which
2929 // should come first.
30-type FlowBoxSortFunc func(uintptr, uintptr, uintptr) int32
30+type FlowBoxSortFunc func(uintptr, uintptr, uintptr) int
3131
3232 type FlowBoxChildClass struct {
3333 ParentClass uintptr
@@ -153,10 +153,10 @@ func (x *FlowBox) GetActivateOnSingleClick() bool {
153153
154154 }
155155
156-var xFlowBoxGetChildAtIndex func(uintptr, int32) uintptr
156+var xFlowBoxGetChildAtIndex func(uintptr, int) uintptr
157157
158158 // Gets the nth child in the @box.
159-func (x *FlowBox) GetChildAtIndex(IdxVar int32) *FlowBoxChild {
159+func (x *FlowBox) GetChildAtIndex(IdxVar int) *FlowBoxChild {
160160
161161 GetChildAtIndexPtr := xFlowBoxGetChildAtIndex(x.GoPointer(), IdxVar)
162162 if GetChildAtIndexPtr == 0 {
@@ -171,12 +171,12 @@ func (x *FlowBox) GetChildAtIndex(IdxVar int32) *FlowBoxChild {
171171
172172 }
173173
174-var xFlowBoxGetChildAtPos func(uintptr, int32, int32) uintptr
174+var xFlowBoxGetChildAtPos func(uintptr, int, int) uintptr
175175
176176 // Gets the child in the (@x, @y) position.
177177 //
178178 // Both @x and @y are assumed to be relative to the origin of @box.
179-func (x *FlowBox) GetChildAtPos(XVar int32, YVar int32) *FlowBoxChild {
179+func (x *FlowBox) GetChildAtPos(XVar int, YVar int) *FlowBoxChild {
180180
181181 GetChildAtPosPtr := xFlowBoxGetChildAtPos(x.GoPointer(), XVar, YVar)
182182 if GetChildAtPosPtr == 0 {
@@ -254,7 +254,7 @@ func (x *FlowBox) GetSelectionMode() SelectionMode {
254254
255255 }
256256
257-var xFlowBoxInsert func(uintptr, uintptr, int32)
257+var xFlowBoxInsert func(uintptr, uintptr, int)
258258
259259 // Inserts the @widget into @box at @position.
260260 //
@@ -263,7 +263,7 @@ var xFlowBoxInsert func(uintptr, uintptr, int32)
263263 //
264264 // If @position is -1, or larger than the total number of children
265265 // in the @box, then the @widget will be appended to the end.
266-func (x *FlowBox) Insert(WidgetVar *Widget, PositionVar int32) {
266+func (x *FlowBox) Insert(WidgetVar *Widget, PositionVar int) {
267267
268268 xFlowBoxInsert(x.GoPointer(), WidgetVar.GoPointer(), PositionVar)
269269
@@ -570,8 +570,8 @@ func (x *FlowBox) ConnectChildActivated(cb func(FlowBox, uintptr)) {
570570 // move by individual children
571571 // - <kbd>Home</kbd>, <kbd>End</kbd> move to the ends of the box
572572 // - <kbd>PgUp</kbd>, <kbd>PgDn</kbd> move vertically by pages
573-func (x *FlowBox) ConnectMoveCursor(cb func(FlowBox, MovementStep, int32, bool, bool) bool) {
574- fcb := func(clsPtr uintptr, StepVarp MovementStep, CountVarp int32, ExtendVarp bool, ModifyVarp bool) bool {
573+func (x *FlowBox) ConnectMoveCursor(cb func(FlowBox, MovementStep, int, bool, bool) bool) {
574+ fcb := func(clsPtr uintptr, StepVarp MovementStep, CountVarp int, ExtendVarp bool, ModifyVarp bool) bool {
575575 fa := FlowBox{}
576576 fa.Ptr = clsPtr
577577
@@ -705,7 +705,7 @@ func (x *FlowBox) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ..
705705 // property change must be communicated to assistive technologies.
706706 //
707707 // This function is meant to be used by language bindings.
708-func (x *FlowBox) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
708+func (x *FlowBox) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
709709
710710 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
711711
@@ -741,7 +741,7 @@ func (x *FlowBox) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ..
741741 // relation change must be communicated to assistive technologies.
742742 //
743743 // This function is meant to be used by language bindings.
744-func (x *FlowBox) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
744+func (x *FlowBox) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
745745
746746 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
747747
@@ -774,7 +774,7 @@ func (x *FlowBox) UpdateState(FirstStateVar AccessibleState, varArgs ...interfac
774774 // state change must be communicated to assistive technologies.
775775 //
776776 // This function is meant to be used by language bindings.
777-func (x *FlowBox) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
777+func (x *FlowBox) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
778778
779779 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
780780
@@ -878,10 +878,10 @@ func (x *FlowBoxChild) GetChild() *Widget {
878878
879879 }
880880
881-var xFlowBoxChildGetIndex func(uintptr) int32
881+var xFlowBoxChildGetIndex func(uintptr) int
882882
883883 // Gets the current index of the @child in its `GtkFlowBox` container.
884-func (x *FlowBoxChild) GetIndex() int32 {
884+func (x *FlowBoxChild) GetIndex() int {
885885
886886 return xFlowBoxChildGetIndex(x.GoPointer())
887887
@@ -992,7 +992,7 @@ func (x *FlowBoxChild) UpdateProperty(FirstPropertyVar AccessibleProperty, varAr
992992 // property change must be communicated to assistive technologies.
993993 //
994994 // This function is meant to be used by language bindings.
995-func (x *FlowBoxChild) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
995+func (x *FlowBoxChild) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
996996
997997 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
998998
@@ -1028,7 +1028,7 @@ func (x *FlowBoxChild) UpdateRelation(FirstRelationVar AccessibleRelation, varAr
10281028 // relation change must be communicated to assistive technologies.
10291029 //
10301030 // This function is meant to be used by language bindings.
1031-func (x *FlowBoxChild) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
1031+func (x *FlowBoxChild) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
10321032
10331033 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
10341034
@@ -1061,7 +1061,7 @@ func (x *FlowBoxChild) UpdateState(FirstStateVar AccessibleState, varArgs ...int
10611061 // state change must be communicated to assistive technologies.
10621062 //
10631063 // This function is meant to be used by language bindings.
1064-func (x *FlowBoxChild) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
1064+func (x *FlowBoxChild) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
10651065
10661066 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
10671067
M v4/gtk/gtkfontbutton.go +4 -4
@@ -244,7 +244,7 @@ func (x *FontButton) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
244244 // property change must be communicated to assistive technologies.
245245 //
246246 // This function is meant to be used by language bindings.
247-func (x *FontButton) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
247+func (x *FontButton) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
248248
249249 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
250250
@@ -280,7 +280,7 @@ func (x *FontButton) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
280280 // relation change must be communicated to assistive technologies.
281281 //
282282 // This function is meant to be used by language bindings.
283-func (x *FontButton) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
283+func (x *FontButton) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
284284
285285 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
286286
@@ -313,7 +313,7 @@ func (x *FontButton) UpdateState(FirstStateVar AccessibleState, varArgs ...inter
313313 // state change must be communicated to assistive technologies.
314314 //
315315 // This function is meant to be used by language bindings.
316-func (x *FontButton) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
316+func (x *FontButton) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
317317
318318 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
319319
@@ -427,7 +427,7 @@ func (x *FontButton) GetFontMap() *pango.FontMap {
427427 }
428428
429429 // The selected font size.
430-func (x *FontButton) GetFontSize() int32 {
430+func (x *FontButton) GetFontSize() int {
431431
432432 return XGtkFontChooserGetFontSize(x.GoPointer())
433433
M v4/gtk/gtkfontchooser.go +3 -3
@@ -36,7 +36,7 @@ type FontChooser interface {
3636 GetFontFamily() *pango.FontFamily
3737 GetFontFeatures() string
3838 GetFontMap() *pango.FontMap
39- GetFontSize() int32
39+ GetFontSize() int
4040 GetLanguage() string
4141 GetLevel() FontChooserLevel
4242 GetPreviewText() string
@@ -160,7 +160,7 @@ func (x *FontChooserBase) GetFontMap() *pango.FontMap {
160160 }
161161
162162 // The selected font size.
163-func (x *FontChooserBase) GetFontSize() int32 {
163+func (x *FontChooserBase) GetFontSize() int {
164164
165165 return XGtkFontChooserGetFontSize(x.GoPointer())
166166
@@ -283,7 +283,7 @@ var XGtkFontChooserGetFontFace func(uintptr) uintptr
283283 var XGtkFontChooserGetFontFamily func(uintptr) uintptr
284284 var XGtkFontChooserGetFontFeatures func(uintptr) string
285285 var XGtkFontChooserGetFontMap func(uintptr) uintptr
286-var XGtkFontChooserGetFontSize func(uintptr) int32
286+var XGtkFontChooserGetFontSize func(uintptr) int
287287 var XGtkFontChooserGetLanguage func(uintptr) string
288288 var XGtkFontChooserGetLevel func(uintptr) FontChooserLevel
289289 var XGtkFontChooserGetPreviewText func(uintptr) string
M v4/gtk/gtkfontchooserdialog.go +4 -4
@@ -117,7 +117,7 @@ func (x *FontChooserDialog) UpdateProperty(FirstPropertyVar AccessibleProperty,
117117 // property change must be communicated to assistive technologies.
118118 //
119119 // This function is meant to be used by language bindings.
120-func (x *FontChooserDialog) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
120+func (x *FontChooserDialog) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
121121
122122 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
123123
@@ -153,7 +153,7 @@ func (x *FontChooserDialog) UpdateRelation(FirstRelationVar AccessibleRelation,
153153 // relation change must be communicated to assistive technologies.
154154 //
155155 // This function is meant to be used by language bindings.
156-func (x *FontChooserDialog) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
156+func (x *FontChooserDialog) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
157157
158158 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
159159
@@ -186,7 +186,7 @@ func (x *FontChooserDialog) UpdateState(FirstStateVar AccessibleState, varArgs .
186186 // state change must be communicated to assistive technologies.
187187 //
188188 // This function is meant to be used by language bindings.
189-func (x *FontChooserDialog) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
189+func (x *FontChooserDialog) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
190190
191191 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
192192
@@ -300,7 +300,7 @@ func (x *FontChooserDialog) GetFontMap() *pango.FontMap {
300300 }
301301
302302 // The selected font size.
303-func (x *FontChooserDialog) GetFontSize() int32 {
303+func (x *FontChooserDialog) GetFontSize() int {
304304
305305 return XGtkFontChooserGetFontSize(x.GoPointer())
306306
M v4/gtk/gtkfontchooserwidget.go +4 -4
@@ -118,7 +118,7 @@ func (x *FontChooserWidget) UpdateProperty(FirstPropertyVar AccessibleProperty,
118118 // property change must be communicated to assistive technologies.
119119 //
120120 // This function is meant to be used by language bindings.
121-func (x *FontChooserWidget) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
121+func (x *FontChooserWidget) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
122122
123123 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
124124
@@ -154,7 +154,7 @@ func (x *FontChooserWidget) UpdateRelation(FirstRelationVar AccessibleRelation,
154154 // relation change must be communicated to assistive technologies.
155155 //
156156 // This function is meant to be used by language bindings.
157-func (x *FontChooserWidget) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
157+func (x *FontChooserWidget) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
158158
159159 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
160160
@@ -187,7 +187,7 @@ func (x *FontChooserWidget) UpdateState(FirstStateVar AccessibleState, varArgs .
187187 // state change must be communicated to assistive technologies.
188188 //
189189 // This function is meant to be used by language bindings.
190-func (x *FontChooserWidget) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
190+func (x *FontChooserWidget) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
191191
192192 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
193193
@@ -301,7 +301,7 @@ func (x *FontChooserWidget) GetFontMap() *pango.FontMap {
301301 }
302302
303303 // The selected font size.
304-func (x *FontChooserWidget) GetFontSize() int32 {
304+func (x *FontChooserWidget) GetFontSize() int {
305305
306306 return XGtkFontChooserGetFontSize(x.GoPointer())
307307
M v4/gtk/gtkframe.go +3 -3
@@ -250,7 +250,7 @@ func (x *Frame) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...i
250250 // property change must be communicated to assistive technologies.
251251 //
252252 // This function is meant to be used by language bindings.
253-func (x *Frame) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
253+func (x *Frame) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
254254
255255 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
256256
@@ -286,7 +286,7 @@ func (x *Frame) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...i
286286 // relation change must be communicated to assistive technologies.
287287 //
288288 // This function is meant to be used by language bindings.
289-func (x *Frame) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
289+func (x *Frame) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
290290
291291 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
292292
@@ -319,7 +319,7 @@ func (x *Frame) UpdateState(FirstStateVar AccessibleState, varArgs ...interface{
319319 // state change must be communicated to assistive technologies.
320320 //
321321 // This function is meant to be used by language bindings.
322-func (x *Frame) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
322+func (x *Frame) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
323323
324324 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
325325
M v4/gtk/gtkgestureclick.go +4 -4
@@ -51,8 +51,8 @@ func (c *GestureClick) SetGoPointer(ptr uintptr) {
5151 }
5252
5353 // Emitted whenever a button or touch press happens.
54-func (x *GestureClick) ConnectPressed(cb func(GestureClick, int32, float64, float64)) {
55- fcb := func(clsPtr uintptr, NPressVarp int32, XVarp float64, YVarp float64) {
54+func (x *GestureClick) ConnectPressed(cb func(GestureClick, int, float64, float64)) {
55+ fcb := func(clsPtr uintptr, NPressVarp int, XVarp float64, YVarp float64) {
5656 fa := GestureClick{}
5757 fa.Ptr = clsPtr
5858
@@ -68,8 +68,8 @@ func (x *GestureClick) ConnectPressed(cb func(GestureClick, int32, float64, floa
6868 // this event, note that [signal@Gtk.GestureClick::stopped] may
6969 // have been emitted between the press and its release, @n_press
7070 // will only start over at the next press.
71-func (x *GestureClick) ConnectReleased(cb func(GestureClick, int32, float64, float64)) {
72- fcb := func(clsPtr uintptr, NPressVarp int32, XVarp float64, YVarp float64) {
71+func (x *GestureClick) ConnectReleased(cb func(GestureClick, int, float64, float64)) {
72+ fcb := func(clsPtr uintptr, NPressVarp int, XVarp float64, YVarp float64) {
7373 fa := GestureClick{}
7474 fa.Ptr = clsPtr
7575
M v4/gtk/gtkglarea.go +9 -9
@@ -220,12 +220,12 @@ func (x *GLArea) GetHasStencilBuffer() bool {
220220
221221 }
222222
223-var xGLAreaGetRequiredVersion func(uintptr, int32, int32)
223+var xGLAreaGetRequiredVersion func(uintptr, int, int)
224224
225225 // Retrieves the required version of OpenGL.
226226 //
227227 // See [method@Gtk.GLArea.set_required_version].
228-func (x *GLArea) GetRequiredVersion(MajorVar int32, MinorVar int32) {
228+func (x *GLArea) GetRequiredVersion(MajorVar int, MinorVar int) {
229229
230230 xGLAreaGetRequiredVersion(x.GoPointer(), MajorVar, MinorVar)
231231
@@ -331,13 +331,13 @@ func (x *GLArea) SetHasStencilBuffer(HasStencilBufferVar bool) {
331331
332332 }
333333
334-var xGLAreaSetRequiredVersion func(uintptr, int32, int32)
334+var xGLAreaSetRequiredVersion func(uintptr, int, int)
335335
336336 // Sets the required version of OpenGL to be used when creating
337337 // the context for the widget.
338338 //
339339 // This function must be called before the area has been realized.
340-func (x *GLArea) SetRequiredVersion(MajorVar int32, MinorVar int32) {
340+func (x *GLArea) SetRequiredVersion(MajorVar int, MinorVar int) {
341341
342342 xGLAreaSetRequiredVersion(x.GoPointer(), MajorVar, MinorVar)
343343
@@ -410,8 +410,8 @@ func (x *GLArea) ConnectRender(cb func(GLArea, uintptr) bool) {
410410 // is emitted.
411411 //
412412 // The default handler sets up the GL viewport.
413-func (x *GLArea) ConnectResize(cb func(GLArea, int32, int32)) {
414- fcb := func(clsPtr uintptr, WidthVarp int32, HeightVarp int32) {
413+func (x *GLArea) ConnectResize(cb func(GLArea, int, int)) {
414+ fcb := func(clsPtr uintptr, WidthVarp int, HeightVarp int) {
415415 fa := GLArea{}
416416 fa.Ptr = clsPtr
417417
@@ -479,7 +479,7 @@ func (x *GLArea) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...
479479 // property change must be communicated to assistive technologies.
480480 //
481481 // This function is meant to be used by language bindings.
482-func (x *GLArea) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
482+func (x *GLArea) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
483483
484484 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
485485
@@ -515,7 +515,7 @@ func (x *GLArea) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...
515515 // relation change must be communicated to assistive technologies.
516516 //
517517 // This function is meant to be used by language bindings.
518-func (x *GLArea) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
518+func (x *GLArea) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
519519
520520 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
521521
@@ -548,7 +548,7 @@ func (x *GLArea) UpdateState(FirstStateVar AccessibleState, varArgs ...interface
548548 // state change must be communicated to assistive technologies.
549549 //
550550 // This function is meant to be used by language bindings.
551-func (x *GLArea) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
551+func (x *GLArea) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
552552
553553 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
554554
M v4/gtk/gtkgrid.go +27 -27
@@ -123,20 +123,20 @@ func NewGrid() *Widget {
123123 return NewGridCls
124124 }
125125
126-var xGridAttach func(uintptr, uintptr, int32, int32, int32, int32)
126+var xGridAttach func(uintptr, uintptr, int, int, int, int)
127127
128128 // Adds a widget to the grid.
129129 //
130130 // The position of @child is determined by @column and @row.
131131 // The number of “cells” that @child will occupy is determined
132132 // by @width and @height.
133-func (x *Grid) Attach(ChildVar *Widget, ColumnVar int32, RowVar int32, WidthVar int32, HeightVar int32) {
133+func (x *Grid) Attach(ChildVar *Widget, ColumnVar int, RowVar int, WidthVar int, HeightVar int) {
134134
135135 xGridAttach(x.GoPointer(), ChildVar.GoPointer(), ColumnVar, RowVar, WidthVar, HeightVar)
136136
137137 }
138138
139-var xGridAttachNextTo func(uintptr, uintptr, uintptr, PositionType, int32, int32)
139+var xGridAttachNextTo func(uintptr, uintptr, uintptr, PositionType, int, int)
140140
141141 // Adds a widget to the grid.
142142 //
@@ -147,26 +147,26 @@ var xGridAttachNextTo func(uintptr, uintptr, uintptr, PositionType, int32, int32
147147 //
148148 // Attaching widgets labeled `[1]`, `[2]`, `[3]` with `@sibling == %NULL` and
149149 // `@side == %GTK_POS_LEFT` yields a layout of `[3][2][1]`.
150-func (x *Grid) AttachNextTo(ChildVar *Widget, SiblingVar *Widget, SideVar PositionType, WidthVar int32, HeightVar int32) {
150+func (x *Grid) AttachNextTo(ChildVar *Widget, SiblingVar *Widget, SideVar PositionType, WidthVar int, HeightVar int) {
151151
152152 xGridAttachNextTo(x.GoPointer(), ChildVar.GoPointer(), SiblingVar.GoPointer(), SideVar, WidthVar, HeightVar)
153153
154154 }
155155
156-var xGridGetBaselineRow func(uintptr) int32
156+var xGridGetBaselineRow func(uintptr) int
157157
158158 // Returns which row defines the global baseline of @grid.
159-func (x *Grid) GetBaselineRow() int32 {
159+func (x *Grid) GetBaselineRow() int {
160160
161161 return xGridGetBaselineRow(x.GoPointer())
162162
163163 }
164164
165-var xGridGetChildAt func(uintptr, int32, int32) uintptr
165+var xGridGetChildAt func(uintptr, int, int) uintptr
166166
167167 // Gets the child of @grid whose area covers the grid
168168 // cell at @column, @row.
169-func (x *Grid) GetChildAt(ColumnVar int32, RowVar int32) *Widget {
169+func (x *Grid) GetChildAt(ColumnVar int, RowVar int) *Widget {
170170
171171 GetChildAtPtr := xGridGetChildAt(x.GoPointer(), ColumnVar, RowVar)
172172 if GetChildAtPtr == 0 {
@@ -199,12 +199,12 @@ func (x *Grid) GetColumnSpacing() uint {
199199
200200 }
201201
202-var xGridGetRowBaselinePosition func(uintptr, int32) BaselinePosition
202+var xGridGetRowBaselinePosition func(uintptr, int) BaselinePosition
203203
204204 // Returns the baseline position of @row.
205205 //
206206 // See [method@Gtk.Grid.set_row_baseline_position].
207-func (x *Grid) GetRowBaselinePosition(RowVar int32) BaselinePosition {
207+func (x *Grid) GetRowBaselinePosition(RowVar int) BaselinePosition {
208208
209209 return xGridGetRowBaselinePosition(x.GoPointer(), RowVar)
210210
@@ -228,14 +228,14 @@ func (x *Grid) GetRowSpacing() uint {
228228
229229 }
230230
231-var xGridInsertColumn func(uintptr, int32)
231+var xGridInsertColumn func(uintptr, int)
232232
233233 // Inserts a column at the specified position.
234234 //
235235 // Children which are attached at or to the right of this position
236236 // are moved one column to the right. Children which span across this
237237 // position are grown to span the new column.
238-func (x *Grid) InsertColumn(PositionVar int32) {
238+func (x *Grid) InsertColumn(PositionVar int) {
239239
240240 xGridInsertColumn(x.GoPointer(), PositionVar)
241241
@@ -255,23 +255,23 @@ func (x *Grid) InsertNextTo(SiblingVar *Widget, SideVar PositionType) {
255255
256256 }
257257
258-var xGridInsertRow func(uintptr, int32)
258+var xGridInsertRow func(uintptr, int)
259259
260260 // Inserts a row at the specified position.
261261 //
262262 // Children which are attached at or below this position
263263 // are moved one row down. Children which span across this
264264 // position are grown to span the new row.
265-func (x *Grid) InsertRow(PositionVar int32) {
265+func (x *Grid) InsertRow(PositionVar int) {
266266
267267 xGridInsertRow(x.GoPointer(), PositionVar)
268268
269269 }
270270
271-var xGridQueryChild func(uintptr, uintptr, int32, int32, int32, int32)
271+var xGridQueryChild func(uintptr, uintptr, int, int, int, int)
272272
273273 // Queries the attach points and spans of @child inside the given `GtkGrid`.
274-func (x *Grid) QueryChild(ChildVar *Widget, ColumnVar int32, RowVar int32, WidthVar int32, HeightVar int32) {
274+func (x *Grid) QueryChild(ChildVar *Widget, ColumnVar int, RowVar int, WidthVar int, HeightVar int) {
275275
276276 xGridQueryChild(x.GoPointer(), ChildVar.GoPointer(), ColumnVar, RowVar, WidthVar, HeightVar)
277277
@@ -289,7 +289,7 @@ func (x *Grid) Remove(ChildVar *Widget) {
289289
290290 }
291291
292-var xGridRemoveColumn func(uintptr, int32)
292+var xGridRemoveColumn func(uintptr, int)
293293
294294 // Removes a column from the grid.
295295 //
@@ -297,13 +297,13 @@ var xGridRemoveColumn func(uintptr, int32)
297297 // spanning children that overlap this column have their
298298 // width reduced by one, and children after the column
299299 // are moved to the left.
300-func (x *Grid) RemoveColumn(PositionVar int32) {
300+func (x *Grid) RemoveColumn(PositionVar int) {
301301
302302 xGridRemoveColumn(x.GoPointer(), PositionVar)
303303
304304 }
305305
306-var xGridRemoveRow func(uintptr, int32)
306+var xGridRemoveRow func(uintptr, int)
307307
308308 // Removes a row from the grid.
309309 //
@@ -311,20 +311,20 @@ var xGridRemoveRow func(uintptr, int32)
311311 // spanning children that overlap this row have their
312312 // height reduced by one, and children below the row
313313 // are moved up.
314-func (x *Grid) RemoveRow(PositionVar int32) {
314+func (x *Grid) RemoveRow(PositionVar int) {
315315
316316 xGridRemoveRow(x.GoPointer(), PositionVar)
317317
318318 }
319319
320-var xGridSetBaselineRow func(uintptr, int32)
320+var xGridSetBaselineRow func(uintptr, int)
321321
322322 // Sets which row defines the global baseline for the entire grid.
323323 //
324324 // Each row in the grid can have its own local baseline, but only
325325 // one of those is global, meaning it will be the baseline in the
326326 // parent of the @grid.
327-func (x *Grid) SetBaselineRow(RowVar int32) {
327+func (x *Grid) SetBaselineRow(RowVar int) {
328328
329329 xGridSetBaselineRow(x.GoPointer(), RowVar)
330330
@@ -348,13 +348,13 @@ func (x *Grid) SetColumnSpacing(SpacingVar uint) {
348348
349349 }
350350
351-var xGridSetRowBaselinePosition func(uintptr, int32, BaselinePosition)
351+var xGridSetRowBaselinePosition func(uintptr, int, BaselinePosition)
352352
353353 // Sets how the baseline should be positioned on @row of the
354354 // grid, in case that row is assigned more space than is requested.
355355 //
356356 // The default baseline position is %GTK_BASELINE_POSITION_CENTER.
357-func (x *Grid) SetRowBaselinePosition(RowVar int32, PosVar BaselinePosition) {
357+func (x *Grid) SetRowBaselinePosition(RowVar int, PosVar BaselinePosition) {
358358
359359 xGridSetRowBaselinePosition(x.GoPointer(), RowVar, PosVar)
360360
@@ -444,7 +444,7 @@ func (x *Grid) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...in
444444 // property change must be communicated to assistive technologies.
445445 //
446446 // This function is meant to be used by language bindings.
447-func (x *Grid) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
447+func (x *Grid) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
448448
449449 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
450450
@@ -480,7 +480,7 @@ func (x *Grid) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...in
480480 // relation change must be communicated to assistive technologies.
481481 //
482482 // This function is meant to be used by language bindings.
483-func (x *Grid) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
483+func (x *Grid) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
484484
485485 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
486486
@@ -513,7 +513,7 @@ func (x *Grid) UpdateState(FirstStateVar AccessibleState, varArgs ...interface{}
513513 // state change must be communicated to assistive technologies.
514514 //
515515 // This function is meant to be used by language bindings.
516-func (x *Grid) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
516+func (x *Grid) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
517517
518518 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
519519
M v4/gtk/gtkgridlayout.go +24 -24
@@ -52,10 +52,10 @@ func NewGridLayout() *LayoutManager {
5252 return NewGridLayoutCls
5353 }
5454
55-var xGridLayoutGetBaselineRow func(uintptr) int32
55+var xGridLayoutGetBaselineRow func(uintptr) int
5656
5757 // Retrieves the row set with gtk_grid_layout_set_baseline_row().
58-func (x *GridLayout) GetBaselineRow() int32 {
58+func (x *GridLayout) GetBaselineRow() int {
5959
6060 return xGridLayoutGetBaselineRow(x.GoPointer())
6161
@@ -79,7 +79,7 @@ func (x *GridLayout) GetColumnSpacing() uint {
7979
8080 }
8181
82-var xGridLayoutGetRowBaselinePosition func(uintptr, int32) BaselinePosition
82+var xGridLayoutGetRowBaselinePosition func(uintptr, int) BaselinePosition
8383
8484 // Returns the baseline position of @row.
8585 //
@@ -87,7 +87,7 @@ var xGridLayoutGetRowBaselinePosition func(uintptr, int32) BaselinePosition
8787 // [method@Gtk.GridLayout.set_row_baseline_position],
8888 // the default value of %GTK_BASELINE_POSITION_CENTER
8989 // is returned.
90-func (x *GridLayout) GetRowBaselinePosition(RowVar int32) BaselinePosition {
90+func (x *GridLayout) GetRowBaselinePosition(RowVar int) BaselinePosition {
9191
9292 return xGridLayoutGetRowBaselinePosition(x.GoPointer(), RowVar)
9393
@@ -111,14 +111,14 @@ func (x *GridLayout) GetRowSpacing() uint {
111111
112112 }
113113
114-var xGridLayoutSetBaselineRow func(uintptr, int32)
114+var xGridLayoutSetBaselineRow func(uintptr, int)
115115
116116 // Sets which row defines the global baseline for the entire grid.
117117 //
118118 // Each row in the grid can have its own local baseline, but only
119119 // one of those is global, meaning it will be the baseline in the
120120 // parent of the @grid.
121-func (x *GridLayout) SetBaselineRow(RowVar int32) {
121+func (x *GridLayout) SetBaselineRow(RowVar int) {
122122
123123 xGridLayoutSetBaselineRow(x.GoPointer(), RowVar)
124124
@@ -142,11 +142,11 @@ func (x *GridLayout) SetColumnSpacing(SpacingVar uint) {
142142
143143 }
144144
145-var xGridLayoutSetRowBaselinePosition func(uintptr, int32, BaselinePosition)
145+var xGridLayoutSetRowBaselinePosition func(uintptr, int, BaselinePosition)
146146
147147 // Sets how the baseline should be positioned on @row of the
148148 // grid, in case that row is assigned more space than is requested.
149-func (x *GridLayout) SetRowBaselinePosition(RowVar int32, PosVar BaselinePosition) {
149+func (x *GridLayout) SetRowBaselinePosition(RowVar int, PosVar BaselinePosition) {
150150
151151 xGridLayoutSetRowBaselinePosition(x.GoPointer(), RowVar, PosVar)
152152
@@ -189,73 +189,73 @@ func GridLayoutChildNewFromInternalPtr(ptr uintptr) *GridLayoutChild {
189189 return cls
190190 }
191191
192-var xGridLayoutChildGetColumn func(uintptr) int32
192+var xGridLayoutChildGetColumn func(uintptr) int
193193
194194 // Retrieves the column number to which @child attaches its left side.
195-func (x *GridLayoutChild) GetColumn() int32 {
195+func (x *GridLayoutChild) GetColumn() int {
196196
197197 return xGridLayoutChildGetColumn(x.GoPointer())
198198
199199 }
200200
201-var xGridLayoutChildGetColumnSpan func(uintptr) int32
201+var xGridLayoutChildGetColumnSpan func(uintptr) int
202202
203203 // Retrieves the number of columns that @child spans to.
204-func (x *GridLayoutChild) GetColumnSpan() int32 {
204+func (x *GridLayoutChild) GetColumnSpan() int {
205205
206206 return xGridLayoutChildGetColumnSpan(x.GoPointer())
207207
208208 }
209209
210-var xGridLayoutChildGetRow func(uintptr) int32
210+var xGridLayoutChildGetRow func(uintptr) int
211211
212212 // Retrieves the row number to which @child attaches its top side.
213-func (x *GridLayoutChild) GetRow() int32 {
213+func (x *GridLayoutChild) GetRow() int {
214214
215215 return xGridLayoutChildGetRow(x.GoPointer())
216216
217217 }
218218
219-var xGridLayoutChildGetRowSpan func(uintptr) int32
219+var xGridLayoutChildGetRowSpan func(uintptr) int
220220
221221 // Retrieves the number of rows that @child spans to.
222-func (x *GridLayoutChild) GetRowSpan() int32 {
222+func (x *GridLayoutChild) GetRowSpan() int {
223223
224224 return xGridLayoutChildGetRowSpan(x.GoPointer())
225225
226226 }
227227
228-var xGridLayoutChildSetColumn func(uintptr, int32)
228+var xGridLayoutChildSetColumn func(uintptr, int)
229229
230230 // Sets the column number to attach the left side of @child.
231-func (x *GridLayoutChild) SetColumn(ColumnVar int32) {
231+func (x *GridLayoutChild) SetColumn(ColumnVar int) {
232232
233233 xGridLayoutChildSetColumn(x.GoPointer(), ColumnVar)
234234
235235 }
236236
237-var xGridLayoutChildSetColumnSpan func(uintptr, int32)
237+var xGridLayoutChildSetColumnSpan func(uintptr, int)
238238
239239 // Sets the number of columns @child spans to.
240-func (x *GridLayoutChild) SetColumnSpan(SpanVar int32) {
240+func (x *GridLayoutChild) SetColumnSpan(SpanVar int) {
241241
242242 xGridLayoutChildSetColumnSpan(x.GoPointer(), SpanVar)
243243
244244 }
245245
246-var xGridLayoutChildSetRow func(uintptr, int32)
246+var xGridLayoutChildSetRow func(uintptr, int)
247247
248248 // Sets the row to place @child in.
249-func (x *GridLayoutChild) SetRow(RowVar int32) {
249+func (x *GridLayoutChild) SetRow(RowVar int) {
250250
251251 xGridLayoutChildSetRow(x.GoPointer(), RowVar)
252252
253253 }
254254
255-var xGridLayoutChildSetRowSpan func(uintptr, int32)
255+var xGridLayoutChildSetRowSpan func(uintptr, int)
256256
257257 // Sets the number of rows @child spans to.
258-func (x *GridLayoutChild) SetRowSpan(SpanVar int32) {
258+func (x *GridLayoutChild) SetRowSpan(SpanVar int) {
259259
260260 xGridLayoutChildSetRowSpan(x.GoPointer(), SpanVar)
261261
M v4/gtk/gtkgridview.go +3 -3
@@ -304,7 +304,7 @@ func (x *GridView) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs .
304304 // property change must be communicated to assistive technologies.
305305 //
306306 // This function is meant to be used by language bindings.
307-func (x *GridView) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
307+func (x *GridView) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
308308
309309 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
310310
@@ -340,7 +340,7 @@ func (x *GridView) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs .
340340 // relation change must be communicated to assistive technologies.
341341 //
342342 // This function is meant to be used by language bindings.
343-func (x *GridView) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
343+func (x *GridView) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
344344
345345 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
346346
@@ -373,7 +373,7 @@ func (x *GridView) UpdateState(FirstStateVar AccessibleState, varArgs ...interfa
373373 // state change must be communicated to assistive technologies.
374374 //
375375 // This function is meant to be used by language bindings.
376-func (x *GridView) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
376+func (x *GridView) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
377377
378378 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
379379
M v4/gtk/gtkheaderbar.go +3 -3
@@ -301,7 +301,7 @@ func (x *HeaderBar) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
301301 // property change must be communicated to assistive technologies.
302302 //
303303 // This function is meant to be used by language bindings.
304-func (x *HeaderBar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
304+func (x *HeaderBar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
305305
306306 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
307307
@@ -337,7 +337,7 @@ func (x *HeaderBar) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
337337 // relation change must be communicated to assistive technologies.
338338 //
339339 // This function is meant to be used by language bindings.
340-func (x *HeaderBar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
340+func (x *HeaderBar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
341341
342342 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
343343
@@ -370,7 +370,7 @@ func (x *HeaderBar) UpdateState(FirstStateVar AccessibleState, varArgs ...interf
370370 // state change must be communicated to assistive technologies.
371371 //
372372 // This function is meant to be used by language bindings.
373-func (x *HeaderBar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
373+func (x *HeaderBar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
374374
375375 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
376376
M v4/gtk/gtkicontheme.go +8 -8
@@ -49,12 +49,12 @@ func IconPaintableNewFromInternalPtr(ptr uintptr) *IconPaintable {
4949 return cls
5050 }
5151
52-var xNewForFileIconPaintable func(uintptr, int32, int32) uintptr
52+var xNewForFileIconPaintable func(uintptr, int, int) uintptr
5353
5454 // Creates a `GtkIconPaintable` for a file with a given size and scale.
5555 //
5656 // The icon can then be rendered by using it as a `GdkPaintable`.
57-func NewForFileIconPaintable(FileVar gio.File, SizeVar int32, ScaleVar int32) *IconPaintable {
57+func NewForFileIconPaintable(FileVar gio.File, SizeVar int, ScaleVar int) *IconPaintable {
5858 NewForFileIconPaintablePtr := xNewForFileIconPaintable(FileVar.GoPointer(), SizeVar, ScaleVar)
5959 if NewForFileIconPaintablePtr == 0 {
6060 return nil
@@ -202,7 +202,7 @@ func (x *IconPaintable) GetIntrinsicAspectRatio() float64 {
202202 //
203203 // If the @paintable does not have a preferred height, it returns 0.
204204 // Negative values are never returned.
205-func (x *IconPaintable) GetIntrinsicHeight() int32 {
205+func (x *IconPaintable) GetIntrinsicHeight() int {
206206
207207 return gdk.XGdkPaintableGetIntrinsicHeight(x.GoPointer())
208208
@@ -218,7 +218,7 @@ func (x *IconPaintable) GetIntrinsicHeight() int32 {
218218 //
219219 // If the @paintable does not have a preferred width, it returns 0.
220220 // Negative values are never returned.
221-func (x *IconPaintable) GetIntrinsicWidth() int32 {
221+func (x *IconPaintable) GetIntrinsicWidth() int {
222222
223223 return gdk.XGdkPaintableGetIntrinsicWidth(x.GoPointer())
224224
@@ -460,13 +460,13 @@ func (x *IconTheme) HasIcon(IconNameVar string) bool {
460460
461461 }
462462
463-var xIconThemeLookupByGicon func(uintptr, uintptr, int32, int32, TextDirection, IconLookupFlags) uintptr
463+var xIconThemeLookupByGicon func(uintptr, uintptr, int, int, TextDirection, IconLookupFlags) uintptr
464464
465465 // Looks up a icon for a desired size and window scale.
466466 //
467467 // The icon can then be rendered by using it as a `GdkPaintable`,
468468 // or you can get information such as the filename and size.
469-func (x *IconTheme) LookupByGicon(IconVar gio.Icon, SizeVar int32, ScaleVar int32, DirectionVar TextDirection, FlagsVar IconLookupFlags) *IconPaintable {
469+func (x *IconTheme) LookupByGicon(IconVar gio.Icon, SizeVar int, ScaleVar int, DirectionVar TextDirection, FlagsVar IconLookupFlags) *IconPaintable {
470470
471471 LookupByGiconPtr := xIconThemeLookupByGicon(x.GoPointer(), IconVar.GoPointer(), SizeVar, ScaleVar, DirectionVar, FlagsVar)
472472 if LookupByGiconPtr == 0 {
@@ -479,7 +479,7 @@ func (x *IconTheme) LookupByGicon(IconVar gio.Icon, SizeVar int32, ScaleVar int3
479479
480480 }
481481
482-var xIconThemeLookupIcon func(uintptr, string, uintptr, int32, int32, TextDirection, IconLookupFlags) uintptr
482+var xIconThemeLookupIcon func(uintptr, string, uintptr, int, int, TextDirection, IconLookupFlags) uintptr
483483
484484 // Looks up a named icon for a desired size and window scale,
485485 // returning a `GtkIconPaintable`.
@@ -497,7 +497,7 @@ var xIconThemeLookupIcon func(uintptr, string, uintptr, int32, int32, TextDirect
497497 // Note that you probably want to listen for icon theme changes and
498498 // update the icon. This is usually done by overriding the
499499 // GtkWidgetClass.css-changed() function.
500-func (x *IconTheme) LookupIcon(IconNameVar string, FallbacksVar uintptr, SizeVar int32, ScaleVar int32, DirectionVar TextDirection, FlagsVar IconLookupFlags) *IconPaintable {
500+func (x *IconTheme) LookupIcon(IconNameVar string, FallbacksVar uintptr, SizeVar int, ScaleVar int, DirectionVar TextDirection, FlagsVar IconLookupFlags) *IconPaintable {
501501
502502 LookupIconPtr := xIconThemeLookupIcon(x.GoPointer(), IconNameVar, FallbacksVar, SizeVar, ScaleVar, DirectionVar, FlagsVar)
503503 if LookupIconPtr == 0 {
M v4/gtk/gtkiconview.go +63 -63
@@ -174,19 +174,19 @@ func (x *IconView) GetCellRect(PathVar *TreePath, CellVar *CellRenderer, RectVar
174174
175175 }
176176
177-var xIconViewGetColumnSpacing func(uintptr) int32
177+var xIconViewGetColumnSpacing func(uintptr) int
178178
179179 // Returns the value of the ::column-spacing property.
180-func (x *IconView) GetColumnSpacing() int32 {
180+func (x *IconView) GetColumnSpacing() int {
181181
182182 return xIconViewGetColumnSpacing(x.GoPointer())
183183
184184 }
185185
186-var xIconViewGetColumns func(uintptr) int32
186+var xIconViewGetColumns func(uintptr) int
187187
188188 // Returns the value of the ::columns property.
189-func (x *IconView) GetColumns() int32 {
189+func (x *IconView) GetColumns() int {
190190
191191 return xIconViewGetColumns(x.GoPointer())
192192
@@ -205,10 +205,10 @@ func (x *IconView) GetCursor(PathVar **TreePath, CellVar **CellRenderer) bool {
205205
206206 }
207207
208-var xIconViewGetDestItemAtPos func(uintptr, int32, int32, **TreePath, *IconViewDropPosition) bool
208+var xIconViewGetDestItemAtPos func(uintptr, int, int, **TreePath, *IconViewDropPosition) bool
209209
210210 // Determines the destination item for a given position.
211-func (x *IconView) GetDestItemAtPos(DragXVar int32, DragYVar int32, PathVar **TreePath, PosVar *IconViewDropPosition) bool {
211+func (x *IconView) GetDestItemAtPos(DragXVar int, DragYVar int, PathVar **TreePath, PosVar *IconViewDropPosition) bool {
212212
213213 return xIconViewGetDestItemAtPos(x.GoPointer(), DragXVar, DragYVar, PathVar, PosVar)
214214
@@ -223,20 +223,20 @@ func (x *IconView) GetDragDestItem(PathVar **TreePath, PosVar *IconViewDropPosit
223223
224224 }
225225
226-var xIconViewGetItemAtPos func(uintptr, int32, int32, **TreePath, *uintptr) bool
226+var xIconViewGetItemAtPos func(uintptr, int, int, **TreePath, *uintptr) bool
227227
228228 // Gets the path and cell for the icon at the given position.
229-func (x *IconView) GetItemAtPos(XVar int32, YVar int32, PathVar **TreePath, CellVar **CellRenderer) bool {
229+func (x *IconView) GetItemAtPos(XVar int, YVar int, PathVar **TreePath, CellVar **CellRenderer) bool {
230230
231231 return xIconViewGetItemAtPos(x.GoPointer(), XVar, YVar, PathVar, gobject.ConvertPtr(CellVar))
232232
233233 }
234234
235-var xIconViewGetItemColumn func(uintptr, *TreePath) int32
235+var xIconViewGetItemColumn func(uintptr, *TreePath) int
236236
237237 // Gets the column in which the item @path is currently
238238 // displayed. Column numbers start at 0.
239-func (x *IconView) GetItemColumn(PathVar *TreePath) int32 {
239+func (x *IconView) GetItemColumn(PathVar *TreePath) int {
240240
241241 return xIconViewGetItemColumn(x.GoPointer(), PathVar)
242242
@@ -252,47 +252,47 @@ func (x *IconView) GetItemOrientation() Orientation {
252252
253253 }
254254
255-var xIconViewGetItemPadding func(uintptr) int32
255+var xIconViewGetItemPadding func(uintptr) int
256256
257257 // Returns the value of the ::item-padding property.
258-func (x *IconView) GetItemPadding() int32 {
258+func (x *IconView) GetItemPadding() int {
259259
260260 return xIconViewGetItemPadding(x.GoPointer())
261261
262262 }
263263
264-var xIconViewGetItemRow func(uintptr, *TreePath) int32
264+var xIconViewGetItemRow func(uintptr, *TreePath) int
265265
266266 // Gets the row in which the item @path is currently
267267 // displayed. Row numbers start at 0.
268-func (x *IconView) GetItemRow(PathVar *TreePath) int32 {
268+func (x *IconView) GetItemRow(PathVar *TreePath) int {
269269
270270 return xIconViewGetItemRow(x.GoPointer(), PathVar)
271271
272272 }
273273
274-var xIconViewGetItemWidth func(uintptr) int32
274+var xIconViewGetItemWidth func(uintptr) int
275275
276276 // Returns the value of the ::item-width property.
277-func (x *IconView) GetItemWidth() int32 {
277+func (x *IconView) GetItemWidth() int {
278278
279279 return xIconViewGetItemWidth(x.GoPointer())
280280
281281 }
282282
283-var xIconViewGetMargin func(uintptr) int32
283+var xIconViewGetMargin func(uintptr) int
284284
285285 // Returns the value of the ::margin property.
286-func (x *IconView) GetMargin() int32 {
286+func (x *IconView) GetMargin() int {
287287
288288 return xIconViewGetMargin(x.GoPointer())
289289
290290 }
291291
292-var xIconViewGetMarkupColumn func(uintptr) int32
292+var xIconViewGetMarkupColumn func(uintptr) int
293293
294294 // Returns the column with markup text for @icon_view.
295-func (x *IconView) GetMarkupColumn() int32 {
295+func (x *IconView) GetMarkupColumn() int {
296296
297297 return xIconViewGetMarkupColumn(x.GoPointer())
298298
@@ -317,19 +317,19 @@ func (x *IconView) GetModel() *TreeModelBase {
317317
318318 }
319319
320-var xIconViewGetPathAtPos func(uintptr, int32, int32) *TreePath
320+var xIconViewGetPathAtPos func(uintptr, int, int) *TreePath
321321
322322 // Gets the path for the icon at the given position.
323-func (x *IconView) GetPathAtPos(XVar int32, YVar int32) *TreePath {
323+func (x *IconView) GetPathAtPos(XVar int, YVar int) *TreePath {
324324
325325 return xIconViewGetPathAtPos(x.GoPointer(), XVar, YVar)
326326
327327 }
328328
329-var xIconViewGetPixbufColumn func(uintptr) int32
329+var xIconViewGetPixbufColumn func(uintptr) int
330330
331331 // Returns the column with pixbufs for @icon_view.
332-func (x *IconView) GetPixbufColumn() int32 {
332+func (x *IconView) GetPixbufColumn() int {
333333
334334 return xIconViewGetPixbufColumn(x.GoPointer())
335335
@@ -345,10 +345,10 @@ func (x *IconView) GetReorderable() bool {
345345
346346 }
347347
348-var xIconViewGetRowSpacing func(uintptr) int32
348+var xIconViewGetRowSpacing func(uintptr) int
349349
350350 // Returns the value of the ::row-spacing property.
351-func (x *IconView) GetRowSpacing() int32 {
351+func (x *IconView) GetRowSpacing() int {
352352
353353 return xIconViewGetRowSpacing(x.GoPointer())
354354
@@ -387,35 +387,35 @@ func (x *IconView) GetSelectionMode() SelectionMode {
387387
388388 }
389389
390-var xIconViewGetSpacing func(uintptr) int32
390+var xIconViewGetSpacing func(uintptr) int
391391
392392 // Returns the value of the ::spacing property.
393-func (x *IconView) GetSpacing() int32 {
393+func (x *IconView) GetSpacing() int {
394394
395395 return xIconViewGetSpacing(x.GoPointer())
396396
397397 }
398398
399-var xIconViewGetTextColumn func(uintptr) int32
399+var xIconViewGetTextColumn func(uintptr) int
400400
401401 // Returns the column with text for @icon_view.
402-func (x *IconView) GetTextColumn() int32 {
402+func (x *IconView) GetTextColumn() int {
403403
404404 return xIconViewGetTextColumn(x.GoPointer())
405405
406406 }
407407
408-var xIconViewGetTooltipColumn func(uintptr) int32
408+var xIconViewGetTooltipColumn func(uintptr) int
409409
410410 // Returns the column of @icon_view’s model which is being used for
411411 // displaying tooltips on @icon_view’s rows.
412-func (x *IconView) GetTooltipColumn() int32 {
412+func (x *IconView) GetTooltipColumn() int {
413413
414414 return xIconViewGetTooltipColumn(x.GoPointer())
415415
416416 }
417417
418-var xIconViewGetTooltipContext func(uintptr, int32, int32, bool, *uintptr, **TreePath, *TreeIter) bool
418+var xIconViewGetTooltipContext func(uintptr, int, int, bool, *uintptr, **TreePath, *TreeIter) bool
419419
420420 // This function is supposed to be used in a `GtkWidget::query-tooltip`
421421 // signal handler for `GtkIconView`. The @x, @y and @keyboard_tip values
@@ -427,7 +427,7 @@ var xIconViewGetTooltipContext func(uintptr, int32, int32, bool, *uintptr, **Tre
427427 // tooltips the item returned will be the cursor item. When %TRUE, then any of
428428 // @model, @path and @iter which have been provided will be set to point to
429429 // that row and the corresponding model.
430-func (x *IconView) GetTooltipContext(XVar int32, YVar int32, KeyboardTipVar bool, ModelVar *TreeModel, PathVar **TreePath, IterVar *TreeIter) bool {
430+func (x *IconView) GetTooltipContext(XVar int, YVar int, KeyboardTipVar bool, ModelVar *TreeModel, PathVar **TreePath, IterVar *TreeIter) bool {
431431
432432 return xIconViewGetTooltipContext(x.GoPointer(), XVar, YVar, KeyboardTipVar, gobject.ConvertPtr(ModelVar), PathVar, IterVar)
433433
@@ -525,23 +525,23 @@ func (x *IconView) SetActivateOnSingleClick(SingleVar bool) {
525525
526526 }
527527
528-var xIconViewSetColumnSpacing func(uintptr, int32)
528+var xIconViewSetColumnSpacing func(uintptr, int)
529529
530530 // Sets the ::column-spacing property which specifies the space
531531 // which is inserted between the columns of the icon view.
532-func (x *IconView) SetColumnSpacing(ColumnSpacingVar int32) {
532+func (x *IconView) SetColumnSpacing(ColumnSpacingVar int) {
533533
534534 xIconViewSetColumnSpacing(x.GoPointer(), ColumnSpacingVar)
535535
536536 }
537537
538-var xIconViewSetColumns func(uintptr, int32)
538+var xIconViewSetColumns func(uintptr, int)
539539
540540 // Sets the ::columns property which determines in how
541541 // many columns the icons are arranged. If @columns is
542542 // -1, the number of columns will be chosen automatically
543543 // to fill the available area.
544-func (x *IconView) SetColumns(ColumnsVar int32) {
544+func (x *IconView) SetColumns(ColumnsVar int) {
545545
546546 xIconViewSetColumns(x.GoPointer(), ColumnsVar)
547547
@@ -583,45 +583,45 @@ func (x *IconView) SetItemOrientation(OrientationVar Orientation) {
583583
584584 }
585585
586-var xIconViewSetItemPadding func(uintptr, int32)
586+var xIconViewSetItemPadding func(uintptr, int)
587587
588588 // Sets the `GtkIconView`:item-padding property which specifies the padding
589589 // around each of the icon view’s items.
590-func (x *IconView) SetItemPadding(ItemPaddingVar int32) {
590+func (x *IconView) SetItemPadding(ItemPaddingVar int) {
591591
592592 xIconViewSetItemPadding(x.GoPointer(), ItemPaddingVar)
593593
594594 }
595595
596-var xIconViewSetItemWidth func(uintptr, int32)
596+var xIconViewSetItemWidth func(uintptr, int)
597597
598598 // Sets the ::item-width property which specifies the width
599599 // to use for each item. If it is set to -1, the icon view will
600600 // automatically determine a suitable item size.
601-func (x *IconView) SetItemWidth(ItemWidthVar int32) {
601+func (x *IconView) SetItemWidth(ItemWidthVar int) {
602602
603603 xIconViewSetItemWidth(x.GoPointer(), ItemWidthVar)
604604
605605 }
606606
607-var xIconViewSetMargin func(uintptr, int32)
607+var xIconViewSetMargin func(uintptr, int)
608608
609609 // Sets the ::margin property which specifies the space
610610 // which is inserted at the top, bottom, left and right
611611 // of the icon view.
612-func (x *IconView) SetMargin(MarginVar int32) {
612+func (x *IconView) SetMargin(MarginVar int) {
613613
614614 xIconViewSetMargin(x.GoPointer(), MarginVar)
615615
616616 }
617617
618-var xIconViewSetMarkupColumn func(uintptr, int32)
618+var xIconViewSetMarkupColumn func(uintptr, int)
619619
620620 // Sets the column with markup information for @icon_view to be
621621 // @column. The markup column must be of type `G_TYPE_STRING`.
622622 // If the markup column is set to something, it overrides
623623 // the text column set by gtk_icon_view_set_text_column().
624-func (x *IconView) SetMarkupColumn(ColumnVar int32) {
624+func (x *IconView) SetMarkupColumn(ColumnVar int) {
625625
626626 xIconViewSetMarkupColumn(x.GoPointer(), ColumnVar)
627627
@@ -639,11 +639,11 @@ func (x *IconView) SetModel(ModelVar TreeModel) {
639639
640640 }
641641
642-var xIconViewSetPixbufColumn func(uintptr, int32)
642+var xIconViewSetPixbufColumn func(uintptr, int)
643643
644644 // Sets the column with pixbufs for @icon_view to be @column. The pixbuf
645645 // column must be of type `GDK_TYPE_PIXBUF`
646-func (x *IconView) SetPixbufColumn(ColumnVar int32) {
646+func (x *IconView) SetPixbufColumn(ColumnVar int) {
647647
648648 xIconViewSetPixbufColumn(x.GoPointer(), ColumnVar)
649649
@@ -669,11 +669,11 @@ func (x *IconView) SetReorderable(ReorderableVar bool) {
669669
670670 }
671671
672-var xIconViewSetRowSpacing func(uintptr, int32)
672+var xIconViewSetRowSpacing func(uintptr, int)
673673
674674 // Sets the ::row-spacing property which specifies the space
675675 // which is inserted between the rows of the icon view.
676-func (x *IconView) SetRowSpacing(RowSpacingVar int32) {
676+func (x *IconView) SetRowSpacing(RowSpacingVar int) {
677677
678678 xIconViewSetRowSpacing(x.GoPointer(), RowSpacingVar)
679679
@@ -688,22 +688,22 @@ func (x *IconView) SetSelectionMode(ModeVar SelectionMode) {
688688
689689 }
690690
691-var xIconViewSetSpacing func(uintptr, int32)
691+var xIconViewSetSpacing func(uintptr, int)
692692
693693 // Sets the ::spacing property which specifies the space
694694 // which is inserted between the cells (i.e. the icon and
695695 // the text) of an item.
696-func (x *IconView) SetSpacing(SpacingVar int32) {
696+func (x *IconView) SetSpacing(SpacingVar int) {
697697
698698 xIconViewSetSpacing(x.GoPointer(), SpacingVar)
699699
700700 }
701701
702-var xIconViewSetTextColumn func(uintptr, int32)
702+var xIconViewSetTextColumn func(uintptr, int)
703703
704704 // Sets the column with text for @icon_view to be @column. The text
705705 // column must be of type `G_TYPE_STRING`.
706-func (x *IconView) SetTextColumn(ColumnVar int32) {
706+func (x *IconView) SetTextColumn(ColumnVar int) {
707707
708708 xIconViewSetTextColumn(x.GoPointer(), ColumnVar)
709709
@@ -721,7 +721,7 @@ func (x *IconView) SetTooltipCell(TooltipVar *Tooltip, PathVar *TreePath, CellVa
721721
722722 }
723723
724-var xIconViewSetTooltipColumn func(uintptr, int32)
724+var xIconViewSetTooltipColumn func(uintptr, int)
725725
726726 // If you only plan to have simple (text-only) tooltips on full items, you
727727 // can use this function to have `GtkIconView` handle these automatically
@@ -733,7 +733,7 @@ var xIconViewSetTooltipColumn func(uintptr, int32)
733733 //
734734 // Note that the signal handler sets the text with gtk_tooltip_set_markup(),
735735 // so &, <, etc have to be escaped in the text.
736-func (x *IconView) SetTooltipColumn(ColumnVar int32) {
736+func (x *IconView) SetTooltipColumn(ColumnVar int) {
737737
738738 xIconViewSetTooltipColumn(x.GoPointer(), ColumnVar)
739739
@@ -848,8 +848,8 @@ func (x *IconView) ConnectItemActivated(cb func(IconView, uintptr)) {
848848 // - PageUp/PageDown which move by "pages"
849849 // All of these will extend the selection when combined with
850850 // the Shift modifier.
851-func (x *IconView) ConnectMoveCursor(cb func(IconView, MovementStep, int32, bool, bool) bool) {
852- fcb := func(clsPtr uintptr, StepVarp MovementStep, CountVarp int32, ExtendVarp bool, ModifyVarp bool) bool {
851+func (x *IconView) ConnectMoveCursor(cb func(IconView, MovementStep, int, bool, bool) bool) {
852+ fcb := func(clsPtr uintptr, StepVarp MovementStep, CountVarp int, ExtendVarp bool, ModifyVarp bool) bool {
853853 fa := IconView{}
854854 fa.Ptr = clsPtr
855855
@@ -1009,7 +1009,7 @@ func (x *IconView) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs .
10091009 // property change must be communicated to assistive technologies.
10101010 //
10111011 // This function is meant to be used by language bindings.
1012-func (x *IconView) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
1012+func (x *IconView) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
10131013
10141014 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
10151015
@@ -1045,7 +1045,7 @@ func (x *IconView) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs .
10451045 // relation change must be communicated to assistive technologies.
10461046 //
10471047 // This function is meant to be used by language bindings.
1048-func (x *IconView) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
1048+func (x *IconView) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
10491049
10501050 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
10511051
@@ -1078,7 +1078,7 @@ func (x *IconView) UpdateState(FirstStateVar AccessibleState, varArgs ...interfa
10781078 // state change must be communicated to assistive technologies.
10791079 //
10801080 // This function is meant to be used by language bindings.
1081-func (x *IconView) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
1081+func (x *IconView) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
10821082
10831083 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
10841084
@@ -1101,7 +1101,7 @@ func (x *IconView) GetBuildableId() string {
11011101 // example if column 2 of the model contains strings, you could have the
11021102 // “text” attribute of a `GtkCellRendererText` get its values from column 2.
11031103 // In this context "attribute" and "property" are used interchangeably.
1104-func (x *IconView) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int32) {
1104+func (x *IconView) AddAttribute(CellVar *CellRenderer, AttributeVar string, ColumnVar int) {
11051105
11061106 XGtkCellLayoutAddAttribute(x.GoPointer(), CellVar.GoPointer(), AttributeVar, ColumnVar)
11071107
@@ -1174,7 +1174,7 @@ func (x *IconView) PackStart(CellVar *CellRenderer, ExpandVar bool) {
11741174 //
11751175 // Note that @cell has already to be packed into @cell_layout
11761176 // for this to function properly.
1177-func (x *IconView) Reorder(CellVar *CellRenderer, PositionVar int32) {
1177+func (x *IconView) Reorder(CellVar *CellRenderer, PositionVar int) {
11781178
11791179 XGtkCellLayoutReorder(x.GoPointer(), CellVar.GoPointer(), PositionVar)
11801180
M v4/gtk/gtkimage.go +7 -7
@@ -321,10 +321,10 @@ func (x *Image) GetPaintable() *gdk.PaintableBase {
321321
322322 }
323323
324-var xImageGetPixelSize func(uintptr) int32
324+var xImageGetPixelSize func(uintptr) int
325325
326326 // Gets the pixel size used for named icons.
327-func (x *Image) GetPixelSize() int32 {
327+func (x *Image) GetPixelSize() int {
328328
329329 return xImageGetPixelSize(x.GoPointer())
330330
@@ -422,13 +422,13 @@ func (x *Image) SetIconSize(IconSizeVar IconSize) {
422422
423423 }
424424
425-var xImageSetPixelSize func(uintptr, int32)
425+var xImageSetPixelSize func(uintptr, int)
426426
427427 // Sets the pixel size to use for named icons.
428428 //
429429 // If the pixel size is set to a value != -1, it is used instead
430430 // of the icon size set by [method@Gtk.Image.set_from_icon_name].
431-func (x *Image) SetPixelSize(PixelSizeVar int32) {
431+func (x *Image) SetPixelSize(PixelSizeVar int) {
432432
433433 xImageSetPixelSize(x.GoPointer(), PixelSizeVar)
434434
@@ -500,7 +500,7 @@ func (x *Image) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...i
500500 // property change must be communicated to assistive technologies.
501501 //
502502 // This function is meant to be used by language bindings.
503-func (x *Image) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
503+func (x *Image) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
504504
505505 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
506506
@@ -536,7 +536,7 @@ func (x *Image) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...i
536536 // relation change must be communicated to assistive technologies.
537537 //
538538 // This function is meant to be used by language bindings.
539-func (x *Image) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
539+func (x *Image) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
540540
541541 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
542542
@@ -569,7 +569,7 @@ func (x *Image) UpdateState(FirstStateVar AccessibleState, varArgs ...interface{
569569 // state change must be communicated to assistive technologies.
570570 //
571571 // This function is meant to be used by language bindings.
572-func (x *Image) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
572+func (x *Image) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
573573
574574 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
575575
M v4/gtk/gtkimcontext.go +16 -16
@@ -52,7 +52,7 @@ func IMContextNewFromInternalPtr(ptr uintptr) *IMContext {
5252 return cls
5353 }
5454
55-var xIMContextDeleteSurrounding func(uintptr, int32, int32) bool
55+var xIMContextDeleteSurrounding func(uintptr, int, int) bool
5656
5757 // Asks the widget that the input context is attached to delete
5858 // characters around the cursor position by emitting the
@@ -71,18 +71,18 @@ var xIMContextDeleteSurrounding func(uintptr, int32, int32) bool
7171 // This function is used by an input method that wants to make
7272 // subsitutions in the existing text in response to new input.
7373 // It is not useful for applications.
74-func (x *IMContext) DeleteSurrounding(OffsetVar int32, NCharsVar int32) bool {
74+func (x *IMContext) DeleteSurrounding(OffsetVar int, NCharsVar int) bool {
7575
7676 return xIMContextDeleteSurrounding(x.GoPointer(), OffsetVar, NCharsVar)
7777
7878 }
7979
80-var xIMContextFilterKey func(uintptr, bool, uintptr, uintptr, uint32, uint, gdk.ModifierType, int32) bool
80+var xIMContextFilterKey func(uintptr, bool, uintptr, uintptr, uint32, uint, gdk.ModifierType, int) bool
8181
8282 // Allow an input method to forward key press and release events
8383 // to another input method without necessarily having a `GdkEvent`
8484 // available.
85-func (x *IMContext) FilterKey(PressVar bool, SurfaceVar *gdk.Surface, DeviceVar *gdk.Device, TimeVar uint32, KeycodeVar uint, StateVar gdk.ModifierType, GroupVar int32) bool {
85+func (x *IMContext) FilterKey(PressVar bool, SurfaceVar *gdk.Surface, DeviceVar *gdk.Device, TimeVar uint32, KeycodeVar uint, StateVar gdk.ModifierType, GroupVar int) bool {
8686
8787 return xIMContextFilterKey(x.GoPointer(), PressVar, SurfaceVar.GoPointer(), DeviceVar.GoPointer(), TimeVar, KeycodeVar, StateVar, GroupVar)
8888
@@ -127,19 +127,19 @@ func (x *IMContext) FocusOut() {
127127
128128 }
129129
130-var xIMContextGetPreeditString func(uintptr, string, **pango.AttrList, int32)
130+var xIMContextGetPreeditString func(uintptr, string, **pango.AttrList, int)
131131
132132 // Retrieve the current preedit string for the input context,
133133 // and a list of attributes to apply to the string.
134134 //
135135 // This string should be displayed inserted at the insertion point.
136-func (x *IMContext) GetPreeditString(StrVar string, AttrsVar **pango.AttrList, CursorPosVar int32) {
136+func (x *IMContext) GetPreeditString(StrVar string, AttrsVar **pango.AttrList, CursorPosVar int) {
137137
138138 xIMContextGetPreeditString(x.GoPointer(), StrVar, AttrsVar, CursorPosVar)
139139
140140 }
141141
142-var xIMContextGetSurrounding func(uintptr, string, int32) bool
142+var xIMContextGetSurrounding func(uintptr, string, int) bool
143143
144144 // Retrieves context around the insertion point.
145145 //
@@ -156,13 +156,13 @@ var xIMContextGetSurrounding func(uintptr, string, int32) bool
156156 // Note that there is no obligation for a widget to respond to the
157157 // `::retrieve-surrounding` signal, so input methods must be prepared to
158158 // function without context.
159-func (x *IMContext) GetSurrounding(TextVar string, CursorIndexVar int32) bool {
159+func (x *IMContext) GetSurrounding(TextVar string, CursorIndexVar int) bool {
160160
161161 return xIMContextGetSurrounding(x.GoPointer(), TextVar, CursorIndexVar)
162162
163163 }
164164
165-var xIMContextGetSurroundingWithSelection func(uintptr, string, int32, int32) bool
165+var xIMContextGetSurroundingWithSelection func(uintptr, string, int, int) bool
166166
167167 // Retrieves context around the insertion point.
168168 //
@@ -179,7 +179,7 @@ var xIMContextGetSurroundingWithSelection func(uintptr, string, int32, int32) bo
179179 // Note that there is no obligation for a widget to respond to the
180180 // `::retrieve-surrounding` signal, so input methods must be prepared to
181181 // function without context.
182-func (x *IMContext) GetSurroundingWithSelection(TextVar string, CursorIndexVar int32, AnchorIndexVar int32) bool {
182+func (x *IMContext) GetSurroundingWithSelection(TextVar string, CursorIndexVar int, AnchorIndexVar int) bool {
183183
184184 return xIMContextGetSurroundingWithSelection(x.GoPointer(), TextVar, CursorIndexVar, AnchorIndexVar)
185185
@@ -222,7 +222,7 @@ func (x *IMContext) SetCursorLocation(AreaVar *gdk.Rectangle) {
222222
223223 }
224224
225-var xIMContextSetSurrounding func(uintptr, string, int32, int32)
225+var xIMContextSetSurrounding func(uintptr, string, int, int)
226226
227227 // Sets surrounding context around the insertion point and preedit
228228 // string.
@@ -230,19 +230,19 @@ var xIMContextSetSurrounding func(uintptr, string, int32, int32)
230230 // This function is expected to be called in response to the
231231 // [signal@Gtk.IMContext::retrieve-surrounding] signal, and will
232232 // likely have no effect if called at other times.
233-func (x *IMContext) SetSurrounding(TextVar string, LenVar int32, CursorIndexVar int32) {
233+func (x *IMContext) SetSurrounding(TextVar string, LenVar int, CursorIndexVar int) {
234234
235235 xIMContextSetSurrounding(x.GoPointer(), TextVar, LenVar, CursorIndexVar)
236236
237237 }
238238
239-var xIMContextSetSurroundingWithSelection func(uintptr, string, int32, int32, int32)
239+var xIMContextSetSurroundingWithSelection func(uintptr, string, int, int, int)
240240
241241 // Sets surrounding context around the insertion point and preedit
242242 // string. This function is expected to be called in response to the
243243 // [signal@Gtk.IMContext::retrieve_surrounding] signal, and will likely
244244 // have no effect if called at other times.
245-func (x *IMContext) SetSurroundingWithSelection(TextVar string, LenVar int32, CursorIndexVar int32, AnchorIndexVar int32) {
245+func (x *IMContext) SetSurroundingWithSelection(TextVar string, LenVar int, CursorIndexVar int, AnchorIndexVar int) {
246246
247247 xIMContextSetSurroundingWithSelection(x.GoPointer(), TextVar, LenVar, CursorIndexVar, AnchorIndexVar)
248248
@@ -291,8 +291,8 @@ func (x *IMContext) ConnectCommit(cb func(IMContext, string)) {
291291
292292 // The ::delete-surrounding signal is emitted when the input method
293293 // needs to delete all or part of the context surrounding the cursor.
294-func (x *IMContext) ConnectDeleteSurrounding(cb func(IMContext, int32, int32) bool) {
295- fcb := func(clsPtr uintptr, OffsetVarp int32, NCharsVarp int32) bool {
294+func (x *IMContext) ConnectDeleteSurrounding(cb func(IMContext, int, int) bool) {
295+ fcb := func(clsPtr uintptr, OffsetVarp int, NCharsVarp int) bool {
296296 fa := IMContext{}
297297 fa.Ptr = clsPtr
298298
M v4/gtk/gtkimcontextsimple.go +2 -2
@@ -83,7 +83,7 @@ func (x *IMContextSimple) AddComposeFile(ComposeFileVar string) {
8383
8484 }
8585
86-var xIMContextSimpleAddTable func(uintptr, uintptr, int32, int32)
86+var xIMContextSimpleAddTable func(uintptr, uintptr, int, int)
8787
8888 // Adds an additional table to search to the input context.
8989 // Each row of the table consists of @max_seq_len key symbols
@@ -94,7 +94,7 @@ var xIMContextSimpleAddTable func(uintptr, uintptr, int32, int32)
9494 // The table must be sorted in dictionary order on the
9595 // numeric value of the key symbol fields. (Values beyond
9696 // the length of the sequence should be zero.)
97-func (x *IMContextSimple) AddTable(DataVar uintptr, MaxSeqLenVar int32, NSeqsVar int32) {
97+func (x *IMContextSimple) AddTable(DataVar uintptr, MaxSeqLenVar int, NSeqsVar int) {
9898
9999 xIMContextSimpleAddTable(x.GoPointer(), DataVar, MaxSeqLenVar, NSeqsVar)
100100
M v4/gtk/gtkinfobar.go +15 -15
@@ -134,7 +134,7 @@ func NewWithButtonsInfoBar(FirstButtonTextVar string, varArgs ...interface{}) *W
134134 return NewWithButtonsInfoBarCls
135135 }
136136
137-var xInfoBarAddActionWidget func(uintptr, uintptr, int32)
137+var xInfoBarAddActionWidget func(uintptr, uintptr, int)
138138
139139 // Add an activatable widget to the action area of a `GtkInfoBar`.
140140 //
@@ -142,13 +142,13 @@ var xInfoBarAddActionWidget func(uintptr, uintptr, int32)
142142 // [signal@Gtk.InfoBar::response] signal on the message area
143143 // when the widget is activated. The widget is appended to the
144144 // end of the message areas action area.
145-func (x *InfoBar) AddActionWidget(ChildVar *Widget, ResponseIdVar int32) {
145+func (x *InfoBar) AddActionWidget(ChildVar *Widget, ResponseIdVar int) {
146146
147147 xInfoBarAddActionWidget(x.GoPointer(), ChildVar.GoPointer(), ResponseIdVar)
148148
149149 }
150150
151-var xInfoBarAddButton func(uintptr, string, int32) uintptr
151+var xInfoBarAddButton func(uintptr, string, int) uintptr
152152
153153 // Adds a button with the given text.
154154 //
@@ -156,7 +156,7 @@ var xInfoBarAddButton func(uintptr, string, int32) uintptr
156156 // signal with the given response_id. The button is appended to the
157157 // end of the info bars's action area. The button widget is returned,
158158 // but usually you don't need it.
159-func (x *InfoBar) AddButton(ButtonTextVar string, ResponseIdVar int32) *Button {
159+func (x *InfoBar) AddButton(ButtonTextVar string, ResponseIdVar int) *Button {
160160
161161 AddButtonPtr := xInfoBarAddButton(x.GoPointer(), ButtonTextVar, ResponseIdVar)
162162 if AddButtonPtr == 0 {
@@ -242,16 +242,16 @@ func (x *InfoBar) RemoveChild(WidgetVar *Widget) {
242242
243243 }
244244
245-var xInfoBarResponse func(uintptr, int32)
245+var xInfoBarResponse func(uintptr, int)
246246
247247 // Emits the “response” signal with the given @response_id.
248-func (x *InfoBar) Response(ResponseIdVar int32) {
248+func (x *InfoBar) Response(ResponseIdVar int) {
249249
250250 xInfoBarResponse(x.GoPointer(), ResponseIdVar)
251251
252252 }
253253
254-var xInfoBarSetDefaultResponse func(uintptr, int32)
254+var xInfoBarSetDefaultResponse func(uintptr, int)
255255
256256 // Sets the last widget in the info bar’s action area with
257257 // the given response_id as the default widget for the dialog.
@@ -260,7 +260,7 @@ var xInfoBarSetDefaultResponse func(uintptr, int32)
260260 //
261261 // Note that this function currently requires @info_bar to
262262 // be added to a widget hierarchy.
263-func (x *InfoBar) SetDefaultResponse(ResponseIdVar int32) {
263+func (x *InfoBar) SetDefaultResponse(ResponseIdVar int) {
264264
265265 xInfoBarSetDefaultResponse(x.GoPointer(), ResponseIdVar)
266266
@@ -277,14 +277,14 @@ func (x *InfoBar) SetMessageType(MessageTypeVar MessageType) {
277277
278278 }
279279
280-var xInfoBarSetResponseSensitive func(uintptr, int32, bool)
280+var xInfoBarSetResponseSensitive func(uintptr, int, bool)
281281
282282 // Sets the sensitivity of action widgets for @response_id.
283283 //
284284 // Calls `gtk_widget_set_sensitive (widget, setting)` for each
285285 // widget in the info bars’s action area with the given @response_id.
286286 // A convenient way to sensitize/desensitize buttons.
287-func (x *InfoBar) SetResponseSensitive(ResponseIdVar int32, SettingVar bool) {
287+func (x *InfoBar) SetResponseSensitive(ResponseIdVar int, SettingVar bool) {
288288
289289 xInfoBarSetResponseSensitive(x.GoPointer(), ResponseIdVar, SettingVar)
290290
@@ -346,8 +346,8 @@ func (x *InfoBar) ConnectClose(cb func(InfoBar)) {
346346 // The signal is also emitted when the application programmer
347347 // calls [method@Gtk.InfoBar.response]. The @response_id depends
348348 // on which action widget was clicked.
349-func (x *InfoBar) ConnectResponse(cb func(InfoBar, int32)) {
350- fcb := func(clsPtr uintptr, ResponseIdVarp int32) {
349+func (x *InfoBar) ConnectResponse(cb func(InfoBar, int)) {
350+ fcb := func(clsPtr uintptr, ResponseIdVarp int) {
351351 fa := InfoBar{}
352352 fa.Ptr = clsPtr
353353
@@ -415,7 +415,7 @@ func (x *InfoBar) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ..
415415 // property change must be communicated to assistive technologies.
416416 //
417417 // This function is meant to be used by language bindings.
418-func (x *InfoBar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
418+func (x *InfoBar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
419419
420420 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
421421
@@ -451,7 +451,7 @@ func (x *InfoBar) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ..
451451 // relation change must be communicated to assistive technologies.
452452 //
453453 // This function is meant to be used by language bindings.
454-func (x *InfoBar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
454+func (x *InfoBar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
455455
456456 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
457457
@@ -484,7 +484,7 @@ func (x *InfoBar) UpdateState(FirstStateVar AccessibleState, varArgs ...interfac
484484 // state change must be communicated to assistive technologies.
485485 //
486486 // This function is meant to be used by language bindings.
487-func (x *InfoBar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
487+func (x *InfoBar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
488488
489489 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
490490
M v4/gtk/gtkinscription.go +3 -3
@@ -351,7 +351,7 @@ func (x *Inscription) UpdateProperty(FirstPropertyVar AccessibleProperty, varArg
351351 // property change must be communicated to assistive technologies.
352352 //
353353 // This function is meant to be used by language bindings.
354-func (x *Inscription) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
354+func (x *Inscription) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
355355
356356 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
357357
@@ -387,7 +387,7 @@ func (x *Inscription) UpdateRelation(FirstRelationVar AccessibleRelation, varArg
387387 // relation change must be communicated to assistive technologies.
388388 //
389389 // This function is meant to be used by language bindings.
390-func (x *Inscription) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
390+func (x *Inscription) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
391391
392392 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
393393
@@ -420,7 +420,7 @@ func (x *Inscription) UpdateState(FirstStateVar AccessibleState, varArgs ...inte
420420 // state change must be communicated to assistive technologies.
421421 //
422422 // This function is meant to be used by language bindings.
423-func (x *Inscription) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
423+func (x *Inscription) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
424424
425425 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
426426
M v4/gtk/gtklabel.go +23 -23
@@ -357,7 +357,7 @@ func (x *Label) GetLayout() *pango.Layout {
357357
358358 }
359359
360-var xLabelGetLayoutOffsets func(uintptr, int32, int32)
360+var xLabelGetLayoutOffsets func(uintptr, int, int)
361361
362362 // Obtains the coordinates where the label will draw its `PangoLayout`.
363363 //
@@ -366,30 +366,30 @@ var xLabelGetLayoutOffsets func(uintptr, int32, int32)
366366 // of the label is clicked. Remember when using the [class@Pango.Layout]
367367 // functions you need to convert to and from pixels using PANGO_PIXELS()
368368 // or [const@Pango.SCALE].
369-func (x *Label) GetLayoutOffsets(XVar int32, YVar int32) {
369+func (x *Label) GetLayoutOffsets(XVar int, YVar int) {
370370
371371 xLabelGetLayoutOffsets(x.GoPointer(), XVar, YVar)
372372
373373 }
374374
375-var xLabelGetLines func(uintptr) int32
375+var xLabelGetLines func(uintptr) int
376376
377377 // Gets the number of lines to which an ellipsized, wrapping
378378 // label should be limited.
379379 //
380380 // See [method@Gtk.Label.set_lines].
381-func (x *Label) GetLines() int32 {
381+func (x *Label) GetLines() int {
382382
383383 return xLabelGetLines(x.GoPointer())
384384
385385 }
386386
387-var xLabelGetMaxWidthChars func(uintptr) int32
387+var xLabelGetMaxWidthChars func(uintptr) int
388388
389389 // Retrieves the desired maximum width of @label, in characters.
390390 //
391391 // See [method@Gtk.Label.set_width_chars].
392-func (x *Label) GetMaxWidthChars() int32 {
392+func (x *Label) GetMaxWidthChars() int {
393393
394394 return xLabelGetMaxWidthChars(x.GoPointer())
395395
@@ -449,10 +449,10 @@ func (x *Label) GetSelectable() bool {
449449
450450 }
451451
452-var xLabelGetSelectionBounds func(uintptr, int32, int32) bool
452+var xLabelGetSelectionBounds func(uintptr, int, int) bool
453453
454454 // Gets the selected range of characters in the label.
455-func (x *Label) GetSelectionBounds(StartVar int32, EndVar int32) bool {
455+func (x *Label) GetSelectionBounds(StartVar int, EndVar int) bool {
456456
457457 return xLabelGetSelectionBounds(x.GoPointer(), StartVar, EndVar)
458458
@@ -514,12 +514,12 @@ func (x *Label) GetUseUnderline() bool {
514514
515515 }
516516
517-var xLabelGetWidthChars func(uintptr) int32
517+var xLabelGetWidthChars func(uintptr) int
518518
519519 // Retrieves the desired width of @label, in characters.
520520 //
521521 // See [method@Gtk.Label.set_width_chars].
522-func (x *Label) GetWidthChars() int32 {
522+func (x *Label) GetWidthChars() int {
523523
524524 return xLabelGetWidthChars(x.GoPointer())
525525
@@ -569,14 +569,14 @@ func (x *Label) GetYalign() float32 {
569569
570570 }
571571
572-var xLabelSelectRegion func(uintptr, int32, int32)
572+var xLabelSelectRegion func(uintptr, int, int)
573573
574574 // Selects a range of characters in the label, if the label is selectable.
575575 //
576576 // See [method@Gtk.Label.set_selectable]. If the label is not selectable,
577577 // this function has no effect. If @start_offset or
578578 // @end_offset are -1, then the end of the label will be substituted.
579-func (x *Label) SelectRegion(StartOffsetVar int32, EndOffsetVar int32) {
579+func (x *Label) SelectRegion(StartOffsetVar int, EndOffsetVar int) {
580580
581581 xLabelSelectRegion(x.GoPointer(), StartOffsetVar, EndOffsetVar)
582582
@@ -649,14 +649,14 @@ func (x *Label) SetLabel(StrVar string) {
649649
650650 }
651651
652-var xLabelSetLines func(uintptr, int32)
652+var xLabelSetLines func(uintptr, int)
653653
654654 // Sets the number of lines to which an ellipsized, wrapping label
655655 // should be limited.
656656 //
657657 // This has no effect if the label is not wrapping or ellipsized.
658658 // Set this to -1 if you don’t want to limit the number of lines.
659-func (x *Label) SetLines(LinesVar int32) {
659+func (x *Label) SetLines(LinesVar int) {
660660
661661 xLabelSetLines(x.GoPointer(), LinesVar)
662662
@@ -714,10 +714,10 @@ func (x *Label) SetMarkupWithMnemonic(StrVar string) {
714714
715715 }
716716
717-var xLabelSetMaxWidthChars func(uintptr, int32)
717+var xLabelSetMaxWidthChars func(uintptr, int)
718718
719719 // Sets the desired maximum width in characters of @label to @n_chars.
720-func (x *Label) SetMaxWidthChars(NCharsVar int32) {
720+func (x *Label) SetMaxWidthChars(NCharsVar int) {
721721
722722 xLabelSetMaxWidthChars(x.GoPointer(), NCharsVar)
723723
@@ -844,10 +844,10 @@ func (x *Label) SetUseUnderline(SettingVar bool) {
844844
845845 }
846846
847-var xLabelSetWidthChars func(uintptr, int32)
847+var xLabelSetWidthChars func(uintptr, int)
848848
849849 // Sets the desired width in characters of @label to @n_chars.
850-func (x *Label) SetWidthChars(NCharsVar int32) {
850+func (x *Label) SetWidthChars(NCharsVar int) {
851851
852852 xLabelSetWidthChars(x.GoPointer(), NCharsVar)
853853
@@ -985,8 +985,8 @@ func (x *Label) ConnectCopyClipboard(cb func(Label)) {
985985 // - Arrow keys move by individual characters/lines
986986 // - Ctrl-arrow key combinations move by words/paragraphs
987987 // - Home/End keys move to the ends of the buffer
988-func (x *Label) ConnectMoveCursor(cb func(Label, MovementStep, int32, bool)) {
989- fcb := func(clsPtr uintptr, StepVarp MovementStep, CountVarp int32, ExtendSelectionVarp bool) {
988+func (x *Label) ConnectMoveCursor(cb func(Label, MovementStep, int, bool)) {
989+ fcb := func(clsPtr uintptr, StepVarp MovementStep, CountVarp int, ExtendSelectionVarp bool) {
990990 fa := Label{}
991991 fa.Ptr = clsPtr
992992
@@ -1054,7 +1054,7 @@ func (x *Label) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...i
10541054 // property change must be communicated to assistive technologies.
10551055 //
10561056 // This function is meant to be used by language bindings.
1057-func (x *Label) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
1057+func (x *Label) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
10581058
10591059 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
10601060
@@ -1090,7 +1090,7 @@ func (x *Label) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...i
10901090 // relation change must be communicated to assistive technologies.
10911091 //
10921092 // This function is meant to be used by language bindings.
1093-func (x *Label) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
1093+func (x *Label) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
10941094
10951095 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
10961096
@@ -1123,7 +1123,7 @@ func (x *Label) UpdateState(FirstStateVar AccessibleState, varArgs ...interface{
11231123 // state change must be communicated to assistive technologies.
11241124 //
11251125 // This function is meant to be used by language bindings.
1126-func (x *Label) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
1126+func (x *Label) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
11271127
11281128 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
11291129
M v4/gtk/gtklayoutmanager.go +4 -4
@@ -79,12 +79,12 @@ func LayoutManagerNewFromInternalPtr(ptr uintptr) *LayoutManager {
7979 return cls
8080 }
8181
82-var xLayoutManagerAllocate func(uintptr, uintptr, int32, int32, int32)
82+var xLayoutManagerAllocate func(uintptr, uintptr, int, int, int)
8383
8484 // Assigns the given @width, @height, and @baseline to
8585 // a @widget, and computes the position and sizes of the children of
8686 // the @widget using the layout management policy of @manager.
87-func (x *LayoutManager) Allocate(WidgetVar *Widget, WidthVar int32, HeightVar int32, BaselineVar int32) {
87+func (x *LayoutManager) Allocate(WidgetVar *Widget, WidthVar int, HeightVar int, BaselineVar int) {
8888
8989 xLayoutManagerAllocate(x.GoPointer(), WidgetVar.GoPointer(), WidthVar, HeightVar, BaselineVar)
9090
@@ -154,14 +154,14 @@ func (x *LayoutManager) LayoutChanged() {
154154
155155 }
156156
157-var xLayoutManagerMeasure func(uintptr, uintptr, Orientation, int32, int32, int32, int32, int32)
157+var xLayoutManagerMeasure func(uintptr, uintptr, Orientation, int, int, int, int, int)
158158
159159 // Measures the size of the @widget using @manager, for the
160160 // given @orientation and size.
161161 //
162162 // See the [class@Gtk.Widget] documentation on layout management for
163163 // more details.
164-func (x *LayoutManager) Measure(WidgetVar *Widget, OrientationVar Orientation, ForSizeVar int32, MinimumVar int32, NaturalVar int32, MinimumBaselineVar int32, NaturalBaselineVar int32) {
164+func (x *LayoutManager) Measure(WidgetVar *Widget, OrientationVar Orientation, ForSizeVar int, MinimumVar int, NaturalVar int, MinimumBaselineVar int, NaturalBaselineVar int) {
165165
166166 xLayoutManagerMeasure(x.GoPointer(), WidgetVar.GoPointer(), OrientationVar, ForSizeVar, MinimumVar, NaturalVar, MinimumBaselineVar, NaturalBaselineVar)
167167
M v4/gtk/gtklevelbar.go +3 -3
@@ -369,7 +369,7 @@ func (x *LevelBar) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs .
369369 // property change must be communicated to assistive technologies.
370370 //
371371 // This function is meant to be used by language bindings.
372-func (x *LevelBar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
372+func (x *LevelBar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
373373
374374 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
375375
@@ -405,7 +405,7 @@ func (x *LevelBar) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs .
405405 // relation change must be communicated to assistive technologies.
406406 //
407407 // This function is meant to be used by language bindings.
408-func (x *LevelBar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
408+func (x *LevelBar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
409409
410410 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
411411
@@ -438,7 +438,7 @@ func (x *LevelBar) UpdateState(FirstStateVar AccessibleState, varArgs ...interfa
438438 // state change must be communicated to assistive technologies.
439439 //
440440 // This function is meant to be used by language bindings.
441-func (x *LevelBar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
441+func (x *LevelBar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
442442
443443 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
444444
M v4/gtk/gtklinkbutton.go +3 -3
@@ -206,7 +206,7 @@ func (x *LinkButton) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
206206 // property change must be communicated to assistive technologies.
207207 //
208208 // This function is meant to be used by language bindings.
209-func (x *LinkButton) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
209+func (x *LinkButton) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
210210
211211 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
212212
@@ -242,7 +242,7 @@ func (x *LinkButton) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
242242 // relation change must be communicated to assistive technologies.
243243 //
244244 // This function is meant to be used by language bindings.
245-func (x *LinkButton) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
245+func (x *LinkButton) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
246246
247247 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
248248
@@ -275,7 +275,7 @@ func (x *LinkButton) UpdateState(FirstStateVar AccessibleState, varArgs ...inter
275275 // state change must be communicated to assistive technologies.
276276 //
277277 // This function is meant to be used by language bindings.
278-func (x *LinkButton) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
278+func (x *LinkButton) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
279279
280280 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
281281
M v4/gtk/gtklistbase.go +3 -3
@@ -83,7 +83,7 @@ func (x *ListBase) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs .
8383 // property change must be communicated to assistive technologies.
8484 //
8585 // This function is meant to be used by language bindings.
86-func (x *ListBase) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
86+func (x *ListBase) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
8787
8888 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
8989
@@ -119,7 +119,7 @@ func (x *ListBase) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs .
119119 // relation change must be communicated to assistive technologies.
120120 //
121121 // This function is meant to be used by language bindings.
122-func (x *ListBase) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
122+func (x *ListBase) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
123123
124124 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
125125
@@ -152,7 +152,7 @@ func (x *ListBase) UpdateState(FirstStateVar AccessibleState, varArgs ...interfa
152152 // state change must be communicated to assistive technologies.
153153 //
154154 // This function is meant to be used by language bindings.
155-func (x *ListBase) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
155+func (x *ListBase) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
156156
157157 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
158158
M v4/gtk/gtklistbox.go +17 -17
@@ -26,7 +26,7 @@ type ListBoxFilterFunc func(uintptr, uintptr) bool
2626 type ListBoxForeachFunc func(uintptr, uintptr, uintptr)
2727
2828 // Compare two rows to determine which should be first.
29-type ListBoxSortFunc func(uintptr, uintptr, uintptr) int32
29+type ListBoxSortFunc func(uintptr, uintptr, uintptr) int
3030
3131 // Whenever @row changes or which row is before @row changes this
3232 // is called, which lets you update the header on @row.
@@ -207,13 +207,13 @@ func (x *ListBox) GetAdjustment() *Adjustment {
207207
208208 }
209209
210-var xListBoxGetRowAtIndex func(uintptr, int32) uintptr
210+var xListBoxGetRowAtIndex func(uintptr, int) uintptr
211211
212212 // Gets the n-th child in the list (not counting headers).
213213 //
214214 // If @index_ is negative or larger than the number of items in the
215215 // list, %NULL is returned.
216-func (x *ListBox) GetRowAtIndex(IndexVar int32) *ListBoxRow {
216+func (x *ListBox) GetRowAtIndex(IndexVar int) *ListBoxRow {
217217
218218 GetRowAtIndexPtr := xListBoxGetRowAtIndex(x.GoPointer(), IndexVar)
219219 if GetRowAtIndexPtr == 0 {
@@ -228,10 +228,10 @@ func (x *ListBox) GetRowAtIndex(IndexVar int32) *ListBoxRow {
228228
229229 }
230230
231-var xListBoxGetRowAtY func(uintptr, int32) uintptr
231+var xListBoxGetRowAtY func(uintptr, int) uintptr
232232
233233 // Gets the row at the @y position.
234-func (x *ListBox) GetRowAtY(YVar int32) *ListBoxRow {
234+func (x *ListBox) GetRowAtY(YVar int) *ListBoxRow {
235235
236236 GetRowAtYPtr := xListBoxGetRowAtY(x.GoPointer(), YVar)
237237 if GetRowAtYPtr == 0 {
@@ -296,7 +296,7 @@ func (x *ListBox) GetShowSeparators() bool {
296296
297297 }
298298
299-var xListBoxInsert func(uintptr, uintptr, int32)
299+var xListBoxInsert func(uintptr, uintptr, int)
300300
301301 // Insert the @child into the @box at @position.
302302 //
@@ -305,7 +305,7 @@ var xListBoxInsert func(uintptr, uintptr, int32)
305305 //
306306 // If @position is -1, or larger than the total number of items in the
307307 // @box, then the @child will be appended to the end.
308-func (x *ListBox) Insert(ChildVar *Widget, PositionVar int32) {
308+func (x *ListBox) Insert(ChildVar *Widget, PositionVar int) {
309309
310310 xListBoxInsert(x.GoPointer(), ChildVar.GoPointer(), PositionVar)
311311
@@ -570,8 +570,8 @@ func (x *ListBox) ConnectActivateCursorRow(cb func(ListBox)) {
570570 gobject.ObjectConnect(x.GoPointer(), "signal::activate-cursor-row", purego.NewCallback(fcb))
571571 }
572572
573-func (x *ListBox) ConnectMoveCursor(cb func(ListBox, MovementStep, int32, bool, bool)) {
574- fcb := func(clsPtr uintptr, ObjectVarp MovementStep, P0Varp int32, P1Varp bool, P2Varp bool) {
573+func (x *ListBox) ConnectMoveCursor(cb func(ListBox, MovementStep, int, bool, bool)) {
574+ fcb := func(clsPtr uintptr, ObjectVarp MovementStep, P0Varp int, P1Varp bool, P2Varp bool) {
575575 fa := ListBox{}
576576 fa.Ptr = clsPtr
577577
@@ -726,7 +726,7 @@ func (x *ListBox) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ..
726726 // property change must be communicated to assistive technologies.
727727 //
728728 // This function is meant to be used by language bindings.
729-func (x *ListBox) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
729+func (x *ListBox) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
730730
731731 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
732732
@@ -762,7 +762,7 @@ func (x *ListBox) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ..
762762 // relation change must be communicated to assistive technologies.
763763 //
764764 // This function is meant to be used by language bindings.
765-func (x *ListBox) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
765+func (x *ListBox) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
766766
767767 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
768768
@@ -795,7 +795,7 @@ func (x *ListBox) UpdateState(FirstStateVar AccessibleState, varArgs ...interfac
795795 // state change must be communicated to assistive technologies.
796796 //
797797 // This function is meant to be used by language bindings.
798-func (x *ListBox) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
798+func (x *ListBox) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
799799
800800 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
801801
@@ -914,10 +914,10 @@ func (x *ListBoxRow) GetHeader() *Widget {
914914
915915 }
916916
917-var xListBoxRowGetIndex func(uintptr) int32
917+var xListBoxRowGetIndex func(uintptr) int
918918
919919 // Gets the current index of the @row in its `GtkListBox` container.
920-func (x *ListBoxRow) GetIndex() int32 {
920+func (x *ListBoxRow) GetIndex() int {
921921
922922 return xListBoxRowGetIndex(x.GoPointer())
923923
@@ -1065,7 +1065,7 @@ func (x *ListBoxRow) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
10651065 // property change must be communicated to assistive technologies.
10661066 //
10671067 // This function is meant to be used by language bindings.
1068-func (x *ListBoxRow) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
1068+func (x *ListBoxRow) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
10691069
10701070 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
10711071
@@ -1101,7 +1101,7 @@ func (x *ListBoxRow) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
11011101 // relation change must be communicated to assistive technologies.
11021102 //
11031103 // This function is meant to be used by language bindings.
1104-func (x *ListBoxRow) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
1104+func (x *ListBoxRow) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
11051105
11061106 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
11071107
@@ -1134,7 +1134,7 @@ func (x *ListBoxRow) UpdateState(FirstStateVar AccessibleState, varArgs ...inter
11341134 // state change must be communicated to assistive technologies.
11351135 //
11361136 // This function is meant to be used by language bindings.
1137-func (x *ListBoxRow) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
1137+func (x *ListBoxRow) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
11381138
11391139 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
11401140
M v4/gtk/gtkliststore.go +26 -26
@@ -171,7 +171,7 @@ func ListStoreNewFromInternalPtr(ptr uintptr) *ListStore {
171171 return cls
172172 }
173173
174-var xNewListStore func(int32, ...interface{}) uintptr
174+var xNewListStore func(int, ...interface{}) uintptr
175175
176176 // Creates a new list store as with @n_columns columns each of the types passed
177177 // in. Note that only types derived from standard GObject fundamental types
@@ -180,7 +180,7 @@ var xNewListStore func(int32, ...interface{}) uintptr
180180 // As an example, `gtk_list_store_new (3, G_TYPE_INT, G_TYPE_STRING,
181181 // GDK_TYPE_TEXTURE);` will create a new `GtkListStore` with three columns, of type
182182 // int, string and `GdkTexture`, respectively.
183-func NewListStore(NColumnsVar int32, varArgs ...interface{}) *ListStore {
183+func NewListStore(NColumnsVar int, varArgs ...interface{}) *ListStore {
184184 NewListStorePtr := xNewListStore(NColumnsVar, varArgs...)
185185 if NewListStorePtr == 0 {
186186 return nil
@@ -191,10 +191,10 @@ func NewListStore(NColumnsVar int32, varArgs ...interface{}) *ListStore {
191191 return NewListStoreCls
192192 }
193193
194-var xNewvListStore func(int32, uintptr) uintptr
194+var xNewvListStore func(int, uintptr) uintptr
195195
196196 // Non-vararg creation function. Used primarily by language bindings.
197-func NewvListStore(NColumnsVar int32, TypesVar uintptr) *ListStore {
197+func NewvListStore(NColumnsVar int, TypesVar uintptr) *ListStore {
198198 NewvListStorePtr := xNewvListStore(NColumnsVar, TypesVar)
199199 if NewvListStorePtr == 0 {
200200 return nil
@@ -225,14 +225,14 @@ func (x *ListStore) Clear() {
225225
226226 }
227227
228-var xListStoreInsert func(uintptr, *TreeIter, int32)
228+var xListStoreInsert func(uintptr, *TreeIter, int)
229229
230230 // Creates a new row at @position. @iter will be changed to point to this new
231231 // row. If @position is -1 or is larger than the number of rows on the list,
232232 // then the new row will be appended to the list. The row will be empty after
233233 // this function is called. To fill in values, you need to call
234234 // gtk_list_store_set() or gtk_list_store_set_value().
235-func (x *ListStore) Insert(IterVar *TreeIter, PositionVar int32) {
235+func (x *ListStore) Insert(IterVar *TreeIter, PositionVar int) {
236236
237237 xListStoreInsert(x.GoPointer(), IterVar, PositionVar)
238238
@@ -262,7 +262,7 @@ func (x *ListStore) InsertBefore(IterVar *TreeIter, SiblingVar *TreeIter) {
262262
263263 }
264264
265-var xListStoreInsertWithValues func(uintptr, *TreeIter, int32, ...interface{})
265+var xListStoreInsertWithValues func(uintptr, *TreeIter, int, ...interface{})
266266
267267 // Creates a new row at @position. @iter will be changed to point to this new
268268 // row. If @position is -1, or larger than the number of rows in the list, then
@@ -298,20 +298,20 @@ var xListStoreInsertWithValues func(uintptr, *TreeIter, int32, ...interface{})
298298 // Since emitting the `GtkTreeModel::rows-reordered` signal repeatedly can
299299 // affect the performance of the program, gtk_list_store_insert_with_values()
300300 // should generally be preferred when inserting rows in a sorted list store.
301-func (x *ListStore) InsertWithValues(IterVar *TreeIter, PositionVar int32, varArgs ...interface{}) {
301+func (x *ListStore) InsertWithValues(IterVar *TreeIter, PositionVar int, varArgs ...interface{}) {
302302
303303 xListStoreInsertWithValues(x.GoPointer(), IterVar, PositionVar, varArgs...)
304304
305305 }
306306
307-var xListStoreInsertWithValuesv func(uintptr, *TreeIter, int32, uintptr, uintptr, int32)
307+var xListStoreInsertWithValuesv func(uintptr, *TreeIter, int, uintptr, uintptr, int)
308308
309309 // A variant of gtk_list_store_insert_with_values() which
310310 // takes the columns and values as two arrays, instead of
311311 // varargs.
312312 //
313313 // This function is mainly intended for language-bindings.
314-func (x *ListStore) InsertWithValuesv(IterVar *TreeIter, PositionVar int32, ColumnsVar uintptr, ValuesVar uintptr, NValuesVar int32) {
314+func (x *ListStore) InsertWithValuesv(IterVar *TreeIter, PositionVar int, ColumnsVar uintptr, ValuesVar uintptr, NValuesVar int) {
315315
316316 xListStoreInsertWithValuesv(x.GoPointer(), IterVar, PositionVar, ColumnsVar, ValuesVar, NValuesVar)
317317
@@ -400,13 +400,13 @@ func (x *ListStore) Set(IterVar *TreeIter, varArgs ...interface{}) {
400400
401401 }
402402
403-var xListStoreSetColumnTypes func(uintptr, int32, uintptr)
403+var xListStoreSetColumnTypes func(uintptr, int, uintptr)
404404
405405 // This function is meant primarily for `GObject`s that inherit from `GtkListStore`,
406406 // and should only be used when constructing a new `GtkListStore`. It will not
407407 // function after a row has been added, or a method on the `GtkTreeModel`
408408 // interface is called.
409-func (x *ListStore) SetColumnTypes(NColumnsVar int32, TypesVar uintptr) {
409+func (x *ListStore) SetColumnTypes(NColumnsVar int, TypesVar uintptr) {
410410
411411 xListStoreSetColumnTypes(x.GoPointer(), NColumnsVar, TypesVar)
412412
@@ -422,25 +422,25 @@ func (x *ListStore) SetValist(IterVar *TreeIter, VarArgsVar []interface{}) {
422422
423423 }
424424
425-var xListStoreSetValue func(uintptr, *TreeIter, int32, *gobject.Value)
425+var xListStoreSetValue func(uintptr, *TreeIter, int, *gobject.Value)
426426
427427 // Sets the data in the cell specified by @iter and @column.
428428 // The type of @value must be convertible to the type of the
429429 // column.
430-func (x *ListStore) SetValue(IterVar *TreeIter, ColumnVar int32, ValueVar *gobject.Value) {
430+func (x *ListStore) SetValue(IterVar *TreeIter, ColumnVar int, ValueVar *gobject.Value) {
431431
432432 xListStoreSetValue(x.GoPointer(), IterVar, ColumnVar, ValueVar)
433433
434434 }
435435
436-var xListStoreSetValuesv func(uintptr, *TreeIter, uintptr, uintptr, int32)
436+var xListStoreSetValuesv func(uintptr, *TreeIter, uintptr, uintptr, int)
437437
438438 // A variant of gtk_list_store_set_valist() which
439439 // takes the columns and values as two arrays, instead of
440440 // varargs. This function is mainly intended for
441441 // language-bindings and in case the number of columns to
442442 // change is not known until run-time.
443-func (x *ListStore) SetValuesv(IterVar *TreeIter, ColumnsVar uintptr, ValuesVar uintptr, NValuesVar int32) {
443+func (x *ListStore) SetValuesv(IterVar *TreeIter, ColumnsVar uintptr, ValuesVar uintptr, NValuesVar int) {
444444
445445 xListStoreSetValuesv(x.GoPointer(), IterVar, ColumnsVar, ValuesVar, NValuesVar)
446446
@@ -578,7 +578,7 @@ func (x *ListStore) Get(IterVar *TreeIter, varArgs ...interface{}) {
578578 }
579579
580580 // Returns the type of the column.
581-func (x *ListStore) GetColumnType(IndexVar int32) []interface{} {
581+func (x *ListStore) GetColumnType(IndexVar int) []interface{} {
582582
583583 return XGtkTreeModelGetColumnType(x.GoPointer(), IndexVar)
584584
@@ -626,7 +626,7 @@ func (x *ListStore) GetIterFromString(IterVar *TreeIter, PathStringVar string) b
626626 }
627627
628628 // Returns the number of columns supported by @tree_model.
629-func (x *ListStore) GetNColumns() int32 {
629+func (x *ListStore) GetNColumns() int {
630630
631631 return XGtkTreeModelGetNColumns(x.GoPointer())
632632
@@ -666,7 +666,7 @@ func (x *ListStore) GetValist(IterVar *TreeIter, VarArgsVar []interface{}) {
666666 //
667667 // When done with @value, g_value_unset() needs to be called
668668 // to free any allocated memory.
669-func (x *ListStore) GetValue(IterVar *TreeIter, ColumnVar int32, ValueVar *gobject.Value) {
669+func (x *ListStore) GetValue(IterVar *TreeIter, ColumnVar int, ValueVar *gobject.Value) {
670670
671671 XGtkTreeModelGetValue(x.GoPointer(), IterVar, ColumnVar, ValueVar)
672672
@@ -697,7 +697,7 @@ func (x *ListStore) IterHasChild(IterVar *TreeIter) bool {
697697 //
698698 // As a special case, if @iter is %NULL, then the number
699699 // of toplevel nodes is returned.
700-func (x *ListStore) IterNChildren(IterVar *TreeIter) int32 {
700+func (x *ListStore) IterNChildren(IterVar *TreeIter) int {
701701
702702 return XGtkTreeModelIterNChildren(x.GoPointer(), IterVar)
703703
@@ -720,7 +720,7 @@ func (x *ListStore) IterNext(IterVar *TreeIter) bool {
720720 // will remain a valid node after this function has been called. As a
721721 // special case, if @parent is %NULL, then the @n-th root node
722722 // is set.
723-func (x *ListStore) IterNthChild(IterVar *TreeIter, ParentVar *TreeIter, NVar int32) bool {
723+func (x *ListStore) IterNthChild(IterVar *TreeIter, ParentVar *TreeIter, NVar int) bool {
724724
725725 return XGtkTreeModelIterNthChild(x.GoPointer(), IterVar, ParentVar, NVar)
726726
@@ -826,7 +826,7 @@ func (x *ListStore) RowInserted(PathVar *TreePath, IterVar *TreeIter) {
826826 //
827827 // This should be called by models when their rows have been
828828 // reordered.
829-func (x *ListStore) RowsReordered(PathVar *TreePath, IterVar *TreeIter, NewOrderVar int32) {
829+func (x *ListStore) RowsReordered(PathVar *TreePath, IterVar *TreeIter, NewOrderVar int) {
830830
831831 XGtkTreeModelRowsReordered(x.GoPointer(), PathVar, IterVar, NewOrderVar)
832832
@@ -838,7 +838,7 @@ func (x *ListStore) RowsReordered(PathVar *TreePath, IterVar *TreeIter, NewOrder
838838 //
839839 // This should be called by models when their rows have been
840840 // reordered.
841-func (x *ListStore) RowsReorderedWithLength(PathVar *TreePath, IterVar *TreeIter, NewOrderVar uintptr, LengthVar int32) {
841+func (x *ListStore) RowsReorderedWithLength(PathVar *TreePath, IterVar *TreeIter, NewOrderVar uintptr, LengthVar int) {
842842
843843 XGtkTreeModelRowsReorderedWithLength(x.GoPointer(), PathVar, IterVar, NewOrderVar, LengthVar)
844844
@@ -862,7 +862,7 @@ func (x *ListStore) UnrefNode(IterVar *TreeIter) {
862862 // order. It returns %TRUE unless the @sort_column_id is
863863 // %GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID or
864864 // %GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID.
865-func (x *ListStore) GetSortColumnId(SortColumnIdVar int32, OrderVar *SortType) bool {
865+func (x *ListStore) GetSortColumnId(SortColumnIdVar int, OrderVar *SortType) bool {
866866
867867 return XGtkTreeSortableGetSortColumnId(x.GoPointer(), SortColumnIdVar, OrderVar)
868868
@@ -901,7 +901,7 @@ func (x *ListStore) SetDefaultSortFunc(SortFuncVar TreeIterCompareFunc, UserData
901901 // will be used, if it is set
902902 //
903903 // - %GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID: no sorting will occur
904-func (x *ListStore) SetSortColumnId(SortColumnIdVar int32, OrderVar SortType) {
904+func (x *ListStore) SetSortColumnId(SortColumnIdVar int, OrderVar SortType) {
905905
906906 XGtkTreeSortableSetSortColumnId(x.GoPointer(), SortColumnIdVar, OrderVar)
907907
@@ -910,7 +910,7 @@ func (x *ListStore) SetSortColumnId(SortColumnIdVar int32, OrderVar SortType) {
910910 // Sets the comparison function used when sorting to be @sort_func. If the
911911 // current sort column id of @sortable is the same as @sort_column_id, then
912912 // the model will sort using this function.
913-func (x *ListStore) SetSortFunc(SortColumnIdVar int32, SortFuncVar TreeIterCompareFunc, UserDataVar uintptr, DestroyVar glib.DestroyNotify) {
913+func (x *ListStore) SetSortFunc(SortColumnIdVar int, SortFuncVar TreeIterCompareFunc, UserDataVar uintptr, DestroyVar glib.DestroyNotify) {
914914
915915 XGtkTreeSortableSetSortFunc(x.GoPointer(), SortColumnIdVar, purego.NewCallback(SortFuncVar), UserDataVar, purego.NewCallback(DestroyVar))
916916
M v4/gtk/gtklistview.go +3 -3
@@ -347,7 +347,7 @@ func (x *ListView) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs .
347347 // property change must be communicated to assistive technologies.
348348 //
349349 // This function is meant to be used by language bindings.
350-func (x *ListView) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
350+func (x *ListView) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
351351
352352 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
353353
@@ -383,7 +383,7 @@ func (x *ListView) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs .
383383 // relation change must be communicated to assistive technologies.
384384 //
385385 // This function is meant to be used by language bindings.
386-func (x *ListView) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
386+func (x *ListView) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
387387
388388 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
389389
@@ -416,7 +416,7 @@ func (x *ListView) UpdateState(FirstStateVar AccessibleState, varArgs ...interfa
416416 // state change must be communicated to assistive technologies.
417417 //
418418 // This function is meant to be used by language bindings.
419-func (x *ListView) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
419+func (x *ListView) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
420420
421421 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
422422
M v4/gtk/gtklockbutton.go +3 -3
@@ -165,7 +165,7 @@ func (x *LockButton) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
165165 // property change must be communicated to assistive technologies.
166166 //
167167 // This function is meant to be used by language bindings.
168-func (x *LockButton) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
168+func (x *LockButton) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
169169
170170 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
171171
@@ -201,7 +201,7 @@ func (x *LockButton) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
201201 // relation change must be communicated to assistive technologies.
202202 //
203203 // This function is meant to be used by language bindings.
204-func (x *LockButton) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
204+func (x *LockButton) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
205205
206206 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
207207
@@ -234,7 +234,7 @@ func (x *LockButton) UpdateState(FirstStateVar AccessibleState, varArgs ...inter
234234 // state change must be communicated to assistive technologies.
235235 //
236236 // This function is meant to be used by language bindings.
237-func (x *LockButton) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
237+func (x *LockButton) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
238238
239239 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
240240
M v4/gtk/gtkmediacontrols.go +3 -3
@@ -135,7 +135,7 @@ func (x *MediaControls) UpdateProperty(FirstPropertyVar AccessibleProperty, varA
135135 // property change must be communicated to assistive technologies.
136136 //
137137 // This function is meant to be used by language bindings.
138-func (x *MediaControls) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
138+func (x *MediaControls) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
139139
140140 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
141141
@@ -171,7 +171,7 @@ func (x *MediaControls) UpdateRelation(FirstRelationVar AccessibleRelation, varA
171171 // relation change must be communicated to assistive technologies.
172172 //
173173 // This function is meant to be used by language bindings.
174-func (x *MediaControls) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
174+func (x *MediaControls) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
175175
176176 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
177177
@@ -204,7 +204,7 @@ func (x *MediaControls) UpdateState(FirstStateVar AccessibleState, varArgs ...in
204204 // state change must be communicated to assistive technologies.
205205 //
206206 // This function is meant to be used by language bindings.
207-func (x *MediaControls) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
207+func (x *MediaControls) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
208208
209209 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
210210
M v4/gtk/gtkmediafile.go +2 -2
@@ -297,7 +297,7 @@ func (x *MediaFile) GetIntrinsicAspectRatio() float64 {
297297 //
298298 // If the @paintable does not have a preferred height, it returns 0.
299299 // Negative values are never returned.
300-func (x *MediaFile) GetIntrinsicHeight() int32 {
300+func (x *MediaFile) GetIntrinsicHeight() int {
301301
302302 return gdk.XGdkPaintableGetIntrinsicHeight(x.GoPointer())
303303
@@ -313,7 +313,7 @@ func (x *MediaFile) GetIntrinsicHeight() int32 {
313313 //
314314 // If the @paintable does not have a preferred width, it returns 0.
315315 // Negative values are never returned.
316-func (x *MediaFile) GetIntrinsicWidth() int32 {
316+func (x *MediaFile) GetIntrinsicWidth() int {
317317
318318 return gdk.XGdkPaintableGetIntrinsicWidth(x.GoPointer())
319319
M v4/gtk/gtkmediastream.go +6 -6
@@ -54,25 +54,25 @@ func (x *MediaStream) Ended() {
5454
5555 }
5656
57-var xMediaStreamError func(uintptr, glib.Quark, int32, string, ...interface{})
57+var xMediaStreamError func(uintptr, glib.Quark, int, string, ...interface{})
5858
5959 // Sets @self into an error state using a printf()-style format string.
6060 //
6161 // This is a utility function that calls [method@Gtk.MediaStream.gerror].
6262 // See that function for details.
63-func (x *MediaStream) Error(DomainVar glib.Quark, CodeVar int32, FormatVar string, varArgs ...interface{}) {
63+func (x *MediaStream) Error(DomainVar glib.Quark, CodeVar int, FormatVar string, varArgs ...interface{}) {
6464
6565 xMediaStreamError(x.GoPointer(), DomainVar, CodeVar, FormatVar, varArgs...)
6666
6767 }
6868
69-var xMediaStreamErrorValist func(uintptr, glib.Quark, int32, string, []interface{})
69+var xMediaStreamErrorValist func(uintptr, glib.Quark, int, string, []interface{})
7070
7171 // Sets @self into an error state using a printf()-style format string.
7272 //
7373 // This is a utility function that calls [method@Gtk.MediaStream.gerror].
7474 // See that function for details.
75-func (x *MediaStream) ErrorValist(DomainVar glib.Quark, CodeVar int32, FormatVar string, ArgsVar []interface{}) {
75+func (x *MediaStream) ErrorValist(DomainVar glib.Quark, CodeVar int, FormatVar string, ArgsVar []interface{}) {
7676
7777 xMediaStreamErrorValist(x.GoPointer(), DomainVar, CodeVar, FormatVar, ArgsVar)
7878
@@ -578,7 +578,7 @@ func (x *MediaStream) GetIntrinsicAspectRatio() float64 {
578578 //
579579 // If the @paintable does not have a preferred height, it returns 0.
580580 // Negative values are never returned.
581-func (x *MediaStream) GetIntrinsicHeight() int32 {
581+func (x *MediaStream) GetIntrinsicHeight() int {
582582
583583 return gdk.XGdkPaintableGetIntrinsicHeight(x.GoPointer())
584584
@@ -594,7 +594,7 @@ func (x *MediaStream) GetIntrinsicHeight() int32 {
594594 //
595595 // If the @paintable does not have a preferred width, it returns 0.
596596 // Negative values are never returned.
597-func (x *MediaStream) GetIntrinsicWidth() int32 {
597+func (x *MediaStream) GetIntrinsicWidth() int {
598598
599599 return gdk.XGdkPaintableGetIntrinsicWidth(x.GoPointer())
600600
M v4/gtk/gtkmenubutton.go +3 -3
@@ -487,7 +487,7 @@ func (x *MenuButton) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
487487 // property change must be communicated to assistive technologies.
488488 //
489489 // This function is meant to be used by language bindings.
490-func (x *MenuButton) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
490+func (x *MenuButton) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
491491
492492 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
493493
@@ -523,7 +523,7 @@ func (x *MenuButton) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
523523 // relation change must be communicated to assistive technologies.
524524 //
525525 // This function is meant to be used by language bindings.
526-func (x *MenuButton) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
526+func (x *MenuButton) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
527527
528528 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
529529
@@ -556,7 +556,7 @@ func (x *MenuButton) UpdateState(FirstStateVar AccessibleState, varArgs ...inter
556556 // state change must be communicated to assistive technologies.
557557 //
558558 // This function is meant to be used by language bindings.
559-func (x *MenuButton) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
559+func (x *MenuButton) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
560560
561561 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
562562
M v4/gtk/gtkmessagedialog.go +3 -3
@@ -313,7 +313,7 @@ func (x *MessageDialog) UpdateProperty(FirstPropertyVar AccessibleProperty, varA
313313 // property change must be communicated to assistive technologies.
314314 //
315315 // This function is meant to be used by language bindings.
316-func (x *MessageDialog) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
316+func (x *MessageDialog) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
317317
318318 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
319319
@@ -349,7 +349,7 @@ func (x *MessageDialog) UpdateRelation(FirstRelationVar AccessibleRelation, varA
349349 // relation change must be communicated to assistive technologies.
350350 //
351351 // This function is meant to be used by language bindings.
352-func (x *MessageDialog) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
352+func (x *MessageDialog) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
353353
354354 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
355355
@@ -382,7 +382,7 @@ func (x *MessageDialog) UpdateState(FirstStateVar AccessibleState, varArgs ...in
382382 // state change must be communicated to assistive technologies.
383383 //
384384 // This function is meant to be used by language bindings.
385-func (x *MessageDialog) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
385+func (x *MessageDialog) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
386386
387387 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
388388
M v4/gtk/gtknativedialog.go +2 -2
@@ -186,8 +186,8 @@ func (c *NativeDialog) SetGoPointer(ptr uintptr) {
186186 //
187187 // If you call [method@Gtk.NativeDialog.hide] before the user
188188 // responds to the dialog this signal will not be emitted.
189-func (x *NativeDialog) ConnectResponse(cb func(NativeDialog, int32)) {
190- fcb := func(clsPtr uintptr, ResponseIdVarp int32) {
189+func (x *NativeDialog) ConnectResponse(cb func(NativeDialog, int)) {
190+ fcb := func(clsPtr uintptr, ResponseIdVarp int) {
191191 fa := NativeDialog{}
192192 fa.Ptr = clsPtr
193193
M v4/gtk/gtknotebook.go +31 -31
@@ -141,20 +141,20 @@ func NewNotebook() *Widget {
141141 return NewNotebookCls
142142 }
143143
144-var xNotebookAppendPage func(uintptr, uintptr, uintptr) int32
144+var xNotebookAppendPage func(uintptr, uintptr, uintptr) int
145145
146146 // Appends a page to @notebook.
147-func (x *Notebook) AppendPage(ChildVar *Widget, TabLabelVar *Widget) int32 {
147+func (x *Notebook) AppendPage(ChildVar *Widget, TabLabelVar *Widget) int {
148148
149149 return xNotebookAppendPage(x.GoPointer(), ChildVar.GoPointer(), TabLabelVar.GoPointer())
150150
151151 }
152152
153-var xNotebookAppendPageMenu func(uintptr, uintptr, uintptr, uintptr) int32
153+var xNotebookAppendPageMenu func(uintptr, uintptr, uintptr, uintptr) int
154154
155155 // Appends a page to @notebook, specifying the widget to use as the
156156 // label in the popup menu.
157-func (x *Notebook) AppendPageMenu(ChildVar *Widget, TabLabelVar *Widget, MenuLabelVar *Widget) int32 {
157+func (x *Notebook) AppendPageMenu(ChildVar *Widget, TabLabelVar *Widget, MenuLabelVar *Widget) int {
158158
159159 return xNotebookAppendPageMenu(x.GoPointer(), ChildVar.GoPointer(), TabLabelVar.GoPointer(), MenuLabelVar.GoPointer())
160160
@@ -194,10 +194,10 @@ func (x *Notebook) GetActionWidget(PackTypeVar PackType) *Widget {
194194
195195 }
196196
197-var xNotebookGetCurrentPage func(uintptr) int32
197+var xNotebookGetCurrentPage func(uintptr) int
198198
199199 // Returns the page number of the current page.
200-func (x *Notebook) GetCurrentPage() int32 {
200+func (x *Notebook) GetCurrentPage() int {
201201
202202 return xNotebookGetCurrentPage(x.GoPointer())
203203
@@ -240,19 +240,19 @@ func (x *Notebook) GetMenuLabelText(ChildVar *Widget) string {
240240
241241 }
242242
243-var xNotebookGetNPages func(uintptr) int32
243+var xNotebookGetNPages func(uintptr) int
244244
245245 // Gets the number of pages in a notebook.
246-func (x *Notebook) GetNPages() int32 {
246+func (x *Notebook) GetNPages() int {
247247
248248 return xNotebookGetNPages(x.GoPointer())
249249
250250 }
251251
252-var xNotebookGetNthPage func(uintptr, int32) uintptr
252+var xNotebookGetNthPage func(uintptr, int) uintptr
253253
254254 // Returns the child widget contained in page number @page_num.
255-func (x *Notebook) GetNthPage(PageNumVar int32) *Widget {
255+func (x *Notebook) GetNthPage(PageNumVar int) *Widget {
256256
257257 GetNthPagePtr := xNotebookGetNthPage(x.GoPointer(), PageNumVar)
258258 if GetNthPagePtr == 0 {
@@ -390,20 +390,20 @@ func (x *Notebook) GetTabReorderable(ChildVar *Widget) bool {
390390
391391 }
392392
393-var xNotebookInsertPage func(uintptr, uintptr, uintptr, int32) int32
393+var xNotebookInsertPage func(uintptr, uintptr, uintptr, int) int
394394
395395 // Insert a page into @notebook at the given position.
396-func (x *Notebook) InsertPage(ChildVar *Widget, TabLabelVar *Widget, PositionVar int32) int32 {
396+func (x *Notebook) InsertPage(ChildVar *Widget, TabLabelVar *Widget, PositionVar int) int {
397397
398398 return xNotebookInsertPage(x.GoPointer(), ChildVar.GoPointer(), TabLabelVar.GoPointer(), PositionVar)
399399
400400 }
401401
402-var xNotebookInsertPageMenu func(uintptr, uintptr, uintptr, uintptr, int32) int32
402+var xNotebookInsertPageMenu func(uintptr, uintptr, uintptr, uintptr, int) int
403403
404404 // Insert a page into @notebook at the given position, specifying
405405 // the widget to use as the label in the popup menu.
406-func (x *Notebook) InsertPageMenu(ChildVar *Widget, TabLabelVar *Widget, MenuLabelVar *Widget, PositionVar int32) int32 {
406+func (x *Notebook) InsertPageMenu(ChildVar *Widget, TabLabelVar *Widget, MenuLabelVar *Widget, PositionVar int) int {
407407
408408 return xNotebookInsertPageMenu(x.GoPointer(), ChildVar.GoPointer(), TabLabelVar.GoPointer(), MenuLabelVar.GoPointer(), PositionVar)
409409
@@ -420,11 +420,11 @@ func (x *Notebook) NextPage() {
420420
421421 }
422422
423-var xNotebookPageNum func(uintptr, uintptr) int32
423+var xNotebookPageNum func(uintptr, uintptr) int
424424
425425 // Finds the index of the page which contains the given child
426426 // widget.
427-func (x *Notebook) PageNum(ChildVar *Widget) int32 {
427+func (x *Notebook) PageNum(ChildVar *Widget) int {
428428
429429 return xNotebookPageNum(x.GoPointer(), ChildVar.GoPointer())
430430
@@ -451,20 +451,20 @@ func (x *Notebook) PopupEnable() {
451451
452452 }
453453
454-var xNotebookPrependPage func(uintptr, uintptr, uintptr) int32
454+var xNotebookPrependPage func(uintptr, uintptr, uintptr) int
455455
456456 // Prepends a page to @notebook.
457-func (x *Notebook) PrependPage(ChildVar *Widget, TabLabelVar *Widget) int32 {
457+func (x *Notebook) PrependPage(ChildVar *Widget, TabLabelVar *Widget) int {
458458
459459 return xNotebookPrependPage(x.GoPointer(), ChildVar.GoPointer(), TabLabelVar.GoPointer())
460460
461461 }
462462
463-var xNotebookPrependPageMenu func(uintptr, uintptr, uintptr, uintptr) int32
463+var xNotebookPrependPageMenu func(uintptr, uintptr, uintptr, uintptr) int
464464
465465 // Prepends a page to @notebook, specifying the widget to use as the
466466 // label in the popup menu.
467-func (x *Notebook) PrependPageMenu(ChildVar *Widget, TabLabelVar *Widget, MenuLabelVar *Widget) int32 {
467+func (x *Notebook) PrependPageMenu(ChildVar *Widget, TabLabelVar *Widget, MenuLabelVar *Widget) int {
468468
469469 return xNotebookPrependPageMenu(x.GoPointer(), ChildVar.GoPointer(), TabLabelVar.GoPointer(), MenuLabelVar.GoPointer())
470470
@@ -481,24 +481,24 @@ func (x *Notebook) PrevPage() {
481481
482482 }
483483
484-var xNotebookRemovePage func(uintptr, int32)
484+var xNotebookRemovePage func(uintptr, int)
485485
486486 // Removes a page from the notebook given its index
487487 // in the notebook.
488-func (x *Notebook) RemovePage(PageNumVar int32) {
488+func (x *Notebook) RemovePage(PageNumVar int) {
489489
490490 xNotebookRemovePage(x.GoPointer(), PageNumVar)
491491
492492 }
493493
494-var xNotebookReorderChild func(uintptr, uintptr, int32)
494+var xNotebookReorderChild func(uintptr, uintptr, int)
495495
496496 // Reorders the page containing @child, so that it appears in position
497497 // @position.
498498 //
499499 // If @position is greater than or equal to the number of children in
500500 // the list or negative, @child will be moved to the end of the list.
501-func (x *Notebook) ReorderChild(ChildVar *Widget, PositionVar int32) {
501+func (x *Notebook) ReorderChild(ChildVar *Widget, PositionVar int) {
502502
503503 xNotebookReorderChild(x.GoPointer(), ChildVar.GoPointer(), PositionVar)
504504
@@ -517,7 +517,7 @@ func (x *Notebook) SetActionWidget(WidgetVar *Widget, PackTypeVar PackType) {
517517
518518 }
519519
520-var xNotebookSetCurrentPage func(uintptr, int32)
520+var xNotebookSetCurrentPage func(uintptr, int)
521521
522522 // Switches to the page number @page_num.
523523 //
@@ -525,7 +525,7 @@ var xNotebookSetCurrentPage func(uintptr, int32)
525525 // to switch to a page unless the child widget is visible.
526526 // Therefore, it is recommended to show child widgets before
527527 // adding them to a notebook.
528-func (x *Notebook) SetCurrentPage(PageNumVar int32) {
528+func (x *Notebook) SetCurrentPage(PageNumVar int) {
529529
530530 xNotebookSetCurrentPage(x.GoPointer(), PageNumVar)
531531
@@ -696,8 +696,8 @@ func (c *Notebook) SetGoPointer(ptr uintptr) {
696696 c.Ptr = ptr
697697 }
698698
699-func (x *Notebook) ConnectChangeCurrentPage(cb func(Notebook, int32) bool) {
700- fcb := func(clsPtr uintptr, ObjectVarp int32) bool {
699+func (x *Notebook) ConnectChangeCurrentPage(cb func(Notebook, int) bool) {
700+ fcb := func(clsPtr uintptr, ObjectVarp int) bool {
701701 fa := Notebook{}
702702 fa.Ptr = clsPtr
703703
@@ -880,7 +880,7 @@ func (x *Notebook) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs .
880880 // property change must be communicated to assistive technologies.
881881 //
882882 // This function is meant to be used by language bindings.
883-func (x *Notebook) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
883+func (x *Notebook) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
884884
885885 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
886886
@@ -916,7 +916,7 @@ func (x *Notebook) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs .
916916 // relation change must be communicated to assistive technologies.
917917 //
918918 // This function is meant to be used by language bindings.
919-func (x *Notebook) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
919+func (x *Notebook) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
920920
921921 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
922922
@@ -949,7 +949,7 @@ func (x *Notebook) UpdateState(FirstStateVar AccessibleState, varArgs ...interfa
949949 // state change must be communicated to assistive technologies.
950950 //
951951 // This function is meant to be used by language bindings.
952-func (x *Notebook) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
952+func (x *Notebook) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
953953
954954 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
955955
M v4/gtk/gtkoverlay.go +3 -3
@@ -249,7 +249,7 @@ func (x *Overlay) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ..
249249 // property change must be communicated to assistive technologies.
250250 //
251251 // This function is meant to be used by language bindings.
252-func (x *Overlay) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
252+func (x *Overlay) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
253253
254254 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
255255
@@ -285,7 +285,7 @@ func (x *Overlay) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ..
285285 // relation change must be communicated to assistive technologies.
286286 //
287287 // This function is meant to be used by language bindings.
288-func (x *Overlay) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
288+func (x *Overlay) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
289289
290290 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
291291
@@ -318,7 +318,7 @@ func (x *Overlay) UpdateState(FirstStateVar AccessibleState, varArgs ...interfac
318318 // state change must be communicated to assistive technologies.
319319 //
320320 // This function is meant to be used by language bindings.
321-func (x *Overlay) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
321+func (x *Overlay) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
322322
323323 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
324324
M v4/gtk/gtkpadcontroller.go +6 -6
@@ -12,9 +12,9 @@ import (
1212 type PadActionEntry struct {
1313 Type PadActionType
1414
15- Index int32
15+ Index int
1616
17- Mode int32
17+ Mode int
1818
1919 Label string
2020
@@ -122,7 +122,7 @@ func NewPadController(GroupVar gio.ActionGroup, PadVar *gdk.Device) *PadControll
122122 return NewPadControllerCls
123123 }
124124
125-var xPadControllerSetAction func(uintptr, PadActionType, int32, int32, string, string)
125+var xPadControllerSetAction func(uintptr, PadActionType, int, int, string, string)
126126
127127 // Adds an individual action to @controller.
128128 //
@@ -133,19 +133,19 @@ var xPadControllerSetAction func(uintptr, PadActionType, int32, int32, string, s
133133 // The given @label should be considered user-visible, so internationalization
134134 // rules apply. Some windowing systems may be able to use those for user
135135 // feedback.
136-func (x *PadController) SetAction(TypeVar PadActionType, IndexVar int32, ModeVar int32, LabelVar string, ActionNameVar string) {
136+func (x *PadController) SetAction(TypeVar PadActionType, IndexVar int, ModeVar int, LabelVar string, ActionNameVar string) {
137137
138138 xPadControllerSetAction(x.GoPointer(), TypeVar, IndexVar, ModeVar, LabelVar, ActionNameVar)
139139
140140 }
141141
142-var xPadControllerSetActionEntries func(uintptr, uintptr, int32)
142+var xPadControllerSetActionEntries func(uintptr, uintptr, int)
143143
144144 // A convenience function to add a group of action entries on
145145 // @controller.
146146 //
147147 // See [struct@Gtk.PadActionEntry] and [method@Gtk.PadController.set_action].
148-func (x *PadController) SetActionEntries(EntriesVar uintptr, NEntriesVar int32) {
148+func (x *PadController) SetActionEntries(EntriesVar uintptr, NEntriesVar int) {
149149
150150 xPadControllerSetActionEntries(x.GoPointer(), EntriesVar, NEntriesVar)
151151
M v4/gtk/gtkpagesetupunixdialog.go +3 -3
@@ -165,7 +165,7 @@ func (x *PageSetupUnixDialog) UpdateProperty(FirstPropertyVar AccessibleProperty
165165 // property change must be communicated to assistive technologies.
166166 //
167167 // This function is meant to be used by language bindings.
168-func (x *PageSetupUnixDialog) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
168+func (x *PageSetupUnixDialog) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
169169
170170 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
171171
@@ -201,7 +201,7 @@ func (x *PageSetupUnixDialog) UpdateRelation(FirstRelationVar AccessibleRelation
201201 // relation change must be communicated to assistive technologies.
202202 //
203203 // This function is meant to be used by language bindings.
204-func (x *PageSetupUnixDialog) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
204+func (x *PageSetupUnixDialog) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
205205
206206 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
207207
@@ -234,7 +234,7 @@ func (x *PageSetupUnixDialog) UpdateState(FirstStateVar AccessibleState, varArgs
234234 // state change must be communicated to assistive technologies.
235235 //
236236 // This function is meant to be used by language bindings.
237-func (x *PageSetupUnixDialog) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
237+func (x *PageSetupUnixDialog) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
238238
239239 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
240240
M v4/gtk/gtkpaned.go +7 -7
@@ -118,10 +118,10 @@ func (x *Paned) GetEndChild() *Widget {
118118
119119 }
120120
121-var xPanedGetPosition func(uintptr) int32
121+var xPanedGetPosition func(uintptr) int
122122
123123 // Obtains the position of the divider between the two panes.
124-func (x *Paned) GetPosition() int32 {
124+func (x *Paned) GetPosition() int {
125125
126126 return xPanedGetPosition(x.GoPointer())
127127
@@ -201,10 +201,10 @@ func (x *Paned) SetEndChild(ChildVar *Widget) {
201201
202202 }
203203
204-var xPanedSetPosition func(uintptr, int32)
204+var xPanedSetPosition func(uintptr, int)
205205
206206 // Sets the position of the divider between the two panes.
207-func (x *Paned) SetPosition(PositionVar int32) {
207+func (x *Paned) SetPosition(PositionVar int) {
208208
209209 xPanedSetPosition(x.GoPointer(), PositionVar)
210210
@@ -434,7 +434,7 @@ func (x *Paned) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...i
434434 // property change must be communicated to assistive technologies.
435435 //
436436 // This function is meant to be used by language bindings.
437-func (x *Paned) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
437+func (x *Paned) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
438438
439439 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
440440
@@ -470,7 +470,7 @@ func (x *Paned) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...i
470470 // relation change must be communicated to assistive technologies.
471471 //
472472 // This function is meant to be used by language bindings.
473-func (x *Paned) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
473+func (x *Paned) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
474474
475475 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
476476
@@ -503,7 +503,7 @@ func (x *Paned) UpdateState(FirstStateVar AccessibleState, varArgs ...interface{
503503 // state change must be communicated to assistive technologies.
504504 //
505505 // This function is meant to be used by language bindings.
506-func (x *Paned) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
506+func (x *Paned) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
507507
508508 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
509509
M v4/gtk/gtkpasswordentry.go +14 -14
@@ -201,7 +201,7 @@ func (x *PasswordEntry) UpdateProperty(FirstPropertyVar AccessibleProperty, varA
201201 // property change must be communicated to assistive technologies.
202202 //
203203 // This function is meant to be used by language bindings.
204-func (x *PasswordEntry) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
204+func (x *PasswordEntry) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
205205
206206 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
207207
@@ -237,7 +237,7 @@ func (x *PasswordEntry) UpdateRelation(FirstRelationVar AccessibleRelation, varA
237237 // relation change must be communicated to assistive technologies.
238238 //
239239 // This function is meant to be used by language bindings.
240-func (x *PasswordEntry) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
240+func (x *PasswordEntry) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
241241
242242 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
243243
@@ -270,7 +270,7 @@ func (x *PasswordEntry) UpdateState(FirstStateVar AccessibleState, varArgs ...in
270270 // state change must be communicated to assistive technologies.
271271 //
272272 // This function is meant to be used by language bindings.
273-func (x *PasswordEntry) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
273+func (x *PasswordEntry) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
274274
275275 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
276276
@@ -303,7 +303,7 @@ func (x *PasswordEntry) DeleteSelection() {
303303 // the end of the text.
304304 //
305305 // Note that the positions are specified in characters, not bytes.
306-func (x *PasswordEntry) DeleteText(StartPosVar int32, EndPosVar int32) {
306+func (x *PasswordEntry) DeleteText(StartPosVar int, EndPosVar int) {
307307
308308 XGtkEditableDeleteText(x.GoPointer(), StartPosVar, EndPosVar)
309309
@@ -334,7 +334,7 @@ func (x *PasswordEntry) GetAlignment() float32 {
334334 // the end of the text.
335335 //
336336 // Note that positions are specified in characters, not bytes.
337-func (x *PasswordEntry) GetChars(StartPosVar int32, EndPosVar int32) string {
337+func (x *PasswordEntry) GetChars(StartPosVar int, EndPosVar int) string {
338338
339339 return XGtkEditableGetChars(x.GoPointer(), StartPosVar, EndPosVar)
340340
@@ -374,7 +374,7 @@ func (x *PasswordEntry) GetEnableUndo() bool {
374374 }
375375
376376 // Retrieves the desired maximum width of @editable, in characters.
377-func (x *PasswordEntry) GetMaxWidthChars() int32 {
377+func (x *PasswordEntry) GetMaxWidthChars() int {
378378
379379 return XGtkEditableGetMaxWidthChars(x.GoPointer())
380380
@@ -384,7 +384,7 @@ func (x *PasswordEntry) GetMaxWidthChars() int32 {
384384 // to the start of the content of the editable.
385385 //
386386 // Note that this position is in characters, not in bytes.
387-func (x *PasswordEntry) GetPosition() int32 {
387+func (x *PasswordEntry) GetPosition() int {
388388
389389 return XGtkEditableGetPosition(x.GoPointer())
390390
@@ -397,7 +397,7 @@ func (x *PasswordEntry) GetPosition() int32 {
397397 // and %FALSE will be returned.
398398 //
399399 // Note that positions are specified in characters, not bytes.
400-func (x *PasswordEntry) GetSelectionBounds(StartPosVar int32, EndPosVar int32) bool {
400+func (x *PasswordEntry) GetSelectionBounds(StartPosVar int, EndPosVar int) bool {
401401
402402 return XGtkEditableGetSelectionBounds(x.GoPointer(), StartPosVar, EndPosVar)
403403
@@ -414,7 +414,7 @@ func (x *PasswordEntry) GetText() string {
414414
415415 // Gets the number of characters of space reserved
416416 // for the contents of the editable.
417-func (x *PasswordEntry) GetWidthChars() int32 {
417+func (x *PasswordEntry) GetWidthChars() int {
418418
419419 return XGtkEditableGetWidthChars(x.GoPointer())
420420
@@ -439,7 +439,7 @@ func (x *PasswordEntry) InitDelegate() {
439439 // Note that the position is in characters, not in bytes.
440440 // The function updates @position to point after the newly
441441 // inserted text.
442-func (x *PasswordEntry) InsertText(TextVar string, LengthVar int32, PositionVar int32) {
442+func (x *PasswordEntry) InsertText(TextVar string, LengthVar int, PositionVar int) {
443443
444444 XGtkEditableInsertText(x.GoPointer(), TextVar, LengthVar, PositionVar)
445445
@@ -453,7 +453,7 @@ func (x *PasswordEntry) InsertText(TextVar string, LengthVar int32, PositionVar
453453 // @start_pos to the end of the text.
454454 //
455455 // Note that positions are specified in characters, not bytes.
456-func (x *PasswordEntry) SelectRegion(StartPosVar int32, EndPosVar int32) {
456+func (x *PasswordEntry) SelectRegion(StartPosVar int, EndPosVar int) {
457457
458458 XGtkEditableSelectRegion(x.GoPointer(), StartPosVar, EndPosVar)
459459
@@ -489,7 +489,7 @@ func (x *PasswordEntry) SetEnableUndo(EnableUndoVar bool) {
489489 }
490490
491491 // Sets the desired maximum width in characters of @editable.
492-func (x *PasswordEntry) SetMaxWidthChars(NCharsVar int32) {
492+func (x *PasswordEntry) SetMaxWidthChars(NCharsVar int) {
493493
494494 XGtkEditableSetMaxWidthChars(x.GoPointer(), NCharsVar)
495495
@@ -502,7 +502,7 @@ func (x *PasswordEntry) SetMaxWidthChars(NCharsVar int32) {
502502 // or equal to the number of characters in the editable. A value of -1
503503 // indicates that the position should be set after the last character
504504 // of the editable. Note that @position is in characters, not in bytes.
505-func (x *PasswordEntry) SetPosition(PositionVar int32) {
505+func (x *PasswordEntry) SetPosition(PositionVar int) {
506506
507507 XGtkEditableSetPosition(x.GoPointer(), PositionVar)
508508
@@ -523,7 +523,7 @@ func (x *PasswordEntry) SetText(TextVar string) {
523523 // Note that it changes the size request, the size can still
524524 // be affected by how you pack the widget into containers.
525525 // If @n_chars is -1, the size reverts to the default size.
526-func (x *PasswordEntry) SetWidthChars(NCharsVar int32) {
526+func (x *PasswordEntry) SetWidthChars(NCharsVar int) {
527527
528528 XGtkEditableSetWidthChars(x.GoPointer(), NCharsVar)
529529
M v4/gtk/gtkpicture.go +3 -3
@@ -452,7 +452,7 @@ func (x *Picture) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ..
452452 // property change must be communicated to assistive technologies.
453453 //
454454 // This function is meant to be used by language bindings.
455-func (x *Picture) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
455+func (x *Picture) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
456456
457457 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
458458
@@ -488,7 +488,7 @@ func (x *Picture) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ..
488488 // relation change must be communicated to assistive technologies.
489489 //
490490 // This function is meant to be used by language bindings.
491-func (x *Picture) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
491+func (x *Picture) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
492492
493493 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
494494
@@ -521,7 +521,7 @@ func (x *Picture) UpdateState(FirstStateVar AccessibleState, varArgs ...interfac
521521 // state change must be communicated to assistive technologies.
522522 //
523523 // This function is meant to be used by language bindings.
524-func (x *Picture) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
524+func (x *Picture) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
525525
526526 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
527527
M v4/gtk/gtkpopover.go +7 -7
@@ -179,10 +179,10 @@ func (x *Popover) GetMnemonicsVisible() bool {
179179
180180 }
181181
182-var xPopoverGetOffset func(uintptr, int32, int32)
182+var xPopoverGetOffset func(uintptr, int, int)
183183
184184 // Gets the offset previous set with gtk_popover_set_offset().
185-func (x *Popover) GetOffset(XOffsetVar int32, YOffsetVar int32) {
185+func (x *Popover) GetOffset(XOffsetVar int, YOffsetVar int) {
186186
187187 xPopoverGetOffset(x.GoPointer(), XOffsetVar, YOffsetVar)
188188
@@ -311,14 +311,14 @@ func (x *Popover) SetMnemonicsVisible(MnemonicsVisibleVar bool) {
311311
312312 }
313313
314-var xPopoverSetOffset func(uintptr, int32, int32)
314+var xPopoverSetOffset func(uintptr, int, int)
315315
316316 // Sets the offset to use when calculating the position
317317 // of the popover.
318318 //
319319 // These values are used when preparing the [struct@Gdk.PopupLayout]
320320 // for positioning the popover.
321-func (x *Popover) SetOffset(XOffsetVar int32, YOffsetVar int32) {
321+func (x *Popover) SetOffset(XOffsetVar int, YOffsetVar int) {
322322
323323 xPopoverSetOffset(x.GoPointer(), XOffsetVar, YOffsetVar)
324324
@@ -443,7 +443,7 @@ func (x *Popover) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ..
443443 // property change must be communicated to assistive technologies.
444444 //
445445 // This function is meant to be used by language bindings.
446-func (x *Popover) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
446+func (x *Popover) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
447447
448448 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
449449
@@ -479,7 +479,7 @@ func (x *Popover) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ..
479479 // relation change must be communicated to assistive technologies.
480480 //
481481 // This function is meant to be used by language bindings.
482-func (x *Popover) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
482+func (x *Popover) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
483483
484484 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
485485
@@ -512,7 +512,7 @@ func (x *Popover) UpdateState(FirstStateVar AccessibleState, varArgs ...interfac
512512 // state change must be communicated to assistive technologies.
513513 //
514514 // This function is meant to be used by language bindings.
515-func (x *Popover) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
515+func (x *Popover) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
516516
517517 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
518518
M v4/gtk/gtkpopovermenu.go +3 -3
@@ -309,7 +309,7 @@ func (x *PopoverMenu) UpdateProperty(FirstPropertyVar AccessibleProperty, varArg
309309 // property change must be communicated to assistive technologies.
310310 //
311311 // This function is meant to be used by language bindings.
312-func (x *PopoverMenu) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
312+func (x *PopoverMenu) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
313313
314314 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
315315
@@ -345,7 +345,7 @@ func (x *PopoverMenu) UpdateRelation(FirstRelationVar AccessibleRelation, varArg
345345 // relation change must be communicated to assistive technologies.
346346 //
347347 // This function is meant to be used by language bindings.
348-func (x *PopoverMenu) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
348+func (x *PopoverMenu) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
349349
350350 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
351351
@@ -378,7 +378,7 @@ func (x *PopoverMenu) UpdateState(FirstStateVar AccessibleState, varArgs ...inte
378378 // state change must be communicated to assistive technologies.
379379 //
380380 // This function is meant to be used by language bindings.
381-func (x *PopoverMenu) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
381+func (x *PopoverMenu) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
382382
383383 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
384384
M v4/gtk/gtkpopovermenubar.go +3 -3
@@ -181,7 +181,7 @@ func (x *PopoverMenuBar) UpdateProperty(FirstPropertyVar AccessibleProperty, var
181181 // property change must be communicated to assistive technologies.
182182 //
183183 // This function is meant to be used by language bindings.
184-func (x *PopoverMenuBar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
184+func (x *PopoverMenuBar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
185185
186186 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
187187
@@ -217,7 +217,7 @@ func (x *PopoverMenuBar) UpdateRelation(FirstRelationVar AccessibleRelation, var
217217 // relation change must be communicated to assistive technologies.
218218 //
219219 // This function is meant to be used by language bindings.
220-func (x *PopoverMenuBar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
220+func (x *PopoverMenuBar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
221221
222222 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
223223
@@ -250,7 +250,7 @@ func (x *PopoverMenuBar) UpdateState(FirstStateVar AccessibleState, varArgs ...i
250250 // state change must be communicated to assistive technologies.
251251 //
252252 // This function is meant to be used by language bindings.
253-func (x *PopoverMenuBar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
253+func (x *PopoverMenuBar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
254254
255255 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
256256
M v4/gtk/gtkprinter.go +4 -4
@@ -116,10 +116,10 @@ func (x *Printer) AcceptsPs() bool {
116116
117117 }
118118
119-var xPrinterCompare func(uintptr, uintptr) int32
119+var xPrinterCompare func(uintptr, uintptr) int
120120
121121 // Compares two printers.
122-func (x *Printer) Compare(BVar *Printer) int32 {
122+func (x *Printer) Compare(BVar *Printer) int {
123123
124124 return xPrinterCompare(x.GoPointer(), BVar.GoPointer())
125125
@@ -217,10 +217,10 @@ func (x *Printer) GetIconName() string {
217217
218218 }
219219
220-var xPrinterGetJobCount func(uintptr) int32
220+var xPrinterGetJobCount func(uintptr) int
221221
222222 // Gets the number of jobs currently queued on the printer.
223-func (x *Printer) GetJobCount() int32 {
223+func (x *Printer) GetJobCount() int {
224224
225225 return xPrinterGetJobCount(x.GoPointer())
226226
M v4/gtk/gtkprintjob.go +10 -10
@@ -75,19 +75,19 @@ func (x *PrintJob) GetNUpLayout() NumberUpLayout {
7575
7676 }
7777
78-var xPrintJobGetNumCopies func(uintptr) int32
78+var xPrintJobGetNumCopies func(uintptr) int
7979
8080 // Gets the number of copies of this job.
81-func (x *PrintJob) GetNumCopies() int32 {
81+func (x *PrintJob) GetNumCopies() int {
8282
8383 return xPrintJobGetNumCopies(x.GoPointer())
8484
8585 }
8686
87-var xPrintJobGetPageRanges func(uintptr, int32) uintptr
87+var xPrintJobGetPageRanges func(uintptr, int) uintptr
8888
8989 // Gets the page ranges for this job.
90-func (x *PrintJob) GetPageRanges(NRangesVar int32) uintptr {
90+func (x *PrintJob) GetPageRanges(NRangesVar int) uintptr {
9191
9292 return xPrintJobGetPageRanges(x.GoPointer(), NRangesVar)
9393
@@ -249,19 +249,19 @@ func (x *PrintJob) SetNUpLayout(LayoutVar NumberUpLayout) {
249249
250250 }
251251
252-var xPrintJobSetNumCopies func(uintptr, int32)
252+var xPrintJobSetNumCopies func(uintptr, int)
253253
254254 // Sets the number of copies for this job.
255-func (x *PrintJob) SetNumCopies(NumCopiesVar int32) {
255+func (x *PrintJob) SetNumCopies(NumCopiesVar int) {
256256
257257 xPrintJobSetNumCopies(x.GoPointer(), NumCopiesVar)
258258
259259 }
260260
261-var xPrintJobSetPageRanges func(uintptr, uintptr, int32)
261+var xPrintJobSetPageRanges func(uintptr, uintptr, int)
262262
263263 // Sets the page ranges for this job.
264-func (x *PrintJob) SetPageRanges(RangesVar uintptr, NRangesVar int32) {
264+func (x *PrintJob) SetPageRanges(RangesVar uintptr, NRangesVar int) {
265265
266266 xPrintJobSetPageRanges(x.GoPointer(), RangesVar, NRangesVar)
267267
@@ -314,7 +314,7 @@ func (x *PrintJob) SetScale(ScaleVar float64) {
314314
315315 }
316316
317-var xPrintJobSetSourceFd func(uintptr, int32) bool
317+var xPrintJobSetSourceFd func(uintptr, int) bool
318318
319319 // Make the `GtkPrintJob` send an existing document to the
320320 // printing system.
@@ -327,7 +327,7 @@ var xPrintJobSetSourceFd func(uintptr, int32) bool
327327 // This is similar to [method@Gtk.PrintJob.set_source_file],
328328 // but takes expects an open file descriptor for the file,
329329 // instead of a filename.
330-func (x *PrintJob) SetSourceFd(FdVar int32) bool {
330+func (x *PrintJob) SetSourceFd(FdVar int) bool {
331331
332332 return xPrintJobSetSourceFd(x.GoPointer(), FdVar)
333333
M v4/gtk/gtkprintoperation.go +12 -12
@@ -323,7 +323,7 @@ func (x *PrintOperation) GetHasSelection() bool {
323323
324324 }
325325
326-var xPrintOperationGetNPagesToPrint func(uintptr) int32
326+var xPrintOperationGetNPagesToPrint func(uintptr) int
327327
328328 // Returns the number of pages that will be printed.
329329 //
@@ -335,7 +335,7 @@ var xPrintOperationGetNPagesToPrint func(uintptr) int32
335335 // print status is %GTK_PRINT_STATUS_GENERATING_DATA.
336336 //
337337 // This is typically used to track the progress of print operation.
338-func (x *PrintOperation) GetNPagesToPrint() int32 {
338+func (x *PrintOperation) GetNPagesToPrint() int {
339339
340340 return xPrintOperationGetNPagesToPrint(x.GoPointer())
341341
@@ -504,7 +504,7 @@ func (x *PrintOperation) SetAllowAsync(AllowAsyncVar bool) {
504504
505505 }
506506
507-var xPrintOperationSetCurrentPage func(uintptr, int32)
507+var xPrintOperationSetCurrentPage func(uintptr, int)
508508
509509 // Sets the current page.
510510 //
@@ -512,7 +512,7 @@ var xPrintOperationSetCurrentPage func(uintptr, int32)
512512 // the user will be able to select to print only the current page.
513513 //
514514 // Note that this only makes sense for pre-paginated documents.
515-func (x *PrintOperation) SetCurrentPage(CurrentPageVar int32) {
515+func (x *PrintOperation) SetCurrentPage(CurrentPageVar int) {
516516
517517 xPrintOperationSetCurrentPage(x.GoPointer(), CurrentPageVar)
518518
@@ -612,7 +612,7 @@ func (x *PrintOperation) SetJobName(JobNameVar string) {
612612
613613 }
614614
615-var xPrintOperationSetNPages func(uintptr, int32)
615+var xPrintOperationSetNPages func(uintptr, int)
616616
617617 // Sets the number of pages in the document.
618618 //
@@ -625,7 +625,7 @@ var xPrintOperationSetNPages func(uintptr, int32)
625625 // and [signal@Gtk.PrintOperation::draw-page] signals are 0-based, i.e.
626626 // if the user chooses to print all pages, the last ::draw-page signal
627627 // will be for page @n_pages - 1.
628-func (x *PrintOperation) SetNPages(NPagesVar int32) {
628+func (x *PrintOperation) SetNPages(NPagesVar int) {
629629
630630 xPrintOperationSetNPages(x.GoPointer(), NPagesVar)
631631
@@ -845,8 +845,8 @@ func (x *PrintOperation) ConnectDone(cb func(PrintOperation, PrintOperationResul
845845 // [method@Gtk.PrintOperation.set_unit] before starting the print
846846 // operation to set up the transformation of the cairo context
847847 // according to your needs.
848-func (x *PrintOperation) ConnectDrawPage(cb func(PrintOperation, uintptr, int32)) {
849- fcb := func(clsPtr uintptr, ContextVarp uintptr, PageNrVarp int32) {
848+func (x *PrintOperation) ConnectDrawPage(cb func(PrintOperation, uintptr, int)) {
849+ fcb := func(clsPtr uintptr, ContextVarp uintptr, PageNrVarp int) {
850850 fa := PrintOperation{}
851851 fa.Ptr = clsPtr
852852
@@ -929,8 +929,8 @@ func (x *PrintOperation) ConnectPreview(cb func(PrintOperation, uintptr, uintptr
929929 // This gives the application a chance to modify the page setup.
930930 // Any changes done to @setup will be in force only for printing
931931 // this page.
932-func (x *PrintOperation) ConnectRequestPageSetup(cb func(PrintOperation, uintptr, int32, uintptr)) {
933- fcb := func(clsPtr uintptr, ContextVarp uintptr, PageNrVarp int32, SetupVarp uintptr) {
932+func (x *PrintOperation) ConnectRequestPageSetup(cb func(PrintOperation, uintptr, int, uintptr)) {
933+ fcb := func(clsPtr uintptr, ContextVarp uintptr, PageNrVarp int, SetupVarp uintptr) {
934934 fa := PrintOperation{}
935935 fa.Ptr = clsPtr
936936
@@ -982,7 +982,7 @@ func (x *PrintOperation) EndPreview() {
982982
983983 // Returns whether the given page is included in the set of pages that
984984 // have been selected for printing.
985-func (x *PrintOperation) IsSelected(PageNrVar int32) bool {
985+func (x *PrintOperation) IsSelected(PageNrVar int) bool {
986986
987987 return XGtkPrintOperationPreviewIsSelected(x.GoPointer(), PageNrVar)
988988
@@ -999,7 +999,7 @@ func (x *PrintOperation) IsSelected(PageNrVar int32) bool {
999999 //
10001000 // Note that this function requires a suitable cairo context to
10011001 // be associated with the print context.
1002-func (x *PrintOperation) RenderPage(PageNrVar int32) {
1002+func (x *PrintOperation) RenderPage(PageNrVar int) {
10031003
10041004 XGtkPrintOperationPreviewRenderPage(x.GoPointer(), PageNrVar)
10051005
M v4/gtk/gtkprintoperationpreview.go +6 -6
@@ -20,8 +20,8 @@ type PrintOperationPreview interface {
2020 GoPointer() uintptr
2121 SetGoPointer(uintptr)
2222 EndPreview()
23- IsSelected(PageNrVar int32) bool
24- RenderPage(PageNrVar int32)
23+ IsSelected(PageNrVar int) bool
24+ RenderPage(PageNrVar int)
2525 }
2626 type PrintOperationPreviewBase struct {
2727 Ptr uintptr
@@ -46,7 +46,7 @@ func (x *PrintOperationPreviewBase) EndPreview() {
4646
4747 // Returns whether the given page is included in the set of pages that
4848 // have been selected for printing.
49-func (x *PrintOperationPreviewBase) IsSelected(PageNrVar int32) bool {
49+func (x *PrintOperationPreviewBase) IsSelected(PageNrVar int) bool {
5050
5151 return XGtkPrintOperationPreviewIsSelected(x.GoPointer(), PageNrVar)
5252
@@ -63,15 +63,15 @@ func (x *PrintOperationPreviewBase) IsSelected(PageNrVar int32) bool {
6363 //
6464 // Note that this function requires a suitable cairo context to
6565 // be associated with the print context.
66-func (x *PrintOperationPreviewBase) RenderPage(PageNrVar int32) {
66+func (x *PrintOperationPreviewBase) RenderPage(PageNrVar int) {
6767
6868 XGtkPrintOperationPreviewRenderPage(x.GoPointer(), PageNrVar)
6969
7070 }
7171
7272 var XGtkPrintOperationPreviewEndPreview func(uintptr)
73-var XGtkPrintOperationPreviewIsSelected func(uintptr, int32) bool
74-var XGtkPrintOperationPreviewRenderPage func(uintptr, int32)
73+var XGtkPrintOperationPreviewIsSelected func(uintptr, int) bool
74+var XGtkPrintOperationPreviewRenderPage func(uintptr, int)
7575
7676 func init() {
7777 lib, err := purego.Dlopen(core.GetPath("GTK"), purego.RTLD_NOW|purego.RTLD_GLOBAL)
M v4/gtk/gtkprintsettings.go +30 -30
@@ -14,9 +14,9 @@ type PrintSettingsFunc func(string, string, uintptr)
1414 //
1515 // See also [method@Gtk.PrintSettings.set_page_ranges].
1616 type PageRange struct {
17- Start int32
17+ Start int
1818
19- End int32
19+ End int
2020 }
2121
2222 // A `GtkPrintSettings` object represents the settings of a print dialog in
@@ -224,20 +224,20 @@ func (x *PrintSettings) GetFinishings() string {
224224
225225 }
226226
227-var xPrintSettingsGetInt func(uintptr, string) int32
227+var xPrintSettingsGetInt func(uintptr, string) int
228228
229229 // Returns the integer value of @key, or 0.
230-func (x *PrintSettings) GetInt(KeyVar string) int32 {
230+func (x *PrintSettings) GetInt(KeyVar string) int {
231231
232232 return xPrintSettingsGetInt(x.GoPointer(), KeyVar)
233233
234234 }
235235
236-var xPrintSettingsGetIntWithDefault func(uintptr, string, int32) int32
236+var xPrintSettingsGetIntWithDefault func(uintptr, string, int) int
237237
238238 // Returns the value of @key, interpreted as
239239 // an integer, or the default value.
240-func (x *PrintSettings) GetIntWithDefault(KeyVar string, DefVar int32) int32 {
240+func (x *PrintSettings) GetIntWithDefault(KeyVar string, DefVar int) int {
241241
242242 return xPrintSettingsGetIntWithDefault(x.GoPointer(), KeyVar, DefVar)
243243
@@ -266,19 +266,19 @@ func (x *PrintSettings) GetMediaType() string {
266266
267267 }
268268
269-var xPrintSettingsGetNCopies func(uintptr) int32
269+var xPrintSettingsGetNCopies func(uintptr) int
270270
271271 // Gets the value of %GTK_PRINT_SETTINGS_N_COPIES.
272-func (x *PrintSettings) GetNCopies() int32 {
272+func (x *PrintSettings) GetNCopies() int {
273273
274274 return xPrintSettingsGetNCopies(x.GoPointer())
275275
276276 }
277277
278-var xPrintSettingsGetNumberUp func(uintptr) int32
278+var xPrintSettingsGetNumberUp func(uintptr) int
279279
280280 // Gets the value of %GTK_PRINT_SETTINGS_NUMBER_UP.
281-func (x *PrintSettings) GetNumberUp() int32 {
281+func (x *PrintSettings) GetNumberUp() int {
282282
283283 return xPrintSettingsGetNumberUp(x.GoPointer())
284284
@@ -312,10 +312,10 @@ func (x *PrintSettings) GetOutputBin() string {
312312
313313 }
314314
315-var xPrintSettingsGetPageRanges func(uintptr, int32) uintptr
315+var xPrintSettingsGetPageRanges func(uintptr, int) uintptr
316316
317317 // Gets the value of %GTK_PRINT_SETTINGS_PAGE_RANGES.
318-func (x *PrintSettings) GetPageRanges(NumRangesVar int32) uintptr {
318+func (x *PrintSettings) GetPageRanges(NumRangesVar int) uintptr {
319319
320320 return xPrintSettingsGetPageRanges(x.GoPointer(), NumRangesVar)
321321
@@ -397,28 +397,28 @@ func (x *PrintSettings) GetQuality() PrintQuality {
397397
398398 }
399399
400-var xPrintSettingsGetResolution func(uintptr) int32
400+var xPrintSettingsGetResolution func(uintptr) int
401401
402402 // Gets the value of %GTK_PRINT_SETTINGS_RESOLUTION.
403-func (x *PrintSettings) GetResolution() int32 {
403+func (x *PrintSettings) GetResolution() int {
404404
405405 return xPrintSettingsGetResolution(x.GoPointer())
406406
407407 }
408408
409-var xPrintSettingsGetResolutionX func(uintptr) int32
409+var xPrintSettingsGetResolutionX func(uintptr) int
410410
411411 // Gets the value of %GTK_PRINT_SETTINGS_RESOLUTION_X.
412-func (x *PrintSettings) GetResolutionX() int32 {
412+func (x *PrintSettings) GetResolutionX() int {
413413
414414 return xPrintSettingsGetResolutionX(x.GoPointer())
415415
416416 }
417417
418-var xPrintSettingsGetResolutionY func(uintptr) int32
418+var xPrintSettingsGetResolutionY func(uintptr) int
419419
420420 // Gets the value of %GTK_PRINT_SETTINGS_RESOLUTION_Y.
421-func (x *PrintSettings) GetResolutionY() int32 {
421+func (x *PrintSettings) GetResolutionY() int {
422422
423423 return xPrintSettingsGetResolutionY(x.GoPointer())
424424
@@ -558,10 +558,10 @@ func (x *PrintSettings) SetFinishings(FinishingsVar string) {
558558
559559 }
560560
561-var xPrintSettingsSetInt func(uintptr, string, int32)
561+var xPrintSettingsSetInt func(uintptr, string, int)
562562
563563 // Sets @key to an integer value.
564-func (x *PrintSettings) SetInt(KeyVar string, ValueVar int32) {
564+func (x *PrintSettings) SetInt(KeyVar string, ValueVar int) {
565565
566566 xPrintSettingsSetInt(x.GoPointer(), KeyVar, ValueVar)
567567
@@ -587,19 +587,19 @@ func (x *PrintSettings) SetMediaType(MediaTypeVar string) {
587587
588588 }
589589
590-var xPrintSettingsSetNCopies func(uintptr, int32)
590+var xPrintSettingsSetNCopies func(uintptr, int)
591591
592592 // Sets the value of %GTK_PRINT_SETTINGS_N_COPIES.
593-func (x *PrintSettings) SetNCopies(NumCopiesVar int32) {
593+func (x *PrintSettings) SetNCopies(NumCopiesVar int) {
594594
595595 xPrintSettingsSetNCopies(x.GoPointer(), NumCopiesVar)
596596
597597 }
598598
599-var xPrintSettingsSetNumberUp func(uintptr, int32)
599+var xPrintSettingsSetNumberUp func(uintptr, int)
600600
601601 // Sets the value of %GTK_PRINT_SETTINGS_NUMBER_UP.
602-func (x *PrintSettings) SetNumberUp(NumberUpVar int32) {
602+func (x *PrintSettings) SetNumberUp(NumberUpVar int) {
603603
604604 xPrintSettingsSetNumberUp(x.GoPointer(), NumberUpVar)
605605
@@ -632,10 +632,10 @@ func (x *PrintSettings) SetOutputBin(OutputBinVar string) {
632632
633633 }
634634
635-var xPrintSettingsSetPageRanges func(uintptr, uintptr, int32)
635+var xPrintSettingsSetPageRanges func(uintptr, uintptr, int)
636636
637637 // Sets the value of %GTK_PRINT_SETTINGS_PAGE_RANGES.
638-func (x *PrintSettings) SetPageRanges(PageRangesVar uintptr, NumRangesVar int32) {
638+func (x *PrintSettings) SetPageRanges(PageRangesVar uintptr, NumRangesVar int) {
639639
640640 xPrintSettingsSetPageRanges(x.GoPointer(), PageRangesVar, NumRangesVar)
641641
@@ -716,23 +716,23 @@ func (x *PrintSettings) SetQuality(QualityVar PrintQuality) {
716716
717717 }
718718
719-var xPrintSettingsSetResolution func(uintptr, int32)
719+var xPrintSettingsSetResolution func(uintptr, int)
720720
721721 // Sets the values of %GTK_PRINT_SETTINGS_RESOLUTION,
722722 // %GTK_PRINT_SETTINGS_RESOLUTION_X and
723723 // %GTK_PRINT_SETTINGS_RESOLUTION_Y.
724-func (x *PrintSettings) SetResolution(ResolutionVar int32) {
724+func (x *PrintSettings) SetResolution(ResolutionVar int) {
725725
726726 xPrintSettingsSetResolution(x.GoPointer(), ResolutionVar)
727727
728728 }
729729
730-var xPrintSettingsSetResolutionXy func(uintptr, int32, int32)
730+var xPrintSettingsSetResolutionXy func(uintptr, int, int)
731731
732732 // Sets the values of %GTK_PRINT_SETTINGS_RESOLUTION,
733733 // %GTK_PRINT_SETTINGS_RESOLUTION_X and
734734 // %GTK_PRINT_SETTINGS_RESOLUTION_Y.
735-func (x *PrintSettings) SetResolutionXy(ResolutionXVar int32, ResolutionYVar int32) {
735+func (x *PrintSettings) SetResolutionXy(ResolutionXVar int, ResolutionYVar int) {
736736
737737 xPrintSettingsSetResolutionXy(x.GoPointer(), ResolutionXVar, ResolutionYVar)
738738
M v4/gtk/gtkprintunixdialog.go +7 -7
@@ -102,10 +102,10 @@ func (x *PrintUnixDialog) AddCustomTab(ChildVar *Widget, TabLabelVar *Widget) {
102102
103103 }
104104
105-var xPrintUnixDialogGetCurrentPage func(uintptr) int32
105+var xPrintUnixDialogGetCurrentPage func(uintptr) int
106106
107107 // Gets the current page of the `GtkPrintUnixDialog`.
108-func (x *PrintUnixDialog) GetCurrentPage() int32 {
108+func (x *PrintUnixDialog) GetCurrentPage() int {
109109
110110 return xPrintUnixDialogGetCurrentPage(x.GoPointer())
111111
@@ -212,13 +212,13 @@ func (x *PrintUnixDialog) GetSupportSelection() bool {
212212
213213 }
214214
215-var xPrintUnixDialogSetCurrentPage func(uintptr, int32)
215+var xPrintUnixDialogSetCurrentPage func(uintptr, int)
216216
217217 // Sets the current page number.
218218 //
219219 // If @current_page is not -1, this enables the current page choice
220220 // for the range of pages to print.
221-func (x *PrintUnixDialog) SetCurrentPage(CurrentPageVar int32) {
221+func (x *PrintUnixDialog) SetCurrentPage(CurrentPageVar int) {
222222
223223 xPrintUnixDialogSetCurrentPage(x.GoPointer(), CurrentPageVar)
224224
@@ -354,7 +354,7 @@ func (x *PrintUnixDialog) UpdateProperty(FirstPropertyVar AccessibleProperty, va
354354 // property change must be communicated to assistive technologies.
355355 //
356356 // This function is meant to be used by language bindings.
357-func (x *PrintUnixDialog) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
357+func (x *PrintUnixDialog) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
358358
359359 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
360360
@@ -390,7 +390,7 @@ func (x *PrintUnixDialog) UpdateRelation(FirstRelationVar AccessibleRelation, va
390390 // relation change must be communicated to assistive technologies.
391391 //
392392 // This function is meant to be used by language bindings.
393-func (x *PrintUnixDialog) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
393+func (x *PrintUnixDialog) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
394394
395395 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
396396
@@ -423,7 +423,7 @@ func (x *PrintUnixDialog) UpdateState(FirstStateVar AccessibleState, varArgs ...
423423 // state change must be communicated to assistive technologies.
424424 //
425425 // This function is meant to be used by language bindings.
426-func (x *PrintUnixDialog) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
426+func (x *PrintUnixDialog) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
427427
428428 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
429429
M v4/gtk/gtkprogressbar.go +3 -3
@@ -310,7 +310,7 @@ func (x *ProgressBar) UpdateProperty(FirstPropertyVar AccessibleProperty, varArg
310310 // property change must be communicated to assistive technologies.
311311 //
312312 // This function is meant to be used by language bindings.
313-func (x *ProgressBar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
313+func (x *ProgressBar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
314314
315315 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
316316
@@ -346,7 +346,7 @@ func (x *ProgressBar) UpdateRelation(FirstRelationVar AccessibleRelation, varArg
346346 // relation change must be communicated to assistive technologies.
347347 //
348348 // This function is meant to be used by language bindings.
349-func (x *ProgressBar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
349+func (x *ProgressBar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
350350
351351 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
352352
@@ -379,7 +379,7 @@ func (x *ProgressBar) UpdateState(FirstStateVar AccessibleState, varArgs ...inte
379379 // state change must be communicated to assistive technologies.
380380 //
381381 // This function is meant to be used by language bindings.
382-func (x *ProgressBar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
382+func (x *ProgressBar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
383383
384384 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
385385
M v4/gtk/gtkrange.go +9 -9
@@ -103,13 +103,13 @@ func (x *Range) GetRestrictToFillLevel() bool {
103103
104104 }
105105
106-var xRangeGetRoundDigits func(uintptr) int32
106+var xRangeGetRoundDigits func(uintptr) int
107107
108108 // Gets the number of digits to round the value to when
109109 // it changes.
110110 //
111111 // See [signal@Gtk.Range::change-value].
112-func (x *Range) GetRoundDigits() int32 {
112+func (x *Range) GetRoundDigits() int {
113113
114114 return xRangeGetRoundDigits(x.GoPointer())
115115
@@ -124,13 +124,13 @@ func (x *Range) GetShowFillLevel() bool {
124124
125125 }
126126
127-var xRangeGetSliderRange func(uintptr, int32, int32)
127+var xRangeGetSliderRange func(uintptr, int, int)
128128
129129 // This function returns sliders range along the long dimension,
130130 // in widget->window coordinates.
131131 //
132132 // This function is useful mainly for `GtkRange` subclasses.
133-func (x *Range) GetSliderRange(SliderStartVar int32, SliderEndVar int32) {
133+func (x *Range) GetSliderRange(SliderStartVar int, SliderEndVar int) {
134134
135135 xRangeGetSliderRange(x.GoPointer(), SliderStartVar, SliderEndVar)
136136
@@ -264,13 +264,13 @@ func (x *Range) SetRestrictToFillLevel(RestrictToFillLevelVar bool) {
264264
265265 }
266266
267-var xRangeSetRoundDigits func(uintptr, int32)
267+var xRangeSetRoundDigits func(uintptr, int)
268268
269269 // Sets the number of digits to round the value to when
270270 // it changes.
271271 //
272272 // See [signal@Gtk.Range::change-value].
273-func (x *Range) SetRoundDigits(RoundDigitsVar int32) {
273+func (x *Range) SetRoundDigits(RoundDigitsVar int) {
274274
275275 xRangeSetRoundDigits(x.GoPointer(), RoundDigitsVar)
276276
@@ -441,7 +441,7 @@ func (x *Range) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...i
441441 // property change must be communicated to assistive technologies.
442442 //
443443 // This function is meant to be used by language bindings.
444-func (x *Range) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
444+func (x *Range) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
445445
446446 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
447447
@@ -477,7 +477,7 @@ func (x *Range) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...i
477477 // relation change must be communicated to assistive technologies.
478478 //
479479 // This function is meant to be used by language bindings.
480-func (x *Range) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
480+func (x *Range) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
481481
482482 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
483483
@@ -510,7 +510,7 @@ func (x *Range) UpdateState(FirstStateVar AccessibleState, varArgs ...interface{
510510 // state change must be communicated to assistive technologies.
511511 //
512512 // This function is meant to be used by language bindings.
513-func (x *Range) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
513+func (x *Range) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
514514
515515 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
516516
M v4/gtk/gtkrecentmanager.go +2 -2
@@ -244,10 +244,10 @@ func (x *RecentManager) MoveItem(UriVar string, NewUriVar string) bool {
244244
245245 }
246246
247-var xRecentManagerPurgeItems func(uintptr) int32
247+var xRecentManagerPurgeItems func(uintptr) int
248248
249249 // Purges every item from the recently used resources list.
250-func (x *RecentManager) PurgeItems() int32 {
250+func (x *RecentManager) PurgeItems() int {
251251
252252 return xRecentManagerPurgeItems(x.GoPointer())
253253
M v4/gtk/gtkrevealer.go +3 -3
@@ -254,7 +254,7 @@ func (x *Revealer) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs .
254254 // property change must be communicated to assistive technologies.
255255 //
256256 // This function is meant to be used by language bindings.
257-func (x *Revealer) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
257+func (x *Revealer) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
258258
259259 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
260260
@@ -290,7 +290,7 @@ func (x *Revealer) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs .
290290 // relation change must be communicated to assistive technologies.
291291 //
292292 // This function is meant to be used by language bindings.
293-func (x *Revealer) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
293+func (x *Revealer) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
294294
295295 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
296296
@@ -323,7 +323,7 @@ func (x *Revealer) UpdateState(FirstStateVar AccessibleState, varArgs ...interfa
323323 // state change must be communicated to assistive technologies.
324324 //
325325 // This function is meant to be used by language bindings.
326-func (x *Revealer) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
326+func (x *Revealer) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
327327
328328 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
329329
M v4/gtk/gtkscale.go +9 -9
@@ -177,10 +177,10 @@ func (x *Scale) ClearMarks() {
177177
178178 }
179179
180-var xScaleGetDigits func(uintptr) int32
180+var xScaleGetDigits func(uintptr) int
181181
182182 // Gets the number of decimal places that are displayed in the value.
183-func (x *Scale) GetDigits() int32 {
183+func (x *Scale) GetDigits() int {
184184
185185 return xScaleGetDigits(x.GoPointer())
186186
@@ -226,7 +226,7 @@ func (x *Scale) GetLayout() *pango.Layout {
226226
227227 }
228228
229-var xScaleGetLayoutOffsets func(uintptr, int32, int32)
229+var xScaleGetLayoutOffsets func(uintptr, int, int)
230230
231231 // Obtains the coordinates where the scale will draw the
232232 // `PangoLayout` representing the text in the scale.
@@ -236,7 +236,7 @@ var xScaleGetLayoutOffsets func(uintptr, int32, int32)
236236 //
237237 // If the [property@GtkScale:draw-value] property is %FALSE, the return
238238 // values are undefined.
239-func (x *Scale) GetLayoutOffsets(XVar int32, YVar int32) {
239+func (x *Scale) GetLayoutOffsets(XVar int, YVar int) {
240240
241241 xScaleGetLayoutOffsets(x.GoPointer(), XVar, YVar)
242242
@@ -251,7 +251,7 @@ func (x *Scale) GetValuePos() PositionType {
251251
252252 }
253253
254-var xScaleSetDigits func(uintptr, int32)
254+var xScaleSetDigits func(uintptr, int)
255255
256256 // Sets the number of decimal places that are displayed in the value.
257257 //
@@ -265,7 +265,7 @@ var xScaleSetDigits func(uintptr, int32)
265265 // the smooth autoscrolling that is built into `GtkScale`. As an alternative,
266266 // you can use [method@Gtk.Scale.set_format_value_func] to format the displayed
267267 // value yourself.
268-func (x *Scale) SetDigits(DigitsVar int32) {
268+func (x *Scale) SetDigits(DigitsVar int) {
269269
270270 xScaleSetDigits(x.GoPointer(), DigitsVar)
271271
@@ -385,7 +385,7 @@ func (x *Scale) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...i
385385 // property change must be communicated to assistive technologies.
386386 //
387387 // This function is meant to be used by language bindings.
388-func (x *Scale) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
388+func (x *Scale) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
389389
390390 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
391391
@@ -421,7 +421,7 @@ func (x *Scale) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...i
421421 // relation change must be communicated to assistive technologies.
422422 //
423423 // This function is meant to be used by language bindings.
424-func (x *Scale) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
424+func (x *Scale) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
425425
426426 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
427427
@@ -454,7 +454,7 @@ func (x *Scale) UpdateState(FirstStateVar AccessibleState, varArgs ...interface{
454454 // state change must be communicated to assistive technologies.
455455 //
456456 // This function is meant to be used by language bindings.
457-func (x *Scale) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
457+func (x *Scale) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
458458
459459 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
460460
M v4/gtk/gtkscalebutton.go +3 -3
@@ -282,7 +282,7 @@ func (x *ScaleButton) UpdateProperty(FirstPropertyVar AccessibleProperty, varArg
282282 // property change must be communicated to assistive technologies.
283283 //
284284 // This function is meant to be used by language bindings.
285-func (x *ScaleButton) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
285+func (x *ScaleButton) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
286286
287287 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
288288
@@ -318,7 +318,7 @@ func (x *ScaleButton) UpdateRelation(FirstRelationVar AccessibleRelation, varArg
318318 // relation change must be communicated to assistive technologies.
319319 //
320320 // This function is meant to be used by language bindings.
321-func (x *ScaleButton) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
321+func (x *ScaleButton) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
322322
323323 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
324324
@@ -351,7 +351,7 @@ func (x *ScaleButton) UpdateState(FirstStateVar AccessibleState, varArgs ...inte
351351 // state change must be communicated to assistive technologies.
352352 //
353353 // This function is meant to be used by language bindings.
354-func (x *ScaleButton) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
354+func (x *ScaleButton) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
355355
356356 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
357357
M v4/gtk/gtkscrollbar.go +3 -3
@@ -170,7 +170,7 @@ func (x *Scrollbar) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
170170 // property change must be communicated to assistive technologies.
171171 //
172172 // This function is meant to be used by language bindings.
173-func (x *Scrollbar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
173+func (x *Scrollbar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
174174
175175 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
176176
@@ -206,7 +206,7 @@ func (x *Scrollbar) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
206206 // relation change must be communicated to assistive technologies.
207207 //
208208 // This function is meant to be used by language bindings.
209-func (x *Scrollbar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
209+func (x *Scrollbar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
210210
211211 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
212212
@@ -239,7 +239,7 @@ func (x *Scrollbar) UpdateState(FirstStateVar AccessibleState, varArgs ...interf
239239 // state change must be communicated to assistive technologies.
240240 //
241241 // This function is meant to be used by language bindings.
242-func (x *Scrollbar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
242+func (x *Scrollbar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
243243
244244 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
245245
M v4/gtk/gtkscrolledwindow.go +19 -19
@@ -236,37 +236,37 @@ func (x *ScrolledWindow) GetKineticScrolling() bool {
236236
237237 }
238238
239-var xScrolledWindowGetMaxContentHeight func(uintptr) int32
239+var xScrolledWindowGetMaxContentHeight func(uintptr) int
240240
241241 // Returns the maximum content height set.
242-func (x *ScrolledWindow) GetMaxContentHeight() int32 {
242+func (x *ScrolledWindow) GetMaxContentHeight() int {
243243
244244 return xScrolledWindowGetMaxContentHeight(x.GoPointer())
245245
246246 }
247247
248-var xScrolledWindowGetMaxContentWidth func(uintptr) int32
248+var xScrolledWindowGetMaxContentWidth func(uintptr) int
249249
250250 // Returns the maximum content width set.
251-func (x *ScrolledWindow) GetMaxContentWidth() int32 {
251+func (x *ScrolledWindow) GetMaxContentWidth() int {
252252
253253 return xScrolledWindowGetMaxContentWidth(x.GoPointer())
254254
255255 }
256256
257-var xScrolledWindowGetMinContentHeight func(uintptr) int32
257+var xScrolledWindowGetMinContentHeight func(uintptr) int
258258
259259 // Gets the minimal content height of @scrolled_window.
260-func (x *ScrolledWindow) GetMinContentHeight() int32 {
260+func (x *ScrolledWindow) GetMinContentHeight() int {
261261
262262 return xScrolledWindowGetMinContentHeight(x.GoPointer())
263263
264264 }
265265
266-var xScrolledWindowGetMinContentWidth func(uintptr) int32
266+var xScrolledWindowGetMinContentWidth func(uintptr) int
267267
268268 // Gets the minimum content width of @scrolled_window.
269-func (x *ScrolledWindow) GetMinContentWidth() int32 {
269+func (x *ScrolledWindow) GetMinContentWidth() int {
270270
271271 return xScrolledWindowGetMinContentWidth(x.GoPointer())
272272
@@ -400,7 +400,7 @@ func (x *ScrolledWindow) SetKineticScrolling(KineticScrollingVar bool) {
400400
401401 }
402402
403-var xScrolledWindowSetMaxContentHeight func(uintptr, int32)
403+var xScrolledWindowSetMaxContentHeight func(uintptr, int)
404404
405405 // Sets the maximum height that @scrolled_window should keep visible.
406406 //
@@ -409,13 +409,13 @@ var xScrolledWindowSetMaxContentHeight func(uintptr, int32)
409409 //
410410 // It is a programming error to set the maximum content height to a value
411411 // smaller than [property@Gtk.ScrolledWindow:min-content-height].
412-func (x *ScrolledWindow) SetMaxContentHeight(HeightVar int32) {
412+func (x *ScrolledWindow) SetMaxContentHeight(HeightVar int) {
413413
414414 xScrolledWindowSetMaxContentHeight(x.GoPointer(), HeightVar)
415415
416416 }
417417
418-var xScrolledWindowSetMaxContentWidth func(uintptr, int32)
418+var xScrolledWindowSetMaxContentWidth func(uintptr, int)
419419
420420 // Sets the maximum width that @scrolled_window should keep visible.
421421 //
@@ -424,13 +424,13 @@ var xScrolledWindowSetMaxContentWidth func(uintptr, int32)
424424 //
425425 // It is a programming error to set the maximum content width to a
426426 // value smaller than [property@Gtk.ScrolledWindow:min-content-width].
427-func (x *ScrolledWindow) SetMaxContentWidth(WidthVar int32) {
427+func (x *ScrolledWindow) SetMaxContentWidth(WidthVar int) {
428428
429429 xScrolledWindowSetMaxContentWidth(x.GoPointer(), WidthVar)
430430
431431 }
432432
433-var xScrolledWindowSetMinContentHeight func(uintptr, int32)
433+var xScrolledWindowSetMinContentHeight func(uintptr, int)
434434
435435 // Sets the minimum height that @scrolled_window should keep visible.
436436 //
@@ -439,13 +439,13 @@ var xScrolledWindowSetMinContentHeight func(uintptr, int32)
439439 //
440440 // It is a programming error to set the minimum content height to a
441441 // value greater than [property@Gtk.ScrolledWindow:max-content-height].
442-func (x *ScrolledWindow) SetMinContentHeight(HeightVar int32) {
442+func (x *ScrolledWindow) SetMinContentHeight(HeightVar int) {
443443
444444 xScrolledWindowSetMinContentHeight(x.GoPointer(), HeightVar)
445445
446446 }
447447
448-var xScrolledWindowSetMinContentWidth func(uintptr, int32)
448+var xScrolledWindowSetMinContentWidth func(uintptr, int)
449449
450450 // Sets the minimum width that @scrolled_window should keep visible.
451451 //
@@ -454,7 +454,7 @@ var xScrolledWindowSetMinContentWidth func(uintptr, int32)
454454 //
455455 // It is a programming error to set the minimum content width to a
456456 // value greater than [property@Gtk.ScrolledWindow:max-content-width].
457-func (x *ScrolledWindow) SetMinContentWidth(WidthVar int32) {
457+func (x *ScrolledWindow) SetMinContentWidth(WidthVar int) {
458458
459459 xScrolledWindowSetMinContentWidth(x.GoPointer(), WidthVar)
460460
@@ -686,7 +686,7 @@ func (x *ScrolledWindow) UpdateProperty(FirstPropertyVar AccessibleProperty, var
686686 // property change must be communicated to assistive technologies.
687687 //
688688 // This function is meant to be used by language bindings.
689-func (x *ScrolledWindow) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
689+func (x *ScrolledWindow) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
690690
691691 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
692692
@@ -722,7 +722,7 @@ func (x *ScrolledWindow) UpdateRelation(FirstRelationVar AccessibleRelation, var
722722 // relation change must be communicated to assistive technologies.
723723 //
724724 // This function is meant to be used by language bindings.
725-func (x *ScrolledWindow) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
725+func (x *ScrolledWindow) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
726726
727727 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
728728
@@ -755,7 +755,7 @@ func (x *ScrolledWindow) UpdateState(FirstStateVar AccessibleState, varArgs ...i
755755 // state change must be communicated to assistive technologies.
756756 //
757757 // This function is meant to be used by language bindings.
758-func (x *ScrolledWindow) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
758+func (x *ScrolledWindow) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
759759
760760 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
761761
M v4/gtk/gtksearchbar.go +3 -3
@@ -267,7 +267,7 @@ func (x *SearchBar) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
267267 // property change must be communicated to assistive technologies.
268268 //
269269 // This function is meant to be used by language bindings.
270-func (x *SearchBar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
270+func (x *SearchBar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
271271
272272 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
273273
@@ -303,7 +303,7 @@ func (x *SearchBar) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
303303 // relation change must be communicated to assistive technologies.
304304 //
305305 // This function is meant to be used by language bindings.
306-func (x *SearchBar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
306+func (x *SearchBar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
307307
308308 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
309309
@@ -336,7 +336,7 @@ func (x *SearchBar) UpdateState(FirstStateVar AccessibleState, varArgs ...interf
336336 // state change must be communicated to assistive technologies.
337337 //
338338 // This function is meant to be used by language bindings.
339-func (x *SearchBar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
339+func (x *SearchBar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
340340
341341 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
342342
M v4/gtk/gtksearchentry.go +14 -14
@@ -305,7 +305,7 @@ func (x *SearchEntry) UpdateProperty(FirstPropertyVar AccessibleProperty, varArg
305305 // property change must be communicated to assistive technologies.
306306 //
307307 // This function is meant to be used by language bindings.
308-func (x *SearchEntry) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
308+func (x *SearchEntry) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
309309
310310 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
311311
@@ -341,7 +341,7 @@ func (x *SearchEntry) UpdateRelation(FirstRelationVar AccessibleRelation, varArg
341341 // relation change must be communicated to assistive technologies.
342342 //
343343 // This function is meant to be used by language bindings.
344-func (x *SearchEntry) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
344+func (x *SearchEntry) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
345345
346346 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
347347
@@ -374,7 +374,7 @@ func (x *SearchEntry) UpdateState(FirstStateVar AccessibleState, varArgs ...inte
374374 // state change must be communicated to assistive technologies.
375375 //
376376 // This function is meant to be used by language bindings.
377-func (x *SearchEntry) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
377+func (x *SearchEntry) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
378378
379379 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
380380
@@ -407,7 +407,7 @@ func (x *SearchEntry) DeleteSelection() {
407407 // the end of the text.
408408 //
409409 // Note that the positions are specified in characters, not bytes.
410-func (x *SearchEntry) DeleteText(StartPosVar int32, EndPosVar int32) {
410+func (x *SearchEntry) DeleteText(StartPosVar int, EndPosVar int) {
411411
412412 XGtkEditableDeleteText(x.GoPointer(), StartPosVar, EndPosVar)
413413
@@ -438,7 +438,7 @@ func (x *SearchEntry) GetAlignment() float32 {
438438 // the end of the text.
439439 //
440440 // Note that positions are specified in characters, not bytes.
441-func (x *SearchEntry) GetChars(StartPosVar int32, EndPosVar int32) string {
441+func (x *SearchEntry) GetChars(StartPosVar int, EndPosVar int) string {
442442
443443 return XGtkEditableGetChars(x.GoPointer(), StartPosVar, EndPosVar)
444444
@@ -478,7 +478,7 @@ func (x *SearchEntry) GetEnableUndo() bool {
478478 }
479479
480480 // Retrieves the desired maximum width of @editable, in characters.
481-func (x *SearchEntry) GetMaxWidthChars() int32 {
481+func (x *SearchEntry) GetMaxWidthChars() int {
482482
483483 return XGtkEditableGetMaxWidthChars(x.GoPointer())
484484
@@ -488,7 +488,7 @@ func (x *SearchEntry) GetMaxWidthChars() int32 {
488488 // to the start of the content of the editable.
489489 //
490490 // Note that this position is in characters, not in bytes.
491-func (x *SearchEntry) GetPosition() int32 {
491+func (x *SearchEntry) GetPosition() int {
492492
493493 return XGtkEditableGetPosition(x.GoPointer())
494494
@@ -501,7 +501,7 @@ func (x *SearchEntry) GetPosition() int32 {
501501 // and %FALSE will be returned.
502502 //
503503 // Note that positions are specified in characters, not bytes.
504-func (x *SearchEntry) GetSelectionBounds(StartPosVar int32, EndPosVar int32) bool {
504+func (x *SearchEntry) GetSelectionBounds(StartPosVar int, EndPosVar int) bool {
505505
506506 return XGtkEditableGetSelectionBounds(x.GoPointer(), StartPosVar, EndPosVar)
507507
@@ -518,7 +518,7 @@ func (x *SearchEntry) GetText() string {
518518
519519 // Gets the number of characters of space reserved
520520 // for the contents of the editable.
521-func (x *SearchEntry) GetWidthChars() int32 {
521+func (x *SearchEntry) GetWidthChars() int {
522522
523523 return XGtkEditableGetWidthChars(x.GoPointer())
524524
@@ -543,7 +543,7 @@ func (x *SearchEntry) InitDelegate() {
543543 // Note that the position is in characters, not in bytes.
544544 // The function updates @position to point after the newly
545545 // inserted text.
546-func (x *SearchEntry) InsertText(TextVar string, LengthVar int32, PositionVar int32) {
546+func (x *SearchEntry) InsertText(TextVar string, LengthVar int, PositionVar int) {
547547
548548 XGtkEditableInsertText(x.GoPointer(), TextVar, LengthVar, PositionVar)
549549
@@ -557,7 +557,7 @@ func (x *SearchEntry) InsertText(TextVar string, LengthVar int32, PositionVar in
557557 // @start_pos to the end of the text.
558558 //
559559 // Note that positions are specified in characters, not bytes.
560-func (x *SearchEntry) SelectRegion(StartPosVar int32, EndPosVar int32) {
560+func (x *SearchEntry) SelectRegion(StartPosVar int, EndPosVar int) {
561561
562562 XGtkEditableSelectRegion(x.GoPointer(), StartPosVar, EndPosVar)
563563
@@ -593,7 +593,7 @@ func (x *SearchEntry) SetEnableUndo(EnableUndoVar bool) {
593593 }
594594
595595 // Sets the desired maximum width in characters of @editable.
596-func (x *SearchEntry) SetMaxWidthChars(NCharsVar int32) {
596+func (x *SearchEntry) SetMaxWidthChars(NCharsVar int) {
597597
598598 XGtkEditableSetMaxWidthChars(x.GoPointer(), NCharsVar)
599599
@@ -606,7 +606,7 @@ func (x *SearchEntry) SetMaxWidthChars(NCharsVar int32) {
606606 // or equal to the number of characters in the editable. A value of -1
607607 // indicates that the position should be set after the last character
608608 // of the editable. Note that @position is in characters, not in bytes.
609-func (x *SearchEntry) SetPosition(PositionVar int32) {
609+func (x *SearchEntry) SetPosition(PositionVar int) {
610610
611611 XGtkEditableSetPosition(x.GoPointer(), PositionVar)
612612
@@ -627,7 +627,7 @@ func (x *SearchEntry) SetText(TextVar string) {
627627 // Note that it changes the size request, the size can still
628628 // be affected by how you pack the widget into containers.
629629 // If @n_chars is -1, the size reverts to the default size.
630-func (x *SearchEntry) SetWidthChars(NCharsVar int32) {
630+func (x *SearchEntry) SetWidthChars(NCharsVar int) {
631631
632632 XGtkEditableSetWidthChars(x.GoPointer(), NCharsVar)
633633
M v4/gtk/gtkseparator.go +3 -3
@@ -115,7 +115,7 @@ func (x *Separator) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
115115 // property change must be communicated to assistive technologies.
116116 //
117117 // This function is meant to be used by language bindings.
118-func (x *Separator) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
118+func (x *Separator) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
119119
120120 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
121121
@@ -151,7 +151,7 @@ func (x *Separator) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
151151 // relation change must be communicated to assistive technologies.
152152 //
153153 // This function is meant to be used by language bindings.
154-func (x *Separator) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
154+func (x *Separator) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
155155
156156 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
157157
@@ -184,7 +184,7 @@ func (x *Separator) UpdateState(FirstStateVar AccessibleState, varArgs ...interf
184184 // state change must be communicated to assistive technologies.
185185 //
186186 // This function is meant to be used by language bindings.
187-func (x *Separator) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
187+func (x *Separator) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
188188
189189 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
190190
M v4/gtk/gtkshortcutlabel.go +3 -3
@@ -141,7 +141,7 @@ func (x *ShortcutLabel) UpdateProperty(FirstPropertyVar AccessibleProperty, varA
141141 // property change must be communicated to assistive technologies.
142142 //
143143 // This function is meant to be used by language bindings.
144-func (x *ShortcutLabel) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
144+func (x *ShortcutLabel) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
145145
146146 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
147147
@@ -177,7 +177,7 @@ func (x *ShortcutLabel) UpdateRelation(FirstRelationVar AccessibleRelation, varA
177177 // relation change must be communicated to assistive technologies.
178178 //
179179 // This function is meant to be used by language bindings.
180-func (x *ShortcutLabel) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
180+func (x *ShortcutLabel) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
181181
182182 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
183183
@@ -210,7 +210,7 @@ func (x *ShortcutLabel) UpdateState(FirstStateVar AccessibleState, varArgs ...in
210210 // state change must be communicated to assistive technologies.
211211 //
212212 // This function is meant to be used by language bindings.
213-func (x *ShortcutLabel) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
213+func (x *ShortcutLabel) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
214214
215215 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
216216
M v4/gtk/gtkshortcutsgroup.go +3 -3
@@ -88,7 +88,7 @@ func (x *ShortcutsGroup) UpdateProperty(FirstPropertyVar AccessibleProperty, var
8888 // property change must be communicated to assistive technologies.
8989 //
9090 // This function is meant to be used by language bindings.
91-func (x *ShortcutsGroup) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
91+func (x *ShortcutsGroup) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
9292
9393 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
9494
@@ -124,7 +124,7 @@ func (x *ShortcutsGroup) UpdateRelation(FirstRelationVar AccessibleRelation, var
124124 // relation change must be communicated to assistive technologies.
125125 //
126126 // This function is meant to be used by language bindings.
127-func (x *ShortcutsGroup) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
127+func (x *ShortcutsGroup) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
128128
129129 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
130130
@@ -157,7 +157,7 @@ func (x *ShortcutsGroup) UpdateState(FirstStateVar AccessibleState, varArgs ...i
157157 // state change must be communicated to assistive technologies.
158158 //
159159 // This function is meant to be used by language bindings.
160-func (x *ShortcutsGroup) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
160+func (x *ShortcutsGroup) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
161161
162162 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
163163
M v4/gtk/gtkshortcutssection.go +5 -5
@@ -40,8 +40,8 @@ func (c *ShortcutsSection) SetGoPointer(ptr uintptr) {
4040 c.Ptr = ptr
4141 }
4242
43-func (x *ShortcutsSection) ConnectChangeCurrentPage(cb func(ShortcutsSection, int32) bool) {
44- fcb := func(clsPtr uintptr, ObjectVarp int32) bool {
43+func (x *ShortcutsSection) ConnectChangeCurrentPage(cb func(ShortcutsSection, int) bool) {
44+ fcb := func(clsPtr uintptr, ObjectVarp int) bool {
4545 fa := ShortcutsSection{}
4646 fa.Ptr = clsPtr
4747
@@ -109,7 +109,7 @@ func (x *ShortcutsSection) UpdateProperty(FirstPropertyVar AccessibleProperty, v
109109 // property change must be communicated to assistive technologies.
110110 //
111111 // This function is meant to be used by language bindings.
112-func (x *ShortcutsSection) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
112+func (x *ShortcutsSection) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
113113
114114 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
115115
@@ -145,7 +145,7 @@ func (x *ShortcutsSection) UpdateRelation(FirstRelationVar AccessibleRelation, v
145145 // relation change must be communicated to assistive technologies.
146146 //
147147 // This function is meant to be used by language bindings.
148-func (x *ShortcutsSection) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
148+func (x *ShortcutsSection) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
149149
150150 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
151151
@@ -178,7 +178,7 @@ func (x *ShortcutsSection) UpdateState(FirstStateVar AccessibleState, varArgs ..
178178 // state change must be communicated to assistive technologies.
179179 //
180180 // This function is meant to be used by language bindings.
181-func (x *ShortcutsSection) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
181+func (x *ShortcutsSection) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
182182
183183 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
184184
M v4/gtk/gtkshortcutsshortcut.go +3 -3
@@ -115,7 +115,7 @@ func (x *ShortcutsShortcut) UpdateProperty(FirstPropertyVar AccessibleProperty,
115115 // property change must be communicated to assistive technologies.
116116 //
117117 // This function is meant to be used by language bindings.
118-func (x *ShortcutsShortcut) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
118+func (x *ShortcutsShortcut) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
119119
120120 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
121121
@@ -151,7 +151,7 @@ func (x *ShortcutsShortcut) UpdateRelation(FirstRelationVar AccessibleRelation,
151151 // relation change must be communicated to assistive technologies.
152152 //
153153 // This function is meant to be used by language bindings.
154-func (x *ShortcutsShortcut) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
154+func (x *ShortcutsShortcut) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
155155
156156 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
157157
@@ -184,7 +184,7 @@ func (x *ShortcutsShortcut) UpdateState(FirstStateVar AccessibleState, varArgs .
184184 // state change must be communicated to assistive technologies.
185185 //
186186 // This function is meant to be used by language bindings.
187-func (x *ShortcutsShortcut) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
187+func (x *ShortcutsShortcut) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
188188
189189 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
190190
M v4/gtk/gtkshortcutswindow.go +3 -3
@@ -157,7 +157,7 @@ func (x *ShortcutsWindow) UpdateProperty(FirstPropertyVar AccessibleProperty, va
157157 // property change must be communicated to assistive technologies.
158158 //
159159 // This function is meant to be used by language bindings.
160-func (x *ShortcutsWindow) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
160+func (x *ShortcutsWindow) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
161161
162162 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
163163
@@ -193,7 +193,7 @@ func (x *ShortcutsWindow) UpdateRelation(FirstRelationVar AccessibleRelation, va
193193 // relation change must be communicated to assistive technologies.
194194 //
195195 // This function is meant to be used by language bindings.
196-func (x *ShortcutsWindow) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
196+func (x *ShortcutsWindow) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
197197
198198 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
199199
@@ -226,7 +226,7 @@ func (x *ShortcutsWindow) UpdateState(FirstStateVar AccessibleState, varArgs ...
226226 // state change must be communicated to assistive technologies.
227227 //
228228 // This function is meant to be used by language bindings.
229-func (x *ShortcutsWindow) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
229+func (x *ShortcutsWindow) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
230230
231231 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
232232
M v4/gtk/gtkshortcuttrigger.go +2 -2
@@ -281,13 +281,13 @@ func ParseStringShortcutTrigger(StringVar string) *ShortcutTrigger {
281281 return ParseStringShortcutTriggerCls
282282 }
283283
284-var xShortcutTriggerCompare func(uintptr, uintptr) int32
284+var xShortcutTriggerCompare func(uintptr, uintptr) int
285285
286286 // The types of @trigger1 and @trigger2 are `gconstpointer` only to allow
287287 // use of this function as a `GCompareFunc`.
288288 //
289289 // They must each be a `GtkShortcutTrigger`.
290-func (x *ShortcutTrigger) Compare(Trigger2Var uintptr) int32 {
290+func (x *ShortcutTrigger) Compare(Trigger2Var uintptr) int {
291291
292292 return xShortcutTriggerCompare(x.GoPointer(), Trigger2Var)
293293
M v4/gtk/gtksizerequest.go +4 -4
@@ -12,12 +12,12 @@ import (
1212 type RequestedSize struct {
1313 Data uintptr
1414
15- MinimumSize int32
15+ MinimumSize int
1616
17- NaturalSize int32
17+ NaturalSize int
1818 }
1919
20-var xDistributeNaturalAllocation func(int32, uint, uintptr) int32
20+var xDistributeNaturalAllocation func(int, uint, uintptr) int
2121
2222 // Distributes @extra_space to child @sizes by bringing smaller
2323 // children up to natural size first.
@@ -25,7 +25,7 @@ var xDistributeNaturalAllocation func(int32, uint, uintptr) int32
2525 // The remaining space will be added to the @minimum_size member of the
2626 // `GtkRequestedSize` struct. If all sizes reach their natural size then
2727 // the remaining space is returned.
28-func DistributeNaturalAllocation(ExtraSpaceVar int32, NRequestedSizesVar uint, SizesVar uintptr) int32 {
28+func DistributeNaturalAllocation(ExtraSpaceVar int, NRequestedSizesVar uint, SizesVar uintptr) int {
2929
3030 return xDistributeNaturalAllocation(ExtraSpaceVar, NRequestedSizesVar, SizesVar)
3131
M v4/gtk/gtksnapshot.go +2 -2
@@ -450,10 +450,10 @@ func (x *Snapshot) RenderFrame(ContextVar *StyleContext, XVar float64, YVar floa
450450
451451 }
452452
453-var xSnapshotRenderInsertionCursor func(uintptr, uintptr, float64, float64, uintptr, int32, pango.Direction)
453+var xSnapshotRenderInsertionCursor func(uintptr, uintptr, float64, float64, uintptr, int, pango.Direction)
454454
455455 // Draws a text caret using @snapshot at the specified index of @layout.
456-func (x *Snapshot) RenderInsertionCursor(ContextVar *StyleContext, XVar float64, YVar float64, LayoutVar *pango.Layout, IndexVar int32, DirectionVar pango.Direction) {
456+func (x *Snapshot) RenderInsertionCursor(ContextVar *StyleContext, XVar float64, YVar float64, LayoutVar *pango.Layout, IndexVar int, DirectionVar pango.Direction) {
457457
458458 xSnapshotRenderInsertionCursor(x.GoPointer(), ContextVar.GoPointer(), XVar, YVar, LayoutVar.GoPointer(), IndexVar, DirectionVar)
459459
M v4/gtk/gtkspinbutton.go +18 -18
@@ -329,10 +329,10 @@ func (x *SpinButton) GetValue() float64 {
329329
330330 }
331331
332-var xSpinButtonGetValueAsInt func(uintptr) int32
332+var xSpinButtonGetValueAsInt func(uintptr) int
333333
334334 // Get the value @spin_button represented as an integer.
335-func (x *SpinButton) GetValueAsInt() int32 {
335+func (x *SpinButton) GetValueAsInt() int {
336336
337337 return xSpinButtonGetValueAsInt(x.GoPointer())
338338
@@ -510,8 +510,8 @@ func (x *SpinButton) ConnectChangeValue(cb func(SpinButton, ScrollType)) {
510510 // new value.
511511 //
512512 // The default conversion uses g_strtod().
513-func (x *SpinButton) ConnectInput(cb func(SpinButton, float64) int32) {
514- fcb := func(clsPtr uintptr, NewValueVarp float64) int32 {
513+func (x *SpinButton) ConnectInput(cb func(SpinButton, float64) int) {
514+ fcb := func(clsPtr uintptr, NewValueVarp float64) int {
515515 fa := SpinButton{}
516516 fa.Ptr = clsPtr
517517
@@ -641,7 +641,7 @@ func (x *SpinButton) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
641641 // property change must be communicated to assistive technologies.
642642 //
643643 // This function is meant to be used by language bindings.
644-func (x *SpinButton) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
644+func (x *SpinButton) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
645645
646646 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
647647
@@ -677,7 +677,7 @@ func (x *SpinButton) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
677677 // relation change must be communicated to assistive technologies.
678678 //
679679 // This function is meant to be used by language bindings.
680-func (x *SpinButton) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
680+func (x *SpinButton) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
681681
682682 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
683683
@@ -710,7 +710,7 @@ func (x *SpinButton) UpdateState(FirstStateVar AccessibleState, varArgs ...inter
710710 // state change must be communicated to assistive technologies.
711711 //
712712 // This function is meant to be used by language bindings.
713-func (x *SpinButton) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
713+func (x *SpinButton) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
714714
715715 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
716716
@@ -773,7 +773,7 @@ func (x *SpinButton) DeleteSelection() {
773773 // the end of the text.
774774 //
775775 // Note that the positions are specified in characters, not bytes.
776-func (x *SpinButton) DeleteText(StartPosVar int32, EndPosVar int32) {
776+func (x *SpinButton) DeleteText(StartPosVar int, EndPosVar int) {
777777
778778 XGtkEditableDeleteText(x.GoPointer(), StartPosVar, EndPosVar)
779779
@@ -804,7 +804,7 @@ func (x *SpinButton) GetAlignment() float32 {
804804 // the end of the text.
805805 //
806806 // Note that positions are specified in characters, not bytes.
807-func (x *SpinButton) GetChars(StartPosVar int32, EndPosVar int32) string {
807+func (x *SpinButton) GetChars(StartPosVar int, EndPosVar int) string {
808808
809809 return XGtkEditableGetChars(x.GoPointer(), StartPosVar, EndPosVar)
810810
@@ -844,7 +844,7 @@ func (x *SpinButton) GetEnableUndo() bool {
844844 }
845845
846846 // Retrieves the desired maximum width of @editable, in characters.
847-func (x *SpinButton) GetMaxWidthChars() int32 {
847+func (x *SpinButton) GetMaxWidthChars() int {
848848
849849 return XGtkEditableGetMaxWidthChars(x.GoPointer())
850850
@@ -854,7 +854,7 @@ func (x *SpinButton) GetMaxWidthChars() int32 {
854854 // to the start of the content of the editable.
855855 //
856856 // Note that this position is in characters, not in bytes.
857-func (x *SpinButton) GetPosition() int32 {
857+func (x *SpinButton) GetPosition() int {
858858
859859 return XGtkEditableGetPosition(x.GoPointer())
860860
@@ -867,7 +867,7 @@ func (x *SpinButton) GetPosition() int32 {
867867 // and %FALSE will be returned.
868868 //
869869 // Note that positions are specified in characters, not bytes.
870-func (x *SpinButton) GetSelectionBounds(StartPosVar int32, EndPosVar int32) bool {
870+func (x *SpinButton) GetSelectionBounds(StartPosVar int, EndPosVar int) bool {
871871
872872 return XGtkEditableGetSelectionBounds(x.GoPointer(), StartPosVar, EndPosVar)
873873
@@ -884,7 +884,7 @@ func (x *SpinButton) GetText() string {
884884
885885 // Gets the number of characters of space reserved
886886 // for the contents of the editable.
887-func (x *SpinButton) GetWidthChars() int32 {
887+func (x *SpinButton) GetWidthChars() int {
888888
889889 return XGtkEditableGetWidthChars(x.GoPointer())
890890
@@ -909,7 +909,7 @@ func (x *SpinButton) InitDelegate() {
909909 // Note that the position is in characters, not in bytes.
910910 // The function updates @position to point after the newly
911911 // inserted text.
912-func (x *SpinButton) InsertText(TextVar string, LengthVar int32, PositionVar int32) {
912+func (x *SpinButton) InsertText(TextVar string, LengthVar int, PositionVar int) {
913913
914914 XGtkEditableInsertText(x.GoPointer(), TextVar, LengthVar, PositionVar)
915915
@@ -923,7 +923,7 @@ func (x *SpinButton) InsertText(TextVar string, LengthVar int32, PositionVar int
923923 // @start_pos to the end of the text.
924924 //
925925 // Note that positions are specified in characters, not bytes.
926-func (x *SpinButton) SelectRegion(StartPosVar int32, EndPosVar int32) {
926+func (x *SpinButton) SelectRegion(StartPosVar int, EndPosVar int) {
927927
928928 XGtkEditableSelectRegion(x.GoPointer(), StartPosVar, EndPosVar)
929929
@@ -959,7 +959,7 @@ func (x *SpinButton) SetEnableUndo(EnableUndoVar bool) {
959959 }
960960
961961 // Sets the desired maximum width in characters of @editable.
962-func (x *SpinButton) SetMaxWidthChars(NCharsVar int32) {
962+func (x *SpinButton) SetMaxWidthChars(NCharsVar int) {
963963
964964 XGtkEditableSetMaxWidthChars(x.GoPointer(), NCharsVar)
965965
@@ -972,7 +972,7 @@ func (x *SpinButton) SetMaxWidthChars(NCharsVar int32) {
972972 // or equal to the number of characters in the editable. A value of -1
973973 // indicates that the position should be set after the last character
974974 // of the editable. Note that @position is in characters, not in bytes.
975-func (x *SpinButton) SetPosition(PositionVar int32) {
975+func (x *SpinButton) SetPosition(PositionVar int) {
976976
977977 XGtkEditableSetPosition(x.GoPointer(), PositionVar)
978978
@@ -993,7 +993,7 @@ func (x *SpinButton) SetText(TextVar string) {
993993 // Note that it changes the size request, the size can still
994994 // be affected by how you pack the widget into containers.
995995 // If @n_chars is -1, the size reverts to the default size.
996-func (x *SpinButton) SetWidthChars(NCharsVar int32) {
996+func (x *SpinButton) SetWidthChars(NCharsVar int) {
997997
998998 XGtkEditableSetWidthChars(x.GoPointer(), NCharsVar)
999999
M v4/gtk/gtkspinner.go +3 -3
@@ -150,7 +150,7 @@ func (x *Spinner) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ..
150150 // property change must be communicated to assistive technologies.
151151 //
152152 // This function is meant to be used by language bindings.
153-func (x *Spinner) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
153+func (x *Spinner) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
154154
155155 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
156156
@@ -186,7 +186,7 @@ func (x *Spinner) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ..
186186 // relation change must be communicated to assistive technologies.
187187 //
188188 // This function is meant to be used by language bindings.
189-func (x *Spinner) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
189+func (x *Spinner) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
190190
191191 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
192192
@@ -219,7 +219,7 @@ func (x *Spinner) UpdateState(FirstStateVar AccessibleState, varArgs ...interfac
219219 // state change must be communicated to assistive technologies.
220220 //
221221 // This function is meant to be used by language bindings.
222-func (x *Spinner) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
222+func (x *Spinner) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
223223
224224 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
225225
M v4/gtk/gtkstack.go +6 -6
@@ -533,7 +533,7 @@ func (x *Stack) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...i
533533 // property change must be communicated to assistive technologies.
534534 //
535535 // This function is meant to be used by language bindings.
536-func (x *Stack) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
536+func (x *Stack) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
537537
538538 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
539539
@@ -569,7 +569,7 @@ func (x *Stack) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...i
569569 // relation change must be communicated to assistive technologies.
570570 //
571571 // This function is meant to be used by language bindings.
572-func (x *Stack) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
572+func (x *Stack) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
573573
574574 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
575575
@@ -602,7 +602,7 @@ func (x *Stack) UpdateState(FirstStateVar AccessibleState, varArgs ...interface{
602602 // state change must be communicated to assistive technologies.
603603 //
604604 // This function is meant to be used by language bindings.
605-func (x *Stack) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
605+func (x *Stack) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
606606
607607 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
608608
@@ -824,7 +824,7 @@ func (x *StackPage) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
824824 // property change must be communicated to assistive technologies.
825825 //
826826 // This function is meant to be used by language bindings.
827-func (x *StackPage) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
827+func (x *StackPage) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
828828
829829 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
830830
@@ -860,7 +860,7 @@ func (x *StackPage) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
860860 // relation change must be communicated to assistive technologies.
861861 //
862862 // This function is meant to be used by language bindings.
863-func (x *StackPage) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
863+func (x *StackPage) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
864864
865865 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
866866
@@ -893,7 +893,7 @@ func (x *StackPage) UpdateState(FirstStateVar AccessibleState, varArgs ...interf
893893 // state change must be communicated to assistive technologies.
894894 //
895895 // This function is meant to be used by language bindings.
896-func (x *StackPage) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
896+func (x *StackPage) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
897897
898898 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
899899
M v4/gtk/gtkstacksidebar.go +3 -3
@@ -144,7 +144,7 @@ func (x *StackSidebar) UpdateProperty(FirstPropertyVar AccessibleProperty, varAr
144144 // property change must be communicated to assistive technologies.
145145 //
146146 // This function is meant to be used by language bindings.
147-func (x *StackSidebar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
147+func (x *StackSidebar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
148148
149149 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
150150
@@ -180,7 +180,7 @@ func (x *StackSidebar) UpdateRelation(FirstRelationVar AccessibleRelation, varAr
180180 // relation change must be communicated to assistive technologies.
181181 //
182182 // This function is meant to be used by language bindings.
183-func (x *StackSidebar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
183+func (x *StackSidebar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
184184
185185 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
186186
@@ -213,7 +213,7 @@ func (x *StackSidebar) UpdateState(FirstStateVar AccessibleState, varArgs ...int
213213 // state change must be communicated to assistive technologies.
214214 //
215215 // This function is meant to be used by language bindings.
216-func (x *StackSidebar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
216+func (x *StackSidebar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
217217
218218 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
219219
M v4/gtk/gtkstackswitcher.go +3 -3
@@ -159,7 +159,7 @@ func (x *StackSwitcher) UpdateProperty(FirstPropertyVar AccessibleProperty, varA
159159 // property change must be communicated to assistive technologies.
160160 //
161161 // This function is meant to be used by language bindings.
162-func (x *StackSwitcher) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
162+func (x *StackSwitcher) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
163163
164164 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
165165
@@ -195,7 +195,7 @@ func (x *StackSwitcher) UpdateRelation(FirstRelationVar AccessibleRelation, varA
195195 // relation change must be communicated to assistive technologies.
196196 //
197197 // This function is meant to be used by language bindings.
198-func (x *StackSwitcher) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
198+func (x *StackSwitcher) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
199199
200200 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
201201
@@ -228,7 +228,7 @@ func (x *StackSwitcher) UpdateState(FirstStateVar AccessibleState, varArgs ...in
228228 // state change must be communicated to assistive technologies.
229229 //
230230 // This function is meant to be used by language bindings.
231-func (x *StackSwitcher) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
231+func (x *StackSwitcher) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
232232
233233 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
234234
M v4/gtk/gtkstatusbar.go +3 -3
@@ -214,7 +214,7 @@ func (x *Statusbar) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs
214214 // property change must be communicated to assistive technologies.
215215 //
216216 // This function is meant to be used by language bindings.
217-func (x *Statusbar) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
217+func (x *Statusbar) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
218218
219219 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
220220
@@ -250,7 +250,7 @@ func (x *Statusbar) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs
250250 // relation change must be communicated to assistive technologies.
251251 //
252252 // This function is meant to be used by language bindings.
253-func (x *Statusbar) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
253+func (x *Statusbar) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
254254
255255 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
256256
@@ -283,7 +283,7 @@ func (x *Statusbar) UpdateState(FirstStateVar AccessibleState, varArgs ...interf
283283 // state change must be communicated to assistive technologies.
284284 //
285285 // This function is meant to be used by language bindings.
286-func (x *Statusbar) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
286+func (x *Statusbar) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
287287
288288 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
289289
M v4/gtk/gtkstylecontext.go +4 -4
@@ -174,10 +174,10 @@ func (x *StyleContext) GetPadding(PaddingVar *Border) {
174174
175175 }
176176
177-var xStyleContextGetScale func(uintptr) int32
177+var xStyleContextGetScale func(uintptr) int
178178
179179 // Returns the scale used for assets.
180-func (x *StyleContext) GetScale() int32 {
180+func (x *StyleContext) GetScale() int {
181181
182182 return xStyleContextGetScale(x.GoPointer())
183183
@@ -280,10 +280,10 @@ func (x *StyleContext) SetDisplay(DisplayVar *gdk.Display) {
280280
281281 }
282282
283-var xStyleContextSetScale func(uintptr, int32)
283+var xStyleContextSetScale func(uintptr, int)
284284
285285 // Sets the scale to use when getting image assets for the style.
286-func (x *StyleContext) SetScale(ScaleVar int32) {
286+func (x *StyleContext) SetScale(ScaleVar int) {
287287
288288 xStyleContextSetScale(x.GoPointer(), ScaleVar)
289289
M v4/gtk/gtkswitch.go +3 -3
@@ -209,7 +209,7 @@ func (x *Switch) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...
209209 // property change must be communicated to assistive technologies.
210210 //
211211 // This function is meant to be used by language bindings.
212-func (x *Switch) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
212+func (x *Switch) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
213213
214214 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
215215
@@ -245,7 +245,7 @@ func (x *Switch) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...
245245 // relation change must be communicated to assistive technologies.
246246 //
247247 // This function is meant to be used by language bindings.
248-func (x *Switch) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
248+func (x *Switch) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
249249
250250 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
251251
@@ -278,7 +278,7 @@ func (x *Switch) UpdateState(FirstStateVar AccessibleState, varArgs ...interface
278278 // state change must be communicated to assistive technologies.
279279 //
280280 // This function is meant to be used by language bindings.
281-func (x *Switch) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
281+func (x *Switch) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
282282
283283 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
284284
M v4/gtk/gtktestatcontext.go +2 -2
@@ -6,9 +6,9 @@ import (
66 "github.com/jwijenbergh/puregotk/internal/core"
77 )
88
9-var xTestAccessibleAssertionMessageRole func(string, string, int32, string, string, uintptr, AccessibleRole, AccessibleRole)
9+var xTestAccessibleAssertionMessageRole func(string, string, int, string, string, uintptr, AccessibleRole, AccessibleRole)
1010
11-func TestAccessibleAssertionMessageRole(DomainVar string, FileVar string, LineVar int32, FuncVar string, ExprVar string, AccessibleVar Accessible, ExpectedRoleVar AccessibleRole, ActualRoleVar AccessibleRole) {
11+func TestAccessibleAssertionMessageRole(DomainVar string, FileVar string, LineVar int, FuncVar string, ExprVar string, AccessibleVar Accessible, ExpectedRoleVar AccessibleRole, ActualRoleVar AccessibleRole) {
1212
1313 xTestAccessibleAssertionMessageRole(DomainVar, FileVar, LineVar, FuncVar, ExprVar, AccessibleVar.GoPointer(), ExpectedRoleVar, ActualRoleVar)
1414
M v4/gtk/gtktestutils.go +2 -2
@@ -6,7 +6,7 @@ import (
66 "github.com/jwijenbergh/puregotk/internal/core"
77 )
88
9-var xTestInit func(int32, uintptr, ...interface{})
9+var xTestInit func(int, uintptr, ...interface{})
1010
1111 // This function is used to initialize a GTK test program.
1212 //
@@ -17,7 +17,7 @@ var xTestInit func(int32, uintptr, ...interface{})
1717 //
1818 // Like gtk_init() and g_test_init(), any known arguments will be
1919 // processed and stripped from @argc and @argv.
20-func TestInit(ArgcpVar int32, ArgvpVar uintptr, varArgs ...interface{}) {
20+func TestInit(ArgcpVar int, ArgvpVar uintptr, varArgs ...interface{}) {
2121
2222 xTestInit(ArgcpVar, ArgvpVar, varArgs...)
2323
M v4/gtk/gtktext.go +22 -22
@@ -235,7 +235,7 @@ func (x *Text) GetInvisibleChar() uint32 {
235235
236236 }
237237
238-var xTextGetMaxLength func(uintptr) int32
238+var xTextGetMaxLength func(uintptr) int
239239
240240 // Retrieves the maximum allowed length of the text in @self.
241241 //
@@ -243,7 +243,7 @@ var xTextGetMaxLength func(uintptr) int32
243243 //
244244 // This is equivalent to getting @self's `GtkEntryBuffer` and
245245 // calling [method@Gtk.EntryBuffer.get_max_length] on it.
246-func (x *Text) GetMaxLength() int32 {
246+func (x *Text) GetMaxLength() int {
247247
248248 return xTextGetMaxLength(x.GoPointer())
249249
@@ -431,7 +431,7 @@ func (x *Text) SetInvisibleChar(ChVar uint32) {
431431
432432 }
433433
434-var xTextSetMaxLength func(uintptr, int32)
434+var xTextSetMaxLength func(uintptr, int)
435435
436436 // Sets the maximum allowed length of the contents of the widget.
437437 //
@@ -440,7 +440,7 @@ var xTextSetMaxLength func(uintptr, int32)
440440 //
441441 // This is equivalent to getting @self's `GtkEntryBuffer` and
442442 // calling [method@Gtk.EntryBuffer.set_max_length] on it.
443-func (x *Text) SetMaxLength(LengthVar int32) {
443+func (x *Text) SetMaxLength(LengthVar int) {
444444
445445 xTextSetMaxLength(x.GoPointer(), LengthVar)
446446
@@ -617,8 +617,8 @@ func (x *Text) ConnectCutClipboard(cb func(Text)) {
617617 // The default bindings for this signal are <kbd>Delete</kbd>
618618 // for deleting a character and <kbd>Ctrl</kbd>-<kbd>Delete</kbd>
619619 // for deleting a word.
620-func (x *Text) ConnectDeleteFromCursor(cb func(Text, DeleteType, int32)) {
621- fcb := func(clsPtr uintptr, TypeVarp DeleteType, CountVarp int32) {
620+func (x *Text) ConnectDeleteFromCursor(cb func(Text, DeleteType, int)) {
621+ fcb := func(clsPtr uintptr, TypeVarp DeleteType, CountVarp int) {
622622 fa := Text{}
623623 fa.Ptr = clsPtr
624624
@@ -683,8 +683,8 @@ func (x *Text) ConnectInsertEmoji(cb func(Text)) {
683683 // move by individual characters/lines
684684 // - <kbd>Ctrl</kbd>-<kbd>→</kbd>, etc. move by words/paragraphs
685685 // - <kbd>Home</kbd>, <kbd>End</kbd> move to the ends of the buffer
686-func (x *Text) ConnectMoveCursor(cb func(Text, MovementStep, int32, bool)) {
687- fcb := func(clsPtr uintptr, StepVarp MovementStep, CountVarp int32, ExtendVarp bool) {
686+func (x *Text) ConnectMoveCursor(cb func(Text, MovementStep, int, bool)) {
687+ fcb := func(clsPtr uintptr, StepVarp MovementStep, CountVarp int, ExtendVarp bool) {
688688 fa := Text{}
689689 fa.Ptr = clsPtr
690690
@@ -801,7 +801,7 @@ func (x *Text) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs ...in
801801 // property change must be communicated to assistive technologies.
802802 //
803803 // This function is meant to be used by language bindings.
804-func (x *Text) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
804+func (x *Text) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
805805
806806 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
807807
@@ -837,7 +837,7 @@ func (x *Text) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs ...in
837837 // relation change must be communicated to assistive technologies.
838838 //
839839 // This function is meant to be used by language bindings.
840-func (x *Text) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
840+func (x *Text) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
841841
842842 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
843843
@@ -870,7 +870,7 @@ func (x *Text) UpdateState(FirstStateVar AccessibleState, varArgs ...interface{}
870870 // state change must be communicated to assistive technologies.
871871 //
872872 // This function is meant to be used by language bindings.
873-func (x *Text) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
873+func (x *Text) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
874874
875875 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
876876
@@ -903,7 +903,7 @@ func (x *Text) DeleteSelection() {
903903 // the end of the text.
904904 //
905905 // Note that the positions are specified in characters, not bytes.
906-func (x *Text) DeleteText(StartPosVar int32, EndPosVar int32) {
906+func (x *Text) DeleteText(StartPosVar int, EndPosVar int) {
907907
908908 XGtkEditableDeleteText(x.GoPointer(), StartPosVar, EndPosVar)
909909
@@ -934,7 +934,7 @@ func (x *Text) GetAlignment() float32 {
934934 // the end of the text.
935935 //
936936 // Note that positions are specified in characters, not bytes.
937-func (x *Text) GetChars(StartPosVar int32, EndPosVar int32) string {
937+func (x *Text) GetChars(StartPosVar int, EndPosVar int) string {
938938
939939 return XGtkEditableGetChars(x.GoPointer(), StartPosVar, EndPosVar)
940940
@@ -974,7 +974,7 @@ func (x *Text) GetEnableUndo() bool {
974974 }
975975
976976 // Retrieves the desired maximum width of @editable, in characters.
977-func (x *Text) GetMaxWidthChars() int32 {
977+func (x *Text) GetMaxWidthChars() int {
978978
979979 return XGtkEditableGetMaxWidthChars(x.GoPointer())
980980
@@ -984,7 +984,7 @@ func (x *Text) GetMaxWidthChars() int32 {
984984 // to the start of the content of the editable.
985985 //
986986 // Note that this position is in characters, not in bytes.
987-func (x *Text) GetPosition() int32 {
987+func (x *Text) GetPosition() int {
988988
989989 return XGtkEditableGetPosition(x.GoPointer())
990990
@@ -997,7 +997,7 @@ func (x *Text) GetPosition() int32 {
997997 // and %FALSE will be returned.
998998 //
999999 // Note that positions are specified in characters, not bytes.
1000-func (x *Text) GetSelectionBounds(StartPosVar int32, EndPosVar int32) bool {
1000+func (x *Text) GetSelectionBounds(StartPosVar int, EndPosVar int) bool {
10011001
10021002 return XGtkEditableGetSelectionBounds(x.GoPointer(), StartPosVar, EndPosVar)
10031003
@@ -1014,7 +1014,7 @@ func (x *Text) GetText() string {
10141014
10151015 // Gets the number of characters of space reserved
10161016 // for the contents of the editable.
1017-func (x *Text) GetWidthChars() int32 {
1017+func (x *Text) GetWidthChars() int {
10181018
10191019 return XGtkEditableGetWidthChars(x.GoPointer())
10201020
@@ -1039,7 +1039,7 @@ func (x *Text) InitDelegate() {
10391039 // Note that the position is in characters, not in bytes.
10401040 // The function updates @position to point after the newly
10411041 // inserted text.
1042-func (x *Text) InsertText(TextVar string, LengthVar int32, PositionVar int32) {
1042+func (x *Text) InsertText(TextVar string, LengthVar int, PositionVar int) {
10431043
10441044 XGtkEditableInsertText(x.GoPointer(), TextVar, LengthVar, PositionVar)
10451045
@@ -1053,7 +1053,7 @@ func (x *Text) InsertText(TextVar string, LengthVar int32, PositionVar int32) {
10531053 // @start_pos to the end of the text.
10541054 //
10551055 // Note that positions are specified in characters, not bytes.
1056-func (x *Text) SelectRegion(StartPosVar int32, EndPosVar int32) {
1056+func (x *Text) SelectRegion(StartPosVar int, EndPosVar int) {
10571057
10581058 XGtkEditableSelectRegion(x.GoPointer(), StartPosVar, EndPosVar)
10591059
@@ -1089,7 +1089,7 @@ func (x *Text) SetEnableUndo(EnableUndoVar bool) {
10891089 }
10901090
10911091 // Sets the desired maximum width in characters of @editable.
1092-func (x *Text) SetMaxWidthChars(NCharsVar int32) {
1092+func (x *Text) SetMaxWidthChars(NCharsVar int) {
10931093
10941094 XGtkEditableSetMaxWidthChars(x.GoPointer(), NCharsVar)
10951095
@@ -1102,7 +1102,7 @@ func (x *Text) SetMaxWidthChars(NCharsVar int32) {
11021102 // or equal to the number of characters in the editable. A value of -1
11031103 // indicates that the position should be set after the last character
11041104 // of the editable. Note that @position is in characters, not in bytes.
1105-func (x *Text) SetPosition(PositionVar int32) {
1105+func (x *Text) SetPosition(PositionVar int) {
11061106
11071107 XGtkEditableSetPosition(x.GoPointer(), PositionVar)
11081108
@@ -1123,7 +1123,7 @@ func (x *Text) SetText(TextVar string) {
11231123 // Note that it changes the size request, the size can still
11241124 // be affected by how you pack the widget into containers.
11251125 // If @n_chars is -1, the size reverts to the default size.
1126-func (x *Text) SetWidthChars(NCharsVar int32) {
1126+func (x *Text) SetWidthChars(NCharsVar int) {
11271127
11281128 XGtkEditableSetWidthChars(x.GoPointer(), NCharsVar)
11291129
M v4/gtk/gtktextbuffer.go +30 -30
@@ -414,7 +414,7 @@ func (x *TextBuffer) GetCanUndo() bool {
414414
415415 }
416416
417-var xTextBufferGetCharCount func(uintptr) int32
417+var xTextBufferGetCharCount func(uintptr) int
418418
419419 // Gets the number of characters in the buffer.
420420 //
@@ -423,7 +423,7 @@ var xTextBufferGetCharCount func(uintptr) int32
423423 // many bytes long.
424424 //
425425 // The character count is cached, so this function is very fast.
426-func (x *TextBuffer) GetCharCount() int32 {
426+func (x *TextBuffer) GetCharCount() int {
427427
428428 return xTextBufferGetCharCount(x.GoPointer())
429429
@@ -499,19 +499,19 @@ func (x *TextBuffer) GetIterAtChildAnchor(IterVar *TextIter, AnchorVar *TextChil
499499
500500 }
501501
502-var xTextBufferGetIterAtLine func(uintptr, *TextIter, int32) bool
502+var xTextBufferGetIterAtLine func(uintptr, *TextIter, int) bool
503503
504504 // Initializes @iter to the start of the given line.
505505 //
506506 // If @line_number is greater than or equal to the number of lines
507507 // in the @buffer, the end iterator is returned.
508-func (x *TextBuffer) GetIterAtLine(IterVar *TextIter, LineNumberVar int32) bool {
508+func (x *TextBuffer) GetIterAtLine(IterVar *TextIter, LineNumberVar int) bool {
509509
510510 return xTextBufferGetIterAtLine(x.GoPointer(), IterVar, LineNumberVar)
511511
512512 }
513513
514-var xTextBufferGetIterAtLineIndex func(uintptr, *TextIter, int32, int32) bool
514+var xTextBufferGetIterAtLineIndex func(uintptr, *TextIter, int, int) bool
515515
516516 // Obtains an iterator pointing to @byte_index within the given line.
517517 //
@@ -521,13 +521,13 @@ var xTextBufferGetIterAtLineIndex func(uintptr, *TextIter, int32, int32) bool
521521 // If @line_number is greater than or equal to the number of lines in the @buffer,
522522 // the end iterator is returned. And if @byte_index is off the
523523 // end of the line, the iterator at the end of the line is returned.
524-func (x *TextBuffer) GetIterAtLineIndex(IterVar *TextIter, LineNumberVar int32, ByteIndexVar int32) bool {
524+func (x *TextBuffer) GetIterAtLineIndex(IterVar *TextIter, LineNumberVar int, ByteIndexVar int) bool {
525525
526526 return xTextBufferGetIterAtLineIndex(x.GoPointer(), IterVar, LineNumberVar, ByteIndexVar)
527527
528528 }
529529
530-var xTextBufferGetIterAtLineOffset func(uintptr, *TextIter, int32, int32) bool
530+var xTextBufferGetIterAtLineOffset func(uintptr, *TextIter, int, int) bool
531531
532532 // Obtains an iterator pointing to @char_offset within the given line.
533533 //
@@ -537,7 +537,7 @@ var xTextBufferGetIterAtLineOffset func(uintptr, *TextIter, int32, int32) bool
537537 // If @line_number is greater than or equal to the number of lines in the @buffer,
538538 // the end iterator is returned. And if @char_offset is off the
539539 // end of the line, the iterator at the end of the line is returned.
540-func (x *TextBuffer) GetIterAtLineOffset(IterVar *TextIter, LineNumberVar int32, CharOffsetVar int32) bool {
540+func (x *TextBuffer) GetIterAtLineOffset(IterVar *TextIter, LineNumberVar int, CharOffsetVar int) bool {
541541
542542 return xTextBufferGetIterAtLineOffset(x.GoPointer(), IterVar, LineNumberVar, CharOffsetVar)
543543
@@ -552,7 +552,7 @@ func (x *TextBuffer) GetIterAtMark(IterVar *TextIter, MarkVar *TextMark) {
552552
553553 }
554554
555-var xTextBufferGetIterAtOffset func(uintptr, *TextIter, int32)
555+var xTextBufferGetIterAtOffset func(uintptr, *TextIter, int)
556556
557557 // Initializes @iter to a position @char_offset chars from the start
558558 // of the entire buffer.
@@ -560,18 +560,18 @@ var xTextBufferGetIterAtOffset func(uintptr, *TextIter, int32)
560560 // If @char_offset is -1 or greater than the number
561561 // of characters in the buffer, @iter is initialized to the end iterator,
562562 // the iterator one past the last valid character in the buffer.
563-func (x *TextBuffer) GetIterAtOffset(IterVar *TextIter, CharOffsetVar int32) {
563+func (x *TextBuffer) GetIterAtOffset(IterVar *TextIter, CharOffsetVar int) {
564564
565565 xTextBufferGetIterAtOffset(x.GoPointer(), IterVar, CharOffsetVar)
566566
567567 }
568568
569-var xTextBufferGetLineCount func(uintptr) int32
569+var xTextBufferGetLineCount func(uintptr) int
570570
571571 // Obtains the number of lines in the buffer.
572572 //
573573 // This value is cached, so the function is very fast.
574-func (x *TextBuffer) GetLineCount() int32 {
574+func (x *TextBuffer) GetLineCount() int {
575575
576576 return xTextBufferGetLineCount(x.GoPointer())
577577
@@ -749,7 +749,7 @@ func (x *TextBuffer) GetText(StartVar *TextIter, EndVar *TextIter, IncludeHidden
749749
750750 }
751751
752-var xTextBufferInsert func(uintptr, *TextIter, string, int32)
752+var xTextBufferInsert func(uintptr, *TextIter, string, int)
753753
754754 // Inserts @len bytes of @text at position @iter.
755755 //
@@ -759,19 +759,19 @@ var xTextBufferInsert func(uintptr, *TextIter, string, int32)
759759 // insertion occurs (because the buffer contents change), but the
760760 // default signal handler revalidates it to point to the end of the
761761 // inserted text.
762-func (x *TextBuffer) Insert(IterVar *TextIter, TextVar string, LenVar int32) {
762+func (x *TextBuffer) Insert(IterVar *TextIter, TextVar string, LenVar int) {
763763
764764 xTextBufferInsert(x.GoPointer(), IterVar, TextVar, LenVar)
765765
766766 }
767767
768-var xTextBufferInsertAtCursor func(uintptr, string, int32)
768+var xTextBufferInsertAtCursor func(uintptr, string, int)
769769
770770 // Inserts @text in @buffer.
771771 //
772772 // Simply calls [method@Gtk.TextBuffer.insert],
773773 // using the current cursor position as the insertion point.
774-func (x *TextBuffer) InsertAtCursor(TextVar string, LenVar int32) {
774+func (x *TextBuffer) InsertAtCursor(TextVar string, LenVar int) {
775775
776776 xTextBufferInsertAtCursor(x.GoPointer(), TextVar, LenVar)
777777
@@ -798,7 +798,7 @@ func (x *TextBuffer) InsertChildAnchor(IterVar *TextIter, AnchorVar *TextChildAn
798798
799799 }
800800
801-var xTextBufferInsertInteractive func(uintptr, *TextIter, string, int32, bool) bool
801+var xTextBufferInsertInteractive func(uintptr, *TextIter, string, int, bool) bool
802802
803803 // Inserts @text in @buffer.
804804 //
@@ -810,13 +810,13 @@ var xTextBufferInsertInteractive func(uintptr, *TextIter, string, int32, bool) b
810810 // @default_editable indicates the editability of text that doesn't
811811 // have a tag affecting editability applied to it. Typically the
812812 // result of [method@Gtk.TextView.get_editable] is appropriate here.
813-func (x *TextBuffer) InsertInteractive(IterVar *TextIter, TextVar string, LenVar int32, DefaultEditableVar bool) bool {
813+func (x *TextBuffer) InsertInteractive(IterVar *TextIter, TextVar string, LenVar int, DefaultEditableVar bool) bool {
814814
815815 return xTextBufferInsertInteractive(x.GoPointer(), IterVar, TextVar, LenVar, DefaultEditableVar)
816816
817817 }
818818
819-var xTextBufferInsertInteractiveAtCursor func(uintptr, string, int32, bool) bool
819+var xTextBufferInsertInteractiveAtCursor func(uintptr, string, int, bool) bool
820820
821821 // Inserts @text in @buffer.
822822 //
@@ -826,13 +826,13 @@ var xTextBufferInsertInteractiveAtCursor func(uintptr, string, int32, bool) bool
826826 // @default_editable indicates the editability of text that doesn't
827827 // have a tag affecting editability applied to it. Typically the
828828 // result of [method@Gtk.TextView.get_editable] is appropriate here.
829-func (x *TextBuffer) InsertInteractiveAtCursor(TextVar string, LenVar int32, DefaultEditableVar bool) bool {
829+func (x *TextBuffer) InsertInteractiveAtCursor(TextVar string, LenVar int, DefaultEditableVar bool) bool {
830830
831831 return xTextBufferInsertInteractiveAtCursor(x.GoPointer(), TextVar, LenVar, DefaultEditableVar)
832832
833833 }
834834
835-var xTextBufferInsertMarkup func(uintptr, *TextIter, string, int32)
835+var xTextBufferInsertMarkup func(uintptr, *TextIter, string, int)
836836
837837 // Inserts the text in @markup at position @iter.
838838 //
@@ -840,7 +840,7 @@ var xTextBufferInsertMarkup func(uintptr, *TextIter, string, int32)
840840 // and valid UTF-8. Emits the [signal@Gtk.TextBuffer::insert-text] signal,
841841 // possibly multiple times; insertion actually occurs in the default handler
842842 // for the signal. @iter will point to the end of the inserted text on return.
843-func (x *TextBuffer) InsertMarkup(IterVar *TextIter, MarkupVar string, LenVar int32) {
843+func (x *TextBuffer) InsertMarkup(IterVar *TextIter, MarkupVar string, LenVar int) {
844844
845845 xTextBufferInsertMarkup(x.GoPointer(), IterVar, MarkupVar, LenVar)
846846
@@ -898,7 +898,7 @@ func (x *TextBuffer) InsertRangeInteractive(IterVar *TextIter, StartVar *TextIte
898898
899899 }
900900
901-var xTextBufferInsertWithTags func(uintptr, *TextIter, string, int32, uintptr, ...interface{})
901+var xTextBufferInsertWithTags func(uintptr, *TextIter, string, int, uintptr, ...interface{})
902902
903903 // Inserts @text into @buffer at @iter, applying the list of tags to
904904 // the newly-inserted text.
@@ -907,20 +907,20 @@ var xTextBufferInsertWithTags func(uintptr, *TextIter, string, int32, uintptr, .
907907 // Equivalent to calling [method@Gtk.TextBuffer.insert],
908908 // then [method@Gtk.TextBuffer.apply_tag] on the inserted text;
909909 // this is just a convenience function.
910-func (x *TextBuffer) InsertWithTags(IterVar *TextIter, TextVar string, LenVar int32, FirstTagVar *TextTag, varArgs ...interface{}) {
910+func (x *TextBuffer) InsertWithTags(IterVar *TextIter, TextVar string, LenVar int, FirstTagVar *TextTag, varArgs ...interface{}) {
911911
912912 xTextBufferInsertWithTags(x.GoPointer(), IterVar, TextVar, LenVar, FirstTagVar.GoPointer(), varArgs...)
913913
914914 }
915915
916-var xTextBufferInsertWithTagsByName func(uintptr, *TextIter, string, int32, string, ...interface{})
916+var xTextBufferInsertWithTagsByName func(uintptr, *TextIter, string, int, string, ...interface{})
917917
918918 // Inserts @text into @buffer at @iter, applying the list of tags to
919919 // the newly-inserted text.
920920 //
921921 // Same as [method@Gtk.TextBuffer.insert_with_tags], but allows you
922922 // to pass in tag names instead of tag objects.
923-func (x *TextBuffer) InsertWithTagsByName(IterVar *TextIter, TextVar string, LenVar int32, FirstTagNameVar string, varArgs ...interface{}) {
923+func (x *TextBuffer) InsertWithTagsByName(IterVar *TextIter, TextVar string, LenVar int, FirstTagNameVar string, varArgs ...interface{}) {
924924
925925 xTextBufferInsertWithTagsByName(x.GoPointer(), IterVar, TextVar, LenVar, FirstTagNameVar, varArgs...)
926926
@@ -1108,7 +1108,7 @@ func (x *TextBuffer) SetModified(SettingVar bool) {
11081108
11091109 }
11101110
1111-var xTextBufferSetText func(uintptr, string, int32)
1111+var xTextBufferSetText func(uintptr, string, int)
11121112
11131113 // Deletes current contents of @buffer, and inserts @text instead. This is
11141114 // automatically marked as an irreversible action in the undo stack. If you
@@ -1117,7 +1117,7 @@ var xTextBufferSetText func(uintptr, string, int32)
11171117 //
11181118 // If @len is -1, @text must be nul-terminated.
11191119 // @text must be valid UTF-8.
1120-func (x *TextBuffer) SetText(TextVar string, LenVar int32) {
1120+func (x *TextBuffer) SetText(TextVar string, LenVar int) {
11211121
11221122 xTextBufferSetText(x.GoPointer(), TextVar, LenVar)
11231123
@@ -1293,8 +1293,8 @@ func (x *TextBuffer) ConnectInsertPaintable(cb func(TextBuffer, uintptr, uintptr
12931293 //
12941294 // See also: [method@Gtk.TextBuffer.insert],
12951295 // [method@Gtk.TextBuffer.insert_range].
1296-func (x *TextBuffer) ConnectInsertText(cb func(TextBuffer, uintptr, string, int32)) {
1297- fcb := func(clsPtr uintptr, LocationVarp uintptr, TextVarp string, LenVarp int32) {
1296+func (x *TextBuffer) ConnectInsertText(cb func(TextBuffer, uintptr, string, int)) {
1297+ fcb := func(clsPtr uintptr, LocationVarp uintptr, TextVarp string, LenVarp int) {
12981298 fa := TextBuffer{}
12991299 fa.Ptr = clsPtr
13001300
M v4/gtk/gtktextiter.go +9 -9
@@ -16,27 +16,27 @@ type TextIter struct {
1616
1717 Dummy2 uintptr
1818
19- Dummy3 int32
19+ Dummy3 int
2020
21- Dummy4 int32
21+ Dummy4 int
2222
23- Dummy5 int32
23+ Dummy5 int
2424
25- Dummy6 int32
25+ Dummy6 int
2626
27- Dummy7 int32
27+ Dummy7 int
2828
29- Dummy8 int32
29+ Dummy8 int
3030
3131 Dummy9 uintptr
3232
3333 Dummy10 uintptr
3434
35- Dummy11 int32
35+ Dummy11 int
3636
37- Dummy12 int32
37+ Dummy12 int
3838
39- Dummy13 int32
39+ Dummy13 int
4040
4141 Dummy14 uintptr
4242 }
M v4/gtk/gtktexttag.go +4 -4
@@ -71,16 +71,16 @@ func (x *TextTag) Changed(SizeChangedVar bool) {
7171
7272 }
7373
74-var xTextTagGetPriority func(uintptr) int32
74+var xTextTagGetPriority func(uintptr) int
7575
7676 // Get the tag priority.
77-func (x *TextTag) GetPriority() int32 {
77+func (x *TextTag) GetPriority() int {
7878
7979 return xTextTagGetPriority(x.GoPointer())
8080
8181 }
8282
83-var xTextTagSetPriority func(uintptr, int32)
83+var xTextTagSetPriority func(uintptr, int)
8484
8585 // Sets the priority of a `GtkTextTag`.
8686 //
@@ -96,7 +96,7 @@ var xTextTagSetPriority func(uintptr, int32)
9696 // precedence of a set of tags is the order in which they were added
9797 // to the table, or created with [method@Gtk.TextBuffer.create_tag],
9898 // which adds the tag to the buffer’s table automatically.
99-func (x *TextTag) SetPriority(PriorityVar int32) {
99+func (x *TextTag) SetPriority(PriorityVar int) {
100100
101101 xTextTagSetPriority(x.GoPointer(), PriorityVar)
102102
M v4/gtk/gtktexttagtable.go +2 -2
@@ -86,10 +86,10 @@ func (x *TextTagTable) Foreach(FuncVar TextTagTableForeach, DataVar uintptr) {
8686
8787 }
8888
89-var xTextTagTableGetSize func(uintptr) int32
89+var xTextTagTableGetSize func(uintptr) int
9090
9191 // Returns the size of the table (number of tags)
92-func (x *TextTagTable) GetSize() int32 {
92+func (x *TextTagTable) GetSize() int {
9393
9494 return xTextTagTableGetSize(x.GoPointer())
9595
M v4/gtk/gtktextview.go +59 -59
@@ -159,7 +159,7 @@ func (x *TextView) AddChildAtAnchor(ChildVar *Widget, AnchorVar *TextChildAnchor
159159
160160 }
161161
162-var xTextViewAddOverlay func(uintptr, uintptr, int32, int32)
162+var xTextViewAddOverlay func(uintptr, uintptr, int, int)
163163
164164 // Adds @child at a fixed coordinate in the `GtkTextView`'s text window.
165165 //
@@ -171,7 +171,7 @@ var xTextViewAddOverlay func(uintptr, uintptr, int32, int32)
171171 //
172172 // If instead you want a widget that will not move with the
173173 // `GtkTextView` contents see `GtkOverlay`.
174-func (x *TextView) AddOverlay(ChildVar *Widget, XposVar int32, YposVar int32) {
174+func (x *TextView) AddOverlay(ChildVar *Widget, XposVar int, YposVar int) {
175175
176176 xTextViewAddOverlay(x.GoPointer(), ChildVar.GoPointer(), XposVar, YposVar)
177177
@@ -211,10 +211,10 @@ func (x *TextView) BackwardDisplayLineStart(IterVar *TextIter) bool {
211211
212212 }
213213
214-var xTextViewBufferToWindowCoords func(uintptr, TextWindowType, int32, int32, int32, int32)
214+var xTextViewBufferToWindowCoords func(uintptr, TextWindowType, int, int, int, int)
215215
216216 // Converts buffer coordinates to window coordinates.
217-func (x *TextView) BufferToWindowCoords(WinVar TextWindowType, BufferXVar int32, BufferYVar int32, WindowXVar int32, WindowYVar int32) {
217+func (x *TextView) BufferToWindowCoords(WinVar TextWindowType, BufferXVar int, BufferYVar int, WindowXVar int, WindowYVar int) {
218218
219219 xTextViewBufferToWindowCoords(x.GoPointer(), WinVar, BufferXVar, BufferYVar, WindowXVar, WindowYVar)
220220
@@ -265,10 +265,10 @@ func (x *TextView) GetAcceptsTab() bool {
265265
266266 }
267267
268-var xTextViewGetBottomMargin func(uintptr) int32
268+var xTextViewGetBottomMargin func(uintptr) int
269269
270270 // Gets the bottom margin for text in the @text_view.
271-func (x *TextView) GetBottomMargin() int32 {
271+func (x *TextView) GetBottomMargin() int {
272272
273273 return xTextViewGetBottomMargin(x.GoPointer())
274274
@@ -385,13 +385,13 @@ func (x *TextView) GetGutter(WinVar TextWindowType) *Widget {
385385
386386 }
387387
388-var xTextViewGetIndent func(uintptr) int32
388+var xTextViewGetIndent func(uintptr) int
389389
390390 // Gets the default indentation of paragraphs in @text_view.
391391 //
392392 // Tags in the view’s buffer may override the default.
393393 // The indentation may be negative.
394-func (x *TextView) GetIndent() int32 {
394+func (x *TextView) GetIndent() int {
395395
396396 return xTextViewGetIndent(x.GoPointer())
397397
@@ -415,7 +415,7 @@ func (x *TextView) GetInputPurpose() InputPurpose {
415415
416416 }
417417
418-var xTextViewGetIterAtLocation func(uintptr, *TextIter, int32, int32) bool
418+var xTextViewGetIterAtLocation func(uintptr, *TextIter, int, int) bool
419419
420420 // Retrieves the iterator at buffer coordinates @x and @y.
421421 //
@@ -423,13 +423,13 @@ var xTextViewGetIterAtLocation func(uintptr, *TextIter, int32, int32) bool
423423 // the currently-displayed portion. If you have coordinates from an
424424 // event, you have to convert those to buffer coordinates with
425425 // [method@Gtk.TextView.window_to_buffer_coords].
426-func (x *TextView) GetIterAtLocation(IterVar *TextIter, XVar int32, YVar int32) bool {
426+func (x *TextView) GetIterAtLocation(IterVar *TextIter, XVar int, YVar int) bool {
427427
428428 return xTextViewGetIterAtLocation(x.GoPointer(), IterVar, XVar, YVar)
429429
430430 }
431431
432-var xTextViewGetIterAtPosition func(uintptr, *TextIter, int32, int32, int32) bool
432+var xTextViewGetIterAtPosition func(uintptr, *TextIter, int, int, int) bool
433433
434434 // Retrieves the iterator pointing to the character at buffer
435435 // coordinates @x and @y.
@@ -441,7 +441,7 @@ var xTextViewGetIterAtPosition func(uintptr, *TextIter, int32, int32, int32) boo
441441 //
442442 // Note that this is different from [method@Gtk.TextView.get_iter_at_location],
443443 // which returns cursor locations, i.e. positions between characters.
444-func (x *TextView) GetIterAtPosition(IterVar *TextIter, TrailingVar int32, XVar int32, YVar int32) bool {
444+func (x *TextView) GetIterAtPosition(IterVar *TextIter, TrailingVar int, XVar int, YVar int) bool {
445445
446446 return xTextViewGetIterAtPosition(x.GoPointer(), IterVar, TrailingVar, XVar, YVar)
447447
@@ -471,18 +471,18 @@ func (x *TextView) GetJustification() Justification {
471471
472472 }
473473
474-var xTextViewGetLeftMargin func(uintptr) int32
474+var xTextViewGetLeftMargin func(uintptr) int
475475
476476 // Gets the default left margin size of paragraphs in the @text_view.
477477 //
478478 // Tags in the buffer may override the default.
479-func (x *TextView) GetLeftMargin() int32 {
479+func (x *TextView) GetLeftMargin() int {
480480
481481 return xTextViewGetLeftMargin(x.GoPointer())
482482
483483 }
484484
485-var xTextViewGetLineAtY func(uintptr, *TextIter, int32, int32)
485+var xTextViewGetLineAtY func(uintptr, *TextIter, int, int)
486486
487487 // Gets the `GtkTextIter` at the start of the line containing
488488 // the coordinate @y.
@@ -491,20 +491,20 @@ var xTextViewGetLineAtY func(uintptr, *TextIter, int32, int32)
491491 // [method@Gtk.TextView.window_to_buffer_coords]. If non-%NULL,
492492 // @line_top will be filled with the coordinate of the top edge
493493 // of the line.
494-func (x *TextView) GetLineAtY(TargetIterVar *TextIter, YVar int32, LineTopVar int32) {
494+func (x *TextView) GetLineAtY(TargetIterVar *TextIter, YVar int, LineTopVar int) {
495495
496496 xTextViewGetLineAtY(x.GoPointer(), TargetIterVar, YVar, LineTopVar)
497497
498498 }
499499
500-var xTextViewGetLineYrange func(uintptr, *TextIter, int32, int32)
500+var xTextViewGetLineYrange func(uintptr, *TextIter, int, int)
501501
502502 // Gets the y coordinate of the top of the line containing @iter,
503503 // and the height of the line.
504504 //
505505 // The coordinate is a buffer coordinate; convert to window
506506 // coordinates with [method@Gtk.TextView.buffer_to_window_coords].
507-func (x *TextView) GetLineYrange(IterVar *TextIter, YVar int32, HeightVar int32) {
507+func (x *TextView) GetLineYrange(IterVar *TextIter, YVar int, HeightVar int) {
508508
509509 xTextViewGetLineYrange(x.GoPointer(), IterVar, YVar, HeightVar)
510510
@@ -549,46 +549,46 @@ func (x *TextView) GetOverwrite() bool {
549549
550550 }
551551
552-var xTextViewGetPixelsAboveLines func(uintptr) int32
552+var xTextViewGetPixelsAboveLines func(uintptr) int
553553
554554 // Gets the default number of pixels to put above paragraphs.
555555 //
556556 // Adding this function with [method@Gtk.TextView.get_pixels_below_lines]
557557 // is equal to the line space between each paragraph.
558-func (x *TextView) GetPixelsAboveLines() int32 {
558+func (x *TextView) GetPixelsAboveLines() int {
559559
560560 return xTextViewGetPixelsAboveLines(x.GoPointer())
561561
562562 }
563563
564-var xTextViewGetPixelsBelowLines func(uintptr) int32
564+var xTextViewGetPixelsBelowLines func(uintptr) int
565565
566566 // Gets the default number of pixels to put below paragraphs.
567567 //
568568 // The line space is the sum of the value returned by this function and
569569 // the value returned by [method@Gtk.TextView.get_pixels_above_lines].
570-func (x *TextView) GetPixelsBelowLines() int32 {
570+func (x *TextView) GetPixelsBelowLines() int {
571571
572572 return xTextViewGetPixelsBelowLines(x.GoPointer())
573573
574574 }
575575
576-var xTextViewGetPixelsInsideWrap func(uintptr) int32
576+var xTextViewGetPixelsInsideWrap func(uintptr) int
577577
578578 // Gets the default number of pixels to put between wrapped lines
579579 // inside a paragraph.
580-func (x *TextView) GetPixelsInsideWrap() int32 {
580+func (x *TextView) GetPixelsInsideWrap() int {
581581
582582 return xTextViewGetPixelsInsideWrap(x.GoPointer())
583583
584584 }
585585
586-var xTextViewGetRightMargin func(uintptr) int32
586+var xTextViewGetRightMargin func(uintptr) int
587587
588588 // Gets the default right margin for text in @text_view.
589589 //
590590 // Tags in the buffer may override the default.
591-func (x *TextView) GetRightMargin() int32 {
591+func (x *TextView) GetRightMargin() int {
592592
593593 return xTextViewGetRightMargin(x.GoPointer())
594594
@@ -628,10 +628,10 @@ func (x *TextView) GetTabs() *pango.TabArray {
628628
629629 }
630630
631-var xTextViewGetTopMargin func(uintptr) int32
631+var xTextViewGetTopMargin func(uintptr) int
632632
633633 // Gets the top margin for text in the @text_view.
634-func (x *TextView) GetTopMargin() int32 {
634+func (x *TextView) GetTopMargin() int {
635635
636636 return xTextViewGetTopMargin(x.GoPointer())
637637
@@ -711,18 +711,18 @@ func (x *TextView) MoveMarkOnscreen(MarkVar *TextMark) bool {
711711
712712 }
713713
714-var xTextViewMoveOverlay func(uintptr, uintptr, int32, int32)
714+var xTextViewMoveOverlay func(uintptr, uintptr, int, int)
715715
716716 // Updates the position of a child.
717717 //
718718 // See [method@Gtk.TextView.add_overlay].
719-func (x *TextView) MoveOverlay(ChildVar *Widget, XposVar int32, YposVar int32) {
719+func (x *TextView) MoveOverlay(ChildVar *Widget, XposVar int, YposVar int) {
720720
721721 xTextViewMoveOverlay(x.GoPointer(), ChildVar.GoPointer(), XposVar, YposVar)
722722
723723 }
724724
725-var xTextViewMoveVisually func(uintptr, *TextIter, int32) bool
725+var xTextViewMoveVisually func(uintptr, *TextIter, int) bool
726726
727727 // Move the iterator a given number of characters visually, treating
728728 // it as the strong cursor position.
@@ -736,7 +736,7 @@ var xTextViewMoveVisually func(uintptr, *TextIter, int32) bool
736736 // between logical and visual order will depend on the direction
737737 // of the current run, and there may be jumps when the cursor
738738 // is moved off of the end of a run.
739-func (x *TextView) MoveVisually(IterVar *TextIter, CountVar int32) bool {
739+func (x *TextView) MoveVisually(IterVar *TextIter, CountVar int) bool {
740740
741741 return xTextViewMoveVisually(x.GoPointer(), IterVar, CountVar)
742742
@@ -851,13 +851,13 @@ func (x *TextView) SetAcceptsTab(AcceptsTabVar bool) {
851851
852852 }
853853
854-var xTextViewSetBottomMargin func(uintptr, int32)
854+var xTextViewSetBottomMargin func(uintptr, int)
855855
856856 // Sets the bottom margin for text in @text_view.
857857 //
858858 // Note that this function is confusingly named.
859859 // In CSS terms, the value set here is padding.
860-func (x *TextView) SetBottomMargin(BottomMarginVar int32) {
860+func (x *TextView) SetBottomMargin(BottomMarginVar int) {
861861
862862 xTextViewSetBottomMargin(x.GoPointer(), BottomMarginVar)
863863
@@ -928,12 +928,12 @@ func (x *TextView) SetGutter(WinVar TextWindowType, WidgetVar *Widget) {
928928
929929 }
930930
931-var xTextViewSetIndent func(uintptr, int32)
931+var xTextViewSetIndent func(uintptr, int)
932932
933933 // Sets the default indentation for paragraphs in @text_view.
934934 //
935935 // Tags in the buffer may override the default.
936-func (x *TextView) SetIndent(IndentVar int32) {
936+func (x *TextView) SetIndent(IndentVar int) {
937937
938938 xTextViewSetIndent(x.GoPointer(), IndentVar)
939939
@@ -974,7 +974,7 @@ func (x *TextView) SetJustification(JustificationVar Justification) {
974974
975975 }
976976
977-var xTextViewSetLeftMargin func(uintptr, int32)
977+var xTextViewSetLeftMargin func(uintptr, int)
978978
979979 // Sets the default left margin for text in @text_view.
980980 //
@@ -982,7 +982,7 @@ var xTextViewSetLeftMargin func(uintptr, int32)
982982 //
983983 // Note that this function is confusingly named.
984984 // In CSS terms, the value set here is padding.
985-func (x *TextView) SetLeftMargin(LeftMarginVar int32) {
985+func (x *TextView) SetLeftMargin(LeftMarginVar int) {
986986
987987 xTextViewSetLeftMargin(x.GoPointer(), LeftMarginVar)
988988
@@ -1007,42 +1007,42 @@ func (x *TextView) SetOverwrite(OverwriteVar bool) {
10071007
10081008 }
10091009
1010-var xTextViewSetPixelsAboveLines func(uintptr, int32)
1010+var xTextViewSetPixelsAboveLines func(uintptr, int)
10111011
10121012 // Sets the default number of blank pixels above paragraphs in @text_view.
10131013 //
10141014 // Tags in the buffer for @text_view may override the defaults.
1015-func (x *TextView) SetPixelsAboveLines(PixelsAboveLinesVar int32) {
1015+func (x *TextView) SetPixelsAboveLines(PixelsAboveLinesVar int) {
10161016
10171017 xTextViewSetPixelsAboveLines(x.GoPointer(), PixelsAboveLinesVar)
10181018
10191019 }
10201020
1021-var xTextViewSetPixelsBelowLines func(uintptr, int32)
1021+var xTextViewSetPixelsBelowLines func(uintptr, int)
10221022
10231023 // Sets the default number of pixels of blank space
10241024 // to put below paragraphs in @text_view.
10251025 //
10261026 // May be overridden by tags applied to @text_view’s buffer.
1027-func (x *TextView) SetPixelsBelowLines(PixelsBelowLinesVar int32) {
1027+func (x *TextView) SetPixelsBelowLines(PixelsBelowLinesVar int) {
10281028
10291029 xTextViewSetPixelsBelowLines(x.GoPointer(), PixelsBelowLinesVar)
10301030
10311031 }
10321032
1033-var xTextViewSetPixelsInsideWrap func(uintptr, int32)
1033+var xTextViewSetPixelsInsideWrap func(uintptr, int)
10341034
10351035 // Sets the default number of pixels of blank space to leave between
10361036 // display/wrapped lines within a paragraph.
10371037 //
10381038 // May be overridden by tags in @text_view’s buffer.
1039-func (x *TextView) SetPixelsInsideWrap(PixelsInsideWrapVar int32) {
1039+func (x *TextView) SetPixelsInsideWrap(PixelsInsideWrapVar int) {
10401040
10411041 xTextViewSetPixelsInsideWrap(x.GoPointer(), PixelsInsideWrapVar)
10421042
10431043 }
10441044
1045-var xTextViewSetRightMargin func(uintptr, int32)
1045+var xTextViewSetRightMargin func(uintptr, int)
10461046
10471047 // Sets the default right margin for text in the text view.
10481048 //
@@ -1050,7 +1050,7 @@ var xTextViewSetRightMargin func(uintptr, int32)
10501050 //
10511051 // Note that this function is confusingly named.
10521052 // In CSS terms, the value set here is padding.
1053-func (x *TextView) SetRightMargin(RightMarginVar int32) {
1053+func (x *TextView) SetRightMargin(RightMarginVar int) {
10541054
10551055 xTextViewSetRightMargin(x.GoPointer(), RightMarginVar)
10561056
@@ -1067,13 +1067,13 @@ func (x *TextView) SetTabs(TabsVar *pango.TabArray) {
10671067
10681068 }
10691069
1070-var xTextViewSetTopMargin func(uintptr, int32)
1070+var xTextViewSetTopMargin func(uintptr, int)
10711071
10721072 // Sets the top margin for text in @text_view.
10731073 //
10741074 // Note that this function is confusingly named.
10751075 // In CSS terms, the value set here is padding.
1076-func (x *TextView) SetTopMargin(TopMarginVar int32) {
1076+func (x *TextView) SetTopMargin(TopMarginVar int) {
10771077
10781078 xTextViewSetTopMargin(x.GoPointer(), TopMarginVar)
10791079
@@ -1100,11 +1100,11 @@ func (x *TextView) StartsDisplayLine(IterVar *TextIter) bool {
11001100
11011101 }
11021102
1103-var xTextViewWindowToBufferCoords func(uintptr, TextWindowType, int32, int32, int32, int32)
1103+var xTextViewWindowToBufferCoords func(uintptr, TextWindowType, int, int, int, int)
11041104
11051105 // Converts coordinates on the window identified by @win to buffer
11061106 // coordinates.
1107-func (x *TextView) WindowToBufferCoords(WinVar TextWindowType, WindowXVar int32, WindowYVar int32, BufferXVar int32, BufferYVar int32) {
1107+func (x *TextView) WindowToBufferCoords(WinVar TextWindowType, WindowXVar int, WindowYVar int, BufferXVar int, BufferYVar int) {
11081108
11091109 xTextViewWindowToBufferCoords(x.GoPointer(), WinVar, WindowXVar, WindowYVar, BufferXVar, BufferYVar)
11101110
@@ -1183,8 +1183,8 @@ func (x *TextView) ConnectCutClipboard(cb func(TextView)) {
11831183 // deleting a character, <kbd>Ctrl</kbd>-<kbd>Delete</kbd> for
11841184 // deleting a word and <kbd>Ctrl</kbd>-<kbd>Backspace</kbd> for
11851185 // deleting a word backwards.
1186-func (x *TextView) ConnectDeleteFromCursor(cb func(TextView, DeleteType, int32)) {
1187- fcb := func(clsPtr uintptr, TypeVarp DeleteType, CountVarp int32) {
1186+func (x *TextView) ConnectDeleteFromCursor(cb func(TextView, DeleteType, int)) {
1187+ fcb := func(clsPtr uintptr, TypeVarp DeleteType, CountVarp int) {
11881188 fa := TextView{}
11891189 fa.Ptr = clsPtr
11901190
@@ -1263,8 +1263,8 @@ func (x *TextView) ConnectInsertEmoji(cb func(TextView)) {
12631263 // - <kbd>PgUp</kbd>, <kbd>PgDn</kbd> move vertically by pages
12641264 // - <kbd>Ctrl</kbd>-<kbd>PgUp</kbd>, <kbd>Ctrl</kbd>-<kbd>PgDn</kbd>
12651265 // move horizontally by pages
1266-func (x *TextView) ConnectMoveCursor(cb func(TextView, MovementStep, int32, bool)) {
1267- fcb := func(clsPtr uintptr, StepVarp MovementStep, CountVarp int32, ExtendSelectionVarp bool) {
1266+func (x *TextView) ConnectMoveCursor(cb func(TextView, MovementStep, int, bool)) {
1267+ fcb := func(clsPtr uintptr, StepVarp MovementStep, CountVarp int, ExtendSelectionVarp bool) {
12681268 fa := TextView{}
12691269 fa.Ptr = clsPtr
12701270
@@ -1282,8 +1282,8 @@ func (x *TextView) ConnectMoveCursor(cb func(TextView, MovementStep, int32, bool
12821282 // window.
12831283 //
12841284 // There are no default bindings for this signal.
1285-func (x *TextView) ConnectMoveViewport(cb func(TextView, ScrollStep, int32)) {
1286- fcb := func(clsPtr uintptr, StepVarp ScrollStep, CountVarp int32) {
1285+func (x *TextView) ConnectMoveViewport(cb func(TextView, ScrollStep, int)) {
1286+ fcb := func(clsPtr uintptr, StepVarp ScrollStep, CountVarp int) {
12871287 fa := TextView{}
12881288 fa.Ptr = clsPtr
12891289
@@ -1461,7 +1461,7 @@ func (x *TextView) UpdateProperty(FirstPropertyVar AccessibleProperty, varArgs .
14611461 // property change must be communicated to assistive technologies.
14621462 //
14631463 // This function is meant to be used by language bindings.
1464-func (x *TextView) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
1464+func (x *TextView) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
14651465
14661466 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
14671467
@@ -1497,7 +1497,7 @@ func (x *TextView) UpdateRelation(FirstRelationVar AccessibleRelation, varArgs .
14971497 // relation change must be communicated to assistive technologies.
14981498 //
14991499 // This function is meant to be used by language bindings.
1500-func (x *TextView) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
1500+func (x *TextView) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
15011501
15021502 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
15031503
@@ -1530,7 +1530,7 @@ func (x *TextView) UpdateState(FirstStateVar AccessibleState, varArgs ...interfa
15301530 // state change must be communicated to assistive technologies.
15311531 //
15321532 // This function is meant to be used by language bindings.
1533-func (x *TextView) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
1533+func (x *TextView) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
15341534
15351535 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
15361536
M v4/gtk/gtktogglebutton.go +3 -3
@@ -287,7 +287,7 @@ func (x *ToggleButton) UpdateProperty(FirstPropertyVar AccessibleProperty, varAr
287287 // property change must be communicated to assistive technologies.
288288 //
289289 // This function is meant to be used by language bindings.
290-func (x *ToggleButton) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
290+func (x *ToggleButton) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
291291
292292 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
293293
@@ -323,7 +323,7 @@ func (x *ToggleButton) UpdateRelation(FirstRelationVar AccessibleRelation, varAr
323323 // relation change must be communicated to assistive technologies.
324324 //
325325 // This function is meant to be used by language bindings.
326-func (x *ToggleButton) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
326+func (x *ToggleButton) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
327327
328328 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
329329
@@ -356,7 +356,7 @@ func (x *ToggleButton) UpdateState(FirstStateVar AccessibleState, varArgs ...int
356356 // state change must be communicated to assistive technologies.
357357 //
358358 // This function is meant to be used by language bindings.
359-func (x *ToggleButton) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
359+func (x *ToggleButton) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
360360
361361 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
362362
M v4/gtk/gtktreeexpander.go +3 -3
@@ -236,7 +236,7 @@ func (x *TreeExpander) UpdateProperty(FirstPropertyVar AccessibleProperty, varAr
236236 // property change must be communicated to assistive technologies.
237237 //
238238 // This function is meant to be used by language bindings.
239-func (x *TreeExpander) UpdatePropertyValue(NPropertiesVar int32, PropertiesVar uintptr, ValuesVar uintptr) {
239+func (x *TreeExpander) UpdatePropertyValue(NPropertiesVar int, PropertiesVar uintptr, ValuesVar uintptr) {
240240
241241 XGtkAccessibleUpdatePropertyValue(x.GoPointer(), NPropertiesVar, PropertiesVar, ValuesVar)
242242
@@ -272,7 +272,7 @@ func (x *TreeExpander) UpdateRelation(FirstRelationVar AccessibleRelation, varAr
272272 // relation change must be communicated to assistive technologies.
273273 //
274274 // This function is meant to be used by language bindings.
275-func (x *TreeExpander) UpdateRelationValue(NRelationsVar int32, RelationsVar uintptr, ValuesVar uintptr) {
275+func (x *TreeExpander) UpdateRelationValue(NRelationsVar int, RelationsVar uintptr, ValuesVar uintptr) {
276276
277277 XGtkAccessibleUpdateRelationValue(x.GoPointer(), NRelationsVar, RelationsVar, ValuesVar)
278278
@@ -305,7 +305,7 @@ func (x *TreeExpander) UpdateState(FirstStateVar AccessibleState, varArgs ...int
305305 // state change must be communicated to assistive technologies.
306306 //
307307 // This function is meant to be used by language bindings.
308-func (x *TreeExpander) UpdateStateValue(NStatesVar int32, StatesVar uintptr, ValuesVar uintptr) {
308+func (x *TreeExpander) UpdateStateValue(NStatesVar int, StatesVar uintptr, ValuesVar uintptr) {
309309
310310 XGtkAccessibleUpdateStateValue(x.GoPointer(), NStatesVar, StatesVar, ValuesVar)
311311
M v4/gtk/gtktreemodel.go +22 -22
@@ -17,7 +17,7 @@ type TreeModelForeachFunc func(uintptr, *TreePath, *TreeIter, uintptr) bool
1717 // model-specific data in the three @user_data
1818 // members.
1919 type TreeIter struct {
20- Stamp int32
20+ Stamp int
2121
2222 UserData uintptr
2323
@@ -255,21 +255,21 @@ type TreeModel interface {
255255 FilterNew(RootVar *TreePath) *TreeModelBase
256256 Foreach(FuncVar TreeModelForeachFunc, UserDataVar uintptr)
257257 Get(IterVar *TreeIter, varArgs ...interface{})
258- GetColumnType(IndexVar int32) []interface{}
258+ GetColumnType(IndexVar int) []interface{}
259259 GetFlags() TreeModelFlags
260260 GetIter(IterVar *TreeIter, PathVar *TreePath) bool
261261 GetIterFirst(IterVar *TreeIter) bool
262262 GetIterFromString(IterVar *TreeIter, PathStringVar string) bool
263- GetNColumns() int32
263+ GetNColumns() int
264264 GetPath(IterVar *TreeIter) *TreePath
265265 GetStringFromIter(IterVar *TreeIter) string
266266 GetValist(IterVar *TreeIter, VarArgsVar []interface{})
267- GetValue(IterVar *TreeIter, ColumnVar int32, ValueVar *gobject.Value)
267+ GetValue(IterVar *TreeIter, ColumnVar int, ValueVar *gobject.Value)
268268 IterChildren(IterVar *TreeIter, ParentVar *TreeIter) bool
269269 IterHasChild(IterVar *TreeIter) bool
270- IterNChildren(IterVar *TreeIter) int32
270+ IterNChildren(IterVar *TreeIter) int
271271 IterNext(IterVar *TreeIter) bool
272- IterNthChild(IterVar *TreeIter, ParentVar *TreeIter, NVar int32) bool
272+ IterNthChild(IterVar *TreeIter, ParentVar *TreeIter, NVar int) bool
273273 IterParent(IterVar *TreeIter, ChildVar *TreeIter) bool
274274 IterPrevious(IterVar *TreeIter) bool
275275 RefNode(IterVar *TreeIter)
@@ -277,8 +277,8 @@ type TreeModel interface {
277277 RowDeleted(PathVar *TreePath)
278278 RowHasChildToggled(PathVar *TreePath, IterVar *TreeIter)
279279 RowInserted(PathVar *TreePath, IterVar *TreeIter)
280- RowsReordered(PathVar *TreePath, IterVar *TreeIter, NewOrderVar int32)
281- RowsReorderedWithLength(PathVar *TreePath, IterVar *TreeIter, NewOrderVar uintptr, LengthVar int32)
280+ RowsReordered(PathVar *TreePath, IterVar *TreeIter, NewOrderVar int)
281+ RowsReorderedWithLength(PathVar *TreePath, IterVar *TreeIter, NewOrderVar uintptr, LengthVar int)
282282 UnrefNode(IterVar *TreeIter)
283283 }
284284 type TreeModelBase struct {
@@ -338,7 +338,7 @@ func (x *TreeModelBase) Get(IterVar *TreeIter, varArgs ...interface{}) {
338338 }
339339
340340 // Returns the type of the column.
341-func (x *TreeModelBase) GetColumnType(IndexVar int32) []interface{} {
341+func (x *TreeModelBase) GetColumnType(IndexVar int) []interface{} {
342342
343343 return XGtkTreeModelGetColumnType(x.GoPointer(), IndexVar)
344344
@@ -386,7 +386,7 @@ func (x *TreeModelBase) GetIterFromString(IterVar *TreeIter, PathStringVar strin
386386 }
387387
388388 // Returns the number of columns supported by @tree_model.
389-func (x *TreeModelBase) GetNColumns() int32 {
389+func (x *TreeModelBase) GetNColumns() int {
390390
391391 return XGtkTreeModelGetNColumns(x.GoPointer())
392392
@@ -426,7 +426,7 @@ func (x *TreeModelBase) GetValist(IterVar *TreeIter, VarArgsVar []interface{}) {
426426 //
427427 // When done with @value, g_value_unset() needs to be called
428428 // to free any allocated memory.
429-func (x *TreeModelBase) GetValue(IterVar *TreeIter, ColumnVar int32, ValueVar *gobject.Value) {
429+func (x *TreeModelBase) GetValue(IterVar *TreeIter, ColumnVar int, ValueVar *gobject.Value) {
430430
431431 XGtkTreeModelGetValue(x.GoPointer(), IterVar, ColumnVar, ValueVar)
432432
@@ -457,7 +457,7 @@ func (x *TreeModelBase) IterHasChild(IterVar *TreeIter) bool {
457457 //
458458 // As a special case, if @iter is %NULL, then the number
459459 // of toplevel nodes is returned.
460-func (x *TreeModelBase) IterNChildren(IterVar *TreeIter) int32 {
460+func (x *TreeModelBase) IterNChildren(IterVar *TreeIter) int {
461461
462462 return XGtkTreeModelIterNChildren(x.GoPointer(), IterVar)
463463
@@ -480,7 +480,7 @@ func (x *TreeModelBase) IterNext(IterVar *TreeIter) bool {
480480 // will remain a valid node after this function has been called. As a
481481 // special case, if @parent is %NULL, then the @n-th root node
482482 // is set.
483-func (x *TreeModelBase) IterNthChild(IterVar *TreeIter, ParentVar *TreeIter, NVar int32) bool {
483+func (x *TreeModelBase) IterNthChild(IterVar *TreeIter, ParentVar *TreeIter, NVar int) bool {
484484
485485 return XGtkTreeModelIterNthChild(x.GoPointer(), IterVar, ParentVar, NVar)
486486
@@ -586,7 +586,7 @@ func (x *TreeModelBase) RowInserted(PathVar *TreePath, IterVar *TreeIter) {
586586 //
587587 // This should be called by models when their rows have been
588588 // reordered.
589-func (x *TreeModelBase) RowsReordered(PathVar *TreePath, IterVar *TreeIter, NewOrderVar int32) {
589+func (x *TreeModelBase) RowsReordered(PathVar *TreePath, IterVar *TreeIter, NewOrderVar int) {
590590
591591 XGtkTreeModelRowsReordered(x.GoPointer(), PathVar, IterVar, NewOrderVar)
592592
@@ -598,7 +598,7 @@ func (x *TreeModelBase) RowsReordered(PathVar *TreePath, IterVar *TreeIter, NewO
598598 //
599599 // This should be called by models when their rows have been
600600 // reordered.
601-func (x *TreeModelBase) RowsReorderedWithLength(PathVar *TreePath, IterVar *TreeIter, NewOrderVar uintptr, LengthVar int32) {
601+func (x *TreeModelBase) RowsReorderedWithLength(PathVar *TreePath, IterVar *TreeIter, NewOrderVar uintptr, LengthVar int) {
602602
603603 XGtkTreeModelRowsReorderedWithLength(x.GoPointer(), PathVar, IterVar, NewOrderVar, LengthVar)
604604
@@ -621,21 +621,21 @@ func (x *TreeModelBase) UnrefNode(IterVar *TreeIter) {
621621 var XGtkTreeModelFilterNew func(uintptr, *TreePath) uintptr
622622 var XGtkTreeModelForeach func(uintptr, uintptr, uintptr)
623623 var XGtkTreeModelGet func(uintptr, *TreeIter, ...interface{})
624-var XGtkTreeModelGetColumnType func(uintptr, int32) []interface{}
624+var XGtkTreeModelGetColumnType func(uintptr, int) []interface{}
625625 var XGtkTreeModelGetFlags func(uintptr) TreeModelFlags
626626 var XGtkTreeModelGetIter func(uintptr, *TreeIter, *TreePath) bool
627627 var XGtkTreeModelGetIterFirst func(uintptr, *TreeIter) bool
628628 var XGtkTreeModelGetIterFromString func(uintptr, *TreeIter, string) bool
629-var XGtkTreeModelGetNColumns func(uintptr) int32
629+var XGtkTreeModelGetNColumns func(uintptr) int
630630 var XGtkTreeModelGetPath func(uintptr, *TreeIter) *TreePath
631631 var XGtkTreeModelGetStringFromIter func(uintptr, *TreeIter) string
632632 var XGtkTreeModelGetValist func(uintptr, *TreeIter, []interface{})
633-var XGtkTreeModelGetValue func(uintptr, *TreeIter, int32, *gobject.Value)
633+var XGtkTreeModelGetValue func(uintptr, *TreeIter, int, *gobject.Value)
634634 var XGtkTreeModelIterChildren func(uintptr, *TreeIter, *TreeIter) bool
635635 var XGtkTreeModelIterHasChild func(uintptr, *TreeIter) bool
636-var XGtkTreeModelIterNChildren func(uintptr, *TreeIter) int32
636+var XGtkTreeModelIterNChildren func(uintptr, *TreeIter) int
637637 var XGtkTreeModelIterNext func(uintptr, *TreeIter) bool
638-var XGtkTreeModelIterNthChild func(uintptr, *TreeIter, *TreeIter, int32) bool
638+var XGtkTreeModelIterNthChild func(uintptr, *TreeIter, *TreeIter, int) bool
639639 var XGtkTreeModelIterParent func(uintptr, *TreeIter, *TreeIter) bool
640640 var XGtkTreeModelIterPrevious func(uintptr, *TreeIter) bool
641641 var XGtkTreeModelRefNode func(uintptr, *TreeIter)
@@ -643,8 +643,8 @@ var XGtkTreeModelRowChanged func(uintptr, *TreePath, *TreeIter)
643643 var XGtkTreeModelRowDeleted func(uintptr, *TreePath)
644644 var XGtkTreeModelRowHasChildToggled func(uintptr, *TreePath, *TreeIter)
645645 var XGtkTreeModelRowInserted func(uintptr, *TreePath, *TreeIter)
646-var XGtkTreeModelRowsReordered func(uintptr, *TreePath, *TreeIter, int32)
647-var XGtkTreeModelRowsReorderedWithLength func(uintptr, *TreePath, *TreeIter, uintptr, int32)
646+var XGtkTreeModelRowsReordered func(uintptr, *TreePath, *TreeIter, int)
647+var XGtkTreeModelRowsReorderedWithLength func(uintptr, *TreePath, *TreeIter, uintptr, int)
648648 var XGtkTreeModelUnrefNode func(uintptr, *TreeIter)
649649
650650 // These flags indicate various properties of a `GtkTreeModel`.
M v4/gtk/gtktreemodelfilter.go +12 -12
@@ -15,7 +15,7 @@ import (
1515 //
1616 // Since this function is called for each data access, it’s not a
1717 // particularly efficient operation.
18-type TreeModelFilterModifyFunc func(uintptr, *TreeIter, *gobject.Value, int32, uintptr)
18+type TreeModelFilterModifyFunc func(uintptr, *TreeIter, *gobject.Value, int, uintptr)
1919
2020 // A function which decides whether the row indicated by @iter is visible.
2121 type TreeModelFilterVisibleFunc func(uintptr, *TreeIter, uintptr) bool
@@ -193,7 +193,7 @@ func (x *TreeModelFilter) Refilter() {
193193
194194 }
195195
196-var xTreeModelFilterSetModifyFunc func(uintptr, int32, uintptr, uintptr, uintptr, uintptr)
196+var xTreeModelFilterSetModifyFunc func(uintptr, int, uintptr, uintptr, uintptr, uintptr)
197197
198198 // With the @n_columns and @types parameters, you give an array of column
199199 // types for this model (which will be exposed to the parent model/view).
@@ -205,13 +205,13 @@ var xTreeModelFilterSetModifyFunc func(uintptr, int32, uintptr, uintptr, uintptr
205205 //
206206 // Note that gtk_tree_model_filter_set_modify_func()
207207 // can only be called once for a given filter model.
208-func (x *TreeModelFilter) SetModifyFunc(NColumnsVar int32, TypesVar uintptr, FuncVar TreeModelFilterModifyFunc, DataVar uintptr, DestroyVar glib.DestroyNotify) {
208+func (x *TreeModelFilter) SetModifyFunc(NColumnsVar int, TypesVar uintptr, FuncVar TreeModelFilterModifyFunc, DataVar uintptr, DestroyVar glib.DestroyNotify) {
209209
210210 xTreeModelFilterSetModifyFunc(x.GoPointer(), NColumnsVar, TypesVar, purego.NewCallback(FuncVar), DataVar, purego.NewCallback(DestroyVar))
211211
212212 }
213213
214-var xTreeModelFilterSetVisibleColumn func(uintptr, int32)
214+var xTreeModelFilterSetVisibleColumn func(uintptr, int)
215215
216216 // Sets @column of the child_model to be the column where @filter should
217217 // look for visibility information. @columns should be a column of type
@@ -221,7 +221,7 @@ var xTreeModelFilterSetVisibleColumn func(uintptr, int32)
221221 // Note that gtk_tree_model_filter_set_visible_func() or
222222 // gtk_tree_model_filter_set_visible_column() can only be called
223223 // once for a given filter model.
224-func (x *TreeModelFilter) SetVisibleColumn(ColumnVar int32) {
224+func (x *TreeModelFilter) SetVisibleColumn(ColumnVar int) {
225225
226226 xTreeModelFilterSetVisibleColumn(x.GoPointer(), ColumnVar)
227227
@@ -362,7 +362,7 @@ func (x *TreeModelFilter) Get(IterVar *TreeIter, varArgs ...interface{}) {
362362 }
363363
364364 // Returns the type of the column.
365-func (x *TreeModelFilter) GetColumnType(IndexVar int32) []interface{} {
365+func (x *TreeModelFilter) GetColumnType(IndexVar int) []interface{} {
366366
367367 return XGtkTreeModelGetColumnType(x.GoPointer(), IndexVar)
368368
@@ -410,7 +410,7 @@ func (x *TreeModelFilter) GetIterFromString(IterVar *TreeIter, PathStringVar str
410410 }
411411
412412 // Returns the number of columns supported by @tree_model.
413-func (x *TreeModelFilter) GetNColumns() int32 {
413+func (x *TreeModelFilter) GetNColumns() int {
414414
415415 return XGtkTreeModelGetNColumns(x.GoPointer())
416416
@@ -450,7 +450,7 @@ func (x *TreeModelFilter) GetValist(IterVar *TreeIter, VarArgsVar []interface{})
450450 //
451451 // When done with @value, g_value_unset() needs to be called
452452 // to free any allocated memory.
453-func (x *TreeModelFilter) GetValue(IterVar *TreeIter, ColumnVar int32, ValueVar *gobject.Value) {
453+func (x *TreeModelFilter) GetValue(IterVar *TreeIter, ColumnVar int, ValueVar *gobject.Value) {
454454
455455 XGtkTreeModelGetValue(x.GoPointer(), IterVar, ColumnVar, ValueVar)
456456
@@ -481,7 +481,7 @@ func (x *TreeModelFilter) IterHasChild(IterVar *TreeIter) bool {
481481 //
482482 // As a special case, if @iter is %NULL, then the number
483483 // of toplevel nodes is returned.
484-func (x *TreeModelFilter) IterNChildren(IterVar *TreeIter) int32 {
484+func (x *TreeModelFilter) IterNChildren(IterVar *TreeIter) int {
485485
486486 return XGtkTreeModelIterNChildren(x.GoPointer(), IterVar)
487487
@@ -504,7 +504,7 @@ func (x *TreeModelFilter) IterNext(IterVar *TreeIter) bool {
504504 // will remain a valid node after this function has been called. As a
505505 // special case, if @parent is %NULL, then the @n-th root node
506506 // is set.
507-func (x *TreeModelFilter) IterNthChild(IterVar *TreeIter, ParentVar *TreeIter, NVar int32) bool {
507+func (x *TreeModelFilter) IterNthChild(IterVar *TreeIter, ParentVar *TreeIter, NVar int) bool {
508508
509509 return XGtkTreeModelIterNthChild(x.GoPointer(), IterVar, ParentVar, NVar)
510510
@@ -610,7 +610,7 @@ func (x *TreeModelFilter) RowInserted(PathVar *TreePath, IterVar *TreeIter) {
610610 //
611611 // This should be called by models when their rows have been
612612 // reordered.
613-func (x *TreeModelFilter) RowsReordered(PathVar *TreePath, IterVar *TreeIter, NewOrderVar int32) {
613+func (x *TreeModelFilter) RowsReordered(PathVar *TreePath, IterVar *TreeIter, NewOrderVar int) {
614614
615615 XGtkTreeModelRowsReordered(x.GoPointer(), PathVar, IterVar, NewOrderVar)
616616
@@ -622,7 +622,7 @@ func (x *TreeModelFilter) RowsReordered(PathVar *TreePath, IterVar *TreeIter, Ne
622622 //
623623 // This should be called by models when their rows have been
624624 // reordered.
625-func (x *TreeModelFilter) RowsReorderedWithLength(PathVar *TreePath, IterVar *TreeIter, NewOrderVar uintptr, LengthVar int32) {
625+func (x *TreeModelFilter) RowsReorderedWithLength(PathVar *TreePath, IterVar *TreeIter, NewOrderVar uintptr, LengthVar int) {
626626
627627 XGtkTreeModelRowsReorderedWithLength(x.GoPointer(), PathVar, IterVar, NewOrderVar, LengthVar)
628628
M v4/gtk/gtktreemodelsort.go +10 -10 collapsed to keep the page light
load diff
M v4/gtk/gtktreeselection.go +2 -2 collapsed to keep the page light
load diff
M v4/gtk/gtktreesortable.go +10 -10 collapsed to keep the page light
load diff
M v4/gtk/gtktreestore.go +28 -28 collapsed to keep the page light
load diff
M v4/gtk/gtktreeview.go +52 -52 collapsed to keep the page light
load diff
M v4/gtk/gtktreeviewcolumn.go +31 -31 collapsed to keep the page light
load diff
M v4/gtk/gtkvideo.go +3 -3 collapsed to keep the page light
load diff
M v4/gtk/gtkviewport.go +3 -3 collapsed to keep the page light
load diff
M v4/gtk/gtkvolumebutton.go +3 -3 collapsed to keep the page light
load diff
M v4/gtk/gtkwidget.go +49 -49 collapsed to keep the page light
load diff
M v4/gtk/gtkwidgetpaintable.go +2 -2 collapsed to keep the page light
load diff
M v4/gtk/gtkwindow.go +7 -7 collapsed to keep the page light
load diff
M v4/gtk/gtkwindowcontrols.go +3 -3 collapsed to keep the page light
load diff
M v4/gtk/gtkwindowhandle.go +3 -3 collapsed to keep the page light
load diff
M v4/pango/pango-attributes.go +14 -14 collapsed to keep the page light
load diff
M v4/pango/pango-bidi-type.go +2 -2 collapsed to keep the page light
load diff
M v4/pango/pango-break.go +10 -10
@@ -42,31 +42,31 @@ type LogAttr struct {
4242 Reserved uint
4343 }
4444
45-var xAttrBreak func(string, int32, *AttrList, int32, uintptr, int32)
45+var xAttrBreak func(string, int, *AttrList, int, uintptr, int)
4646
4747 // Apply customization from attributes to the breaks in @attrs.
4848 //
4949 // The line breaks are assumed to have been produced
5050 // by [func@Pango.default_break] and [func@Pango.tailor_break].
51-func AttrBreak(TextVar string, LengthVar int32, AttrListVar *AttrList, OffsetVar int32, AttrsVar uintptr, AttrsLenVar int32) {
51+func AttrBreak(TextVar string, LengthVar int, AttrListVar *AttrList, OffsetVar int, AttrsVar uintptr, AttrsLenVar int) {
5252
5353 xAttrBreak(TextVar, LengthVar, AttrListVar, OffsetVar, AttrsVar, AttrsLenVar)
5454
5555 }
5656
57-var xBreak func(string, int32, *Analysis, uintptr, int32)
57+var xBreak func(string, int, *Analysis, uintptr, int)
5858
5959 // Determines possible line, word, and character breaks
6060 // for a string of Unicode text with a single analysis.
6161 //
6262 // For most purposes you may want to use [func@Pango.get_log_attrs].
63-func Break(TextVar string, LengthVar int32, AnalysisVar *Analysis, AttrsVar uintptr, AttrsLenVar int32) {
63+func Break(TextVar string, LengthVar int, AnalysisVar *Analysis, AttrsVar uintptr, AttrsLenVar int) {
6464
6565 xBreak(TextVar, LengthVar, AnalysisVar, AttrsVar, AttrsLenVar)
6666
6767 }
6868
69-var xDefaultBreak func(string, int32, *Analysis, *LogAttr, int32)
69+var xDefaultBreak func(string, int, *Analysis, *LogAttr, int)
7070
7171 // This is the default break algorithm.
7272 //
@@ -77,13 +77,13 @@ var xDefaultBreak func(string, int32, *Analysis, *LogAttr, int32)
7777 // See [func@Pango.tailor_break] for language-specific breaks.
7878 //
7979 // See [func@Pango.attr_break] for attribute-based customization.
80-func DefaultBreak(TextVar string, LengthVar int32, AnalysisVar *Analysis, AttrsVar *LogAttr, AttrsLenVar int32) {
80+func DefaultBreak(TextVar string, LengthVar int, AnalysisVar *Analysis, AttrsVar *LogAttr, AttrsLenVar int) {
8181
8282 xDefaultBreak(TextVar, LengthVar, AnalysisVar, AttrsVar, AttrsLenVar)
8383
8484 }
8585
86-var xGetLogAttrs func(string, int32, int32, *Language, uintptr, int32)
86+var xGetLogAttrs func(string, int, int, *Language, uintptr, int)
8787
8888 // Computes a `PangoLogAttr` for each character in @text.
8989 //
@@ -94,13 +94,13 @@ var xGetLogAttrs func(string, int32, int32, *Language, uintptr, int32)
9494 // logical attributes can't be computed without context
9595 // (for example you need to see spaces on either side of
9696 // a word to know the word is a word).
97-func GetLogAttrs(TextVar string, LengthVar int32, LevelVar int32, LanguageVar *Language, AttrsVar uintptr, AttrsLenVar int32) {
97+func GetLogAttrs(TextVar string, LengthVar int, LevelVar int, LanguageVar *Language, AttrsVar uintptr, AttrsLenVar int) {
9898
9999 xGetLogAttrs(TextVar, LengthVar, LevelVar, LanguageVar, AttrsVar, AttrsLenVar)
100100
101101 }
102102
103-var xTailorBreak func(string, int32, *Analysis, int32, uintptr, int32)
103+var xTailorBreak func(string, int, *Analysis, int, uintptr, int)
104104
105105 // Apply language-specific tailoring to the breaks in @attrs.
106106 //
@@ -111,7 +111,7 @@ var xTailorBreak func(string, int32, *Analysis, int32, uintptr, int32)
111111 //
112112 // Note that it is better to pass -1 for @offset and use [func@Pango.attr_break]
113113 // to apply attributes to the whole paragraph.
114-func TailorBreak(TextVar string, LengthVar int32, AnalysisVar *Analysis, OffsetVar int32, AttrsVar uintptr, AttrsLenVar int32) {
114+func TailorBreak(TextVar string, LengthVar int, AnalysisVar *Analysis, OffsetVar int, AttrsVar uintptr, AttrsLenVar int) {
115115
116116 xTailorBreak(TextVar, LengthVar, AnalysisVar, OffsetVar, AttrsVar, AttrsLenVar)
117117
M v4/pango/pango-context.go +2 -2 collapsed to keep the page light
load diff
M v4/pango/pango-coverage.go +6 -6 collapsed to keep the page light
load diff
M v4/pango/pango-font.go +13 -13 collapsed to keep the page light
load diff
M v4/pango/pango-fontmap.go +2 -2 collapsed to keep the page light
load diff
M v4/pango/pango-fontset.go +2 -2 collapsed to keep the page light
load diff
M v4/pango/pango-glyph-item.go +9 -9 collapsed to keep the page light
load diff
M v4/pango/pango-glyph.go +11 -11 collapsed to keep the page light
load diff
M v4/pango/pango-item.go +7 -7 collapsed to keep the page light
load diff
M v4/pango/pango-layout.go +56 -56 collapsed to keep the page light
load diff
M v4/pango/pango-markup.go +2 -2 collapsed to keep the page light
load diff
M v4/pango/pango-renderer.go +12 -12 collapsed to keep the page light
load diff
M v4/pango/pango-types.go +8 -8 collapsed to keep the page light
load diff
M v4/pango/pango-utils.go +16 -16 collapsed to keep the page light
load diff

Keyboard shortcuts

Single-key shortcuts are on. ctrl k and esc work whatever this says.

ctrl k :
go to a section, branch, tag, file or repository
?
this list
j k
move the row cursor down / up
enter
open the row under the cursor; on Files, a directory opens or closes in place
↑ ↓ ← → home end
in the file tree (focus on a row): previous / next row, close / open a directory or go to its parent / first entry, first / last row. They never open a file
l h
on Files: open a directory or a file / close a directory or go up to its parent, then to the parent page. Elsewhere: into the side panel (on a merge request, its files) / back to the content; there j k move between its controls
g g G
first / last row
/
filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)
b
switch branch or tag
g s g f g c g b g m g i g r g a
tabs: summary, files, commits, branches & tags, merge requests, issues, releases, actions (when available)
g h
home
w
wide mode: use the whole width of the screen, or not (remembered)
y
copy a permalink pinned to the commit
d u x
diff: split / unified / collapse or expand all
e E
diff: the whole file in view / every file, with the lines the hunks hide
n
merge request: next note in the diff
esc
close a dialog, leave a field

Branches 1

Tags 102

↑↓ moveenter openesc close