--- a/ui/qt/toolkit.cpp Sun Dec 07 10:51:47 2025 +0100 +++ b/ui/qt/toolkit.cpp Sun Dec 07 11:05:22 2025 +0100 @@ -37,16 +37,10 @@ #include "../common/properties.h" #include "../common/menu.h" #include "../common/toolbar.h" +#include "../common/app.h" static const char *application_name; -static ui_callback startup_func; -static void *startup_data; -static ui_callback open_func; -static void *open_data; -static ui_callback exit_func; -static void *exit_data; - static int is_toplevel_realized = 0; static int app_argc; @@ -73,33 +67,14 @@ return application_name; } -void ui_onstartup(ui_callback f, void *userdata) { - startup_func = f; - startup_data = userdata; -} - -void ui_onopen(ui_callback f, void *userdata) { - open_func = f; - open_data = userdata; -} - -void ui_onexit(ui_callback f, void *userdata) { - exit_func = f; - exit_data = userdata; -} - void ui_app_exit_on_shutdown(UiBool exitapp) { exit_on_shutdown = exitapp; } void ui_main() { - if(startup_func) { - startup_func(NULL, startup_data); - } + uic_application_startup(NULL); application->exec(); - if(exit_func) { - exit_func(NULL, exit_data); - } + uic_application_exit(NULL); uic_store_app_properties(); delete application;