comparison: ui/ui/toolkit.h
ui/ui/toolkit.h
- branch
- newapi
- changeset 183
- 3ce2eb11913b
- parent 181
- c52d88ea020b
- child 184
- 8c9b4b28aaa9
equal
deleted
inserted
replaced
| 182:6cf690e042bd | 183:3ce2eb11913b |
|---|---|
| 68 #endif | 68 #endif |
| 69 | 69 |
| 70 #elif UI_WINUI | 70 #elif UI_WINUI |
| 71 | 71 |
| 72 #ifdef __cplusplus | 72 #ifdef __cplusplus |
| 73 | |
| 73 #include <Windows.h> | 74 #include <Windows.h> |
| 74 #undef GetCurrentTime | 75 #undef GetCurrentTime |
| 75 #include <winrt/Windows.Foundation.Collections.h> | 76 #include <winrt/Windows.Foundation.Collections.h> |
| 76 #include <winrt/Windows.UI.Xaml.Interop.h> | 77 #include <winrt/Windows.UI.Xaml.Interop.h> |
| 77 #include <winrt/Microsoft.UI.Xaml.Controls.h> | 78 #include <winrt/Microsoft.UI.Xaml.Controls.h> |
| 78 | 79 |
| 79 #define UIWIDGET winrt::Microsoft::UI::Xaml::UIElement | 80 class UiWindow { |
| 80 #define UIWINDOW winrt::Microsoft::UI::Xaml::Window | 81 public: |
| 82 winrt::Microsoft::UI::Xaml::Window window { nullptr }; | |
| 83 | |
| 84 UiWindow(winrt::Microsoft::UI::Xaml::Window& win); | |
| 85 }; | |
| 86 | |
| 87 class UiWidget { | |
| 88 public: | |
| 89 winrt::Microsoft::UI::Xaml::UIElement uielement; | |
| 90 | |
| 91 UiWidget(winrt::Microsoft::UI::Xaml::UIElement& elm); | |
| 92 }; | |
| 93 | |
| 94 #define UIWIDGET UiWidget* | |
| 95 #define UIWINDOW UiWindow* | |
| 81 #define UIMENU void* | 96 #define UIMENU void* |
| 97 | |
| 98 /* | |
| 99 // winrt::Microsoft::UI::Xaml::UIElement | |
| 100 #define UIWIDGET void* | |
| 101 // winrt::Microsoft::UI::Xaml::Window | |
| 102 #define UIWINDOW void* | |
| 103 #define UIMENU void* | |
| 104 */ | |
| 82 | 105 |
| 83 #else | 106 #else |
| 84 #define UIWIDGET void* | 107 #define UIWIDGET void* |
| 85 #define UIWINDOW void* | 108 #define UIWINDOW void* |
| 86 #define UIMENU void* | 109 #define UIMENU void* |
