Merge pull request #349 from bnema/fix/rollback-lazy-puregotk
fix(deps): emergency rollback puregotk lazy registration regression
905 files · +25263 -27842
M go.mod +1 -1
| @@ -11,7 +11,7 @@ require ( | |||
| 11 | 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | |
| 14 | - | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | + | github.com/bnema/puregotk v0.7.0 | |
| 15 | 15 | github.com/charmbracelet/bubbles v1.0.0 | |
| 16 | 16 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 17 | 17 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -11,7 +11,7 @@ require ( | |||||
| 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | ||
| 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | ||
| 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | ||
| 14 | - | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | 14 | + | github.com/bnema/puregotk v0.7.0 |
| 15 | github.com/charmbracelet/bubbles v1.0.0 | 15 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 16 | github.com/charmbracelet/bubbletea v1.3.10 | 16 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 17 | github.com/charmbracelet/lipgloss v1.1.0 | 17 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +0 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +4 -197 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +0 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +64 -99 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +62 -95 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +15 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +29 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +47 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +27 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +12 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +26 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +22 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +15 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +25 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +26 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +38 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +19 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +37 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +22 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +37 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +20 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +22 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +22 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +33 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +38 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +33 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +22 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +33 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +48 -61 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +1 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +33 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +24 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +15 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +17 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +56 -69 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +14 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +15 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +44 -63 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +23 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +1 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +32 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +49 -60 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +38 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +26 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +33 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +22 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +29 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +15 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +17 -8 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +37 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +27 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +39 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +34 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +34 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +30 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +21 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +44 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +24 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +28 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +30 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +21 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +16 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +32 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +37 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +87 -123 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +28 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +18 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +36 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +51 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +35 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +16 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +62 -78
| @@ -5,6 +5,7 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | + | "github.com/bnema/purego" | |
| 8 | 9 | "github.com/bnema/puregotk/pkg/core" | |
| 9 | 10 | "github.com/bnema/puregotk/v4/gio" | |
| 10 | 11 | "github.com/bnema/puregotk/v4/gobject" | |
| @@ -137,7 +138,6 @@ type ViewStack struct { | |||
| 137 | 138 | var xViewStackGLibType func() types.GType | |
| 138 | 139 | ||
| 139 | 140 | func ViewStackGLibType() types.GType { | |
| 140 | - | core.LazyRegister(&xViewStackGLibType, "ADW", "adw_view_stack_get_type", false) | |
| 141 | 141 | return xViewStackGLibType() | |
| 142 | 142 | } | |
| 143 | 143 | ||
| @@ -151,7 +151,6 @@ var xNewViewStack func() uintptr | |||
| 151 | 151 | ||
| 152 | 152 | // Creates a new `AdwViewStack`. | |
| 153 | 153 | func NewViewStack() *ViewStack { | |
| 154 | - | core.LazyRegister(&xNewViewStack, "ADW", "adw_view_stack_new", false) | |
| 155 | 154 | var cls *ViewStack | |
| 156 | 155 | ||
| 157 | 156 | cret := xNewViewStack() | |
| @@ -169,7 +168,6 @@ var xViewStackAdd func(uintptr, uintptr) uintptr | |||
| 169 | 168 | ||
| 170 | 169 | // Adds a child to @self. | |
| 171 | 170 | func (x *ViewStack) Add(ChildVar *gtk.Widget) *ViewStackPage { | |
| 172 | - | core.LazyRegister(&xViewStackAdd, "ADW", "adw_view_stack_add", false) | |
| 173 | 171 | var cls *ViewStackPage | |
| 174 | 172 | ||
| 175 | 173 | cret := xViewStackAdd(x.GoPointer(), ChildVar.GoPointer()) | |
| @@ -189,7 +187,6 @@ var xViewStackAddNamed func(uintptr, uintptr, uintptr) uintptr | |||
| 189 | 187 | // | |
| 190 | 188 | // The child is identified by the @name. | |
| 191 | 189 | func (x *ViewStack) AddNamed(ChildVar *gtk.Widget, NameVar *string) *ViewStackPage { | |
| 192 | - | core.LazyRegister(&xViewStackAddNamed, "ADW", "adw_view_stack_add_named", false) | |
| 193 | 190 | var cls *ViewStackPage | |
| 194 | 191 | ||
| 195 | 192 | NameVarPtr := core.GStrdupNullable(NameVar) | |
| @@ -213,7 +210,6 @@ var xViewStackAddTitled func(uintptr, uintptr, uintptr, string) uintptr | |||
| 213 | 210 | // The child is identified by the @name. The @title will be used by | |
| 214 | 211 | // [class@ViewSwitcher] to represent @child, so it should be short. | |
| 215 | 212 | func (x *ViewStack) AddTitled(ChildVar *gtk.Widget, NameVar *string, TitleVar string) *ViewStackPage { | |
| 216 | - | core.LazyRegister(&xViewStackAddTitled, "ADW", "adw_view_stack_add_titled", false) | |
| 217 | 213 | var cls *ViewStackPage | |
| 218 | 214 | ||
| 219 | 215 | NameVarPtr := core.GStrdupNullable(NameVar) | |
| @@ -237,7 +233,6 @@ var xViewStackAddTitledWithIcon func(uintptr, uintptr, uintptr, string, string) | |||
| 237 | 233 | // The child is identified by the @name. The @title and @icon_name will be used | |
| 238 | 234 | // by [class@ViewSwitcher] to represent @child. | |
| 239 | 235 | func (x *ViewStack) AddTitledWithIcon(ChildVar *gtk.Widget, NameVar *string, TitleVar string, IconNameVar string) *ViewStackPage { | |
| 240 | - | core.LazyRegister(&xViewStackAddTitledWithIcon, "ADW", "adw_view_stack_add_titled_with_icon", false) | |
| 241 | 236 | var cls *ViewStackPage | |
| 242 | 237 | ||
| 243 | 238 | NameVarPtr := core.GStrdupNullable(NameVar) | |
| @@ -258,7 +253,6 @@ var xViewStackGetChildByName func(uintptr, string) uintptr | |||
| 258 | 253 | ||
| 259 | 254 | // Finds the child with @name in @self. | |
| 260 | 255 | func (x *ViewStack) GetChildByName(NameVar string) *gtk.Widget { | |
| 261 | - | core.LazyRegister(&xViewStackGetChildByName, "ADW", "adw_view_stack_get_child_by_name", false) | |
| 262 | 256 | var cls *gtk.Widget | |
| 263 | 257 | ||
| 264 | 258 | cret := xViewStackGetChildByName(x.GoPointer(), NameVar) | |
| @@ -280,8 +274,6 @@ var xViewStackGetEnableTransitions func(uintptr) bool | |||
| 280 | 274 | // [property@ViewStack:transition-running] to know when the transition is | |
| 281 | 275 | // running. | |
| 282 | 276 | func (x *ViewStack) GetEnableTransitions() bool { | |
| 283 | - | core.LazyRegister(&xViewStackGetEnableTransitions, "ADW", "adw_view_stack_get_enable_transitions", false) | |
| 284 | - | ||
| 285 | 277 | cret := xViewStackGetEnableTransitions(x.GoPointer()) | |
| 286 | 278 | return cret | |
| 287 | 279 | } | |
| @@ -290,8 +282,6 @@ var xViewStackGetHhomogeneous func(uintptr) bool | |||
| 290 | 282 | ||
| 291 | 283 | // Gets whether @self is horizontally homogeneous. | |
| 292 | 284 | func (x *ViewStack) GetHhomogeneous() bool { | |
| 293 | - | core.LazyRegister(&xViewStackGetHhomogeneous, "ADW", "adw_view_stack_get_hhomogeneous", false) | |
| 294 | - | ||
| 295 | 285 | cret := xViewStackGetHhomogeneous(x.GoPointer()) | |
| 296 | 286 | return cret | |
| 297 | 287 | } | |
| @@ -300,7 +290,6 @@ var xViewStackGetPage func(uintptr, uintptr) uintptr | |||
| 300 | 290 | ||
| 301 | 291 | // Gets the [class@ViewStackPage] object for @child. | |
| 302 | 292 | func (x *ViewStack) GetPage(ChildVar *gtk.Widget) *ViewStackPage { | |
| 303 | - | core.LazyRegister(&xViewStackGetPage, "ADW", "adw_view_stack_get_page", false) | |
| 304 | 293 | var cls *ViewStackPage | |
| 305 | 294 | ||
| 306 | 295 | cret := xViewStackGetPage(x.GoPointer(), ChildVar.GoPointer()) | |
| @@ -326,7 +315,6 @@ var xViewStackGetPages func(uintptr) uintptr | |||
| 326 | 315 | // The model also implements [iface@Gtk.SelectionModel] and can be used to track | |
| 327 | 316 | // and change the visible page. | |
| 328 | 317 | func (x *ViewStack) GetPages() *gtk.SelectionModelBase { | |
| 329 | - | core.LazyRegister(&xViewStackGetPages, "ADW", "adw_view_stack_get_pages", false) | |
| 330 | 318 | var cls *gtk.SelectionModelBase | |
| 331 | 319 | ||
| 332 | 320 | cret := xViewStackGetPages(x.GoPointer()) | |
| @@ -343,8 +331,6 @@ var xViewStackGetTransitionDuration func(uintptr) uint | |||
| 343 | 331 | ||
| 344 | 332 | // Gets the transition animation duration for @self. | |
| 345 | 333 | func (x *ViewStack) GetTransitionDuration() uint { | |
| 346 | - | core.LazyRegister(&xViewStackGetTransitionDuration, "ADW", "adw_view_stack_get_transition_duration", false) | |
| 347 | - | ||
| 348 | 334 | cret := xViewStackGetTransitionDuration(x.GoPointer()) | |
| 349 | 335 | return cret | |
| 350 | 336 | } | |
| @@ -357,8 +343,6 @@ var xViewStackGetTransitionRunning func(uintptr) bool | |||
| 357 | 343 | // then immediately to `FALSE`, so it's possible to rely on its notifications | |
| 358 | 344 | // to know that a transition has happened. | |
| 359 | 345 | func (x *ViewStack) GetTransitionRunning() bool { | |
| 360 | - | core.LazyRegister(&xViewStackGetTransitionRunning, "ADW", "adw_view_stack_get_transition_running", false) | |
| 361 | - | ||
| 362 | 346 | cret := xViewStackGetTransitionRunning(x.GoPointer()) | |
| 363 | 347 | return cret | |
| 364 | 348 | } | |
| @@ -367,8 +351,6 @@ var xViewStackGetVhomogeneous func(uintptr) bool | |||
| 367 | 351 | ||
| 368 | 352 | // Gets whether @self is vertically homogeneous. | |
| 369 | 353 | func (x *ViewStack) GetVhomogeneous() bool { | |
| 370 | - | core.LazyRegister(&xViewStackGetVhomogeneous, "ADW", "adw_view_stack_get_vhomogeneous", false) | |
| 371 | - | ||
| 372 | 354 | cret := xViewStackGetVhomogeneous(x.GoPointer()) | |
| 373 | 355 | return cret | |
| 374 | 356 | } | |
| @@ -377,7 +359,6 @@ var xViewStackGetVisibleChild func(uintptr) uintptr | |||
| 377 | 359 | ||
| 378 | 360 | // Gets the currently visible child of @self. | |
| 379 | 361 | func (x *ViewStack) GetVisibleChild() *gtk.Widget { | |
| 380 | - | core.LazyRegister(&xViewStackGetVisibleChild, "ADW", "adw_view_stack_get_visible_child", false) | |
| 381 | 362 | var cls *gtk.Widget | |
| 382 | 363 | ||
| 383 | 364 | cret := xViewStackGetVisibleChild(x.GoPointer()) | |
| @@ -395,8 +376,6 @@ var xViewStackGetVisibleChildName func(uintptr) string | |||
| 395 | 376 | ||
| 396 | 377 | // Returns the name of the currently visible child of @self. | |
| 397 | 378 | func (x *ViewStack) GetVisibleChildName() string { | |
| 398 | - | core.LazyRegister(&xViewStackGetVisibleChildName, "ADW", "adw_view_stack_get_visible_child_name", false) | |
| 399 | - | ||
| 400 | 379 | cret := xViewStackGetVisibleChildName(x.GoPointer()) | |
| 401 | 380 | return cret | |
| 402 | 381 | } | |
| @@ -405,8 +384,6 @@ var xViewStackRemove func(uintptr, uintptr) | |||
| 405 | 384 | ||
| 406 | 385 | // Removes a child widget from @self. | |
| 407 | 386 | func (x *ViewStack) Remove(ChildVar *gtk.Widget) { | |
| 408 | - | core.LazyRegister(&xViewStackRemove, "ADW", "adw_view_stack_remove", false) | |
| 409 | - | ||
| 410 | 387 | xViewStackRemove(x.GoPointer(), ChildVar.GoPointer()) | |
| 411 | 388 | } | |
| 412 | 389 | ||
| @@ -414,8 +391,6 @@ var xViewStackSetEnableTransitions func(uintptr, bool) | |||
| 414 | 391 | ||
| 415 | 392 | // Sets whether @self uses a crossfade transition between pages. | |
| 416 | 393 | func (x *ViewStack) SetEnableTransitions(EnableTransitionsVar bool) { | |
| 417 | - | core.LazyRegister(&xViewStackSetEnableTransitions, "ADW", "adw_view_stack_set_enable_transitions", false) | |
| 418 | - | ||
| 419 | 394 | xViewStackSetEnableTransitions(x.GoPointer(), EnableTransitionsVar) | |
| 420 | 395 | } | |
| 421 | 396 | ||
| @@ -429,8 +404,6 @@ var xViewStackSetHhomogeneous func(uintptr, bool) | |||
| 429 | 404 | // If it's `FALSE`, the stack may change width when a different child becomes | |
| 430 | 405 | // visible. | |
| 431 | 406 | func (x *ViewStack) SetHhomogeneous(HhomogeneousVar bool) { | |
| 432 | - | core.LazyRegister(&xViewStackSetHhomogeneous, "ADW", "adw_view_stack_set_hhomogeneous", false) | |
| 433 | - | ||
| 434 | 407 | xViewStackSetHhomogeneous(x.GoPointer(), HhomogeneousVar) | |
| 435 | 408 | } | |
| 436 | 409 | ||
| @@ -440,8 +413,6 @@ var xViewStackSetTransitionDuration func(uintptr, uint) | |||
| 440 | 413 | // | |
| 441 | 414 | // Only used when [property@ViewStack:enable-transitions] is set to `TRUE`. | |
| 442 | 415 | func (x *ViewStack) SetTransitionDuration(DurationVar uint) { | |
| 443 | - | core.LazyRegister(&xViewStackSetTransitionDuration, "ADW", "adw_view_stack_set_transition_duration", false) | |
| 444 | - | ||
| 445 | 416 | xViewStackSetTransitionDuration(x.GoPointer(), DurationVar) | |
| 446 | 417 | } | |
| 447 | 418 | ||
| @@ -455,8 +426,6 @@ var xViewStackSetVhomogeneous func(uintptr, bool) | |||
| 455 | 426 | // If it's `FALSE`, the stack may change height when a different child becomes | |
| 456 | 427 | // visible. | |
| 457 | 428 | func (x *ViewStack) SetVhomogeneous(VhomogeneousVar bool) { | |
| 458 | - | core.LazyRegister(&xViewStackSetVhomogeneous, "ADW", "adw_view_stack_set_vhomogeneous", false) | |
| 459 | - | ||
| 460 | 429 | xViewStackSetVhomogeneous(x.GoPointer(), VhomogeneousVar) | |
| 461 | 430 | } | |
| 462 | 431 | ||
| @@ -464,8 +433,6 @@ var xViewStackSetVisibleChild func(uintptr, uintptr) | |||
| 464 | 433 | ||
| 465 | 434 | // Makes @child the visible child of @self. | |
| 466 | 435 | func (x *ViewStack) SetVisibleChild(ChildVar *gtk.Widget) { | |
| 467 | - | core.LazyRegister(&xViewStackSetVisibleChild, "ADW", "adw_view_stack_set_visible_child", false) | |
| 468 | - | ||
| 469 | 436 | xViewStackSetVisibleChild(x.GoPointer(), ChildVar.GoPointer()) | |
| 470 | 437 | } | |
| 471 | 438 | ||
| @@ -475,8 +442,6 @@ var xViewStackSetVisibleChildName func(uintptr, string) | |||
| 475 | 442 | // | |
| 476 | 443 | // See [property@ViewStack:visible-child]. | |
| 477 | 444 | func (x *ViewStack) SetVisibleChildName(NameVar string) { | |
| 478 | - | core.LazyRegister(&xViewStackSetVisibleChildName, "ADW", "adw_view_stack_set_visible_child_name", false) | |
| 479 | - | ||
| 480 | 445 | xViewStackSetVisibleChildName(x.GoPointer(), NameVar) | |
| 481 | 446 | } | |
| 482 | 447 | ||
| @@ -896,7 +861,6 @@ type ViewStackPage struct { | |||
| 896 | 861 | var xViewStackPageGLibType func() types.GType | |
| 897 | 862 | ||
| 898 | 863 | func ViewStackPageGLibType() types.GType { | |
| 899 | - | core.LazyRegister(&xViewStackPageGLibType, "ADW", "adw_view_stack_page_get_type", false) | |
| 900 | 864 | return xViewStackPageGLibType() | |
| 901 | 865 | } | |
| 902 | 866 | ||
| @@ -910,8 +874,6 @@ var xViewStackPageGetBadgeNumber func(uintptr) uint | |||
| 910 | 874 | ||
| 911 | 875 | // Gets the badge number for this page. | |
| 912 | 876 | func (x *ViewStackPage) GetBadgeNumber() uint { | |
| 913 | - | core.LazyRegister(&xViewStackPageGetBadgeNumber, "ADW", "adw_view_stack_page_get_badge_number", false) | |
| 914 | - | ||
| 915 | 877 | cret := xViewStackPageGetBadgeNumber(x.GoPointer()) | |
| 916 | 878 | return cret | |
| 917 | 879 | } | |
| @@ -920,7 +882,6 @@ var xViewStackPageGetChild func(uintptr) uintptr | |||
| 920 | 882 | ||
| 921 | 883 | // Gets the stack child to which @self belongs. | |
| 922 | 884 | func (x *ViewStackPage) GetChild() *gtk.Widget { | |
| 923 | - | core.LazyRegister(&xViewStackPageGetChild, "ADW", "adw_view_stack_page_get_child", false) | |
| 924 | 885 | var cls *gtk.Widget | |
| 925 | 886 | ||
| 926 | 887 | cret := xViewStackPageGetChild(x.GoPointer()) | |
| @@ -938,8 +899,6 @@ var xViewStackPageGetIconName func(uintptr) string | |||
| 938 | 899 | ||
| 939 | 900 | // Gets the icon name of the page. | |
| 940 | 901 | func (x *ViewStackPage) GetIconName() string { | |
| 941 | - | core.LazyRegister(&xViewStackPageGetIconName, "ADW", "adw_view_stack_page_get_icon_name", false) | |
| 942 | - | ||
| 943 | 902 | cret := xViewStackPageGetIconName(x.GoPointer()) | |
| 944 | 903 | return cret | |
| 945 | 904 | } | |
| @@ -948,8 +907,6 @@ var xViewStackPageGetName func(uintptr) string | |||
| 948 | 907 | ||
| 949 | 908 | // Gets the name of the page. | |
| 950 | 909 | func (x *ViewStackPage) GetName() string { | |
| 951 | - | core.LazyRegister(&xViewStackPageGetName, "ADW", "adw_view_stack_page_get_name", false) | |
| 952 | - | ||
| 953 | 910 | cret := xViewStackPageGetName(x.GoPointer()) | |
| 954 | 911 | return cret | |
| 955 | 912 | } | |
| @@ -958,8 +915,6 @@ var xViewStackPageGetNeedsAttention func(uintptr) bool | |||
| 958 | 915 | ||
| 959 | 916 | // Gets whether the page requires the user attention. | |
| 960 | 917 | func (x *ViewStackPage) GetNeedsAttention() bool { | |
| 961 | - | core.LazyRegister(&xViewStackPageGetNeedsAttention, "ADW", "adw_view_stack_page_get_needs_attention", false) | |
| 962 | - | ||
| 963 | 918 | cret := xViewStackPageGetNeedsAttention(x.GoPointer()) | |
| 964 | 919 | return cret | |
| 965 | 920 | } | |
| @@ -968,8 +923,6 @@ var xViewStackPageGetSectionTitle func(uintptr) string | |||
| 968 | 923 | ||
| 969 | 924 | // Gets the section title for @self. | |
| 970 | 925 | func (x *ViewStackPage) GetSectionTitle() string { | |
| 971 | - | core.LazyRegister(&xViewStackPageGetSectionTitle, "ADW", "adw_view_stack_page_get_section_title", false) | |
| 972 | - | ||
| 973 | 926 | cret := xViewStackPageGetSectionTitle(x.GoPointer()) | |
| 974 | 927 | return cret | |
| 975 | 928 | } | |
| @@ -978,8 +931,6 @@ var xViewStackPageGetStartsSection func(uintptr) bool | |||
| 978 | 931 | ||
| 979 | 932 | // Gets whether @self starts a section. | |
| 980 | 933 | func (x *ViewStackPage) GetStartsSection() bool { | |
| 981 | - | core.LazyRegister(&xViewStackPageGetStartsSection, "ADW", "adw_view_stack_page_get_starts_section", false) | |
| 982 | - | ||
| 983 | 934 | cret := xViewStackPageGetStartsSection(x.GoPointer()) | |
| 984 | 935 | return cret | |
| 985 | 936 | } | |
| @@ -988,8 +939,6 @@ var xViewStackPageGetTitle func(uintptr) string | |||
| 988 | 939 | ||
| 989 | 940 | // Gets the page title. | |
| 990 | 941 | func (x *ViewStackPage) GetTitle() string { | |
| 991 | - | core.LazyRegister(&xViewStackPageGetTitle, "ADW", "adw_view_stack_page_get_title", false) | |
| 992 | - | ||
| 993 | 942 | cret := xViewStackPageGetTitle(x.GoPointer()) | |
| 994 | 943 | return cret | |
| 995 | 944 | } | |
| @@ -998,8 +947,6 @@ var xViewStackPageGetUseUnderline func(uintptr) bool | |||
| 998 | 947 | ||
| 999 | 948 | // Gets whether underlines in the page title indicate mnemonics. | |
| 1000 | 949 | func (x *ViewStackPage) GetUseUnderline() bool { | |
| 1001 | - | core.LazyRegister(&xViewStackPageGetUseUnderline, "ADW", "adw_view_stack_page_get_use_underline", false) | |
| 1002 | - | ||
| 1003 | 950 | cret := xViewStackPageGetUseUnderline(x.GoPointer()) | |
| 1004 | 951 | return cret | |
| 1005 | 952 | } | |
| @@ -1011,8 +958,6 @@ var xViewStackPageGetVisible func(uintptr) bool | |||
| 1011 | 958 | // This is independent from the [property@Gtk.Widget:visible] | |
| 1012 | 959 | // property of its widget. | |
| 1013 | 960 | func (x *ViewStackPage) GetVisible() bool { | |
| 1014 | - | core.LazyRegister(&xViewStackPageGetVisible, "ADW", "adw_view_stack_page_get_visible", false) | |
| 1015 | - | ||
| 1016 | 961 | cret := xViewStackPageGetVisible(x.GoPointer()) | |
| 1017 | 962 | return cret | |
| 1018 | 963 | } | |
| @@ -1026,8 +971,6 @@ var xViewStackPageSetBadgeNumber func(uintptr, uint) | |||
| 1026 | 971 | // | |
| 1027 | 972 | // It can be used together with [property@ViewStack{age}:needs-attention]. | |
| 1028 | 973 | func (x *ViewStackPage) SetBadgeNumber(BadgeNumberVar uint) { | |
| 1029 | - | core.LazyRegister(&xViewStackPageSetBadgeNumber, "ADW", "adw_view_stack_page_set_badge_number", false) | |
| 1030 | - | ||
| 1031 | 974 | xViewStackPageSetBadgeNumber(x.GoPointer(), BadgeNumberVar) | |
| 1032 | 975 | } | |
| 1033 | 976 | ||
| @@ -1035,8 +978,6 @@ var xViewStackPageSetIconName func(uintptr, uintptr) | |||
| 1035 | 978 | ||
| 1036 | 979 | // Sets the icon name of the page. | |
| 1037 | 980 | func (x *ViewStackPage) SetIconName(IconNameVar *string) { | |
| 1038 | - | core.LazyRegister(&xViewStackPageSetIconName, "ADW", "adw_view_stack_page_set_icon_name", false) | |
| 1039 | - | ||
| 1040 | 981 | IconNameVarPtr := core.GStrdupNullable(IconNameVar) | |
| 1041 | 982 | defer core.GFreeNullable(IconNameVarPtr) | |
| 1042 | 983 | ||
| @@ -1047,8 +988,6 @@ var xViewStackPageSetName func(uintptr, uintptr) | |||
| 1047 | 988 | ||
| 1048 | 989 | // Sets the name of the page. | |
| 1049 | 990 | func (x *ViewStackPage) SetName(NameVar *string) { | |
| 1050 | - | core.LazyRegister(&xViewStackPageSetName, "ADW", "adw_view_stack_page_set_name", false) | |
| 1051 | - | ||
| 1052 | 991 | NameVarPtr := core.GStrdupNullable(NameVar) | |
| 1053 | 992 | defer core.GFreeNullable(NameVarPtr) | |
| 1054 | 993 | ||
| @@ -1061,8 +1000,6 @@ var xViewStackPageSetNeedsAttention func(uintptr, bool) | |||
| 1061 | 1000 | // | |
| 1062 | 1001 | // [class@ViewSwitcher] will display it as a dot next to the page icon. | |
| 1063 | 1002 | func (x *ViewStackPage) SetNeedsAttention(NeedsAttentionVar bool) { | |
| 1064 | - | core.LazyRegister(&xViewStackPageSetNeedsAttention, "ADW", "adw_view_stack_page_set_needs_attention", false) | |
| 1065 | - | ||
| 1066 | 1003 | xViewStackPageSetNeedsAttention(x.GoPointer(), NeedsAttentionVar) | |
| 1067 | 1004 | } | |
| 1068 | 1005 | ||
| @@ -1072,8 +1009,6 @@ var xViewStackPageSetSectionTitle func(uintptr, uintptr) | |||
| 1072 | 1009 | // | |
| 1073 | 1010 | // Does nothing unless [property@ViewStackPage:starts-section] is set. | |
| 1074 | 1011 | func (x *ViewStackPage) SetSectionTitle(SectionTitleVar *string) { | |
| 1075 | - | core.LazyRegister(&xViewStackPageSetSectionTitle, "ADW", "adw_view_stack_page_set_section_title", false) | |
| 1076 | - | ||
| 1077 | 1012 | SectionTitleVarPtr := core.GStrdupNullable(SectionTitleVar) | |
| 1078 | 1013 | defer core.GFreeNullable(SectionTitleVarPtr) | |
| 1079 | 1014 | ||
| @@ -1090,8 +1025,6 @@ var xViewStackPageSetStartsSection func(uintptr, bool) | |||
| 1090 | 1025 | // If [property@ViewStackPage:section-title] is set, it should be used as a | |
| 1091 | 1026 | // title for the section. | |
| 1092 | 1027 | func (x *ViewStackPage) SetStartsSection(StartsSectionVar bool) { | |
| 1093 | - | core.LazyRegister(&xViewStackPageSetStartsSection, "ADW", "adw_view_stack_page_set_starts_section", false) | |
| 1094 | - | ||
| 1095 | 1028 | xViewStackPageSetStartsSection(x.GoPointer(), StartsSectionVar) | |
| 1096 | 1029 | } | |
| 1097 | 1030 | ||
| @@ -1099,8 +1032,6 @@ var xViewStackPageSetTitle func(uintptr, uintptr) | |||
| 1099 | 1032 | ||
| 1100 | 1033 | // Sets the page title. | |
| 1101 | 1034 | func (x *ViewStackPage) SetTitle(TitleVar *string) { | |
| 1102 | - | core.LazyRegister(&xViewStackPageSetTitle, "ADW", "adw_view_stack_page_set_title", false) | |
| 1103 | - | ||
| 1104 | 1035 | TitleVarPtr := core.GStrdupNullable(TitleVar) | |
| 1105 | 1036 | defer core.GFreeNullable(TitleVarPtr) | |
| 1106 | 1037 | ||
| @@ -1111,8 +1042,6 @@ var xViewStackPageSetUseUnderline func(uintptr, bool) | |||
| 1111 | 1042 | ||
| 1112 | 1043 | // Sets whether underlines in the page title indicate mnemonics. | |
| 1113 | 1044 | func (x *ViewStackPage) SetUseUnderline(UseUnderlineVar bool) { | |
| 1114 | - | core.LazyRegister(&xViewStackPageSetUseUnderline, "ADW", "adw_view_stack_page_set_use_underline", false) | |
| 1115 | - | ||
| 1116 | 1045 | xViewStackPageSetUseUnderline(x.GoPointer(), UseUnderlineVar) | |
| 1117 | 1046 | } | |
| 1118 | 1047 | ||
| @@ -1123,8 +1052,6 @@ var xViewStackPageSetVisible func(uintptr, bool) | |||
| 1123 | 1052 | // This is independent from the [property@Gtk.Widget:visible] property of | |
| 1124 | 1053 | // [property@ViewStackPage:child]. | |
| 1125 | 1054 | func (x *ViewStackPage) SetVisible(VisibleVar bool) { | |
| 1126 | - | core.LazyRegister(&xViewStackPageSetVisible, "ADW", "adw_view_stack_page_set_visible", false) | |
| 1127 | - | ||
| 1128 | 1055 | xViewStackPageSetVisible(x.GoPointer(), VisibleVar) | |
| 1129 | 1056 | } | |
| 1130 | 1057 | ||
| @@ -1589,7 +1516,6 @@ type ViewStackPages struct { | |||
| 1589 | 1516 | var xViewStackPagesGLibType func() types.GType | |
| 1590 | 1517 | ||
| 1591 | 1518 | func ViewStackPagesGLibType() types.GType { | |
| 1592 | - | core.LazyRegister(&xViewStackPagesGLibType, "ADW", "adw_view_stack_pages_get_type", false) | |
| 1593 | 1519 | return xViewStackPagesGLibType() | |
| 1594 | 1520 | } | |
| 1595 | 1521 | ||
| @@ -1607,7 +1533,6 @@ var xViewStackPagesGetSelectedPage func(uintptr) uintptr | |||
| 1607 | 1533 | // | |
| 1608 | 1534 | // Returns `NULL` if there's no selected page. | |
| 1609 | 1535 | func (x *ViewStackPages) GetSelectedPage() *ViewStackPage { | |
| 1610 | - | core.LazyRegister(&xViewStackPagesGetSelectedPage, "ADW", "adw_view_stack_pages_get_selected_page", false) | |
| 1611 | 1536 | var cls *ViewStackPage | |
| 1612 | 1537 | ||
| 1613 | 1538 | cret := xViewStackPagesGetSelectedPage(x.GoPointer()) | |
| @@ -1627,8 +1552,6 @@ var xViewStackPagesSetSelectedPage func(uintptr, uintptr) | |||
| 1627 | 1552 | // | |
| 1628 | 1553 | // See [property@ViewStack:visible-child]. | |
| 1629 | 1554 | func (x *ViewStackPages) SetSelectedPage(PageVar *ViewStackPage) { | |
| 1630 | - | core.LazyRegister(&xViewStackPagesSetSelectedPage, "ADW", "adw_view_stack_pages_set_selected_page", false) | |
| 1631 | - | ||
| 1632 | 1555 | xViewStackPagesSetSelectedPage(x.GoPointer(), PageVar.GoPointer()) | |
| 1633 | 1556 | } | |
| 1634 | 1557 | ||
| @@ -1887,4 +1810,65 @@ func (x *ViewStackPages) UnselectRange(PositionVar uint, NItemsVar uint) bool { | |||
| 1887 | 1810 | func init() { | |
| 1888 | 1811 | core.SetPackageName("ADW", "libadwaita-1") | |
| 1889 | 1812 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 1813 | + | var libs []uintptr | |
| 1814 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 1815 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1816 | + | if err != nil { | |
| 1817 | + | panic(err) | |
| 1818 | + | } | |
| 1819 | + | libs = append(libs, lib) | |
| 1820 | + | } | |
| 1821 | + | ||
| 1822 | + | core.PuregoSafeRegister(&xViewStackGLibType, libs, "adw_view_stack_get_type") | |
| 1823 | + | ||
| 1824 | + | core.PuregoSafeRegister(&xNewViewStack, libs, "adw_view_stack_new") | |
| 1825 | + | ||
| 1826 | + | core.PuregoSafeRegister(&xViewStackAdd, libs, "adw_view_stack_add") | |
| 1827 | + | core.PuregoSafeRegister(&xViewStackAddNamed, libs, "adw_view_stack_add_named") | |
| 1828 | + | core.PuregoSafeRegister(&xViewStackAddTitled, libs, "adw_view_stack_add_titled") | |
| 1829 | + | core.PuregoSafeRegister(&xViewStackAddTitledWithIcon, libs, "adw_view_stack_add_titled_with_icon") | |
| 1830 | + | core.PuregoSafeRegister(&xViewStackGetChildByName, libs, "adw_view_stack_get_child_by_name") | |
| 1831 | + | core.PuregoSafeRegister(&xViewStackGetEnableTransitions, libs, "adw_view_stack_get_enable_transitions") | |
| 1832 | + | core.PuregoSafeRegister(&xViewStackGetHhomogeneous, libs, "adw_view_stack_get_hhomogeneous") | |
| 1833 | + | core.PuregoSafeRegister(&xViewStackGetPage, libs, "adw_view_stack_get_page") | |
| 1834 | + | core.PuregoSafeRegister(&xViewStackGetPages, libs, "adw_view_stack_get_pages") | |
| 1835 | + | core.PuregoSafeRegister(&xViewStackGetTransitionDuration, libs, "adw_view_stack_get_transition_duration") | |
| 1836 | + | core.PuregoSafeRegister(&xViewStackGetTransitionRunning, libs, "adw_view_stack_get_transition_running") | |
| 1837 | + | core.PuregoSafeRegister(&xViewStackGetVhomogeneous, libs, "adw_view_stack_get_vhomogeneous") | |
| 1838 | + | core.PuregoSafeRegister(&xViewStackGetVisibleChild, libs, "adw_view_stack_get_visible_child") | |
| 1839 | + | core.PuregoSafeRegister(&xViewStackGetVisibleChildName, libs, "adw_view_stack_get_visible_child_name") | |
| 1840 | + | core.PuregoSafeRegister(&xViewStackRemove, libs, "adw_view_stack_remove") | |
| 1841 | + | core.PuregoSafeRegister(&xViewStackSetEnableTransitions, libs, "adw_view_stack_set_enable_transitions") | |
| 1842 | + | core.PuregoSafeRegister(&xViewStackSetHhomogeneous, libs, "adw_view_stack_set_hhomogeneous") | |
| 1843 | + | core.PuregoSafeRegister(&xViewStackSetTransitionDuration, libs, "adw_view_stack_set_transition_duration") | |
| 1844 | + | core.PuregoSafeRegister(&xViewStackSetVhomogeneous, libs, "adw_view_stack_set_vhomogeneous") | |
| 1845 | + | core.PuregoSafeRegister(&xViewStackSetVisibleChild, libs, "adw_view_stack_set_visible_child") | |
| 1846 | + | core.PuregoSafeRegister(&xViewStackSetVisibleChildName, libs, "adw_view_stack_set_visible_child_name") | |
| 1847 | + | ||
| 1848 | + | core.PuregoSafeRegister(&xViewStackPageGLibType, libs, "adw_view_stack_page_get_type") | |
| 1849 | + | ||
| 1850 | + | core.PuregoSafeRegister(&xViewStackPageGetBadgeNumber, libs, "adw_view_stack_page_get_badge_number") | |
| 1851 | + | core.PuregoSafeRegister(&xViewStackPageGetChild, libs, "adw_view_stack_page_get_child") | |
| 1852 | + | core.PuregoSafeRegister(&xViewStackPageGetIconName, libs, "adw_view_stack_page_get_icon_name") | |
| 1853 | + | core.PuregoSafeRegister(&xViewStackPageGetName, libs, "adw_view_stack_page_get_name") | |
| 1854 | + | core.PuregoSafeRegister(&xViewStackPageGetNeedsAttention, libs, "adw_view_stack_page_get_needs_attention") | |
| 1855 | + | core.PuregoSafeRegister(&xViewStackPageGetSectionTitle, libs, "adw_view_stack_page_get_section_title") | |
| 1856 | + | core.PuregoSafeRegister(&xViewStackPageGetStartsSection, libs, "adw_view_stack_page_get_starts_section") | |
| 1857 | + | core.PuregoSafeRegister(&xViewStackPageGetTitle, libs, "adw_view_stack_page_get_title") | |
| 1858 | + | core.PuregoSafeRegister(&xViewStackPageGetUseUnderline, libs, "adw_view_stack_page_get_use_underline") | |
| 1859 | + | core.PuregoSafeRegister(&xViewStackPageGetVisible, libs, "adw_view_stack_page_get_visible") | |
| 1860 | + | core.PuregoSafeRegister(&xViewStackPageSetBadgeNumber, libs, "adw_view_stack_page_set_badge_number") | |
| 1861 | + | core.PuregoSafeRegister(&xViewStackPageSetIconName, libs, "adw_view_stack_page_set_icon_name") | |
| 1862 | + | core.PuregoSafeRegister(&xViewStackPageSetName, libs, "adw_view_stack_page_set_name") | |
| 1863 | + | core.PuregoSafeRegister(&xViewStackPageSetNeedsAttention, libs, "adw_view_stack_page_set_needs_attention") | |
| 1864 | + | core.PuregoSafeRegister(&xViewStackPageSetSectionTitle, libs, "adw_view_stack_page_set_section_title") | |
| 1865 | + | core.PuregoSafeRegister(&xViewStackPageSetStartsSection, libs, "adw_view_stack_page_set_starts_section") | |
| 1866 | + | core.PuregoSafeRegister(&xViewStackPageSetTitle, libs, "adw_view_stack_page_set_title") | |
| 1867 | + | core.PuregoSafeRegister(&xViewStackPageSetUseUnderline, libs, "adw_view_stack_page_set_use_underline") | |
| 1868 | + | core.PuregoSafeRegister(&xViewStackPageSetVisible, libs, "adw_view_stack_page_set_visible") | |
| 1869 | + | ||
| 1870 | + | core.PuregoSafeRegister(&xViewStackPagesGLibType, libs, "adw_view_stack_pages_get_type") | |
| 1871 | + | ||
| 1872 | + | core.PuregoSafeRegister(&xViewStackPagesGetSelectedPage, libs, "adw_view_stack_pages_get_selected_page") | |
| 1873 | + | core.PuregoSafeRegister(&xViewStackPagesSetSelectedPage, libs, "adw_view_stack_pages_set_selected_page") | |
| 1890 | 1874 | } | |
| @@ -5,6 +5,7 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | + | "github.com/bnema/purego" | |||
| 8 | "github.com/bnema/puregotk/pkg/core" | 9 | "github.com/bnema/puregotk/pkg/core" | ||
| 9 | "github.com/bnema/puregotk/v4/gio" | 10 | "github.com/bnema/puregotk/v4/gio" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject" | 11 | "github.com/bnema/puregotk/v4/gobject" | ||
| @@ -137,7 +138,6 @@ type ViewStack struct { | |||||
| 137 | var xViewStackGLibType func() types.GType | 138 | var xViewStackGLibType func() types.GType | ||
| 138 | 139 | ||||
| 139 | func ViewStackGLibType() types.GType { | 140 | func ViewStackGLibType() types.GType { | ||
| 140 | - | core.LazyRegister(&xViewStackGLibType, "ADW", "adw_view_stack_get_type", false) | |||
| 141 | return xViewStackGLibType() | 141 | return xViewStackGLibType() | ||
| 142 | } | 142 | } | ||
| 143 | 143 | ||||
| @@ -151,7 +151,6 @@ var xNewViewStack func() uintptr | |||||
| 151 | 151 | ||||
| 152 | // Creates a new `AdwViewStack`. | 152 | // Creates a new `AdwViewStack`. | ||
| 153 | func NewViewStack() *ViewStack { | 153 | func NewViewStack() *ViewStack { | ||
| 154 | - | core.LazyRegister(&xNewViewStack, "ADW", "adw_view_stack_new", false) | |||
| 155 | var cls *ViewStack | 154 | var cls *ViewStack | ||
| 156 | 155 | ||||
| 157 | cret := xNewViewStack() | 156 | cret := xNewViewStack() | ||
| @@ -169,7 +168,6 @@ var xViewStackAdd func(uintptr, uintptr) uintptr | |||||
| 169 | 168 | ||||
| 170 | // Adds a child to @self. | 169 | // Adds a child to @self. | ||
| 171 | func (x *ViewStack) Add(ChildVar *gtk.Widget) *ViewStackPage { | 170 | func (x *ViewStack) Add(ChildVar *gtk.Widget) *ViewStackPage { | ||
| 172 | - | core.LazyRegister(&xViewStackAdd, "ADW", "adw_view_stack_add", false) | |||
| 173 | var cls *ViewStackPage | 171 | var cls *ViewStackPage | ||
| 174 | 172 | ||||
| 175 | cret := xViewStackAdd(x.GoPointer(), ChildVar.GoPointer()) | 173 | cret := xViewStackAdd(x.GoPointer(), ChildVar.GoPointer()) | ||
| @@ -189,7 +187,6 @@ var xViewStackAddNamed func(uintptr, uintptr, uintptr) uintptr | |||||
| 189 | // | 187 | // | ||
| 190 | // The child is identified by the @name. | 188 | // The child is identified by the @name. | ||
| 191 | func (x *ViewStack) AddNamed(ChildVar *gtk.Widget, NameVar *string) *ViewStackPage { | 189 | func (x *ViewStack) AddNamed(ChildVar *gtk.Widget, NameVar *string) *ViewStackPage { | ||
| 192 | - | core.LazyRegister(&xViewStackAddNamed, "ADW", "adw_view_stack_add_named", false) | |||
| 193 | var cls *ViewStackPage | 190 | var cls *ViewStackPage | ||
| 194 | 191 | ||||
| 195 | NameVarPtr := core.GStrdupNullable(NameVar) | 192 | NameVarPtr := core.GStrdupNullable(NameVar) | ||
| @@ -213,7 +210,6 @@ var xViewStackAddTitled func(uintptr, uintptr, uintptr, string) uintptr | |||||
| 213 | // The child is identified by the @name. The @title will be used by | 210 | // The child is identified by the @name. The @title will be used by | ||
| 214 | // [class@ViewSwitcher] to represent @child, so it should be short. | 211 | // [class@ViewSwitcher] to represent @child, so it should be short. | ||
| 215 | func (x *ViewStack) AddTitled(ChildVar *gtk.Widget, NameVar *string, TitleVar string) *ViewStackPage { | 212 | func (x *ViewStack) AddTitled(ChildVar *gtk.Widget, NameVar *string, TitleVar string) *ViewStackPage { | ||
| 216 | - | core.LazyRegister(&xViewStackAddTitled, "ADW", "adw_view_stack_add_titled", false) | |||
| 217 | var cls *ViewStackPage | 213 | var cls *ViewStackPage | ||
| 218 | 214 | ||||
| 219 | NameVarPtr := core.GStrdupNullable(NameVar) | 215 | NameVarPtr := core.GStrdupNullable(NameVar) | ||
| @@ -237,7 +233,6 @@ var xViewStackAddTitledWithIcon func(uintptr, uintptr, uintptr, string, string) | |||||
| 237 | // The child is identified by the @name. The @title and @icon_name will be used | 233 | // The child is identified by the @name. The @title and @icon_name will be used | ||
| 238 | // by [class@ViewSwitcher] to represent @child. | 234 | // by [class@ViewSwitcher] to represent @child. | ||
| 239 | func (x *ViewStack) AddTitledWithIcon(ChildVar *gtk.Widget, NameVar *string, TitleVar string, IconNameVar string) *ViewStackPage { | 235 | func (x *ViewStack) AddTitledWithIcon(ChildVar *gtk.Widget, NameVar *string, TitleVar string, IconNameVar string) *ViewStackPage { | ||
| 240 | - | core.LazyRegister(&xViewStackAddTitledWithIcon, "ADW", "adw_view_stack_add_titled_with_icon", false) | |||
| 241 | var cls *ViewStackPage | 236 | var cls *ViewStackPage | ||
| 242 | 237 | ||||
| 243 | NameVarPtr := core.GStrdupNullable(NameVar) | 238 | NameVarPtr := core.GStrdupNullable(NameVar) | ||
| @@ -258,7 +253,6 @@ var xViewStackGetChildByName func(uintptr, string) uintptr | |||||
| 258 | 253 | ||||
| 259 | // Finds the child with @name in @self. | 254 | // Finds the child with @name in @self. | ||
| 260 | func (x *ViewStack) GetChildByName(NameVar string) *gtk.Widget { | 255 | func (x *ViewStack) GetChildByName(NameVar string) *gtk.Widget { | ||
| 261 | - | core.LazyRegister(&xViewStackGetChildByName, "ADW", "adw_view_stack_get_child_by_name", false) | |||
| 262 | var cls *gtk.Widget | 256 | var cls *gtk.Widget | ||
| 263 | 257 | ||||
| 264 | cret := xViewStackGetChildByName(x.GoPointer(), NameVar) | 258 | cret := xViewStackGetChildByName(x.GoPointer(), NameVar) | ||
| @@ -280,8 +274,6 @@ var xViewStackGetEnableTransitions func(uintptr) bool | |||||
| 280 | // [property@ViewStack:transition-running] to know when the transition is | 274 | // [property@ViewStack:transition-running] to know when the transition is | ||
| 281 | // running. | 275 | // running. | ||
| 282 | func (x *ViewStack) GetEnableTransitions() bool { | 276 | func (x *ViewStack) GetEnableTransitions() bool { | ||
| 283 | - | core.LazyRegister(&xViewStackGetEnableTransitions, "ADW", "adw_view_stack_get_enable_transitions", false) | |||
| 284 | - | ||||
| 285 | cret := xViewStackGetEnableTransitions(x.GoPointer()) | 277 | cret := xViewStackGetEnableTransitions(x.GoPointer()) | ||
| 286 | return cret | 278 | return cret | ||
| 287 | } | 279 | } | ||
| @@ -290,8 +282,6 @@ var xViewStackGetHhomogeneous func(uintptr) bool | |||||
| 290 | 282 | ||||
| 291 | // Gets whether @self is horizontally homogeneous. | 283 | // Gets whether @self is horizontally homogeneous. | ||
| 292 | func (x *ViewStack) GetHhomogeneous() bool { | 284 | func (x *ViewStack) GetHhomogeneous() bool { | ||
| 293 | - | core.LazyRegister(&xViewStackGetHhomogeneous, "ADW", "adw_view_stack_get_hhomogeneous", false) | |||
| 294 | - | ||||
| 295 | cret := xViewStackGetHhomogeneous(x.GoPointer()) | 285 | cret := xViewStackGetHhomogeneous(x.GoPointer()) | ||
| 296 | return cret | 286 | return cret | ||
| 297 | } | 287 | } | ||
| @@ -300,7 +290,6 @@ var xViewStackGetPage func(uintptr, uintptr) uintptr | |||||
| 300 | 290 | ||||
| 301 | // Gets the [class@ViewStackPage] object for @child. | 291 | // Gets the [class@ViewStackPage] object for @child. | ||
| 302 | func (x *ViewStack) GetPage(ChildVar *gtk.Widget) *ViewStackPage { | 292 | func (x *ViewStack) GetPage(ChildVar *gtk.Widget) *ViewStackPage { | ||
| 303 | - | core.LazyRegister(&xViewStackGetPage, "ADW", "adw_view_stack_get_page", false) | |||
| 304 | var cls *ViewStackPage | 293 | var cls *ViewStackPage | ||
| 305 | 294 | ||||
| 306 | cret := xViewStackGetPage(x.GoPointer(), ChildVar.GoPointer()) | 295 | cret := xViewStackGetPage(x.GoPointer(), ChildVar.GoPointer()) | ||
| @@ -326,7 +315,6 @@ var xViewStackGetPages func(uintptr) uintptr | |||||
| 326 | // The model also implements [iface@Gtk.SelectionModel] and can be used to track | 315 | // The model also implements [iface@Gtk.SelectionModel] and can be used to track | ||
| 327 | // and change the visible page. | 316 | // and change the visible page. | ||
| 328 | func (x *ViewStack) GetPages() *gtk.SelectionModelBase { | 317 | func (x *ViewStack) GetPages() *gtk.SelectionModelBase { | ||
| 329 | - | core.LazyRegister(&xViewStackGetPages, "ADW", "adw_view_stack_get_pages", false) | |||
| 330 | var cls *gtk.SelectionModelBase | 318 | var cls *gtk.SelectionModelBase | ||
| 331 | 319 | ||||
| 332 | cret := xViewStackGetPages(x.GoPointer()) | 320 | cret := xViewStackGetPages(x.GoPointer()) | ||
| @@ -343,8 +331,6 @@ var xViewStackGetTransitionDuration func(uintptr) uint | |||||
| 343 | 331 | ||||
| 344 | // Gets the transition animation duration for @self. | 332 | // Gets the transition animation duration for @self. | ||
| 345 | func (x *ViewStack) GetTransitionDuration() uint { | 333 | func (x *ViewStack) GetTransitionDuration() uint { | ||
| 346 | - | core.LazyRegister(&xViewStackGetTransitionDuration, "ADW", "adw_view_stack_get_transition_duration", false) | |||
| 347 | - | ||||
| 348 | cret := xViewStackGetTransitionDuration(x.GoPointer()) | 334 | cret := xViewStackGetTransitionDuration(x.GoPointer()) | ||
| 349 | return cret | 335 | return cret | ||
| 350 | } | 336 | } | ||
| @@ -357,8 +343,6 @@ var xViewStackGetTransitionRunning func(uintptr) bool | |||||
| 357 | // then immediately to `FALSE`, so it's possible to rely on its notifications | 343 | // then immediately to `FALSE`, so it's possible to rely on its notifications | ||
| 358 | // to know that a transition has happened. | 344 | // to know that a transition has happened. | ||
| 359 | func (x *ViewStack) GetTransitionRunning() bool { | 345 | func (x *ViewStack) GetTransitionRunning() bool { | ||
| 360 | - | core.LazyRegister(&xViewStackGetTransitionRunning, "ADW", "adw_view_stack_get_transition_running", false) | |||
| 361 | - | ||||
| 362 | cret := xViewStackGetTransitionRunning(x.GoPointer()) | 346 | cret := xViewStackGetTransitionRunning(x.GoPointer()) | ||
| 363 | return cret | 347 | return cret | ||
| 364 | } | 348 | } | ||
| @@ -367,8 +351,6 @@ var xViewStackGetVhomogeneous func(uintptr) bool | |||||
| 367 | 351 | ||||
| 368 | // Gets whether @self is vertically homogeneous. | 352 | // Gets whether @self is vertically homogeneous. | ||
| 369 | func (x *ViewStack) GetVhomogeneous() bool { | 353 | func (x *ViewStack) GetVhomogeneous() bool { | ||
| 370 | - | core.LazyRegister(&xViewStackGetVhomogeneous, "ADW", "adw_view_stack_get_vhomogeneous", false) | |||
| 371 | - | ||||
| 372 | cret := xViewStackGetVhomogeneous(x.GoPointer()) | 354 | cret := xViewStackGetVhomogeneous(x.GoPointer()) | ||
| 373 | return cret | 355 | return cret | ||
| 374 | } | 356 | } | ||
| @@ -377,7 +359,6 @@ var xViewStackGetVisibleChild func(uintptr) uintptr | |||||
| 377 | 359 | ||||
| 378 | // Gets the currently visible child of @self. | 360 | // Gets the currently visible child of @self. | ||
| 379 | func (x *ViewStack) GetVisibleChild() *gtk.Widget { | 361 | func (x *ViewStack) GetVisibleChild() *gtk.Widget { | ||
| 380 | - | core.LazyRegister(&xViewStackGetVisibleChild, "ADW", "adw_view_stack_get_visible_child", false) | |||
| 381 | var cls *gtk.Widget | 362 | var cls *gtk.Widget | ||
| 382 | 363 | ||||
| 383 | cret := xViewStackGetVisibleChild(x.GoPointer()) | 364 | cret := xViewStackGetVisibleChild(x.GoPointer()) | ||
| @@ -395,8 +376,6 @@ var xViewStackGetVisibleChildName func(uintptr) string | |||||
| 395 | 376 | ||||
| 396 | // Returns the name of the currently visible child of @self. | 377 | // Returns the name of the currently visible child of @self. | ||
| 397 | func (x *ViewStack) GetVisibleChildName() string { | 378 | func (x *ViewStack) GetVisibleChildName() string { | ||
| 398 | - | core.LazyRegister(&xViewStackGetVisibleChildName, "ADW", "adw_view_stack_get_visible_child_name", false) | |||
| 399 | - | ||||
| 400 | cret := xViewStackGetVisibleChildName(x.GoPointer()) | 379 | cret := xViewStackGetVisibleChildName(x.GoPointer()) | ||
| 401 | return cret | 380 | return cret | ||
| 402 | } | 381 | } | ||
| @@ -405,8 +384,6 @@ var xViewStackRemove func(uintptr, uintptr) | |||||
| 405 | 384 | ||||
| 406 | // Removes a child widget from @self. | 385 | // Removes a child widget from @self. | ||
| 407 | func (x *ViewStack) Remove(ChildVar *gtk.Widget) { | 386 | func (x *ViewStack) Remove(ChildVar *gtk.Widget) { | ||
| 408 | - | core.LazyRegister(&xViewStackRemove, "ADW", "adw_view_stack_remove", false) | |||
| 409 | - | ||||
| 410 | xViewStackRemove(x.GoPointer(), ChildVar.GoPointer()) | 387 | xViewStackRemove(x.GoPointer(), ChildVar.GoPointer()) | ||
| 411 | } | 388 | } | ||
| 412 | 389 | ||||
| @@ -414,8 +391,6 @@ var xViewStackSetEnableTransitions func(uintptr, bool) | |||||
| 414 | 391 | ||||
| 415 | // Sets whether @self uses a crossfade transition between pages. | 392 | // Sets whether @self uses a crossfade transition between pages. | ||
| 416 | func (x *ViewStack) SetEnableTransitions(EnableTransitionsVar bool) { | 393 | func (x *ViewStack) SetEnableTransitions(EnableTransitionsVar bool) { | ||
| 417 | - | core.LazyRegister(&xViewStackSetEnableTransitions, "ADW", "adw_view_stack_set_enable_transitions", false) | |||
| 418 | - | ||||
| 419 | xViewStackSetEnableTransitions(x.GoPointer(), EnableTransitionsVar) | 394 | xViewStackSetEnableTransitions(x.GoPointer(), EnableTransitionsVar) | ||
| 420 | } | 395 | } | ||
| 421 | 396 | ||||
| @@ -429,8 +404,6 @@ var xViewStackSetHhomogeneous func(uintptr, bool) | |||||
| 429 | // If it's `FALSE`, the stack may change width when a different child becomes | 404 | // If it's `FALSE`, the stack may change width when a different child becomes | ||
| 430 | // visible. | 405 | // visible. | ||
| 431 | func (x *ViewStack) SetHhomogeneous(HhomogeneousVar bool) { | 406 | func (x *ViewStack) SetHhomogeneous(HhomogeneousVar bool) { | ||
| 432 | - | core.LazyRegister(&xViewStackSetHhomogeneous, "ADW", "adw_view_stack_set_hhomogeneous", false) | |||
| 433 | - | ||||
| 434 | xViewStackSetHhomogeneous(x.GoPointer(), HhomogeneousVar) | 407 | xViewStackSetHhomogeneous(x.GoPointer(), HhomogeneousVar) | ||
| 435 | } | 408 | } | ||
| 436 | 409 | ||||
| @@ -440,8 +413,6 @@ var xViewStackSetTransitionDuration func(uintptr, uint) | |||||
| 440 | // | 413 | // | ||
| 441 | // Only used when [property@ViewStack:enable-transitions] is set to `TRUE`. | 414 | // Only used when [property@ViewStack:enable-transitions] is set to `TRUE`. | ||
| 442 | func (x *ViewStack) SetTransitionDuration(DurationVar uint) { | 415 | func (x *ViewStack) SetTransitionDuration(DurationVar uint) { | ||
| 443 | - | core.LazyRegister(&xViewStackSetTransitionDuration, "ADW", "adw_view_stack_set_transition_duration", false) | |||
| 444 | - | ||||
| 445 | xViewStackSetTransitionDuration(x.GoPointer(), DurationVar) | 416 | xViewStackSetTransitionDuration(x.GoPointer(), DurationVar) | ||
| 446 | } | 417 | } | ||
| 447 | 418 | ||||
| @@ -455,8 +426,6 @@ var xViewStackSetVhomogeneous func(uintptr, bool) | |||||
| 455 | // If it's `FALSE`, the stack may change height when a different child becomes | 426 | // If it's `FALSE`, the stack may change height when a different child becomes | ||
| 456 | // visible. | 427 | // visible. | ||
| 457 | func (x *ViewStack) SetVhomogeneous(VhomogeneousVar bool) { | 428 | func (x *ViewStack) SetVhomogeneous(VhomogeneousVar bool) { | ||
| 458 | - | core.LazyRegister(&xViewStackSetVhomogeneous, "ADW", "adw_view_stack_set_vhomogeneous", false) | |||
| 459 | - | ||||
| 460 | xViewStackSetVhomogeneous(x.GoPointer(), VhomogeneousVar) | 429 | xViewStackSetVhomogeneous(x.GoPointer(), VhomogeneousVar) | ||
| 461 | } | 430 | } | ||
| 462 | 431 | ||||
| @@ -464,8 +433,6 @@ var xViewStackSetVisibleChild func(uintptr, uintptr) | |||||
| 464 | 433 | ||||
| 465 | // Makes @child the visible child of @self. | 434 | // Makes @child the visible child of @self. | ||
| 466 | func (x *ViewStack) SetVisibleChild(ChildVar *gtk.Widget) { | 435 | func (x *ViewStack) SetVisibleChild(ChildVar *gtk.Widget) { | ||
| 467 | - | core.LazyRegister(&xViewStackSetVisibleChild, "ADW", "adw_view_stack_set_visible_child", false) | |||
| 468 | - | ||||
| 469 | xViewStackSetVisibleChild(x.GoPointer(), ChildVar.GoPointer()) | 436 | xViewStackSetVisibleChild(x.GoPointer(), ChildVar.GoPointer()) | ||
| 470 | } | 437 | } | ||
| 471 | 438 | ||||
| @@ -475,8 +442,6 @@ var xViewStackSetVisibleChildName func(uintptr, string) | |||||
| 475 | // | 442 | // | ||
| 476 | // See [property@ViewStack:visible-child]. | 443 | // See [property@ViewStack:visible-child]. | ||
| 477 | func (x *ViewStack) SetVisibleChildName(NameVar string) { | 444 | func (x *ViewStack) SetVisibleChildName(NameVar string) { | ||
| 478 | - | core.LazyRegister(&xViewStackSetVisibleChildName, "ADW", "adw_view_stack_set_visible_child_name", false) | |||
| 479 | - | ||||
| 480 | xViewStackSetVisibleChildName(x.GoPointer(), NameVar) | 445 | xViewStackSetVisibleChildName(x.GoPointer(), NameVar) | ||
| 481 | } | 446 | } | ||
| 482 | 447 | ||||
| @@ -896,7 +861,6 @@ type ViewStackPage struct { | |||||
| 896 | var xViewStackPageGLibType func() types.GType | 861 | var xViewStackPageGLibType func() types.GType | ||
| 897 | 862 | ||||
| 898 | func ViewStackPageGLibType() types.GType { | 863 | func ViewStackPageGLibType() types.GType { | ||
| 899 | - | core.LazyRegister(&xViewStackPageGLibType, "ADW", "adw_view_stack_page_get_type", false) | |||
| 900 | return xViewStackPageGLibType() | 864 | return xViewStackPageGLibType() | ||
| 901 | } | 865 | } | ||
| 902 | 866 | ||||
| @@ -910,8 +874,6 @@ var xViewStackPageGetBadgeNumber func(uintptr) uint | |||||
| 910 | 874 | ||||
| 911 | // Gets the badge number for this page. | 875 | // Gets the badge number for this page. | ||
| 912 | func (x *ViewStackPage) GetBadgeNumber() uint { | 876 | func (x *ViewStackPage) GetBadgeNumber() uint { | ||
| 913 | - | core.LazyRegister(&xViewStackPageGetBadgeNumber, "ADW", "adw_view_stack_page_get_badge_number", false) | |||
| 914 | - | ||||
| 915 | cret := xViewStackPageGetBadgeNumber(x.GoPointer()) | 877 | cret := xViewStackPageGetBadgeNumber(x.GoPointer()) | ||
| 916 | return cret | 878 | return cret | ||
| 917 | } | 879 | } | ||
| @@ -920,7 +882,6 @@ var xViewStackPageGetChild func(uintptr) uintptr | |||||
| 920 | 882 | ||||
| 921 | // Gets the stack child to which @self belongs. | 883 | // Gets the stack child to which @self belongs. | ||
| 922 | func (x *ViewStackPage) GetChild() *gtk.Widget { | 884 | func (x *ViewStackPage) GetChild() *gtk.Widget { | ||
| 923 | - | core.LazyRegister(&xViewStackPageGetChild, "ADW", "adw_view_stack_page_get_child", false) | |||
| 924 | var cls *gtk.Widget | 885 | var cls *gtk.Widget | ||
| 925 | 886 | ||||
| 926 | cret := xViewStackPageGetChild(x.GoPointer()) | 887 | cret := xViewStackPageGetChild(x.GoPointer()) | ||
| @@ -938,8 +899,6 @@ var xViewStackPageGetIconName func(uintptr) string | |||||
| 938 | 899 | ||||
| 939 | // Gets the icon name of the page. | 900 | // Gets the icon name of the page. | ||
| 940 | func (x *ViewStackPage) GetIconName() string { | 901 | func (x *ViewStackPage) GetIconName() string { | ||
| 941 | - | core.LazyRegister(&xViewStackPageGetIconName, "ADW", "adw_view_stack_page_get_icon_name", false) | |||
| 942 | - | ||||
| 943 | cret := xViewStackPageGetIconName(x.GoPointer()) | 902 | cret := xViewStackPageGetIconName(x.GoPointer()) | ||
| 944 | return cret | 903 | return cret | ||
| 945 | } | 904 | } | ||
| @@ -948,8 +907,6 @@ var xViewStackPageGetName func(uintptr) string | |||||
| 948 | 907 | ||||
| 949 | // Gets the name of the page. | 908 | // Gets the name of the page. | ||
| 950 | func (x *ViewStackPage) GetName() string { | 909 | func (x *ViewStackPage) GetName() string { | ||
| 951 | - | core.LazyRegister(&xViewStackPageGetName, "ADW", "adw_view_stack_page_get_name", false) | |||
| 952 | - | ||||
| 953 | cret := xViewStackPageGetName(x.GoPointer()) | 910 | cret := xViewStackPageGetName(x.GoPointer()) | ||
| 954 | return cret | 911 | return cret | ||
| 955 | } | 912 | } | ||
| @@ -958,8 +915,6 @@ var xViewStackPageGetNeedsAttention func(uintptr) bool | |||||
| 958 | 915 | ||||
| 959 | // Gets whether the page requires the user attention. | 916 | // Gets whether the page requires the user attention. | ||
| 960 | func (x *ViewStackPage) GetNeedsAttention() bool { | 917 | func (x *ViewStackPage) GetNeedsAttention() bool { | ||
| 961 | - | core.LazyRegister(&xViewStackPageGetNeedsAttention, "ADW", "adw_view_stack_page_get_needs_attention", false) | |||
| 962 | - | ||||
| 963 | cret := xViewStackPageGetNeedsAttention(x.GoPointer()) | 918 | cret := xViewStackPageGetNeedsAttention(x.GoPointer()) | ||
| 964 | return cret | 919 | return cret | ||
| 965 | } | 920 | } | ||
| @@ -968,8 +923,6 @@ var xViewStackPageGetSectionTitle func(uintptr) string | |||||
| 968 | 923 | ||||
| 969 | // Gets the section title for @self. | 924 | // Gets the section title for @self. | ||
| 970 | func (x *ViewStackPage) GetSectionTitle() string { | 925 | func (x *ViewStackPage) GetSectionTitle() string { | ||
| 971 | - | core.LazyRegister(&xViewStackPageGetSectionTitle, "ADW", "adw_view_stack_page_get_section_title", false) | |||
| 972 | - | ||||
| 973 | cret := xViewStackPageGetSectionTitle(x.GoPointer()) | 926 | cret := xViewStackPageGetSectionTitle(x.GoPointer()) | ||
| 974 | return cret | 927 | return cret | ||
| 975 | } | 928 | } | ||
| @@ -978,8 +931,6 @@ var xViewStackPageGetStartsSection func(uintptr) bool | |||||
| 978 | 931 | ||||
| 979 | // Gets whether @self starts a section. | 932 | // Gets whether @self starts a section. | ||
| 980 | func (x *ViewStackPage) GetStartsSection() bool { | 933 | func (x *ViewStackPage) GetStartsSection() bool { | ||
| 981 | - | core.LazyRegister(&xViewStackPageGetStartsSection, "ADW", "adw_view_stack_page_get_starts_section", false) | |||
| 982 | - | ||||
| 983 | cret := xViewStackPageGetStartsSection(x.GoPointer()) | 934 | cret := xViewStackPageGetStartsSection(x.GoPointer()) | ||
| 984 | return cret | 935 | return cret | ||
| 985 | } | 936 | } | ||
| @@ -988,8 +939,6 @@ var xViewStackPageGetTitle func(uintptr) string | |||||
| 988 | 939 | ||||
| 989 | // Gets the page title. | 940 | // Gets the page title. | ||
| 990 | func (x *ViewStackPage) GetTitle() string { | 941 | func (x *ViewStackPage) GetTitle() string { | ||
| 991 | - | core.LazyRegister(&xViewStackPageGetTitle, "ADW", "adw_view_stack_page_get_title", false) | |||
| 992 | - | ||||
| 993 | cret := xViewStackPageGetTitle(x.GoPointer()) | 942 | cret := xViewStackPageGetTitle(x.GoPointer()) | ||
| 994 | return cret | 943 | return cret | ||
| 995 | } | 944 | } | ||
| @@ -998,8 +947,6 @@ var xViewStackPageGetUseUnderline func(uintptr) bool | |||||
| 998 | 947 | ||||
| 999 | // Gets whether underlines in the page title indicate mnemonics. | 948 | // Gets whether underlines in the page title indicate mnemonics. | ||
| 1000 | func (x *ViewStackPage) GetUseUnderline() bool { | 949 | func (x *ViewStackPage) GetUseUnderline() bool { | ||
| 1001 | - | core.LazyRegister(&xViewStackPageGetUseUnderline, "ADW", "adw_view_stack_page_get_use_underline", false) | |||
| 1002 | - | ||||
| 1003 | cret := xViewStackPageGetUseUnderline(x.GoPointer()) | 950 | cret := xViewStackPageGetUseUnderline(x.GoPointer()) | ||
| 1004 | return cret | 951 | return cret | ||
| 1005 | } | 952 | } | ||
| @@ -1011,8 +958,6 @@ var xViewStackPageGetVisible func(uintptr) bool | |||||
| 1011 | // This is independent from the [property@Gtk.Widget:visible] | 958 | // This is independent from the [property@Gtk.Widget:visible] | ||
| 1012 | // property of its widget. | 959 | // property of its widget. | ||
| 1013 | func (x *ViewStackPage) GetVisible() bool { | 960 | func (x *ViewStackPage) GetVisible() bool { | ||
| 1014 | - | core.LazyRegister(&xViewStackPageGetVisible, "ADW", "adw_view_stack_page_get_visible", false) | |||
| 1015 | - | ||||
| 1016 | cret := xViewStackPageGetVisible(x.GoPointer()) | 961 | cret := xViewStackPageGetVisible(x.GoPointer()) | ||
| 1017 | return cret | 962 | return cret | ||
| 1018 | } | 963 | } | ||
| @@ -1026,8 +971,6 @@ var xViewStackPageSetBadgeNumber func(uintptr, uint) | |||||
| 1026 | // | 971 | // | ||
| 1027 | // It can be used together with [property@ViewStack{age}:needs-attention]. | 972 | // It can be used together with [property@ViewStack{age}:needs-attention]. | ||
| 1028 | func (x *ViewStackPage) SetBadgeNumber(BadgeNumberVar uint) { | 973 | func (x *ViewStackPage) SetBadgeNumber(BadgeNumberVar uint) { | ||
| 1029 | - | core.LazyRegister(&xViewStackPageSetBadgeNumber, "ADW", "adw_view_stack_page_set_badge_number", false) | |||
| 1030 | - | ||||
| 1031 | xViewStackPageSetBadgeNumber(x.GoPointer(), BadgeNumberVar) | 974 | xViewStackPageSetBadgeNumber(x.GoPointer(), BadgeNumberVar) | ||
| 1032 | } | 975 | } | ||
| 1033 | 976 | ||||
| @@ -1035,8 +978,6 @@ var xViewStackPageSetIconName func(uintptr, uintptr) | |||||
| 1035 | 978 | ||||
| 1036 | // Sets the icon name of the page. | 979 | // Sets the icon name of the page. | ||
| 1037 | func (x *ViewStackPage) SetIconName(IconNameVar *string) { | 980 | func (x *ViewStackPage) SetIconName(IconNameVar *string) { | ||
| 1038 | - | core.LazyRegister(&xViewStackPageSetIconName, "ADW", "adw_view_stack_page_set_icon_name", false) | |||
| 1039 | - | ||||
| 1040 | IconNameVarPtr := core.GStrdupNullable(IconNameVar) | 981 | IconNameVarPtr := core.GStrdupNullable(IconNameVar) | ||
| 1041 | defer core.GFreeNullable(IconNameVarPtr) | 982 | defer core.GFreeNullable(IconNameVarPtr) | ||
| 1042 | 983 | ||||
| @@ -1047,8 +988,6 @@ var xViewStackPageSetName func(uintptr, uintptr) | |||||
| 1047 | 988 | ||||
| 1048 | // Sets the name of the page. | 989 | // Sets the name of the page. | ||
| 1049 | func (x *ViewStackPage) SetName(NameVar *string) { | 990 | func (x *ViewStackPage) SetName(NameVar *string) { | ||
| 1050 | - | core.LazyRegister(&xViewStackPageSetName, "ADW", "adw_view_stack_page_set_name", false) | |||
| 1051 | - | ||||
| 1052 | NameVarPtr := core.GStrdupNullable(NameVar) | 991 | NameVarPtr := core.GStrdupNullable(NameVar) | ||
| 1053 | defer core.GFreeNullable(NameVarPtr) | 992 | defer core.GFreeNullable(NameVarPtr) | ||
| 1054 | 993 | ||||
| @@ -1061,8 +1000,6 @@ var xViewStackPageSetNeedsAttention func(uintptr, bool) | |||||
| 1061 | // | 1000 | // | ||
| 1062 | // [class@ViewSwitcher] will display it as a dot next to the page icon. | 1001 | // [class@ViewSwitcher] will display it as a dot next to the page icon. | ||
| 1063 | func (x *ViewStackPage) SetNeedsAttention(NeedsAttentionVar bool) { | 1002 | func (x *ViewStackPage) SetNeedsAttention(NeedsAttentionVar bool) { | ||
| 1064 | - | core.LazyRegister(&xViewStackPageSetNeedsAttention, "ADW", "adw_view_stack_page_set_needs_attention", false) | |||
| 1065 | - | ||||
| 1066 | xViewStackPageSetNeedsAttention(x.GoPointer(), NeedsAttentionVar) | 1003 | xViewStackPageSetNeedsAttention(x.GoPointer(), NeedsAttentionVar) | ||
| 1067 | } | 1004 | } | ||
| 1068 | 1005 | ||||
| @@ -1072,8 +1009,6 @@ var xViewStackPageSetSectionTitle func(uintptr, uintptr) | |||||
| 1072 | // | 1009 | // | ||
| 1073 | // Does nothing unless [property@ViewStackPage:starts-section] is set. | 1010 | // Does nothing unless [property@ViewStackPage:starts-section] is set. | ||
| 1074 | func (x *ViewStackPage) SetSectionTitle(SectionTitleVar *string) { | 1011 | func (x *ViewStackPage) SetSectionTitle(SectionTitleVar *string) { | ||
| 1075 | - | core.LazyRegister(&xViewStackPageSetSectionTitle, "ADW", "adw_view_stack_page_set_section_title", false) | |||
| 1076 | - | ||||
| 1077 | SectionTitleVarPtr := core.GStrdupNullable(SectionTitleVar) | 1012 | SectionTitleVarPtr := core.GStrdupNullable(SectionTitleVar) | ||
| 1078 | defer core.GFreeNullable(SectionTitleVarPtr) | 1013 | defer core.GFreeNullable(SectionTitleVarPtr) | ||
| 1079 | 1014 | ||||
| @@ -1090,8 +1025,6 @@ var xViewStackPageSetStartsSection func(uintptr, bool) | |||||
| 1090 | // If [property@ViewStackPage:section-title] is set, it should be used as a | 1025 | // If [property@ViewStackPage:section-title] is set, it should be used as a | ||
| 1091 | // title for the section. | 1026 | // title for the section. | ||
| 1092 | func (x *ViewStackPage) SetStartsSection(StartsSectionVar bool) { | 1027 | func (x *ViewStackPage) SetStartsSection(StartsSectionVar bool) { | ||
| 1093 | - | core.LazyRegister(&xViewStackPageSetStartsSection, "ADW", "adw_view_stack_page_set_starts_section", false) | |||
| 1094 | - | ||||
| 1095 | xViewStackPageSetStartsSection(x.GoPointer(), StartsSectionVar) | 1028 | xViewStackPageSetStartsSection(x.GoPointer(), StartsSectionVar) | ||
| 1096 | } | 1029 | } | ||
| 1097 | 1030 | ||||
| @@ -1099,8 +1032,6 @@ var xViewStackPageSetTitle func(uintptr, uintptr) | |||||
| 1099 | 1032 | ||||
| 1100 | // Sets the page title. | 1033 | // Sets the page title. | ||
| 1101 | func (x *ViewStackPage) SetTitle(TitleVar *string) { | 1034 | func (x *ViewStackPage) SetTitle(TitleVar *string) { | ||
| 1102 | - | core.LazyRegister(&xViewStackPageSetTitle, "ADW", "adw_view_stack_page_set_title", false) | |||
| 1103 | - | ||||
| 1104 | TitleVarPtr := core.GStrdupNullable(TitleVar) | 1035 | TitleVarPtr := core.GStrdupNullable(TitleVar) | ||
| 1105 | defer core.GFreeNullable(TitleVarPtr) | 1036 | defer core.GFreeNullable(TitleVarPtr) | ||
| 1106 | 1037 | ||||
| @@ -1111,8 +1042,6 @@ var xViewStackPageSetUseUnderline func(uintptr, bool) | |||||
| 1111 | 1042 | ||||
| 1112 | // Sets whether underlines in the page title indicate mnemonics. | 1043 | // Sets whether underlines in the page title indicate mnemonics. | ||
| 1113 | func (x *ViewStackPage) SetUseUnderline(UseUnderlineVar bool) { | 1044 | func (x *ViewStackPage) SetUseUnderline(UseUnderlineVar bool) { | ||
| 1114 | - | core.LazyRegister(&xViewStackPageSetUseUnderline, "ADW", "adw_view_stack_page_set_use_underline", false) | |||
| 1115 | - | ||||
| 1116 | xViewStackPageSetUseUnderline(x.GoPointer(), UseUnderlineVar) | 1045 | xViewStackPageSetUseUnderline(x.GoPointer(), UseUnderlineVar) | ||
| 1117 | } | 1046 | } | ||
| 1118 | 1047 | ||||
| @@ -1123,8 +1052,6 @@ var xViewStackPageSetVisible func(uintptr, bool) | |||||
| 1123 | // This is independent from the [property@Gtk.Widget:visible] property of | 1052 | // This is independent from the [property@Gtk.Widget:visible] property of | ||
| 1124 | // [property@ViewStackPage:child]. | 1053 | // [property@ViewStackPage:child]. | ||
| 1125 | func (x *ViewStackPage) SetVisible(VisibleVar bool) { | 1054 | func (x *ViewStackPage) SetVisible(VisibleVar bool) { | ||
| 1126 | - | core.LazyRegister(&xViewStackPageSetVisible, "ADW", "adw_view_stack_page_set_visible", false) | |||
| 1127 | - | ||||
| 1128 | xViewStackPageSetVisible(x.GoPointer(), VisibleVar) | 1055 | xViewStackPageSetVisible(x.GoPointer(), VisibleVar) | ||
| 1129 | } | 1056 | } | ||
| 1130 | 1057 | ||||
| @@ -1589,7 +1516,6 @@ type ViewStackPages struct { | |||||
| 1589 | var xViewStackPagesGLibType func() types.GType | 1516 | var xViewStackPagesGLibType func() types.GType | ||
| 1590 | 1517 | ||||
| 1591 | func ViewStackPagesGLibType() types.GType { | 1518 | func ViewStackPagesGLibType() types.GType { | ||
| 1592 | - | core.LazyRegister(&xViewStackPagesGLibType, "ADW", "adw_view_stack_pages_get_type", false) | |||
| 1593 | return xViewStackPagesGLibType() | 1519 | return xViewStackPagesGLibType() | ||
| 1594 | } | 1520 | } | ||
| 1595 | 1521 | ||||
| @@ -1607,7 +1533,6 @@ var xViewStackPagesGetSelectedPage func(uintptr) uintptr | |||||
| 1607 | // | 1533 | // | ||
| 1608 | // Returns `NULL` if there's no selected page. | 1534 | // Returns `NULL` if there's no selected page. | ||
| 1609 | func (x *ViewStackPages) GetSelectedPage() *ViewStackPage { | 1535 | func (x *ViewStackPages) GetSelectedPage() *ViewStackPage { | ||
| 1610 | - | core.LazyRegister(&xViewStackPagesGetSelectedPage, "ADW", "adw_view_stack_pages_get_selected_page", false) | |||
| 1611 | var cls *ViewStackPage | 1536 | var cls *ViewStackPage | ||
| 1612 | 1537 | ||||
| 1613 | cret := xViewStackPagesGetSelectedPage(x.GoPointer()) | 1538 | cret := xViewStackPagesGetSelectedPage(x.GoPointer()) | ||
| @@ -1627,8 +1552,6 @@ var xViewStackPagesSetSelectedPage func(uintptr, uintptr) | |||||
| 1627 | // | 1552 | // | ||
| 1628 | // See [property@ViewStack:visible-child]. | 1553 | // See [property@ViewStack:visible-child]. | ||
| 1629 | func (x *ViewStackPages) SetSelectedPage(PageVar *ViewStackPage) { | 1554 | func (x *ViewStackPages) SetSelectedPage(PageVar *ViewStackPage) { | ||
| 1630 | - | core.LazyRegister(&xViewStackPagesSetSelectedPage, "ADW", "adw_view_stack_pages_set_selected_page", false) | |||
| 1631 | - | ||||
| 1632 | xViewStackPagesSetSelectedPage(x.GoPointer(), PageVar.GoPointer()) | 1555 | xViewStackPagesSetSelectedPage(x.GoPointer(), PageVar.GoPointer()) | ||
| 1633 | } | 1556 | } | ||
| 1634 | 1557 | ||||
| @@ -1887,4 +1810,65 @@ func (x *ViewStackPages) UnselectRange(PositionVar uint, NItemsVar uint) bool { | |||||
| 1887 | func init() { | 1810 | func init() { | ||
| 1888 | core.SetPackageName("ADW", "libadwaita-1") | 1811 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 1889 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 1812 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 1813 | + | var libs []uintptr | |||
| 1814 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 1815 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 1816 | + | if err != nil { | |||
| 1817 | + | panic(err) | |||
| 1818 | + | } | |||
| 1819 | + | libs = append(libs, lib) | |||
| 1820 | + | } | |||
| 1821 | + | ||||
| 1822 | + | core.PuregoSafeRegister(&xViewStackGLibType, libs, "adw_view_stack_get_type") | |||
| 1823 | + | ||||
| 1824 | + | core.PuregoSafeRegister(&xNewViewStack, libs, "adw_view_stack_new") | |||
| 1825 | + | ||||
| 1826 | + | core.PuregoSafeRegister(&xViewStackAdd, libs, "adw_view_stack_add") | |||
| 1827 | + | core.PuregoSafeRegister(&xViewStackAddNamed, libs, "adw_view_stack_add_named") | |||
| 1828 | + | core.PuregoSafeRegister(&xViewStackAddTitled, libs, "adw_view_stack_add_titled") | |||
| 1829 | + | core.PuregoSafeRegister(&xViewStackAddTitledWithIcon, libs, "adw_view_stack_add_titled_with_icon") | |||
| 1830 | + | core.PuregoSafeRegister(&xViewStackGetChildByName, libs, "adw_view_stack_get_child_by_name") | |||
| 1831 | + | core.PuregoSafeRegister(&xViewStackGetEnableTransitions, libs, "adw_view_stack_get_enable_transitions") | |||
| 1832 | + | core.PuregoSafeRegister(&xViewStackGetHhomogeneous, libs, "adw_view_stack_get_hhomogeneous") | |||
| 1833 | + | core.PuregoSafeRegister(&xViewStackGetPage, libs, "adw_view_stack_get_page") | |||
| 1834 | + | core.PuregoSafeRegister(&xViewStackGetPages, libs, "adw_view_stack_get_pages") | |||
| 1835 | + | core.PuregoSafeRegister(&xViewStackGetTransitionDuration, libs, "adw_view_stack_get_transition_duration") | |||
| 1836 | + | core.PuregoSafeRegister(&xViewStackGetTransitionRunning, libs, "adw_view_stack_get_transition_running") | |||
| 1837 | + | core.PuregoSafeRegister(&xViewStackGetVhomogeneous, libs, "adw_view_stack_get_vhomogeneous") | |||
| 1838 | + | core.PuregoSafeRegister(&xViewStackGetVisibleChild, libs, "adw_view_stack_get_visible_child") | |||
| 1839 | + | core.PuregoSafeRegister(&xViewStackGetVisibleChildName, libs, "adw_view_stack_get_visible_child_name") | |||
| 1840 | + | core.PuregoSafeRegister(&xViewStackRemove, libs, "adw_view_stack_remove") | |||
| 1841 | + | core.PuregoSafeRegister(&xViewStackSetEnableTransitions, libs, "adw_view_stack_set_enable_transitions") | |||
| 1842 | + | core.PuregoSafeRegister(&xViewStackSetHhomogeneous, libs, "adw_view_stack_set_hhomogeneous") | |||
| 1843 | + | core.PuregoSafeRegister(&xViewStackSetTransitionDuration, libs, "adw_view_stack_set_transition_duration") | |||
| 1844 | + | core.PuregoSafeRegister(&xViewStackSetVhomogeneous, libs, "adw_view_stack_set_vhomogeneous") | |||
| 1845 | + | core.PuregoSafeRegister(&xViewStackSetVisibleChild, libs, "adw_view_stack_set_visible_child") | |||
| 1846 | + | core.PuregoSafeRegister(&xViewStackSetVisibleChildName, libs, "adw_view_stack_set_visible_child_name") | |||
| 1847 | + | ||||
| 1848 | + | core.PuregoSafeRegister(&xViewStackPageGLibType, libs, "adw_view_stack_page_get_type") | |||
| 1849 | + | ||||
| 1850 | + | core.PuregoSafeRegister(&xViewStackPageGetBadgeNumber, libs, "adw_view_stack_page_get_badge_number") | |||
| 1851 | + | core.PuregoSafeRegister(&xViewStackPageGetChild, libs, "adw_view_stack_page_get_child") | |||
| 1852 | + | core.PuregoSafeRegister(&xViewStackPageGetIconName, libs, "adw_view_stack_page_get_icon_name") | |||
| 1853 | + | core.PuregoSafeRegister(&xViewStackPageGetName, libs, "adw_view_stack_page_get_name") | |||
| 1854 | + | core.PuregoSafeRegister(&xViewStackPageGetNeedsAttention, libs, "adw_view_stack_page_get_needs_attention") | |||
| 1855 | + | core.PuregoSafeRegister(&xViewStackPageGetSectionTitle, libs, "adw_view_stack_page_get_section_title") | |||
| 1856 | + | core.PuregoSafeRegister(&xViewStackPageGetStartsSection, libs, "adw_view_stack_page_get_starts_section") | |||
| 1857 | + | core.PuregoSafeRegister(&xViewStackPageGetTitle, libs, "adw_view_stack_page_get_title") | |||
| 1858 | + | core.PuregoSafeRegister(&xViewStackPageGetUseUnderline, libs, "adw_view_stack_page_get_use_underline") | |||
| 1859 | + | core.PuregoSafeRegister(&xViewStackPageGetVisible, libs, "adw_view_stack_page_get_visible") | |||
| 1860 | + | core.PuregoSafeRegister(&xViewStackPageSetBadgeNumber, libs, "adw_view_stack_page_set_badge_number") | |||
| 1861 | + | core.PuregoSafeRegister(&xViewStackPageSetIconName, libs, "adw_view_stack_page_set_icon_name") | |||
| 1862 | + | core.PuregoSafeRegister(&xViewStackPageSetName, libs, "adw_view_stack_page_set_name") | |||
| 1863 | + | core.PuregoSafeRegister(&xViewStackPageSetNeedsAttention, libs, "adw_view_stack_page_set_needs_attention") | |||
| 1864 | + | core.PuregoSafeRegister(&xViewStackPageSetSectionTitle, libs, "adw_view_stack_page_set_section_title") | |||
| 1865 | + | core.PuregoSafeRegister(&xViewStackPageSetStartsSection, libs, "adw_view_stack_page_set_starts_section") | |||
| 1866 | + | core.PuregoSafeRegister(&xViewStackPageSetTitle, libs, "adw_view_stack_page_set_title") | |||
| 1867 | + | core.PuregoSafeRegister(&xViewStackPageSetUseUnderline, libs, "adw_view_stack_page_set_use_underline") | |||
| 1868 | + | core.PuregoSafeRegister(&xViewStackPageSetVisible, libs, "adw_view_stack_page_set_visible") | |||
| 1869 | + | ||||
| 1870 | + | core.PuregoSafeRegister(&xViewStackPagesGLibType, libs, "adw_view_stack_pages_get_type") | |||
| 1871 | + | ||||
| 1872 | + | core.PuregoSafeRegister(&xViewStackPagesGetSelectedPage, libs, "adw_view_stack_pages_get_selected_page") | |||
| 1873 | + | core.PuregoSafeRegister(&xViewStackPagesSetSelectedPage, libs, "adw_view_stack_pages_set_selected_page") | |||
| 1890 | } | 1874 | } | ||