about summary refs log tree commit diff stats
path: root/src/wrapped
diff options
context:
space:
mode:
authorlizhuoheng <114734429+LiZhuoheng-coder@users.noreply.github.com>2023-04-23 14:33:56 +0800
committerGitHub <noreply@github.com>2023-04-23 08:33:56 +0200
commit24ead2f125464a8e1faef3248523f5d42e9898ef (patch)
tree8d451c5ccde19e033b9a661487e72255d910d8a3 /src/wrapped
parent225e50a32aa9c15eb71ee8eef6bf45748074c7fa (diff)
downloadbox64-24ead2f125464a8e1faef3248523f5d42e9898ef.tar.gz
box64-24ead2f125464a8e1faef3248523f5d42e9898ef.zip
Added more gtk3 wrapped functions (#727)
Diffstat (limited to 'src/wrapped')
-rwxr-xr-xsrc/wrapped/wrappedgio2_private.h20
-rwxr-xr-xsrc/wrapped/wrappedgtk3.c10
-rwxr-xr-xsrc/wrapped/wrappedgtk3_private.h16
3 files changed, 36 insertions, 10 deletions
diff --git a/src/wrapped/wrappedgio2_private.h b/src/wrapped/wrappedgio2_private.h
index 148759ae..46a8ca7a 100755
--- a/src/wrapped/wrappedgio2_private.h
+++ b/src/wrapped/wrappedgio2_private.h
@@ -27,10 +27,10 @@ GO(g_action_group_get_type, LFv)
 GO(g_action_group_has_action, iFpp)
 GO(g_action_group_list_actions, pFp)
 GO(g_action_group_query_action, iFppppppp)
-//GO(g_action_map_add_action, 
+GO(g_action_map_add_action, vFpp)
 //GO(g_action_map_add_action_entries, 
 //GO(g_action_map_get_type, 
-//GO(g_action_map_lookup_action, 
+GO(g_action_map_lookup_action, pFpp)
 //GO(g_action_map_remove_action, 
 //GO(g_action_name_is_valid, 
 //GO(g_action_parse_detailed_name, 
@@ -1027,9 +1027,9 @@ GO(g_list_model_get_object, pFpu)
 //GO(g_memory_output_stream_steal_as_bytes, 
 //GO(g_memory_output_stream_steal_data, 
 //GO(g_memory_settings_backend_new, 
-//GO(g_menu_append, 
+GO(g_menu_append, vFppp)
 //GO(g_menu_append_item, 
-//GO(g_menu_append_section, 
+GO(g_menu_append_section, vFppp)
 //GO(g_menu_append_submenu, 
 //GO(g_menu_attribute_iter_get_name, 
 //GO(g_menu_attribute_iter_get_next, 
@@ -1074,7 +1074,7 @@ GO(g_list_model_get_object, pFpu)
 //GO(g_menu_model_items_changed, 
 //GO(g_menu_model_iterate_item_attributes, 
 //GO(g_menu_model_iterate_item_links, 
-//GO(g_menu_new, 
+GO(g_menu_new, pFv)
 //GO(g_menu_prepend, 
 //GO(g_menu_prepend_item, 
 //GO(g_menu_prepend_section, 
@@ -1306,7 +1306,7 @@ GO(g_settings_apply, vFp)
 //GO(g_settings_bind_flags_get_type, 
 //GO(g_settings_bind_with_mapping, 
 //GO(g_settings_bind_writable, 
-//GO(g_settings_create_action, 
+GO(g_settings_create_action, pFpp)
 GO(g_settings_delay, vFp)
 //GO(g_settings_get, 
 GO(g_settings_get_boolean, iFpp)
@@ -1362,18 +1362,18 @@ GO(g_settings_schema_source_ref, pFp)
 GO(g_settings_schema_source_unref, vFp)
 GO(g_settings_schema_unref, vFp)
 //GO(g_settings_set, 
-//GO(g_settings_set_boolean, 
+GO(g_settings_set_boolean, iFppi)
 //GO(g_settings_set_double, 
 //GO(g_settings_set_enum, 
 //GO(g_settings_set_flags, 
-//GO(g_settings_set_int, 
+GO(g_settings_set_int, iFppi)
 //GO(g_settings_set_string, 
 //GO(g_settings_set_strv, 
 //GO(g_settings_set_uint, 
 GO(g_settings_set_value, iFppp)
 GO(g_settings_sync, vFv)
 //GO(g_settings_unbind, 
-//GO(g_simple_action_get_type, 
+GO(g_simple_action_get_type, LFv)
 //GO(g_simple_action_group_add_entries, 
 //GO(g_simple_action_group_get_type, 
 //GO(g_simple_action_group_insert, 
@@ -1382,7 +1382,7 @@ GO(g_settings_sync, vFv)
 //GO(g_simple_action_group_remove, 
 //GO(g_simple_action_new, 
 //GO(g_simple_action_new_stateful, 
-//GO(g_simple_action_set_enabled, 
+GO(g_simple_action_set_enabled, vFpi)
 //GO(g_simple_action_set_state, 
 GOM(g_simple_async_report_error_in_idle, vFEpppuipV)
 GOM(g_simple_async_report_gerror_in_idle, vFEpppp)
diff --git a/src/wrapped/wrappedgtk3.c b/src/wrapped/wrappedgtk3.c
index edf0dec0..64ced1ac 100755
--- a/src/wrapped/wrappedgtk3.c
+++ b/src/wrapped/wrappedgtk3.c
@@ -38,12 +38,15 @@ typedef void          (*vFpipV_t)(void*, int, void*, ...);
 #define ADDED_FUNCTIONS()                   \
 GO(g_type_class_ref, pFL_t)                 \
 GO(g_type_class_unref, vFp_t)               \
+GO(gtk_application_window_get_type, LFv_t)  \
 GO(gtk_bin_get_type, LFv_t)                 \
 GO(gtk_widget_get_type, LFv_t)              \
 GO(gtk_button_get_type, LFv_t)              \
 GO(gtk_container_get_type, LFv_t)           \
 GO(gtk_misc_get_type, LFv_t)                \
 GO(gtk_label_get_type, LFv_t)               \
+GO(gtk_list_box_get_type, LFv_t)            \
+GO(gtk_list_box_row_get_type, LFv_t)        \
 GO(gtk_tree_view_get_type, LFv_t)           \
 GO(gtk_window_get_type, LFv_t)              \
 GO(gtk_table_get_type, LFv_t)               \
@@ -61,6 +64,7 @@ GO(gtk_menu_shell_get_type, LFv_t)          \
 GO(gtk_menu_bar_get_type, LFv_t)            \
 GO(gtk_action_get_type, LFv_t)              \
 GO(gtk_application_get_type, LFv_t)         \
+GO(gtk_grid_get_type, LFv_t)                \
 GO(gtk_dialog_add_button, pFppi_t)          \
 GO(gtk_spin_button_get_value, dFp_t)        \
 GO(gtk_builder_lookup_callback_symbol, pFpp_t)  \
@@ -726,7 +730,13 @@ EXPORT void my3_gtk_container_foreach(x64emu_t* emu, void* container, void* cb,
     SetGtkApplicationID(my->gtk_application_get_type());        \
     SetGtkWidget3ID(my->gtk_widget_get_type());                 \
     SetGtkContainer3ID(my->gtk_container_get_type());           \
+    SetGtkBin3ID(my->gtk_bin_get_type());                       \
+    SetGtkWindow3ID(my->gtk_window_get_type());                 \
+    SetGtkApplicationWindowID(my->gtk_application_window_get_type());\
+    SetGtkListBoxID(my->gtk_list_box_get_type());               \
+    SetGtkListBoxRowID(my->gtk_list_box_row_get_type());        \
     SetGtkTextView3ID(my->gtk_text_view_get_type());            \
+    SetGtkGrid3ID(my->gtk_grid_get_type());                     \
     SetGtkActionID(my->gtk_action_get_type());                  \
     setNeededLibs(lib, 3, "libgdk-3.so.0", "libpangocairo-1.0.so.0", "libgio-2.0.so.0");
 
diff --git a/src/wrapped/wrappedgtk3_private.h b/src/wrapped/wrappedgtk3_private.h
index bbc80b43..2b0269ab 100755
--- a/src/wrapped/wrappedgtk3_private.h
+++ b/src/wrapped/wrappedgtk3_private.h
@@ -191,8 +191,11 @@ GO(gtk_alignment_set_padding, vFpuuuu)
 GO(gtk_align_get_type, pFv)
 GO(gtk_alternative_dialog_button_order, iFp)
 GO(gtk_anchor_type_get_type, pFv)
+GO(gtk_application_add_window, vFpp)
 GO(gtk_application_get_new, pFpi)
 GO(gtk_application_get_type, pFv)
+GO(gtk_application_new, pFpi)
+GO(gtk_application_set_accels_for_action, vFppp)
 GO(gtk_application_window_new, pFp)
 GO(gtk_application_window_get_type, pFv)
 GO(gtk_app_chooser_button_get_type, pFv)
@@ -1204,6 +1207,10 @@ GO(gtk_grab_add, vFp)
 GO(gtk_grab_get_current, pFv)
 GO(gtk_grab_remove, vFp)
 GO(gtk_grid_get_type, pFv)
+GO(gtk_grid_set_column_homogeneous, vFpi)
+GO(gtk_grid_set_column_spacing, vFpu)
+GO(gtk_grid_set_row_homogeneous, vFpi)
+GO(gtk_grid_set_row_spacing, vFpu)
 GO(gtk_handle_box_get_child_detached, iFp)
 GO(gtk_handle_box_get_handle_position, iFp)
 GO(gtk_handle_box_get_shadow_type, iFp)
@@ -1221,7 +1228,11 @@ GO(gtk_hbutton_box_get_type, pFv)
 GO(gtk_hbutton_box_new, pFv)
 GO(gtk_hbutton_box_set_layout_default, vFi)
 GO(gtk_hbutton_box_set_spacing_default, vFi)
+GO(gtk_header_bar_new, pFv)
 GO(gtk_header_bar_get_type, lFv)
+GO(gtk_header_bar_pack_end, vFpp)
+GO(gtk_header_bar_set_show_close_button, vFpi)
+GO(gtk_header_bar_set_title, vFpp)
 GO(gtk_hpaned_get_type, pFv)
 //GO(gtk_hpaned_new, 
 GO(gtk_hruler_get_type, pFv)
@@ -1600,6 +1611,7 @@ GO(gtk_link_button_get_type, pFv)
 GO(gtk_list_append_items, vFpp)
 GO(gtk_list_box_get_type, pFv)
 GO(gtk_list_box_row_get_type, pFv)
+GO(gtk_list_box_set_header_func, vFppp)
 GO(gtk_list_child_position, iFpp)
 GO(gtk_list_clear_items, vFpii)
 GO(gtk_list_end_drag_selection, vFp)
@@ -1693,6 +1705,8 @@ GO(gtk_menu_bar_get_type, pFv)
 GO(gtk_menu_bar_new, pFv)
 GO(gtk_menu_bar_set_child_pack_direction, vFpi)
 GO(gtk_menu_bar_set_pack_direction, vFpi)
+GO(gtk_menu_button_new, pFv)
+GO(gtk_menu_button_set_menu_model, vFpp)
 GO(gtk_menu_button_get_type, pFv)
 GO(gtk_menu_detach, vFp)
 GO(gtk_menu_direction_type_get_type, pFv)
@@ -1884,6 +1898,7 @@ GO(gtk_orientable_get_orientation, iFp)
 GO(gtk_orientable_get_type, pFv)
 GO(gtk_orientable_set_orientation, vFpi)
 GO(gtk_orientation_get_type, pFv)
+GO(gtk_overlay_add_overlay, vFpp)
 GO(gtk_overlay_get_type, pFv)
 GO(gtk_pack_direction_get_type, pFv)
 GO(gtk_pack_type_get_type, pFv)
@@ -4172,6 +4187,7 @@ GO(gtk_window_set_startup_id, vFpp)
 GO(gtk_window_set_title, vFpp)
 GO(gtk_window_set_transient_for, vFpp)
 GO(gtk_window_set_type_hint, vFpi)
+GO(gtk_window_set_titlebar, vFpp)
 GO(gtk_window_set_urgency_hint, vFpi)
 GO(gtk_widget_set_visual, vFpp)
 GO(gtk_window_set_wmclass, vFppp)