diff -r f34953bf4ac7 -r c52d88ea020b ui/ui/toolkit.h --- a/ui/ui/toolkit.h Tue May 23 14:19:06 2023 +0200 +++ b/ui/ui/toolkit.h Mon May 29 10:37:23 2023 +0200 @@ -68,10 +68,27 @@ #endif #elif UI_WINUI + +#ifdef __cplusplus +#include +#undef GetCurrentTime +#include +#include +#include + +#define UIWIDGET winrt::Microsoft::UI::Xaml::UIElement +#define UIWINDOW winrt::Microsoft::UI::Xaml::Window +#define UIMENU void* + +#else #define UIWIDGET void* +#define UIWINDOW void* #define UIMENU void* #endif + +#endif + #ifndef TRUE #define TRUE 1 #endif @@ -137,6 +154,13 @@ * native widget */ UIWIDGET widget; + +#ifdef UI_WINUI + /* + * native window object + */ + UIWINDOW wobj; +#endif /* * user window data