comparison: ui/winui/toolkit.cpp
ui/winui/toolkit.cpp
- branch
- newapi
- changeset 209
- 770b3548906c
- parent 208
- f632bc0589ab
- child 212
- ad5c74af14c4
equal
deleted
inserted
replaced
| 208:f632bc0589ab | 209:770b3548906c |
|---|---|
| 64 static void* appclose_udata; | 64 static void* appclose_udata; |
| 65 | 65 |
| 66 | 66 |
| 67 static UiObject* active_window; | 67 static UiObject* active_window; |
| 68 | 68 |
| 69 void ui_app_run_startup() { | |
| 70 if (startup_func) { | |
| 71 startup_func(NULL, startup_data); | |
| 72 } | |
| 73 } | |
| 69 | 74 |
| 70 class App : public ApplicationT<App, IXamlMetadataProvider> { | 75 class App : public ApplicationT<App, IXamlMetadataProvider> { |
| 71 public: | 76 public: |
| 72 void OnLaunched(LaunchActivatedEventArgs const&) { | 77 void OnLaunched(LaunchActivatedEventArgs const&) { |
| 73 Resources().MergedDictionaries().Append(XamlControlsResources()); | 78 Resources().MergedDictionaries().Append(XamlControlsResources()); |
| 163 exit_data = userdata; | 168 exit_data = userdata; |
| 164 } | 169 } |
| 165 | 170 |
| 166 void ui_main() { | 171 void ui_main() { |
| 167 init_apartment(); | 172 init_apartment(); |
| 168 Application::Start([](auto&&) {make<App>(); }); | 173 //Application::Start([](auto&&) {make<App>(); }); |
| 174 | |
| 175 ::winrt::Microsoft::UI::Xaml::Application::Start( | |
| 176 [](auto&&) | |
| 177 { | |
| 178 ::winrt::make<::winrt::winui::implementation::App>(); | |
| 179 }); | |
| 169 } | 180 } |
| 170 | 181 |
| 171 class UiWin { | 182 class UiWin { |
| 172 public: | 183 public: |
| 173 Window window; | 184 Window window; |
