diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapped/generated/functions_list.txt | 3 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappedgtkx112types.h | 3 | ||||
| -rwxr-xr-x | src/wrapped/wrappedgtkx112.c | 27 | ||||
| -rwxr-xr-x | src/wrapped/wrappedgtkx112_private.h | 4 |
4 files changed, 32 insertions, 5 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index 51d6d6b8..ab42a065 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -2272,8 +2272,11 @@ wrappedgtkx112: - gtk_tree_model_foreach - vFppV: - gtk_dialog_add_buttons + - gtk_list_store_set - gtk_message_dialog_format_secondary_markup - gtk_message_dialog_format_secondary_text +- vFppA: + - gtk_list_store_set_valist - uFupp: - gtk_timeout_add - vFppup: diff --git a/src/wrapped/generated/wrappedgtkx112types.h b/src/wrapped/generated/wrappedgtkx112types.h index 854862aa..b28d7934 100644 --- a/src/wrapped/generated/wrappedgtkx112types.h +++ b/src/wrapped/generated/wrappedgtkx112types.h @@ -18,6 +18,7 @@ typedef int64_t (*iFpp_t)(void*, void*); typedef void* (*pFpi_t)(void*, int64_t); typedef void (*vFppp_t)(void*, void*, void*); typedef void (*vFppV_t)(void*, void*, ...); +typedef void (*vFppA_t)(void*, void*, va_list); typedef uint64_t (*uFupp_t)(uint64_t, void*, void*); typedef void (*vFppup_t)(void*, void*, uint64_t, void*); typedef void (*vFpppp_t)(void*, void*, void*, void*); @@ -53,8 +54,10 @@ typedef void* (*pFpipppppppi_t)(void*, int64_t, void*, void*, void*, void*, void GO(gtk_menu_attach_to_widget, vFppp_t) \ GO(gtk_tree_model_foreach, vFppp_t) \ GO(gtk_dialog_add_buttons, vFppV_t) \ + GO(gtk_list_store_set, vFppV_t) \ GO(gtk_message_dialog_format_secondary_markup, vFppV_t) \ GO(gtk_message_dialog_format_secondary_text, vFppV_t) \ + GO(gtk_list_store_set_valist, vFppA_t) \ GO(gtk_timeout_add, uFupp_t) \ GO(gtk_action_group_add_actions, vFppup_t) \ GO(gtk_clipboard_request_contents, vFpppp_t) \ diff --git a/src/wrapped/wrappedgtkx112.c b/src/wrapped/wrappedgtkx112.c index e1ad8b11..8293822b 100755 --- a/src/wrapped/wrappedgtkx112.c +++ b/src/wrapped/wrappedgtkx112.c @@ -38,6 +38,7 @@ typedef void* (*pFpi_t)(void*, int); typedef void* (*pFpL_t)(void*, size_t); typedef void (*vFpp_t)(void*, void*); typedef void* (*pFppi_t)(void*, void*, int32_t); +typedef void (*vFppA_t)(void*, void*, va_list); typedef int32_t (*iFppp_t)(void*, void*, void*); typedef void (*vFppp_t)(void*, void*, void*); typedef uint32_t (*uFupp_t)(uint32_t, void*, void*); @@ -127,6 +128,7 @@ typedef void* (*pFpipppppppi_t)(void*, int, void*, void*, void*, void*, GO(gtk_clipboard_request_text, vFppp_t) \ GO(gtk_clipboard_request_contents, vFpppp_t)\ GO(gtk_input_add_full, uFiipppp_t) \ + GO(gtk_list_store_set_valist, vFppA_t) \ @@ -637,7 +639,7 @@ EXPORT void my_gtk_dialog_add_buttons(x64emu_t* emu, void* dialog, void* first, void* btn = first; while(btn) { - int id = (int)*(b++); + uintptr_t id = *(b++); my->gtk_dialog_add_button(dialog, btn, id); btn = (void*)*(b++); } @@ -672,6 +674,25 @@ EXPORT void my_gtk_message_dialog_format_secondary_markup(x64emu_t* emu, void* d my->gtk_message_dialog_format_secondary_markup(dialog, buf); free(buf); } + +EXPORT void my_gtk_list_store_set_valist(x64emu_t* emu, void* list, void* iter, x64_va_list_t V) +{ + library_t * lib = GetLibInternal(libname); + gtkx112_my_t *my = (gtkx112_my_t*)lib->priv.w.p2; + + CONVERT_VALIST(V); + my->gtk_list_store_set_valist(list, iter, VARARGS); +} + +EXPORT void my_gtk_list_store_set(x64emu_t* emu, void* list, void* iter, uintptr_t* b) +{ + library_t * lib = GetLibInternal(libname); + gtkx112_my_t *my = (gtkx112_my_t*)lib->priv.w.p2; + + CREATE_VALIST_FROM_VAARG(b, emu->scratch, 2); + my->gtk_list_store_set_valist(list, iter, VARARGS); +} + EXPORT void* my_gtk_type_class(x64emu_t* emu, size_t type) { library_t * lib = GetLibInternal(libname); @@ -871,7 +892,7 @@ EXPORT void my_gtk_tree_sortable_set_default_sort_func(x64emu_t* emu, void* sort my->gtk_tree_sortable_set_default_sort_func(sortable, findGtkTreeIterCompareFuncFct(f), data, findGDestroyNotifyFct(notify)); } -EXPORT int my_gtk_type_unique(x64emu_t* emu, int parent, my_GtkTypeInfo_t* gtkinfo) +EXPORT size_t my_gtk_type_unique(x64emu_t* emu, size_t parent, my_GtkTypeInfo_t* gtkinfo) { library_t * lib = GetLibInternal(libname); gtkx112_my_t *my = (gtkx112_my_t*)lib->priv.w.p2; @@ -900,7 +921,7 @@ EXPORT float my_gtk_spin_button_get_value_as_float(x64emu_t* emu, void* spinner) return my->gtk_spin_button_get_value(spinner); } -static int gtk1Type(gtkx112_my_t *my, size_t type) +static size_t gtk1Type(gtkx112_my_t *my, size_t type) { if (type==21) return my->gtk_object_get_type(); diff --git a/src/wrapped/wrappedgtkx112_private.h b/src/wrapped/wrappedgtkx112_private.h index 3738e435..d4b04e9a 100755 --- a/src/wrapped/wrappedgtkx112_private.h +++ b/src/wrapped/wrappedgtkx112_private.h @@ -1576,9 +1576,9 @@ GO(gtk_list_store_newv, pFip) GO(gtk_list_store_prepend, vFpp) GO(gtk_list_store_remove, iFpp) GO(gtk_list_store_reorder, vFpp) -GO2(gtk_list_store_set, vFppV, gtk_list_store_set_valist) +GOM(gtk_list_store_set, vFEppV) GO(gtk_list_store_set_column_types, vFpip) -GO(gtk_list_store_set_valist, vFppp) +GOM(gtk_list_store_set_valist, vFEppA) GO(gtk_list_store_set_value, vFppip) GO(gtk_list_store_set_valuesv, vFppppi) //TODO: check if GValues need alignement GO(gtk_list_store_swap, vFppp) |