fix!: Remove Application.OnWindowCreated from WinUI tree

BREAKING CHANGE: Application.OnWindowCreated does not exist in WinAppSDK
unoplatform · May 8, 2023 · bb368b8 · bb368b8
1 parent ade59d3
commit bb368b8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Application.cs b/src/Uno.UI/UI/Xaml/Application.cs
@@ -390,6 +390,7 @@ private SuspendingOperation CreateSuspendingOperation() =>
 			new SuspendingOperation(DateTimeOffset.Now.AddSeconds(0), null);
 #endif
 
+#if !HAS_UNO_WINUI
 		protected virtual void OnWindowCreated(global::Windows.UI.Xaml.WindowCreatedEventArgs args)
 		{
 		}
@@ -398,6 +399,7 @@ internal void RaiseWindowCreated(Window window)
 		{
 			OnWindowCreated(new WindowCreatedEventArgs(window));
 		}
+#endif
 
 		private void SetRequestedTheme(ApplicationTheme requestedTheme)
 		{

diff --git a/src/Uno.UI/UI/Xaml/Window.cs b/src/Uno.UI/UI/Xaml/Window.cs
@@ -89,6 +89,8 @@ internal Window(bool internalUse)
 		private void InitializeCommon()
 		{
 			InitDragAndDrop();
+
+#if !HAS_UNO_WINUI
 			if (Application.Current != null)
 			{
 				Application.Current.RaiseWindowCreated(this);
@@ -100,6 +102,7 @@ private void InitializeCommon()
 					this.Log().Warn("Unable to raise WindowCreatedEvent, there is no active Application");
 				}
 			}
+#endif
 
 			Background = SolidColorBrushHelper.White;
 		}

diff --git a/src/Uno.UI/UI/Xaml/WindowCreatedEventArgs.cs b/src/Uno.UI/UI/Xaml/WindowCreatedEventArgs.cs
@@ -1,6 +1,8 @@
+#if !HAS_UNO_WINUI
 using System;
 using Windows.Foundation;
 using Windows.Foundation.Metadata;
+
 namespace Windows.UI.Xaml
 {
 	public sealed partial class WindowCreatedEventArgs
@@ -14,3 +16,4 @@ public Window Window
 		}
 	}
 }
+#endif