Mercurial > hg > toolkit / file diff

--- a/ui/winui/toolkit.cpp	Sun Dec 07 10:51:47 2025 +0100
+++ b/ui/winui/toolkit.cpp	Sun Dec 07 11:05:22 2025 +0100
@@ -37,6 +37,7 @@
 #include "../common/document.h"
 #include "../common/toolbar.h"
 #include "../common/properties.h"
+#include "../common/app.h"
 
 #include "icons.h"
 
@@ -55,15 +56,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 ui_callback   appclose_fnc;
 
 static void* appclose_udata;
@@ -75,19 +67,14 @@
 
 void ui_app_run_startup() {
 	uiDispatcherQueue = winrt::Microsoft::UI::Dispatching::DispatcherQueue::GetForCurrentThread();
-	
-	if (startup_func) {
-		startup_func(NULL, startup_data);
-	}
+	uic_application_startup(NULL);
 }
 
 class App : public ApplicationT<App, IXamlMetadataProvider> {
 public:
 	void OnLaunched(LaunchActivatedEventArgs const&) {
 		Resources().MergedDictionaries().Append(XamlControlsResources());
-		if (startup_func) {
-			startup_func(NULL, startup_data);
-		}
+		uic_application_startup(NULL);
 
 		//auto window = make<winui::implementation::MainWindow>();
 		//window.Activate();
@@ -175,21 +162,6 @@
 	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() {
 	/*
 	init_apartment();