diff options
| -rw-r--r-- | src/wrapped/generated/functions_list.txt | 3 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappedgtk3types.h | 3 | ||||
| -rw-r--r-- | src/wrapped/wrappedgtk3.c | 17 | ||||
| -rw-r--r-- | src/wrapped/wrappedgtk3_private.h | 4 |
4 files changed, 25 insertions, 2 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index 9c71b2aa..4061b045 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -3810,7 +3810,10 @@ wrappedgtk3: - gtk_message_dialog_format_secondary_markup - gtk_message_dialog_format_secondary_text - gtk_style_context_get + - gtk_tree_store_set - gtk_widget_style_get +- vFppA: + - gtk_tree_store_set_valist - uFupp: - gtk_timeout_add - vFppiV: diff --git a/src/wrapped/generated/wrappedgtk3types.h b/src/wrapped/generated/wrappedgtk3types.h index a8cbb22e..477cff95 100644 --- a/src/wrapped/generated/wrappedgtk3types.h +++ b/src/wrapped/generated/wrappedgtk3types.h @@ -20,6 +20,7 @@ typedef void* (*pFuV_t)(uint32_t, ...); typedef void (*vFpiA_t)(void*, int32_t, va_list); typedef void (*vFppp_t)(void*, void*, void*); typedef void (*vFppV_t)(void*, void*, ...); +typedef void (*vFppA_t)(void*, void*, va_list); typedef uint32_t (*uFupp_t)(uint32_t, void*, void*); typedef void (*vFppiV_t)(void*, void*, int32_t, ...); typedef void (*vFpppi_t)(void*, void*, void*, int32_t); @@ -55,7 +56,9 @@ typedef void* (*pFpipppppppi_t)(void*, int32_t, void*, void*, void*, void*, void GO(gtk_message_dialog_format_secondary_markup, vFppV_t) \ GO(gtk_message_dialog_format_secondary_text, vFppV_t) \ GO(gtk_style_context_get, vFppV_t) \ + GO(gtk_tree_store_set, vFppV_t) \ GO(gtk_widget_style_get, vFppV_t) \ + GO(gtk_tree_store_set_valist, vFppA_t) \ GO(gtk_timeout_add, uFupp_t) \ GO(gtk_list_store_insert_with_values, vFppiV_t) \ GO(gtk_enumerate_printers, vFpppi_t) \ diff --git a/src/wrapped/wrappedgtk3.c b/src/wrapped/wrappedgtk3.c index 698fa440..0a49279e 100644 --- a/src/wrapped/wrappedgtk3.c +++ b/src/wrapped/wrappedgtk3.c @@ -800,6 +800,23 @@ EXPORT void my3_gtk_list_store_insert_with_values(x64emu_t* emu, void* list_stor my->gtk_list_store_insert_with_valuesv(list_store, iter, position, columns, values, n); } +EXPORT void my3_gtk_tree_store_set_valist(x64emu_t* emu, void* tree, void* iter, x64_va_list_t V) +{ + #ifdef CONVERT_VALIST + CONVERT_VALIST(V); + #else + CREATE_VALIST_FROM_VALIST(V, emu->scratch); + #endif + my->gtk_tree_store_set_valist(tree, iter, VARARGS); +} + +EXPORT void my3_gtk_tree_store_set(x64emu_t* emu, void* tree, void* iter, uintptr_t* b) +{ + CREATE_VALIST_FROM_VAARG(b, emu->scratch, 2); + my->gtk_tree_store_set_valist(tree, iter, VARARGS); +} + + #define PRE_INIT \ if(box64_nogtk) \ return -1; diff --git a/src/wrapped/wrappedgtk3_private.h b/src/wrapped/wrappedgtk3_private.h index d27f88d7..b6b5e2f2 100644 --- a/src/wrapped/wrappedgtk3_private.h +++ b/src/wrapped/wrappedgtk3_private.h @@ -3613,9 +3613,9 @@ GO(gtk_tree_store_newv, pFip) GO(gtk_tree_store_prepend, vFppp) //GO(gtk_tree_store_remove, GO(gtk_tree_store_reorder, vFppp) -//GO2(gtk_tree_store_set, vFppV, gtk_tree_store_set_valist) +GOM(gtk_tree_store_set, vFEppV) GO(gtk_tree_store_set_column_types, vFpip) -//GO(gtk_tree_store_set_valist, vFppp) +GOM(gtk_tree_store_set_valist, vFEppA) GO(gtk_tree_store_set_value, vFppip) GO(gtk_tree_store_set_valuesv, vFppppi) //GO(gtk_tree_store_swap, |