comparison: ui/winui/App.xaml.cpp
ui/winui/App.xaml.cpp
- branch
- newapi
- changeset 209
- 770b3548906c
- parent 205
- b1ac0dd1d38b
equal
deleted
inserted
replaced
| 208:f632bc0589ab | 209:770b3548906c |
|---|---|
| 3 | 3 |
| 4 #include "pch.h" | 4 #include "pch.h" |
| 5 | 5 |
| 6 #include "App.xaml.h" | 6 #include "App.xaml.h" |
| 7 #include "MainWindow.xaml.h" | 7 #include "MainWindow.xaml.h" |
| 8 | |
| 9 #include "toolkit.h" | |
| 8 | 10 |
| 9 using namespace winrt; | 11 using namespace winrt; |
| 10 using namespace Windows::Foundation; | 12 using namespace Windows::Foundation; |
| 11 using namespace Microsoft::UI::Xaml; | 13 using namespace Microsoft::UI::Xaml; |
| 12 using namespace Microsoft::UI::Xaml::Controls; | 14 using namespace Microsoft::UI::Xaml::Controls; |
| 41 /// Invoked when the application is launched. | 43 /// Invoked when the application is launched. |
| 42 /// </summary> | 44 /// </summary> |
| 43 /// <param name="e">Details about the launch request and process.</param> | 45 /// <param name="e">Details about the launch request and process.</param> |
| 44 void App::OnLaunched(LaunchActivatedEventArgs const&) | 46 void App::OnLaunched(LaunchActivatedEventArgs const&) |
| 45 { | 47 { |
| 46 window = make<MainWindow>(); | 48 ui_app_run_startup(); |
| 47 window.Activate(); | 49 //window = make<MainWindow>(); |
| 50 //window.Activate(); | |
| 48 } | 51 } |
