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
| @@ -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/glib" | |
| @@ -91,7 +92,6 @@ type ComboRow struct { | |||
| 91 | 92 | var xComboRowGLibType func() types.GType | |
| 92 | 93 | ||
| 93 | 94 | func ComboRowGLibType() types.GType { | |
| 94 | - | core.LazyRegister(&xComboRowGLibType, "ADW", "adw_combo_row_get_type", false) | |
| 95 | 95 | return xComboRowGLibType() | |
| 96 | 96 | } | |
| 97 | 97 | ||
| @@ -105,7 +105,6 @@ var xNewComboRow func() uintptr | |||
| 105 | 105 | ||
| 106 | 106 | // Creates a new `AdwComboRow`. | |
| 107 | 107 | func NewComboRow() *ComboRow { | |
| 108 | - | core.LazyRegister(&xNewComboRow, "ADW", "adw_combo_row_new", false) | |
| 109 | 108 | var cls *ComboRow | |
| 110 | 109 | ||
| 111 | 110 | cret := xNewComboRow() | |
| @@ -128,8 +127,6 @@ var xComboRowGetEnableSearch func(uintptr) bool | |||
| 128 | 127 | // | |
| 129 | 128 | // Search requires [property@ComboRow:expression] to be set. | |
| 130 | 129 | func (x *ComboRow) GetEnableSearch() bool { | |
| 131 | - | core.LazyRegister(&xComboRowGetEnableSearch, "ADW", "adw_combo_row_get_enable_search", false) | |
| 132 | - | ||
| 133 | 130 | cret := xComboRowGetEnableSearch(x.GoPointer()) | |
| 134 | 131 | return cret | |
| 135 | 132 | } | |
| @@ -138,7 +135,6 @@ var xComboRowGetExpression func(uintptr) uintptr | |||
| 138 | 135 | ||
| 139 | 136 | // Gets the expression used to obtain strings from items. | |
| 140 | 137 | func (x *ComboRow) GetExpression() *gtk.Expression { | |
| 141 | - | core.LazyRegister(&xComboRowGetExpression, "ADW", "adw_combo_row_get_expression", false) | |
| 142 | 138 | var cls *gtk.Expression | |
| 143 | 139 | ||
| 144 | 140 | cret := xComboRowGetExpression(x.GoPointer()) | |
| @@ -156,7 +152,6 @@ var xComboRowGetFactory func(uintptr) uintptr | |||
| 156 | 152 | ||
| 157 | 153 | // Gets the factory for populating list items. | |
| 158 | 154 | func (x *ComboRow) GetFactory() *gtk.ListItemFactory { | |
| 159 | - | core.LazyRegister(&xComboRowGetFactory, "ADW", "adw_combo_row_get_factory", false) | |
| 160 | 155 | var cls *gtk.ListItemFactory | |
| 161 | 156 | ||
| 162 | 157 | cret := xComboRowGetFactory(x.GoPointer()) | |
| @@ -174,7 +169,6 @@ var xComboRowGetHeaderFactory func(uintptr) uintptr | |||
| 174 | 169 | ||
| 175 | 170 | // Gets the factory that's currently used to create header widgets for the popup. | |
| 176 | 171 | func (x *ComboRow) GetHeaderFactory() *gtk.ListItemFactory { | |
| 177 | - | core.LazyRegister(&xComboRowGetHeaderFactory, "ADW", "adw_combo_row_get_header_factory", false) | |
| 178 | 172 | var cls *gtk.ListItemFactory | |
| 179 | 173 | ||
| 180 | 174 | cret := xComboRowGetHeaderFactory(x.GoPointer()) | |
| @@ -192,7 +186,6 @@ var xComboRowGetListFactory func(uintptr) uintptr | |||
| 192 | 186 | ||
| 193 | 187 | // Gets the factory for populating list items in the popup. | |
| 194 | 188 | func (x *ComboRow) GetListFactory() *gtk.ListItemFactory { | |
| 195 | - | core.LazyRegister(&xComboRowGetListFactory, "ADW", "adw_combo_row_get_list_factory", false) | |
| 196 | 189 | var cls *gtk.ListItemFactory | |
| 197 | 190 | ||
| 198 | 191 | cret := xComboRowGetListFactory(x.GoPointer()) | |
| @@ -210,7 +203,6 @@ var xComboRowGetModel func(uintptr) uintptr | |||
| 210 | 203 | ||
| 211 | 204 | // Gets the model that provides the displayed items. | |
| 212 | 205 | func (x *ComboRow) GetModel() *gio.ListModelBase { | |
| 213 | - | core.LazyRegister(&xComboRowGetModel, "ADW", "adw_combo_row_get_model", false) | |
| 214 | 206 | var cls *gio.ListModelBase | |
| 215 | 207 | ||
| 216 | 208 | cret := xComboRowGetModel(x.GoPointer()) | |
| @@ -228,8 +220,6 @@ var xComboRowGetSearchMatchMode func(uintptr) gtk.StringFilterMatchMode | |||
| 228 | 220 | ||
| 229 | 221 | // Returns the match mode that the search filter is using. | |
| 230 | 222 | func (x *ComboRow) GetSearchMatchMode() gtk.StringFilterMatchMode { | |
| 231 | - | core.LazyRegister(&xComboRowGetSearchMatchMode, "ADW", "adw_combo_row_get_search_match_mode", false) | |
| 232 | - | ||
| 233 | 223 | cret := xComboRowGetSearchMatchMode(x.GoPointer()) | |
| 234 | 224 | return cret | |
| 235 | 225 | } | |
| @@ -238,8 +228,6 @@ var xComboRowGetSelected func(uintptr) uint | |||
| 238 | 228 | ||
| 239 | 229 | // Gets the position of the selected item. | |
| 240 | 230 | func (x *ComboRow) GetSelected() uint { | |
| 241 | - | core.LazyRegister(&xComboRowGetSelected, "ADW", "adw_combo_row_get_selected", false) | |
| 242 | - | ||
| 243 | 231 | cret := xComboRowGetSelected(x.GoPointer()) | |
| 244 | 232 | return cret | |
| 245 | 233 | } | |
| @@ -248,7 +236,6 @@ var xComboRowGetSelectedItem func(uintptr) uintptr | |||
| 248 | 236 | ||
| 249 | 237 | // Gets the selected item. | |
| 250 | 238 | func (x *ComboRow) GetSelectedItem() *gobject.Object { | |
| 251 | - | core.LazyRegister(&xComboRowGetSelectedItem, "ADW", "adw_combo_row_get_selected_item", false) | |
| 252 | 239 | var cls *gobject.Object | |
| 253 | 240 | ||
| 254 | 241 | cret := xComboRowGetSelectedItem(x.GoPointer()) | |
| @@ -266,8 +253,6 @@ var xComboRowGetUseSubtitle func(uintptr) bool | |||
| 266 | 253 | ||
| 267 | 254 | // Gets whether to use the current value as the subtitle. | |
| 268 | 255 | func (x *ComboRow) GetUseSubtitle() bool { | |
| 269 | - | core.LazyRegister(&xComboRowGetUseSubtitle, "ADW", "adw_combo_row_get_use_subtitle", false) | |
| 270 | - | ||
| 271 | 256 | cret := xComboRowGetUseSubtitle(x.GoPointer()) | |
| 272 | 257 | return cret | |
| 273 | 258 | } | |
| @@ -281,8 +266,6 @@ var xComboRowSetEnableSearch func(uintptr, bool) | |||
| 281 | 266 | // | |
| 282 | 267 | // Search requires [property@ComboRow:expression] to be set. | |
| 283 | 268 | func (x *ComboRow) SetEnableSearch(EnableSearchVar bool) { | |
| 284 | - | core.LazyRegister(&xComboRowSetEnableSearch, "ADW", "adw_combo_row_set_enable_search", false) | |
| 285 | - | ||
| 286 | 269 | xComboRowSetEnableSearch(x.GoPointer(), EnableSearchVar) | |
| 287 | 270 | } | |
| 288 | 271 | ||
| @@ -296,8 +279,6 @@ var xComboRowSetExpression func(uintptr, uintptr) | |||
| 296 | 279 | // [property@ComboRow:factory] is not set, or when | |
| 297 | 280 | // [property@ComboRow:use-subtitle] is set to `TRUE`. | |
| 298 | 281 | func (x *ComboRow) SetExpression(ExpressionVar *gtk.Expression) { | |
| 299 | - | core.LazyRegister(&xComboRowSetExpression, "ADW", "adw_combo_row_set_expression", false) | |
| 300 | - | ||
| 301 | 282 | xComboRowSetExpression(x.GoPointer(), ExpressionVar.GoPointer()) | |
| 302 | 283 | } | |
| 303 | 284 | ||
| @@ -308,8 +289,6 @@ var xComboRowSetFactory func(uintptr, uintptr) | |||
| 308 | 289 | // This factory is always used for the item in the row. It is also used for | |
| 309 | 290 | // items in the popup unless [property@ComboRow:list-factory] is set. | |
| 310 | 291 | func (x *ComboRow) SetFactory(FactoryVar *gtk.ListItemFactory) { | |
| 311 | - | core.LazyRegister(&xComboRowSetFactory, "ADW", "adw_combo_row_set_factory", false) | |
| 312 | - | ||
| 313 | 292 | xComboRowSetFactory(x.GoPointer(), FactoryVar.GoPointer()) | |
| 314 | 293 | } | |
| 315 | 294 | ||
| @@ -317,8 +296,6 @@ var xComboRowSetHeaderFactory func(uintptr, uintptr) | |||
| 317 | 296 | ||
| 318 | 297 | // Sets the factory to use for creating header widgets for the popup. | |
| 319 | 298 | func (x *ComboRow) SetHeaderFactory(FactoryVar *gtk.ListItemFactory) { | |
| 320 | - | core.LazyRegister(&xComboRowSetHeaderFactory, "ADW", "adw_combo_row_set_header_factory", false) | |
| 321 | - | ||
| 322 | 299 | xComboRowSetHeaderFactory(x.GoPointer(), FactoryVar.GoPointer()) | |
| 323 | 300 | } | |
| 324 | 301 | ||
| @@ -328,8 +305,6 @@ var xComboRowSetListFactory func(uintptr, uintptr) | |||
| 328 | 305 | // | |
| 329 | 306 | // If this is not set, [property@ComboRow:factory] is used. | |
| 330 | 307 | func (x *ComboRow) SetListFactory(FactoryVar *gtk.ListItemFactory) { | |
| 331 | - | core.LazyRegister(&xComboRowSetListFactory, "ADW", "adw_combo_row_set_list_factory", false) | |
| 332 | - | ||
| 333 | 308 | xComboRowSetListFactory(x.GoPointer(), FactoryVar.GoPointer()) | |
| 334 | 309 | } | |
| 335 | 310 | ||
| @@ -337,8 +312,6 @@ var xComboRowSetModel func(uintptr, uintptr) | |||
| 337 | 312 | ||
| 338 | 313 | // Sets the model that provides the displayed items. | |
| 339 | 314 | func (x *ComboRow) SetModel(ModelVar gio.ListModel) { | |
| 340 | - | core.LazyRegister(&xComboRowSetModel, "ADW", "adw_combo_row_set_model", false) | |
| 341 | - | ||
| 342 | 315 | xComboRowSetModel(x.GoPointer(), ModelVar.GoPointer()) | |
| 343 | 316 | } | |
| 344 | 317 | ||
| @@ -346,8 +319,6 @@ var xComboRowSetSearchMatchMode func(uintptr, gtk.StringFilterMatchMode) | |||
| 346 | 319 | ||
| 347 | 320 | // Sets the match mode for the search filter. | |
| 348 | 321 | func (x *ComboRow) SetSearchMatchMode(SearchMatchModeVar gtk.StringFilterMatchMode) { | |
| 349 | - | core.LazyRegister(&xComboRowSetSearchMatchMode, "ADW", "adw_combo_row_set_search_match_mode", false) | |
| 350 | - | ||
| 351 | 322 | xComboRowSetSearchMatchMode(x.GoPointer(), SearchMatchModeVar) | |
| 352 | 323 | } | |
| 353 | 324 | ||
| @@ -355,8 +326,6 @@ var xComboRowSetSelected func(uintptr, uint) | |||
| 355 | 326 | ||
| 356 | 327 | // Selects the item at the given position. | |
| 357 | 328 | func (x *ComboRow) SetSelected(PositionVar uint) { | |
| 358 | - | core.LazyRegister(&xComboRowSetSelected, "ADW", "adw_combo_row_set_selected", false) | |
| 359 | - | ||
| 360 | 329 | xComboRowSetSelected(x.GoPointer(), PositionVar) | |
| 361 | 330 | } | |
| 362 | 331 | ||
| @@ -372,8 +341,6 @@ var xComboRowSetUseSubtitle func(uintptr, bool) | |||
| 372 | 341 | // The subtitle is interpreted as Pango markup if | |
| 373 | 342 | // [property@PreferencesRow:use-markup] is set to `TRUE`. | |
| 374 | 343 | func (x *ComboRow) SetUseSubtitle(UseSubtitleVar bool) { | |
| 375 | - | core.LazyRegister(&xComboRowSetUseSubtitle, "ADW", "adw_combo_row_set_use_subtitle", false) | |
| 376 | - | ||
| 377 | 344 | xComboRowSetUseSubtitle(x.GoPointer(), UseSubtitleVar) | |
| 378 | 345 | } | |
| 379 | 346 | ||
| @@ -813,4 +780,36 @@ func (x *ComboRow) GetBuildableId() string { | |||
| 813 | 780 | func init() { | |
| 814 | 781 | core.SetPackageName("ADW", "libadwaita-1") | |
| 815 | 782 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 783 | + | var libs []uintptr | |
| 784 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 785 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 786 | + | if err != nil { | |
| 787 | + | panic(err) | |
| 788 | + | } | |
| 789 | + | libs = append(libs, lib) | |
| 790 | + | } | |
| 791 | + | ||
| 792 | + | core.PuregoSafeRegister(&xComboRowGLibType, libs, "adw_combo_row_get_type") | |
| 793 | + | ||
| 794 | + | core.PuregoSafeRegister(&xNewComboRow, libs, "adw_combo_row_new") | |
| 795 | + | ||
| 796 | + | core.PuregoSafeRegister(&xComboRowGetEnableSearch, libs, "adw_combo_row_get_enable_search") | |
| 797 | + | core.PuregoSafeRegister(&xComboRowGetExpression, libs, "adw_combo_row_get_expression") | |
| 798 | + | core.PuregoSafeRegister(&xComboRowGetFactory, libs, "adw_combo_row_get_factory") | |
| 799 | + | core.PuregoSafeRegister(&xComboRowGetHeaderFactory, libs, "adw_combo_row_get_header_factory") | |
| 800 | + | core.PuregoSafeRegister(&xComboRowGetListFactory, libs, "adw_combo_row_get_list_factory") | |
| 801 | + | core.PuregoSafeRegister(&xComboRowGetModel, libs, "adw_combo_row_get_model") | |
| 802 | + | core.PuregoSafeRegister(&xComboRowGetSearchMatchMode, libs, "adw_combo_row_get_search_match_mode") | |
| 803 | + | core.PuregoSafeRegister(&xComboRowGetSelected, libs, "adw_combo_row_get_selected") | |
| 804 | + | core.PuregoSafeRegister(&xComboRowGetSelectedItem, libs, "adw_combo_row_get_selected_item") | |
| 805 | + | core.PuregoSafeRegister(&xComboRowGetUseSubtitle, libs, "adw_combo_row_get_use_subtitle") | |
| 806 | + | core.PuregoSafeRegister(&xComboRowSetEnableSearch, libs, "adw_combo_row_set_enable_search") | |
| 807 | + | core.PuregoSafeRegister(&xComboRowSetExpression, libs, "adw_combo_row_set_expression") | |
| 808 | + | core.PuregoSafeRegister(&xComboRowSetFactory, libs, "adw_combo_row_set_factory") | |
| 809 | + | core.PuregoSafeRegister(&xComboRowSetHeaderFactory, libs, "adw_combo_row_set_header_factory") | |
| 810 | + | core.PuregoSafeRegister(&xComboRowSetListFactory, libs, "adw_combo_row_set_list_factory") | |
| 811 | + | core.PuregoSafeRegister(&xComboRowSetModel, libs, "adw_combo_row_set_model") | |
| 812 | + | core.PuregoSafeRegister(&xComboRowSetSearchMatchMode, libs, "adw_combo_row_set_search_match_mode") | |
| 813 | + | core.PuregoSafeRegister(&xComboRowSetSelected, libs, "adw_combo_row_set_selected") | |
| 814 | + | core.PuregoSafeRegister(&xComboRowSetUseSubtitle, libs, "adw_combo_row_set_use_subtitle") | |
| 816 | 815 | } | |
| @@ -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/glib" | 11 | "github.com/bnema/puregotk/v4/glib" | ||
| @@ -91,7 +92,6 @@ type ComboRow struct { | |||||
| 91 | var xComboRowGLibType func() types.GType | 92 | var xComboRowGLibType func() types.GType | ||
| 92 | 93 | ||||
| 93 | func ComboRowGLibType() types.GType { | 94 | func ComboRowGLibType() types.GType { | ||
| 94 | - | core.LazyRegister(&xComboRowGLibType, "ADW", "adw_combo_row_get_type", false) | |||
| 95 | return xComboRowGLibType() | 95 | return xComboRowGLibType() | ||
| 96 | } | 96 | } | ||
| 97 | 97 | ||||
| @@ -105,7 +105,6 @@ var xNewComboRow func() uintptr | |||||
| 105 | 105 | ||||
| 106 | // Creates a new `AdwComboRow`. | 106 | // Creates a new `AdwComboRow`. | ||
| 107 | func NewComboRow() *ComboRow { | 107 | func NewComboRow() *ComboRow { | ||
| 108 | - | core.LazyRegister(&xNewComboRow, "ADW", "adw_combo_row_new", false) | |||
| 109 | var cls *ComboRow | 108 | var cls *ComboRow | ||
| 110 | 109 | ||||
| 111 | cret := xNewComboRow() | 110 | cret := xNewComboRow() | ||
| @@ -128,8 +127,6 @@ var xComboRowGetEnableSearch func(uintptr) bool | |||||
| 128 | // | 127 | // | ||
| 129 | // Search requires [property@ComboRow:expression] to be set. | 128 | // Search requires [property@ComboRow:expression] to be set. | ||
| 130 | func (x *ComboRow) GetEnableSearch() bool { | 129 | func (x *ComboRow) GetEnableSearch() bool { | ||
| 131 | - | core.LazyRegister(&xComboRowGetEnableSearch, "ADW", "adw_combo_row_get_enable_search", false) | |||
| 132 | - | ||||
| 133 | cret := xComboRowGetEnableSearch(x.GoPointer()) | 130 | cret := xComboRowGetEnableSearch(x.GoPointer()) | ||
| 134 | return cret | 131 | return cret | ||
| 135 | } | 132 | } | ||
| @@ -138,7 +135,6 @@ var xComboRowGetExpression func(uintptr) uintptr | |||||
| 138 | 135 | ||||
| 139 | // Gets the expression used to obtain strings from items. | 136 | // Gets the expression used to obtain strings from items. | ||
| 140 | func (x *ComboRow) GetExpression() *gtk.Expression { | 137 | func (x *ComboRow) GetExpression() *gtk.Expression { | ||
| 141 | - | core.LazyRegister(&xComboRowGetExpression, "ADW", "adw_combo_row_get_expression", false) | |||
| 142 | var cls *gtk.Expression | 138 | var cls *gtk.Expression | ||
| 143 | 139 | ||||
| 144 | cret := xComboRowGetExpression(x.GoPointer()) | 140 | cret := xComboRowGetExpression(x.GoPointer()) | ||
| @@ -156,7 +152,6 @@ var xComboRowGetFactory func(uintptr) uintptr | |||||
| 156 | 152 | ||||
| 157 | // Gets the factory for populating list items. | 153 | // Gets the factory for populating list items. | ||
| 158 | func (x *ComboRow) GetFactory() *gtk.ListItemFactory { | 154 | func (x *ComboRow) GetFactory() *gtk.ListItemFactory { | ||
| 159 | - | core.LazyRegister(&xComboRowGetFactory, "ADW", "adw_combo_row_get_factory", false) | |||
| 160 | var cls *gtk.ListItemFactory | 155 | var cls *gtk.ListItemFactory | ||
| 161 | 156 | ||||
| 162 | cret := xComboRowGetFactory(x.GoPointer()) | 157 | cret := xComboRowGetFactory(x.GoPointer()) | ||
| @@ -174,7 +169,6 @@ var xComboRowGetHeaderFactory func(uintptr) uintptr | |||||
| 174 | 169 | ||||
| 175 | // Gets the factory that's currently used to create header widgets for the popup. | 170 | // Gets the factory that's currently used to create header widgets for the popup. | ||
| 176 | func (x *ComboRow) GetHeaderFactory() *gtk.ListItemFactory { | 171 | func (x *ComboRow) GetHeaderFactory() *gtk.ListItemFactory { | ||
| 177 | - | core.LazyRegister(&xComboRowGetHeaderFactory, "ADW", "adw_combo_row_get_header_factory", false) | |||
| 178 | var cls *gtk.ListItemFactory | 172 | var cls *gtk.ListItemFactory | ||
| 179 | 173 | ||||
| 180 | cret := xComboRowGetHeaderFactory(x.GoPointer()) | 174 | cret := xComboRowGetHeaderFactory(x.GoPointer()) | ||
| @@ -192,7 +186,6 @@ var xComboRowGetListFactory func(uintptr) uintptr | |||||
| 192 | 186 | ||||
| 193 | // Gets the factory for populating list items in the popup. | 187 | // Gets the factory for populating list items in the popup. | ||
| 194 | func (x *ComboRow) GetListFactory() *gtk.ListItemFactory { | 188 | func (x *ComboRow) GetListFactory() *gtk.ListItemFactory { | ||
| 195 | - | core.LazyRegister(&xComboRowGetListFactory, "ADW", "adw_combo_row_get_list_factory", false) | |||
| 196 | var cls *gtk.ListItemFactory | 189 | var cls *gtk.ListItemFactory | ||
| 197 | 190 | ||||
| 198 | cret := xComboRowGetListFactory(x.GoPointer()) | 191 | cret := xComboRowGetListFactory(x.GoPointer()) | ||
| @@ -210,7 +203,6 @@ var xComboRowGetModel func(uintptr) uintptr | |||||
| 210 | 203 | ||||
| 211 | // Gets the model that provides the displayed items. | 204 | // Gets the model that provides the displayed items. | ||
| 212 | func (x *ComboRow) GetModel() *gio.ListModelBase { | 205 | func (x *ComboRow) GetModel() *gio.ListModelBase { | ||
| 213 | - | core.LazyRegister(&xComboRowGetModel, "ADW", "adw_combo_row_get_model", false) | |||
| 214 | var cls *gio.ListModelBase | 206 | var cls *gio.ListModelBase | ||
| 215 | 207 | ||||
| 216 | cret := xComboRowGetModel(x.GoPointer()) | 208 | cret := xComboRowGetModel(x.GoPointer()) | ||
| @@ -228,8 +220,6 @@ var xComboRowGetSearchMatchMode func(uintptr) gtk.StringFilterMatchMode | |||||
| 228 | 220 | ||||
| 229 | // Returns the match mode that the search filter is using. | 221 | // Returns the match mode that the search filter is using. | ||
| 230 | func (x *ComboRow) GetSearchMatchMode() gtk.StringFilterMatchMode { | 222 | func (x *ComboRow) GetSearchMatchMode() gtk.StringFilterMatchMode { | ||
| 231 | - | core.LazyRegister(&xComboRowGetSearchMatchMode, "ADW", "adw_combo_row_get_search_match_mode", false) | |||
| 232 | - | ||||
| 233 | cret := xComboRowGetSearchMatchMode(x.GoPointer()) | 223 | cret := xComboRowGetSearchMatchMode(x.GoPointer()) | ||
| 234 | return cret | 224 | return cret | ||
| 235 | } | 225 | } | ||
| @@ -238,8 +228,6 @@ var xComboRowGetSelected func(uintptr) uint | |||||
| 238 | 228 | ||||
| 239 | // Gets the position of the selected item. | 229 | // Gets the position of the selected item. | ||
| 240 | func (x *ComboRow) GetSelected() uint { | 230 | func (x *ComboRow) GetSelected() uint { | ||
| 241 | - | core.LazyRegister(&xComboRowGetSelected, "ADW", "adw_combo_row_get_selected", false) | |||
| 242 | - | ||||
| 243 | cret := xComboRowGetSelected(x.GoPointer()) | 231 | cret := xComboRowGetSelected(x.GoPointer()) | ||
| 244 | return cret | 232 | return cret | ||
| 245 | } | 233 | } | ||
| @@ -248,7 +236,6 @@ var xComboRowGetSelectedItem func(uintptr) uintptr | |||||
| 248 | 236 | ||||
| 249 | // Gets the selected item. | 237 | // Gets the selected item. | ||
| 250 | func (x *ComboRow) GetSelectedItem() *gobject.Object { | 238 | func (x *ComboRow) GetSelectedItem() *gobject.Object { | ||
| 251 | - | core.LazyRegister(&xComboRowGetSelectedItem, "ADW", "adw_combo_row_get_selected_item", false) | |||
| 252 | var cls *gobject.Object | 239 | var cls *gobject.Object | ||
| 253 | 240 | ||||
| 254 | cret := xComboRowGetSelectedItem(x.GoPointer()) | 241 | cret := xComboRowGetSelectedItem(x.GoPointer()) | ||
| @@ -266,8 +253,6 @@ var xComboRowGetUseSubtitle func(uintptr) bool | |||||
| 266 | 253 | ||||
| 267 | // Gets whether to use the current value as the subtitle. | 254 | // Gets whether to use the current value as the subtitle. | ||
| 268 | func (x *ComboRow) GetUseSubtitle() bool { | 255 | func (x *ComboRow) GetUseSubtitle() bool { | ||
| 269 | - | core.LazyRegister(&xComboRowGetUseSubtitle, "ADW", "adw_combo_row_get_use_subtitle", false) | |||
| 270 | - | ||||
| 271 | cret := xComboRowGetUseSubtitle(x.GoPointer()) | 256 | cret := xComboRowGetUseSubtitle(x.GoPointer()) | ||
| 272 | return cret | 257 | return cret | ||
| 273 | } | 258 | } | ||
| @@ -281,8 +266,6 @@ var xComboRowSetEnableSearch func(uintptr, bool) | |||||
| 281 | // | 266 | // | ||
| 282 | // Search requires [property@ComboRow:expression] to be set. | 267 | // Search requires [property@ComboRow:expression] to be set. | ||
| 283 | func (x *ComboRow) SetEnableSearch(EnableSearchVar bool) { | 268 | func (x *ComboRow) SetEnableSearch(EnableSearchVar bool) { | ||
| 284 | - | core.LazyRegister(&xComboRowSetEnableSearch, "ADW", "adw_combo_row_set_enable_search", false) | |||
| 285 | - | ||||
| 286 | xComboRowSetEnableSearch(x.GoPointer(), EnableSearchVar) | 269 | xComboRowSetEnableSearch(x.GoPointer(), EnableSearchVar) | ||
| 287 | } | 270 | } | ||
| 288 | 271 | ||||
| @@ -296,8 +279,6 @@ var xComboRowSetExpression func(uintptr, uintptr) | |||||
| 296 | // [property@ComboRow:factory] is not set, or when | 279 | // [property@ComboRow:factory] is not set, or when | ||
| 297 | // [property@ComboRow:use-subtitle] is set to `TRUE`. | 280 | // [property@ComboRow:use-subtitle] is set to `TRUE`. | ||
| 298 | func (x *ComboRow) SetExpression(ExpressionVar *gtk.Expression) { | 281 | func (x *ComboRow) SetExpression(ExpressionVar *gtk.Expression) { | ||
| 299 | - | core.LazyRegister(&xComboRowSetExpression, "ADW", "adw_combo_row_set_expression", false) | |||
| 300 | - | ||||
| 301 | xComboRowSetExpression(x.GoPointer(), ExpressionVar.GoPointer()) | 282 | xComboRowSetExpression(x.GoPointer(), ExpressionVar.GoPointer()) | ||
| 302 | } | 283 | } | ||
| 303 | 284 | ||||
| @@ -308,8 +289,6 @@ var xComboRowSetFactory func(uintptr, uintptr) | |||||
| 308 | // This factory is always used for the item in the row. It is also used for | 289 | // This factory is always used for the item in the row. It is also used for | ||
| 309 | // items in the popup unless [property@ComboRow:list-factory] is set. | 290 | // items in the popup unless [property@ComboRow:list-factory] is set. | ||
| 310 | func (x *ComboRow) SetFactory(FactoryVar *gtk.ListItemFactory) { | 291 | func (x *ComboRow) SetFactory(FactoryVar *gtk.ListItemFactory) { | ||
| 311 | - | core.LazyRegister(&xComboRowSetFactory, "ADW", "adw_combo_row_set_factory", false) | |||
| 312 | - | ||||
| 313 | xComboRowSetFactory(x.GoPointer(), FactoryVar.GoPointer()) | 292 | xComboRowSetFactory(x.GoPointer(), FactoryVar.GoPointer()) | ||
| 314 | } | 293 | } | ||
| 315 | 294 | ||||
| @@ -317,8 +296,6 @@ var xComboRowSetHeaderFactory func(uintptr, uintptr) | |||||
| 317 | 296 | ||||
| 318 | // Sets the factory to use for creating header widgets for the popup. | 297 | // Sets the factory to use for creating header widgets for the popup. | ||
| 319 | func (x *ComboRow) SetHeaderFactory(FactoryVar *gtk.ListItemFactory) { | 298 | func (x *ComboRow) SetHeaderFactory(FactoryVar *gtk.ListItemFactory) { | ||
| 320 | - | core.LazyRegister(&xComboRowSetHeaderFactory, "ADW", "adw_combo_row_set_header_factory", false) | |||
| 321 | - | ||||
| 322 | xComboRowSetHeaderFactory(x.GoPointer(), FactoryVar.GoPointer()) | 299 | xComboRowSetHeaderFactory(x.GoPointer(), FactoryVar.GoPointer()) | ||
| 323 | } | 300 | } | ||
| 324 | 301 | ||||
| @@ -328,8 +305,6 @@ var xComboRowSetListFactory func(uintptr, uintptr) | |||||
| 328 | // | 305 | // | ||
| 329 | // If this is not set, [property@ComboRow:factory] is used. | 306 | // If this is not set, [property@ComboRow:factory] is used. | ||
| 330 | func (x *ComboRow) SetListFactory(FactoryVar *gtk.ListItemFactory) { | 307 | func (x *ComboRow) SetListFactory(FactoryVar *gtk.ListItemFactory) { | ||
| 331 | - | core.LazyRegister(&xComboRowSetListFactory, "ADW", "adw_combo_row_set_list_factory", false) | |||
| 332 | - | ||||
| 333 | xComboRowSetListFactory(x.GoPointer(), FactoryVar.GoPointer()) | 308 | xComboRowSetListFactory(x.GoPointer(), FactoryVar.GoPointer()) | ||
| 334 | } | 309 | } | ||
| 335 | 310 | ||||
| @@ -337,8 +312,6 @@ var xComboRowSetModel func(uintptr, uintptr) | |||||
| 337 | 312 | ||||
| 338 | // Sets the model that provides the displayed items. | 313 | // Sets the model that provides the displayed items. | ||
| 339 | func (x *ComboRow) SetModel(ModelVar gio.ListModel) { | 314 | func (x *ComboRow) SetModel(ModelVar gio.ListModel) { | ||
| 340 | - | core.LazyRegister(&xComboRowSetModel, "ADW", "adw_combo_row_set_model", false) | |||
| 341 | - | ||||
| 342 | xComboRowSetModel(x.GoPointer(), ModelVar.GoPointer()) | 315 | xComboRowSetModel(x.GoPointer(), ModelVar.GoPointer()) | ||
| 343 | } | 316 | } | ||
| 344 | 317 | ||||
| @@ -346,8 +319,6 @@ var xComboRowSetSearchMatchMode func(uintptr, gtk.StringFilterMatchMode) | |||||
| 346 | 319 | ||||
| 347 | // Sets the match mode for the search filter. | 320 | // Sets the match mode for the search filter. | ||
| 348 | func (x *ComboRow) SetSearchMatchMode(SearchMatchModeVar gtk.StringFilterMatchMode) { | 321 | func (x *ComboRow) SetSearchMatchMode(SearchMatchModeVar gtk.StringFilterMatchMode) { | ||
| 349 | - | core.LazyRegister(&xComboRowSetSearchMatchMode, "ADW", "adw_combo_row_set_search_match_mode", false) | |||
| 350 | - | ||||
| 351 | xComboRowSetSearchMatchMode(x.GoPointer(), SearchMatchModeVar) | 322 | xComboRowSetSearchMatchMode(x.GoPointer(), SearchMatchModeVar) | ||
| 352 | } | 323 | } | ||
| 353 | 324 | ||||
| @@ -355,8 +326,6 @@ var xComboRowSetSelected func(uintptr, uint) | |||||
| 355 | 326 | ||||
| 356 | // Selects the item at the given position. | 327 | // Selects the item at the given position. | ||
| 357 | func (x *ComboRow) SetSelected(PositionVar uint) { | 328 | func (x *ComboRow) SetSelected(PositionVar uint) { | ||
| 358 | - | core.LazyRegister(&xComboRowSetSelected, "ADW", "adw_combo_row_set_selected", false) | |||
| 359 | - | ||||
| 360 | xComboRowSetSelected(x.GoPointer(), PositionVar) | 329 | xComboRowSetSelected(x.GoPointer(), PositionVar) | ||
| 361 | } | 330 | } | ||
| 362 | 331 | ||||
| @@ -372,8 +341,6 @@ var xComboRowSetUseSubtitle func(uintptr, bool) | |||||
| 372 | // The subtitle is interpreted as Pango markup if | 341 | // The subtitle is interpreted as Pango markup if | ||
| 373 | // [property@PreferencesRow:use-markup] is set to `TRUE`. | 342 | // [property@PreferencesRow:use-markup] is set to `TRUE`. | ||
| 374 | func (x *ComboRow) SetUseSubtitle(UseSubtitleVar bool) { | 343 | func (x *ComboRow) SetUseSubtitle(UseSubtitleVar bool) { | ||
| 375 | - | core.LazyRegister(&xComboRowSetUseSubtitle, "ADW", "adw_combo_row_set_use_subtitle", false) | |||
| 376 | - | ||||
| 377 | xComboRowSetUseSubtitle(x.GoPointer(), UseSubtitleVar) | 344 | xComboRowSetUseSubtitle(x.GoPointer(), UseSubtitleVar) | ||
| 378 | } | 345 | } | ||
| 379 | 346 | ||||
| @@ -813,4 +780,36 @@ func (x *ComboRow) GetBuildableId() string { | |||||
| 813 | func init() { | 780 | func init() { | ||
| 814 | core.SetPackageName("ADW", "libadwaita-1") | 781 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 815 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 782 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 783 | + | var libs []uintptr | |||
| 784 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 785 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 786 | + | if err != nil { | |||
| 787 | + | panic(err) | |||
| 788 | + | } | |||
| 789 | + | libs = append(libs, lib) | |||
| 790 | + | } | |||
| 791 | + | ||||
| 792 | + | core.PuregoSafeRegister(&xComboRowGLibType, libs, "adw_combo_row_get_type") | |||
| 793 | + | ||||
| 794 | + | core.PuregoSafeRegister(&xNewComboRow, libs, "adw_combo_row_new") | |||
| 795 | + | ||||
| 796 | + | core.PuregoSafeRegister(&xComboRowGetEnableSearch, libs, "adw_combo_row_get_enable_search") | |||
| 797 | + | core.PuregoSafeRegister(&xComboRowGetExpression, libs, "adw_combo_row_get_expression") | |||
| 798 | + | core.PuregoSafeRegister(&xComboRowGetFactory, libs, "adw_combo_row_get_factory") | |||
| 799 | + | core.PuregoSafeRegister(&xComboRowGetHeaderFactory, libs, "adw_combo_row_get_header_factory") | |||
| 800 | + | core.PuregoSafeRegister(&xComboRowGetListFactory, libs, "adw_combo_row_get_list_factory") | |||
| 801 | + | core.PuregoSafeRegister(&xComboRowGetModel, libs, "adw_combo_row_get_model") | |||
| 802 | + | core.PuregoSafeRegister(&xComboRowGetSearchMatchMode, libs, "adw_combo_row_get_search_match_mode") | |||
| 803 | + | core.PuregoSafeRegister(&xComboRowGetSelected, libs, "adw_combo_row_get_selected") | |||
| 804 | + | core.PuregoSafeRegister(&xComboRowGetSelectedItem, libs, "adw_combo_row_get_selected_item") | |||
| 805 | + | core.PuregoSafeRegister(&xComboRowGetUseSubtitle, libs, "adw_combo_row_get_use_subtitle") | |||
| 806 | + | core.PuregoSafeRegister(&xComboRowSetEnableSearch, libs, "adw_combo_row_set_enable_search") | |||
| 807 | + | core.PuregoSafeRegister(&xComboRowSetExpression, libs, "adw_combo_row_set_expression") | |||
| 808 | + | core.PuregoSafeRegister(&xComboRowSetFactory, libs, "adw_combo_row_set_factory") | |||
| 809 | + | core.PuregoSafeRegister(&xComboRowSetHeaderFactory, libs, "adw_combo_row_set_header_factory") | |||
| 810 | + | core.PuregoSafeRegister(&xComboRowSetListFactory, libs, "adw_combo_row_set_list_factory") | |||
| 811 | + | core.PuregoSafeRegister(&xComboRowSetModel, libs, "adw_combo_row_set_model") | |||
| 812 | + | core.PuregoSafeRegister(&xComboRowSetSearchMatchMode, libs, "adw_combo_row_set_search_match_mode") | |||
| 813 | + | core.PuregoSafeRegister(&xComboRowSetSelected, libs, "adw_combo_row_set_selected") | |||
| 814 | + | core.PuregoSafeRegister(&xComboRowSetUseSubtitle, libs, "adw_combo_row_set_use_subtitle") | |||
| 816 | } | 815 | } | ||