--- a/ui/win32/toolkit.c Sun Dec 07 10:51:47 2025 +0100 +++ b/ui/win32/toolkit.c Sun Dec 07 11:05:22 2025 +0100 @@ -35,6 +35,7 @@ #include "../common/toolbar.h" #include "../common/document.h" #include "../common/properties.h" +#include "../common/app.h" #include "../ui/widget.h" @@ -45,13 +46,6 @@ static const char *application_name; -static ui_callback startup_func; -static void *startup_data; -static ui_callback open_func; -void *open_data; -static ui_callback exit_func; -void *exit_data; - static HFONT ui_font = NULL; void ui_init(const char *appname, int argc, char **argv) { @@ -91,25 +85,8 @@ 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_main() { - if(startup_func) { - startup_func(NULL, startup_data); - } + uic_application_startup(NULL); // event loop MSG msg; @@ -118,9 +95,7 @@ DispatchMessage(&msg); } - if(exit_func) { - exit_func(NULL, exit_data); - } + uic_application_exit(NULL); uic_store_app_properties(); }