Mercurial > hg > toolkit / file diff

--- a/ui/ui/toolkit.h	Mon May 29 12:48:42 2023 +0200
+++ b/ui/ui/toolkit.h	Fri Sep 22 21:32:45 2023 +0200
@@ -70,16 +70,39 @@
 #elif UI_WINUI
 
 #ifdef __cplusplus
+
 #include <Windows.h>
 #undef GetCurrentTime
 #include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/Windows.UI.Xaml.Interop.h>
 #include <winrt/Microsoft.UI.Xaml.Controls.h>
 
-#define UIWIDGET winrt::Microsoft::UI::Xaml::UIElement
-#define UIWINDOW winrt::Microsoft::UI::Xaml::Window
+class UiWindow {
+public:
+    winrt::Microsoft::UI::Xaml::Window window { nullptr };
+
+    UiWindow(winrt::Microsoft::UI::Xaml::Window& win);
+};
+
+class UiWidget {
+public:
+    winrt::Microsoft::UI::Xaml::UIElement uielement;
+
+    UiWidget(winrt::Microsoft::UI::Xaml::UIElement& elm);
+};
+
+#define UIWIDGET UiWidget*
+#define UIWINDOW UiWindow*
 #define UIMENU   void*
 
+/*
+// winrt::Microsoft::UI::Xaml::UIElement
+#define UIWIDGET void*
+// winrt::Microsoft::UI::Xaml::Window
+#define UIWINDOW void*
+#define UIMENU   void*
+*/
+
 #else
 #define UIWIDGET void*
 #define UIWINDOW void*